chore: sync remote PR branch history without force-push

.agents/skills/PR_WORKFLOW.md

@@ -3,6 +3,10 @@
 Please read this in full and do not skip sections.
 This is the single source of truth for the maintainer PR workflow.
 
+## Triage order
+
+Process PRs **oldest to newest**. Older PRs are more likely to have merge conflicts and stale dependencies; resolving them first keeps the queue healthy and avoids snowballing rebase pain.
+
 ## Working rule
 
 Skills execute workflow. Maintainers provide judgment.
@@ -106,7 +110,7 @@ Before any substantive review or prep work, **always rebase the PR branch onto c
 - During `prepare-pr`, use concise, action-oriented subjects **without** PR numbers or thanks; reserve `(#<PR>) thanks @<pr-author>` for the final merge/squash commit.
 - Group related changes; avoid bundling unrelated refactors.
 - Changelog workflow: keep the latest released version at the top (no `Unreleased`); after publishing, bump the version and start a new top section.
-- When working on a PR: add a changelog entry line with the PR number `(#<PR>)` and `thanks @<pr-author>` when author metadata is available (mandatory in this workflow).
+- When working on a PR: add a changelog entry with the PR number and thank the contributor (mandatory in this workflow).
 - When working on an issue: reference the issue in the changelog entry.
 - In this workflow, changelog is always required even for internal/test-only changes.
 

.agents/skills/merge-pr/SKILL.md

@@ -41,12 +41,11 @@ scripts/pr-merge <PR>
 scripts/pr-merge run <PR>
 ```
 
-3. Capture and report these values in a human-readable summary (not raw `key=value` lines):
+3. Ensure output reports:
 
-- Merge commit SHA
-- Merge author email
-- Merge completion comment URL
-- PR URL
+- `merge_sha=<sha>`
+- `merge_author_email=<email>`
+- `comment_url=<url>`
 
 ## Steps
 
@@ -98,4 +97,3 @@ Cleanup is handled by `run` after merge success.
 
 - End in `MERGED`, never `CLOSED`.
 - Cleanup only after confirmed merge.
-- In final chat output, use labeled lines or bullets; do not paste raw wrapper diagnostics unless debugging.

.agents/skills/prepare-pr/SKILL.md

@@ -74,11 +74,6 @@ jq -r '.changelog' .local/review.json
 jq -r '.docs' .local/review.json
 ```
 
-Changelog gate requirement:
-
-- `CHANGELOG.md` must include a newly added changelog entry line.
-- When PR author metadata is available, that same changelog entry line must include `(#<PR>) thanks @<pr-author>`.
-
 4. Commit scoped changes
 
 Use concise, action-oriented subject lines without PR numbers/thanks. The final merge/squash commit is the only place we include PR numbers and contributor thanks.

.env.example

@@ -37,16 +37,6 @@ OPENCLAW_GATEWAY_TOKEN=change-me-to-a-long-random-token
 # ANTHROPIC_API_KEY=sk-ant-...
 # GEMINI_API_KEY=...
 # OPENROUTER_API_KEY=sk-or-...
-# OPENCLAW_LIVE_OPENAI_KEY=sk-...
-# OPENCLAW_LIVE_ANTHROPIC_KEY=sk-ant-...
-# OPENCLAW_LIVE_GEMINI_KEY=...
-# OPENAI_API_KEY_1=...
-# ANTHROPIC_API_KEY_1=...
-# GEMINI_API_KEY_1=...
-# GOOGLE_API_KEY=...
-# OPENAI_API_KEYS=sk-1,sk-2
-# ANTHROPIC_API_KEYS=sk-ant-1,sk-ant-2
-# GEMINI_API_KEYS=key-1,key-2
 
 # Optional additional providers
 # ZAI_API_KEY=...

.github/actions/setup-node-env/action.yml

@@ -52,7 +52,7 @@ runs:
       if: inputs.install-bun == 'true'
       uses: oven-sh/setup-bun@v2
       with:
-        bun-version: "1.3.9+cf6cdbbba"
+        bun-version: latest
 
     - name: Runtime versions
       shell: bash

.github/workflows/auto-response.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         id: app-token
@@ -48,7 +48,7 @@ jobs:
                 label: "r: third-party-extension",
                 close: true,
                 message:
-                  "Please make this as a third-party plugin that you maintain yourself in your own repo. Docs: https://docs.openclaw.ai/plugin. Feel free to open a PR after to add it to our community plugins page: https://docs.openclaw.ai/plugins/community",
+                  "This would be better made as a third-party extension with our SDK that you maintain yourself. Docs: https://docs.openclaw.ai/plugin.",
               },
               {
                 label: "r: moltbook",

.github/workflows/ci.yml

@@ -192,28 +192,20 @@ jobs:
             task: test
             command: pnpm canvas:a2ui:bundle && bunx vitest run --config vitest.unit.config.ts
     steps:
-      - name: Skip bun lane on push
-        if: github.event_name == 'push' && matrix.runtime == 'bun'
-        run: echo "Skipping bun test lane on push events."
-
       - name: Checkout
-        if: github.event_name != 'push' || matrix.runtime != 'bun'
         uses: actions/checkout@v4
         with:
           submodules: false
 
       - name: Setup Node environment
-        if: matrix.runtime != 'bun' || github.event_name != 'push'
         uses: ./.github/actions/setup-node-env
-        with:
-          install-bun: "${{ matrix.runtime == 'bun' }}"
 
       - name: Configure vitest JSON reports
-        if: (github.event_name != 'push' || matrix.runtime != 'bun') && matrix.task == 'test' && matrix.runtime == 'node'
+        if: matrix.task == 'test' && matrix.runtime == 'node'
         run: echo "OPENCLAW_VITEST_REPORT_DIR=$RUNNER_TEMP/vitest-reports" >> "$GITHUB_ENV"
 
       - name: Configure Node test resources
-        if: (github.event_name != 'push' || matrix.runtime != 'bun') && matrix.task == 'test' && matrix.runtime == 'node'
+        if: matrix.task == 'test' && matrix.runtime == 'node'
         run: |
           # `pnpm test` runs `scripts/test-parallel.mjs`, which spawns multiple Node processes.
           # Default heap limits have been too low on Linux CI (V8 OOM near 4GB).
@@ -221,17 +213,16 @@ jobs:
           echo "OPENCLAW_TEST_MAX_OLD_SPACE_SIZE_MB=6144" >> "$GITHUB_ENV"
 
       - name: Run ${{ matrix.task }} (${{ matrix.runtime }})
-        if: matrix.runtime != 'bun' || github.event_name != 'push'
         run: ${{ matrix.command }}
 
       - name: Summarize slowest tests
-        if: (github.event_name != 'push' || matrix.runtime != 'bun') && matrix.task == 'test' && matrix.runtime == 'node'
+        if: matrix.task == 'test' && matrix.runtime == 'node'
         run: |
           node scripts/vitest-slowest.mjs --dir "$OPENCLAW_VITEST_REPORT_DIR" --top 50 --out "$RUNNER_TEMP/vitest-slowest.md" > /dev/null
           echo "Slowest test summary written to $RUNNER_TEMP/vitest-slowest.md"
 
       - name: Upload vitest reports
-        if: (github.event_name != 'push' || matrix.runtime != 'bun') && matrix.task == 'test' && matrix.runtime == 'node'
+        if: matrix.task == 'test' && matrix.runtime == 'node'
         uses: actions/upload-artifact@v4
         with:
           name: vitest-reports-${{ runner.os }}-${{ matrix.runtime }}
@@ -253,8 +244,6 @@ jobs:
 
       - name: Setup Node environment
         uses: ./.github/actions/setup-node-env
-        with:
-          install-bun: "false"
 
       - name: Check types and lint and oxfmt
         run: pnpm check
@@ -272,8 +261,6 @@ jobs:
 
       - name: Setup Node environment
         uses: ./.github/actions/setup-node-env
-        with:
-          install-bun: "false"
 
       - name: Check docs
         run: pnpm check:docs
@@ -379,10 +366,16 @@ jobs:
           pnpm-version: "10.23.0"
           cache-key-suffix: "node22"
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
       - name: Runtime versions
         run: |
           node -v
           npm -v
+          bun -v
           pnpm -v
 
       - name: Capture node path

.github/workflows/docker-release.yml

@@ -30,6 +30,7 @@ jobs:
       contents: read
     outputs:
       image-digest: ${{ steps.build.outputs.digest }}
+      image-metadata: ${{ steps.meta.outputs.json }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -44,30 +45,18 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Resolve image tags (amd64)
-        id: tags
-        shell: bash
-        env:
-          IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        run: |
-          set -euo pipefail
-          tags=()
-          if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
-            tags+=("${IMAGE}:main-amd64")
-          fi
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            version="${GITHUB_REF#refs/tags/v}"
-            tags+=("${IMAGE}:${version}-amd64")
-          fi
-          if [[ ${#tags[@]} -eq 0 ]]; then
-            echo "::error::No amd64 tags resolved for ref ${GITHUB_REF}"
-            exit 1
-          fi
-          {
-            echo "value<<EOF"
-            printf "%s\n" "${tags[@]}"
-            echo "EOF"
-          } >> "$GITHUB_OUTPUT"
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{version}},suffix=-amd64
+            type=semver,pattern={{version}},suffix=-arm64
+            type=ref,event=branch,suffix=-amd64
+            type=ref,event=branch,suffix=-arm64
 
       - name: Build and push amd64 image
         id: build
@@ -75,7 +64,8 @@ jobs:
         with:
           context: .
           platforms: linux/amd64
-          tags: ${{ steps.tags.outputs.value }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cache:amd64
           cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cache:amd64,mode=max
           provenance: false
@@ -89,6 +79,7 @@ jobs:
       contents: read
     outputs:
       image-digest: ${{ steps.build.outputs.digest }}
+      image-metadata: ${{ steps.meta.outputs.json }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -103,30 +94,18 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Resolve image tags (arm64)
-        id: tags
-        shell: bash
-        env:
-          IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        run: |
-          set -euo pipefail
-          tags=()
-          if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
-            tags+=("${IMAGE}:main-arm64")
-          fi
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            version="${GITHUB_REF#refs/tags/v}"
-            tags+=("${IMAGE}:${version}-arm64")
-          fi
-          if [[ ${#tags[@]} -eq 0 ]]; then
-            echo "::error::No arm64 tags resolved for ref ${GITHUB_REF}"
-            exit 1
-          fi
-          {
-            echo "value<<EOF"
-            printf "%s\n" "${tags[@]}"
-            echo "EOF"
-          } >> "$GITHUB_OUTPUT"
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{version}},suffix=-amd64
+            type=semver,pattern={{version}},suffix=-arm64
+            type=ref,event=branch,suffix=-amd64
+            type=ref,event=branch,suffix=-arm64
 
       - name: Build and push arm64 image
         id: build
@@ -134,7 +113,8 @@ jobs:
         with:
           context: .
           platforms: linux/arm64
-          tags: ${{ steps.tags.outputs.value }}
+          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
           cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cache:arm64
           cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cache:arm64,mode=max
           provenance: false
@@ -148,9 +128,6 @@ jobs:
       contents: read
     needs: [build-amd64, build-arm64]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -158,41 +135,19 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Resolve manifest tags
-        id: tags
-        shell: bash
-        env:
-          IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-        run: |
-          set -euo pipefail
-          tags=()
-          if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
-            tags+=("${IMAGE}:main")
-          fi
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            version="${GITHUB_REF#refs/tags/v}"
-            tags+=("${IMAGE}:${version}")
-          fi
-          if [[ ${#tags[@]} -eq 0 ]]; then
-            echo "::error::No manifest tags resolved for ref ${GITHUB_REF}"
-            exit 1
-          fi
-          {
-            echo "value<<EOF"
-            printf "%s\n" "${tags[@]}"
-            echo "EOF"
-          } >> "$GITHUB_OUTPUT"
+      - name: Extract metadata for manifest
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
 
       - name: Create and push manifest
-        shell: bash
         run: |
-          set -euo pipefail
-          mapfile -t tags <<< "${{ steps.tags.outputs.value }}"
-          args=()
-          for tag in "${tags[@]}"; do
-            [ -z "$tag" ] && continue
-            args+=("-t" "$tag")
-          done
-          docker buildx imagetools create "${args[@]}" \
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             ${{ needs.build-amd64.outputs.image-digest }} \
             ${{ needs.build-arm64.outputs.image-digest }}
+        env:
+          DOCKER_METADATA_OUTPUT_JSON: ${{ steps.meta.outputs.json }}

.github/workflows/formal-conformance.yml

@@ -0,0 +1,139 @@
+name: Formal models (informational conformance)
+
+on:
+  pull_request:
+
+concurrency:
+  group: formal-conformance-${{ github.event.pull_request.number || github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  formal_conformance:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - name: Checkout openclaw (PR)
+        uses: actions/checkout@v4
+        with:
+          path: openclaw
+
+      - name: Checkout formal models
+        uses: actions/checkout@v4
+        with:
+          repository: vignesh07/clawdbot-formal-models
+          ref: main
+          path: clawdbot-formal-models
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Regenerate extracted constants from openclaw
+        run: |
+          set -euo pipefail
+          cd clawdbot-formal-models
+          export OPENCLAW_REPO_DIR="${GITHUB_WORKSPACE}/openclaw"
+          node scripts/extract-tool-groups.mjs
+          node scripts/check-tool-group-alias.mjs
+
+      # Drift is about extracted artifacts only; compute it before model checking
+      # to avoid any incidental file touches affecting the result.
+      - name: Compute drift (generated/*)
+        id: drift
+        run: |
+          set -euo pipefail
+          cd clawdbot-formal-models
+
+          if git diff --quiet -- generated; then
+            echo "drift=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          echo "drift=true" >> "$GITHUB_OUTPUT"
+          git diff -- generated > "${GITHUB_WORKSPACE}/formal-models-drift.diff"
+
+      - name: Model check (green suite)
+        run: |
+          set -euo pipefail
+          cd clawdbot-formal-models
+          make \
+            precedence groups elevated nodes-policy \
+            attacker approvals approvals-token nodes-pipeline \
+            gateway-exposure gateway-exposure-v2 gateway-exposure-v2-protected \
+            gateway-auth-conformance gateway-auth-tailscale gateway-auth-proxy \
+            pairing pairing-cap pairing-idempotency pairing-refresh pairing-refresh-race \
+            ingress-gating ingress-idempotency ingress-dedupe-fallback ingress-trace ingress-trace2 \
+            routing-isolation routing-precedence routing-identitylinks routing-identity-transitive routing-identity-symmetry routing-identity-channel-override \
+            routing-thread-parent discord-pluralkit \
+            ingress-retry session-key-stability session-explosion-bound config-normalization \
+            queue-drain delivery-route-stability delivery-pipeline retry-termination retry-eventual-success \
+            no-cross-stream multi-event-eventual-emission \
+            dedupe-collision-fallback crash-restart-dedupe two-worker-dedupe openclaw-session-key-conformance \
+            routing-thread-parent-channel-override routing-trirule gateway-auth-proxy-header-spoof \
+            group-alias-check
+
+      - name: Model check (negative suite, expected violations)
+        continue-on-error: true
+        run: |
+          set -euo pipefail
+          cd clawdbot-formal-models
+          make -k \
+            precedence-negative groups-negative elevated-negative nodes-policy-negative \
+            attacker-negative attacker-nodes-negative attacker-nodes-allowlist-negative attacker-nodes-allowlist-negative \
+            approvals-negative approvals-token-negative nodes-pipeline-negative \
+            gateway-exposure-negative gateway-exposure-v2-negative gateway-exposure-v2-protected-negative \
+            gateway-exposure-v2-unsafe-custom gateway-exposure-v2-unsafe-tailnet gateway-exposure-v2-unsafe-auto \
+            gateway-auth-conformance-negative gateway-auth-tailscale-negative gateway-auth-proxy-negative \
+            pairing-negative pairing-cap-negative pairing-idempotency-negative pairing-refresh-negative pairing-refresh-race-negative \
+            ingress-gating-negative ingress-idempotency-negative ingress-dedupe-fallback-negative ingress-trace-negative ingress-trace2-negative \
+            routing-isolation-negative routing-precedence-negative routing-identitylinks-negative routing-identity-transitive-negative routing-identity-symmetry-negative routing-identity-channel-override-negative \
+            routing-thread-parent-negative discord-pluralkit-negative \
+            ingress-retry-negative session-key-stability-negative config-normalization-negative \
+            queue-drain delivery-route-stability-negative delivery-pipeline-negative retry-termination-negative retry-eventual-success-negative \
+            no-cross-stream-negative multi-event-eventual-emission-negative \
+            dedupe-collision-fallback-negative crash-restart-dedupe-negative two-worker-dedupe-negative openclaw-session-key-conformance-negative \
+            routing-thread-parent-channel-override-negative routing-trirule-negative gateway-auth-proxy-header-spoof-negative
+
+      - name: Upload drift diff artifact
+        if: steps.drift.outputs.drift == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: formal-models-conformance-drift
+          path: formal-models-drift.diff
+
+      - name: Comment on PR (informational)
+        if: steps.drift.outputs.drift == 'true'
+        continue-on-error: true
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const body = [
+              '⚠️ **Formal models conformance drift detected**',
+              '',
+              'The formal models extracted constants (`generated/*`) do not match this openclaw PR.',
+              '',
+              'This check is **informational** (not blocking merges yet).',
+              'See the `formal-models-conformance-drift` artifact for the diff.',
+              '',
+              'If this change is intentional, follow up by updating the formal models repo or regenerating the extracted artifacts there.',
+            ].join('\n');
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body,
+            });
+
+      - name: Summary
+        run: |
+          if [ "${{ steps.drift.outputs.drift }}" = "true" ]; then
+            echo "Formal conformance drift detected (informational)."
+          else
+            echo "Formal conformance: no drift."
+          fi

.github/workflows/labeler.yml

@@ -23,7 +23,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         id: app-token
@@ -200,7 +200,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         id: app-token
@@ -440,7 +440,7 @@ jobs:
   label-issues:
     permissions:
       issues: write
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         id: app-token

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         id: app-token
@@ -31,7 +31,7 @@ jobs:
           stale-pr-label: stale
           exempt-issue-labels: enhancement,maintainer,pinned,security,no-stale
           exempt-pr-labels: maintainer,no-stale
-          operations-per-run: 10000
+          operations-per-run: 500
           exempt-all-assignees: true
           remove-stale-when-updated: true
           stale-issue-message: |

.gitignore

@@ -36,13 +36,10 @@ bin/docs-list
 apps/macos/.build-local/
 apps/macos/.swiftpm/
 apps/shared/MoltbotKit/.swiftpm/
-apps/shared/OpenClawKit/.swiftpm/
 Core/
 apps/ios/*.xcodeproj/
 apps/ios/*.xcworkspace/
 apps/ios/.swiftpm/
-apps/ios/.derivedData/
-apps/ios/.local-signing.xcconfig
 vendor/
 apps/ios/Clawdbot.xcodeproj/
 apps/ios/Clawdbot.xcodeproj/**
@@ -89,7 +86,3 @@ USER.md
 !.agent/workflows/
 /local/
 package-lock.json
-.claude/settings.local.json
-
-# Local iOS signing overrides
-apps/ios/LocalSigning.xcconfig

.oxfmtrc.jsonc

@@ -6,18 +6,14 @@
   "experimentalSortPackageJson": {
     "sortScripts": true,
   },
-  "tabWidth": 2,
-  "useTabs": false,
   "ignorePatterns": [
     "apps/",
     "assets/",
-    "docker-compose.yml",
     "dist/",
     "docs/_layouts/",
     "node_modules/",
     "patches/",
     "pnpm-lock.yaml/",
-    "src/auto-reply/reply/export-html/",
     "Swabble/",
     "vendor/",
   ],

.oxlintrc.json

@@ -11,8 +11,6 @@
     "eslint-plugin-unicorn/prefer-array-find": "off",
     "eslint/no-await-in-loop": "off",
     "eslint/no-new": "off",
-    "eslint/no-shadow": "off",
-    "eslint/no-unmodified-loop-condition": "off",
     "oxc/no-accumulating-spread": "off",
     "oxc/no-async-endpoint-handlers": "off",
     "oxc/no-map-spread": "off",
@@ -29,9 +27,8 @@
     "extensions/",
     "node_modules/",
     "patches/",
-    "pnpm-lock.yaml",
+    "pnpm-lock.yaml/",
     "skills/",
-    "src/auto-reply/reply/export-html/template.js",
     "src/canvas-host/a2ui/a2ui.bundle.js",
     "Swabble/",
     "vendor/"

AGENTS.md

@@ -70,10 +70,6 @@
 
 - Language: TypeScript (ESM). Prefer strict typing; avoid `any`.
 - Formatting/linting via Oxlint and Oxfmt; run `pnpm check` before commits.
-- Never add `@ts-nocheck` and do not disable `no-explicit-any`; fix root causes and update Oxlint/Oxfmt config only when required.
-- Never share class behavior via prototype mutation (`applyPrototypeMixins`, `Object.defineProperty` on `.prototype`, or exporting `Class.prototype` for merges). Use explicit inheritance/composition (`A extends B extends C`) or helper composition so TypeScript can typecheck.
-- If this pattern is needed, stop and get explicit approval before shipping; default behavior is to split/refactor into an explicit class hierarchy and keep members strongly typed.
-- In tests, prefer per-instance stubs over prototype mutation (`SomeClass.prototype.method = ...`) unless a test explicitly documents why prototype-level patching is required.
 - Add brief code comments for tricky or non-obvious logic.
 - Keep files concise; extract helpers instead of “V2” copies. Use existing patterns for CLI options and dependency injection via `createDefaultDeps`.
 - Aim to keep files under ~700 LOC; guideline only (not a hard guardrail). Split/refactor when it improves clarity or testability.
@@ -114,7 +110,6 @@
 ## Git Notes
 
 - If `git branch -d/-D <branch>` is policy-blocked, delete the local ref directly: `git update-ref -d refs/heads/<branch>`.
-- Bulk PR close/reopen safety: if a close action would affect more than 5 PRs, first ask for explicit user confirmation with the exact PR count and target scope/query.
 
 ## Security & Configuration Tips
 
@@ -218,7 +213,7 @@
   - skip if package is missing on npm or version already matches.
 - Keep `openclaw` untouched: never run publish from repo root unless explicitly requested.
 - Post-check for each release:
-  - per-plugin: `npm view @openclaw/<name> version --userconfig "$(mktemp)"` should be `2026.2.17`
+  - per-plugin: `npm view @openclaw/<name> version --userconfig "$(mktemp)"` should be `2026.2.16`
   - core guard: `npm view openclaw version --userconfig "$(mktemp)"` should stay at previous version unless explicitly requested.
 
 ## Changelog Release Notes

CHANGELOG.md

@@ -2,250 +2,7 @@
 
 Docs: https://docs.openclaw.ai
 
-## 2026.2.18 (Unreleased)
-
-### Changes
-
-- iOS/Gateway: wake disconnected iOS nodes via APNs before `nodes.invoke` and auto-reconnect gateway sessions on silent push wake to reduce invoke failures while the app is backgrounded. (#20332) Thanks @mbelinky.
-- Dev tooling: align `oxfmt` local/CI formatting behavior. (#12579) Thanks @vincentkoc.
-- iOS/APNs: add push registration and notification-signing configuration for node delivery. (#20308) Thanks @mbelinky.
-- Gateway/APNs: add a push-test pipeline for APNs delivery validation in gateway flows. (#20307) Thanks @mbelinky.
-- iOS/Watch: add an Apple Watch companion MVP with watch inbox UI, watch notification relay handling, and gateway command surfaces for watch status/send flows. (#20054) Thanks @mbelinky.
-- Gateway/CLI: add paired-device hygiene flows with `device.pair.remove`, plus `openclaw devices remove` and guarded `openclaw devices clear --yes [--pending]` commands for removing paired entries and optionally rejecting pending requests. (#20057) Thanks @mbelinky.
-- Skills: harden coding-agent skill guidance by removing shell-command examples that interpolate untrusted issue text directly into command strings.
-
-### Fixes
-
-- Security/Webhooks: harden Feishu and Zalo webhook ingress with webhook-mode token preconditions, loopback-default Feishu bind host, JSON content-type enforcement, per-path rate limiting, replay dedupe for Zalo events, constant-time Zalo secret comparison, and anomaly status counters.
-- Security/Plugins: add explicit `plugins.runtime.allowLegacyExec` opt-in to re-enable deprecated `runtime.system.runCommandWithTimeout` for legacy modules while keeping runtime command execution disabled by default. (#20874) Thanks @mbelinky.
-- Gateway/WebChat: block `sessions.patch` and `sessions.delete` for WebChat clients so session-store mutations stay restricted to non-WebChat operator flows. Thanks @allsmog for reporting.
-- Security/Skills: for the next npm release, reject symlinks during skill packaging to prevent external file inclusion in distributed `.skill` archives. Thanks @aether-ai-agent for reporting.
-- Security/Gateway: fail startup when `hooks.token` matches `gateway.auth.token` so hooks and gateway token reuse is rejected at boot. (#20813) Thanks @coygeek.
-- Security/Network: block plaintext `ws://` connections to non-loopback hosts and require secure websocket transport elsewhere. (#20803) Thanks @jscaldwell55.
-- Security/Config: parse frontmatter YAML using the YAML 1.2 core schema to avoid implicit coercion of `on`/`off`-style values. (#20857) Thanks @davidrudduck.
-- Security/Discord: escape backticks in exec-approval embed content to prevent markdown formatting injection via command text. (#20854) Thanks @davidrudduck.
-- Security/Agents: replace shell-based `execSync` usage with `execFileSync` in command lookup helpers to eliminate shell argument interpolation risk. (#20655) Thanks @mahanandhi.
-- Security/Media: use `crypto.randomBytes()` for temp file names and set owner-only permissions for TTS temp files. (#20654) Thanks @mahanandhi.
-- Security/Gateway: set baseline security headers (`X-Content-Type-Options: nosniff`, `Referrer-Policy: no-referrer`) on gateway HTTP responses. (#10526) Thanks @abdelsfane.
-- Tests/Security: refactor `src/security/audit.test.ts` by extracting shared helpers to reduce duplication in security audit test coverage. (#20087) Thanks @habakan.
-- Channels/Matrix: fix mention detection for `formatted_body` Matrix-to links by handling matrix.to mention formats consistently. (#16941) Thanks @zerone0x.
-- Scripts: update clawdock helper command support to include `docker-compose.extra.yml` where available. (#17094) Thanks @zerone0x.
-- Security/iMessage: harden remote attachment SSH/SCP handling by requiring strict host-key verification, validating `channels.imessage.remoteHost` as `host`/`user@host`, and rejecting unsafe host tokens from config or auto-detection. Thanks @allsmog for reporting.
-- Security/Feishu: prevent path traversal in Feishu inbound media temp-file writes by replacing key-derived temp filenames with UUID-based names. Thanks @allsmog for reporting.
-- LINE/Security: harden inbound media temp-file naming by using UUID-based temp paths for downloaded media instead of external message IDs. (#20792) Thanks @mbelinky.
-- Security/Refactor: centralize hardened temp-file path generation for Feishu and LINE media downloads via shared `buildRandomTempFilePath` helper to reduce drift risk. (#20810) Thanks @mbelinky.
-- Security/Media: harden local media ingestion against TOCTOU/symlink swap attacks by pinning reads to a single file descriptor with symlink rejection and inode/device verification in `saveMediaSource`. Thanks @dorjoos for reporting.
-- Security/Lobster (Windows): for the next npm release, remove shell-based fallback when launching Lobster wrappers (`.cmd`/`.bat`) and switch to explicit argv execution with wrapper entrypoint resolution, preventing command injection while preserving Windows wrapper compatibility. Thanks @tdjackey for reporting.
-- Agents/Streaming: keep assistant partial streaming active during reasoning streams, handle native `thinking_*` stream events consistently, dedupe mixed reasoning-end signals, and clear stale mutating tool errors after same-target retry success. (#20635) Thanks @obviyus.
-- Security/OTEL: sanitize OTLP endpoint URL resolution. (#13791) Thanks @vincentkoc.
-- OTEL/diagnostics-otel: complete OpenTelemetry v2 API migration. (#12897) Thanks @vincentkoc.
-- Gateway: clarify launchctl GUI domain bootstrap failure on macOS. (#13795) Thanks @vincentkoc.
-- Security: patch Dependabot security issues in pnpm lock. (#20832) Thanks @vincentkoc.
-- Lobster/CI: fix flaky test Windows cmd shim script resolution. (#20833) Thanks @vincentkoc.
-- Security: migrate request dependencies to `@cypress/request`. (#20836) Thanks @vincentkoc.
-- Gateway/Auth: default unresolved gateway auth to token mode with startup auto-generation/persistence of `gateway.auth.token`, while allowing explicit `gateway.auth.mode: "none"` for intentional open loopback setups. (#20686) thanks @gumadeiras.
-- Browser/Relay: require gateway-token auth on both `/extension` and `/cdp`, and align Chrome extension setup to use a single `gateway.auth.token` input for relay authentication. Thanks @tdjackey for reporting.
-- Gateway/Hooks: run BOOT.md startup checks per configured agent scope, including per-agent session-key resolution, startup-hook regression coverage, and non-success boot outcome logging for diagnosability. (#20569) thanks @mcaxtr.
-- Telegram: unify message-like inbound handling so `message` and `channel_post` share the same dedupe/access/media pipeline and remain behaviorally consistent. (#20591) Thanks @obviyus.
-- Heartbeat/Cron: skip interval heartbeats when `HEARTBEAT.md` is missing or empty and no tagged cron events are queued, while preserving cron-event fallback for queued tagged reminders. (#20461) thanks @vikpos.
-- Telegram/Agents: gate exec/bash tool-failure warnings behind verbose mode so default Telegram replies stay clean while verbose sessions still surface diagnostics. (#20560) Thanks @obviyus.
-- Gateway/Daemon: forward `TMPDIR` into installed service environments so macOS LaunchAgent gateway runs can open SQLite temp/journal files reliably instead of failing with `SQLITE_CANTOPEN`. (#20512) Thanks @Clawborn.
-- Agents/Billing: include the active model that produced a billing error in user-facing billing messages (for example, `OpenAI (gpt-5.3)`) across payload, failover, and lifecycle error paths, so users can identify exactly which key needs credits. (#20510) Thanks @echoVic.
-- iOS/Screen: move `WKWebView` lifecycle ownership into `ScreenWebView` coordinator and explicit attach/detach flow to reduce gesture/lifecycle crash risk (`__NSArrayM insertObject:atIndex:` paths) during screen tab updates. (#20366) Thanks @ngutman.
-- Gateway/TUI: honor `agents.defaults.blockStreamingDefault` for `chat.send` by removing the hardcoded block-streaming disable override, so replies can use configured block-mode delivery. (#19693) Thanks @neipor.
-- Protocol/Apple: regenerate Swift gateway models for `push.test` so `pnpm protocol:check` stays green on main. Thanks @mbelinky.
-- Canvas/A2UI: improve bundled-asset resolution and empty-state handling so UI fallbacks render reliably. (#20312) Thanks @mbelinky.
-- UI/Sessions: accept the canonical main session-key alias in Chat UI flows so main-session routing stays consistent. (#20311) Thanks @mbelinky.
-- iOS/Onboarding: prevent pairing-status flicker during auto-resume by keeping resumed state transitions stable. (#20310) Thanks @mbelinky.
-- OpenClawKit/Protocol: preserve JSON boolean literals (`true`/`false`) when bridging through `AnyCodable` so Apple client RPC params no longer re-encode booleans as `1`/`0`. Thanks @mbelinky.
-- iOS/Onboarding: stabilize pairing and reconnect behavior by resetting stale pairing request state on manual retry, disconnecting both operator and node gateways on operator failure, and avoiding duplicate pairing loops from operator transport identity attachment. (#20056) Thanks @mbelinky.
-- Browser/Relay: reuse an already-running extension relay when the relay port is occupied by another OpenClaw process, while still failing on non-relay port collisions to avoid masking unrelated listeners. (#20035) Thanks @mbelinky.
-- Telegram/Cron/Heartbeat: honor explicit Telegram topic targets in cron and heartbeat delivery (`<chatId>:topic:<threadId>`) so scheduled sends land in the configured topic instead of the last active thread. (#19367) Thanks @Lukavyi.
-- iOS/Signing: restore local auto-selected signing-team overrides during iOS project generation by wiring `.local-signing.xcconfig` into the active signing config and emitting `OPENCLAW_DEVELOPMENT_TEAM` in local signing setup. (#19993) Thanks @ngutman.
-- Commands/Doctor: avoid rewriting invalid configs with new `gateway.auth.token` defaults during repair and only write when real config changes are detected, preventing accidental token duplication and backup churn.
-- Sandbox/Registry: serialize container and browser registry writes with shared file locks and atomic replacement to prevent lost updates and delete rollback races from desyncing `sandbox list`, `prune`, and `recreate --all`. Thanks @kexinoh.
-- Security/Exec: require `tools.exec.safeBins` binaries to resolve from trusted bin directories (system defaults plus gateway startup `PATH`) so PATH-hijacked trojan binaries cannot bypass allowlist checks. Thanks @jackhax for reporting.
-- Security/Browser: route browser URL navigation through one SSRF-guarded validation path for tab-open/CDP-target/Playwright navigation flows and block private/metadata destinations by default (configurable via `browser.ssrfPolicy`). This ships in the next npm release. Thanks @dorjoos for reporting.
-- Security/Exec: for the next npm release, harden safe-bin stdin-only enforcement by blocking output/recursive flags (`sort -o/--output`, grep recursion) and tightening default safe bins to remove `sort`/`grep`, preventing safe-bin allowlist bypass for file writes/recursive reads. Thanks @nedlir for reporting.
-- Cron/Webhooks: protect cron webhook POST delivery with SSRF-guarded outbound fetch (`fetchWithSsrFGuard`) to block private/metadata destinations before request dispatch. Thanks @Adam55A-code.
-- Security/Net: block SSRF bypass via NAT64 (`64:ff9b::/96`, `64:ff9b:1::/48`), 6to4 (`2002::/16`), and Teredo (`2001:0000::/32`) IPv6 transition addresses, and fail closed on IPv6 parse errors. Thanks @jackhax.
-
-## 2026.2.17
-
-### Changes
-
-- Agents/Anthropic: add opt-in 1M context beta header support for Opus/Sonnet via model `params.context1m: true` (maps to `anthropic-beta: context-1m-2025-08-07`).
-- Agents/Models: support Anthropic Sonnet 4.6 (`anthropic/claude-sonnet-4-6`) across aliases/defaults with forward-compat fallback when upstream catalogs still only expose Sonnet 4.5.
-- Commands/Subagents: add `/subagents spawn` for deterministic subagent activation from chat commands. (#18218) Thanks @JoshuaLelon.
-- Agents/Subagents: add an accepted response note for `sessions_spawn` explaining polling subagents are disabled for one-off calls. Thanks @tyler6204.
-- Agents/Subagents: prefix spawned subagent task messages with context to preserve source information in downstream handling. Thanks @tyler6204.
-- iOS/Share: add an iOS share extension that forwards shared URL/text/image content directly to gateway `agent.request`, with delivery-route fallback and optional receipt acknowledgements. (#19424) Thanks @mbelinky.
-- iOS/Talk: add a `Background Listening` toggle that keeps Talk Mode active while the app is backgrounded (off by default for battery safety). Thanks @zeulewan.
-- iOS/Talk: add a `Voice Directive Hint` toggle for Talk Mode prompts so users can disable ElevenLabs voice-switching instructions to save tokens when not needed. (#18250) Thanks @zeulewan.
-- iOS/Talk: harden barge-in behavior by disabling interrupt-on-speech when output route is built-in speaker/receiver, reducing false interruptions from local TTS bleed-through. Thanks @zeulewan.
-- Slack: add native single-message text streaming with Slack `chat.startStream`/`appendStream`/`stopStream`; keep reply threading aligned with `replyToMode`, default streaming to enabled, and fall back to normal delivery when streaming fails. (#9972) Thanks @natedenh.
-- Slack: add configurable streaming modes for draft previews. (#18555) Thanks @Solvely-Colin.
-- Telegram/Agents: add inline button `style` support (`primary|success|danger`) across message tool schema, Telegram action parsing, send pipeline, and runtime prompt guidance. (#18241) Thanks @obviyus.
-- Telegram: surface user message reactions as system events, with configurable `channels.telegram.reactionNotifications` scope. (#10075) Thanks @Glucksberg.
-- iMessage: support `replyToId` on outbound text/media sends and normalize leading `[[reply_to:<id>]]` tags so replies target the intended iMessage. Thanks @tyler6204.
-- Tool Display/Web UI: add intent-first tool detail views and exec summaries. (#18592) Thanks @xdLawless2.
-- Discord: expose native `/exec` command options (host/security/ask/node) so Discord slash commands get autocomplete and structured inputs. Thanks @thewilloftheshadow.
-- Discord: allow reusable interactive components with `components.reusable=true` so buttons, selects, and forms can be used multiple times before expiring. Thanks @thewilloftheshadow.
-- Discord: add per-button `allowedUsers` allowlist for interactive components to restrict who can click buttons. Thanks @thewilloftheshadow.
-- Cron/Gateway: separate per-job webhook delivery (`delivery.mode = "webhook"`) from announce delivery, enforce valid HTTP(S) webhook URLs, and keep a temporary legacy `notify + cron.webhook` fallback for stored jobs. (#17901) Thanks @advaitpaliwal.
-- Cron/CLI: add deterministic default stagger for recurring top-of-hour cron schedules (including 6-field seconds cron), auto-migrate existing jobs to persisted `schedule.staggerMs`, and add `openclaw cron add/edit --stagger <duration>` plus `--exact` overrides for per-job timing control.
-- Cron: log per-run model/provider usage telemetry in cron run logs/webhooks and add a local usage report script for aggregating token usage by job. (#18172) Thanks @HankAndTheCrew.
-- Tools/Web: add URL allowlists for `web_search` and `web_fetch`. (#18584) Thanks @smartprogrammer93.
-- Browser: add `extraArgs` config for custom Chrome launch arguments. (#18443) Thanks @JayMishra-source.
-- Voice Call: pre-cache inbound greeting TTS for faster first playback. (#18447) Thanks @JayMishra-source.
-- Skills: compact skill file `<location>` paths in the system prompt by replacing home-directory prefixes with `~`, and add targeted compaction tests for prompt serialization behavior. (#14776) Thanks @bitfish3.
-- Skills: refine skill-description routing boundaries with explicit "Use when"/"NOT for" guidance for coding-agent/github/weather, and clarify PTY/browser fallback wording. (#14577) Thanks @DylanWoodAkers.
-- Auto-reply/Prompts: include trusted inbound `message_id` in conversation metadata payloads for downstream targeting workflows. Thanks @tyler6204.
-- Auto-reply: include `sender_id` in trusted inbound metadata so moderation workflows can target the sender without relying on untrusted text. (#18303) Thanks @crimeacs.
-- UI/Sessions: avoid duplicating typed session prefixes in display names (for example `Subagent Subagent ...`). Thanks @tyler6204.
-- Agents/Z.AI: enable `tool_stream` by default for real-time tool call streaming, with opt-out via `params.tool_stream: false`. (#18173) Thanks @tianxiao1430-jpg.
-- Plugins: add `before_agent_start` model/provider overrides before resolution. (#18568) Thanks @natefikru.
-- Mattermost: add emoji reaction actions plus reaction event notifications, including an explicit boolean `remove` flag to avoid accidental removals. (#18608) Thanks @echo931.
-- Memory/Search: add FTS fallback plus query expansion for memory search. (#18304) Thanks @irchelper.
-- Agents/Models: support per-model `thinkingDefault` overrides in model config. (#18152) Thanks @wu-tian807.
-- Agents: enable `llms.txt` discovery in default behavior. (#18158) Thanks @yolo-maxi.
-- Extensions/Auth: add OpenAI Codex CLI auth provider integration. (#18009) Thanks @jiteshdhamaniya.
-- Feishu: add Bitable create-app/create-field tools for automation workflows. (#17963) Thanks @gaowanqi08141999.
-- Docker: add optional `OPENCLAW_INSTALL_BROWSER` build arg to preinstall Chromium + Xvfb in the Docker image, avoiding runtime Playwright installs. (#18449)
-
-### Fixes
-
-- Tests/Telegram: add regression coverage for command-menu sync that asserts all `setMyCommands` entries are Telegram-safe and hyphen-normalized across native/custom/plugin command sources. (#19703) Thanks @obviyus.
-- Agents/Image: collapse resize diagnostics to one line per image and include visible pixel/byte size details in the log message for faster triage.
-- Agents/Subagents: preemptively guard accumulated tool-result context before model calls by truncating oversized outputs and compacting oldest tool-result messages to avoid context-window overflow crashes. Thanks @tyler6204.
-- Agents/Subagents/CLI: fail `sessions_spawn` when subagent model patching is rejected, allow subagent model patch defaults from `subagents.model`, and keep `sessions list`/`status` model reporting aligned to runtime model resolution. (#18660) Thanks @robbyczgw-cla.
-- Agents/Subagents: add explicit subagent guidance to recover from `[compacted: tool output removed to free context]` / `[truncated: output exceeded context limit]` markers by re-reading with smaller chunks instead of full-file `cat`. Thanks @tyler6204.
-- Agents/Tools: make `read` auto-page across chunks (when no explicit `limit` is provided) and scale its per-call output budget from model `contextWindow`, so larger contexts can read more before context guards kick in. Thanks @tyler6204.
-- Agents/Tools: strip duplicated `read` truncation payloads from tool-result `details` and make pre-call context guarding account for heavy tool-result metadata, so repeated `read` calls no longer bypass compaction and overflow model context windows. Thanks @tyler6204.
-- Reply threading: keep reply context sticky across streamed/split chunks and preserve `replyToId` on all chunk sends across shared and channel-specific delivery paths (including iMessage, BlueBubbles, Telegram, Discord, and Matrix), so follow-up bubbles stay attached to the same referenced message. Thanks @tyler6204.
-- Gateway/Agent: defer transient lifecycle `error` snapshots with a short grace window so `agent.wait` does not resolve early during retry/failover. Thanks @tyler6204.
-- Gateway/Presence: centralize presence snapshot broadcasts and unify runtime version precedence (`OPENCLAW_VERSION` > `OPENCLAW_SERVICE_VERSION` > `npm_package_version`) so self-presence and websocket `hello-ok` report consistent versions.
-- Hooks/Automation: bridge outbound/inbound message lifecycle into internal hook events (`message:received`, `message:sent`) with session-key correlation guards, while keeping per-payload success/error reporting accurate for chunked and best-effort deliveries. (PR #9387)
-- Media understanding: honor `agents.defaults.imageModel` during auto-discovery so implicit image analysis uses configured primary/fallback image models. (PR #7607)
-- iOS/Onboarding: stop auth Step 3 retry-loop churn by pausing reconnect attempts on unauthorized/missing-token gateway errors and keeping auth/pairing issue state sticky during manual retry. (#19153) Thanks @mbelinky.
-- Voice-call: auto-end calls when media streams disconnect to prevent stuck active calls. (#18435) Thanks @JayMishra-source.
-- Voice call/Gateway: prevent overlapping closed-loop turn races with per-call turn locking, route transcript dedupe via source-aware fingerprints with strict cache eviction bounds, and harden `voicecall latency` stats for large logs without spread-operator stack overflow. (#19140) Thanks @mbelinky.
-- iOS/Chat: route ChatSheet RPCs through the operator session instead of the node session to avoid node-role authorization failures for `chat.history`, `chat.send`, and `sessions.list`. (#19320) Thanks @mbelinky.
-- macOS/Update: correct the Sparkle appcast version for 2026.2.15 so updates are offered again. (#18201)
-- Gateway/Auth: clear stale device-auth tokens after device token mismatch errors so re-paired clients can re-auth. (#18201)
-- Telegram: enable DM voice-note transcription with CLI fallback handling. (#18564) Thanks @thhuang.
-- Telegram/Polls: restore Telegram poll action wiring in channel handlers. (#18122) Thanks @akyourowngames.
-- WebChat: strip reply/audio directive tags from rendered chat output. (#18093) Thanks @aldoeliacim.
-- Discord: honor configured HTTP proxy for app-id and allowlist REST resolution. (#17958) Thanks @k2009.
-- BlueBubbles: add fallback path to recover outbound `message_id` from `fromMe` webhooks when platform message IDs are missing. Thanks @tyler6204.
-- BlueBubbles: match outbound message-id fallback recovery by chat identifier as well as account context. Thanks @tyler6204.
-- BlueBubbles: include sender identifier in untrusted conversation metadata for conversation info payloads. Thanks @tyler6204.
-- Security/Exec: fix the OC-09 credential-theft path via environment-variable injection. (#18048) Thanks @aether-ai-agent.
-- Security/Config: confine `$include` resolution to the top-level config directory, harden traversal/symlink checks with cross-platform-safe path containment, and add doctor hints for invalid escaped include paths. (#18652) Thanks @aether-ai-agent.
-- Security/Net: block SSRF bypass via ISATAP embedded IPv4 transition addresses and centralize hostname/IP blocking checks across URL safety validators. Thanks @zpbrent for reporting.
-- Providers: improve error messaging for unconfigured local `ollama`/`vllm` providers. (#18183) Thanks @arosstale.
-- TTS: surface all provider errors instead of only the last error in aggregated failures. (#17964) Thanks @ikari-pl.
-- CLI/Doctor/Configure: skip gateway auth checks for loopback-only setups. (#18407) Thanks @sggolakiya.
-- CLI/Doctor: reconcile gateway service-token drift after re-pair flows. (#18525) Thanks @norunners.
-- Process/Windows: disable detached spawn in exec runs to prevent empty command output. (#18067) Thanks @arosstale.
-- Process: gracefully terminate process trees with SIGTERM before SIGKILL. (#18626) Thanks @sauerdaniel.
-- Sessions/Windows: use atomic session-store writes to prevent context loss on Windows. (#18347) Thanks @twcwinston.
-- Agents/Image: validate base64 image payloads before provider submission. (#18263) Thanks @sriram369.
-- Models CLI: validate catalog entries in `openclaw models set`. (#18129) Thanks @carrotRakko.
-- Usage: isolate last-turn totals in token usage reporting to avoid mixed-turn totals. (#18052) Thanks @arosstale.
-- Cron: resolve `accountId` from agent bindings in isolated sessions. (#17996) Thanks @simonemacario.
-- Gateway/HTTP: preserve unbracketed IPv6 `Host` headers when normalizing requests. (#18061) Thanks @Clawborn.
-- Sandbox: fix workspace-directory orphaning during SHA-1 -> SHA-256 slug migration. (#18523) Thanks @yinghaosang.
-- Ollama/Qwen: handle Qwen 3 reasoning field format in Ollama responses. (#18631) Thanks @mr-sk.
-- OpenAI/Transcripts: always drop orphaned reasoning blocks from transcript repair. (#18632) Thanks @TySabs.
-- Fix types in all tests. Typecheck the whole repository.
-- Gateway/Channels: wire `gateway.channelHealthCheckMinutes` into strict config validation, treat implicit account status as managed for health checks, and harden channel auto-restart flow (preserve restart-attempt caps across crash loops, propagate enabled/configured runtime flags, and stop pending restart backoff after manual stop). Thanks @steipete.
-- Gateway/WebChat: hard-cap `chat.history` oversized payloads by truncating high-cost fields and replacing over-budget entries with placeholders, so history fetches stay within configured byte limits and avoid chat UI freezes. (#18505)
-- UI/Usage: replace lingering undefined `var(--text-muted)` usage with `var(--muted)` in usage date-range and chart styles to keep muted text visible across themes. (#17975) Thanks @jogelin.
-- UI/Usage: preserve selected-range totals when timeline data is downsampled by bucket-aggregating timeseries points (instead of dropping intermediate points), so filtered tokens/cost stay accurate. (#17959) Thanks @jogelin.
-- UI/Sessions: refresh the sessions table only after successful deletes and preserve delete errors on cancel/failure paths, so deleted sessions disappear automatically without masking delete failures. (#18507)
-- Scripts/UI/Windows: fix `pnpm ui:*` spawn `EINVAL` failures by restoring shell-backed launch for `.cmd`/`.bat` runners, narrowing shell usage to launcher types that require it, and rejecting unsafe forwarded shell metacharacters in UI script args. (#18594)
-- Hooks/Session-memory: recover `/new` conversation summaries when session pointers are reset-path or missing `sessionFile`, and consistently prefer the newest `.jsonl.reset.*` transcript candidate for fallback extraction. (#18088)
-- Auto-reply/Sessions: prevent stale thread ID leakage into non-thread sessions so replies stay in the main DM after topic interactions. (#18528) Thanks @j2h4u.
-- Slack: restrict forwarded-attachment ingestion to explicit shared-message attachments and skip non-Slack forwarded `image_url` fetches, preventing non-forward attachment unfurls from polluting inbound agent context while preserving forwarded message handling.
-- Feishu: detect bot mentions in post messages with embedded docs when `message.mentions` is empty. (#18074) Thanks @popomore.
-- Agents/Sessions: align session lock watchdog hold windows with run and compaction timeout budgets (plus grace), preventing valid long-running turns from being force-unlocked mid-run while still recovering hung lock owners. (#18060)
-- Cron: preserve default model fallbacks for cron agent runs when only `model.primary` is overridden, so failover still follows configured fallbacks unless explicitly cleared with `fallbacks: []`. (#18210) Thanks @mahsumaktas.
-- Cron: route text-only announce output through the main session announce flow via runSubagentAnnounceFlow so cron text-only output remains visible to the initiating session. Thanks @tyler6204.
-- Cron: treat `timeoutSeconds: 0` as no-timeout (not clamped to 1), ensuring long-running cron runs are not prematurely terminated. Thanks @tyler6204.
-- Cron announce injection now targets the session determined by delivery config (`to` + channel) instead of defaulting to the current session. Thanks @tyler6204.
-- Cron/Heartbeat: canonicalize session-scoped reminder `sessionKey` routing and preserve explicit flat `sessionKey` cron tool inputs, preventing enqueue/wake namespace drift for session-targeted reminders. (#18637) Thanks @vignesh07.
-- Cron/Webhooks: reuse existing session IDs for webhook/cron runs when the session key is stable and still fresh, preserving conversation history. (#18031) Thanks @Operative-001.
-- Cron: prevent spin loops when cron jobs complete within the scheduled second by advancing the next run and enforcing a minimum refire gap. (#18073) Thanks @widingmarcus-cyber.
-- OpenClawKit/iOS ChatUI: accept canonical session-key completion events for local pending runs and preserve message IDs across history refreshes, preventing stuck "thinking" state and message flicker after gateway replies. (#18165) Thanks @mbelinky.
-- iOS/Onboarding: add QR-first onboarding wizard with setup-code deep link support, pairing/auth issue guidance, and device-pair QR generation improvements for Telegram/Web/TUI fallback flows. (#18162) Thanks @mbelinky and @Marvae.
-- iOS/Gateway: stabilize connect/discovery state handling, add onboarding reset recovery in Settings, and fix iOS gateway-controller coverage for command-surface and last-connection persistence behavior. (#18164) Thanks @mbelinky.
-- iOS/Talk: harden mobile talk config handling by ignoring redacted/env-placeholder API keys, support secure local keychain override, improve accessibility motion/contrast behavior in status UI, and tighten ATS to local-network allowance. (#18163) Thanks @mbelinky.
-- iOS/Location: restore the significant location monitor implementation (service hooks + protocol surface + ATS key alignment) after merge drift so iOS builds compile again. (#18260) Thanks @ngutman.
-- iOS/Signing: auto-select local Apple Development team during iOS project generation/build, prefer the canonical OpenClaw team when available, and support local per-machine signing overrides without committing team IDs. (#18421) Thanks @ngutman.
-- Discord/Telegram: make per-account message action gates effective for both action listing and execution, and preserve top-level gate restrictions when account overrides only specify a subset of `actions` keys (account key -> base key -> default fallback). (#18494)
-- Telegram: keep DM-topic replies and draft previews in the originating private-chat topic by preserving positive `message_thread_id` values for DM threads. (#18586) Thanks @sebslight.
-- Telegram: preserve private-chat topic `message_thread_id` on outbound sends (message/sticker/poll), keep thread-not-found retry fallback, and avoid masking `chat not found` routing errors. (#18993) Thanks @obviyus.
-- Discord: prevent duplicate media delivery when the model uses the `message send` tool with media, by skipping media extraction from messaging tool results since the tool already sent the message directly. (#18270)
-- Discord: route `audioAsVoice` auto-replies through the voice message API so opt-in audio renders as voice messages. (#18041) Thanks @zerone0x.
-- Discord: skip auto-thread creation in forum/media/voice/stage channels and keep group session last-route metadata fresh to avoid invalid thread API errors and lost follow-up sends. (#18098) Thanks @Clawborn.
-- Discord/Commands: normalize `commands.allowFrom` entries with `user:`/`discord:`/`pk:` prefixes and `<@id>` mentions so command authorization matches Discord allowlist behavior. (#18042)
-- Telegram: keep draft-stream preview replies attached to the user message for `replyToMode: "all"` in groups and DMs, preserving threaded reply context from preview through finalization. (#17880) Thanks @yinghaosang.
-- Telegram: prevent streaming final replies from being overwritten by later final/error payloads, and suppress fallback tool-error warnings when a recovered assistant answer already exists after tool calls. (#17883) Thanks @Marvae and @obviyus.
-- Telegram: debounce the first draft-stream preview update (30-char threshold) and finalize short responses by editing the stop-time preview message, improving first push notifications and avoiding duplicate final sends. (#18148) Thanks @Marvae.
-- Telegram: disable block streaming when `channels.telegram.streamMode` is `off`, preventing newline/content-block replies from splitting into multiple messages. (#17679) Thanks @saivarunk.
-- Telegram: keep `streamMode: "partial"` draft previews in a single message across assistant-message/reasoning boundaries, preventing duplicate preview bubbles during partial-mode tool-call turns. (#18956) Thanks @obviyus.
-- Telegram: normalize native command names for Telegram menu registration (`-` -> `_`) to avoid `BOT_COMMAND_INVALID` command-menu wipeouts, and log failed command syncs instead of silently swallowing them. (#19257) Thanks @akramcodez.
-- Telegram: route non-abort slash commands on the normal chat/topic sequential lane while keeping true abort requests (`/stop`, `stop`) on the control lane, preventing command/reply race conditions from control-lane bypass. (#17899) Thanks @obviyus.
-- Telegram: ignore `<media:...>` placeholder lines when extracting `MEDIA:` tool-result paths, preventing false local-file reads and dropped replies. (#18510) Thanks @yinghaosang.
-- Telegram: skip retries when inbound media `getFile` fails with Telegram's 20MB limit and continue processing message text, avoiding dropped messages for oversized attachments. (#18531) Thanks @brandonwise.
-- Telegram: clear stored polling offsets when bot tokens change or accounts are deleted, preventing stale offsets after token rotations. (#18233)
-- Telegram: enable `autoSelectFamily` by default on Node.js 22+ so IPv4 fallback works on broken IPv6 networks. (#18272) Thanks @nacho9900.
-- Auto-reply/TTS: keep tool-result media delivery enabled in group chats and native command sessions (while still suppressing tool summary text) so `NO_REPLY` follow-ups do not drop successful TTS audio. (#17991) Thanks @zerone0x.
-- Agents/Tools: deliver tool-result media even when verbose tool output is off so media attachments are not dropped. (#16679)
-- Discord: optimize reaction notification handling to skip unnecessary message fetches in `off`/`all`/`allowlist` modes, streamline reaction routing, and improve reaction emoji formatting. (#18248) Thanks @thewilloftheshadow and @victorGPT.
-- CLI/Pairing: make `openclaw qr --remote` prefer `gateway.remote.url` over tailscale/public URL resolution and register the `openclaw clawbot qr` legacy alias path. (#18091)
-- CLI/QR: restore fail-fast validation for `openclaw qr --remote` when neither `gateway.remote.url` nor tailscale `serve`/`funnel` is configured, preventing unusable remote pairing QR flows. (#18166) Thanks @mbelinky.
-- CLI: fix parent/subcommand option collisions across gateway, daemon, update, ACP, and browser command flows, while preserving legacy `browser set headers --json <payload>` compatibility.
-- CLI/Doctor: ensure `openclaw doctor --fix --non-interactive --yes` exits promptly after completion so one-shot automation no longer hangs. (#18502)
-- CLI/Doctor: auto-repair `dmPolicy="open"` configs missing wildcard allowlists and write channel-correct repair paths (including `channels.googlechat.dm.allowFrom`) so `openclaw doctor --fix` no longer leaves Google Chat configs invalid after attempted repair. (#18544)
-- CLI/Doctor: detect gateway service token drift when the gateway token is only provided via environment variables, keeping service repairs aligned after token rotation.
-- Gateway/Update: prevent restart crash loops after failed self-updates by restarting only on successful updates, stopping early on failed install/build steps, and running `openclaw doctor --fix` during updates to sanitize config. (#18131) Thanks @RamiNoodle733.
-- Gateway/Update: preserve update.run restart delivery context so post-update status replies route back to the initiating channel/thread. (#18267) Thanks @yinghaosang.
-- CLI/Update: run a standalone restart helper after updates, honoring service-name overrides and reporting restart initiation separately from confirmed restarts. (#18050)
-- CLI/Daemon: warn when a gateway restart sees a stale service token so users can reinstall with `openclaw gateway install --force`, and skip drift warnings for non-gateway service restarts. (#18018)
-- CLI/Daemon: prefer the active version-manager Node when installing daemons and include macOS version-manager bin directories in the service PATH so launchd services resolve user-managed runtimes.
-- CLI/Status: fix `openclaw status --all` token summaries for bot-token-only channels so Mattermost/Zalo no longer show a bot+app warning. (#18527) Thanks @echo931.
-- CLI/Configure: make the `/model picker` allowlist prompt searchable with tokenized matching in `openclaw configure` so users can filter huge model lists by typing terms like `gpt-5.2 openai/`. (#19010) Thanks @bjesuiter.
-- CLI/Message: preserve `--components` JSON payloads in `openclaw message send` so Discord component payloads are no longer dropped. (#18222) Thanks @saurabhchopade.
-- Voice Call: add an optional stale call reaper (`staleCallReaperSeconds`) to end stuck calls when enabled. (#18437)
-- Auto-reply/Subagents: propagate group context (`groupId`, `groupChannel`, `space`) when spawning via `/subagents spawn`, matching tool-triggered subagent spawn behavior.
-- Subagents: route nested announce results back to the parent session after the parent run ends, falling back only when the parent session is deleted. (#18043) Thanks @tyler6204.
-- Subagents: cap announce retry loops with max attempts and expiry to prevent infinite retry spam after deferred announces. (#18444)
-- Agents/Tools/exec: add a preflight guard that detects likely shell env var injection (e.g. `$DM_JSON`, `$TMPDIR`) in Python/Node scripts before execution, preventing recurring cron failures and wasted tokens when models emit mixed shell+language source. (#12836)
-- Agents/Tools/exec: treat normal non-zero exit codes as completed and append the exit code to tool output to avoid false tool-failure warnings. (#18425)
-- Agents/Tools: make loop detection progress-aware and phased by hard-blocking known `process(action=poll|log)` no-progress loops, warning on generic identical-call repeats, warning + no-progress-blocking ping-pong alternation loops (10/20), coalescing repeated warning spam into threshold buckets (including canonical ping-pong pairs), adding a global circuit breaker at 30 no-progress repeats, and emitting structured diagnostic `tool.loop` warning/error events for loop actions. (#16808) Thanks @akramcodez and @beca-oc.
-- Agents/Hooks: preserve the `before_tool_call` wrapped-marker across abort-signal tool wrapping so the hook runs once per tool call in normal agent sessions. (#16852) Thanks @sreuter.
-- Agents/Tests: add `before_message_write` persistence regression coverage for block/mutate behavior (including synthetic tool-result flushes) and thrown-hook fallback persistence. (#18197) Thanks @shakkernerd
-- Agents/Tools: scope the `message` tool schema to the active channel so Telegram uses `buttons` and Discord uses `components`. (#18215) Thanks @obviyus.
-- Agents/Image tool: replace Anthropic-incompatible union schema with explicit `image` (single) and `images` (multi) parameters, keeping tool schemas `anyOf`/`oneOf`/`allOf`-free while preserving multi-image analysis support. (#18551, #18566) Thanks @aldoeliacim.
-- Agents/Models: probe the primary model when its auth-profile cooldown is near expiry (with per-provider throttling), so runs recover from temporary rate limits without staying on fallback models until restart. (#17478) Thanks @PlayerGhost.
-- Agents/Failover: classify provider abort stop-reason errors (`Unhandled stop reason: abort`, `stop reason: abort`, `reason: abort`) as timeout-class failures so configured model fallback chains trigger instead of surfacing raw abort failures. (#18618) Thanks @sauerdaniel.
-- Models/CLI: sync auth-profiles credentials into agent `auth.json` before registry availability checks so `openclaw models list --all` reports auth correctly for API-key/token providers, normalize provider-id aliases when bridging credentials, and skip expired token mirrors. (#18610, #18615)
-- Agents/Context: raise default total bootstrap prompt cap from `24000` to `150000` chars (keeping `bootstrapMaxChars` at `20000`), include total-cap visibility in `/context`, and mark truncation from injected-vs-raw sizes so total-cap clipping is reflected accurately.
-- Memory/QMD: scope managed collection names per agent and precreate glob-backed collection directories before registration, preventing cross-agent collection clobbering and startup ENOENT failures in fresh workspaces. (#17194) Thanks @jonathanadams96.
-- Cron: preserve per-job schedule-error isolation in post-run maintenance recompute so malformed sibling jobs no longer abort persistence of successful runs. (#17852) Thanks @pierreeurope.
-- Gateway/Config: prevent `config.patch` object-array merges from falling back to full-array replacement when some patch entries lack `id`, so partial `agents.list` updates no longer drop unrelated agents. (#17989) Thanks @stakeswky.
-- Gateway/Auth: trim whitespace around trusted proxy entries before matching so configured proxies with stray spaces still authorize. (#18084) Thanks @Clawborn.
-- Config/Discord: require string IDs in Discord allowlists, keep onboarding inputs string-only, and add doctor repair for numeric entries. (#18220) Thanks @thewilloftheshadow.
-- Security/Sessions: create new session transcript JSONL files with user-only (`0o600`) permissions and extend `openclaw security audit --fix` to remediate existing transcript file permissions.
-- Sessions/Maintenance: archive transcripts when pruning stale sessions, clean expired media in subdirectories, and purge `.deleted` transcript archives after the prune window to prevent disk leaks. (#18538)
-- Infra/Fetch: ensure foreign abort-signal listener cleanup never masks original fetch successes/failures, while still preventing detached-finally unhandled rejection noise in `wrapFetchWithAbortSignal`. Thanks @Jackten.
-- Heartbeat: allow suppressing tool error warning payloads during heartbeat runs via a new heartbeat config flag. (#18497) Thanks @thewilloftheshadow.
-- Heartbeat: include sender metadata (From/To/Provider) in heartbeat prompts so model context matches the delivery target. (#18532) Thanks @dinakars777.
-- Heartbeat/Telegram: strip configured `responsePrefix` before heartbeat ack detection (with boundary-safe matching) so prefixed `HEARTBEAT_OK` replies are correctly suppressed instead of leaking into DMs. (#18602)
-
-## 2026.2.15
+## 2026.2.16 (Unreleased)
 
 ### Changes
 
@@ -254,16 +11,14 @@ Docs: https://docs.openclaw.ai
 - Plugins: expose `llm_input` and `llm_output` hook payloads so extensions can observe prompt/input context and model output usage details. (#16724) Thanks @SecondThread.
 - Subagents: nested sub-agents (sub-sub-agents) with configurable depth. Set `agents.defaults.subagents.maxSpawnDepth: 2` to allow sub-agents to spawn their own children. Includes `maxChildrenPerAgent` limit (default 5), depth-aware tool policy, and proper announce chain routing. (#14447) Thanks @tyler6204.
 - Slack/Discord/Telegram: add per-channel ack reaction overrides (account/channel-level) to support platform-specific emoji formats. (#17092) Thanks @zerone0x.
-- Telegram: add `channel_post` inbound support for channel-based bot-to-bot wake/trigger flows, with channel allowlist gating and message/media batching parity.
 - Cron/Gateway: add finished-run webhook delivery toggle (`notify`) and dedicated webhook auth token support (`cron.webhookToken`) for outbound cron webhook posts. (#14535) Thanks @advaitpaliwal.
+- Cron/Gateway: separate per-job webhook delivery (`delivery.mode = "webhook"`) from announce delivery, enforce valid HTTP(S) webhook URLs, and keep a temporary legacy `notify + cron.webhook` fallback for stored jobs. (#17901) Thanks @advaitpaliwal.
 - Channels: deduplicate probe/token resolution base types across core + extensions while preserving per-channel error typing. (#16986) Thanks @iyoda and @thewilloftheshadow.
-- Memory: add MMR (Maximal Marginal Relevance) re-ranking for hybrid search diversity. Configurable via `memorySearch.query.hybrid.mmr`. Thanks @rodrigouroz.
-- Memory: add opt-in temporal decay for hybrid search scoring, with configurable half-life via `memorySearch.query.hybrid.temporalDecay`. Thanks @rodrigouroz.
 
 ### Fixes
 
-- Discord: send initial content when creating non-forum threads so `thread-create` content is delivered. (#18117) Thanks @zerone0x.
 - Security: replace deprecated SHA-1 sandbox configuration hashing with SHA-256 for deterministic sandbox cache identity and recreation checks. Thanks @kexinoh.
+- Security/Sessions: create new session transcript JSONL files with user-only (`0o600`) permissions and extend `openclaw security audit --fix` to remediate existing transcript file permissions.
 - Security/Logging: redact Telegram bot tokens from error messages and uncaught stack traces to prevent accidental secret leakage into logs. Thanks @aether-ai-agent.
 - Sandbox/Security: block dangerous sandbox Docker config (bind mounts, host networking, unconfined seccomp/apparmor) to prevent container escape via config injection. Thanks @aether-ai-agent.
 - Sandbox: preserve array order in config hashing so order-sensitive Docker/browser settings trigger container recreation correctly. Thanks @kexinoh.
@@ -273,12 +28,13 @@ Docs: https://docs.openclaw.ai
 - Skills/Security: restrict `download` installer `targetDir` to the per-skill tools directory to prevent arbitrary file writes. Thanks @Adam55A-code.
 - Skills/Linux: harden go installer fallback on apt-based systems by handling root/no-sudo environments safely, doing best-effort apt index refresh, and returning actionable errors instead of failing with spawn errors. (#17687) Thanks @mcrolly.
 - Web Fetch/Security: cap downloaded response body size before HTML parsing to prevent memory exhaustion from oversized or deeply nested pages. Thanks @xuemian168.
+- Infra/Fetch: ensure foreign abort-signal listener cleanup never masks original fetch successes/failures, while still preventing detached-finally unhandled rejection noise in `wrapFetchWithAbortSignal`. Thanks @Jackten.
 - Config/Gateway: make sensitive-key whitelist suffix matching case-insensitive while preserving `passwordFile` path exemptions, preventing accidental redaction of non-secret config values like `maxTokens` and IRC password-file paths. (#16042) Thanks @akramcodez.
+- Gateway/Config: prevent `config.patch` object-array merges from falling back to full-array replacement when some patch entries lack `id`, so partial `agents.list` updates no longer drop unrelated agents. (#17989) Thanks @stakeswky.
 - Dev tooling: harden git `pre-commit` hook against option injection from malicious filenames (for example `--force`), preventing accidental staging of ignored files. Thanks @mrthankyou.
 - Gateway/Agent: reject malformed `agent:`-prefixed session keys (for example, `agent:main`) in `agent` and `agent.identity.get` instead of silently resolving them to the default agent, preventing accidental cross-session routing. (#15707) Thanks @rodrigouroz.
 - Gateway/Chat: harden `chat.send` inbound message handling by rejecting null bytes, stripping unsafe control characters, and normalizing Unicode to NFC before dispatch. (#8593) Thanks @fr33d3m0n.
 - Gateway/Send: return an actionable error when `send` targets internal-only `webchat`, guiding callers to use `chat.send` or a deliverable channel. (#15703) Thanks @rodrigouroz.
-- Gateway/Commands: keep webchat command authorization on the internal `webchat` context instead of inferring another provider from channel allowlists, fixing dropped `/new`/`/status` commands in Control UI when channel allowlists are configured. (#7189) Thanks @karlisbergmanis-lv.
 - Control UI: prevent stored XSS via assistant name/avatar by removing inline script injection, serving bootstrap config as JSON, and enforcing `script-src 'self'`. Thanks @Adam55A-code.
 - Agents/Security: sanitize workspace paths before embedding into LLM prompts (strip Unicode control/format chars) to prevent instruction injection via malicious directory names. Thanks @aether-ai-agent.
 - Agents/Sandbox: clarify system prompt path guidance so sandbox `bash/exec` uses container paths (for example `/workspace`) while file tools keep host-bridge mapping, avoiding first-attempt path misses from host-only absolute paths in sandbox command execution. (#17693) Thanks @app/juniordevbot.
@@ -287,26 +43,29 @@ Docs: https://docs.openclaw.ai
 - Agents/OpenAI: force `store=true` for direct OpenAI Responses/Codex runs to preserve multi-turn server-side conversation state, while leaving proxy/non-OpenAI endpoints unchanged. (#16803) Thanks @mark9232 and @vignesh07.
 - Memory/FTS: make `buildFtsQuery` Unicode-aware so non-ASCII queries (including CJK) produce keyword tokens instead of falling back to vector-only search. (#17672) Thanks @KinGP5471.
 - Auto-reply/Compaction: resolve `memory/YYYY-MM-DD.md` placeholders with timezone-aware runtime dates and append a `Current time:` line to memory-flush turns, preventing wrong-year memory filenames without making the system prompt time-variant. (#17603, #17633) Thanks @nicholaspapadam-wq and @vignesh07.
-- Auth/Cooldowns: auto-expire stale auth profile cooldowns when `cooldownUntil` or `disabledUntil` timestamps have passed, and reset `errorCount` so the next transient failure does not immediately escalate to a disproportionately long cooldown. Handles `cooldownUntil` and `disabledUntil` independently. (#3604) Thanks @nabbilkhan.
 - Agents: return an explicit timeout error reply when an embedded run times out before producing any payloads, preventing silent dropped turns during slow cache-refresh transitions. (#16659) Thanks @liaosvcaf and @vignesh07.
 - Group chats: always inject group chat context (name, participants, reply guidance) into the system prompt on every turn, not just the first. Prevents the model from losing awareness of which group it's in and incorrectly using the message tool to send to the same group. (#14447) Thanks @tyler6204.
 - Browser/Agents: when browser control service is unavailable, return explicit non-retry guidance (instead of "try again") so models do not loop on repeated browser tool calls until timeout. (#17673) Thanks @austenstone.
 - Subagents: use child-run-based deterministic announce idempotency keys across direct and queued delivery paths (with legacy queued-item fallback) to prevent duplicate announce retries without collapsing distinct same-millisecond announces. (#17150) Thanks @widingmarcus-cyber.
 - Subagents/Models: preserve `agents.defaults.model.fallbacks` when subagent sessions carry a model override, so subagent runs fail over to configured fallback models instead of retrying only the overridden primary model.
-- Agents/Tools: scope the `message` tool schema to the active channel so Telegram uses `buttons` and Discord uses `components`. (#18215) Thanks @obviyus.
+- Agents/Models: probe the primary model when its auth-profile cooldown is near expiry (with per-provider throttling), so runs recover from temporary rate limits without staying on fallback models until restart. (#17478) Thanks @PlayerGhost.
 - Telegram: omit `message_thread_id` for DM sends/draft previews and keep forum-topic handling (`id=1` general omitted, non-general kept), preventing DM failures with `400 Bad Request: message thread not found`. (#10942) Thanks @garnetlyx.
 - Telegram: replace inbound `<media:audio>` placeholder with successful preflight voice transcript in message body context, preventing placeholder-only prompt bodies for mention-gated voice messages. (#16789) Thanks @Limitless2023.
 - Telegram: retry inbound media `getFile` calls (3 attempts with backoff) and gracefully fall back to placeholder-only processing when retries fail, preventing dropped voice/media messages on transient Telegram network errors. (#16154) Thanks @yinghaosang.
 - Telegram: finalize streaming preview replies in place instead of sending a second final message, preventing duplicate Telegram assistant outputs at stream completion. (#17218) Thanks @obviyus.
+- Telegram: keep draft-stream preview replies attached to the user message for `replyToMode: "all"` in groups and DMs, preserving threaded reply context from preview through finalization. (#17880) Thanks @yinghaosang.
+- Telegram: disable block streaming when `channels.telegram.streamMode` is `off`, preventing newline/content-block replies from splitting into multiple messages. (#17679) Thanks @saivarunk.
+- Telegram: route non-abort slash commands on the normal chat/topic sequential lane while keeping true abort requests (`/stop`, `stop`) on the control lane, preventing command/reply race conditions from control-lane bypass. (#17899) Thanks @obviyus.
+- Telegram: prevent streaming final replies from being overwritten by later final/error payloads, and suppress fallback tool-error warnings when a recovered assistant answer already exists after tool calls. (#17883) Thanks @Marvae and @obviyus.
 - Discord: preserve channel session continuity when runtime payloads omit `message.channelId` by falling back to event/raw `channel_id` values for routing/session keys, so same-channel messages keep history across turns/restarts. Also align diagnostics so active Discord runs no longer appear as `sessionKey=unknown`. (#17622) Thanks @shakkernerd.
 - Discord: dedupe native skill commands by skill name in multi-agent setups to prevent duplicated slash commands with `_2` suffixes. (#17365) Thanks @seewhyme.
 - Discord: ensure role allowlist matching uses raw role IDs for message routing authorization. Thanks @xinhuagu.
-- Discord: skip text-based exec approval forwarding in favor of Discord's component-based approval UI. Thanks @thewilloftheshadow.
 - Web UI/Agents: hide `BOOTSTRAP.md` in the Agents Files list after onboarding is completed, avoiding confusing missing-file warnings for completed workspaces. (#17491) Thanks @gumadeiras.
 - Memory/QMD: scope managed collection names per agent and precreate glob-backed collection directories before registration, preventing cross-agent collection clobbering and startup ENOENT failures in fresh workspaces. (#17194) Thanks @jonathanadams96.
-- Gateway/Memory: initialize QMD startup sync for every configured agent (not just the default agent), so `memory.qmd.update.onBoot` is effective across multi-agent setups. (#17663) Thanks @HenryLoenwind.
 - Auto-reply/WhatsApp/TUI/Web: when a final assistant message is `NO_REPLY` and a messaging tool send succeeded, mirror the delivered messaging-tool text into session-visible assistant output so TUI/Web no longer show `NO_REPLY` placeholders. (#7010) Thanks @Morrowind-Xie.
+- Auto-reply/TTS: keep tool-result media delivery enabled in group chats and native command sessions (while still suppressing tool summary text) so `NO_REPLY` follow-ups do not drop successful TTS audio. (#17991) Thanks @zerone0x.
 - Cron: infer `payload.kind="agentTurn"` for model-only `cron.update` payload patches, so partial agent-turn updates do not fail validation when `kind` is omitted. (#15664) Thanks @rodrigouroz.
+- Cron: preserve per-job schedule-error isolation in post-run maintenance recompute so malformed sibling jobs no longer abort persistence of successful runs. (#17852) Thanks @pierreeurope.
 - TUI: make searchable-select filtering and highlight rendering ANSI-aware so queries ignore hidden escape codes and no longer corrupt ANSI styling sequences during match highlighting. (#4519) Thanks @bee4come.
 - TUI/Windows: coalesce rapid single-line submit bursts in Git Bash into one multiline message as a fallback when bracketed paste is unavailable, preventing pasted multiline text from being split into multiple sends. (#4986) Thanks @adamkane.
 - TUI: suppress false `(no output)` placeholders for non-local empty final events during concurrent runs, preventing external-channel replies from showing empty assistant bubbles while a local run is still streaming. (#5782) Thanks @LagWizard and @vignesh07.
@@ -326,8 +85,6 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
-- CLI/Installation: fix Docker installation hangs on macOS. (#12972) Thanks @vincentkoc.
-- Models: fix antigravity opus 4.6 availability follow-up. (#12845) Thanks @vincentkoc.
 - Security/Sessions/Telegram: restrict session tool targeting by default to the current session tree (`tools.sessions.visibility`, default `tree`) with sandbox clamping, and pass configured per-account Telegram webhook secrets in webhook mode when no explicit override is provided. Thanks @aether-ai-agent.
 - CLI/Plugins: ensure `openclaw message send` exits after successful delivery across plugin-backed channels so one-shot sends do not hang. (#16491) Thanks @yinghaosang.
 - CLI/Plugins: run registered plugin `gateway_stop` hooks before `openclaw message` exits (success and failure paths), so plugin-backed channels can clean up one-shot CLI resources. (#16580) Thanks @gumadeiras.
@@ -580,7 +337,6 @@ Docs: https://docs.openclaw.ai
 - Tools/web_search: support `freshness` for the Perplexity provider by mapping `pd`/`pw`/`pm`/`py` to Perplexity `search_recency_filter` values and including freshness in the Perplexity cache key. (#15343) Thanks @echoVic.
 - Clawdock: avoid Zsh readonly variable collisions in helper scripts. (#15501) Thanks @nkelner.
 - Memory: switch default local embedding model to the QAT `embeddinggemma-300m-qat-Q8_0` variant for better quality at the same footprint. (#15429) Thanks @azade-c.
-- Docs/Discord: expand quick setup and clarify guild workspace guidance. (#20088) Thanks @pejmanjohn, @thewilloftheshadow.
 - Docs/Mermaid: remove hardcoded Mermaid init theme blocks from four docs diagrams so dark mode inherits readable theme defaults. (#15157) Thanks @heytulsiprasad.
 - Security/Pairing: generate 256-bit base64url device and node pairing tokens and use byte-safe constant-time verification to avoid token-compare edge-case failures. (#16535) Thanks @FaizanKolega, @gumadeiras.
 
@@ -650,7 +406,6 @@ Docs: https://docs.openclaw.ai
 - Browser: add Chrome launch flag `--disable-blink-features=AutomationControlled` to reduce `navigator.webdriver` automation detection issues on reCAPTCHA-protected sites. (#10735) Thanks @Milofax.
 - Heartbeat: filter noise-only system events so scheduled reminder notifications do not fire when cron runs carry only heartbeat markers. (#13317) Thanks @pvtclawn.
 - Signal: render mention placeholders as `@uuid`/`@phone` so mention gating and Clawdbot targeting work. (#2013) Thanks @alexgleason.
-- Agents/Reminders: guard reminder promises by appending a note when no `cron.add` succeeded in the turn, so users know nothing was scheduled. (#18588) Thanks @vignesh07.
 - Discord: omit empty content fields for media-only messages while preserving caption whitespace. (#9507) Thanks @leszekszpunar.
 - Onboarding/Providers: add Z.AI endpoint-specific auth choices (`zai-coding-global`, `zai-coding-cn`, `zai-global`, `zai-cn`) and expand default Z.AI model wiring. (#13456) Thanks @tomsun28.
 - Onboarding/Providers: update MiniMax API default/recommended models from M2.1 to M2.5, add M2.5/M2.5-Lightning model entries, and include `minimax-m2.5` in modern model filtering. (#14865) Thanks @adao-max.
@@ -694,7 +449,6 @@ Docs: https://docs.openclaw.ai
 
 - Commands: add `commands.allowFrom` config for separate command authorization, allowing operators to restrict slash commands to specific users while keeping chat open to others. (#12430) Thanks @thewilloftheshadow.
 - Docker: add ClawDock shell helpers for Docker workflows. (#12817) Thanks @Olshansk.
-- Gateway: periodic channel health monitor auto-restarts stuck, crashed, or silently-stopped channels. Configurable via `gateway.channelHealthCheckMinutes` (default: 5, set to 0 to disable). (#7053, #4302)
 - iOS: alpha node app + setup-code onboarding. (#11756) Thanks @mbelinky.
 - Channels: comprehensive BlueBubbles and channel cleanup. (#11093) Thanks @tyler6204.
 - Channels: IRC first-class channel support. (#11482) Thanks @vignesh07.
@@ -758,7 +512,6 @@ Docs: https://docs.openclaw.ai
 - Thinking: allow xhigh for `github-copilot/gpt-5.2-codex` and `github-copilot/gpt-5.2`. (#11646) Thanks @LatencyTDH.
 - Thinking: honor `/think off` for reasoning-capable models. (#9564) Thanks @liuy.
 - Discord: support forum/media thread-create starter messages, wire `message thread create --message`, and harden routing. (#10062) Thanks @jarvis89757.
-- Discord: download attachments from forwarded messages. (#17049) Thanks @pip-nomel, @thewilloftheshadow.
 - Paths: structurally resolve `OPENCLAW_HOME`-derived home paths and fix Windows drive-letter handling in tool meta shortening. (#12125) Thanks @mcaxtr.
 - Memory: set Voyage embeddings `input_type` for improved retrieval. (#10818) Thanks @mcinteerj.
 - Memory: disable async batch embeddings by default for memory indexing (opt-in via `agents.defaults.memorySearch.remote.batch.enabled`). (#13069) Thanks @mcinteerj.

CONTRIBUTING.md

@@ -5,7 +5,6 @@ Welcome to the lobster tank! 🦞
 ## Quick Links
 
 - **GitHub:** https://github.com/openclaw/openclaw
-- **Vision:** [`VISION.md`](VISION.md)
 - **Discord:** https://discord.gg/qkhbAGHRBT
 - **X/Twitter:** [@steipete](https://x.com/steipete) / [@openclaw](https://x.com/openclaw)
 
@@ -14,7 +13,7 @@ Welcome to the lobster tank! 🦞
 - **Peter Steinberger** - Benevolent Dictator
   - GitHub: [@steipete](https://github.com/steipete) · X: [@steipete](https://x.com/steipete)
 
-- **Shadow** - Discord subsystem, Discord admin, Clawhub, all community moderation
+- **Shadow** - Discord subsystem, Discord admin
   - GitHub: [@thewilloftheshadow](https://github.com/thewilloftheshadow) · X: [@4shad0wed](https://x.com/4shad0wed)
 
 - **Vignesh** - Memory (QMD), formal modeling, TUI, IRC, and Lobster
@@ -52,7 +51,7 @@ Welcome to the lobster tank! 🦞
 - Test locally with your OpenClaw instance
 - Run tests: `pnpm build && pnpm check && pnpm test`
 - Ensure CI checks pass
-- Keep PRs focused (one thing per PR; do not mix unrelated concerns)
+- Keep PRs focused (one thing per PR)
 - Describe what & why
 
 ## Control UI Decorators
@@ -94,26 +93,6 @@ We are currently prioritizing:
 
 Check the [GitHub Issues](https://github.com/openclaw/openclaw/issues) for "good first issue" labels!
 
-## Maintainers
-
-We're selectively expanding the maintainer team.
-If you're an experienced contributor who wants to help shape OpenClaw's direction — whether through code, docs, or community — we'd like to hear from you.
-
-Being a maintainer is a responsibility, not an honorary title. We expect active, consistent involvement — triaging issues, reviewing PRs, and helping move the project forward.
-
-Still interested? Email contributing@openclaw.ai with:
-
-- Links to your PRs on OpenClaw (if you don't have any, start there first)
-- Links to open source projects you maintain or actively contribute to
-- Your GitHub, Discord, and X/Twitter handles
-- A brief intro: background, experience, and areas of interest
-- Languages you speak and where you're based
-- How much time you can realistically commit
-
-We welcome people across all skill sets — engineering, documentation, community management, and more.
-We review every human-only-written application carefully and add maintainers slowly and deliberately.
-Please allow a few weeks for a response.
-
 ## Report a Vulnerability
 
 We take security reports seriously. Report vulnerabilities directly to the repository where the issue lives:

Dockerfile

@@ -23,19 +23,6 @@ COPY scripts ./scripts
 
 RUN pnpm install --frozen-lockfile
 
-# Optionally install Chromium and Xvfb for browser automation.
-# Build with: docker build --build-arg OPENCLAW_INSTALL_BROWSER=1 ...
-# Adds ~300MB but eliminates the 60-90s Playwright install on every container start.
-# Must run after pnpm install so playwright-core is available in node_modules.
-ARG OPENCLAW_INSTALL_BROWSER=""
-RUN if [ -n "$OPENCLAW_INSTALL_BROWSER" ]; then \
-      apt-get update && \
-      DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xvfb && \
-      node /app/node_modules/playwright-core/cli.js install --with-deps chromium && \
-      apt-get clean && \
-      rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*; \
-    fi
-
 COPY . .
 RUN pnpm build
 # Force pnpm for UI build (Bun may fail on ARM/Synology architectures)

README.md

@@ -23,7 +23,7 @@ It answers you on the channels you already use (WhatsApp, Telegram, Slack, Disco
 
 If you want a personal, single-user assistant that feels local, fast, and always-on, this is it.
 
-[Website](https://openclaw.ai) · [Docs](https://docs.openclaw.ai) · [Vision](VISION.md) · [DeepWiki](https://deepwiki.com/openclaw/openclaw) · [Getting Started](https://docs.openclaw.ai/start/getting-started) · [Updating](https://docs.openclaw.ai/install/updating) · [Showcase](https://docs.openclaw.ai/start/showcase) · [FAQ](https://docs.openclaw.ai/start/faq) · [Wizard](https://docs.openclaw.ai/start/wizard) · [Nix](https://github.com/openclaw/nix-openclaw) · [Docker](https://docs.openclaw.ai/install/docker) · [Discord](https://discord.gg/clawd)
+[Website](https://openclaw.ai) · [Docs](https://docs.openclaw.ai) · [DeepWiki](https://deepwiki.com/openclaw/openclaw) · [Getting Started](https://docs.openclaw.ai/start/getting-started) · [Updating](https://docs.openclaw.ai/install/updating) · [Showcase](https://docs.openclaw.ai/start/showcase) · [FAQ](https://docs.openclaw.ai/start/faq) · [Wizard](https://docs.openclaw.ai/start/wizard) · [Nix](https://github.com/openclaw/nix-openclaw) · [Docker](https://docs.openclaw.ai/install/docker) · [Discord](https://discord.gg/clawd)
 
 Preferred setup: run the onboarding wizard (`openclaw onboard`) in your terminal.
 The wizard guides you step by step through setting up the gateway, workspace, channels, and skills. The CLI wizard is the recommended path and works on **macOS, Linux, and Windows (via WSL2; strongly recommended)**.
@@ -546,5 +546,4 @@ Thanks to all clawtributors:
   <a href="https://github.com/0xJonHoldsCrypto"><img src="https://avatars.githubusercontent.com/u/81202085?v=4&s=48" width="48" height="48" alt="0xJonHoldsCrypto" title="0xJonHoldsCrypto"/></a> <a href="https://github.com/aaronn"><img src="https://avatars.githubusercontent.com/u/1653630?v=4&s=48" width="48" height="48" alt="aaronn" title="aaronn"/></a> <a href="https://github.com/Alphonse-arianee"><img src="https://avatars.githubusercontent.com/u/254457365?v=4&s=48" width="48" height="48" alt="Alphonse-arianee" title="Alphonse-arianee"/></a> <a href="https://github.com/atalovesyou"><img src="https://avatars.githubusercontent.com/u/3534502?v=4&s=48" width="48" height="48" alt="atalovesyou" title="atalovesyou"/></a> <a href="https://github.com/search?q=Azade"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Azade" title="Azade"/></a> <a href="https://github.com/carlulsoe"><img src="https://avatars.githubusercontent.com/u/34673973?v=4&s=48" width="48" height="48" alt="carlulsoe" title="carlulsoe"/></a> <a href="https://github.com/search?q=ddyo"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="ddyo" title="ddyo"/></a> <a href="https://github.com/search?q=Erik"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Erik" title="Erik"/></a> <a href="https://github.com/jiulingyun"><img src="https://avatars.githubusercontent.com/u/126459548?v=4&s=48" width="48" height="48" alt="jiulingyun" title="jiulingyun"/></a> <a href="https://github.com/latitudeki5223"><img src="https://avatars.githubusercontent.com/u/119656367?v=4&s=48" width="48" height="48" alt="latitudeki5223" title="latitudeki5223"/></a>
   <a href="https://github.com/search?q=Manuel%20Maly"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Manuel Maly" title="Manuel Maly"/></a> <a href="https://github.com/minghinmatthewlam"><img src="https://avatars.githubusercontent.com/u/14224566?v=4&s=48" width="48" height="48" alt="minghinmatthewlam" title="minghinmatthewlam"/></a> <a href="https://github.com/search?q=Mourad%20Boustani"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Mourad Boustani" title="Mourad Boustani"/></a> <a href="https://github.com/odrobnik"><img src="https://avatars.githubusercontent.com/u/333270?v=4&s=48" width="48" height="48" alt="odrobnik" title="odrobnik"/></a> <a href="https://github.com/pcty-nextgen-ios-builder"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="pcty-nextgen-ios-builder" title="pcty-nextgen-ios-builder"/></a> <a href="https://github.com/search?q=Quentin"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Quentin" title="Quentin"/></a> <a href="https://github.com/rafaelreis-r"><img src="https://avatars.githubusercontent.com/u/57492577?v=4&s=48" width="48" height="48" alt="rafaelreis-r" title="rafaelreis-r"/></a> <a href="https://github.com/search?q=Randy%20Torres"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Randy Torres" title="Randy Torres"/></a> <a href="https://github.com/rhjoh"><img src="https://avatars.githubusercontent.com/u/105699450?v=4&s=48" width="48" height="48" alt="rhjoh" title="rhjoh"/></a> <a href="https://github.com/search?q=Rolf%20Fredheim"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="Rolf Fredheim" title="Rolf Fredheim"/></a>
   <a href="https://github.com/ronak-guliani"><img src="https://avatars.githubusercontent.com/u/23518228?v=4&s=48" width="48" height="48" alt="ronak-guliani" title="ronak-guliani"/></a> <a href="https://github.com/search?q=William%20Stock"><img src="assets/avatar-placeholder.svg" width="48" height="48" alt="William Stock" title="William Stock"/></a>
-     <a href="https://github.com/AkashKobal"><img src="https://avatars.githubusercontent.com/u/98216083?v=4" width="48" height="48" alt="Akash Kobal" title="Akash Kobal"/></a>
 </p>

VISION.md

@@ -1,110 +0,0 @@
-## OpenClaw Vision
-
-OpenClaw is the AI that actually does things.
-It runs on your devices, in your channels, with your rules.
-
-This document explains the current state and direction of the project.
-We are still early, so iteration is fast.
-Project overview and developer docs: [`README.md`](README.md)
-Contribution guide: [`CONTRIBUTING.md`](CONTRIBUTING.md)
-
-OpenClaw started as a personal playground to learn AI and build something genuinely useful:
-an assistant that can run real tasks on a real computer.
-It evolved through several names and shells: Warelay -> Clawdbot -> Moltbot -> OpenClaw.
-
-The goal: a personal assistant that is easy to use, supports a wide range of platforms, and respects privacy and security.
-
-The current focus is:
-
-Priority:
-
-- Security and safe defaults
-- Bug fixes and stability
-- Setup reliability and first-run UX
-
-Next priorities:
-
-- Supporting all major model providers
-- Improving support for major messaging channels (and adding a few high-demand ones)
-- Performance and test infrastructure
-- Better computer-use and agent harness capabilities
-- Ergonomics across CLI and web frontend
-- Companion apps on macOS, iOS, Android, Windows, and Linux
-
-Contribution rules:
-
-- One PR = one issue/topic. Do not bundle multiple unrelated fixes/features.
-- PRs over ~5,000 changed lines are reviewed only in exceptional circumstances.
-- Do not open large batches of tiny PRs at once; each PR has review cost.
-- For very small related fixes, grouping into one focused PR is encouraged.
-
-## Security
-
-Security in OpenClaw is a deliberate tradeoff: strong defaults without killing capability.
-The goal is to stay powerful for real work while making risky paths explicit and operator-controlled.
-
-Canonical security policy and reporting:
-
-- [`SECURITY.md`](SECURITY.md)
-
-We prioritize secure defaults, but also expose clear knobs for trusted high-power workflows.
-
-## Plugins & Memory
-
-OpenClaw has an extensive plugin API.
-Core stays lean; optional capability should usually ship as plugins.
-
-Preferred plugin path is npm package distribution plus local extension loading for development.
-If you build a plugin, host and maintain it in your own repository.
-The bar for adding optional plugins to core is intentionally high.
-Plugin docs: [`docs/tools/plugin.md`](docs/tools/plugin.md)
-Community plugin listing + PR bar: https://docs.openclaw.ai/plugins/community
-
-Memory is a special plugin slot where only one memory plugin can be active at a time.
-Today we ship multiple memory options; over time we plan to converge on one recommended default path.
-
-### Skills
-
-We still ship some bundled skills for baseline UX.
-New skills should be published to ClawHub first (`clawhub.ai`), not added to core by default.
-Core skill additions should be rare and require a strong product or security reason.
-
-### MCP Support
-
-OpenClaw supports MCP through `mcporter`: https://github.com/steipete/mcporter
-
-This keeps MCP integration flexible and decoupled from core runtime:
-
-- add or change MCP servers without restarting the gateway
-- keep core tool/context surface lean
-- reduce MCP churn impact on core stability and security
-
-For now, we prefer this bridge model over building first-class MCP runtime into core.
-If there is an MCP server or feature `mcporter` does not support yet, please open an issue there.
-
-### Setup
-
-OpenClaw is currently terminal-first by design.
-This keeps setup explicit: users see docs, auth, permissions, and security posture up front.
-
-Long term, we want easier onboarding flows as hardening matures.
-We do not want convenience wrappers that hide critical security decisions from users.
-
-### Why TypeScript?
-
-OpenClaw is primarily an orchestration system: prompts, tools, protocols, and integrations.
-TypeScript was chosen to keep OpenClaw hackable by default.
-It is widely known, fast to iterate in, and easy to read, modify, and extend.
-
-## What We Will Not Merge (For Now)
-
-- New core skills when they can live on ClawHub
-- Full-doc translation sets for all docs (deferred; we plan AI-generated translations later)
-- Commercial service integrations that do not clearly fit the model-provider category
-- Wrapper channels around already supported channels without a clear capability or security gap
-- First-class MCP runtime in core when `mcporter` already provides the integration path
-- Agent-hierarchy frameworks (manager-of-managers / nested planner trees) as a default architecture
-- Heavy orchestration layers that duplicate existing agent and tool infrastructure
-
-This list is a roadmap guardrail, not a law of physics.
-Strong user demand and strong technical rationale can change it.

appcast.xml

@@ -144,7 +144,7 @@
             <title>2026.2.15</title>
             <pubDate>Mon, 16 Feb 2026 05:04:34 +0100</pubDate>
             <link>https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml</link>
-            <sparkle:version>202602150</sparkle:version>
+            <sparkle:version>11213</sparkle:version>
             <sparkle:shortVersionString>2026.2.15</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
             <description><![CDATA[<h2>OpenClaw 2026.2.15</h2>

apps/android/app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
     applicationId = "ai.openclaw.android"
     minSdk = 31
     targetSdk = 36
-    versionCode = 202602180
-    versionName = "2026.2.18"
+    versionCode = 202602160
+    versionName = "2026.2.16"
     ndk {
       // Support all major ABIs — native libs are tiny (~47 KB per ABI)
       abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")

apps/ios/.swiftlint.yml

@@ -3,7 +3,3 @@ parent_config: ../../.swiftlint.yml
 included:
   - Sources
   - ../shared/ClawdisNodeKit/Sources
-
-type_body_length:
-  warning: 900
-  error: 1300

apps/ios/Config/Signing.xcconfig

@@ -1,18 +0,0 @@
-// Shared iOS signing defaults for local development + CI.
-OPENCLAW_IOS_DEFAULT_TEAM = Y5PE65HELJ
-OPENCLAW_IOS_SELECTED_TEAM = $(OPENCLAW_IOS_DEFAULT_TEAM)
-OPENCLAW_APP_BUNDLE_ID = ai.openclaw.ios
-OPENCLAW_WATCH_APP_BUNDLE_ID = ai.openclaw.ios.watchkitapp
-OPENCLAW_WATCH_EXTENSION_BUNDLE_ID = ai.openclaw.ios.watchkitapp.extension
-
-// Local contributors can override this by running scripts/ios-configure-signing.sh.
-// Keep include after defaults: xcconfig is evaluated top-to-bottom.
-#include? "../.local-signing.xcconfig"
-#include? "../LocalSigning.xcconfig"
-
-CODE_SIGN_STYLE = Automatic
-CODE_SIGN_IDENTITY = Apple Development
-DEVELOPMENT_TEAM = $(OPENCLAW_IOS_SELECTED_TEAM)
-
-// Let Xcode manage provisioning for the selected local team.
-PROVISIONING_PROFILE_SPECIFIER =

apps/ios/LocalSigning.xcconfig.example

@@ -1,14 +0,0 @@
-// Copy to LocalSigning.xcconfig for personal local signing overrides.
-// This file is only an example and should stay committed.
-
-OPENCLAW_CODE_SIGN_STYLE = Automatic
-OPENCLAW_DEVELOPMENT_TEAM = P5Z8X89DJL
-
-OPENCLAW_APP_BUNDLE_ID = ai.openclaw.ios.test.mariano
-OPENCLAW_SHARE_BUNDLE_ID = ai.openclaw.ios.test.mariano.share
-OPENCLAW_WATCH_APP_BUNDLE_ID = ai.openclaw.ios.test.mariano.watchkitapp
-OPENCLAW_WATCH_EXTENSION_BUNDLE_ID = ai.openclaw.ios.test.mariano.watchkitapp.extension
-
-// Leave empty with automatic signing.
-OPENCLAW_APP_PROFILE =
-OPENCLAW_SHARE_PROFILE =

apps/ios/README.md

@@ -1,110 +1,66 @@
-# OpenClaw iOS (Super Alpha)
+# OpenClaw (iOS)
 
-NO TEST FLIGHT AVAILABLE AT THIS POINT
+This is an **alpha** iOS app that connects to an OpenClaw Gateway as a `role: node`.
 
-This iPhone app is super-alpha and internal-use only. It connects to an OpenClaw Gateway as a `role: node`.
+Expect rough edges:
 
-## Distribution Status
+- UI and onboarding are changing quickly.
+- Background behavior is not stable yet (foreground app is the supported mode right now).
+- Permissions are opt-in and the app should be treated as sensitive while we harden it.
 
-NO TEST FLIGHT AVAILABLE AT THIS POINT
+## What It Does
 
-- Current distribution: local/manual deploy from source via Xcode.
-- App Store flow is not part of the current internal development path.
+- Connects to a Gateway over `ws://` / `wss://`
+- Pairs a new device (approved from your bot)
+- Exposes phone services as node commands (camera, location, photos, calendar, reminders, etc; gated by iOS permissions)
+- Provides Talk + Chat surfaces (alpha)
 
-## Super-Alpha Disclaimer
+## Pairing (Recommended Flow)
 
-- Breaking changes are expected.
-- UI and onboarding flows can change without migration guarantees.
-- Foreground use is the only reliable mode right now.
-- Treat this build as sensitive while permissions and background behavior are still being hardened.
+If your Gateway has the `device-pair` plugin installed:
 
-## Exact Xcode Manual Deploy Flow
+1. In Telegram, message your bot: `/pair`
+2. Copy the **setup code** message
+3. On iOS: OpenClaw → Settings → Gateway → paste setup code → Connect
+4. Back in Telegram: `/pair approve`
 
-1. Prereqs:
-   - Xcode 16+
-   - `pnpm`
-   - `xcodegen`
-   - Apple Development signing set up in Xcode
-2. From repo root:
+## Build And Run
+
+Prereqs:
+
+- Xcode (current stable)
+- `pnpm`
+- `xcodegen`
+
+From the repo root:
 
 ```bash
 pnpm install
-./scripts/ios-configure-signing.sh
-cd apps/ios
-xcodegen generate
-open OpenClaw.xcodeproj
-```
-
-3. In Xcode:
-   - Scheme: `OpenClaw`
-   - Destination: connected iPhone (recommended for real behavior)
-   - Build configuration: `Debug`
-   - Run (`Product` -> `Run`)
-4. If signing fails on a personal team:
-   - Use unique local bundle IDs via `apps/ios/LocalSigning.xcconfig`.
-   - Start from `apps/ios/LocalSigning.xcconfig.example`.
-
-Shortcut command (same flow + open project):
-
-```bash
 pnpm ios:open
 ```
 
-## APNs Expectations For Local/Manual Builds
+Then in Xcode:
 
-- The app calls `registerForRemoteNotifications()` at launch.
-- `apps/ios/Sources/OpenClaw.entitlements` sets `aps-environment` to `development`.
-- APNs token registration to gateway happens only after gateway connection (`push.apns.register`).
-- Your selected team/profile must support Push Notifications for the app bundle ID you are signing.
-- If push capability or provisioning is wrong, APNs registration fails at runtime (check Xcode logs for `APNs registration failed`).
-- Debug builds register as APNs sandbox; Release builds use production.
+1. Select the `OpenClaw` scheme
+2. Select a simulator or a connected device
+3. Run
 
-## What Works Now (Concrete)
+If you're using a personal Apple Development team, you may need to change the bundle identifier in Xcode to a unique value so signing succeeds.
 
-- Pairing via setup code flow (`/pair` then `/pair approve` in Telegram).
-- Gateway connection via discovery or manual host/port with TLS fingerprint trust prompt.
-- Chat + Talk surfaces through the operator gateway session.
-- iPhone node commands in foreground: camera snap/clip, canvas present/navigate/eval/snapshot, screen record, location, contacts, calendar, reminders, photos, motion, local notifications.
-- Share extension deep-link forwarding into the connected gateway session.
+## Build From CLI
 
-## Known Issues / Limitations / Problems
+```bash
+pnpm ios:build
+```
 
-- Foreground-first: iOS can suspend sockets in background; reconnect recovery is still being tuned.
-- Background command limits are strict: `canvas.*`, `camera.*`, `screen.*`, and `talk.*` are blocked when backgrounded.
-- Background location requires `Always` location permission.
-- Pairing/auth errors intentionally pause reconnect loops until a human fixes auth/pairing state.
-- Voice Wake and Talk contend for the same microphone; Talk suppresses wake capture while active.
-- APNs reliability depends on local signing/provisioning/topic alignment.
-- Expect rough UX edges and occasional reconnect churn during active development.
+## Tests
 
-## Current In-Progress Workstream
+```bash
+cd apps/ios
+xcodegen generate
+xcodebuild test -project OpenClaw.xcodeproj -scheme OpenClaw -destination "platform=iOS Simulator,name=iPhone 17"
+```
 
-Automatic wake/reconnect hardening:
+## Shared Code
 
-- improve wake/resume behavior across scene transitions
-- reduce dead-socket states after background -> foreground
-- tighten node/operator session reconnect coordination
-- reduce manual recovery steps after transient network failures
-
-## Debugging Checklist
-
-1. Confirm build/signing baseline:
-   - regenerate project (`xcodegen generate`)
-   - verify selected team + bundle IDs
-2. In app `Settings -> Gateway`:
-   - confirm status text, server, and remote address
-   - verify whether status shows pairing/auth gating
-3. If pairing is required:
-   - run `/pair approve` from Telegram, then reconnect
-4. If discovery is flaky:
-   - enable `Discovery Debug Logs`
-   - inspect `Settings -> Gateway -> Discovery Logs`
-5. If network path is unclear:
-   - switch to manual host/port + TLS in Gateway Advanced settings
-6. In Xcode console, filter for subsystem/category signals:
-   - `ai.openclaw.ios`
-   - `GatewayDiag`
-   - `APNs registration failed`
-7. Validate background expectations:
-   - repro in foreground first
-   - then test background transitions and confirm reconnect on return
+- `apps/shared/OpenClawKit` contains the shared transport/types used by the iOS app.

apps/ios/ShareExtension/Info.plist

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>OpenClaw Share</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2026.2.18</string>
-	<key>CFBundleVersion</key>
-	<string>20260218</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-			<key>NSExtensionActivationRule</key>
-			<dict>
-				<key>NSExtensionActivationSupportsImageWithMaxCount</key>
-				<integer>10</integer>
-				<key>NSExtensionActivationSupportsMovieWithMaxCount</key>
-				<integer>1</integer>
-				<key>NSExtensionActivationSupportsText</key>
-				<true/>
-				<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
-				<integer>1</integer>
-			</dict>
-		</dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.share-services</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>$(PRODUCT_MODULE_NAME).ShareViewController</string>
-	</dict>
-</dict>
-</plist>

apps/ios/ShareExtension/ShareViewController.swift

@@ -1,548 +0,0 @@
-import Foundation
-import OpenClawKit
-import os
-import UIKit
-import UniformTypeIdentifiers
-
-final class ShareViewController: UIViewController {
-    private struct ShareAttachment: Codable {
-        var type: String
-        var mimeType: String
-        var fileName: String
-        var content: String
-    }
-
-    private struct ExtractedShareContent {
-        var payload: SharedContentPayload
-        var attachments: [ShareAttachment]
-    }
-
-    private let logger = Logger(subsystem: "ai.openclaw.ios", category: "ShareExtension")
-    private var statusLabel: UILabel?
-    private let draftTextView = UITextView()
-    private let sendButton = UIButton(type: .system)
-    private let cancelButton = UIButton(type: .system)
-    private var didPrepareDraft = false
-    private var isSending = false
-    private var pendingAttachments: [ShareAttachment] = []
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.preferredContentSize = CGSize(width: UIScreen.main.bounds.width, height: 420)
-        self.setupUI()
-    }
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        guard !self.didPrepareDraft else { return }
-        self.didPrepareDraft = true
-        Task { await self.prepareDraft() }
-    }
-
-    private func setupUI() {
-        self.view.backgroundColor = .systemBackground
-
-        self.draftTextView.translatesAutoresizingMaskIntoConstraints = false
-        self.draftTextView.font = .preferredFont(forTextStyle: .body)
-        self.draftTextView.backgroundColor = UIColor.secondarySystemBackground
-        self.draftTextView.layer.cornerRadius = 10
-        self.draftTextView.textContainerInset = UIEdgeInsets(top: 12, left: 10, bottom: 12, right: 10)
-
-        self.sendButton.translatesAutoresizingMaskIntoConstraints = false
-        self.sendButton.setTitle("Send to OpenClaw", for: .normal)
-        self.sendButton.titleLabel?.font = .preferredFont(forTextStyle: .headline)
-        self.sendButton.addTarget(self, action: #selector(self.handleSendTap), for: .touchUpInside)
-        self.sendButton.isEnabled = false
-
-        self.cancelButton.translatesAutoresizingMaskIntoConstraints = false
-        self.cancelButton.setTitle("Cancel", for: .normal)
-        self.cancelButton.addTarget(self, action: #selector(self.handleCancelTap), for: .touchUpInside)
-
-        let buttons = UIStackView(arrangedSubviews: [self.cancelButton, self.sendButton])
-        buttons.translatesAutoresizingMaskIntoConstraints = false
-        buttons.axis = .horizontal
-        buttons.alignment = .fill
-        buttons.distribution = .fillEqually
-        buttons.spacing = 12
-
-        self.view.addSubview(self.draftTextView)
-        self.view.addSubview(buttons)
-
-        NSLayoutConstraint.activate([
-            self.draftTextView.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor, constant: 14),
-            self.draftTextView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 14),
-            self.draftTextView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -14),
-            self.draftTextView.bottomAnchor.constraint(equalTo: buttons.topAnchor, constant: -12),
-
-            buttons.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 14),
-            buttons.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -14),
-            buttons.bottomAnchor.constraint(equalTo: self.view.keyboardLayoutGuide.topAnchor, constant: -8),
-            buttons.heightAnchor.constraint(equalToConstant: 44),
-        ])
-    }
-
-    private func prepareDraft() async {
-        let traceId = UUID().uuidString
-        ShareGatewayRelaySettings.saveLastEvent("Share opened.")
-        self.showStatus("Preparing share…")
-        self.logger.info("share begin trace=\(traceId, privacy: .public)")
-        let extracted = await self.extractSharedContent()
-        let payload = extracted.payload
-        self.pendingAttachments = extracted.attachments
-        self.logger.info(
-            "share payload trace=\(traceId, privacy: .public) titleChars=\(payload.title?.count ?? 0) textChars=\(payload.text?.count ?? 0) hasURL=\(payload.url != nil) imageAttachments=\(self.pendingAttachments.count)"
-        )
-        let message = self.composeDraft(from: payload)
-        await MainActor.run {
-            self.draftTextView.text = message
-            self.sendButton.isEnabled = true
-            self.draftTextView.becomeFirstResponder()
-        }
-        if message.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-            ShareGatewayRelaySettings.saveLastEvent("Share ready: waiting for message input.")
-            self.showStatus("Add a message, then tap Send.")
-        } else {
-            ShareGatewayRelaySettings.saveLastEvent("Share ready: draft prepared.")
-            self.showStatus("Edit text, then tap Send.")
-        }
-    }
-
-    @objc
-    private func handleSendTap() {
-        guard !self.isSending else { return }
-        Task { await self.sendCurrentDraft() }
-    }
-
-    @objc
-    private func handleCancelTap() {
-        self.extensionContext?.completeRequest(returningItems: nil)
-    }
-
-    private func sendCurrentDraft() async {
-        let message = await MainActor.run { self.draftTextView.text ?? "" }
-        let trimmed = message.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else {
-            ShareGatewayRelaySettings.saveLastEvent("Share blocked: message is empty.")
-            self.showStatus("Message is empty.")
-            return
-        }
-
-        await MainActor.run {
-            self.isSending = true
-            self.sendButton.isEnabled = false
-            self.cancelButton.isEnabled = false
-        }
-        self.showStatus("Sending to OpenClaw gateway…")
-        ShareGatewayRelaySettings.saveLastEvent("Sending to gateway…")
-        do {
-            try await self.sendMessageToGateway(trimmed, attachments: self.pendingAttachments)
-            ShareGatewayRelaySettings.saveLastEvent(
-                "Sent to gateway (\(trimmed.count) chars, \(self.pendingAttachments.count) attachment(s)).")
-            self.showStatus("Sent to OpenClaw.")
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.45) {
-                self.extensionContext?.completeRequest(returningItems: nil)
-            }
-        } catch {
-            self.logger.error("share send failed reason=\(error.localizedDescription, privacy: .public)")
-            ShareGatewayRelaySettings.saveLastEvent("Send failed: \(error.localizedDescription)")
-            self.showStatus("Send failed: \(error.localizedDescription)")
-            await MainActor.run {
-                self.isSending = false
-                self.sendButton.isEnabled = true
-                self.cancelButton.isEnabled = true
-            }
-        }
-    }
-
-    private func sendMessageToGateway(_ message: String, attachments: [ShareAttachment]) async throws {
-        guard let config = ShareGatewayRelaySettings.loadConfig() else {
-            throw NSError(
-                domain: "OpenClawShare",
-                code: 10,
-                userInfo: [NSLocalizedDescriptionKey: "OpenClaw is not connected to a gateway yet."])
-        }
-        guard let url = URL(string: config.gatewayURLString) else {
-            throw NSError(
-                domain: "OpenClawShare",
-                code: 11,
-                userInfo: [NSLocalizedDescriptionKey: "Invalid saved gateway URL."])
-        }
-
-        let gateway = GatewayNodeSession()
-        defer {
-            Task { await gateway.disconnect() }
-        }
-        let makeOptions: (String) -> GatewayConnectOptions = { clientId in
-            GatewayConnectOptions(
-                role: "node",
-                scopes: [],
-                caps: [],
-                commands: [],
-                permissions: [:],
-                clientId: clientId,
-                clientMode: "node",
-                clientDisplayName: "OpenClaw Share",
-                includeDeviceIdentity: false)
-        }
-
-        do {
-            try await gateway.connect(
-                url: url,
-                token: config.token,
-                password: config.password,
-                connectOptions: makeOptions("openclaw-ios"),
-                sessionBox: nil,
-                onConnected: {},
-                onDisconnected: { _ in },
-                onInvoke: { req in
-                    BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: OpenClawNodeError(
-                            code: .invalidRequest,
-                            message: "share extension does not support node invoke"))
-                })
-        } catch {
-            let expectsLegacyClientId = self.shouldRetryWithLegacyClientId(error)
-            guard expectsLegacyClientId else { throw error }
-            try await gateway.connect(
-                url: url,
-                token: config.token,
-                password: config.password,
-                connectOptions: makeOptions("moltbot-ios"),
-                sessionBox: nil,
-                onConnected: {},
-                onDisconnected: { _ in },
-                onInvoke: { req in
-                    BridgeInvokeResponse(
-                        id: req.id,
-                        ok: false,
-                        error: OpenClawNodeError(
-                            code: .invalidRequest,
-                            message: "share extension does not support node invoke"))
-                })
-        }
-
-        struct AgentRequestPayload: Codable {
-            var message: String
-            var sessionKey: String?
-            var thinking: String
-            var deliver: Bool
-            var attachments: [ShareAttachment]?
-            var receipt: Bool
-            var receiptText: String?
-            var to: String?
-            var channel: String?
-            var timeoutSeconds: Int?
-            var key: String?
-        }
-
-        let deliveryChannel = config.deliveryChannel?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let deliveryTo = config.deliveryTo?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let canDeliverToRoute = (deliveryChannel?.isEmpty == false) && (deliveryTo?.isEmpty == false)
-
-        let params = AgentRequestPayload(
-            message: message,
-            sessionKey: config.sessionKey,
-            thinking: "low",
-            deliver: canDeliverToRoute,
-            attachments: attachments.isEmpty ? nil : attachments,
-            receipt: canDeliverToRoute,
-            receiptText: canDeliverToRoute ? "Just received your iOS share + request, working on it." : nil,
-            to: canDeliverToRoute ? deliveryTo : nil,
-            channel: canDeliverToRoute ? deliveryChannel : nil,
-            timeoutSeconds: nil,
-            key: UUID().uuidString)
-        let data = try JSONEncoder().encode(params)
-        guard let json = String(data: data, encoding: .utf8) else {
-            throw NSError(
-                domain: "OpenClawShare",
-                code: 12,
-                userInfo: [NSLocalizedDescriptionKey: "Failed to encode chat payload."])
-        }
-        struct NodeEventParams: Codable {
-            var event: String
-            var payloadJSON: String
-        }
-        let eventData = try JSONEncoder().encode(NodeEventParams(event: "agent.request", payloadJSON: json))
-        guard let nodeEventParams = String(data: eventData, encoding: .utf8) else {
-            throw NSError(
-                domain: "OpenClawShare",
-                code: 13,
-                userInfo: [NSLocalizedDescriptionKey: "Failed to encode node event payload."])
-        }
-        _ = try await gateway.request(method: "node.event", paramsJSON: nodeEventParams, timeoutSeconds: 25)
-    }
-
-    private func shouldRetryWithLegacyClientId(_ error: Error) -> Bool {
-        if let gatewayError = error as? GatewayResponseError {
-            let code = gatewayError.code.lowercased()
-            let message = gatewayError.message.lowercased()
-            let pathValue = (gatewayError.details["path"]?.value as? String)?.lowercased() ?? ""
-            let mentionsClientIdPath =
-                message.contains("/client/id") || message.contains("client id")
-                || pathValue.contains("/client/id")
-            let isInvalidConnectParams =
-                (code.contains("invalid") && code.contains("connect"))
-                || message.contains("invalid connect params")
-            if isInvalidConnectParams && mentionsClientIdPath {
-                return true
-            }
-        }
-
-        let text = error.localizedDescription.lowercased()
-        return text.contains("invalid connect params")
-            && (text.contains("/client/id") || text.contains("client id"))
-    }
-
-    private func showStatus(_ text: String) {
-        DispatchQueue.main.async {
-            let label: UILabel
-            if let existing = self.statusLabel {
-                label = existing
-            } else {
-                let newLabel = UILabel()
-                newLabel.translatesAutoresizingMaskIntoConstraints = false
-                newLabel.numberOfLines = 0
-                newLabel.textAlignment = .center
-                newLabel.font = .preferredFont(forTextStyle: .body)
-                newLabel.textColor = .label
-                newLabel.backgroundColor = UIColor.systemBackground.withAlphaComponent(0.92)
-                newLabel.layer.cornerRadius = 12
-                newLabel.clipsToBounds = true
-                newLabel.layoutMargins = UIEdgeInsets(top: 12, left: 14, bottom: 12, right: 14)
-                self.view.addSubview(newLabel)
-                NSLayoutConstraint.activate([
-                    newLabel.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 18),
-                    newLabel.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -18),
-                    newLabel.bottomAnchor.constraint(equalTo: self.sendButton.topAnchor, constant: -10),
-                ])
-                self.statusLabel = newLabel
-                label = newLabel
-            }
-            label.text = "  \(text)  "
-        }
-    }
-
-    private func composeDraft(from payload: SharedContentPayload) -> String {
-        var lines: [String] = []
-        let title = self.sanitizeDraftFragment(payload.title)
-        let text = self.sanitizeDraftFragment(payload.text)
-        let url = payload.url?.absoluteString.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-
-        if let title, !title.isEmpty { lines.append(title) }
-        if let text, !text.isEmpty { lines.append(text) }
-        if !url.isEmpty { lines.append(url) }
-
-        return lines.joined(separator: "\n\n")
-    }
-
-    private func sanitizeDraftFragment(_ raw: String?) -> String? {
-        guard let raw else { return nil }
-        let banned = [
-            "shared from ios.",
-            "text:",
-            "shared attachment(s):",
-            "please help me with this.",
-            "please help me with this.w",
-        ]
-        let cleanedLines = raw
-            .components(separatedBy: .newlines)
-            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { line in
-                guard !line.isEmpty else { return false }
-                let lowered = line.lowercased()
-                return !banned.contains { lowered == $0 || lowered.hasPrefix($0) }
-            }
-        let cleaned = cleanedLines.joined(separator: "\n").trimmingCharacters(in: .whitespacesAndNewlines)
-        return cleaned.isEmpty ? nil : cleaned
-    }
-
-    private func extractSharedContent() async -> ExtractedShareContent {
-        guard let items = self.extensionContext?.inputItems as? [NSExtensionItem] else {
-            return ExtractedShareContent(
-                payload: SharedContentPayload(title: nil, url: nil, text: nil),
-                attachments: [])
-        }
-
-        var title: String?
-        var sharedURL: URL?
-        var sharedText: String?
-        var imageCount = 0
-        var videoCount = 0
-        var fileCount = 0
-        var unknownCount = 0
-        var attachments: [ShareAttachment] = []
-        let maxImageAttachments = 3
-
-        for item in items {
-            if title == nil {
-                title = item.attributedTitle?.string ?? item.attributedContentText?.string
-            }
-
-            for provider in item.attachments ?? [] {
-                if sharedURL == nil {
-                    sharedURL = await self.loadURL(from: provider)
-                }
-
-                if sharedText == nil {
-                    sharedText = await self.loadText(from: provider)
-                }
-
-                if provider.hasItemConformingToTypeIdentifier(UTType.image.identifier) {
-                    imageCount += 1
-                    if attachments.count < maxImageAttachments,
-                       let attachment = await self.loadImageAttachment(from: provider, index: attachments.count)
-                    {
-                        attachments.append(attachment)
-                    }
-                } else if provider.hasItemConformingToTypeIdentifier(UTType.movie.identifier) {
-                    videoCount += 1
-                } else if provider.hasItemConformingToTypeIdentifier(UTType.fileURL.identifier) {
-                    fileCount += 1
-                } else {
-                    unknownCount += 1
-                }
-
-            }
-        }
-
-        _ = imageCount
-        _ = videoCount
-        _ = fileCount
-        _ = unknownCount
-
-        return ExtractedShareContent(
-            payload: SharedContentPayload(title: title, url: sharedURL, text: sharedText),
-            attachments: attachments)
-    }
-
-    private func loadImageAttachment(from provider: NSItemProvider, index: Int) async -> ShareAttachment? {
-        let imageUTI = self.preferredImageTypeIdentifier(from: provider) ?? UTType.image.identifier
-        guard let rawData = await self.loadDataValue(from: provider, typeIdentifier: imageUTI) else {
-            return nil
-        }
-
-        let maxBytes = 5_000_000
-        guard let image = UIImage(data: rawData),
-              let data = self.normalizedJPEGData(from: image, maxBytes: maxBytes)
-        else {
-            return nil
-        }
-
-        return ShareAttachment(
-            type: "image",
-            mimeType: "image/jpeg",
-            fileName: "shared-image-\(index + 1).jpg",
-            content: data.base64EncodedString())
-    }
-
-    private func preferredImageTypeIdentifier(from provider: NSItemProvider) -> String? {
-        for identifier in provider.registeredTypeIdentifiers {
-            guard let utType = UTType(identifier) else { continue }
-            if utType.conforms(to: .image) {
-                return identifier
-            }
-        }
-        return nil
-    }
-
-    private func normalizedJPEGData(from image: UIImage, maxBytes: Int) -> Data? {
-        var quality: CGFloat = 0.9
-        while quality >= 0.4 {
-            if let data = image.jpegData(compressionQuality: quality), data.count <= maxBytes {
-                return data
-            }
-            quality -= 0.1
-        }
-        guard let fallback = image.jpegData(compressionQuality: 0.35) else { return nil }
-        if fallback.count <= maxBytes { return fallback }
-        return nil
-    }
-
-    private func loadURL(from provider: NSItemProvider) async -> URL? {
-        if provider.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
-            if let url = await self.loadURLValue(
-                from: provider,
-                typeIdentifier: UTType.url.identifier)
-            {
-                return url
-            }
-        }
-
-        if provider.hasItemConformingToTypeIdentifier(UTType.text.identifier) {
-            if let text = await self.loadTextValue(from: provider, typeIdentifier: UTType.text.identifier),
-               let url = URL(string: text.trimmingCharacters(in: .whitespacesAndNewlines)),
-                   url.scheme != nil
-            {
-                return url
-            }
-        }
-
-        return nil
-    }
-
-    private func loadText(from provider: NSItemProvider) async -> String? {
-        if provider.hasItemConformingToTypeIdentifier(UTType.plainText.identifier) {
-            if let text = await self.loadTextValue(from: provider, typeIdentifier: UTType.plainText.identifier) {
-                return text
-            }
-        }
-
-        if provider.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
-            if let url = await self.loadURLValue(from: provider, typeIdentifier: UTType.url.identifier) {
-                return url.absoluteString
-            }
-        }
-
-        return nil
-    }
-
-    private func loadURLValue(from provider: NSItemProvider, typeIdentifier: String) async -> URL? {
-        await withCheckedContinuation { continuation in
-            provider.loadItem(forTypeIdentifier: typeIdentifier, options: nil) { item, _ in
-                if let url = item as? URL {
-                    continuation.resume(returning: url)
-                    return
-                }
-                if let str = item as? String, let url = URL(string: str) {
-                    continuation.resume(returning: url)
-                    return
-                }
-                if let ns = item as? NSString, let url = URL(string: ns as String) {
-                    continuation.resume(returning: url)
-                    return
-                }
-                continuation.resume(returning: nil)
-            }
-        }
-    }
-
-    private func loadTextValue(from provider: NSItemProvider, typeIdentifier: String) async -> String? {
-        await withCheckedContinuation { continuation in
-            provider.loadItem(forTypeIdentifier: typeIdentifier, options: nil) { item, _ in
-                if let text = item as? String {
-                    continuation.resume(returning: text)
-                    return
-                }
-                if let text = item as? NSString {
-                    continuation.resume(returning: text as String)
-                    return
-                }
-                if let text = item as? NSAttributedString {
-                    continuation.resume(returning: text.string)
-                    return
-                }
-                continuation.resume(returning: nil)
-            }
-        }
-    }
-
-    private func loadDataValue(from provider: NSItemProvider, typeIdentifier: String) async -> Data? {
-        await withCheckedContinuation { continuation in
-            provider.loadDataRepresentation(forTypeIdentifier: typeIdentifier) { data, _ in
-                continuation.resume(returning: data)
-            }
-        }
-    }
-}

apps/ios/Signing.xcconfig

@@ -1,17 +0,0 @@
-// Default signing values for shared/repo builds.
-// Auto-selected local team overrides live in .local-signing.xcconfig (git-ignored).
-// Manual local overrides can go in LocalSigning.xcconfig (git-ignored).
-
-OPENCLAW_CODE_SIGN_STYLE = Manual
-OPENCLAW_DEVELOPMENT_TEAM = Y5PE65HELJ
-
-OPENCLAW_APP_BUNDLE_ID = ai.openclaw.ios
-OPENCLAW_SHARE_BUNDLE_ID = ai.openclaw.ios.share
-
-OPENCLAW_APP_PROFILE = ai.openclaw.ios Development
-OPENCLAW_SHARE_PROFILE = ai.openclaw.ios.share Development
-
-// Keep local includes after defaults: xcconfig is evaluated top-to-bottom,
-// so later assignments in local files override the defaults above.
-#include? ".local-signing.xcconfig"
-#include? "LocalSigning.xcconfig"

apps/ios/Sources/Chat/IOSGatewayChatTransport.swift

@@ -2,10 +2,8 @@ import OpenClawChatUI
 import OpenClawKit
 import OpenClawProtocol
 import Foundation
-import OSLog
 
 struct IOSGatewayChatTransport: OpenClawChatTransport, Sendable {
-    private static let logger = Logger(subsystem: "ai.openclaw", category: "ios.chat.transport")
     private let gateway: GatewayNodeSession
 
     init(gateway: GatewayNodeSession) {
@@ -35,8 +33,10 @@ struct IOSGatewayChatTransport: OpenClawChatTransport, Sendable {
     }
 
     func setActiveSessionKey(_ sessionKey: String) async throws {
-        // Operator clients receive chat events without node-style subscriptions.
-        // (chat.subscribe is a node event, not an operator RPC method.)
+        struct Subscribe: Codable { var sessionKey: String }
+        let data = try JSONEncoder().encode(Subscribe(sessionKey: sessionKey))
+        let json = String(data: data, encoding: .utf8)
+        await self.gateway.sendEvent(event: "chat.subscribe", payloadJSON: json)
     }
 
     func requestHistory(sessionKey: String) async throws -> OpenClawChatHistoryPayload {
@@ -54,7 +54,6 @@ struct IOSGatewayChatTransport: OpenClawChatTransport, Sendable {
         idempotencyKey: String,
         attachments: [OpenClawChatAttachmentPayload]) async throws -> OpenClawChatSendResponse
     {
-        Self.logger.info("chat.send start sessionKey=\(sessionKey, privacy: .public) len=\(message.count, privacy: .public) attachments=\(attachments.count, privacy: .public)")
         struct Params: Codable {
             var sessionKey: String
             var message: String
@@ -73,15 +72,8 @@ struct IOSGatewayChatTransport: OpenClawChatTransport, Sendable {
             idempotencyKey: idempotencyKey)
         let data = try JSONEncoder().encode(params)
         let json = String(data: data, encoding: .utf8)
-        do {
-            let res = try await self.gateway.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 35)
-            let decoded = try JSONDecoder().decode(OpenClawChatSendResponse.self, from: res)
-            Self.logger.info("chat.send ok runId=\(decoded.runId, privacy: .public)")
-            return decoded
-        } catch {
-            Self.logger.error("chat.send failed \(error.localizedDescription, privacy: .public)")
-            throw error
-        }
+        let res = try await self.gateway.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 35)
+        return try JSONDecoder().decode(OpenClawChatSendResponse.self, from: res)
     }
 
     func requestHealth(timeoutMs: Int) async throws -> Bool {

apps/ios/Sources/Gateway/GatewayConnectionController.swift

@@ -72,55 +72,32 @@ final class GatewayConnectionController {
         }
     }
 
-    func allowAutoConnectAgain() {
-        self.didAutoConnect = false
-        self.maybeAutoConnect()
-    }
-
-    func restartDiscovery() {
-        self.discovery.stop()
-        self.didAutoConnect = false
-        self.discovery.start()
-        self.updateFromDiscovery()
-    }
-
-
-    /// Returns `nil` when a connect attempt was started, otherwise returns a user-facing error.
-    func connectWithDiagnostics(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async -> String? {
+    func connect(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async {
         await self.connectDiscoveredGateway(gateway)
     }
 
     private func connectDiscoveredGateway(
-        _ gateway: GatewayDiscoveryModel.DiscoveredGateway) async -> String?
+        _ gateway: GatewayDiscoveryModel.DiscoveredGateway) async
     {
         let instanceId = UserDefaults.standard.string(forKey: "node.instanceId")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if instanceId.isEmpty {
-            return "Missing instanceId (node.instanceId). Try restarting the app."
-        }
         let token = GatewaySettingsStore.loadGatewayToken(instanceId: instanceId)
         let password = GatewaySettingsStore.loadGatewayPassword(instanceId: instanceId)
 
         // Resolve the service endpoint (SRV/A/AAAA). TXT is unauthenticated; do not route via TXT.
-        guard let target = await self.resolveServiceEndpoint(gateway.endpoint) else {
-            return "Failed to resolve the discovered gateway endpoint."
-        }
+        guard let target = await self.resolveServiceEndpoint(gateway.endpoint) else { return }
 
         let stableID = gateway.stableID
         // Discovery is a LAN operation; refuse unauthenticated plaintext connects.
         let tlsRequired = true
         let stored = GatewayTLSStore.loadFingerprint(stableID: stableID)
 
-        guard gateway.tlsEnabled || stored != nil else {
-            return "Discovered gateway is missing TLS and no trusted fingerprint is stored."
-        }
+        guard gateway.tlsEnabled || stored != nil else { return }
 
         if tlsRequired, stored == nil {
             guard let url = self.buildGatewayURL(host: target.host, port: target.port, useTLS: true)
-            else { return "Failed to build TLS URL for trust verification." }
-            guard let fp = await self.probeTLSFingerprint(url: url) else {
-                return "Failed to read TLS fingerprint from discovered gateway."
-            }
+            else { return }
+            guard let fp = await self.probeTLSFingerprint(url: url) else { return }
             self.pendingTrustConnect = (url: url, stableID: stableID, isManual: false)
             self.pendingTrustPrompt = TrustPrompt(
                 stableID: stableID,
@@ -130,7 +107,7 @@ final class GatewayConnectionController {
                 fingerprintSha256: fp,
                 isManual: false)
             self.appModel?.gatewayStatusText = "Verify gateway TLS fingerprint"
-            return nil
+            return
         }
 
         let tlsParams = stored.map { fp in
@@ -141,7 +118,7 @@ final class GatewayConnectionController {
             host: target.host,
             port: target.port,
             useTLS: tlsParams?.required == true)
-        else { return "Failed to build discovered gateway URL." }
+        else { return }
         GatewaySettingsStore.saveLastGatewayConnectionDiscovered(stableID: stableID, useTLS: true)
         self.didAutoConnect = true
         self.startAutoConnect(
@@ -150,11 +127,6 @@ final class GatewayConnectionController {
             tls: tlsParams,
             token: token,
             password: password)
-        return nil
-    }
-
-    func connect(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async {
-        _ = await self.connectWithDiagnostics(gateway)
     }
 
     func connectManual(host: String, port: Int, useTLS: Bool) async {
@@ -518,125 +490,6 @@ final class GatewayConnectionController {
         }
     }
 
-    private func resolveHostPortFromBonjourEndpoint(_ endpoint: NWEndpoint) async -> (host: String, port: Int)? {
-        switch endpoint {
-        case let .hostPort(host, port):
-            return (host: host.debugDescription, port: Int(port.rawValue))
-        case let .service(name, type, domain, _):
-            return await Self.resolveBonjourServiceToHostPort(name: name, type: type, domain: domain)
-        default:
-            return nil
-        }
-    }
-
-    private static func resolveBonjourServiceToHostPort(
-        name: String,
-        type: String,
-        domain: String,
-        timeoutSeconds: TimeInterval = 3.0
-    ) async -> (host: String, port: Int)? {
-        // NetService callbacks are delivered via a run loop. If we resolve from a thread without one,
-        // we can end up never receiving callbacks, which in turn leaks the continuation and leaves
-        // the UI stuck "connecting". Keep the whole lifecycle on the main run loop and always
-        // resume the continuation exactly once (timeout/cancel safe).
-        @MainActor
-        final class Resolver: NSObject, @preconcurrency NetServiceDelegate {
-            private var cont: CheckedContinuation<(host: String, port: Int)?, Never>?
-            private let service: NetService
-            private var timeoutTask: Task<Void, Never>?
-            private var finished = false
-
-            init(cont: CheckedContinuation<(host: String, port: Int)?, Never>, service: NetService) {
-                self.cont = cont
-                self.service = service
-                super.init()
-            }
-
-            func start(timeoutSeconds: TimeInterval) {
-                self.service.delegate = self
-                self.service.schedule(in: .main, forMode: .default)
-
-                // NetService has its own timeout, but we keep a manual one as a backstop in case
-                // callbacks never arrive (e.g. local network permission issues).
-                self.timeoutTask = Task { @MainActor [weak self] in
-                    guard let self else { return }
-                    let ns = UInt64(max(0.1, timeoutSeconds) * 1_000_000_000)
-                    try? await Task.sleep(nanoseconds: ns)
-                    self.finish(nil)
-                }
-
-                self.service.resolve(withTimeout: timeoutSeconds)
-            }
-
-            func netServiceDidResolveAddress(_ sender: NetService) {
-                self.finish(Self.extractHostPort(sender))
-            }
-
-            func netService(_ sender: NetService, didNotResolve errorDict: [String: NSNumber]) {
-                _ = errorDict // currently best-effort; callers surface a generic failure
-                self.finish(nil)
-            }
-
-            private func finish(_ result: (host: String, port: Int)?) {
-                guard !self.finished else { return }
-                self.finished = true
-
-                self.timeoutTask?.cancel()
-                self.timeoutTask = nil
-
-                self.service.stop()
-                self.service.remove(from: .main, forMode: .default)
-
-                let c = self.cont
-                self.cont = nil
-                c?.resume(returning: result)
-            }
-
-            private static func extractHostPort(_ svc: NetService) -> (host: String, port: Int)? {
-                let port = svc.port
-
-                if let host = svc.hostName?.trimmingCharacters(in: .whitespacesAndNewlines), !host.isEmpty {
-                    return (host: host, port: port)
-                }
-
-                guard let addrs = svc.addresses else { return nil }
-                    for addrData in addrs {
-                        let host = addrData.withUnsafeBytes { ptr -> String? in
-                        guard let base = ptr.baseAddress, !ptr.isEmpty else { return nil }
-                        var buffer = [CChar](repeating: 0, count: Int(NI_MAXHOST))
-
-                        let rc = getnameinfo(
-                            base.assumingMemoryBound(to: sockaddr.self),
-                            socklen_t(ptr.count),
-                            &buffer,
-                            socklen_t(buffer.count),
-                            nil,
-                            0,
-                            NI_NUMERICHOST)
-                        guard rc == 0 else { return nil }
-                        return String(cString: buffer)
-                    }
-
-                    if let host, !host.isEmpty {
-                        return (host: host, port: port)
-                    }
-                }
-
-                return nil
-            }
-        }
-
-        return await withCheckedContinuation { cont in
-            Task { @MainActor in
-                let service = NetService(domain: domain, type: type, name: name)
-                let resolver = Resolver(cont: cont, service: service)
-                // Keep the resolver alive for the lifetime of the NetService resolve.
-                objc_setAssociatedObject(service, "resolver", resolver, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-                resolver.start(timeoutSeconds: timeoutSeconds)
-            }
-        }
-    }
-
     private func buildGatewayURL(host: String, port: Int, useTLS: Bool) -> URL? {
         let scheme = useTLS ? "wss" : "ws"
         var components = URLComponents()
@@ -729,9 +582,6 @@ final class GatewayConnectionController {
         if locationMode != .off { caps.append(OpenClawCapability.location.rawValue) }
 
         caps.append(OpenClawCapability.device.rawValue)
-        if WatchMessagingService.isSupportedOnDevice() {
-            caps.append(OpenClawCapability.watch.rawValue)
-        }
         caps.append(OpenClawCapability.photos.rawValue)
         caps.append(OpenClawCapability.contacts.rawValue)
         caps.append(OpenClawCapability.calendar.rawValue)
@@ -775,10 +625,6 @@ final class GatewayConnectionController {
             commands.append(OpenClawDeviceCommand.status.rawValue)
             commands.append(OpenClawDeviceCommand.info.rawValue)
         }
-        if caps.contains(OpenClawCapability.watch.rawValue) {
-            commands.append(OpenClawWatchCommand.status.rawValue)
-            commands.append(OpenClawWatchCommand.notify.rawValue)
-        }
         if caps.contains(OpenClawCapability.photos.rawValue) {
             commands.append(OpenClawPhotosCommand.latest.rawValue)
         }
@@ -829,12 +675,6 @@ final class GatewayConnectionController {
         permissions["motion"] =
             motionStatus == .authorized || pedometerStatus == .authorized
 
-        let watchStatus = WatchMessagingService.currentStatusSnapshot()
-        permissions["watchSupported"] = watchStatus.supported
-        permissions["watchPaired"] = watchStatus.paired
-        permissions["watchAppInstalled"] = watchStatus.appInstalled
-        permissions["watchReachable"] = watchStatus.reachable
-
         return permissions
     }
 

apps/ios/Sources/Gateway/GatewayConnectionIssue.swift

@@ -1,71 +0,0 @@
-import Foundation
-
-enum GatewayConnectionIssue: Equatable {
-    case none
-    case tokenMissing
-    case unauthorized
-    case pairingRequired(requestId: String?)
-    case network
-    case unknown(String)
-
-    var requestId: String? {
-        if case let .pairingRequired(requestId) = self {
-            return requestId
-        }
-        return nil
-    }
-
-    var needsAuthToken: Bool {
-        switch self {
-        case .tokenMissing, .unauthorized:
-            return true
-        default:
-            return false
-        }
-    }
-
-    var needsPairing: Bool {
-        if case .pairingRequired = self { return true }
-        return false
-    }
-
-    static func detect(from statusText: String) -> Self {
-        let trimmed = statusText.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return .none }
-        let lower = trimmed.lowercased()
-
-        if lower.contains("pairing required") || lower.contains("not_paired") || lower.contains("not paired") {
-            return .pairingRequired(requestId: self.extractRequestId(from: trimmed))
-        }
-        if lower.contains("gateway token missing") {
-            return .tokenMissing
-        }
-        if lower.contains("unauthorized") {
-            return .unauthorized
-        }
-        if lower.contains("connection refused") ||
-            lower.contains("timed out") ||
-            lower.contains("network is unreachable") ||
-            lower.contains("cannot find host") ||
-            lower.contains("could not connect")
-        {
-            return .network
-        }
-        if lower.hasPrefix("gateway error:") {
-            return .unknown(trimmed)
-        }
-        return .none
-    }
-
-    private static func extractRequestId(from statusText: String) -> String? {
-        let marker = "requestId:"
-        guard let range = statusText.range(of: marker) else { return nil }
-        let suffix = statusText[range.upperBound...]
-        let trimmed = suffix.trimmingCharacters(in: .whitespacesAndNewlines)
-        let end = trimmed.firstIndex(where: { ch in
-            ch == ")" || ch.isWhitespace || ch == "," || ch == ";"
-        }) ?? trimmed.endIndex
-        let id = String(trimmed[..<end]).trimmingCharacters(in: .whitespacesAndNewlines)
-        return id.isEmpty ? nil : id
-    }
-}

apps/ios/Sources/Gateway/GatewayQuickSetupSheet.swift

@@ -1,113 +0,0 @@
-import SwiftUI
-
-struct GatewayQuickSetupSheet: View {
-    @Environment(NodeAppModel.self) private var appModel
-    @Environment(GatewayConnectionController.self) private var gatewayController
-    @Environment(\.dismiss) private var dismiss
-
-    @AppStorage("onboarding.quickSetupDismissed") private var quickSetupDismissed: Bool = false
-    @State private var connecting: Bool = false
-    @State private var connectError: String?
-
-    var body: some View {
-        NavigationStack {
-            VStack(alignment: .leading, spacing: 16) {
-                Text("Connect to a Gateway?")
-                    .font(.title2.bold())
-
-                if let candidate = self.bestCandidate {
-                    VStack(alignment: .leading, spacing: 6) {
-                        Text(verbatim: candidate.name)
-                            .font(.headline)
-                        Text(verbatim: candidate.debugID)
-                            .font(.footnote)
-                            .foregroundStyle(.secondary)
-
-                        VStack(alignment: .leading, spacing: 2) {
-                            // Use verbatim strings so Bonjour-provided values can't be interpreted as
-                            // localized format strings (which can crash with Objective-C exceptions).
-                            Text(verbatim: "Discovery: \(self.gatewayController.discoveryStatusText)")
-                            Text(verbatim: "Status: \(self.appModel.gatewayStatusText)")
-                            Text(verbatim: "Node: \(self.appModel.nodeStatusText)")
-                            Text(verbatim: "Operator: \(self.appModel.operatorStatusText)")
-                        }
-                        .font(.footnote)
-                        .foregroundStyle(.secondary)
-                    }
-                    .padding(12)
-                    .background(.thinMaterial)
-                    .clipShape(RoundedRectangle(cornerRadius: 14))
-
-                    Button {
-                        self.connectError = nil
-                        self.connecting = true
-                        Task {
-                            let err = await self.gatewayController.connectWithDiagnostics(candidate)
-                            await MainActor.run {
-                                self.connecting = false
-                                self.connectError = err
-                                // If we kicked off a connect, leave the sheet up so the user can see status evolve.
-                            }
-                        }
-                    } label: {
-                        Group {
-                            if self.connecting {
-                                HStack(spacing: 8) {
-                                    ProgressView().progressViewStyle(.circular)
-                                    Text("Connecting…")
-                                }
-                            } else {
-                                Text("Connect")
-                            }
-                        }
-                        .frame(maxWidth: .infinity)
-                    }
-                    .buttonStyle(.borderedProminent)
-                    .disabled(self.connecting)
-
-                    if let connectError {
-                        Text(connectError)
-                            .font(.footnote)
-                            .foregroundStyle(.secondary)
-                            .textSelection(.enabled)
-                    }
-
-                    Button {
-                        self.dismiss()
-                    } label: {
-                        Text("Not now")
-                            .frame(maxWidth: .infinity)
-                    }
-                    .buttonStyle(.bordered)
-                    .disabled(self.connecting)
-
-                    Toggle("Don’t show this again", isOn: self.$quickSetupDismissed)
-                        .padding(.top, 4)
-                } else {
-                    Text("No gateways found yet. Make sure your gateway is running and Bonjour discovery is enabled.")
-                        .foregroundStyle(.secondary)
-                }
-
-                Spacer()
-            }
-            .padding()
-            .navigationTitle("Quick Setup")
-            .navigationBarTitleDisplayMode(.inline)
-            .toolbar {
-                ToolbarItem(placement: .topBarTrailing) {
-                    Button {
-                        self.quickSetupDismissed = true
-                        self.dismiss()
-                    } label: {
-                        Text("Close")
-                    }
-                }
-            }
-        }
-    }
-
-    private var bestCandidate: GatewayDiscoveryModel.DiscoveredGateway? {
-        // Prefer whatever discovery says is first; the list is already name-sorted.
-        self.gatewayController.gateways.first
-    }
-}

apps/ios/Sources/Gateway/GatewaySettingsStore.swift

@@ -4,7 +4,6 @@ import os
 enum GatewaySettingsStore {
     private static let gatewayService = "ai.openclaw.gateway"
     private static let nodeService = "ai.openclaw.node"
-    private static let talkService = "ai.openclaw.talk"
 
     private static let instanceIdDefaultsKey = "node.instanceId"
     private static let preferredGatewayStableIDDefaultsKey = "gateway.preferredStableID"
@@ -25,7 +24,6 @@ enum GatewaySettingsStore {
     private static let instanceIdAccount = "instanceId"
     private static let preferredGatewayStableIDAccount = "preferredStableID"
     private static let lastDiscoveredGatewayStableIDAccount = "lastDiscoveredStableID"
-    private static let talkElevenLabsApiKeyAccount = "elevenlabs.apiKey"
 
     static func bootstrapPersistence() {
         self.ensureStableInstanceID()
@@ -145,27 +143,6 @@ enum GatewaySettingsStore {
         case discovered
     }
 
-    static func loadTalkElevenLabsApiKey() -> String? {
-        let value = KeychainStore.loadString(
-            service: self.talkService,
-            account: self.talkElevenLabsApiKeyAccount)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-        if value?.isEmpty == false { return value }
-        return nil
-    }
-
-    static func saveTalkElevenLabsApiKey(_ apiKey: String?) {
-        let trimmed = apiKey?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if trimmed.isEmpty {
-            _ = KeychainStore.delete(service: self.talkService, account: self.talkElevenLabsApiKeyAccount)
-            return
-        }
-        _ = KeychainStore.saveString(
-            trimmed,
-            service: self.talkService,
-            account: self.talkElevenLabsApiKeyAccount)
-    }
-
     static func saveLastGatewayConnectionManual(host: String, port: Int, useTLS: Bool, stableID: String) {
         let defaults = UserDefaults.standard
         defaults.set(LastGatewayKind.manual.rawValue, forKey: self.lastGatewayKindDefaultsKey)
@@ -207,25 +184,6 @@ enum GatewaySettingsStore {
         return .manual(host: host, port: port, useTLS: useTLS, stableID: stableID)
     }
 
-    static func clearLastGatewayConnection(defaults: UserDefaults = .standard) {
-        defaults.removeObject(forKey: self.lastGatewayKindDefaultsKey)
-        defaults.removeObject(forKey: self.lastGatewayHostDefaultsKey)
-        defaults.removeObject(forKey: self.lastGatewayPortDefaultsKey)
-        defaults.removeObject(forKey: self.lastGatewayTlsDefaultsKey)
-        defaults.removeObject(forKey: self.lastGatewayStableIDDefaultsKey)
-    }
-
-    static func deleteGatewayCredentials(instanceId: String) {
-        let trimmed = instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return }
-        _ = KeychainStore.delete(
-            service: self.gatewayService,
-            account: self.gatewayTokenAccount(instanceId: trimmed))
-        _ = KeychainStore.delete(
-            service: self.gatewayService,
-            account: self.gatewayPasswordAccount(instanceId: trimmed))
-    }
-
     static func loadGatewayClientIdOverride(stableID: String) -> String? {
         let trimmedID = stableID.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmedID.isEmpty else { return nil }

apps/ios/Sources/Gateway/GatewayTrustPromptAlert.swift

@@ -6,10 +6,10 @@ struct GatewayTrustPromptAlert: ViewModifier {
     private var promptBinding: Binding<GatewayConnectionController.TrustPrompt?> {
         Binding(
             get: { self.gatewayController.pendingTrustPrompt },
-            set: { _ in
-                // Keep pending trust state until explicit user action.
-                // `alert(item:)` may set the binding to nil during dismissal, which can race with
-                // the button handler and cause accept to no-op.
+            set: { newValue in
+                if newValue == nil {
+                    self.gatewayController.clearPendingTrustPrompt()
+                }
             })
     }
 
@@ -39,3 +39,4 @@ extension View {
         self.modifier(GatewayTrustPromptAlert())
     }
 }
+

apps/ios/Sources/Info.plist

@@ -17,26 +17,15 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2026.2.18</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>ai.openclaw.ios</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>openclaw</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>20260218</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoadsInWebContent</key>
-		<true/>
+			<string>APPL</string>
+			<key>CFBundleShortVersionString</key>
+			<string>2026.2.16</string>
+			<key>CFBundleVersion</key>
+			<string>20260216</string>
+			<key>NSAppTransportSecurity</key>
+			<dict>
+			<key>NSAllowsArbitraryLoadsInWebContent</key>
+			<true/>
 	</dict>
 	<key>NSBonjourServices</key>
 	<array>
@@ -62,7 +51,6 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
-		<string>remote-notification</string>
 	</array>
 	<key>UILaunchScreen</key>
 	<dict/>

apps/ios/Sources/Location/LocationService.swift

@@ -12,10 +12,6 @@ final class LocationService: NSObject, CLLocationManagerDelegate {
     private let manager = CLLocationManager()
     private var authContinuation: CheckedContinuation<CLAuthorizationStatus, Never>?
     private var locationContinuation: CheckedContinuation<CLLocation, Swift.Error>?
-    private var updatesContinuation: AsyncStream<CLLocation>.Continuation?
-    private var isStreaming = false
-    private var significantLocationCallback: (@Sendable (CLLocation) -> Void)?
-    private var isMonitoringSignificantChanges = false
 
     override init() {
         super.init()
@@ -108,56 +104,6 @@ final class LocationService: NSObject, CLLocationManagerDelegate {
         }
     }
 
-    func startLocationUpdates(
-        desiredAccuracy: OpenClawLocationAccuracy,
-        significantChangesOnly: Bool) -> AsyncStream<CLLocation>
-    {
-        self.stopLocationUpdates()
-
-        self.manager.desiredAccuracy = Self.accuracyValue(desiredAccuracy)
-        self.manager.pausesLocationUpdatesAutomatically = true
-        self.manager.allowsBackgroundLocationUpdates = true
-
-        self.isStreaming = true
-        if significantChangesOnly {
-            self.manager.startMonitoringSignificantLocationChanges()
-        } else {
-            self.manager.startUpdatingLocation()
-        }
-
-        return AsyncStream(bufferingPolicy: .bufferingNewest(1)) { continuation in
-            self.updatesContinuation = continuation
-            continuation.onTermination = { @Sendable _ in
-                Task { @MainActor in
-                    self.stopLocationUpdates()
-                }
-            }
-        }
-    }
-
-    func stopLocationUpdates() {
-        guard self.isStreaming else { return }
-        self.isStreaming = false
-        self.manager.stopUpdatingLocation()
-        self.manager.stopMonitoringSignificantLocationChanges()
-        self.updatesContinuation?.finish()
-        self.updatesContinuation = nil
-    }
-
-    func startMonitoringSignificantLocationChanges(onUpdate: @escaping @Sendable (CLLocation) -> Void) {
-        self.significantLocationCallback = onUpdate
-        guard !self.isMonitoringSignificantChanges else { return }
-        self.isMonitoringSignificantChanges = true
-        self.manager.startMonitoringSignificantLocationChanges()
-    }
-
-    func stopMonitoringSignificantLocationChanges() {
-        guard self.isMonitoringSignificantChanges else { return }
-        self.isMonitoringSignificantChanges = false
-        self.significantLocationCallback = nil
-        self.manager.stopMonitoringSignificantLocationChanges()
-    }
-
     nonisolated func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
         let status = manager.authorizationStatus
         Task { @MainActor in
@@ -171,22 +117,12 @@ final class LocationService: NSObject, CLLocationManagerDelegate {
     nonisolated func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
         let locs = locations
         Task { @MainActor in
-            // Resolve the one-shot continuation first (if any).
-            if let cont = self.locationContinuation {
-                self.locationContinuation = nil
-                if let latest = locs.last {
-                    cont.resume(returning: latest)
-                } else {
-                    cont.resume(throwing: Error.unavailable)
-                }
-                // Don't return — also forward to significant-change callback below
-                // so both consumers receive updates when both are active.
-            }
-            if let callback = self.significantLocationCallback, let latest = locs.last {
-                callback(latest)
-            }
-            if let latest = locs.last, let updates = self.updatesContinuation {
-                updates.yield(latest)
+            guard let cont = self.locationContinuation else { return }
+            self.locationContinuation = nil
+            if let latest = locs.last {
+                cont.resume(returning: latest)
+            } else {
+                cont.resume(throwing: Error.unavailable)
             }
         }
     }

apps/ios/Sources/Location/SignificantLocationMonitor.swift

@@ -1,38 +0,0 @@
-import CoreLocation
-import Foundation
-import OpenClawKit
-
-/// Monitors significant location changes and pushes `location.update`
-/// events to the gateway so the severance hook can determine whether
-/// the user is at their configured work location.
-@MainActor
-enum SignificantLocationMonitor {
-    static func startIfNeeded(
-        locationService: any LocationServicing,
-        locationMode: OpenClawLocationMode,
-        gateway: GatewayNodeSession
-    ) {
-        guard locationMode == .always else { return }
-        let status = locationService.authorizationStatus()
-        guard status == .authorizedAlways else { return }
-        locationService.startMonitoringSignificantLocationChanges { location in
-            struct Payload: Codable {
-                var lat: Double
-                var lon: Double
-                var accuracyMeters: Double
-                var source: String?
-            }
-            let payload = Payload(
-                lat: location.coordinate.latitude,
-                lon: location.coordinate.longitude,
-                accuracyMeters: location.horizontalAccuracy,
-                source: "ios-significant-location")
-            guard let data = try? JSONEncoder().encode(payload),
-                  let json = String(data: data, encoding: .utf8)
-            else { return }
-            Task { @MainActor in
-                await gateway.sendEvent(event: "location.update", payloadJSON: json)
-            }
-        }
-    }
-}

apps/ios/Sources/Model/NodeAppModel.swift

@@ -2,7 +2,6 @@ import OpenClawChatUI
 import OpenClawKit
 import OpenClawProtocol
 import Observation
-import os
 import SwiftUI
 import UIKit
 import UserNotifications
@@ -11,6 +10,7 @@ import UserNotifications
 private struct NotificationCallError: Error, Sendable {
     let message: String
 }
+
 // Ensures notification requests return promptly even if the system prompt blocks.
 private final class NotificationInvokeLatch<T: Sendable>: @unchecked Sendable {
     private let lock = NSLock()
@@ -37,11 +37,10 @@ private final class NotificationInvokeLatch<T: Sendable>: @unchecked Sendable {
         cont?.resume(returning: response)
     }
 }
+
 @MainActor
 @Observable
 final class NodeAppModel {
-    private let deepLinkLogger = Logger(subsystem: "ai.openclaw.ios", category: "DeepLink")
-    private let pushWakeLogger = Logger(subsystem: "ai.openclaw.ios", category: "PushWake")
     enum CameraHUDKind {
         case photo
         case recording
@@ -54,24 +53,35 @@ final class NodeAppModel {
     private let camera: any CameraServicing
     private let screenRecorder: any ScreenRecordingServicing
     var gatewayStatusText: String = "Offline"
-    var nodeStatusText: String = "Offline"
-    var operatorStatusText: String = "Offline"
     var gatewayServerName: String?
     var gatewayRemoteAddress: String?
     var connectedGatewayID: String?
     var gatewayAutoReconnectEnabled: Bool = true
-    // When the gateway requires pairing approval, we pause reconnect churn and show a stable UX.
-    // Reconnect loops (both our own and the underlying WebSocket watchdog) can otherwise generate
-    // multiple pending requests and cause the onboarding UI to "flip-flop".
-    var gatewayPairingPaused: Bool = false
-    var gatewayPairingRequestId: String?
     var seamColorHex: String?
     private var mainSessionBaseKey: String = "main"
     var selectedAgentId: String?
     var gatewayDefaultAgentId: String?
     var gatewayAgents: [AgentSummary] = []
-    var lastShareEventText: String = "No share events yet."
-    var openChatRequestID: Int = 0
+
+    var mainSessionKey: String {
+        let base = SessionKey.normalizeMainKey(self.mainSessionBaseKey)
+        let agentId = (self.selectedAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        let defaultId = (self.gatewayDefaultAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        if agentId.isEmpty || (!defaultId.isEmpty && agentId == defaultId) { return base }
+        return SessionKey.makeAgentSessionKey(agentId: agentId, baseKey: base)
+    }
+
+    var activeAgentName: String {
+        let agentId = (self.selectedAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        let defaultId = (self.gatewayDefaultAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        let resolvedId = agentId.isEmpty ? defaultId : agentId
+        if resolvedId.isEmpty { return "Main" }
+        if let match = self.gatewayAgents.first(where: { $0.id == resolvedId }) {
+            let name = (match.name ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+            return name.isEmpty ? match.id : name
+        }
+        return resolvedId
+    }
 
     // Primary "node" connection: used for device capabilities and node.invoke requests.
     private let nodeGateway = GatewayNodeSession()
@@ -94,22 +104,16 @@ final class NodeAppModel {
     private let calendarService: any CalendarServicing
     private let remindersService: any RemindersServicing
     private let motionService: any MotionServicing
-    private let watchMessagingService: any WatchMessagingServicing
     var lastAutoA2uiURL: String?
     private var pttVoiceWakeSuspended = false
     private var talkVoiceWakeSuspended = false
     private var backgroundVoiceWakeSuspended = false
     private var backgroundTalkSuspended = false
-    private var backgroundTalkKeptActive = false
     private var backgroundedAt: Date?
     private var reconnectAfterBackgroundArmed = false
 
     private var gatewayConnected = false
     private var operatorConnected = false
-    private var shareDeliveryChannel: String?
-    private var shareDeliveryTo: String?
-    private var apnsDeviceTokenHex: String?
-    private var apnsLastRegisteredTokenHex: String?
     var gatewaySession: GatewayNodeSession { self.nodeGateway }
     var operatorSession: GatewayNodeSession { self.operatorGateway }
     private(set) var activeGatewayConnectConfig: GatewayConnectConfig?
@@ -131,7 +135,6 @@ final class NodeAppModel {
         calendarService: any CalendarServicing = CalendarService(),
         remindersService: any RemindersServicing = RemindersService(),
         motionService: any MotionServicing = MotionService(),
-        watchMessagingService: any WatchMessagingServicing = WatchMessagingService(),
         talkMode: TalkModeManager = TalkModeManager())
     {
         self.screen = screen
@@ -145,9 +148,7 @@ final class NodeAppModel {
         self.calendarService = calendarService
         self.remindersService = remindersService
         self.motionService = motionService
-        self.watchMessagingService = watchMessagingService
         self.talkMode = talkMode
-        self.apnsDeviceTokenHex = UserDefaults.standard.string(forKey: Self.apnsDeviceTokenUserDefaultsKey)
         GatewayDiagnostics.bootstrap()
 
         self.voiceWake.configure { [weak self] cmd in
@@ -163,7 +164,6 @@ final class NodeAppModel {
         let enabled = UserDefaults.standard.bool(forKey: "voiceWake.enabled")
         self.voiceWake.setEnabled(enabled)
         self.talkMode.attachGateway(self.operatorGateway)
-        self.refreshLastShareEventFromRelay()
         let talkEnabled = UserDefaults.standard.bool(forKey: "talk.enabled")
         // Route through the coordinator so VoiceWake and Talk don't fight over the microphone.
         self.setTalkEnabled(talkEnabled)
@@ -264,18 +264,15 @@ final class NodeAppModel {
 
 
     func setScenePhase(_ phase: ScenePhase) {
-        let keepTalkActive = UserDefaults.standard.bool(forKey: "talk.background.enabled")
         switch phase {
         case .background:
             self.isBackgrounded = true
             self.stopGatewayHealthMonitor()
             self.backgroundedAt = Date()
             self.reconnectAfterBackgroundArmed = true
-            // Release voice wake mic in background.
+            // Be conservative: release the mic when the app backgrounds.
             self.backgroundVoiceWakeSuspended = self.voiceWake.suspendForExternalAudioCapture()
-            let shouldKeepTalkActive = keepTalkActive && self.talkMode.isEnabled
-            self.backgroundTalkKeptActive = shouldKeepTalkActive
-            self.backgroundTalkSuspended = self.talkMode.suspendForBackground(keepActive: shouldKeepTalkActive)
+            self.backgroundTalkSuspended = self.talkMode.suspendForBackground()
         case .active, .inactive:
             self.isBackgrounded = false
             if self.operatorConnected {
@@ -287,12 +284,8 @@ final class NodeAppModel {
                 Task { [weak self] in
                     guard let self else { return }
                     let suspended = await MainActor.run { self.backgroundTalkSuspended }
-                    let keptActive = await MainActor.run { self.backgroundTalkKeptActive }
-                    await MainActor.run {
-                        self.backgroundTalkSuspended = false
-                        self.backgroundTalkKeptActive = false
-                    }
-                    await self.talkMode.resumeAfterBackground(wasSuspended: suspended, wasKeptActive: keptActive)
+                    await MainActor.run { self.backgroundTalkSuspended = false }
+                    await self.talkMode.resumeAfterBackground(wasSuspended: suspended)
                 }
             }
             if phase == .active, self.reconnectAfterBackgroundArmed {
@@ -347,7 +340,6 @@ final class NodeAppModel {
     }
 
     func setTalkEnabled(_ enabled: Bool) {
-        UserDefaults.standard.set(enabled, forKey: "talk.enabled")
         if enabled {
             // Voice wake holds the microphone continuously; talk mode needs exclusive access for STT.
             // When talk is enabled from the UI, prioritize talk and pause voice wake.
@@ -359,11 +351,6 @@ final class NodeAppModel {
             self.talkVoiceWakeSuspended = false
         }
         self.talkMode.setEnabled(enabled)
-        Task { [weak self] in
-            await self?.pushTalkModeToGateway(
-                enabled: enabled,
-                phase: enabled ? "enabled" : "disabled")
-        }
     }
 
     func requestLocationPermissions(mode: OpenClawLocationMode) async -> Bool {
@@ -393,14 +380,6 @@ final class NodeAppModel {
     }
 
     private static let defaultSeamColor = Color(red: 79 / 255.0, green: 122 / 255.0, blue: 154 / 255.0)
-    private static let apnsDeviceTokenUserDefaultsKey = "push.apns.deviceTokenHex"
-    private static var apnsEnvironment: String {
-#if DEBUG
-        "sandbox"
-#else
-        "production"
-#endif
-    }
 
     private static func color(fromHex raw: String?) -> Color? {
         let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
@@ -468,16 +447,6 @@ final class NodeAppModel {
             GatewaySettingsStore.saveGatewaySelectedAgentId(stableID: stableID, agentId: self.selectedAgentId)
         }
         self.talkMode.updateMainSessionKey(self.mainSessionKey)
-        if let relay = ShareGatewayRelaySettings.loadConfig() {
-            ShareGatewayRelaySettings.saveConfig(
-                ShareGatewayRelayConfig(
-                    gatewayURLString: relay.gatewayURLString,
-                    token: relay.token,
-                    password: relay.password,
-                    sessionKey: self.mainSessionKey,
-                    deliveryChannel: self.shareDeliveryChannel,
-                    deliveryTo: self.shareDeliveryTo))
-        }
     }
 
     func setGlobalWakeWords(_ words: [String]) async {
@@ -510,49 +479,16 @@ final class NodeAppModel {
             let stream = await self.operatorGateway.subscribeServerEvents(bufferingNewest: 200)
             for await evt in stream {
                 if Task.isCancelled { return }
+                guard evt.event == "voicewake.changed" else { continue }
                 guard let payload = evt.payload else { continue }
-                switch evt.event {
-                case "voicewake.changed":
-                    struct Payload: Decodable { var triggers: [String] }
-                    guard let decoded = try? GatewayPayloadDecoding.decode(payload, as: Payload.self) else { continue }
-                    let triggers = VoiceWakePreferences.sanitizeTriggerWords(decoded.triggers)
-                    VoiceWakePreferences.saveTriggerWords(triggers)
-                case "talk.mode":
-                    struct Payload: Decodable {
-                        var enabled: Bool
-                        var phase: String?
-                    }
-                    guard let decoded = try? GatewayPayloadDecoding.decode(payload, as: Payload.self) else { continue }
-                    self.applyTalkModeSync(enabled: decoded.enabled, phase: decoded.phase)
-                default:
-                    continue
-                }
+                struct Payload: Decodable { var triggers: [String] }
+                guard let decoded = try? GatewayPayloadDecoding.decode(payload, as: Payload.self) else { continue }
+                let triggers = VoiceWakePreferences.sanitizeTriggerWords(decoded.triggers)
+                VoiceWakePreferences.saveTriggerWords(triggers)
             }
         }
     }
 
-    private func applyTalkModeSync(enabled: Bool, phase: String?) {
-        _ = phase
-        guard self.talkMode.isEnabled != enabled else { return }
-        self.setTalkEnabled(enabled)
-    }
-
-    private func pushTalkModeToGateway(enabled: Bool, phase: String?) async {
-        guard await self.isOperatorConnected() else { return }
-        struct TalkModePayload: Encodable {
-            var enabled: Bool
-            var phase: String?
-        }
-        let payload = TalkModePayload(enabled: enabled, phase: phase)
-        guard let data = try? JSONEncoder().encode(payload),
-              let json = String(data: data, encoding: .utf8)
-        else { return }
-        _ = try? await self.operatorGateway.request(
-            method: "talk.mode",
-            paramsJSON: json,
-            timeoutSeconds: 8)
-    }
-
     private func startGatewayHealthMonitor() {
         self.gatewayHealthMonitorDisabled = false
         self.gatewayHealthMonitor.start(
@@ -579,11 +515,8 @@ final class NodeAppModel {
             onFailure: { [weak self] _ in
                 guard let self else { return }
                 await self.operatorGateway.disconnect()
-                await self.nodeGateway.disconnect()
                 await MainActor.run {
                     self.operatorConnected = false
-                    self.gatewayConnected = false
-                    self.gatewayStatusText = "Reconnecting…"
                     self.talkMode.updateGatewayConnected(false)
                 }
             })
@@ -644,41 +577,28 @@ final class NodeAppModel {
         switch route {
         case let .agent(link):
             await self.handleAgentDeepLink(link, originalURL: url)
-        case .gateway:
-            break
         }
     }
 
     private func handleAgentDeepLink(_ link: AgentDeepLink, originalURL: URL) async {
         let message = link.message.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !message.isEmpty else { return }
-        self.deepLinkLogger.info(
-            "agent deep link received messageChars=\(message.count) url=\(originalURL.absoluteString, privacy: .public)"
-        )
 
         if message.count > 20000 {
             self.screen.errorText = "Deep link too large (message exceeds 20,000 characters)."
-            self.recordShareEvent("Rejected: message too large (\(message.count) chars).")
             return
         }
 
         guard await self.isGatewayConnected() else {
             self.screen.errorText = "Gateway not connected (cannot forward deep link)."
-            self.recordShareEvent("Failed: gateway not connected.")
-            self.deepLinkLogger.error("agent deep link rejected: gateway not connected")
             return
         }
 
         do {
             try await self.sendAgentRequest(link: link)
             self.screen.errorText = nil
-            self.recordShareEvent("Sent to gateway (\(message.count) chars).")
-            self.deepLinkLogger.info("agent deep link forwarded to gateway")
-            self.openChatRequestID &+= 1
         } catch {
             self.screen.errorText = "Agent request failed: \(error.localizedDescription)"
-            self.recordShareEvent("Failed: \(error.localizedDescription)")
-            self.deepLinkLogger.error("agent deep link send failed: \(error.localizedDescription, privacy: .public)")
         }
     }
 
@@ -1425,14 +1345,6 @@ private extension NodeAppModel {
             return try await self.handleDeviceInvoke(req)
         }
 
-        register([
-            OpenClawWatchCommand.status.rawValue,
-            OpenClawWatchCommand.notify.rawValue,
-        ]) { [weak self] req in
-            guard let self else { throw NodeCapabilityRouter.RouterError.handlerUnavailable }
-            return try await self.handleWatchInvoke(req)
-        }
-
         register([OpenClawPhotosCommand.latest.rawValue]) { [weak self] req in
             guard let self else { throw NodeCapabilityRouter.RouterError.handlerUnavailable }
             return try await self.handlePhotosInvoke(req)
@@ -1483,67 +1395,14 @@ private extension NodeAppModel {
         return NodeCapabilityRouter(handlers: handlers)
     }
 
-    func handleWatchInvoke(_ req: BridgeInvokeRequest) async throws -> BridgeInvokeResponse {
-        switch req.command {
-        case OpenClawWatchCommand.status.rawValue:
-            let status = await self.watchMessagingService.status()
-            let payload = OpenClawWatchStatusPayload(
-                supported: status.supported,
-                paired: status.paired,
-                appInstalled: status.appInstalled,
-                reachable: status.reachable,
-                activationState: status.activationState)
-            let json = try Self.encodePayload(payload)
-            return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: json)
-        case OpenClawWatchCommand.notify.rawValue:
-            let params = try Self.decodeParams(OpenClawWatchNotifyParams.self, from: req.paramsJSON)
-            let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
-            let body = params.body.trimmingCharacters(in: .whitespacesAndNewlines)
-            if title.isEmpty && body.isEmpty {
-                return BridgeInvokeResponse(
-                    id: req.id,
-                    ok: false,
-                    error: OpenClawNodeError(
-                        code: .invalidRequest,
-                        message: "INVALID_REQUEST: empty watch notification"))
-            }
-            do {
-                let result = try await self.watchMessagingService.sendNotification(
-                    id: req.id,
-                    title: title,
-                    body: body,
-                    priority: params.priority)
-                let payload = OpenClawWatchNotifyPayload(
-                    deliveredImmediately: result.deliveredImmediately,
-                    queuedForDelivery: result.queuedForDelivery,
-                    transport: result.transport)
-                let json = try Self.encodePayload(payload)
-                return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: json)
-            } catch {
-                return BridgeInvokeResponse(
-                    id: req.id,
-                    ok: false,
-                    error: OpenClawNodeError(
-                        code: .unavailable,
-                        message: error.localizedDescription))
-            }
-        default:
-            return BridgeInvokeResponse(
-                id: req.id,
-                ok: false,
-                error: OpenClawNodeError(code: .invalidRequest, message: "INVALID_REQUEST: unknown command"))
-        }
-    }
-
     func locationMode() -> OpenClawLocationMode {
         let raw = UserDefaults.standard.string(forKey: "location.enabledMode") ?? "off"
         return OpenClawLocationMode(rawValue: raw) ?? .off
     }
 
     func isLocationPreciseEnabled() -> Bool {
-        // iOS settings now expose a single location mode control.
-        // Default location tool precision stays high unless a command explicitly requests balanced.
-        true
+        if UserDefaults.standard.object(forKey: "location.preciseEnabled") == nil { return true }
+        return UserDefaults.standard.bool(forKey: "location.preciseEnabled")
     }
 
     static func decodeParams<T: Decodable>(_ type: T.Type, from json: String?) throws -> T {
@@ -1595,26 +1454,6 @@ private extension NodeAppModel {
 }
 
 extension NodeAppModel {
-    var mainSessionKey: String {
-        let base = SessionKey.normalizeMainKey(self.mainSessionBaseKey)
-        let agentId = (self.selectedAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        let defaultId = (self.gatewayDefaultAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        if agentId.isEmpty || (!defaultId.isEmpty && agentId == defaultId) { return base }
-        return SessionKey.makeAgentSessionKey(agentId: agentId, baseKey: base)
-    }
-
-    var activeAgentName: String {
-        let agentId = (self.selectedAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        let defaultId = (self.gatewayDefaultAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        let resolvedId = agentId.isEmpty ? defaultId : agentId
-        if resolvedId.isEmpty { return "Main" }
-        if let match = self.gatewayAgents.first(where: { $0.id == resolvedId }) {
-            let name = (match.name ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            return name.isEmpty ? match.id : name
-        }
-        return resolvedId
-    }
-
     func connectToGateway(
         url: URL,
         gatewayStableID: String,
@@ -1667,8 +1506,6 @@ extension NodeAppModel {
 
     func disconnectGateway() {
         self.gatewayAutoReconnectEnabled = false
-        self.gatewayPairingPaused = false
-        self.gatewayPairingRequestId = nil
         self.nodeGatewayTask?.cancel()
         self.nodeGatewayTask = nil
         self.operatorGatewayTask?.cancel()
@@ -1691,7 +1528,6 @@ extension NodeAppModel {
         self.seamColorHex = nil
         self.mainSessionBaseKey = "main"
         self.talkMode.updateMainSessionKey(self.mainSessionKey)
-        ShareGatewayRelaySettings.clearConfig()
         self.showLocalCanvasOnDisconnect()
     }
 }
@@ -1699,8 +1535,6 @@ extension NodeAppModel {
 private extension NodeAppModel {
     func prepareForGatewayConnect(url: URL, stableID: String) {
         self.gatewayAutoReconnectEnabled = true
-        self.gatewayPairingPaused = false
-        self.gatewayPairingRequestId = nil
         self.nodeGatewayTask?.cancel()
         self.operatorGatewayTask?.cancel()
         self.gatewayHealthMonitor.stop()
@@ -1714,7 +1548,6 @@ private extension NodeAppModel {
         self.gatewayDefaultAgentId = nil
         self.gatewayAgents = []
         self.selectedAgentId = GatewaySettingsStore.loadGatewaySelectedAgentId(stableID: stableID)
-        self.apnsLastRegisteredTokenHex = nil
     }
 
     func startOperatorGatewayLoop(
@@ -1731,14 +1564,6 @@ private extension NodeAppModel {
             guard let self else { return }
             var attempt = 0
             while !Task.isCancelled {
-                if self.gatewayPairingPaused {
-                    try? await Task.sleep(nanoseconds: 1_000_000_000)
-                    continue
-                }
-                if !self.gatewayAutoReconnectEnabled {
-                    try? await Task.sleep(nanoseconds: 1_000_000_000)
-                    continue
-                }
                 if await self.isOperatorConnected() {
                     try? await Task.sleep(nanoseconds: 1_000_000_000)
                     continue
@@ -1767,7 +1592,6 @@ private extension NodeAppModel {
                                 "operator gateway connected host=\(url.host ?? "?") scheme=\(url.scheme ?? "?")")
                             await self.refreshBrandingFromGateway()
                             await self.refreshAgentsFromGateway()
-                            await self.refreshShareRouteFromGateway()
                             await self.startVoiceWakeSync()
                             await MainActor.run { self.startGatewayHealthMonitor() }
                         },
@@ -1815,17 +1639,8 @@ private extension NodeAppModel {
             var attempt = 0
             var currentOptions = nodeOptions
             var didFallbackClientId = false
-            var pausedForPairingApproval = false
 
             while !Task.isCancelled {
-                if self.gatewayPairingPaused {
-                    try? await Task.sleep(nanoseconds: 1_000_000_000)
-                    continue
-                }
-                if !self.gatewayAutoReconnectEnabled {
-                    try? await Task.sleep(nanoseconds: 1_000_000_000)
-                    continue
-                }
                 if await self.isGatewayConnected() {
                     try? await Task.sleep(nanoseconds: 1_000_000_000)
                     continue
@@ -1854,28 +1669,12 @@ private extension NodeAppModel {
                                 self.screen.errorText = nil
                                 UserDefaults.standard.set(true, forKey: "gateway.autoconnect")
                             }
-                            let relayData = await MainActor.run {
-                                (
-                                    sessionKey: self.mainSessionKey,
-                                    deliveryChannel: self.shareDeliveryChannel,
-                                    deliveryTo: self.shareDeliveryTo
-                                )
-                            }
-                            ShareGatewayRelaySettings.saveConfig(
-                                ShareGatewayRelayConfig(
-                                    gatewayURLString: url.absoluteString,
-                                    token: token,
-                                    password: password,
-                                    sessionKey: relayData.sessionKey,
-                                    deliveryChannel: relayData.deliveryChannel,
-                                    deliveryTo: relayData.deliveryTo))
-                            GatewayDiagnostics.log("gateway connected host=\(url.host ?? "?") scheme=\(url.scheme ?? "?")")
+                            GatewayDiagnostics.log(
+                                "gateway connected host=\(url.host ?? "?") scheme=\(url.scheme ?? "?")")
                             if let addr = await self.nodeGateway.currentRemoteAddress() {
                                 await MainActor.run { self.gatewayRemoteAddress = addr }
                             }
                             await self.showA2UIOnConnectIfNeeded()
-                            await self.onNodeGatewayConnected()
-                            await MainActor.run { SignificantLocationMonitor.startIfNeeded(locationService: self.locationService, locationMode: self.locationMode(), gateway: self.nodeGateway) }
                         },
                         onDisconnected: { [weak self] reason in
                             guard let self else { return }
@@ -1927,60 +1726,11 @@ private extension NodeAppModel {
                         self.showLocalCanvasOnDisconnect()
                     }
                     GatewayDiagnostics.log("gateway connect error: \(error.localizedDescription)")
-
-                    // If auth is missing/rejected, pause reconnect churn until the user intervenes.
-                    // Reconnect loops only spam the same failing handshake and make onboarding noisy.
-                    let lower = error.localizedDescription.lowercased()
-                    if lower.contains("unauthorized") || lower.contains("gateway token missing") {
-                        await MainActor.run {
-                            self.gatewayAutoReconnectEnabled = false
-                        }
-                    }
-
-                    // If pairing is required, stop reconnect churn. The user must approve the request
-                    // on the gateway before another connect attempt will succeed, and retry loops can
-                    // generate multiple pending requests.
-                    if lower.contains("not_paired") || lower.contains("pairing required") {
-                        let requestId: String? = {
-                            // GatewayResponseError for connect decorates the message with `(requestId: ...)`.
-                            // Keep this resilient since other layers may wrap the text.
-                            let text = error.localizedDescription
-                            guard let start = text.range(of: "(requestId: ")?.upperBound else { return nil }
-                            guard let end = text[start...].firstIndex(of: ")") else { return nil }
-                            let raw = String(text[start..<end]).trimmingCharacters(in: .whitespacesAndNewlines)
-                            return raw.isEmpty ? nil : raw
-                        }()
-                        await MainActor.run {
-                            self.gatewayAutoReconnectEnabled = false
-                            self.gatewayPairingPaused = true
-                            self.gatewayPairingRequestId = requestId
-                            if let requestId, !requestId.isEmpty {
-                                self.gatewayStatusText =
-                                    "Pairing required (requestId: \(requestId)). Approve on gateway and return to OpenClaw."
-                            } else {
-                                self.gatewayStatusText = "Pairing required. Approve on gateway and return to OpenClaw."
-                            }
-                        }
-                        // Hard stop the underlying WebSocket watchdog reconnects so the UI stays stable and
-                        // we don't generate multiple pending requests while waiting for approval.
-                        pausedForPairingApproval = true
-                        self.operatorGatewayTask?.cancel()
-                        self.operatorGatewayTask = nil
-                        await self.operatorGateway.disconnect()
-                        await self.nodeGateway.disconnect()
-                        break
-                    }
-
                     let sleepSeconds = min(8.0, 0.5 * pow(1.7, Double(attempt)))
                     try? await Task.sleep(nanoseconds: UInt64(sleepSeconds * 1_000_000_000))
                 }
             }
 
-            if pausedForPairingApproval {
-                // Leave the status text + request id intact so onboarding can guide the user.
-                return
-            }
-
             await MainActor.run {
                 self.gatewayStatusText = "Offline"
                 self.gatewayServerName = nil
@@ -2007,8 +1757,6 @@ private extension NodeAppModel {
             clientId: clientId,
             clientMode: "ui",
             clientDisplayName: displayName,
-            // Operator traffic should authenticate via shared gateway auth only.
-            // Including device identity here can trigger duplicate pairing flows.
             includeDeviceIdentity: false)
     }
 
@@ -2027,206 +1775,6 @@ private extension NodeAppModel {
     }
 }
 
-extension NodeAppModel {
-    private func refreshShareRouteFromGateway() async {
-        struct Params: Codable {
-            var includeGlobal: Bool
-            var includeUnknown: Bool
-            var limit: Int
-        }
-        struct SessionRow: Decodable {
-            var key: String
-            var updatedAt: Double?
-            var lastChannel: String?
-            var lastTo: String?
-        }
-        struct SessionsListResult: Decodable {
-            var sessions: [SessionRow]
-        }
-
-        let normalize: (String?) -> String? = { raw in
-            let value = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            return value.isEmpty ? nil : value
-        }
-
-        do {
-            let data = try JSONEncoder().encode(
-                Params(includeGlobal: true, includeUnknown: false, limit: 80))
-            guard let json = String(data: data, encoding: .utf8) else { return }
-            let response = try await self.operatorGateway.request(
-                method: "sessions.list",
-                paramsJSON: json,
-                timeoutSeconds: 10)
-            let decoded = try JSONDecoder().decode(SessionsListResult.self, from: response)
-            let currentKey = self.mainSessionKey
-            let sorted = decoded.sessions.sorted { ($0.updatedAt ?? 0) > ($1.updatedAt ?? 0) }
-            let exactMatch = sorted.first { row in
-                row.key == currentKey && normalize(row.lastChannel) != nil && normalize(row.lastTo) != nil
-            }
-            let selected = exactMatch
-            let channel = normalize(selected?.lastChannel)
-            let to = normalize(selected?.lastTo)
-
-            await MainActor.run {
-                self.shareDeliveryChannel = channel
-                self.shareDeliveryTo = to
-                if let relay = ShareGatewayRelaySettings.loadConfig() {
-                    ShareGatewayRelaySettings.saveConfig(
-                        ShareGatewayRelayConfig(
-                            gatewayURLString: relay.gatewayURLString,
-                            token: relay.token,
-                            password: relay.password,
-                            sessionKey: self.mainSessionKey,
-                            deliveryChannel: channel,
-                            deliveryTo: to))
-                }
-            }
-        } catch {
-            // Best-effort only.
-        }
-    }
-
-    func runSharePipelineSelfTest() async {
-        self.recordShareEvent("Share self-test running…")
-
-        let payload = SharedContentPayload(
-            title: "OpenClaw Share Self-Test",
-            url: URL(string: "https://openclaw.ai/share-self-test"),
-            text: "Validate iOS share->deep-link->gateway forwarding.")
-        guard let deepLink = ShareToAgentDeepLink.buildURL(
-            from: payload,
-            instruction: "Reply with: SHARE SELF-TEST OK")
-        else {
-            self.recordShareEvent("Self-test failed: could not build deep link.")
-            return
-        }
-
-        await self.handleDeepLink(url: deepLink)
-    }
-
-    func refreshLastShareEventFromRelay() {
-        if let event = ShareGatewayRelaySettings.loadLastEvent() {
-            self.lastShareEventText = event
-        }
-    }
-
-    func recordShareEvent(_ text: String) {
-        ShareGatewayRelaySettings.saveLastEvent(text)
-        self.refreshLastShareEventFromRelay()
-    }
-
-    func reloadTalkConfig() {
-        Task { [weak self] in
-            await self?.talkMode.reloadConfig()
-        }
-    }
-
-    /// Back-compat hook retained for older gateway-connect flows.
-    func onNodeGatewayConnected() async {
-        await self.registerAPNsTokenIfNeeded()
-    }
-
-    func handleSilentPushWake(_ userInfo: [AnyHashable: Any]) async -> Bool {
-        guard Self.isSilentPushPayload(userInfo) else {
-            self.pushWakeLogger.info("Ignored APNs payload: not silent push")
-            return false
-        }
-        self.pushWakeLogger.info("Silent push received; attempting reconnect if needed")
-        return await self.reconnectGatewaySessionsForSilentPushIfNeeded()
-    }
-
-    func updateAPNsDeviceToken(_ tokenData: Data) {
-        let tokenHex = tokenData.map { String(format: "%02x", $0) }.joined()
-        let trimmed = tokenHex.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return }
-        self.apnsDeviceTokenHex = trimmed
-        UserDefaults.standard.set(trimmed, forKey: Self.apnsDeviceTokenUserDefaultsKey)
-        Task { [weak self] in
-            await self?.registerAPNsTokenIfNeeded()
-        }
-    }
-
-    private func registerAPNsTokenIfNeeded() async {
-        guard self.gatewayConnected else { return }
-        guard let token = self.apnsDeviceTokenHex?.trimmingCharacters(in: .whitespacesAndNewlines),
-              !token.isEmpty
-        else {
-            return
-        }
-        if token == self.apnsLastRegisteredTokenHex {
-            return
-        }
-        guard let topic = Bundle.main.bundleIdentifier?.trimmingCharacters(in: .whitespacesAndNewlines),
-              !topic.isEmpty
-        else {
-            return
-        }
-
-        struct PushRegistrationPayload: Codable {
-            var token: String
-            var topic: String
-            var environment: String
-        }
-
-        let payload = PushRegistrationPayload(
-            token: token,
-            topic: topic,
-            environment: Self.apnsEnvironment)
-        do {
-            let json = try Self.encodePayload(payload)
-            await self.nodeGateway.sendEvent(event: "push.apns.register", payloadJSON: json)
-            self.apnsLastRegisteredTokenHex = token
-        } catch {
-            // Best-effort only.
-        }
-    }
-
-    private static func isSilentPushPayload(_ userInfo: [AnyHashable: Any]) -> Bool {
-        guard let apsAny = userInfo["aps"] else { return false }
-        if let aps = apsAny as? [AnyHashable: Any] {
-            return Self.hasContentAvailable(aps["content-available"])
-        }
-        if let aps = apsAny as? [String: Any] {
-            return Self.hasContentAvailable(aps["content-available"])
-        }
-        return false
-    }
-
-    private static func hasContentAvailable(_ value: Any?) -> Bool {
-        if let number = value as? NSNumber {
-            return number.intValue == 1
-        }
-        if let text = value as? String {
-            return text.trimmingCharacters(in: .whitespacesAndNewlines) == "1"
-        }
-        return false
-    }
-
-    private func reconnectGatewaySessionsForSilentPushIfNeeded() async -> Bool {
-        guard self.isBackgrounded else {
-            self.pushWakeLogger.info("Wake no-op: app not backgrounded")
-            return false
-        }
-        guard self.gatewayAutoReconnectEnabled else {
-            self.pushWakeLogger.info("Wake no-op: auto reconnect disabled")
-            return false
-        }
-        guard self.activeGatewayConnectConfig != nil else {
-            self.pushWakeLogger.info("Wake no-op: no active gateway config")
-            return false
-        }
-
-        await self.operatorGateway.disconnect()
-        await self.nodeGateway.disconnect()
-        self.operatorConnected = false
-        self.gatewayConnected = false
-        self.gatewayStatusText = "Reconnecting…"
-        self.talkMode.updateGatewayConnected(false)
-        self.pushWakeLogger.info("Wake reconnect trigger applied")
-        return true
-    }
-}
-
 #if DEBUG
 extension NodeAppModel {
     func _test_handleInvoke(_ req: BridgeInvokeRequest) async -> BridgeInvokeResponse {
@@ -2260,9 +1808,5 @@ extension NodeAppModel {
     func _test_showLocalCanvasOnDisconnect() {
         self.showLocalCanvasOnDisconnect()
     }
-
-    func _test_applyTalkModeSync(enabled: Bool, phase: String? = nil) {
-        self.applyTalkModeSync(enabled: enabled, phase: phase)
-    }
 }
 #endif

apps/ios/Sources/Onboarding/OnboardingStateStore.swift

@@ -1,52 +0,0 @@
-import Foundation
-
-enum OnboardingConnectionMode: String, CaseIterable {
-    case homeNetwork = "home_network"
-    case remoteDomain = "remote_domain"
-    case developerLocal = "developer_local"
-
-    var title: String {
-        switch self {
-        case .homeNetwork:
-            "Home Network"
-        case .remoteDomain:
-            "Remote Domain"
-        case .developerLocal:
-            "Same Machine (Dev)"
-        }
-    }
-}
-
-enum OnboardingStateStore {
-    private static let completedDefaultsKey = "onboarding.completed"
-    private static let lastModeDefaultsKey = "onboarding.last_mode"
-    private static let lastSuccessTimeDefaultsKey = "onboarding.last_success_time"
-
-    @MainActor
-    static func shouldPresentOnLaunch(appModel: NodeAppModel, defaults: UserDefaults = .standard) -> Bool {
-        if defaults.bool(forKey: Self.completedDefaultsKey) { return false }
-        // If we have a last-known connection config, don't force onboarding on launch. Auto-connect
-        // should handle reconnecting, and users can always open onboarding manually if needed.
-        if GatewaySettingsStore.loadLastGatewayConnection() != nil { return false }
-        return appModel.gatewayServerName == nil
-    }
-
-    static func markCompleted(mode: OnboardingConnectionMode? = nil, defaults: UserDefaults = .standard) {
-        defaults.set(true, forKey: Self.completedDefaultsKey)
-        if let mode {
-            defaults.set(mode.rawValue, forKey: Self.lastModeDefaultsKey)
-        }
-        defaults.set(Int(Date().timeIntervalSince1970), forKey: Self.lastSuccessTimeDefaultsKey)
-    }
-
-    static func markIncomplete(defaults: UserDefaults = .standard) {
-        defaults.set(false, forKey: Self.completedDefaultsKey)
-    }
-
-    static func lastMode(defaults: UserDefaults = .standard) -> OnboardingConnectionMode? {
-        let raw = defaults.string(forKey: Self.lastModeDefaultsKey)?
-            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        guard !raw.isEmpty else { return nil }
-        return OnboardingConnectionMode(rawValue: raw)
-    }
-}

apps/ios/Sources/Onboarding/OnboardingWizardView.swift

@@ -1,890 +0,0 @@
-import CoreImage
-import Combine
-import OpenClawKit
-import PhotosUI
-import SwiftUI
-import UIKit
-
-private enum OnboardingStep: Int, CaseIterable {
-    case welcome
-    case mode
-    case connect
-    case auth
-    case success
-
-    var previous: Self? {
-        Self(rawValue: self.rawValue - 1)
-    }
-
-    var next: Self? {
-        Self(rawValue: self.rawValue + 1)
-    }
-
-    /// Progress label for the manual setup flow (mode → connect → auth → success).
-    var manualProgressTitle: String {
-        let manualSteps: [OnboardingStep] = [.mode, .connect, .auth, .success]
-        guard let idx = manualSteps.firstIndex(of: self) else { return "" }
-        return "Step \(idx + 1) of \(manualSteps.count)"
-    }
-
-    var title: String {
-        switch self {
-        case .welcome: "Welcome"
-        case .mode: "Connection Mode"
-        case .connect: "Connect"
-        case .auth: "Authentication"
-        case .success: "Connected"
-        }
-    }
-
-    var canGoBack: Bool {
-        self != .welcome && self != .success
-    }
-}
-
-struct OnboardingWizardView: View {
-    @Environment(NodeAppModel.self) private var appModel: NodeAppModel
-    @Environment(GatewayConnectionController.self) private var gatewayController: GatewayConnectionController
-    @Environment(\.scenePhase) private var scenePhase
-    @AppStorage("node.instanceId") private var instanceId: String = UUID().uuidString
-    @AppStorage("gateway.discovery.domain") private var discoveryDomain: String = ""
-    @AppStorage("onboarding.developerMode") private var developerModeEnabled: Bool = false
-    @State private var step: OnboardingStep = .welcome
-    @State private var selectedMode: OnboardingConnectionMode?
-    @State private var manualHost: String = ""
-    @State private var manualPort: Int = 18789
-    @State private var manualPortText: String = "18789"
-    @State private var manualTLS: Bool = true
-    @State private var gatewayToken: String = ""
-    @State private var gatewayPassword: String = ""
-    @State private var connectMessage: String?
-    @State private var statusLine: String = "Scan the QR code from your gateway to connect."
-    @State private var connectingGatewayID: String?
-    @State private var issue: GatewayConnectionIssue = .none
-    @State private var didMarkCompleted = false
-    @State private var didAutoPresentQR = false
-    @State private var pairingRequestId: String?
-    @State private var discoveryRestartTask: Task<Void, Never>?
-    @State private var showQRScanner: Bool = false
-    @State private var scannerError: String?
-    @State private var selectedPhoto: PhotosPickerItem?
-    @State private var lastPairingAutoResumeAttemptAt: Date?
-    private static let pairingAutoResumeTicker = Timer.publish(every: 2.0, on: .main, in: .common).autoconnect()
-
-    let allowSkip: Bool
-    let onClose: () -> Void
-
-    private var isFullScreenStep: Bool {
-        self.step == .welcome || self.step == .success
-    }
-
-    var body: some View {
-        NavigationStack {
-            Group {
-                switch self.step {
-                case .welcome:
-                    self.welcomeStep
-                case .success:
-                    self.successStep
-                default:
-                    Form {
-                        switch self.step {
-                        case .mode:
-                            self.modeStep
-                        case .connect:
-                            self.connectStep
-                        case .auth:
-                            self.authStep
-                        default:
-                            EmptyView()
-                        }
-                    }
-                    .scrollDismissesKeyboard(.interactively)
-                }
-            }
-            .navigationTitle(self.isFullScreenStep ? "" : self.step.title)
-            .navigationBarTitleDisplayMode(.inline)
-            .toolbar {
-                if !self.isFullScreenStep {
-                    ToolbarItem(placement: .principal) {
-                        VStack(spacing: 2) {
-                            Text(self.step.title)
-                                .font(.headline)
-                            Text(self.step.manualProgressTitle)
-                                .font(.caption2)
-                                .foregroundStyle(.secondary)
-                        }
-                    }
-                }
-                ToolbarItem(placement: .topBarLeading) {
-                    if self.step.canGoBack {
-                        Button {
-                            self.navigateBack()
-                        } label: {
-                            Label("Back", systemImage: "chevron.left")
-                        }
-                    } else if self.allowSkip {
-                        Button("Close") {
-                            self.onClose()
-                        }
-                    }
-                }
-                ToolbarItemGroup(placement: .keyboard) {
-                    Spacer()
-                    Button("Done") {
-                        UIApplication.shared.sendAction(
-                            #selector(UIResponder.resignFirstResponder),
-                            to: nil, from: nil, for: nil)
-                    }
-                }
-            }
-        }
-        .gatewayTrustPromptAlert()
-        .alert("QR Scanner Unavailable", isPresented: Binding(
-            get: { self.scannerError != nil },
-            set: { if !$0 { self.scannerError = nil } }
-        )) {
-            Button("OK", role: .cancel) {}
-        } message: {
-            Text(self.scannerError ?? "")
-        }
-        .sheet(isPresented: self.$showQRScanner) {
-            NavigationStack {
-                QRScannerView(
-                    onGatewayLink: { link in
-                        self.handleScannedLink(link)
-                    },
-                    onError: { error in
-                        self.showQRScanner = false
-                        self.statusLine = "Scanner error: \(error)"
-                        self.scannerError = error
-                    },
-                    onDismiss: {
-                        self.showQRScanner = false
-                    })
-                    .ignoresSafeArea()
-                    .navigationTitle("Scan QR Code")
-                    .navigationBarTitleDisplayMode(.inline)
-                    .toolbar {
-                        ToolbarItem(placement: .topBarLeading) {
-                            Button("Cancel") { self.showQRScanner = false }
-                        }
-                        ToolbarItem(placement: .topBarTrailing) {
-                            PhotosPicker(selection: self.$selectedPhoto, matching: .images) {
-                                Label("Photos", systemImage: "photo")
-                            }
-                        }
-                    }
-            }
-            .onChange(of: self.selectedPhoto) { _, newValue in
-                guard let item = newValue else { return }
-                self.selectedPhoto = nil
-                Task {
-                    guard let data = try? await item.loadTransferable(type: Data.self) else {
-                        self.showQRScanner = false
-                        self.scannerError = "Could not load the selected image."
-                        return
-                    }
-                    if let message = self.detectQRCode(from: data) {
-                        if let link = GatewayConnectDeepLink.fromSetupCode(message) {
-                            self.handleScannedLink(link)
-                            return
-                        }
-                        if let url = URL(string: message),
-                           let route = DeepLinkParser.parse(url),
-                           case let .gateway(link) = route
-                        {
-                            self.handleScannedLink(link)
-                            return
-                        }
-                    }
-                    self.showQRScanner = false
-                    self.scannerError = "No valid QR code found in the selected image."
-                }
-            }
-        }
-        .onAppear {
-            self.initializeState()
-        }
-        .onDisappear {
-            self.discoveryRestartTask?.cancel()
-            self.discoveryRestartTask = nil
-        }
-        .onChange(of: self.discoveryDomain) { _, _ in
-            self.scheduleDiscoveryRestart()
-        }
-        .onChange(of: self.manualPortText) { _, newValue in
-            let digits = newValue.filter(\.isNumber)
-            if digits != newValue {
-                self.manualPortText = digits
-                return
-            }
-            guard let parsed = Int(digits), parsed > 0 else {
-                self.manualPort = 0
-                return
-            }
-            self.manualPort = min(parsed, 65535)
-        }
-        .onChange(of: self.manualPort) { _, newValue in
-            let normalized = newValue > 0 ? String(newValue) : ""
-            if self.manualPortText != normalized {
-                self.manualPortText = normalized
-            }
-        }
-        .onChange(of: self.gatewayToken) { _, newValue in
-            self.saveGatewayCredentials(token: newValue, password: self.gatewayPassword)
-        }
-        .onChange(of: self.gatewayPassword) { _, newValue in
-            self.saveGatewayCredentials(token: self.gatewayToken, password: newValue)
-        }
-        .onChange(of: self.appModel.gatewayStatusText) { _, newValue in
-            let next = GatewayConnectionIssue.detect(from: newValue)
-            // Avoid "flip-flopping" the UI by clearing actionable issues when the underlying connection
-            // transitions through intermediate statuses (e.g. Offline/Connecting while reconnect churns).
-            if self.issue.needsPairing, next.needsPairing {
-                // Keep the requestId sticky even if the status line omits it after we pause.
-                let mergedRequestId = next.requestId ?? self.issue.requestId ?? self.pairingRequestId
-                self.issue = .pairingRequired(requestId: mergedRequestId)
-            } else if self.issue.needsPairing, !next.needsPairing {
-                // Ignore non-pairing statuses until the user explicitly retries/scans again, or we connect.
-            } else if self.issue.needsAuthToken, !next.needsAuthToken, !next.needsPairing {
-                // Same idea for auth: once we learn credentials are missing/rejected, keep that sticky until
-                // the user retries/scans again or we successfully connect.
-            } else {
-                self.issue = next
-            }
-
-            if let requestId = next.requestId, !requestId.isEmpty {
-                self.pairingRequestId = requestId
-            }
-
-            // If the gateway tells us auth is missing/rejected, stop reconnect churn until the user intervenes.
-            if next.needsAuthToken {
-                self.appModel.gatewayAutoReconnectEnabled = false
-            }
-
-            if self.issue.needsAuthToken || self.issue.needsPairing {
-                self.step = .auth
-            }
-            if !newValue.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-                self.connectMessage = newValue
-                self.statusLine = newValue
-            }
-        }
-        .onChange(of: self.appModel.gatewayServerName) { _, newValue in
-            guard newValue != nil else { return }
-            self.showQRScanner = false
-            self.statusLine = "Connected."
-            if !self.didMarkCompleted, let selectedMode {
-                OnboardingStateStore.markCompleted(mode: selectedMode)
-                self.didMarkCompleted = true
-            }
-            self.onClose()
-        }
-        .onChange(of: self.scenePhase) { _, newValue in
-            guard newValue == .active else { return }
-            self.attemptAutomaticPairingResumeIfNeeded()
-        }
-        .onReceive(Self.pairingAutoResumeTicker) { _ in
-            self.attemptAutomaticPairingResumeIfNeeded()
-        }
-    }
-
-    @ViewBuilder
-    private var welcomeStep: some View {
-        VStack(spacing: 0) {
-            Spacer()
-
-            Image(systemName: "qrcode.viewfinder")
-                .font(.system(size: 64))
-                .foregroundStyle(.tint)
-                .padding(.bottom, 20)
-
-            Text("Welcome")
-                .font(.largeTitle.weight(.bold))
-                .padding(.bottom, 8)
-
-            Text("Connect to your OpenClaw gateway")
-                .font(.subheadline)
-                .foregroundStyle(.secondary)
-                .multilineTextAlignment(.center)
-                .padding(.horizontal, 32)
-
-            Spacer()
-
-            VStack(spacing: 12) {
-                Button {
-                    self.statusLine = "Opening QR scanner…"
-                    self.showQRScanner = true
-                } label: {
-                    Label("Scan QR Code", systemImage: "qrcode")
-                        .frame(maxWidth: .infinity)
-                }
-                .buttonStyle(.borderedProminent)
-                .controlSize(.large)
-
-                Button {
-                    self.step = .mode
-                } label: {
-                    Text("Set Up Manually")
-                        .frame(maxWidth: .infinity)
-                }
-                .buttonStyle(.bordered)
-                .controlSize(.large)
-            }
-            .padding(.bottom, 12)
-
-            Text(self.statusLine)
-                .font(.footnote)
-                .foregroundStyle(.secondary)
-                .multilineTextAlignment(.center)
-                .padding(.horizontal, 24)
-            .padding(.horizontal, 24)
-            .padding(.bottom, 48)
-        }
-    }
-
-    @ViewBuilder
-    private var modeStep: some View {
-        Section("Connection Mode") {
-            OnboardingModeRow(
-                title: OnboardingConnectionMode.homeNetwork.title,
-                subtitle: "LAN or Tailscale host",
-                selected: self.selectedMode == .homeNetwork)
-            {
-                self.selectMode(.homeNetwork)
-            }
-
-            OnboardingModeRow(
-                title: OnboardingConnectionMode.remoteDomain.title,
-                subtitle: "VPS with domain",
-                selected: self.selectedMode == .remoteDomain)
-            {
-                self.selectMode(.remoteDomain)
-            }
-
-            Toggle(
-                "Developer mode",
-                isOn: Binding(
-                    get: { self.developerModeEnabled },
-                    set: { newValue in
-                        self.developerModeEnabled = newValue
-                        if !newValue, self.selectedMode == .developerLocal {
-                            self.selectedMode = nil
-                        }
-                    }))
-
-            if self.developerModeEnabled {
-                OnboardingModeRow(
-                    title: OnboardingConnectionMode.developerLocal.title,
-                    subtitle: "For local iOS app development",
-                    selected: self.selectedMode == .developerLocal)
-                {
-                    self.selectMode(.developerLocal)
-                }
-            }
-        }
-
-        Section {
-            Button("Continue") {
-                self.step = .connect
-            }
-            .disabled(self.selectedMode == nil)
-        }
-    }
-
-    @ViewBuilder
-    private var connectStep: some View {
-        if let selectedMode {
-            Section {
-                LabeledContent("Mode", value: selectedMode.title)
-                LabeledContent("Discovery", value: self.gatewayController.discoveryStatusText)
-                LabeledContent("Status", value: self.appModel.gatewayStatusText)
-                LabeledContent("Progress", value: self.statusLine)
-            } header: {
-                Text("Status")
-            } footer: {
-                if let connectMessage {
-                    Text(connectMessage)
-                }
-            }
-
-            switch selectedMode {
-            case .homeNetwork:
-                self.homeNetworkConnectSection
-            case .remoteDomain:
-                self.remoteDomainConnectSection
-            case .developerLocal:
-                self.developerConnectSection
-            }
-        } else {
-            Section {
-                Text("Choose a mode first.")
-                Button("Back to Mode Selection") {
-                    self.step = .mode
-                }
-            }
-        }
-    }
-
-    private var homeNetworkConnectSection: some View {
-        Group {
-            Section("Discovered Gateways") {
-                if self.gatewayController.gateways.isEmpty {
-                    Text("No gateways found yet.")
-                        .foregroundStyle(.secondary)
-                } else {
-                    ForEach(self.gatewayController.gateways) { gateway in
-                        let hasHost = self.gatewayHasResolvableHost(gateway)
-
-                        HStack {
-                            VStack(alignment: .leading, spacing: 4) {
-                                Text(gateway.name)
-                                if let host = gateway.lanHost ?? gateway.tailnetDns {
-                                    Text(host)
-                                        .font(.footnote)
-                                        .foregroundStyle(.secondary)
-                                }
-                            }
-                            Spacer()
-                            Button {
-                                Task { await self.connectDiscoveredGateway(gateway) }
-                            } label: {
-                                if self.connectingGatewayID == gateway.id {
-                                    ProgressView()
-                                        .progressViewStyle(.circular)
-                                } else if !hasHost {
-                                    Text("Resolving…")
-                                } else {
-                                    Text("Connect")
-                                }
-                            }
-                            .disabled(self.connectingGatewayID != nil || !hasHost)
-                        }
-                    }
-                }
-
-                Button("Restart Discovery") {
-                    self.gatewayController.restartDiscovery()
-                }
-                .disabled(self.connectingGatewayID != nil)
-            }
-
-            self.manualConnectionFieldsSection(title: "Manual Fallback")
-        }
-    }
-
-    private var remoteDomainConnectSection: some View {
-        self.manualConnectionFieldsSection(title: "Domain Settings")
-    }
-
-    private var developerConnectSection: some View {
-        Section {
-            TextField("Host", text: self.$manualHost)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
-            TextField("Port", text: self.$manualPortText)
-                .keyboardType(.numberPad)
-            Toggle("Use TLS", isOn: self.$manualTLS)
-
-            Button {
-                Task { await self.connectManual() }
-            } label: {
-                if self.connectingGatewayID == "manual" {
-                    HStack(spacing: 8) {
-                        ProgressView()
-                            .progressViewStyle(.circular)
-                        Text("Connecting…")
-                    }
-                } else {
-                    Text("Connect")
-                }
-            }
-            .disabled(!self.canConnectManual || self.connectingGatewayID != nil)
-        } header: {
-            Text("Developer Local")
-        } footer: {
-            Text("Default host is localhost. Use your Mac LAN IP if simulator networking requires it.")
-        }
-    }
-
-    private var authStep: some View {
-        Group {
-            Section("Authentication") {
-                TextField("Gateway Auth Token", text: self.$gatewayToken)
-                    .textInputAutocapitalization(.never)
-                    .autocorrectionDisabled()
-                SecureField("Gateway Password", text: self.$gatewayPassword)
-
-                if self.issue.needsAuthToken {
-                    Text("Gateway rejected credentials. Scan a fresh QR code or update token/password.")
-                        .font(.footnote)
-                        .foregroundStyle(.secondary)
-                } else {
-                    Text("Auth token looks valid.")
-                        .font(.footnote)
-                        .foregroundStyle(.secondary)
-                }
-            }
-
-            if self.issue.needsPairing {
-                Section {
-                    Button {
-                        self.resumeAfterPairingApproval()
-                    } label: {
-                        Label("Resume After Approval", systemImage: "arrow.clockwise")
-                    }
-                    .disabled(self.connectingGatewayID != nil)
-                } header: {
-                    Text("Pairing Approval")
-                } footer: {
-                    let requestLine: String = {
-                        if let id = self.issue.requestId, !id.isEmpty {
-                            return "Request ID: \(id)"
-                        }
-                        return "Request ID: check `openclaw devices list`."
-                    }()
-                    Text(
-                        "Approve this device on the gateway.\n"
-                            + "1) `openclaw devices approve` (or `openclaw devices approve <requestId>`)\n"
-                            + "2) `/pair approve` in Telegram\n"
-                            + "\(requestLine)\n"
-                            + "OpenClaw will also retry automatically when you return to this app.")
-                }
-            }
-
-            Section {
-                Button {
-                    self.openQRScannerFromOnboarding()
-                } label: {
-                    Label("Scan QR Code Again", systemImage: "qrcode.viewfinder")
-                }
-                .disabled(self.connectingGatewayID != nil)
-
-                Button {
-                    Task { await self.retryLastAttempt() }
-                } label: {
-                    if self.connectingGatewayID == "retry" {
-                        ProgressView()
-                            .progressViewStyle(.circular)
-                    } else {
-                        Text("Retry Connection")
-                    }
-                }
-                .disabled(self.connectingGatewayID != nil)
-            }
-        }
-    }
-
-    private var successStep: some View {
-        VStack(spacing: 0) {
-            Spacer()
-
-            Image(systemName: "checkmark.circle.fill")
-                .font(.system(size: 64))
-                .foregroundStyle(.green)
-                .padding(.bottom, 20)
-
-            Text("Connected")
-                .font(.largeTitle.weight(.bold))
-                .padding(.bottom, 8)
-
-            let server = self.appModel.gatewayServerName ?? "gateway"
-            Text(server)
-                .font(.subheadline)
-                .foregroundStyle(.secondary)
-                .padding(.bottom, 4)
-
-            if let addr = self.appModel.gatewayRemoteAddress {
-                Text(addr)
-                    .font(.subheadline)
-                    .foregroundStyle(.secondary)
-            }
-
-            Spacer()
-
-            Button {
-                self.onClose()
-            } label: {
-                Text("Open OpenClaw")
-                    .frame(maxWidth: .infinity)
-            }
-            .buttonStyle(.borderedProminent)
-            .controlSize(.large)
-            .padding(.horizontal, 24)
-            .padding(.bottom, 48)
-        }
-    }
-
-    @ViewBuilder
-    private func manualConnectionFieldsSection(title: String) -> some View {
-        Section(title) {
-            TextField("Host", text: self.$manualHost)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
-            TextField("Port", text: self.$manualPortText)
-                .keyboardType(.numberPad)
-            Toggle("Use TLS", isOn: self.$manualTLS)
-            TextField("Discovery Domain (optional)", text: self.$discoveryDomain)
-                .textInputAutocapitalization(.never)
-                .autocorrectionDisabled()
-
-            Button {
-                Task { await self.connectManual() }
-            } label: {
-                if self.connectingGatewayID == "manual" {
-                    HStack(spacing: 8) {
-                        ProgressView()
-                            .progressViewStyle(.circular)
-                        Text("Connecting…")
-                    }
-                } else {
-                    Text("Connect")
-                }
-            }
-            .disabled(!self.canConnectManual || self.connectingGatewayID != nil)
-        }
-    }
-
-    private func handleScannedLink(_ link: GatewayConnectDeepLink) {
-        self.manualHost = link.host
-        self.manualPort = link.port
-        self.manualTLS = link.tls
-        if let token = link.token {
-            self.gatewayToken = token
-        }
-        if let password = link.password {
-            self.gatewayPassword = password
-        }
-        self.saveGatewayCredentials(token: self.gatewayToken, password: self.gatewayPassword)
-        self.showQRScanner = false
-        self.connectMessage = "Connecting via QR code…"
-        self.statusLine = "QR loaded. Connecting to \(link.host):\(link.port)…"
-        if self.selectedMode == nil {
-            self.selectedMode = link.tls ? .remoteDomain : .homeNetwork
-        }
-        Task { await self.connectManual() }
-    }
-
-    private func openQRScannerFromOnboarding() {
-        // Stop active reconnect loops before scanning new credentials.
-        self.appModel.disconnectGateway()
-        self.connectingGatewayID = nil
-        self.connectMessage = nil
-        self.issue = .none
-        self.pairingRequestId = nil
-        self.statusLine = "Opening QR scanner…"
-        self.showQRScanner = true
-    }
-
-    private func resumeAfterPairingApproval() {
-        // We intentionally stop reconnect churn while unpaired to avoid generating multiple pending requests.
-        self.appModel.gatewayAutoReconnectEnabled = true
-        self.appModel.gatewayPairingPaused = false
-        self.appModel.gatewayPairingRequestId = nil
-        // Pairing state is sticky to prevent UI flip-flop during reconnect churn.
-        // Once the user explicitly resumes after approving, clear the sticky issue
-        // so new status/auth errors can surface instead of being masked as pairing.
-        self.issue = .none
-        self.connectMessage = "Retrying after approval…"
-        self.statusLine = "Retrying after approval…"
-        Task { await self.retryLastAttempt() }
-    }
-
-    private func resumeAfterPairingApprovalInBackground() {
-        // Keep the pairing issue sticky to avoid visual flicker while we probe for approval.
-        self.appModel.gatewayAutoReconnectEnabled = true
-        self.appModel.gatewayPairingPaused = false
-        self.appModel.gatewayPairingRequestId = nil
-        Task { await self.retryLastAttempt(silent: true) }
-    }
-
-    private func attemptAutomaticPairingResumeIfNeeded() {
-        guard self.scenePhase == .active else { return }
-        guard self.step == .auth else { return }
-        guard self.issue.needsPairing else { return }
-        guard self.connectingGatewayID == nil else { return }
-
-        let now = Date()
-        if let last = self.lastPairingAutoResumeAttemptAt, now.timeIntervalSince(last) < 6 {
-            return
-        }
-        self.lastPairingAutoResumeAttemptAt = now
-        self.resumeAfterPairingApprovalInBackground()
-    }
-
-    private func detectQRCode(from data: Data) -> String? {
-        guard let ciImage = CIImage(data: data) else { return nil }
-        let detector = CIDetector(
-            ofType: CIDetectorTypeQRCode, context: nil,
-            options: [CIDetectorAccuracy: CIDetectorAccuracyHigh])
-        let features = detector?.features(in: ciImage) ?? []
-        for feature in features {
-            if let qr = feature as? CIQRCodeFeature, let message = qr.messageString {
-                return message
-            }
-        }
-        return nil
-    }
-
-    private func navigateBack() {
-        guard let target = self.step.previous else { return }
-        self.connectingGatewayID = nil
-        self.connectMessage = nil
-        self.step = target
-    }
-    private var canConnectManual: Bool {
-        let host = self.manualHost.trimmingCharacters(in: .whitespacesAndNewlines)
-        return !host.isEmpty && self.manualPort > 0 && self.manualPort <= 65535
-    }
-
-    private func initializeState() {
-        if self.manualHost.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-            if let last = GatewaySettingsStore.loadLastGatewayConnection() {
-                switch last {
-                case let .manual(host, port, useTLS, _):
-                    self.manualHost = host
-                    self.manualPort = port
-                    self.manualTLS = useTLS
-                case .discovered:
-                    self.manualHost = "openclaw.local"
-                    self.manualPort = 18789
-                    self.manualTLS = true
-                }
-            } else {
-                self.manualHost = "openclaw.local"
-                self.manualPort = 18789
-                self.manualTLS = true
-            }
-        }
-        self.manualPortText = self.manualPort > 0 ? String(self.manualPort) : ""
-        if self.selectedMode == nil {
-            self.selectedMode = OnboardingStateStore.lastMode()
-        }
-        if self.selectedMode == .developerLocal && self.manualHost == "openclaw.local" {
-            self.manualHost = "localhost"
-            self.manualTLS = false
-        }
-
-        let trimmedInstanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
-        if !trimmedInstanceId.isEmpty {
-            self.gatewayToken = GatewaySettingsStore.loadGatewayToken(instanceId: trimmedInstanceId) ?? ""
-            self.gatewayPassword = GatewaySettingsStore.loadGatewayPassword(instanceId: trimmedInstanceId) ?? ""
-        }
-
-        let hasSavedGateway = GatewaySettingsStore.loadLastGatewayConnection() != nil
-        let hasToken = !self.gatewayToken.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-        let hasPassword = !self.gatewayPassword.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-        if !self.didAutoPresentQR, !hasSavedGateway, !hasToken, !hasPassword {
-            self.didAutoPresentQR = true
-            self.statusLine = "No saved pairing found. Scan QR code to connect."
-            self.showQRScanner = true
-        }
-    }
-
-    private func scheduleDiscoveryRestart() {
-        self.discoveryRestartTask?.cancel()
-        self.discoveryRestartTask = Task { @MainActor in
-            try? await Task.sleep(nanoseconds: 350_000_000)
-            guard !Task.isCancelled else { return }
-            self.gatewayController.restartDiscovery()
-        }
-    }
-
-    private func saveGatewayCredentials(token: String, password: String) {
-        let trimmedInstanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmedInstanceId.isEmpty else { return }
-        let trimmedToken = token.trimmingCharacters(in: .whitespacesAndNewlines)
-        GatewaySettingsStore.saveGatewayToken(trimmedToken, instanceId: trimmedInstanceId)
-        let trimmedPassword = password.trimmingCharacters(in: .whitespacesAndNewlines)
-        GatewaySettingsStore.saveGatewayPassword(trimmedPassword, instanceId: trimmedInstanceId)
-    }
-
-    private func connectDiscoveredGateway(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async {
-        self.connectingGatewayID = gateway.id
-        self.issue = .none
-        self.connectMessage = "Connecting to \(gateway.name)…"
-        self.statusLine = "Connecting to \(gateway.name)…"
-        defer { self.connectingGatewayID = nil }
-        await self.gatewayController.connect(gateway)
-    }
-
-    private func selectMode(_ mode: OnboardingConnectionMode) {
-        self.selectedMode = mode
-        self.applyModeDefaults(mode)
-    }
-
-    private func applyModeDefaults(_ mode: OnboardingConnectionMode) {
-        let host = self.manualHost.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        let hostIsDefaultLike = host.isEmpty || host == "openclaw.local" || host == "localhost"
-
-        switch mode {
-        case .homeNetwork:
-            if hostIsDefaultLike { self.manualHost = "openclaw.local" }
-            self.manualTLS = true
-            if self.manualPort <= 0 || self.manualPort > 65535 { self.manualPort = 18789 }
-        case .remoteDomain:
-            if host == "openclaw.local" || host == "localhost" { self.manualHost = "" }
-            self.manualTLS = true
-            if self.manualPort <= 0 || self.manualPort > 65535 { self.manualPort = 18789 }
-        case .developerLocal:
-            if hostIsDefaultLike { self.manualHost = "localhost" }
-            self.manualTLS = false
-            if self.manualPort <= 0 || self.manualPort > 65535 { self.manualPort = 18789 }
-        }
-    }
-
-    private func gatewayHasResolvableHost(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) -> Bool {
-        let lanHost = gateway.lanHost?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if !lanHost.isEmpty { return true }
-        let tailnetDns = gateway.tailnetDns?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        return !tailnetDns.isEmpty
-    }
-
-    private func connectManual() async {
-        let host = self.manualHost.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !host.isEmpty, self.manualPort > 0, self.manualPort <= 65535 else { return }
-        self.connectingGatewayID = "manual"
-        self.issue = .none
-        self.connectMessage = "Connecting to \(host)…"
-        self.statusLine = "Connecting to \(host):\(self.manualPort)…"
-        defer { self.connectingGatewayID = nil }
-        await self.gatewayController.connectManual(host: host, port: self.manualPort, useTLS: self.manualTLS)
-    }
-
-    private func retryLastAttempt(silent: Bool = false) async {
-        self.connectingGatewayID = silent ? "retry-auto" : "retry"
-        // Keep current auth/pairing issue sticky while retrying to avoid Step 3 UI flip-flop.
-        if !silent {
-            self.connectMessage = "Retrying…"
-            self.statusLine = "Retrying last connection…"
-        }
-        defer { self.connectingGatewayID = nil }
-        await self.gatewayController.connectLastKnown()
-    }
-}
-
-private struct OnboardingModeRow: View {
-    let title: String
-    let subtitle: String
-    let selected: Bool
-    let action: () -> Void
-
-    var body: some View {
-        Button(action: self.action) {
-            HStack {
-                VStack(alignment: .leading, spacing: 2) {
-                    Text(self.title)
-                        .font(.body.weight(.semibold))
-                    Text(self.subtitle)
-                        .font(.footnote)
-                        .foregroundStyle(.secondary)
-                }
-                Spacer()
-                Image(systemName: self.selected ? "checkmark.circle.fill" : "circle")
-                    .foregroundStyle(self.selected ? Color.accentColor : Color.secondary)
-            }
-        }
-        .buttonStyle(.plain)
-    }
-}

apps/ios/Sources/Onboarding/QRScannerView.swift

@@ -1,96 +0,0 @@
-import OpenClawKit
-import SwiftUI
-import VisionKit
-
-struct QRScannerView: UIViewControllerRepresentable {
-    let onGatewayLink: (GatewayConnectDeepLink) -> Void
-    let onError: (String) -> Void
-    let onDismiss: () -> Void
-
-    func makeUIViewController(context: Context) -> UIViewController {
-        guard DataScannerViewController.isSupported else {
-            context.coordinator.reportError("QR scanning is not supported on this device.")
-            return UIViewController()
-        }
-        guard DataScannerViewController.isAvailable else {
-            context.coordinator.reportError("Camera scanning is currently unavailable.")
-            return UIViewController()
-        }
-        let scanner = DataScannerViewController(
-            recognizedDataTypes: [.barcode(symbologies: [.qr])],
-            isHighlightingEnabled: true)
-        scanner.delegate = context.coordinator
-        do {
-            try scanner.startScanning()
-        } catch {
-            context.coordinator.reportError("Could not start QR scanner.")
-        }
-        return scanner
-    }
-
-    func updateUIViewController(_: UIViewController, context _: Context) {}
-
-    static func dismantleUIViewController(_ uiViewController: UIViewController, coordinator: Coordinator) {
-        if let scanner = uiViewController as? DataScannerViewController {
-            scanner.stopScanning()
-        }
-        coordinator.parent.onDismiss()
-    }
-
-    func makeCoordinator() -> Coordinator {
-        Coordinator(parent: self)
-    }
-
-    final class Coordinator: NSObject, DataScannerViewControllerDelegate {
-        let parent: QRScannerView
-        private var handled = false
-        private var reportedError = false
-
-        init(parent: QRScannerView) {
-            self.parent = parent
-        }
-
-        func reportError(_ message: String) {
-            guard !self.reportedError else { return }
-            self.reportedError = true
-            Task { @MainActor in
-                self.parent.onError(message)
-            }
-        }
-
-        func dataScanner(_: DataScannerViewController, didAdd items: [RecognizedItem], allItems _: [RecognizedItem]) {
-            guard !self.handled else { return }
-            for item in items {
-                guard case let .barcode(barcode) = item,
-                      let payload = barcode.payloadStringValue
-                else { continue }
-
-                // Try setup code format first (base64url JSON from /pair qr).
-                if let link = GatewayConnectDeepLink.fromSetupCode(payload) {
-                    self.handled = true
-                    self.parent.onGatewayLink(link)
-                    return
-                }
-
-                // Fall back to deep link URL format (openclaw://gateway?...).
-                if let url = URL(string: payload),
-                   let route = DeepLinkParser.parse(url),
-                   case let .gateway(link) = route
-                {
-                    self.handled = true
-                    self.parent.onGatewayLink(link)
-                    return
-                }
-            }
-        }
-
-        func dataScanner(_: DataScannerViewController, didRemove _: [RecognizedItem], allItems _: [RecognizedItem]) {}
-
-        func dataScanner(
-            _: DataScannerViewController,
-            becameUnavailableWithError _: DataScannerViewController.ScanningUnavailable)
-        {
-            self.reportError("Camera is not available on this device.")
-        }
-    }
-}

apps/ios/Sources/OpenClaw.entitlements

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>aps-environment</key>
-	<string>development</string>
-</dict>
-</plist>
-

apps/ios/Sources/OpenClawApp.swift

@@ -1,73 +1,12 @@
 import SwiftUI
-import Foundation
-import os
-import UIKit
-
-final class OpenClawAppDelegate: NSObject, UIApplicationDelegate {
-    private let logger = Logger(subsystem: "ai.openclaw.ios", category: "Push")
-    private var pendingAPNsDeviceToken: Data?
-    weak var appModel: NodeAppModel? {
-        didSet {
-            guard let model = self.appModel, let token = self.pendingAPNsDeviceToken else { return }
-            self.pendingAPNsDeviceToken = nil
-            Task { @MainActor in
-                model.updateAPNsDeviceToken(token)
-            }
-        }
-    }
-
-    func application(
-        _ application: UIApplication,
-        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
-    ) -> Bool
-    {
-        application.registerForRemoteNotifications()
-        return true
-    }
-
-    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-        if let appModel = self.appModel {
-            Task { @MainActor in
-                appModel.updateAPNsDeviceToken(deviceToken)
-            }
-            return
-        }
-
-        self.pendingAPNsDeviceToken = deviceToken
-    }
-
-    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: any Error) {
-        self.logger.error("APNs registration failed: \(error.localizedDescription, privacy: .public)")
-    }
-
-    func application(
-        _ application: UIApplication,
-        didReceiveRemoteNotification userInfo: [AnyHashable: Any],
-        fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void)
-    {
-        self.logger.info("APNs remote notification received keys=\(userInfo.keys.count, privacy: .public)")
-        Task { @MainActor in
-            guard let appModel = self.appModel else {
-                self.logger.info("APNs wake skipped: appModel unavailable")
-                completionHandler(.noData)
-                return
-            }
-            let handled = await appModel.handleSilentPushWake(userInfo)
-            self.logger.info("APNs wake handled=\(handled, privacy: .public)")
-            completionHandler(handled ? .newData : .noData)
-        }
-    }
-}
 
 @main
 struct OpenClawApp: App {
     @State private var appModel: NodeAppModel
     @State private var gatewayController: GatewayConnectionController
-    @UIApplicationDelegateAdaptor(OpenClawAppDelegate.self) private var appDelegate
     @Environment(\.scenePhase) private var scenePhase
 
     init() {
-        Self.installUncaughtExceptionLogger()
         GatewaySettingsStore.bootstrapPersistence()
         let appModel = NodeAppModel()
         _appModel = State(initialValue: appModel)
@@ -80,9 +19,6 @@ struct OpenClawApp: App {
                 .environment(self.appModel)
                 .environment(self.appModel.voiceWake)
                 .environment(self.gatewayController)
-                .task {
-                    self.appDelegate.appModel = self.appModel
-                }
                 .onOpenURL { url in
                     Task { await self.appModel.handleDeepLink(url: url) }
                 }
@@ -93,18 +29,3 @@ struct OpenClawApp: App {
         }
     }
 }
-
-extension OpenClawApp {
-    private static func installUncaughtExceptionLogger() {
-        NSLog("OpenClaw: installing uncaught exception handler")
-        NSSetUncaughtExceptionHandler { exception in
-            // Useful when the app hits NSExceptions from SwiftUI/WebKit internals; these do not
-            // produce a normal Swift error backtrace.
-            let reason = exception.reason ?? "(no reason)"
-            NSLog("UNCAUGHT EXCEPTION: %@ %@", exception.name.rawValue, reason)
-            for line in exception.callStackSymbols {
-                NSLog("  %@", line)
-            }
-        }
-    }
-}

apps/ios/Sources/RootCanvas.swift

@@ -3,69 +3,34 @@ import UIKit
 
 struct RootCanvas: View {
     @Environment(NodeAppModel.self) private var appModel
-    @Environment(GatewayConnectionController.self) private var gatewayController
     @Environment(VoiceWakeManager.self) private var voiceWake
     @Environment(\.colorScheme) private var systemColorScheme
     @Environment(\.scenePhase) private var scenePhase
     @AppStorage(VoiceWakePreferences.enabledKey) private var voiceWakeEnabled: Bool = false
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
     @AppStorage("canvas.debugStatusEnabled") private var canvasDebugStatusEnabled: Bool = false
-    @AppStorage("onboarding.requestID") private var onboardingRequestID: Int = 0
     @AppStorage("gateway.onboardingComplete") private var onboardingComplete: Bool = false
     @AppStorage("gateway.hasConnectedOnce") private var hasConnectedOnce: Bool = false
     @AppStorage("gateway.preferredStableID") private var preferredGatewayStableID: String = ""
     @AppStorage("gateway.manual.enabled") private var manualGatewayEnabled: Bool = false
     @AppStorage("gateway.manual.host") private var manualGatewayHost: String = ""
-    @AppStorage("onboarding.quickSetupDismissed") private var quickSetupDismissed: Bool = false
     @State private var presentedSheet: PresentedSheet?
     @State private var voiceWakeToastText: String?
     @State private var toastDismissTask: Task<Void, Never>?
-    @State private var showOnboarding: Bool = false
-    @State private var onboardingAllowSkip: Bool = true
-    @State private var didEvaluateOnboarding: Bool = false
     @State private var didAutoOpenSettings: Bool = false
 
     private enum PresentedSheet: Identifiable {
         case settings
         case chat
-        case quickSetup
 
         var id: Int {
             switch self {
             case .settings: 0
             case .chat: 1
-            case .quickSetup: 2
             }
         }
     }
 
-    enum StartupPresentationRoute: Equatable {
-        case none
-        case onboarding
-        case settings
-    }
-
-    static func startupPresentationRoute(
-        gatewayConnected: Bool,
-        hasConnectedOnce: Bool,
-        onboardingComplete: Bool,
-        hasExistingGatewayConfig: Bool,
-        shouldPresentOnLaunch: Bool) -> StartupPresentationRoute
-    {
-        if gatewayConnected {
-            return .none
-        }
-        // On first run or explicit launch onboarding state, onboarding always wins.
-        if shouldPresentOnLaunch || !hasConnectedOnce || !onboardingComplete {
-            return .onboarding
-        }
-        // Settings auto-open is a recovery path for previously-connected installs only.
-        if !hasExistingGatewayConfig {
-            return .settings
-        }
-        return .none
-    }
-
     var body: some View {
         ZStack {
             CanvasContent(
@@ -92,63 +57,30 @@ struct RootCanvas: View {
             switch sheet {
             case .settings:
                 SettingsTab()
-                    .environment(self.appModel)
-                    .environment(self.appModel.voiceWake)
-                    .environment(self.gatewayController)
             case .chat:
                 ChatSheet(
-                    // Chat RPCs run on the operator session (read/write scopes).
                     gateway: self.appModel.operatorSession,
                     sessionKey: self.appModel.mainSessionKey,
                     agentName: self.appModel.activeAgentName,
                     userAccent: self.appModel.seamColor)
-            case .quickSetup:
-                GatewayQuickSetupSheet()
-                    .environment(self.appModel)
-                    .environment(self.gatewayController)
             }
         }
-        .fullScreenCover(isPresented: self.$showOnboarding) {
-            OnboardingWizardView(
-                allowSkip: self.onboardingAllowSkip,
-                onClose: {
-                    self.showOnboarding = false
-                })
-                .environment(self.appModel)
-                .environment(self.appModel.voiceWake)
-                .environment(self.gatewayController)
-        }
         .onAppear { self.updateIdleTimer() }
-        .onAppear { self.evaluateOnboardingPresentation(force: false) }
         .onAppear { self.maybeAutoOpenSettings() }
         .onChange(of: self.preventSleep) { _, _ in self.updateIdleTimer() }
         .onChange(of: self.scenePhase) { _, _ in self.updateIdleTimer() }
-        .onAppear { self.maybeShowQuickSetup() }
-        .onChange(of: self.gatewayController.gateways.count) { _, _ in self.maybeShowQuickSetup() }
         .onAppear { self.updateCanvasDebugStatus() }
         .onChange(of: self.canvasDebugStatusEnabled) { _, _ in self.updateCanvasDebugStatus() }
         .onChange(of: self.appModel.gatewayStatusText) { _, _ in self.updateCanvasDebugStatus() }
         .onChange(of: self.appModel.gatewayServerName) { _, _ in self.updateCanvasDebugStatus() }
-        .onChange(of: self.appModel.gatewayServerName) { _, newValue in
-            if newValue != nil {
-                self.showOnboarding = false
-            }
-        }
-        .onChange(of: self.onboardingRequestID) { _, _ in
-            self.evaluateOnboardingPresentation(force: true)
-        }
         .onChange(of: self.appModel.gatewayRemoteAddress) { _, _ in self.updateCanvasDebugStatus() }
         .onChange(of: self.appModel.gatewayServerName) { _, newValue in
             if newValue != nil {
                 self.onboardingComplete = true
                 self.hasConnectedOnce = true
-                OnboardingStateStore.markCompleted(mode: nil)
             }
             self.maybeAutoOpenSettings()
         }
-        .onChange(of: self.appModel.openChatRequestID) { _, _ in
-            self.presentedSheet = .chat
-        }
         .onChange(of: self.voiceWake.lastTriggeredCommand) { _, newValue in
             guard let newValue else { return }
             let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -204,31 +136,11 @@ struct RootCanvas: View {
         self.appModel.screen.updateDebugStatus(title: title, subtitle: subtitle)
     }
 
-    private func evaluateOnboardingPresentation(force: Bool) {
-        if force {
-            self.onboardingAllowSkip = true
-            self.showOnboarding = true
-            return
-        }
-
-        guard !self.didEvaluateOnboarding else { return }
-        self.didEvaluateOnboarding = true
-        let route = Self.startupPresentationRoute(
-            gatewayConnected: self.appModel.gatewayServerName != nil,
-            hasConnectedOnce: self.hasConnectedOnce,
-            onboardingComplete: self.onboardingComplete,
-            hasExistingGatewayConfig: self.hasExistingGatewayConfig(),
-            shouldPresentOnLaunch: OnboardingStateStore.shouldPresentOnLaunch(appModel: self.appModel))
-        switch route {
-        case .none:
-            break
-        case .onboarding:
-            self.onboardingAllowSkip = true
-            self.showOnboarding = true
-        case .settings:
-            self.didAutoOpenSettings = true
-            self.presentedSheet = .settings
-        }
+    private func shouldAutoOpenSettings() -> Bool {
+        if self.appModel.gatewayServerName != nil { return false }
+        if !self.hasConnectedOnce { return true }
+        if !self.onboardingComplete { return true }
+        return !self.hasExistingGatewayConfig()
     }
 
     private func hasExistingGatewayConfig() -> Bool {
@@ -239,26 +151,10 @@ struct RootCanvas: View {
 
     private func maybeAutoOpenSettings() {
         guard !self.didAutoOpenSettings else { return }
-        guard !self.showOnboarding else { return }
-        let route = Self.startupPresentationRoute(
-            gatewayConnected: self.appModel.gatewayServerName != nil,
-            hasConnectedOnce: self.hasConnectedOnce,
-            onboardingComplete: self.onboardingComplete,
-            hasExistingGatewayConfig: self.hasExistingGatewayConfig(),
-            shouldPresentOnLaunch: false)
-        guard route == .settings else { return }
+        guard self.shouldAutoOpenSettings() else { return }
         self.didAutoOpenSettings = true
         self.presentedSheet = .settings
     }
-
-    private func maybeShowQuickSetup() {
-        guard !self.quickSetupDismissed else { return }
-        guard !self.showOnboarding else { return }
-        guard self.presentedSheet == nil else { return }
-        guard self.appModel.gatewayServerName == nil else { return }
-        guard !self.gatewayController.gateways.isEmpty else { return }
-        self.presentedSheet = .quickSetup
-    }
 }
 
 private struct CanvasContent: View {
@@ -360,64 +256,11 @@ private struct CanvasContent: View {
     }
 
     private var statusActivity: StatusPill.Activity? {
-        // Status pill owns transient activity state so it doesn't overlap the connection indicator.
-        if self.appModel.isBackgrounded {
-            return StatusPill.Activity(
-                title: "Foreground required",
-                systemImage: "exclamationmark.triangle.fill",
-                tint: .orange)
-        }
-
-        let gatewayStatus = self.appModel.gatewayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
-        let gatewayLower = gatewayStatus.lowercased()
-        if gatewayLower.contains("repair") {
-            return StatusPill.Activity(title: "Repairing…", systemImage: "wrench.and.screwdriver", tint: .orange)
-        }
-        if gatewayLower.contains("approval") || gatewayLower.contains("pairing") {
-            return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
-        }
-        // Avoid duplicating the primary gateway status ("Connecting…") in the activity slot.
-
-        if self.appModel.screenRecordActive {
-            return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
-        }
-
-        if let cameraHUDText, !cameraHUDText.isEmpty, let cameraHUDKind {
-            let systemImage: String
-            let tint: Color?
-            switch cameraHUDKind {
-            case .photo:
-                systemImage = "camera.fill"
-                tint = nil
-            case .recording:
-                systemImage = "video.fill"
-                tint = .red
-            case .success:
-                systemImage = "checkmark.circle.fill"
-                tint = .green
-            case .error:
-                systemImage = "exclamationmark.triangle.fill"
-                tint = .red
-            }
-            return StatusPill.Activity(title: cameraHUDText, systemImage: systemImage, tint: tint)
-        }
-
-        if self.voiceWakeEnabled {
-            let voiceStatus = self.appModel.voiceWake.statusText
-            if voiceStatus.localizedCaseInsensitiveContains("microphone permission") {
-                return StatusPill.Activity(title: "Mic permission", systemImage: "mic.slash", tint: .orange)
-            }
-            if voiceStatus == "Paused" {
-                // Talk mode intentionally pauses voice wake to release the mic. Don't spam the HUD for that case.
-                if self.appModel.talkMode.isEnabled {
-                    return nil
-                }
-                let suffix = self.appModel.isBackgrounded ? " (background)" : ""
-                return StatusPill.Activity(title: "Voice Wake paused\(suffix)", systemImage: "pause.circle.fill")
-            }
-        }
-
-        return nil
+        StatusActivityBuilder.build(
+            appModel: self.appModel,
+            voiceWakeEnabled: self.voiceWakeEnabled,
+            cameraHUDText: self.cameraHUDText,
+            cameraHUDKind: self.cameraHUDKind)
     }
 }
 

apps/ios/Sources/RootTabs.swift

@@ -3,7 +3,6 @@ import SwiftUI
 struct RootTabs: View {
     @Environment(NodeAppModel.self) private var appModel
     @Environment(VoiceWakeManager.self) private var voiceWake
-    @Environment(\.accessibilityReduceMotion) private var reduceMotion
     @AppStorage(VoiceWakePreferences.enabledKey) private var voiceWakeEnabled: Bool = false
     @State private var selectedTab: Int = 0
     @State private var voiceWakeToastText: String?
@@ -53,14 +52,14 @@ struct RootTabs: View {
             guard !trimmed.isEmpty else { return }
 
             self.toastDismissTask?.cancel()
-            withAnimation(self.reduceMotion ? .none : .spring(response: 0.25, dampingFraction: 0.85)) {
+            withAnimation(.spring(response: 0.25, dampingFraction: 0.85)) {
                 self.voiceWakeToastText = trimmed
             }
 
             self.toastDismissTask = Task {
                 try? await Task.sleep(nanoseconds: 2_300_000_000)
                 await MainActor.run {
-                    withAnimation(self.reduceMotion ? .none : .easeOut(duration: 0.25)) {
+                    withAnimation(.easeOut(duration: 0.25)) {
                         self.voiceWakeToastText = nil
                     }
                 }

apps/ios/Sources/Screen/ScreenController.swift

@@ -1,12 +1,14 @@
 import OpenClawKit
 import Observation
-import UIKit
+import SwiftUI
 import WebKit
 
 @MainActor
 @Observable
 final class ScreenController {
-    private weak var activeWebView: WKWebView?
+    let webView: WKWebView
+    private let navigationDelegate: ScreenNavigationDelegate
+    private let a2uiActionHandler: CanvasA2UIActionMessageHandler
 
     var urlString: String = ""
     var errorText: String?
@@ -22,6 +24,29 @@ final class ScreenController {
     private var debugStatusSubtitle: String?
 
     init() {
+        let config = WKWebViewConfiguration()
+        config.websiteDataStore = .nonPersistent()
+        let a2uiActionHandler = CanvasA2UIActionMessageHandler()
+        let userContentController = WKUserContentController()
+        for name in CanvasA2UIActionMessageHandler.handlerNames {
+            userContentController.add(a2uiActionHandler, name: name)
+        }
+        config.userContentController = userContentController
+        self.navigationDelegate = ScreenNavigationDelegate()
+        self.a2uiActionHandler = a2uiActionHandler
+        self.webView = WKWebView(frame: .zero, configuration: config)
+        // Canvas scaffold is a fully self-contained HTML page; avoid relying on transparency underlays.
+        self.webView.isOpaque = true
+        self.webView.backgroundColor = .black
+        self.webView.scrollView.backgroundColor = .black
+        self.webView.scrollView.contentInsetAdjustmentBehavior = .never
+        self.webView.scrollView.contentInset = .zero
+        self.webView.scrollView.scrollIndicatorInsets = .zero
+        self.webView.scrollView.automaticallyAdjustsScrollIndicatorInsets = false
+        self.applyScrollBehavior()
+        self.webView.navigationDelegate = self.navigationDelegate
+        self.navigationDelegate.controller = self
+        a2uiActionHandler.controller = self
         self.reload()
     }
 
@@ -46,26 +71,24 @@ final class ScreenController {
     }
 
     func reload() {
-        self.applyScrollBehavior()
-        guard let webView = self.activeWebView else { return }
-
         let trimmed = self.urlString.trimmingCharacters(in: .whitespacesAndNewlines)
+        self.applyScrollBehavior()
         if trimmed.isEmpty {
             guard let url = Self.canvasScaffoldURL else { return }
             self.errorText = nil
-            webView.loadFileURL(url, allowingReadAccessTo: url.deletingLastPathComponent())
+            self.webView.loadFileURL(url, allowingReadAccessTo: url.deletingLastPathComponent())
             return
-        }
-
-        guard let url = URL(string: trimmed) else {
-            self.errorText = "Invalid URL: \(trimmed)"
-            return
-        }
-        self.errorText = nil
-        if url.isFileURL {
-            webView.loadFileURL(url, allowingReadAccessTo: url.deletingLastPathComponent())
         } else {
-            webView.load(URLRequest(url: url))
+            guard let url = URL(string: trimmed) else {
+                self.errorText = "Invalid URL: \(trimmed)"
+                return
+            }
+            self.errorText = nil
+            if url.isFileURL {
+                self.webView.loadFileURL(url, allowingReadAccessTo: url.deletingLastPathComponent())
+            } else {
+                self.webView.load(URLRequest(url: url))
+            }
         }
     }
 
@@ -85,8 +108,7 @@ final class ScreenController {
         self.applyDebugStatusIfNeeded()
     }
 
-    func applyDebugStatusIfNeeded() {
-        guard let webView = self.activeWebView else { return }
+    fileprivate func applyDebugStatusIfNeeded() {
         let enabled = self.debugStatusEnabled
         let title = self.debugStatusTitle
         let subtitle = self.debugStatusSubtitle
@@ -105,7 +127,7 @@ final class ScreenController {
           } catch (_) {}
         })()
         """
-        webView.evaluateJavaScript(js) { _, _ in }
+        self.webView.evaluateJavaScript(js) { _, _ in }
     }
 
     func waitForA2UIReady(timeoutMs: Int) async -> Bool {
@@ -132,13 +154,8 @@ final class ScreenController {
     }
 
     func eval(javaScript: String) async throws -> String {
-        guard let webView = self.activeWebView else {
-            throw NSError(domain: "Screen", code: 3, userInfo: [
-                NSLocalizedDescriptionKey: "web view unavailable",
-            ])
-        }
-        return try await withCheckedThrowingContinuation { cont in
-            webView.evaluateJavaScript(javaScript) { result, error in
+        try await withCheckedThrowingContinuation { cont in
+            self.webView.evaluateJavaScript(javaScript) { result, error in
                 if let error {
                     cont.resume(throwing: error)
                     return
@@ -157,13 +174,8 @@ final class ScreenController {
         if let maxWidth {
             config.snapshotWidth = NSNumber(value: Double(maxWidth))
         }
-        guard let webView = self.activeWebView else {
-            throw NSError(domain: "Screen", code: 3, userInfo: [
-                NSLocalizedDescriptionKey: "web view unavailable",
-            ])
-        }
         let image: UIImage = try await withCheckedThrowingContinuation { cont in
-            webView.takeSnapshot(with: config) { image, error in
+            self.webView.takeSnapshot(with: config) { image, error in
                 if let error {
                     cont.resume(throwing: error)
                     return
@@ -194,13 +206,8 @@ final class ScreenController {
         if let maxWidth {
             config.snapshotWidth = NSNumber(value: Double(maxWidth))
         }
-        guard let webView = self.activeWebView else {
-            throw NSError(domain: "Screen", code: 3, userInfo: [
-                NSLocalizedDescriptionKey: "web view unavailable",
-            ])
-        }
         let image: UIImage = try await withCheckedThrowingContinuation { cont in
-            webView.takeSnapshot(with: config) { image, error in
+            self.webView.takeSnapshot(with: config) { image, error in
                 if let error {
                     cont.resume(throwing: error)
                     return
@@ -231,17 +238,6 @@ final class ScreenController {
         return data.base64EncodedString()
     }
 
-    func attachWebView(_ webView: WKWebView) {
-        self.activeWebView = webView
-        self.reload()
-        self.applyDebugStatusIfNeeded()
-    }
-
-    func detachWebView(_ webView: WKWebView) {
-        guard self.activeWebView === webView else { return }
-        self.activeWebView = nil
-    }
-
     private static func bundledResourceURL(
         name: String,
         ext: String,
@@ -281,10 +277,9 @@ final class ScreenController {
     }
 
     private func applyScrollBehavior() {
-        guard let webView = self.activeWebView else { return }
         let trimmed = self.urlString.trimmingCharacters(in: .whitespacesAndNewlines)
         let allowScroll = !trimmed.isEmpty
-        let scrollView = webView.scrollView
+        let scrollView = self.webView.scrollView
         // Default canvas needs raw touch events; external pages should scroll.
         scrollView.isScrollEnabled = allowScroll
         scrollView.bounces = allowScroll
@@ -371,3 +366,72 @@ extension Double {
         return self
     }
 }
+
+// MARK: - Navigation Delegate
+
+/// Handles navigation policy to intercept openclaw:// deep links from canvas
+@MainActor
+private final class ScreenNavigationDelegate: NSObject, WKNavigationDelegate {
+    weak var controller: ScreenController?
+
+    func webView(
+        _ webView: WKWebView,
+        decidePolicyFor navigationAction: WKNavigationAction,
+        decisionHandler: @escaping @MainActor @Sendable (WKNavigationActionPolicy) -> Void)
+    {
+        guard let url = navigationAction.request.url else {
+            decisionHandler(.allow)
+            return
+        }
+
+        // Intercept openclaw:// deep links.
+        if url.scheme?.lowercased() == "openclaw" {
+            decisionHandler(.cancel)
+            self.controller?.onDeepLink?(url)
+            return
+        }
+
+        decisionHandler(.allow)
+    }
+
+    func webView(
+        _: WKWebView,
+        didFailProvisionalNavigation _: WKNavigation?,
+        withError error: any Error)
+    {
+        self.controller?.errorText = error.localizedDescription
+    }
+
+    func webView(_: WKWebView, didFinish _: WKNavigation?) {
+        self.controller?.errorText = nil
+        self.controller?.applyDebugStatusIfNeeded()
+    }
+
+    func webView(_: WKWebView, didFail _: WKNavigation?, withError error: any Error) {
+        self.controller?.errorText = error.localizedDescription
+    }
+}
+
+private final class CanvasA2UIActionMessageHandler: NSObject, WKScriptMessageHandler {
+    static let messageName = "openclawCanvasA2UIAction"
+    static let handlerNames = [messageName]
+
+    weak var controller: ScreenController?
+
+    func userContentController(_: WKUserContentController, didReceive message: WKScriptMessage) {
+        guard Self.handlerNames.contains(message.name) else { return }
+        guard let controller else { return }
+
+        guard let url = message.webView?.url else { return }
+        if url.isFileURL {
+            guard controller.isTrustedCanvasUIURL(url) else { return }
+        } else {
+            // For security, only accept actions from local-network pages (e.g. the canvas host).
+            guard controller.isLocalNetworkCanvasURL(url) else { return }
+        }
+
+        guard let body = ScreenController.parseA2UIActionBody(message.body) else { return }
+
+        controller.onA2UIAction?(body)
+    }
+}

apps/ios/Sources/Screen/ScreenWebView.swift

@@ -5,189 +5,11 @@ import WebKit
 struct ScreenWebView: UIViewRepresentable {
     var controller: ScreenController
 
-    func makeCoordinator() -> ScreenWebViewCoordinator {
-        ScreenWebViewCoordinator(controller: self.controller)
+    func makeUIView(context: Context) -> WKWebView {
+        self.controller.webView
     }
 
-    func makeUIView(context: Context) -> UIView {
-        context.coordinator.makeContainerView()
-    }
-
-    func updateUIView(_: UIView, context: Context) {
-        context.coordinator.updateController(self.controller)
-    }
-
-    static func dismantleUIView(_: UIView, coordinator: ScreenWebViewCoordinator) {
-        coordinator.teardown()
-    }
-}
-
-@MainActor
-final class ScreenWebViewCoordinator: NSObject {
-    private weak var controller: ScreenController?
-    private let navigationDelegate = ScreenNavigationDelegate()
-    private let a2uiActionHandler = CanvasA2UIActionMessageHandler()
-    private let userContentController = WKUserContentController()
-
-    private(set) var managedWebView: WKWebView?
-    private weak var containerView: UIView?
-
-    init(controller: ScreenController) {
-        self.controller = controller
-        super.init()
-        self.navigationDelegate.controller = controller
-        self.a2uiActionHandler.controller = controller
-    }
-
-    func makeContainerView() -> UIView {
-        if let containerView {
-            return containerView
-        }
-
-        let container = UIView(frame: .zero)
-        container.backgroundColor = .black
-
-        let webView = Self.makeWebView(userContentController: self.userContentController)
-        webView.navigationDelegate = self.navigationDelegate
-        self.installA2UIHandlers()
-
-        webView.translatesAutoresizingMaskIntoConstraints = false
-        container.addSubview(webView)
-        NSLayoutConstraint.activate([
-            webView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
-            webView.trailingAnchor.constraint(equalTo: container.trailingAnchor),
-            webView.topAnchor.constraint(equalTo: container.topAnchor),
-            webView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
-        ])
-
-        self.managedWebView = webView
-        self.containerView = container
-        self.controller?.attachWebView(webView)
-        return container
-    }
-
-    func updateController(_ controller: ScreenController) {
-        let previousController = self.controller
-        let controllerChanged = self.controller !== controller
-        self.controller = controller
-        self.navigationDelegate.controller = controller
-        self.a2uiActionHandler.controller = controller
-        if controllerChanged, let managedWebView {
-            previousController?.detachWebView(managedWebView)
-            controller.attachWebView(managedWebView)
-        }
-    }
-
-    func teardown() {
-        if let managedWebView {
-            self.controller?.detachWebView(managedWebView)
-            managedWebView.navigationDelegate = nil
-        }
-        self.removeA2UIHandlers()
-        self.navigationDelegate.controller = nil
-        self.a2uiActionHandler.controller = nil
-        self.managedWebView = nil
-        self.containerView = nil
-    }
-
-    private static func makeWebView(userContentController: WKUserContentController) -> WKWebView {
-        let config = WKWebViewConfiguration()
-        config.websiteDataStore = .nonPersistent()
-        config.userContentController = userContentController
-
-        let webView = WKWebView(frame: .zero, configuration: config)
-        // Canvas scaffold is a fully self-contained HTML page; avoid relying on transparency underlays.
-        webView.isOpaque = true
-        webView.backgroundColor = .black
-
-        let scrollView = webView.scrollView
-        scrollView.backgroundColor = .black
-        scrollView.contentInsetAdjustmentBehavior = .never
-        scrollView.contentInset = .zero
-        scrollView.scrollIndicatorInsets = .zero
-        scrollView.automaticallyAdjustsScrollIndicatorInsets = false
-
-        return webView
-    }
-
-    private func installA2UIHandlers() {
-        for name in CanvasA2UIActionMessageHandler.handlerNames {
-            self.userContentController.add(self.a2uiActionHandler, name: name)
-        }
-    }
-
-    private func removeA2UIHandlers() {
-        for name in CanvasA2UIActionMessageHandler.handlerNames {
-            self.userContentController.removeScriptMessageHandler(forName: name)
-        }
-    }
-}
-
-// MARK: - Navigation Delegate
-
-/// Handles navigation policy to intercept openclaw:// deep links from canvas
-@MainActor
-private final class ScreenNavigationDelegate: NSObject, WKNavigationDelegate {
-    weak var controller: ScreenController?
-
-    func webView(
-        _: WKWebView,
-        decidePolicyFor navigationAction: WKNavigationAction,
-        decisionHandler: @escaping @MainActor @Sendable (WKNavigationActionPolicy) -> Void)
-    {
-        guard let url = navigationAction.request.url else {
-            decisionHandler(.allow)
-            return
-        }
-
-        // Intercept openclaw:// deep links.
-        if url.scheme?.lowercased() == "openclaw" {
-            decisionHandler(.cancel)
-            self.controller?.onDeepLink?(url)
-            return
-        }
-
-        decisionHandler(.allow)
-    }
-
-    func webView(
-        _: WKWebView,
-        didFailProvisionalNavigation _: WKNavigation?,
-        withError error: any Error)
-    {
-        self.controller?.errorText = error.localizedDescription
-    }
-
-    func webView(_: WKWebView, didFinish _: WKNavigation?) {
-        self.controller?.errorText = nil
-        self.controller?.applyDebugStatusIfNeeded()
-    }
-
-    func webView(_: WKWebView, didFail _: WKNavigation?, withError error: any Error) {
-        self.controller?.errorText = error.localizedDescription
-    }
-}
-
-private final class CanvasA2UIActionMessageHandler: NSObject, WKScriptMessageHandler {
-    static let messageName = "openclawCanvasA2UIAction"
-    static let handlerNames = [messageName]
-
-    weak var controller: ScreenController?
-
-    func userContentController(_: WKUserContentController, didReceive message: WKScriptMessage) {
-        guard Self.handlerNames.contains(message.name) else { return }
-        guard let controller else { return }
-
-        guard let url = message.webView?.url else { return }
-        if url.isFileURL {
-            guard controller.isTrustedCanvasUIURL(url) else { return }
-        } else {
-            // For security, only accept actions from local-network pages (e.g. the canvas host).
-            guard controller.isLocalNetworkCanvasURL(url) else { return }
-        }
-
-        guard let body = ScreenController.parseA2UIActionBody(message.body) else { return }
-
-        controller.onA2UIAction?(body)
+    func updateUIView(_ webView: WKWebView, context: Context) {
+        // State changes are driven by ScreenController.
     }
 }

apps/ios/Sources/Services/NodeServiceProtocols.swift

@@ -28,12 +28,6 @@ protocol LocationServicing: Sendable {
         desiredAccuracy: OpenClawLocationAccuracy,
         maxAgeMs: Int?,
         timeoutMs: Int?) async throws -> CLLocation
-    func startLocationUpdates(
-        desiredAccuracy: OpenClawLocationAccuracy,
-        significantChangesOnly: Bool) -> AsyncStream<CLLocation>
-    func stopLocationUpdates()
-    func startMonitoringSignificantLocationChanges(onUpdate: @escaping @Sendable (CLLocation) -> Void)
-    func stopMonitoringSignificantLocationChanges()
 }
 
 protocol DeviceStatusServicing: Sendable {
@@ -65,29 +59,6 @@ protocol MotionServicing: Sendable {
     func pedometer(params: OpenClawPedometerParams) async throws -> OpenClawPedometerPayload
 }
 
-struct WatchMessagingStatus: Sendable, Equatable {
-    var supported: Bool
-    var paired: Bool
-    var appInstalled: Bool
-    var reachable: Bool
-    var activationState: String
-}
-
-struct WatchNotificationSendResult: Sendable, Equatable {
-    var deliveredImmediately: Bool
-    var queuedForDelivery: Bool
-    var transport: String
-}
-
-protocol WatchMessagingServicing: AnyObject, Sendable {
-    func status() async -> WatchMessagingStatus
-    func sendNotification(
-        id: String,
-        title: String,
-        body: String,
-        priority: OpenClawNotificationPriority?) async throws -> WatchNotificationSendResult
-}
-
 extension CameraController: CameraServicing {}
 extension ScreenRecordService: ScreenRecordingServicing {}
 extension LocationService: LocationServicing {}

apps/ios/Sources/Services/WatchMessagingService.swift

@@ -1,176 +0,0 @@
-import Foundation
-import OpenClawKit
-import OSLog
-@preconcurrency import WatchConnectivity
-
-enum WatchMessagingError: LocalizedError {
-    case unsupported
-    case notPaired
-    case watchAppNotInstalled
-
-    var errorDescription: String? {
-        switch self {
-        case .unsupported:
-            "WATCH_UNAVAILABLE: WatchConnectivity is not supported on this device"
-        case .notPaired:
-            "WATCH_UNAVAILABLE: no paired Apple Watch"
-        case .watchAppNotInstalled:
-            "WATCH_UNAVAILABLE: OpenClaw watch companion app is not installed"
-        }
-    }
-}
-
-final class WatchMessagingService: NSObject, WatchMessagingServicing, @unchecked Sendable {
-    private static let logger = Logger(subsystem: "ai.openclaw", category: "watch.messaging")
-    private let session: WCSession?
-
-    override init() {
-        if WCSession.isSupported() {
-            self.session = WCSession.default
-        } else {
-            self.session = nil
-        }
-        super.init()
-        if let session = self.session {
-            session.delegate = self
-            session.activate()
-        }
-    }
-
-    static func isSupportedOnDevice() -> Bool {
-        WCSession.isSupported()
-    }
-
-    static func currentStatusSnapshot() -> WatchMessagingStatus {
-        guard WCSession.isSupported() else {
-            return WatchMessagingStatus(
-                supported: false,
-                paired: false,
-                appInstalled: false,
-                reachable: false,
-                activationState: "unsupported")
-        }
-        let session = WCSession.default
-        return status(for: session)
-    }
-
-    func status() async -> WatchMessagingStatus {
-        await self.ensureActivated()
-        guard let session = self.session else {
-            return WatchMessagingStatus(
-                supported: false,
-                paired: false,
-                appInstalled: false,
-                reachable: false,
-                activationState: "unsupported")
-        }
-        return Self.status(for: session)
-    }
-
-    func sendNotification(
-        id: String,
-        title: String,
-        body: String,
-        priority: OpenClawNotificationPriority?) async throws -> WatchNotificationSendResult
-    {
-        await self.ensureActivated()
-        guard let session = self.session else {
-            throw WatchMessagingError.unsupported
-        }
-
-        let snapshot = Self.status(for: session)
-        guard snapshot.paired else { throw WatchMessagingError.notPaired }
-        guard snapshot.appInstalled else { throw WatchMessagingError.watchAppNotInstalled }
-
-        let payload: [String: Any] = [
-            "type": "watch.notify",
-            "id": id,
-            "title": title,
-            "body": body,
-            "priority": priority?.rawValue ?? OpenClawNotificationPriority.active.rawValue,
-            "sentAtMs": Int(Date().timeIntervalSince1970 * 1000),
-        ]
-
-        if snapshot.reachable {
-            do {
-                try await self.sendReachableMessage(payload, with: session)
-                return WatchNotificationSendResult(
-                    deliveredImmediately: true,
-                    queuedForDelivery: false,
-                    transport: "sendMessage")
-            } catch {
-                Self.logger.error("watch sendMessage failed: \(error.localizedDescription, privacy: .public)")
-            }
-        }
-
-        _ = session.transferUserInfo(payload)
-        return WatchNotificationSendResult(
-            deliveredImmediately: false,
-            queuedForDelivery: true,
-            transport: "transferUserInfo")
-    }
-
-    private func sendReachableMessage(_ payload: [String: Any], with session: WCSession) async throws {
-        try await withCheckedThrowingContinuation { continuation in
-            session.sendMessage(payload, replyHandler: { _ in
-                continuation.resume()
-            }, errorHandler: { error in
-                continuation.resume(throwing: error)
-            })
-        }
-    }
-
-    private func ensureActivated() async {
-        guard let session = self.session else { return }
-        if session.activationState == .activated { return }
-        session.activate()
-        for _ in 0..<8 {
-            if session.activationState == .activated { return }
-            try? await Task.sleep(nanoseconds: 100_000_000)
-        }
-    }
-
-    private static func status(for session: WCSession) -> WatchMessagingStatus {
-        WatchMessagingStatus(
-            supported: true,
-            paired: session.isPaired,
-            appInstalled: session.isWatchAppInstalled,
-            reachable: session.isReachable,
-            activationState: activationStateLabel(session.activationState))
-    }
-
-    private static func activationStateLabel(_ state: WCSessionActivationState) -> String {
-        switch state {
-        case .notActivated:
-            "notActivated"
-        case .inactive:
-            "inactive"
-        case .activated:
-            "activated"
-        @unknown default:
-            "unknown"
-        }
-    }
-}
-
-extension WatchMessagingService: WCSessionDelegate {
-    func session(
-        _ session: WCSession,
-        activationDidCompleteWith activationState: WCSessionActivationState,
-        error: (any Error)?)
-    {
-        if let error {
-            Self.logger.error("watch activation failed: \(error.localizedDescription, privacy: .public)")
-            return
-        }
-        Self.logger.debug("watch activation state=\(Self.activationStateLabel(activationState), privacy: .public)")
-    }
-
-    func sessionDidBecomeInactive(_ session: WCSession) {}
-
-    func sessionDidDeactivate(_ session: WCSession) {
-        session.activate()
-    }
-
-    func sessionReachabilityDidChange(_ session: WCSession) {}
-}

apps/ios/Sources/Settings/SettingsTab.swift

@@ -6,12 +6,6 @@ import SwiftUI
 import UIKit
 
 struct SettingsTab: View {
-    private struct FeatureHelp: Identifiable {
-        let id = UUID()
-        let title: String
-        let message: String
-    }
-
     @Environment(NodeAppModel.self) private var appModel: NodeAppModel
     @Environment(VoiceWakeManager.self) private var voiceWake: VoiceWakeManager
     @Environment(GatewayConnectionController.self) private var gatewayController: GatewayConnectionController
@@ -21,10 +15,9 @@ struct SettingsTab: View {
     @AppStorage("voiceWake.enabled") private var voiceWakeEnabled: Bool = false
     @AppStorage("talk.enabled") private var talkEnabled: Bool = false
     @AppStorage("talk.button.enabled") private var talkButtonEnabled: Bool = true
-    @AppStorage("talk.background.enabled") private var talkBackgroundEnabled: Bool = false
-    @AppStorage("talk.voiceDirectiveHint.enabled") private var talkVoiceDirectiveHintEnabled: Bool = true
     @AppStorage("camera.enabled") private var cameraEnabled: Bool = true
     @AppStorage("location.enabledMode") private var locationEnabledModeRaw: String = OpenClawLocationMode.off.rawValue
+    @AppStorage("location.preciseEnabled") private var locationPreciseEnabled: Bool = true
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
     @AppStorage("gateway.preferredStableID") private var preferredGatewayStableID: String = ""
     @AppStorage("gateway.lastDiscoveredStableID") private var lastDiscoveredGatewayStableID: String = ""
@@ -35,27 +28,17 @@ struct SettingsTab: View {
     @AppStorage("gateway.manual.tls") private var manualGatewayTLS: Bool = true
     @AppStorage("gateway.discovery.debugLogs") private var discoveryDebugLogsEnabled: Bool = false
     @AppStorage("canvas.debugStatusEnabled") private var canvasDebugStatusEnabled: Bool = false
-
-    // Onboarding control (RootCanvas listens to onboarding.requestID and force-opens the wizard).
-    @AppStorage("onboarding.requestID") private var onboardingRequestID: Int = 0
-    @AppStorage("gateway.onboardingComplete") private var onboardingComplete: Bool = false
-    @AppStorage("gateway.hasConnectedOnce") private var hasConnectedOnce: Bool = false
-
     @State private var connectingGatewayID: String?
+    @State private var localIPAddress: String?
     @State private var lastLocationModeRaw: String = OpenClawLocationMode.off.rawValue
     @State private var gatewayToken: String = ""
     @State private var gatewayPassword: String = ""
-    @State private var defaultShareInstruction: String = ""
     @AppStorage("gateway.setupCode") private var setupCode: String = ""
     @State private var setupStatusText: String?
     @State private var manualGatewayPortText: String = ""
     @State private var gatewayExpanded: Bool = true
     @State private var selectedAgentPickerId: String = ""
 
-    @State private var showResetOnboardingAlert: Bool = false
-    @State private var activeFeatureHelp: FeatureHelp?
-    @State private var suppressCredentialPersist: Bool = false
-
     private let gatewayLogger = Logger(subsystem: "ai.openclaw.ios", category: "GatewaySettings")
 
     var body: some View {
@@ -120,6 +103,7 @@ struct SettingsTab: View {
                                 .foregroundStyle(.secondary)
                         }
 
+                        DisclosureGroup("Advanced") {
                         if self.appModel.gatewayServerName == nil {
                             LabeledContent("Discovery", value: self.gatewayController.discoveryStatusText)
                         }
@@ -164,74 +148,69 @@ struct SettingsTab: View {
                             self.gatewayList(showing: .all)
                         }
 
-                        DisclosureGroup("Advanced") {
-                            Toggle("Use Manual Gateway", isOn: self.$manualGatewayEnabled)
+                        Toggle("Use Manual Gateway", isOn: self.$manualGatewayEnabled)
 
-                            TextField("Host", text: self.$manualGatewayHost)
-                                .textInputAutocapitalization(.never)
-                                .autocorrectionDisabled()
+                        TextField("Host", text: self.$manualGatewayHost)
+                            .textInputAutocapitalization(.never)
+                            .autocorrectionDisabled()
 
-                            TextField("Port (optional)", text: self.manualPortBinding)
-                                .keyboardType(.numberPad)
+                        TextField("Port (optional)", text: self.manualPortBinding)
+                            .keyboardType(.numberPad)
 
-                            Toggle("Use TLS", isOn: self.$manualGatewayTLS)
+                        Toggle("Use TLS", isOn: self.$manualGatewayTLS)
 
-                            Button {
-                                Task { await self.connectManual() }
-                            } label: {
-                                if self.connectingGatewayID == "manual" {
-                                    HStack(spacing: 8) {
-                                        ProgressView()
-                                            .progressViewStyle(.circular)
-                                        Text("Connecting…")
-                                    }
-                                } else {
-                                    Text("Connect (Manual)")
+                        Button {
+                            Task { await self.connectManual() }
+                        } label: {
+                            if self.connectingGatewayID == "manual" {
+                                HStack(spacing: 8) {
+                                    ProgressView()
+                                        .progressViewStyle(.circular)
+                                    Text("Connecting…")
                                 }
-                            }
-                            .disabled(self.connectingGatewayID != nil || self.manualGatewayHost
-                                .trimmingCharacters(in: .whitespacesAndNewlines)
-                                .isEmpty || !self.manualPortIsValid)
-
-                            Text(
-                                "Use this when mDNS/Bonjour discovery is blocked. "
-                                    + "Leave port empty for 443 on tailnet DNS (TLS) or 18789 otherwise.")
-                                .font(.footnote)
-                                .foregroundStyle(.secondary)
-
-                            Toggle("Discovery Debug Logs", isOn: self.$discoveryDebugLogsEnabled)
-                                .onChange(of: self.discoveryDebugLogsEnabled) { _, newValue in
-                                    self.gatewayController.setDiscoveryDebugLoggingEnabled(newValue)
-                                }
-
-                            NavigationLink("Discovery Logs") {
-                                GatewayDiscoveryDebugLogView()
-                            }
-
-                            Toggle("Debug Canvas Status", isOn: self.$canvasDebugStatusEnabled)
-
-                            TextField("Gateway Auth Token", text: self.$gatewayToken)
-                                .textInputAutocapitalization(.never)
-                                .autocorrectionDisabled()
-
-                            SecureField("Gateway Password", text: self.$gatewayPassword)
-
-                            Button("Reset Onboarding", role: .destructive) {
-                                self.showResetOnboardingAlert = true
-                            }
-
-                            VStack(alignment: .leading, spacing: 6) {
-                                Text("Debug")
-                                    .font(.footnote.weight(.semibold))
-                                    .foregroundStyle(.secondary)
-                                Text(self.gatewayDebugText())
-                                    .font(.system(size: 12, weight: .regular, design: .monospaced))
-                                    .foregroundStyle(.secondary)
-                                    .frame(maxWidth: .infinity, alignment: .leading)
-                                    .padding(10)
-                                    .background(.thinMaterial, in: RoundedRectangle(cornerRadius: 10, style: .continuous))
+                            } else {
+                                Text("Connect (Manual)")
                             }
                         }
+                        .disabled(self.connectingGatewayID != nil || self.manualGatewayHost
+                            .trimmingCharacters(in: .whitespacesAndNewlines)
+                            .isEmpty || !self.manualPortIsValid)
+
+                        Text(
+                            "Use this when mDNS/Bonjour discovery is blocked. "
+                                + "Leave port empty for 443 on tailnet DNS (TLS) or 18789 otherwise.")
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+
+                        Toggle("Discovery Debug Logs", isOn: self.$discoveryDebugLogsEnabled)
+                            .onChange(of: self.discoveryDebugLogsEnabled) { _, newValue in
+                                self.gatewayController.setDiscoveryDebugLoggingEnabled(newValue)
+                            }
+
+                        NavigationLink("Discovery Logs") {
+                            GatewayDiscoveryDebugLogView()
+                        }
+
+                        Toggle("Debug Canvas Status", isOn: self.$canvasDebugStatusEnabled)
+
+                        TextField("Gateway Token", text: self.$gatewayToken)
+                            .textInputAutocapitalization(.never)
+                            .autocorrectionDisabled()
+
+                        SecureField("Gateway Password", text: self.$gatewayPassword)
+
+                        VStack(alignment: .leading, spacing: 6) {
+                            Text("Debug")
+                                .font(.footnote.weight(.semibold))
+                                .foregroundStyle(.secondary)
+                            Text(self.gatewayDebugText())
+                                .font(.system(size: 12, weight: .regular, design: .monospaced))
+                                .foregroundStyle(.secondary)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                                .padding(10)
+                                .background(.thinMaterial, in: RoundedRectangle(cornerRadius: 10, style: .continuous))
+                        }
+                    }
                     } label: {
                         HStack(spacing: 10) {
                             Circle()
@@ -248,22 +227,16 @@ struct SettingsTab: View {
 
                 Section("Device") {
                     DisclosureGroup("Features") {
-                        self.featureToggle(
-                            "Voice Wake",
-                            isOn: self.$voiceWakeEnabled,
-                            help: "Enables wake-word activation to start a hands-free session.") { newValue in
+                        Toggle("Voice Wake", isOn: self.$voiceWakeEnabled)
+                            .onChange(of: self.voiceWakeEnabled) { _, newValue in
                                 self.appModel.setVoiceWakeEnabled(newValue)
                             }
-                        self.featureToggle(
-                            "Talk Mode",
-                            isOn: self.$talkEnabled,
-                            help: "Enables voice conversation mode with your connected OpenClaw agent.") { newValue in
+                        Toggle("Talk Mode", isOn: self.$talkEnabled)
+                            .onChange(of: self.talkEnabled) { _, newValue in
                                 self.appModel.setTalkEnabled(newValue)
                             }
-                        self.featureToggle(
-                            "Background Listening",
-                            isOn: self.$talkBackgroundEnabled,
-                            help: "Keeps listening while the app is backgrounded. Uses more battery.")
+                        // Keep this separate so users can hide the side bubble without disabling Talk Mode.
+                        Toggle("Show Talk Button", isOn: self.$talkButtonEnabled)
 
                         NavigationLink {
                             VoiceWakeWordsSettingsView()
@@ -273,78 +246,29 @@ struct SettingsTab: View {
                                 value: VoiceWakePreferences.displayString(for: self.voiceWake.triggerWords))
                         }
 
-                        self.featureToggle(
-                            "Allow Camera",
-                            isOn: self.$cameraEnabled,
-                            help: "Allows the gateway to request photos or short video clips while OpenClaw is foregrounded.")
+                        Toggle("Allow Camera", isOn: self.$cameraEnabled)
+                        Text("Allows the gateway to request photos or short video clips (foreground only).")
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
 
-                        HStack(spacing: 8) {
-                            Text("Location Access")
-                            Spacer()
-                            Button {
-                                self.activeFeatureHelp = FeatureHelp(
-                                    title: "Location Access",
-                                    message: "Controls location permissions for OpenClaw. Off disables location tools, While Using enables foreground location, and Always enables background location.")
-                            } label: {
-                                Image(systemName: "info.circle")
-                                    .foregroundStyle(.secondary)
-                            }
-                            .buttonStyle(.plain)
-                            .accessibilityLabel("Location Access info")
-                        }
                         Picker("Location Access", selection: self.$locationEnabledModeRaw) {
                             Text("Off").tag(OpenClawLocationMode.off.rawValue)
                             Text("While Using").tag(OpenClawLocationMode.whileUsing.rawValue)
                             Text("Always").tag(OpenClawLocationMode.always.rawValue)
                         }
-                        .labelsHidden()
                         .pickerStyle(.segmented)
 
-                        self.featureToggle(
-                            "Prevent Sleep",
-                            isOn: self.$preventSleep,
-                            help: "Keeps the screen awake while OpenClaw is open.")
+                        Toggle("Precise Location", isOn: self.$locationPreciseEnabled)
+                            .disabled(self.locationMode == .off)
 
-                        DisclosureGroup("Advanced") {
-                            self.featureToggle(
-                                "Voice Directive Hint",
-                                isOn: self.$talkVoiceDirectiveHintEnabled,
-                                help: "Adds voice-switching instructions to Talk prompts. Disable to reduce prompt size.")
-                            self.featureToggle(
-                                "Show Talk Button",
-                                isOn: self.$talkButtonEnabled,
-                                help: "Shows the floating Talk button in the main interface.")
-                            TextField("Default Share Instruction", text: self.$defaultShareInstruction, axis: .vertical)
-                                .lineLimit(2 ... 6)
-                                .textInputAutocapitalization(.sentences)
-                            HStack(spacing: 8) {
-                                Text("Default Share Instruction")
-                                    .font(.footnote)
-                                    .foregroundStyle(.secondary)
-                                Spacer()
-                                Button {
-                                    self.activeFeatureHelp = FeatureHelp(
-                                        title: "Default Share Instruction",
-                                        message: "Appends this instruction when sharing content into OpenClaw from iOS.")
-                                } label: {
-                                    Image(systemName: "info.circle")
-                                        .foregroundStyle(.secondary)
-                                }
-                                .buttonStyle(.plain)
-                                .accessibilityLabel("Default Share Instruction info")
-                            }
+                        Text("Always requires system permission and may prompt to open Settings.")
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
 
-                            VStack(alignment: .leading, spacing: 8) {
-                                Button {
-                                    Task { await self.appModel.runSharePipelineSelfTest() }
-                                } label: {
-                                    Label("Run Share Self-Test", systemImage: "checkmark.seal")
-                                }
-                                Text(self.appModel.lastShareEventText)
-                                    .font(.footnote)
-                                    .foregroundStyle(.secondary)
-                            }
-                        }
+                        Toggle("Prevent Sleep", isOn: self.$preventSleep)
+                        Text("Keeps the screen awake while OpenClaw is open.")
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
                     }
 
                     DisclosureGroup("Device Info") {
@@ -352,11 +276,19 @@ struct SettingsTab: View {
                         Text(self.instanceId)
                             .font(.footnote)
                             .foregroundStyle(.secondary)
-                            .lineLimit(1)
-                            .truncationMode(.middle)
-                        LabeledContent("Device", value: self.deviceFamily())
+                        LabeledContent("IP", value: self.localIPAddress ?? "—")
+                            .contextMenu {
+                                if let ip = self.localIPAddress {
+                                    Button {
+                                        UIPasteboard.general.string = ip
+                                    } label: {
+                                        Label("Copy", systemImage: "doc.on.doc")
+                                    }
+                                }
+                            }
                         LabeledContent("Platform", value: self.platformString())
-                        LabeledContent("OpenClaw", value: self.openClawVersionString())
+                        LabeledContent("Version", value: self.appVersion())
+                        LabeledContent("Model", value: self.modelIdentifier())
                     }
                 }
             }
@@ -371,22 +303,8 @@ struct SettingsTab: View {
                     .accessibilityLabel("Close")
                 }
             }
-            .alert("Reset Onboarding?", isPresented: self.$showResetOnboardingAlert) {
-                Button("Reset", role: .destructive) {
-                    self.resetOnboarding()
-                }
-                Button("Cancel", role: .cancel) {}
-            } message: {
-                Text(
-                    "This will disconnect, clear saved gateway connection + credentials, and reopen the onboarding wizard.")
-            }
-            .alert(item: self.$activeFeatureHelp) { help in
-                Alert(
-                    title: Text(help.title),
-                    message: Text(help.message),
-                    dismissButton: .default(Text("OK")))
-            }
             .onAppear {
+                self.localIPAddress = NetworkInterfaces.primaryIPv4Address()
                 self.lastLocationModeRaw = self.locationEnabledModeRaw
                 self.syncManualPortText()
                 let trimmedInstanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -394,8 +312,6 @@ struct SettingsTab: View {
                     self.gatewayToken = GatewaySettingsStore.loadGatewayToken(instanceId: trimmedInstanceId) ?? ""
                     self.gatewayPassword = GatewaySettingsStore.loadGatewayPassword(instanceId: trimmedInstanceId) ?? ""
                 }
-                self.defaultShareInstruction = ShareToAgentSettings.loadDefaultInstruction()
-                self.appModel.refreshLastShareEventFromRelay()
                 // Keep setup front-and-center when disconnected; keep things compact once connected.
                 self.gatewayExpanded = !self.isGatewayConnected
                 self.selectedAgentPickerId = self.appModel.selectedAgentId ?? ""
@@ -415,22 +331,17 @@ struct SettingsTab: View {
                 GatewaySettingsStore.savePreferredGatewayStableID(trimmed)
             }
             .onChange(of: self.gatewayToken) { _, newValue in
-                guard !self.suppressCredentialPersist else { return }
                 let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
                 let instanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
                 guard !instanceId.isEmpty else { return }
                 GatewaySettingsStore.saveGatewayToken(trimmed, instanceId: instanceId)
             }
             .onChange(of: self.gatewayPassword) { _, newValue in
-                guard !self.suppressCredentialPersist else { return }
                 let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
                 let instanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
                 guard !instanceId.isEmpty else { return }
                 GatewaySettingsStore.saveGatewayPassword(trimmed, instanceId: instanceId)
             }
-            .onChange(of: self.defaultShareInstruction) { _, newValue in
-                ShareToAgentSettings.saveDefaultInstruction(newValue)
-            }
             .onChange(of: self.manualGatewayPort) { _, _ in
                 self.syncManualPortText()
             }
@@ -510,11 +421,10 @@ struct SettingsTab: View {
                 ForEach(rows) { gateway in
                     HStack {
                         VStack(alignment: .leading, spacing: 2) {
-                            // Avoid localized-string formatting edge cases from Bonjour-advertised names.
-                            Text(verbatim: gateway.name)
+                            Text(gateway.name)
                             let detailLines = self.gatewayDetailLines(gateway)
                             ForEach(detailLines, id: \.self) { line in
-                                Text(verbatim: line)
+                                Text(line)
                                     .font(.footnote)
                                     .foregroundStyle(.secondary)
                             }
@@ -562,6 +472,14 @@ struct SettingsTab: View {
         return "iOS \(v.majorVersion).\(v.minorVersion).\(v.patchVersion)"
     }
 
+    private var locationMode: OpenClawLocationMode {
+        OpenClawLocationMode(rawValue: self.locationEnabledModeRaw) ?? .off
+    }
+
+    private func appVersion() -> String {
+        Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"
+    }
+
     private func deviceFamily() -> String {
         switch UIDevice.current.userInterfaceIdiom {
         case .pad:
@@ -573,36 +491,14 @@ struct SettingsTab: View {
         }
     }
 
-    private func openClawVersionString() -> String {
-        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"
-        let build = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? ""
-        let trimmedBuild = build.trimmingCharacters(in: .whitespacesAndNewlines)
-        if trimmedBuild.isEmpty || trimmedBuild == version {
-            return version
-        }
-        return "\(version) (\(trimmedBuild))"
-    }
-
-    private func featureToggle(
-        _ title: String,
-        isOn: Binding<Bool>,
-        help: String,
-        onChange: ((Bool) -> Void)? = nil
-    ) -> some View {
-        HStack(spacing: 8) {
-            Toggle(title, isOn: isOn)
-            Button {
-                self.activeFeatureHelp = FeatureHelp(title: title, message: help)
-            } label: {
-                Image(systemName: "info.circle")
-                    .foregroundStyle(.secondary)
-            }
-            .buttonStyle(.plain)
-            .accessibilityLabel("\(title) info")
-        }
-        .onChange(of: isOn.wrappedValue) { _, newValue in
-            onChange?(newValue)
+    private func modelIdentifier() -> String {
+        var systemInfo = utsname()
+        uname(&systemInfo)
+        let machine = withUnsafeBytes(of: &systemInfo.machine) { ptr in
+            String(bytes: ptr.prefix { $0 != 0 }, encoding: .utf8)
         }
+        let trimmed = machine?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        return trimmed.isEmpty ? "unknown" : trimmed
     }
 
     private func connect(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) async {
@@ -614,10 +510,7 @@ struct SettingsTab: View {
         GatewaySettingsStore.saveLastDiscoveredGatewayStableID(gateway.stableID)
         defer { self.connectingGatewayID = nil }
 
-        let err = await self.gatewayController.connectWithDiagnostics(gateway)
-        if let err {
-            self.setupStatusText = err
-        }
+        await self.gatewayController.connect(gateway)
     }
 
     private func connectLastKnown() async {
@@ -956,43 +849,6 @@ struct SettingsTab: View {
         SettingsNetworkingHelpers.httpURLString(host: host, port: port, fallback: fallback)
     }
 
-    private func resetOnboarding() {
-        // Disconnect first so RootCanvas doesn't instantly mark onboarding complete again.
-        self.appModel.disconnectGateway()
-        self.connectingGatewayID = nil
-        self.setupStatusText = nil
-        self.setupCode = ""
-        self.gatewayAutoConnect = false
-
-        self.suppressCredentialPersist = true
-        defer { self.suppressCredentialPersist = false }
-
-        self.gatewayToken = ""
-        self.gatewayPassword = ""
-
-        let trimmedInstanceId = self.instanceId.trimmingCharacters(in: .whitespacesAndNewlines)
-        if !trimmedInstanceId.isEmpty {
-            GatewaySettingsStore.deleteGatewayCredentials(instanceId: trimmedInstanceId)
-        }
-
-        // Reset onboarding state + clear saved gateway connection (the two things RootCanvas checks).
-        GatewaySettingsStore.clearLastGatewayConnection()
-
-        // RootCanvas also short-circuits onboarding when these are true.
-        self.onboardingComplete = false
-        self.hasConnectedOnce = false
-
-        // Clear manual override so it doesn't count as an existing gateway config.
-        self.manualGatewayEnabled = false
-        self.manualGatewayHost = ""
-
-        // Force re-present even without app restart.
-        self.onboardingRequestID += 1
-
-        // The onboarding wizard is presented from RootCanvas; dismiss Settings so it can show.
-        self.dismiss()
-    }
-
     private func gatewayDetailLines(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) -> [String] {
         var lines: [String] = []
         if let lanHost = gateway.lanHost { lines.append("LAN: \(lanHost)") }

apps/ios/Sources/Status/StatusActivityBuilder.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 
 enum StatusActivityBuilder {
-    @MainActor
     static func build(
         appModel: NodeAppModel,
         voiceWakeEnabled: Bool,

apps/ios/Sources/Status/StatusPill.swift

@@ -2,8 +2,6 @@ import SwiftUI
 
 struct StatusPill: View {
     @Environment(\.scenePhase) private var scenePhase
-    @Environment(\.accessibilityReduceMotion) private var reduceMotion
-    @Environment(\.colorSchemeContrast) private var contrast
 
     enum GatewayState: Equatable {
         case connected
@@ -51,11 +49,11 @@ struct StatusPill: View {
                     Circle()
                         .fill(self.gateway.color)
                         .frame(width: 9, height: 9)
-                        .scaleEffect(self.gateway == .connecting && !self.reduceMotion ? (self.pulse ? 1.15 : 0.85) : 1.0)
-                        .opacity(self.gateway == .connecting && !self.reduceMotion ? (self.pulse ? 1.0 : 0.6) : 1.0)
+                        .scaleEffect(self.gateway == .connecting ? (self.pulse ? 1.15 : 0.85) : 1.0)
+                        .opacity(self.gateway == .connecting ? (self.pulse ? 1.0 : 0.6) : 1.0)
 
                     Text(self.gateway.title)
-                        .font(.subheadline.weight(.semibold))
+                        .font(.system(size: 13, weight: .semibold))
                         .foregroundStyle(.primary)
                 }
 
@@ -66,17 +64,17 @@ struct StatusPill: View {
                 if let activity {
                     HStack(spacing: 6) {
                         Image(systemName: activity.systemImage)
-                            .font(.subheadline.weight(.semibold))
+                            .font(.system(size: 13, weight: .semibold))
                             .foregroundStyle(activity.tint ?? .primary)
                         Text(activity.title)
-                            .font(.subheadline.weight(.semibold))
+                            .font(.system(size: 13, weight: .semibold))
                             .foregroundStyle(.primary)
                             .lineLimit(1)
                     }
                     .transition(.opacity.combined(with: .move(edge: .top)))
                 } else {
                     Image(systemName: self.voiceWakeEnabled ? "mic.fill" : "mic.slash")
-                        .font(.subheadline.weight(.semibold))
+                        .font(.system(size: 13, weight: .semibold))
                         .foregroundStyle(self.voiceWakeEnabled ? .primary : .secondary)
                         .accessibilityLabel(self.voiceWakeEnabled ? "Voice Wake enabled" : "Voice Wake disabled")
                         .transition(.opacity.combined(with: .move(edge: .top)))
@@ -89,28 +87,21 @@ struct StatusPill: View {
                     .fill(.ultraThinMaterial)
                     .overlay {
                         RoundedRectangle(cornerRadius: 14, style: .continuous)
-                            .strokeBorder(
-                                .white.opacity(self.contrast == .increased ? 0.5 : (self.brighten ? 0.24 : 0.18)),
-                                lineWidth: self.contrast == .increased ? 1.0 : 0.5
-                            )
+                            .strokeBorder(.white.opacity(self.brighten ? 0.24 : 0.18), lineWidth: 0.5)
                     }
                     .shadow(color: .black.opacity(0.25), radius: 12, y: 6)
             }
         }
         .buttonStyle(.plain)
-        .accessibilityLabel("Connection Status")
+        .accessibilityLabel("Status")
         .accessibilityValue(self.accessibilityValue)
-        .accessibilityHint("Double tap to open settings")
-        .onAppear { self.updatePulse(for: self.gateway, scenePhase: self.scenePhase, reduceMotion: self.reduceMotion) }
+        .onAppear { self.updatePulse(for: self.gateway, scenePhase: self.scenePhase) }
         .onDisappear { self.pulse = false }
         .onChange(of: self.gateway) { _, newValue in
-            self.updatePulse(for: newValue, scenePhase: self.scenePhase, reduceMotion: self.reduceMotion)
+            self.updatePulse(for: newValue, scenePhase: self.scenePhase)
         }
         .onChange(of: self.scenePhase) { _, newValue in
-            self.updatePulse(for: self.gateway, scenePhase: newValue, reduceMotion: self.reduceMotion)
-        }
-        .onChange(of: self.reduceMotion) { _, newValue in
-            self.updatePulse(for: self.gateway, scenePhase: self.scenePhase, reduceMotion: newValue)
+            self.updatePulse(for: self.gateway, scenePhase: newValue)
         }
         .animation(.easeInOut(duration: 0.18), value: self.activity?.title)
     }
@@ -122,9 +113,9 @@ struct StatusPill: View {
         return "\(self.gateway.title), Voice Wake \(self.voiceWakeEnabled ? "enabled" : "disabled")"
     }
 
-    private func updatePulse(for gateway: GatewayState, scenePhase: ScenePhase, reduceMotion: Bool) {
-        guard gateway == .connecting, scenePhase == .active, !reduceMotion else {
-            withAnimation(reduceMotion ? .none : .easeOut(duration: 0.2)) { self.pulse = false }
+    private func updatePulse(for gateway: GatewayState, scenePhase: ScenePhase) {
+        guard gateway == .connecting, scenePhase == .active else {
+            withAnimation(.easeOut(duration: 0.2)) { self.pulse = false }
             return
         }
 

apps/ios/Sources/Status/VoiceWakeToast.swift

@@ -1,19 +1,17 @@
 import SwiftUI
 
 struct VoiceWakeToast: View {
-    @Environment(\.colorSchemeContrast) private var contrast
-
     var command: String
     var brighten: Bool = false
 
     var body: some View {
         HStack(spacing: 10) {
             Image(systemName: "mic.fill")
-                .font(.subheadline.weight(.semibold))
+                .font(.system(size: 14, weight: .semibold))
                 .foregroundStyle(.primary)
 
             Text(self.command)
-                .font(.subheadline.weight(.semibold))
+                .font(.system(size: 14, weight: .semibold))
                 .foregroundStyle(.primary)
                 .lineLimit(1)
                 .truncationMode(.tail)
@@ -25,14 +23,11 @@ struct VoiceWakeToast: View {
                 .fill(.ultraThinMaterial)
                 .overlay {
                     RoundedRectangle(cornerRadius: 14, style: .continuous)
-                        .strokeBorder(
-                            .white.opacity(self.contrast == .increased ? 0.5 : (self.brighten ? 0.24 : 0.18)),
-                            lineWidth: self.contrast == .increased ? 1.0 : 0.5
-                        )
+                        .strokeBorder(.white.opacity(self.brighten ? 0.24 : 0.18), lineWidth: 0.5)
                 }
                 .shadow(color: .black.opacity(0.25), radius: 12, y: 6)
         }
-        .accessibilityLabel("Voice Wake triggered")
-        .accessibilityValue("Command: \(self.command)")
+        .accessibilityLabel("Voice Wake")
+        .accessibilityValue(self.command)
     }
 }

apps/ios/Sources/Voice/TalkModeManager.swift

@@ -16,7 +16,6 @@ import Speech
 final class TalkModeManager: NSObject {
     private typealias SpeechRequest = SFSpeechAudioBufferRecognitionRequest
     private static let defaultModelIdFallback = "eleven_v3"
-    private static let redactedConfigSentinel = "__OPENCLAW_REDACTED__"
     var isEnabled: Bool = false
     var isListening: Bool = false
     var isSpeaking: Bool = false
@@ -219,12 +218,8 @@ final class TalkModeManager: NSObject {
 
     /// Suspends microphone usage without disabling Talk Mode.
     /// Used when the app backgrounds (or when we need to temporarily release the mic).
-    func suspendForBackground(keepActive: Bool = false) -> Bool {
+    func suspendForBackground() -> Bool {
         guard self.isEnabled else { return false }
-        if keepActive {
-            self.statusText = self.isListening ? "Listening" : self.statusText
-            return false
-        }
         let wasActive = self.isListening || self.isSpeaking || self.isPushToTalkActive
 
         self.isListening = false
@@ -251,8 +246,7 @@ final class TalkModeManager: NSObject {
         return wasActive
     }
 
-    func resumeAfterBackground(wasSuspended: Bool, wasKeptActive: Bool = false) async {
-        if wasKeptActive { return }
+    func resumeAfterBackground(wasSuspended: Bool) async {
         guard wasSuspended else { return }
         guard self.isEnabled else { return }
         await self.start()
@@ -820,24 +814,29 @@ final class TalkModeManager: NSObject {
     private func subscribeChatIfNeeded(sessionKey: String) async {
         let key = sessionKey.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !key.isEmpty else { return }
+        guard let gateway else { return }
         guard !self.chatSubscribedSessionKeys.contains(key) else { return }
 
-        // Operator clients receive chat events without node-style subscriptions.
+        let payload = "{\"sessionKey\":\"\(key)\"}"
+        await gateway.sendEvent(event: "chat.subscribe", payloadJSON: payload)
         self.chatSubscribedSessionKeys.insert(key)
+        self.logger.info("chat.subscribe ok sessionKey=\(key, privacy: .public)")
     }
 
     private func unsubscribeAllChats() async {
+        guard let gateway else { return }
+        let keys = self.chatSubscribedSessionKeys
         self.chatSubscribedSessionKeys.removeAll()
+        for key in keys {
+            let payload = "{\"sessionKey\":\"\(key)\"}"
+            await gateway.sendEvent(event: "chat.unsubscribe", payloadJSON: payload)
+        }
     }
 
     private func buildPrompt(transcript: String) -> String {
         let interrupted = self.lastInterruptedAtSeconds
         self.lastInterruptedAtSeconds = nil
-        let includeVoiceDirectiveHint = (UserDefaults.standard.object(forKey: "talk.voiceDirectiveHint.enabled") as? Bool) ?? true
-        return TalkPromptBuilder.build(
-            transcript: transcript,
-            interruptedAtSeconds: interrupted,
-            includeVoiceDirectiveHint: includeVoiceDirectiveHint)
+        return TalkPromptBuilder.build(transcript: transcript, interruptedAtSeconds: interrupted)
     }
 
     private enum ChatCompletionState: CustomStringConvertible {
@@ -1115,7 +1114,6 @@ final class TalkModeManager: NSObject {
     }
 
     private func shouldInterrupt(with transcript: String) -> Bool {
-        guard self.shouldAllowSpeechInterruptForCurrentRoute() else { return false }
         let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
         guard trimmed.count >= 3 else { return false }
         if let spoken = self.lastSpokenText?.lowercased(), spoken.contains(trimmed.lowercased()) {
@@ -1124,20 +1122,6 @@ final class TalkModeManager: NSObject {
         return true
     }
 
-    private func shouldAllowSpeechInterruptForCurrentRoute() -> Bool {
-        let route = AVAudioSession.sharedInstance().currentRoute
-        // Built-in speaker/receiver often feeds TTS back into STT, causing false interrupts.
-        // Allow barge-in for isolated outputs (headphones/Bluetooth/USB/CarPlay/AirPlay).
-        return !route.outputs.contains { output in
-            switch output.portType {
-            case .builtInSpeaker, .builtInReceiver:
-                return true
-            default:
-                return false
-            }
-        }
-    }
-
     private func shouldUseIncrementalTTS() -> Bool {
         true
     }
@@ -1684,15 +1668,6 @@ extension TalkModeManager {
         return value.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" || $0 == "_" }
     }
 
-    private static func normalizedTalkApiKey(_ raw: String?) -> String? {
-        let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return nil }
-        guard trimmed != Self.redactedConfigSentinel else { return nil }
-        // Config values may be env placeholders (for example `${ELEVENLABS_API_KEY}`).
-        if trimmed.hasPrefix("${"), trimmed.hasSuffix("}") { return nil }
-        return trimmed
-    }
-
     func reloadConfig() async {
         guard let gateway else { return }
         do {
@@ -1724,15 +1699,7 @@ extension TalkModeManager {
             }
             self.defaultOutputFormat = (talk?["outputFormat"] as? String)?
                 .trimmingCharacters(in: .whitespacesAndNewlines)
-            let rawConfigApiKey = (talk?["apiKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-            let configApiKey = Self.normalizedTalkApiKey(rawConfigApiKey)
-            let localApiKey = Self.normalizedTalkApiKey(GatewaySettingsStore.loadTalkElevenLabsApiKey())
-            if rawConfigApiKey == Self.redactedConfigSentinel {
-                self.apiKey = (localApiKey?.isEmpty == false) ? localApiKey : nil
-                GatewayDiagnostics.log("talk config apiKey redacted; using local override if present")
-            } else {
-                self.apiKey = (localApiKey?.isEmpty == false) ? localApiKey : configApiKey
-            }
+            self.apiKey = (talk?["apiKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
             if let interrupt = talk?["interruptOnSpeech"] as? Bool {
                 self.interruptOnSpeech = interrupt
             }

apps/ios/Tests/DeepLinkParserTests.swift

@@ -76,52 +76,4 @@ import Testing
             timeoutSeconds: nil,
             key: nil)))
     }
-
-    @Test func parseGatewayLinkParsesCommonFields() {
-        let url = URL(
-            string: "openclaw://gateway?host=openclaw.local&port=18789&tls=1&token=abc&password=def")!
-        #expect(
-            DeepLinkParser.parse(url) == .gateway(
-                .init(host: "openclaw.local", port: 18789, tls: true, token: "abc", password: "def")))
-    }
-
-    @Test func parseGatewaySetupCodeParsesBase64UrlPayload() {
-        let payload = #"{"url":"wss://gateway.example.com:443","token":"tok","password":"pw"}"#
-        let encoded = Data(payload.utf8)
-            .base64EncodedString()
-            .replacingOccurrences(of: "+", with: "-")
-            .replacingOccurrences(of: "/", with: "_")
-            .replacingOccurrences(of: "=", with: "")
-
-        let link = GatewayConnectDeepLink.fromSetupCode(encoded)
-
-        #expect(link == .init(
-            host: "gateway.example.com",
-            port: 443,
-            tls: true,
-            token: "tok",
-            password: "pw"))
-    }
-
-    @Test func parseGatewaySetupCodeRejectsInvalidInput() {
-        #expect(GatewayConnectDeepLink.fromSetupCode("not-a-valid-setup-code") == nil)
-    }
-
-    @Test func parseGatewaySetupCodeDefaultsTo443ForWssWithoutPort() {
-        let payload = #"{"url":"wss://gateway.example.com","token":"tok"}"#
-        let encoded = Data(payload.utf8)
-            .base64EncodedString()
-            .replacingOccurrences(of: "+", with: "-")
-            .replacingOccurrences(of: "/", with: "_")
-            .replacingOccurrences(of: "=", with: "")
-
-        let link = GatewayConnectDeepLink.fromSetupCode(encoded)
-
-        #expect(link == .init(
-            host: "gateway.example.com",
-            port: 443,
-            tls: true,
-            token: "tok",
-            password: nil))
-    }
 }

apps/ios/Tests/GatewayConnectionControllerTests.swift

@@ -76,47 +76,4 @@ private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws ->
             #expect(commands.contains(OpenClawLocationCommand.get.rawValue))
         }
     }
-    @Test @MainActor func currentCommandsExcludeDangerousSystemExecCommands() {
-        withUserDefaults([
-            "node.instanceId": "ios-test",
-            "camera.enabled": true,
-            "location.enabledMode": OpenClawLocationMode.whileUsing.rawValue,
-        ]) {
-            let appModel = NodeAppModel()
-            let controller = GatewayConnectionController(appModel: appModel, startDiscovery: false)
-            let commands = Set(controller._test_currentCommands())
-
-            // iOS should expose notify, but not host shell/exec-approval commands.
-            #expect(commands.contains(OpenClawSystemCommand.notify.rawValue))
-            #expect(!commands.contains(OpenClawSystemCommand.run.rawValue))
-            #expect(!commands.contains(OpenClawSystemCommand.which.rawValue))
-            #expect(!commands.contains(OpenClawSystemCommand.execApprovalsGet.rawValue))
-            #expect(!commands.contains(OpenClawSystemCommand.execApprovalsSet.rawValue))
-        }
-    }
-
-    @Test @MainActor func loadLastConnectionReadsSavedValues() {
-        withUserDefaults([:]) {
-            GatewaySettingsStore.saveLastGatewayConnectionManual(
-                host: "gateway.example.com",
-                port: 443,
-                useTLS: true,
-                stableID: "manual|gateway.example.com|443")
-            let loaded = GatewaySettingsStore.loadLastGatewayConnection()
-            #expect(loaded == .manual(host: "gateway.example.com", port: 443, useTLS: true, stableID: "manual|gateway.example.com|443"))
-        }
-    }
-
-    @Test @MainActor func loadLastConnectionReturnsNilForInvalidData() {
-        withUserDefaults([
-            "gateway.last.kind": "manual",
-            "gateway.last.host": "",
-            "gateway.last.port": 0,
-            "gateway.last.tls": false,
-            "gateway.last.stableID": "manual|invalid|0",
-        ]) {
-            let loaded = GatewaySettingsStore.loadLastGatewayConnection()
-            #expect(loaded == nil)
-        }
-    }
 }

apps/ios/Tests/GatewayConnectionIssueTests.swift

@@ -1,33 +0,0 @@
-import Testing
-@testable import OpenClaw
-
-@Suite(.serialized) struct GatewayConnectionIssueTests {
-    @Test func detectsTokenMissing() {
-        let issue = GatewayConnectionIssue.detect(from: "unauthorized: gateway token missing")
-        #expect(issue == .tokenMissing)
-        #expect(issue.needsAuthToken)
-    }
-
-    @Test func detectsUnauthorized() {
-        let issue = GatewayConnectionIssue.detect(from: "Gateway error: unauthorized role")
-        #expect(issue == .unauthorized)
-        #expect(issue.needsAuthToken)
-    }
-
-    @Test func detectsPairingWithRequestId() {
-        let issue = GatewayConnectionIssue.detect(from: "pairing required (requestId: abc123)")
-        #expect(issue == .pairingRequired(requestId: "abc123"))
-        #expect(issue.needsPairing)
-        #expect(issue.requestId == "abc123")
-    }
-
-    @Test func detectsNetworkError() {
-        let issue = GatewayConnectionIssue.detect(from: "Gateway error: Connection refused")
-        #expect(issue == .network)
-    }
-
-    @Test func returnsNoneForBenignStatus() {
-        let issue = GatewayConnectionIssue.detect(from: "Connected")
-        #expect(issue == .none)
-    }
-}

apps/ios/Tests/Info.plist

@@ -17,8 +17,8 @@
 	<key>CFBundlePackageType</key>
 			<string>BNDL</string>
 			<key>CFBundleShortVersionString</key>
-			<string>2026.2.18</string>
+			<string>2026.2.16</string>
 			<key>CFBundleVersion</key>
-			<string>20260218</string>
+			<string>20260216</string>
 		</dict>
 	</plist>

apps/ios/Tests/NodeAppModelInvokeTests.swift

@@ -29,39 +29,6 @@ private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws ->
     return try body()
 }
 
-@MainActor
-private final class MockWatchMessagingService: WatchMessagingServicing, @unchecked Sendable {
-    var currentStatus = WatchMessagingStatus(
-        supported: true,
-        paired: true,
-        appInstalled: true,
-        reachable: true,
-        activationState: "activated")
-    var nextSendResult = WatchNotificationSendResult(
-        deliveredImmediately: true,
-        queuedForDelivery: false,
-        transport: "sendMessage")
-    var sendError: Error?
-    var lastSent: (id: String, title: String, body: String, priority: OpenClawNotificationPriority?)?
-
-    func status() async -> WatchMessagingStatus {
-        self.currentStatus
-    }
-
-    func sendNotification(
-        id: String,
-        title: String,
-        body: String,
-        priority: OpenClawNotificationPriority?) async throws -> WatchNotificationSendResult
-    {
-        self.lastSent = (id: id, title: title, body: body, priority: priority)
-        if let sendError = self.sendError {
-            throw sendError
-        }
-        return self.nextSendResult
-    }
-}
-
 @Suite(.serialized) struct NodeAppModelInvokeTests {
     @Test @MainActor func decodeParamsFailsWithoutJSON() {
         #expect(throws: Error.self) {
@@ -189,96 +156,6 @@ private final class MockWatchMessagingService: WatchMessagingServicing, @uncheck
         #expect(res.error?.code == .invalidRequest)
     }
 
-    @Test @MainActor func handleInvokeWatchStatusReturnsServiceSnapshot() async throws {
-        let watchService = MockWatchMessagingService()
-        watchService.currentStatus = WatchMessagingStatus(
-            supported: true,
-            paired: true,
-            appInstalled: true,
-            reachable: false,
-            activationState: "inactive")
-        let appModel = NodeAppModel(watchMessagingService: watchService)
-        let req = BridgeInvokeRequest(id: "watch-status", command: OpenClawWatchCommand.status.rawValue)
-
-        let res = await appModel._test_handleInvoke(req)
-        #expect(res.ok == true)
-
-        let payloadData = try #require(res.payloadJSON?.data(using: .utf8))
-        let payload = try JSONDecoder().decode(OpenClawWatchStatusPayload.self, from: payloadData)
-        #expect(payload.supported == true)
-        #expect(payload.reachable == false)
-        #expect(payload.activationState == "inactive")
-    }
-
-    @Test @MainActor func handleInvokeWatchNotifyRoutesToWatchService() async throws {
-        let watchService = MockWatchMessagingService()
-        watchService.nextSendResult = WatchNotificationSendResult(
-            deliveredImmediately: false,
-            queuedForDelivery: true,
-            transport: "transferUserInfo")
-        let appModel = NodeAppModel(watchMessagingService: watchService)
-        let params = OpenClawWatchNotifyParams(
-            title: "OpenClaw",
-            body: "Meeting with Peter is at 4pm",
-            priority: .timeSensitive)
-        let paramsData = try JSONEncoder().encode(params)
-        let paramsJSON = String(decoding: paramsData, as: UTF8.self)
-        let req = BridgeInvokeRequest(
-            id: "watch-notify",
-            command: OpenClawWatchCommand.notify.rawValue,
-            paramsJSON: paramsJSON)
-
-        let res = await appModel._test_handleInvoke(req)
-        #expect(res.ok == true)
-        #expect(watchService.lastSent?.title == "OpenClaw")
-        #expect(watchService.lastSent?.body == "Meeting with Peter is at 4pm")
-        #expect(watchService.lastSent?.priority == .timeSensitive)
-
-        let payloadData = try #require(res.payloadJSON?.data(using: .utf8))
-        let payload = try JSONDecoder().decode(OpenClawWatchNotifyPayload.self, from: payloadData)
-        #expect(payload.deliveredImmediately == false)
-        #expect(payload.queuedForDelivery == true)
-        #expect(payload.transport == "transferUserInfo")
-    }
-
-    @Test @MainActor func handleInvokeWatchNotifyRejectsEmptyMessage() async throws {
-        let watchService = MockWatchMessagingService()
-        let appModel = NodeAppModel(watchMessagingService: watchService)
-        let params = OpenClawWatchNotifyParams(title: "   ", body: "\n")
-        let paramsData = try JSONEncoder().encode(params)
-        let paramsJSON = String(decoding: paramsData, as: UTF8.self)
-        let req = BridgeInvokeRequest(
-            id: "watch-notify-empty",
-            command: OpenClawWatchCommand.notify.rawValue,
-            paramsJSON: paramsJSON)
-
-        let res = await appModel._test_handleInvoke(req)
-        #expect(res.ok == false)
-        #expect(res.error?.code == .invalidRequest)
-        #expect(watchService.lastSent == nil)
-    }
-
-    @Test @MainActor func handleInvokeWatchNotifyReturnsUnavailableOnDeliveryFailure() async throws {
-        let watchService = MockWatchMessagingService()
-        watchService.sendError = NSError(
-            domain: "watch",
-            code: 1,
-            userInfo: [NSLocalizedDescriptionKey: "WATCH_UNAVAILABLE: no paired Apple Watch"])
-        let appModel = NodeAppModel(watchMessagingService: watchService)
-        let params = OpenClawWatchNotifyParams(title: "OpenClaw", body: "Delivery check")
-        let paramsData = try JSONEncoder().encode(params)
-        let paramsJSON = String(decoding: paramsData, as: UTF8.self)
-        let req = BridgeInvokeRequest(
-            id: "watch-notify-fail",
-            command: OpenClawWatchCommand.notify.rawValue,
-            paramsJSON: paramsJSON)
-
-        let res = await appModel._test_handleInvoke(req)
-        #expect(res.ok == false)
-        #expect(res.error?.code == .unavailable)
-        #expect(res.error?.message.contains("WATCH_UNAVAILABLE") == true)
-    }
-
     @Test @MainActor func handleDeepLinkSetsErrorWhenNotConnected() async {
         let appModel = NodeAppModel()
         let url = URL(string: "openclaw://agent?message=hello")!

apps/ios/Tests/OnboardingStateStoreTests.swift

@@ -1,57 +0,0 @@
-import Foundation
-import Testing
-@testable import OpenClaw
-
-@Suite(.serialized) struct OnboardingStateStoreTests {
-    @Test @MainActor func shouldPresentWhenFreshAndDisconnected() {
-        let testDefaults = self.makeDefaults()
-        let defaults = testDefaults.defaults
-        defer { self.reset(testDefaults) }
-
-        let appModel = NodeAppModel()
-        appModel.gatewayServerName = nil
-        #expect(OnboardingStateStore.shouldPresentOnLaunch(appModel: appModel, defaults: defaults))
-    }
-
-    @Test @MainActor func doesNotPresentWhenConnected() {
-        let testDefaults = self.makeDefaults()
-        let defaults = testDefaults.defaults
-        defer { self.reset(testDefaults) }
-
-        let appModel = NodeAppModel()
-        appModel.gatewayServerName = "gateway"
-        #expect(!OnboardingStateStore.shouldPresentOnLaunch(appModel: appModel, defaults: defaults))
-    }
-
-    @Test @MainActor func markCompletedPersistsMode() {
-        let testDefaults = self.makeDefaults()
-        let defaults = testDefaults.defaults
-        defer { self.reset(testDefaults) }
-
-        let appModel = NodeAppModel()
-        appModel.gatewayServerName = nil
-
-        OnboardingStateStore.markCompleted(mode: .remoteDomain, defaults: defaults)
-        #expect(OnboardingStateStore.lastMode(defaults: defaults) == .remoteDomain)
-        #expect(!OnboardingStateStore.shouldPresentOnLaunch(appModel: appModel, defaults: defaults))
-
-        OnboardingStateStore.markIncomplete(defaults: defaults)
-        #expect(OnboardingStateStore.shouldPresentOnLaunch(appModel: appModel, defaults: defaults))
-    }
-
-    private struct TestDefaults {
-        var suiteName: String
-        var defaults: UserDefaults
-    }
-
-    private func makeDefaults() -> TestDefaults {
-        let suiteName = "OnboardingStateStoreTests.\(UUID().uuidString)"
-        return TestDefaults(
-            suiteName: suiteName,
-            defaults: UserDefaults(suiteName: suiteName) ?? .standard)
-    }
-
-    private func reset(_ defaults: TestDefaults) {
-        defaults.defaults.removePersistentDomain(forName: defaults.suiteName)
-    }
-}

apps/ios/Tests/ScreenControllerTests.swift

@@ -2,38 +2,25 @@ import Testing
 import WebKit
 @testable import OpenClaw
 
-@MainActor
-private func mountScreen(_ screen: ScreenController) throws -> (ScreenWebViewCoordinator, WKWebView) {
-    let coordinator = ScreenWebViewCoordinator(controller: screen)
-    _ = coordinator.makeContainerView()
-    let webView = try #require(coordinator.managedWebView)
-    return (coordinator, webView)
-}
-
 @Suite struct ScreenControllerTests {
-    @Test @MainActor func canvasModeConfiguresWebViewForTouch() throws {
+    @Test @MainActor func canvasModeConfiguresWebViewForTouch() {
         let screen = ScreenController()
-        let (coordinator, webView) = try mountScreen(screen)
-        defer { coordinator.teardown() }
 
-        #expect(webView.isOpaque == true)
-        #expect(webView.backgroundColor == .black)
+        #expect(screen.webView.isOpaque == true)
+        #expect(screen.webView.backgroundColor == .black)
 
-        let scrollView = webView.scrollView
+        let scrollView = screen.webView.scrollView
         #expect(scrollView.backgroundColor == .black)
         #expect(scrollView.contentInsetAdjustmentBehavior == .never)
         #expect(scrollView.isScrollEnabled == false)
         #expect(scrollView.bounces == false)
     }
 
-    @Test @MainActor func navigateEnablesScrollForWebPages() throws {
+    @Test @MainActor func navigateEnablesScrollForWebPages() {
         let screen = ScreenController()
-        let (coordinator, webView) = try mountScreen(screen)
-        defer { coordinator.teardown() }
-
         screen.navigate(to: "https://example.com")
 
-        let scrollView = webView.scrollView
+        let scrollView = screen.webView.scrollView
         #expect(scrollView.isScrollEnabled == true)
         #expect(scrollView.bounces == true)
     }
@@ -47,9 +34,6 @@ private func mountScreen(_ screen: ScreenController) throws -> (ScreenWebViewCoo
 
     @Test @MainActor func evalExecutesJavaScript() async throws {
         let screen = ScreenController()
-        let (coordinator, _) = try mountScreen(screen)
-        defer { coordinator.teardown() }
-
         let deadline = ContinuousClock().now.advanced(by: .seconds(3))
 
         while true {

apps/ios/Tests/ShareToAgentDeepLinkTests.swift

@@ -1,51 +0,0 @@
-import OpenClawKit
-import Foundation
-import Testing
-
-@Suite struct ShareToAgentDeepLinkTests {
-    @Test func buildMessageIncludesSharedFields() {
-        let payload = SharedContentPayload(
-            title: "Article",
-            url: URL(string: "https://example.com/post")!,
-            text: "Read this")
-
-        let message = ShareToAgentDeepLink.buildMessage(
-            from: payload,
-            instruction: "Summarize and give next steps.")
-        #expect(message.contains("Shared from iOS."))
-        #expect(message.contains("Title: Article"))
-        #expect(message.contains("URL: https://example.com/post"))
-        #expect(message.contains("Text:\nRead this"))
-        #expect(message.contains("Summarize and give next steps."))
-    }
-
-    @Test func buildURLEncodesAgentRoute() {
-        let payload = SharedContentPayload(
-            title: "",
-            url: URL(string: "https://example.com")!,
-            text: nil)
-
-        let url = ShareToAgentDeepLink.buildURL(from: payload)
-        let parsed = url.flatMap { DeepLinkParser.parse($0) }
-        guard case let .agent(agent)? = parsed else {
-            Issue.record("Expected openclaw://agent deep link")
-            return
-        }
-
-        #expect(agent.thinking == "low")
-        #expect(agent.message.contains("https://example.com"))
-    }
-
-    @Test func buildURLReturnsNilWhenPayloadEmpty() {
-        let payload = SharedContentPayload(title: nil, url: nil, text: nil)
-        #expect(ShareToAgentDeepLink.buildURL(from: payload) == nil)
-    }
-
-    @Test func shareInstructionSettingsRoundTrip() {
-        let value = "Focus on booking constraints and alternatives."
-        ShareToAgentSettings.saveDefaultInstruction(value)
-        defer { ShareToAgentSettings.saveDefaultInstruction(nil) }
-
-        #expect(ShareToAgentSettings.loadDefaultInstruction() == value)
-    }
-}

apps/ios/WatchApp/Info.plist

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>OpenClaw</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2026.2.18</string>
-	<key>CFBundleVersion</key>
-	<string>20260218</string>
-	<key>WKCompanionAppBundleIdentifier</key>
-	<string>$(OPENCLAW_APP_BUNDLE_ID)</string>
-	<key>WKWatchKitApp</key>
-	<true/>
-</dict>
-</plist>

apps/ios/WatchExtension/Info.plist

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>OpenClaw</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2026.2.18</string>
-	<key>CFBundleVersion</key>
-	<string>20260218</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-			<key>WKAppBundleIdentifier</key>
-			<string>$(OPENCLAW_WATCH_APP_BUNDLE_ID)</string>
-		</dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.watchkit</string>
-	</dict>
-</dict>
-</plist>

apps/ios/WatchExtension/Sources/OpenClawWatchApp.swift

@@ -1,20 +0,0 @@
-import SwiftUI
-
-@main
-struct OpenClawWatchApp: App {
-    @State private var inboxStore = WatchInboxStore()
-    @State private var receiver: WatchConnectivityReceiver?
-
-    var body: some Scene {
-        WindowGroup {
-            WatchInboxView(store: self.inboxStore)
-                .task {
-                    if self.receiver == nil {
-                        let receiver = WatchConnectivityReceiver(store: self.inboxStore)
-                        receiver.activate()
-                        self.receiver = receiver
-                    }
-                }
-        }
-    }
-}

apps/ios/WatchExtension/Sources/WatchConnectivityReceiver.swift

@@ -1,92 +0,0 @@
-import Foundation
-import WatchConnectivity
-
-final class WatchConnectivityReceiver: NSObject, @unchecked Sendable {
-    private let store: WatchInboxStore
-    private let session: WCSession?
-
-    init(store: WatchInboxStore) {
-        self.store = store
-        if WCSession.isSupported() {
-            self.session = WCSession.default
-        } else {
-            self.session = nil
-        }
-        super.init()
-    }
-
-    func activate() {
-        guard let session = self.session else { return }
-        session.delegate = self
-        session.activate()
-    }
-
-    private static func parseNotificationPayload(_ payload: [String: Any]) -> WatchNotifyMessage? {
-        guard let type = payload["type"] as? String, type == "watch.notify" else {
-            return nil
-        }
-
-        let title = (payload["title"] as? String)?
-            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let body = (payload["body"] as? String)?
-            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-
-        guard title.isEmpty == false || body.isEmpty == false else {
-            return nil
-        }
-
-        let id = (payload["id"] as? String)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-        let sentAtMs = (payload["sentAtMs"] as? Int) ?? (payload["sentAtMs"] as? NSNumber)?.intValue
-
-        return WatchNotifyMessage(
-            id: id,
-            title: title,
-            body: body,
-            sentAtMs: sentAtMs)
-    }
-}
-
-extension WatchConnectivityReceiver: WCSessionDelegate {
-    func session(
-        _: WCSession,
-        activationDidCompleteWith _: WCSessionActivationState,
-        error _: (any Error)?)
-    {}
-
-    func session(_: WCSession, didReceiveMessage message: [String: Any]) {
-        guard let incoming = Self.parseNotificationPayload(message) else { return }
-        Task { @MainActor in
-            self.store.consume(message: incoming, transport: "sendMessage")
-        }
-    }
-
-    func session(
-        _: WCSession,
-        didReceiveMessage message: [String: Any],
-        replyHandler: @escaping ([String: Any]) -> Void)
-    {
-        guard let incoming = Self.parseNotificationPayload(message) else {
-            replyHandler(["ok": false])
-            return
-        }
-        replyHandler(["ok": true])
-        Task { @MainActor in
-            self.store.consume(message: incoming, transport: "sendMessage")
-        }
-    }
-
-    func session(_: WCSession, didReceiveUserInfo userInfo: [String: Any]) {
-        guard let incoming = Self.parseNotificationPayload(userInfo) else { return }
-        Task { @MainActor in
-            self.store.consume(message: incoming, transport: "transferUserInfo")
-        }
-    }
-
-    func session(_: WCSession, didReceiveApplicationContext applicationContext: [String: Any]) {
-        guard let incoming = Self.parseNotificationPayload(applicationContext) else { return }
-        Task { @MainActor in
-            self.store.consume(message: incoming, transport: "applicationContext")
-        }
-    }
-}

apps/ios/WatchExtension/Sources/WatchInboxStore.swift

@@ -1,124 +0,0 @@
-import Foundation
-import Observation
-import UserNotifications
-import WatchKit
-
-struct WatchNotifyMessage: Sendable {
-    var id: String?
-    var title: String
-    var body: String
-    var sentAtMs: Int?
-}
-
-@MainActor @Observable final class WatchInboxStore {
-    private struct PersistedState: Codable {
-        var title: String
-        var body: String
-        var transport: String
-        var updatedAt: Date
-        var lastDeliveryKey: String?
-    }
-
-    private static let persistedStateKey = "watch.inbox.state.v1"
-    private let defaults: UserDefaults
-
-    var title = "OpenClaw"
-    var body = "Waiting for messages from your iPhone."
-    var transport = "none"
-    var updatedAt: Date?
-    private var lastDeliveryKey: String?
-
-    init(defaults: UserDefaults = .standard) {
-        self.defaults = defaults
-        self.restorePersistedState()
-        Task {
-            await self.ensureNotificationAuthorization()
-        }
-    }
-
-    func consume(message: WatchNotifyMessage, transport: String) {
-        let messageID = message.id?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-        let deliveryKey = self.deliveryKey(
-            messageID: messageID,
-            title: message.title,
-            body: message.body,
-            sentAtMs: message.sentAtMs)
-        guard deliveryKey != self.lastDeliveryKey else { return }
-
-        let normalizedTitle = message.title.isEmpty ? "OpenClaw" : message.title
-        self.title = normalizedTitle
-        self.body = message.body
-        self.transport = transport
-        self.updatedAt = Date()
-        self.lastDeliveryKey = deliveryKey
-        self.persistState()
-
-        Task {
-            await self.postLocalNotification(
-                identifier: deliveryKey,
-                title: normalizedTitle,
-                body: message.body)
-        }
-    }
-
-    private func restorePersistedState() {
-        guard let data = self.defaults.data(forKey: Self.persistedStateKey),
-            let state = try? JSONDecoder().decode(PersistedState.self, from: data)
-        else {
-            return
-        }
-
-        self.title = state.title
-        self.body = state.body
-        self.transport = state.transport
-        self.updatedAt = state.updatedAt
-        self.lastDeliveryKey = state.lastDeliveryKey
-    }
-
-    private func persistState() {
-        guard let updatedAt = self.updatedAt else { return }
-        let state = PersistedState(
-            title: self.title,
-            body: self.body,
-            transport: self.transport,
-            updatedAt: updatedAt,
-            lastDeliveryKey: self.lastDeliveryKey)
-        guard let data = try? JSONEncoder().encode(state) else { return }
-        self.defaults.set(data, forKey: Self.persistedStateKey)
-    }
-
-    private func deliveryKey(messageID: String?, title: String, body: String, sentAtMs: Int?) -> String {
-        if let messageID, messageID.isEmpty == false {
-            return "id:\(messageID)"
-        }
-        return "content:\(title)|\(body)|\(sentAtMs ?? 0)"
-    }
-
-    private func ensureNotificationAuthorization() async {
-        let center = UNUserNotificationCenter.current()
-        let settings = await center.notificationSettings()
-        switch settings.authorizationStatus {
-        case .notDetermined:
-            _ = try? await center.requestAuthorization(options: [.alert, .sound])
-        default:
-            break
-        }
-    }
-
-    private func postLocalNotification(identifier: String, title: String, body: String) async {
-        let content = UNMutableNotificationContent()
-        content.title = title
-        content.body = body
-        content.sound = .default
-        content.threadIdentifier = "openclaw-watch"
-
-        let request = UNNotificationRequest(
-            identifier: identifier,
-            content: content,
-            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 0.2, repeats: false))
-
-        _ = try? await UNUserNotificationCenter.current().add(request)
-        WKInterfaceDevice.current().play(.notification)
-    }
-}

apps/ios/WatchExtension/Sources/WatchInboxView.swift

@@ -1,27 +0,0 @@
-import SwiftUI
-
-struct WatchInboxView: View {
-    @Bindable var store: WatchInboxStore
-
-    var body: some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 8) {
-                Text(store.title)
-                    .font(.headline)
-                    .lineLimit(2)
-
-                Text(store.body)
-                    .font(.body)
-                    .fixedSize(horizontal: false, vertical: true)
-
-                if let updatedAt = store.updatedAt {
-                    Text("Updated \(updatedAt.formatted(date: .omitted, time: .shortened))")
-                        .font(.footnote)
-                        .foregroundStyle(.secondary)
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding()
-        }
-    }
-}

apps/ios/fastlane/Fastfile

@@ -66,8 +66,7 @@ platform :ios do
     if team_id.nil? || team_id.strip.empty?
       helper_path = File.expand_path("../../scripts/ios-team-id.sh", __dir__)
       if File.exist?(helper_path)
-        # Keep CI/local compatibility where teams are present in keychain but not Xcode account metadata.
-        team_id = sh("IOS_ALLOW_KEYCHAIN_TEAM_FALLBACK=1 bash #{helper_path.shellescape}").strip
+        team_id = sh("bash #{helper_path.shellescape}").strip
       end
     end
     UI.user_error!("Missing IOS_DEVELOPMENT_TEAM (Apple Team ID). Add it to fastlane/.env or export it in your shell.") if team_id.nil? || team_id.strip.empty?

apps/ios/fastlane/SETUP.md

@@ -22,7 +22,7 @@ ASC_KEY_PATH=/absolute/path/to/AuthKey_XXXXXXXXXX.p8
 IOS_DEVELOPMENT_TEAM=YOUR_TEAM_ID
 ```
 
-Tip: run `scripts/ios-team-id.sh` from the repo root to print a Team ID to paste into `.env`. The helper prefers the canonical OpenClaw team (`Y5PE65HELJ`) when present locally; otherwise it prefers the first non-personal team from your Xcode account (then personal team if needed). Fastlane uses this helper automatically if `IOS_DEVELOPMENT_TEAM` is missing.
+Tip: run `scripts/ios-team-id.sh` from the repo root to print a Team ID to paste into `.env`. Fastlane falls back to this helper if `IOS_DEVELOPMENT_TEAM` is missing.
 
 Run:
 

apps/ios/project.yml

@@ -29,15 +29,9 @@ targets:
   OpenClaw:
     type: application
     platform: iOS
-    configFiles:
-      Debug: Signing.xcconfig
-      Release: Signing.xcconfig
     sources:
       - path: Sources
     dependencies:
-      - target: OpenClawShareExtension
-        embed: true
-      - target: OpenClawWatchApp
       - package: OpenClawKit
       - package: OpenClawKit
         product: OpenClawChatUI
@@ -75,11 +69,10 @@ targets:
     settings:
       base:
         CODE_SIGN_IDENTITY: "Apple Development"
-        CODE_SIGN_ENTITLEMENTS: Sources/OpenClaw.entitlements
-        CODE_SIGN_STYLE: "$(OPENCLAW_CODE_SIGN_STYLE)"
-        DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)"
-        PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_APP_BUNDLE_ID)"
-        PROVISIONING_PROFILE_SPECIFIER: "$(OPENCLAW_APP_PROFILE)"
+        CODE_SIGN_STYLE: Manual
+        DEVELOPMENT_TEAM: Y5PE65HELJ
+        PRODUCT_BUNDLE_IDENTIFIER: ai.openclaw.ios
+        PROVISIONING_PROFILE_SPECIFIER: "ai.openclaw.ios Development"
         SWIFT_VERSION: "6.0"
         SWIFT_STRICT_CONCURRENCY: complete
         ENABLE_APPINTENTS_METADATA: NO
@@ -88,18 +81,13 @@ targets:
       properties:
         CFBundleDisplayName: OpenClaw
         CFBundleIconName: AppIcon
-        CFBundleURLTypes:
-          - CFBundleURLName: ai.openclaw.ios
-            CFBundleURLSchemes:
-              - openclaw
-        CFBundleShortVersionString: "2026.2.18"
-        CFBundleVersion: "20260218"
+        CFBundleShortVersionString: "2026.2.16"
+        CFBundleVersion: "20260216"
         UILaunchScreen: {}
         UIApplicationSceneManifest:
           UIApplicationSupportsMultipleScenes: false
         UIBackgroundModes:
           - audio
-          - remote-notification
         NSLocalNetworkUsageDescription: OpenClaw discovers and connects to your OpenClaw gateway on the local network.
         NSAppTransportSecurity:
           NSAllowsArbitraryLoadsInWebContent: true
@@ -121,90 +109,6 @@ targets:
           - UIInterfaceOrientationLandscapeLeft
           - UIInterfaceOrientationLandscapeRight
 
-  OpenClawShareExtension:
-    type: app-extension
-    platform: iOS
-    configFiles:
-      Debug: Signing.xcconfig
-      Release: Signing.xcconfig
-    sources:
-      - path: ShareExtension
-    dependencies:
-      - package: OpenClawKit
-    settings:
-      base:
-        CODE_SIGN_IDENTITY: "Apple Development"
-        CODE_SIGN_STYLE: "$(OPENCLAW_CODE_SIGN_STYLE)"
-        DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)"
-        PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_SHARE_BUNDLE_ID)"
-        PROVISIONING_PROFILE_SPECIFIER: "$(OPENCLAW_SHARE_PROFILE)"
-        SWIFT_VERSION: "6.0"
-        SWIFT_STRICT_CONCURRENCY: complete
-    info:
-      path: ShareExtension/Info.plist
-      properties:
-        CFBundleDisplayName: OpenClaw Share
-        CFBundleShortVersionString: "2026.2.18"
-        CFBundleVersion: "20260218"
-        NSExtension:
-          NSExtensionPointIdentifier: com.apple.share-services
-          NSExtensionPrincipalClass: "$(PRODUCT_MODULE_NAME).ShareViewController"
-          NSExtensionAttributes:
-            NSExtensionActivationRule:
-              NSExtensionActivationSupportsText: true
-              NSExtensionActivationSupportsWebURLWithMaxCount: 1
-              NSExtensionActivationSupportsImageWithMaxCount: 10
-              NSExtensionActivationSupportsMovieWithMaxCount: 1
-
-  OpenClawWatchApp:
-    type: application.watchapp2
-    platform: watchOS
-    deploymentTarget: "11.0"
-    sources:
-      - path: WatchApp
-    dependencies:
-      - target: OpenClawWatchExtension
-    configFiles:
-      Debug: Config/Signing.xcconfig
-      Release: Config/Signing.xcconfig
-    settings:
-      base:
-        PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_WATCH_APP_BUNDLE_ID)"
-    info:
-      path: WatchApp/Info.plist
-      properties:
-        CFBundleDisplayName: OpenClaw
-        CFBundleShortVersionString: "2026.2.18"
-        CFBundleVersion: "20260218"
-        WKCompanionAppBundleIdentifier: "$(OPENCLAW_APP_BUNDLE_ID)"
-        WKWatchKitApp: true
-
-  OpenClawWatchExtension:
-    type: watchkit2-extension
-    platform: watchOS
-    deploymentTarget: "11.0"
-    sources:
-      - path: WatchExtension/Sources
-    dependencies:
-      - sdk: WatchConnectivity.framework
-      - sdk: UserNotifications.framework
-    configFiles:
-      Debug: Config/Signing.xcconfig
-      Release: Config/Signing.xcconfig
-    settings:
-      base:
-        PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_WATCH_EXTENSION_BUNDLE_ID)"
-    info:
-      path: WatchExtension/Info.plist
-      properties:
-        CFBundleDisplayName: OpenClaw
-        CFBundleShortVersionString: "2026.2.18"
-        CFBundleVersion: "20260218"
-        NSExtension:
-          NSExtensionAttributes:
-            WKAppBundleIdentifier: "$(OPENCLAW_WATCH_APP_BUNDLE_ID)"
-          NSExtensionPointIdentifier: com.apple.watchkit
-
   OpenClawTests:
     type: bundle.unit-test
     platform: iOS
@@ -226,5 +130,5 @@ targets:
       path: Tests/Info.plist
       properties:
         CFBundleDisplayName: OpenClawTests
-        CFBundleShortVersionString: "2026.2.18"
-        CFBundleVersion: "20260218"
+        CFBundleShortVersionString: "2026.2.16"
+        CFBundleVersion: "20260216"

apps/macos/Sources/OpenClaw/DeepLinks.swift

@@ -67,8 +67,6 @@ final class DeepLinkHandler {
         switch route {
         case let .agent(link):
             await self.handleAgent(link: link, originalURL: url)
-        case .gateway:
-            break
         }
     }
 

apps/macos/Sources/OpenClaw/Resources/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2026.2.18</string>
+    <string>2026.2.16</string>
     <key>CFBundleVersion</key>
-    <string>202602180</string>
+    <string>202602160</string>
     <key>CFBundleIconFile</key>
     <string>OpenClaw</string>
     <key>CFBundleURLTypes</key>

apps/macos/Sources/OpenClawProtocol/GatewayModels.swift

@@ -296,7 +296,6 @@ public struct Snapshot: Codable, Sendable {
     public let statedir: String?
     public let sessiondefaults: [String: AnyCodable]?
     public let authmode: AnyCodable?
-    public let updateavailable: [String: AnyCodable]?
 
     public init(
         presence: [PresenceEntry],
@@ -306,8 +305,7 @@ public struct Snapshot: Codable, Sendable {
         configpath: String?,
         statedir: String?,
         sessiondefaults: [String: AnyCodable]?,
-        authmode: AnyCodable?,
-        updateavailable: [String: AnyCodable]?
+        authmode: AnyCodable?
     ) {
         self.presence = presence
         self.health = health
@@ -317,7 +315,6 @@ public struct Snapshot: Codable, Sendable {
         self.statedir = statedir
         self.sessiondefaults = sessiondefaults
         self.authmode = authmode
-        self.updateavailable = updateavailable
     }
     private enum CodingKeys: String, CodingKey {
         case presence
@@ -328,7 +325,6 @@ public struct Snapshot: Codable, Sendable {
         case statedir = "stateDir"
         case sessiondefaults = "sessionDefaults"
         case authmode = "authMode"
-        case updateavailable = "updateAvailable"
     }
 }
 
@@ -398,7 +394,6 @@ public struct SendParams: Codable, Sendable {
     public let gifplayback: Bool?
     public let channel: String?
     public let accountid: String?
-    public let threadid: String?
     public let sessionkey: String?
     public let idempotencykey: String
 
@@ -410,7 +405,6 @@ public struct SendParams: Codable, Sendable {
         gifplayback: Bool?,
         channel: String?,
         accountid: String?,
-        threadid: String?,
         sessionkey: String?,
         idempotencykey: String
     ) {
@@ -421,7 +415,6 @@ public struct SendParams: Codable, Sendable {
         self.gifplayback = gifplayback
         self.channel = channel
         self.accountid = accountid
-        self.threadid = threadid
         self.sessionkey = sessionkey
         self.idempotencykey = idempotencykey
     }
@@ -433,7 +426,6 @@ public struct SendParams: Codable, Sendable {
         case gifplayback = "gifPlayback"
         case channel
         case accountid = "accountId"
-        case threadid = "threadId"
         case sessionkey = "sessionKey"
         case idempotencykey = "idempotencyKey"
     }
@@ -929,68 +921,6 @@ public struct NodeInvokeRequestEvent: Codable, Sendable {
     }
 }
 
-public struct PushTestParams: Codable, Sendable {
-    public let nodeid: String
-    public let title: String?
-    public let body: String?
-    public let environment: String?
-
-    public init(
-        nodeid: String,
-        title: String?,
-        body: String?,
-        environment: String?
-    ) {
-        self.nodeid = nodeid
-        self.title = title
-        self.body = body
-        self.environment = environment
-    }
-    private enum CodingKeys: String, CodingKey {
-        case nodeid = "nodeId"
-        case title
-        case body
-        case environment
-    }
-}
-
-public struct PushTestResult: Codable, Sendable {
-    public let ok: Bool
-    public let status: Int
-    public let apnsid: String?
-    public let reason: String?
-    public let tokensuffix: String
-    public let topic: String
-    public let environment: String
-
-    public init(
-        ok: Bool,
-        status: Int,
-        apnsid: String?,
-        reason: String?,
-        tokensuffix: String,
-        topic: String,
-        environment: String
-    ) {
-        self.ok = ok
-        self.status = status
-        self.apnsid = apnsid
-        self.reason = reason
-        self.tokensuffix = tokensuffix
-        self.topic = topic
-        self.environment = environment
-    }
-    private enum CodingKeys: String, CodingKey {
-        case ok
-        case status
-        case apnsid = "apnsId"
-        case reason
-        case tokensuffix = "tokenSuffix"
-        case topic
-        case environment
-    }
-}
-
 public struct SessionsListParams: Codable, Sendable {
     public let limit: Int?
     public let activeminutes: Int?
@@ -2154,7 +2084,6 @@ public struct SkillsUpdateParams: Codable, Sendable {
 public struct CronJob: Codable, Sendable {
     public let id: String
     public let agentid: String?
-    public let sessionkey: String?
     public let name: String
     public let description: String?
     public let enabled: Bool
@@ -2171,7 +2100,6 @@ public struct CronJob: Codable, Sendable {
     public init(
         id: String,
         agentid: String?,
-        sessionkey: String?,
         name: String,
         description: String?,
         enabled: Bool,
@@ -2187,7 +2115,6 @@ public struct CronJob: Codable, Sendable {
     ) {
         self.id = id
         self.agentid = agentid
-        self.sessionkey = sessionkey
         self.name = name
         self.description = description
         self.enabled = enabled
@@ -2204,7 +2131,6 @@ public struct CronJob: Codable, Sendable {
     private enum CodingKeys: String, CodingKey {
         case id
         case agentid = "agentId"
-        case sessionkey = "sessionKey"
         case name
         case description
         case enabled
@@ -2239,7 +2165,6 @@ public struct CronStatusParams: Codable, Sendable {
 public struct CronAddParams: Codable, Sendable {
     public let name: String
     public let agentid: AnyCodable?
-    public let sessionkey: AnyCodable?
     public let description: String?
     public let enabled: Bool?
     public let deleteafterrun: Bool?
@@ -2252,7 +2177,6 @@ public struct CronAddParams: Codable, Sendable {
     public init(
         name: String,
         agentid: AnyCodable?,
-        sessionkey: AnyCodable?,
         description: String?,
         enabled: Bool?,
         deleteafterrun: Bool?,
@@ -2264,7 +2188,6 @@ public struct CronAddParams: Codable, Sendable {
     ) {
         self.name = name
         self.agentid = agentid
-        self.sessionkey = sessionkey
         self.description = description
         self.enabled = enabled
         self.deleteafterrun = deleteafterrun
@@ -2277,7 +2200,6 @@ public struct CronAddParams: Codable, Sendable {
     private enum CodingKeys: String, CodingKey {
         case name
         case agentid = "agentId"
-        case sessionkey = "sessionKey"
         case description
         case enabled
         case deleteafterrun = "deleteAfterRun"
@@ -2574,19 +2496,6 @@ public struct DevicePairRejectParams: Codable, Sendable {
     }
 }
 
-public struct DevicePairRemoveParams: Codable, Sendable {
-    public let deviceid: String
-
-    public init(
-        deviceid: String
-    ) {
-        self.deviceid = deviceid
-    }
-    private enum CodingKeys: String, CodingKey {
-        case deviceid = "deviceId"
-    }
-}
-
 public struct DeviceTokenRotateParams: Codable, Sendable {
     public let deviceid: String
     public let role: String

apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatViewModel.swift

@@ -170,9 +170,7 @@ public final class OpenClawChatViewModel {
             }
 
             let payload = try await self.transport.requestHistory(sessionKey: self.sessionKey)
-            self.messages = Self.reconcileMessageIDs(
-                previous: self.messages,
-                incoming: Self.decodeMessages(payload.messages ?? []))
+            self.messages = Self.decodeMessages(payload.messages ?? [])
             self.sessionId = payload.sessionId
             if let level = payload.thinkingLevel, !level.isEmpty {
                 self.thinkingLevel = level
@@ -193,70 +191,6 @@ public final class OpenClawChatViewModel {
         return Self.dedupeMessages(decoded)
     }
 
-    private static func messageIdentityKey(for message: OpenClawChatMessage) -> String? {
-        let role = message.role.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard !role.isEmpty else { return nil }
-
-        let timestamp: String = {
-            guard let value = message.timestamp, value.isFinite else { return "" }
-            return String(format: "%.3f", value)
-        }()
-
-        let contentFingerprint = message.content.map { item in
-            let type = (item.type ?? "text").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-            let text = (item.text ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            let id = (item.id ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            let name = (item.name ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            let fileName = (item.fileName ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-            return [type, text, id, name, fileName].joined(separator: "\\u{001F}")
-        }.joined(separator: "\\u{001E}")
-
-        let toolCallId = (message.toolCallId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        let toolName = (message.toolName ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        if timestamp.isEmpty, contentFingerprint.isEmpty, toolCallId.isEmpty, toolName.isEmpty {
-            return nil
-        }
-        return [role, timestamp, toolCallId, toolName, contentFingerprint].joined(separator: "|")
-    }
-
-    private static func reconcileMessageIDs(
-        previous: [OpenClawChatMessage],
-        incoming: [OpenClawChatMessage]) -> [OpenClawChatMessage]
-    {
-        guard !previous.isEmpty, !incoming.isEmpty else { return incoming }
-
-        var idsByKey: [String: [UUID]] = [:]
-        for message in previous {
-            guard let key = Self.messageIdentityKey(for: message) else { continue }
-            idsByKey[key, default: []].append(message.id)
-        }
-
-        return incoming.map { message in
-            guard let key = Self.messageIdentityKey(for: message),
-                  var ids = idsByKey[key],
-                  let reusedId = ids.first
-            else {
-                return message
-            }
-            ids.removeFirst()
-            if ids.isEmpty {
-                idsByKey.removeValue(forKey: key)
-            } else {
-                idsByKey[key] = ids
-            }
-            guard reusedId != message.id else { return message }
-            return OpenClawChatMessage(
-                id: reusedId,
-                role: message.role,
-                content: message.content,
-                timestamp: message.timestamp,
-                toolCallId: message.toolCallId,
-                toolName: message.toolName,
-                usage: message.usage,
-                stopReason: message.stopReason)
-        }
-    }
-
     private static func dedupeMessages(_ messages: [OpenClawChatMessage]) -> [OpenClawChatMessage] {
         var result: [OpenClawChatMessage] = []
         result.reserveCapacity(messages.count)
@@ -441,18 +375,11 @@ public final class OpenClawChatViewModel {
     }
 
     private func handleChatEvent(_ chat: OpenClawChatEventPayload) {
-        let isOurRun = chat.runId.flatMap { self.pendingRuns.contains($0) } ?? false
-
-        // Gateway may publish canonical session keys (for example "agent:main:main")
-        // even when this view currently uses an alias key (for example "main").
-        // Never drop events for our own pending run on key mismatch, or the UI can stay
-        // stuck at "thinking" until the user reopens and forces a history reload.
-        if let sessionKey = chat.sessionKey,
-           !Self.matchesCurrentSessionKey(incoming: sessionKey, current: self.sessionKey),
-           !isOurRun
-        {
+        if let sessionKey = chat.sessionKey, sessionKey != self.sessionKey {
             return
         }
+
+        let isOurRun = chat.runId.flatMap { self.pendingRuns.contains($0) } ?? false
         if !isOurRun {
             // Keep multiple clients in sync: if another client finishes a run for our session, refresh history.
             switch chat.state {
@@ -484,21 +411,6 @@ public final class OpenClawChatViewModel {
         }
     }
 
-    private static func matchesCurrentSessionKey(incoming: String, current: String) -> Bool {
-        let incomingNormalized = incoming.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        let currentNormalized = current.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        if incomingNormalized == currentNormalized {
-            return true
-        }
-        // Common alias pair in operator clients: UI uses "main" while gateway emits canonical.
-        if (incomingNormalized == "agent:main:main" && currentNormalized == "main") ||
-            (incomingNormalized == "main" && currentNormalized == "agent:main:main")
-        {
-            return true
-        }
-        return false
-    }
-
     private func handleAgentEvent(_ evt: OpenClawAgentEventPayload) {
         if let sessionId, evt.runId != sessionId {
             return
@@ -532,9 +444,7 @@ public final class OpenClawChatViewModel {
     private func refreshHistoryAfterRun() async {
         do {
             let payload = try await self.transport.requestHistory(sessionKey: self.sessionKey)
-            self.messages = Self.reconcileMessageIDs(
-                previous: self.messages,
-                incoming: Self.decodeMessages(payload.messages ?? []))
+            self.messages = Self.decodeMessages(payload.messages ?? [])
             self.sessionId = payload.sessionId
             if let level = payload.thinkingLevel, !level.isEmpty {
                 self.thinkingLevel = level

apps/shared/OpenClawKit/Sources/OpenClawKit/Capabilities.swift

@@ -7,7 +7,6 @@ public enum OpenClawCapability: String, Codable, Sendable {
     case voiceWake
     case location
     case device
-    case watch
     case photos
     case contacts
     case calendar

apps/shared/OpenClawKit/Sources/OpenClawKit/DeepLinks.swift

@@ -2,56 +2,6 @@ import Foundation
 
 public enum DeepLinkRoute: Sendable, Equatable {
     case agent(AgentDeepLink)
-    case gateway(GatewayConnectDeepLink)
-}
-
-public struct GatewayConnectDeepLink: Codable, Sendable, Equatable {
-    public let host: String
-    public let port: Int
-    public let tls: Bool
-    public let token: String?
-    public let password: String?
-
-    public init(host: String, port: Int, tls: Bool, token: String?, password: String?) {
-        self.host = host
-        self.port = port
-        self.tls = tls
-        self.token = token
-        self.password = password
-    }
-
-    public var websocketURL: URL? {
-        let scheme = self.tls ? "wss" : "ws"
-        return URL(string: "\(scheme)://\(self.host):\(self.port)")
-    }
-
-    /// Parse a device-pair setup code (base64url-encoded JSON: `{url, token?, password?}`).
-    public static func fromSetupCode(_ code: String) -> GatewayConnectDeepLink? {
-        guard let data = Self.decodeBase64Url(code) else { return nil }
-        guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return nil }
-        guard let urlString = json["url"] as? String,
-              let parsed = URLComponents(string: urlString),
-              let hostname = parsed.host, !hostname.isEmpty
-        else { return nil }
-
-        let scheme = (parsed.scheme ?? "ws").lowercased()
-        let tls = scheme == "wss"
-        let port = parsed.port ?? (tls ? 443 : 18789)
-        let token = json["token"] as? String
-        let password = json["password"] as? String
-        return GatewayConnectDeepLink(host: hostname, port: port, tls: tls, token: token, password: password)
-    }
-
-    private static func decodeBase64Url(_ input: String) -> Data? {
-        var base64 = input
-            .replacingOccurrences(of: "-", with: "+")
-            .replacingOccurrences(of: "_", with: "/")
-        let remainder = base64.count % 4
-        if remainder > 0 {
-            base64.append(contentsOf: String(repeating: "=", count: 4 - remainder))
-        }
-        return Data(base64Encoded: base64)
-    }
 }
 
 public struct AgentDeepLink: Codable, Sendable, Equatable {
@@ -119,23 +69,6 @@ public enum DeepLinkParser {
                     channel: query["channel"],
                     timeoutSeconds: timeoutSeconds,
                     key: query["key"]))
-
-        case "gateway":
-            guard let hostParam = query["host"],
-                  !hostParam.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-            else {
-                return nil
-            }
-            let port = query["port"].flatMap { Int($0) } ?? 18789
-            let tls = (query["tls"] as NSString?)?.boolValue ?? false
-            return .gateway(
-                .init(
-                    host: hostParam,
-                    port: port,
-                    tls: tls,
-                    token: query["token"],
-                    password: query["password"]))
-
         default:
             return nil
         }

apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayChannel.swift

@@ -133,16 +133,10 @@ public actor GatewayChannelActor {
     private var lastAuthSource: GatewayAuthSource = .none
     private let decoder = JSONDecoder()
     private let encoder = JSONEncoder()
-    // Remote gateways (tailscale/wan) can take a bit longer to deliver the connect.challenge event,
-    // and we must include the nonce once the gateway requires v2 signing.
-    private let connectTimeoutSeconds: Double = 12
-    private let connectChallengeTimeoutSeconds: Double = 6.0
-    // Some networks will silently drop idle TCP/TLS flows around ~30s. The gateway tick is server->client,
-    // but NATs/proxies often require outbound traffic to keep the connection alive.
-    private let keepaliveIntervalSeconds: Double = 15.0
+    private let connectTimeoutSeconds: Double = 6
+    private let connectChallengeTimeoutSeconds: Double = 3.0
     private var watchdogTask: Task<Void, Never>?
     private var tickTask: Task<Void, Never>?
-    private var keepaliveTask: Task<Void, Never>?
     private let defaultRequestTimeoutMs: Double = 15000
     private let pushHandler: (@Sendable (GatewayPush) async -> Void)?
     private let connectOptions: GatewayConnectOptions?
@@ -181,9 +175,6 @@ public actor GatewayChannelActor {
         self.tickTask?.cancel()
         self.tickTask = nil
 
-        self.keepaliveTask?.cancel()
-        self.keepaliveTask = nil
-
         self.task?.cancel(with: .goingAway, reason: nil)
         self.task = nil
 
@@ -266,7 +257,6 @@ public actor GatewayChannelActor {
         self.connected = true
         self.backoffMs = 500
         self.lastSeq = nil
-        self.startKeepalive()
 
         let waiters = self.connectWaiters
         self.connectWaiters.removeAll()
@@ -275,29 +265,6 @@ public actor GatewayChannelActor {
         }
     }
 
-    private func startKeepalive() {
-        self.keepaliveTask?.cancel()
-        self.keepaliveTask = Task { [weak self] in
-            guard let self else { return }
-            await self.keepaliveLoop()
-        }
-    }
-
-    private func keepaliveLoop() async {
-        while self.shouldReconnect {
-            try? await Task.sleep(nanoseconds: UInt64(self.keepaliveIntervalSeconds * 1_000_000_000))
-            guard self.shouldReconnect else { return }
-            guard self.connected else { continue }
-            // Best-effort outbound message to keep intermediate NAT/proxy state alive.
-            // We intentionally ignore the response.
-            do {
-                try await self.send(method: "health", params: nil)
-            } catch {
-                // Avoid spamming logs; the reconnect paths will surface meaningful errors.
-            }
-        }
-    }
-
     private func sendConnect() async throws {
         let platform = InstanceIdentity.platformString
         let primaryLocale = Locale.preferredLanguages.first ?? Locale.current.identifier
@@ -491,8 +458,6 @@ public actor GatewayChannelActor {
         let wrapped = self.wrap(err, context: "gateway receive")
         self.logger.error("gateway ws receive failed \(wrapped.localizedDescription, privacy: .public)")
         self.connected = false
-        self.keepaliveTask?.cancel()
-        self.keepaliveTask = nil
         await self.disconnectHandler?("receive failed: \(wrapped.localizedDescription)")
         await self.failPending(wrapped)
         await self.scheduleReconnect()

apps/shared/OpenClawKit/Sources/OpenClawKit/GatewayNodeSession.swift

@@ -85,13 +85,7 @@ public actor GatewayNodeSession {
                 latch.resume(result)
             }
             timeoutTask = Task.detached {
-                do {
-                    try await Task.sleep(nanoseconds: UInt64(timeout) * 1_000_000)
-                } catch {
-                    // Expected when invoke finishes first and cancels the timeout task.
-                    return
-                }
-                guard !Task.isCancelled else { return }
+                try? await Task.sleep(nanoseconds: UInt64(timeout) * 1_000_000)
                 timeoutLogger.info("node invoke timeout fired id=\(request.id, privacy: .public)")
                 latch.resume(BridgeInvokeResponse(
                     id: request.id,

apps/shared/OpenClawKit/Sources/OpenClawKit/ShareGatewayRelaySettings.swift

@@ -1,62 +0,0 @@
-import Foundation
-
-public struct ShareGatewayRelayConfig: Codable, Sendable, Equatable {
-    public let gatewayURLString: String
-    public let token: String?
-    public let password: String?
-    public let sessionKey: String
-    public let deliveryChannel: String?
-    public let deliveryTo: String?
-
-    public init(
-        gatewayURLString: String,
-        token: String?,
-        password: String?,
-        sessionKey: String,
-        deliveryChannel: String? = nil,
-        deliveryTo: String? = nil)
-    {
-        self.gatewayURLString = gatewayURLString
-        self.token = token
-        self.password = password
-        self.sessionKey = sessionKey
-        self.deliveryChannel = deliveryChannel
-        self.deliveryTo = deliveryTo
-    }
-}
-
-public enum ShareGatewayRelaySettings {
-    private static let suiteName = "group.ai.openclaw.shared"
-    private static let relayConfigKey = "share.gatewayRelay.config.v1"
-    private static let lastEventKey = "share.gatewayRelay.event.v1"
-
-    private static var defaults: UserDefaults {
-        UserDefaults(suiteName: self.suiteName) ?? .standard
-    }
-
-    public static func loadConfig() -> ShareGatewayRelayConfig? {
-        guard let data = self.defaults.data(forKey: self.relayConfigKey) else { return nil }
-        return try? JSONDecoder().decode(ShareGatewayRelayConfig.self, from: data)
-    }
-
-    public static func saveConfig(_ config: ShareGatewayRelayConfig) {
-        guard let data = try? JSONEncoder().encode(config) else { return }
-        self.defaults.set(data, forKey: self.relayConfigKey)
-    }
-
-    public static func clearConfig() {
-        self.defaults.removeObject(forKey: self.relayConfigKey)
-    }
-
-    public static func saveLastEvent(_ message: String) {
-        let timestamp = ISO8601DateFormatter().string(from: Date())
-        let payload = "[\(timestamp)] \(message)"
-        self.defaults.set(payload, forKey: self.lastEventKey)
-    }
-
-    public static func loadLastEvent() -> String? {
-        let value = self.defaults.string(forKey: self.lastEventKey)?
-            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        return value.isEmpty ? nil : value
-    }
-}

apps/shared/OpenClawKit/Sources/OpenClawKit/ShareToAgentDeepLink.swift

@@ -1,62 +0,0 @@
-import Foundation
-
-public struct SharedContentPayload: Sendable, Equatable {
-    public let title: String?
-    public let url: URL?
-    public let text: String?
-
-    public init(title: String?, url: URL?, text: String?) {
-        self.title = title
-        self.url = url
-        self.text = text
-    }
-}
-
-public enum ShareToAgentDeepLink {
-    public static func buildURL(from payload: SharedContentPayload, instruction: String? = nil) -> URL? {
-        let message = self.buildMessage(from: payload, instruction: instruction)
-        guard !message.isEmpty else { return nil }
-
-        var components = URLComponents()
-        components.scheme = "openclaw"
-        components.host = "agent"
-        components.queryItems = [
-            URLQueryItem(name: "message", value: message),
-            URLQueryItem(name: "thinking", value: "low"),
-        ]
-        return components.url
-    }
-
-    public static func buildMessage(from payload: SharedContentPayload, instruction: String? = nil) -> String {
-        let title = self.clean(payload.title)
-        let text = self.clean(payload.text)
-        let urlText = payload.url?.absoluteString.trimmingCharacters(in: .whitespacesAndNewlines)
-        let resolvedInstruction = self.clean(instruction) ?? ShareToAgentSettings.loadDefaultInstruction()
-
-        var lines: [String] = ["Shared from iOS."]
-        if let title, !title.isEmpty {
-            lines.append("Title: \(title)")
-        }
-        if let urlText, !urlText.isEmpty {
-            lines.append("URL: \(urlText)")
-        }
-        if let text, !text.isEmpty {
-            lines.append("Text:\n\(text)")
-        }
-        lines.append(resolvedInstruction)
-
-        let message = lines.joined(separator: "\n\n")
-        return self.limit(message, maxCharacters: 2400)
-    }
-
-    private static func clean(_ value: String?) -> String? {
-        guard let value else { return nil }
-        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
-        return trimmed.isEmpty ? nil : trimmed
-    }
-
-    private static func limit(_ value: String, maxCharacters: Int) -> String {
-        guard value.count > maxCharacters else { return value }
-        return String(value.prefix(maxCharacters))
-    }
-}

apps/shared/OpenClawKit/Sources/OpenClawKit/ShareToAgentSettings.swift

@@ -1,29 +0,0 @@
-import Foundation
-
-public enum ShareToAgentSettings {
-    private static let suiteName = "group.ai.openclaw.shared"
-    private static let defaultInstructionKey = "share.defaultInstruction"
-    private static let fallbackInstruction = "Please help me with this."
-
-    private static var defaults: UserDefaults {
-        UserDefaults(suiteName: suiteName) ?? .standard
-    }
-
-    public static func loadDefaultInstruction() -> String {
-        let raw = self.defaults.string(forKey: self.defaultInstructionKey)?
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-        if let raw, !raw.isEmpty {
-            return raw
-        }
-        return self.fallbackInstruction
-    }
-
-    public static func saveDefaultInstruction(_ value: String?) {
-        let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if trimmed.isEmpty {
-            self.defaults.removeObject(forKey: self.defaultInstructionKey)
-            return
-        }
-        self.defaults.set(trimmed, forKey: self.defaultInstructionKey)
-    }
-}

apps/shared/OpenClawKit/Sources/OpenClawKit/TalkPromptBuilder.swift

@@ -1,19 +1,10 @@
 public enum TalkPromptBuilder: Sendable {
-    public static func build(
-        transcript: String,
-        interruptedAtSeconds: Double?,
-        includeVoiceDirectiveHint: Bool = true
-    ) -> String {
+    public static func build(transcript: String, interruptedAtSeconds: Double?) -> String {
         var lines: [String] = [
             "Talk Mode active. Reply in a concise, spoken tone.",
+            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice (id or alias), e.g. {\"voice\":\"<id>\",\"once\":true}.",
         ]
 
-        if includeVoiceDirectiveHint {
-            lines.append(
-                "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice (id or alias), e.g. {\"voice\":\"<id>\",\"once\":true}."
-            )
-        }
-
         if let interruptedAtSeconds {
             let formatted = String(format: "%.1f", interruptedAtSeconds)
             lines.append("Assistant speech interrupted at \(formatted)s.")

apps/shared/OpenClawKit/Sources/OpenClawKit/WatchCommands.swift

@@ -1,52 +0,0 @@
-import Foundation
-
-public enum OpenClawWatchCommand: String, Codable, Sendable {
-    case status = "watch.status"
-    case notify = "watch.notify"
-}
-
-public struct OpenClawWatchStatusPayload: Codable, Sendable, Equatable {
-    public var supported: Bool
-    public var paired: Bool
-    public var appInstalled: Bool
-    public var reachable: Bool
-    public var activationState: String
-
-    public init(
-        supported: Bool,
-        paired: Bool,
-        appInstalled: Bool,
-        reachable: Bool,
-        activationState: String)
-    {
-        self.supported = supported
-        self.paired = paired
-        self.appInstalled = appInstalled
-        self.reachable = reachable
-        self.activationState = activationState
-    }
-}
-
-public struct OpenClawWatchNotifyParams: Codable, Sendable, Equatable {
-    public var title: String
-    public var body: String
-    public var priority: OpenClawNotificationPriority?
-
-    public init(title: String, body: String, priority: OpenClawNotificationPriority? = nil) {
-        self.title = title
-        self.body = body
-        self.priority = priority
-    }
-}
-
-public struct OpenClawWatchNotifyPayload: Codable, Sendable, Equatable {
-    public var deliveredImmediately: Bool
-    public var queuedForDelivery: Bool
-    public var transport: String
-
-    public init(deliveredImmediately: Bool, queuedForDelivery: Bool, transport: String) {
-        self.deliveredImmediately = deliveredImmediately
-        self.queuedForDelivery = queuedForDelivery
-        self.transport = transport
-    }
-}

apps/shared/OpenClawKit/Sources/OpenClawProtocol/AnyCodable.swift

@@ -6,13 +6,13 @@ import Foundation
 public struct AnyCodable: Codable, @unchecked Sendable, Hashable {
     public let value: Any
 
-    public init(_ value: Any) { self.value = Self.normalize(value) }
+    public init(_ value: Any) { self.value = value }
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.singleValueContainer()
-        if let boolVal = try? container.decode(Bool.self) { self.value = boolVal; return }
         if let intVal = try? container.decode(Int.self) { self.value = intVal; return }
         if let doubleVal = try? container.decode(Double.self) { self.value = doubleVal; return }
+        if let boolVal = try? container.decode(Bool.self) { self.value = boolVal; return }
         if let stringVal = try? container.decode(String.self) { self.value = stringVal; return }
         if container.decodeNil() { self.value = NSNull(); return }
         if let dict = try? container.decode([String: AnyCodable].self) { self.value = dict; return }
@@ -23,12 +23,10 @@ public struct AnyCodable: Codable, @unchecked Sendable, Hashable {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.singleValueContainer()
         switch self.value {
-        case let boolVal as Bool: try container.encode(boolVal)
         case let intVal as Int: try container.encode(intVal)
         case let doubleVal as Double: try container.encode(doubleVal)
+        case let boolVal as Bool: try container.encode(boolVal)
         case let stringVal as String: try container.encode(stringVal)
-        case let number as NSNumber where CFGetTypeID(number) == CFBooleanGetTypeID():
-            try container.encode(number.boolValue)
         case is NSNull: try container.encodeNil()
         case let dict as [String: AnyCodable]: try container.encode(dict)
         case let array as [AnyCodable]: try container.encode(array)
@@ -53,18 +51,11 @@ public struct AnyCodable: Codable, @unchecked Sendable, Hashable {
         }
     }
 
-    private static func normalize(_ value: Any) -> Any {
-        if let number = value as? NSNumber, CFGetTypeID(number) == CFBooleanGetTypeID() {
-            return number.boolValue
-        }
-        return value
-    }
-
     public static func == (lhs: AnyCodable, rhs: AnyCodable) -> Bool {
         switch (lhs.value, rhs.value) {
-        case let (l as Bool, r as Bool): l == r
         case let (l as Int, r as Int): l == r
         case let (l as Double, r as Double): l == r
+        case let (l as Bool, r as Bool): l == r
         case let (l as String, r as String): l == r
         case (_ as NSNull, _ as NSNull): true
         case let (l as [String: AnyCodable], r as [String: AnyCodable]): l == r
@@ -76,12 +67,12 @@ public struct AnyCodable: Codable, @unchecked Sendable, Hashable {
 
     public func hash(into hasher: inout Hasher) {
         switch self.value {
-        case let v as Bool:
-            hasher.combine(2); hasher.combine(v)
         case let v as Int:
             hasher.combine(0); hasher.combine(v)
         case let v as Double:
             hasher.combine(1); hasher.combine(v)
+        case let v as Bool:
+            hasher.combine(2); hasher.combine(v)
         case let v as String:
             hasher.combine(3); hasher.combine(v)
         case _ as NSNull:

apps/shared/OpenClawKit/Sources/OpenClawProtocol/GatewayModels.swift

@@ -296,7 +296,6 @@ public struct Snapshot: Codable, Sendable {
     public let statedir: String?
     public let sessiondefaults: [String: AnyCodable]?
     public let authmode: AnyCodable?
-    public let updateavailable: [String: AnyCodable]?
 
     public init(
         presence: [PresenceEntry],
@@ -306,8 +305,7 @@ public struct Snapshot: Codable, Sendable {
         configpath: String?,
         statedir: String?,
         sessiondefaults: [String: AnyCodable]?,
-        authmode: AnyCodable?,
-        updateavailable: [String: AnyCodable]?
+        authmode: AnyCodable?
     ) {
         self.presence = presence
         self.health = health
@@ -317,7 +315,6 @@ public struct Snapshot: Codable, Sendable {
         self.statedir = statedir
         self.sessiondefaults = sessiondefaults
         self.authmode = authmode
-        self.updateavailable = updateavailable
     }
     private enum CodingKeys: String, CodingKey {
         case presence
@@ -328,7 +325,6 @@ public struct Snapshot: Codable, Sendable {
         case statedir = "stateDir"
         case sessiondefaults = "sessionDefaults"
         case authmode = "authMode"
-        case updateavailable = "updateAvailable"
     }
 }
 
@@ -398,7 +394,6 @@ public struct SendParams: Codable, Sendable {
     public let gifplayback: Bool?
     public let channel: String?
     public let accountid: String?
-    public let threadid: String?
     public let sessionkey: String?
     public let idempotencykey: String
 
@@ -410,7 +405,6 @@ public struct SendParams: Codable, Sendable {
         gifplayback: Bool?,
         channel: String?,
         accountid: String?,
-        threadid: String?,
         sessionkey: String?,
         idempotencykey: String
     ) {
@@ -421,7 +415,6 @@ public struct SendParams: Codable, Sendable {
         self.gifplayback = gifplayback
         self.channel = channel
         self.accountid = accountid
-        self.threadid = threadid
         self.sessionkey = sessionkey
         self.idempotencykey = idempotencykey
     }
@@ -433,7 +426,6 @@ public struct SendParams: Codable, Sendable {
         case gifplayback = "gifPlayback"
         case channel
         case accountid = "accountId"
-        case threadid = "threadId"
         case sessionkey = "sessionKey"
         case idempotencykey = "idempotencyKey"
     }
@@ -929,68 +921,6 @@ public struct NodeInvokeRequestEvent: Codable, Sendable {
     }
 }
 
-public struct PushTestParams: Codable, Sendable {
-    public let nodeid: String
-    public let title: String?
-    public let body: String?
-    public let environment: String?
-
-    public init(
-        nodeid: String,
-        title: String?,
-        body: String?,
-        environment: String?
-    ) {
-        self.nodeid = nodeid
-        self.title = title
-        self.body = body
-        self.environment = environment
-    }
-    private enum CodingKeys: String, CodingKey {
-        case nodeid = "nodeId"
-        case title
-        case body
-        case environment
-    }
-}
-
-public struct PushTestResult: Codable, Sendable {
-    public let ok: Bool
-    public let status: Int
-    public let apnsid: String?
-    public let reason: String?
-    public let tokensuffix: String
-    public let topic: String
-    public let environment: String
-
-    public init(
-        ok: Bool,
-        status: Int,
-        apnsid: String?,
-        reason: String?,
-        tokensuffix: String,
-        topic: String,
-        environment: String
-    ) {
-        self.ok = ok
-        self.status = status
-        self.apnsid = apnsid
-        self.reason = reason
-        self.tokensuffix = tokensuffix
-        self.topic = topic
-        self.environment = environment
-    }
-    private enum CodingKeys: String, CodingKey {
-        case ok
-        case status
-        case apnsid = "apnsId"
-        case reason
-        case tokensuffix = "tokenSuffix"
-        case topic
-        case environment
-    }
-}
-
 public struct SessionsListParams: Codable, Sendable {
     public let limit: Int?
     public let activeminutes: Int?
@@ -2154,7 +2084,6 @@ public struct SkillsUpdateParams: Codable, Sendable {
 public struct CronJob: Codable, Sendable {
     public let id: String
     public let agentid: String?
-    public let sessionkey: String?
     public let name: String
     public let description: String?
     public let enabled: Bool
@@ -2171,7 +2100,6 @@ public struct CronJob: Codable, Sendable {
     public init(
         id: String,
         agentid: String?,
-        sessionkey: String?,
         name: String,
         description: String?,
         enabled: Bool,
@@ -2187,7 +2115,6 @@ public struct CronJob: Codable, Sendable {
     ) {
         self.id = id
         self.agentid = agentid
-        self.sessionkey = sessionkey
         self.name = name
         self.description = description
         self.enabled = enabled
@@ -2204,7 +2131,6 @@ public struct CronJob: Codable, Sendable {
     private enum CodingKeys: String, CodingKey {
         case id
         case agentid = "agentId"
-        case sessionkey = "sessionKey"
         case name
         case description
         case enabled
@@ -2239,7 +2165,6 @@ public struct CronStatusParams: Codable, Sendable {
 public struct CronAddParams: Codable, Sendable {
     public let name: String
     public let agentid: AnyCodable?
-    public let sessionkey: AnyCodable?
     public let description: String?
     public let enabled: Bool?
     public let deleteafterrun: Bool?
@@ -2252,7 +2177,6 @@ public struct CronAddParams: Codable, Sendable {
     public init(
         name: String,
         agentid: AnyCodable?,
-        sessionkey: AnyCodable?,
         description: String?,
         enabled: Bool?,
         deleteafterrun: Bool?,
@@ -2264,7 +2188,6 @@ public struct CronAddParams: Codable, Sendable {
     ) {
         self.name = name
         self.agentid = agentid
-        self.sessionkey = sessionkey
         self.description = description
         self.enabled = enabled
         self.deleteafterrun = deleteafterrun
@@ -2277,7 +2200,6 @@ public struct CronAddParams: Codable, Sendable {
     private enum CodingKeys: String, CodingKey {
         case name
         case agentid = "agentId"
-        case sessionkey = "sessionKey"
         case description
         case enabled
         case deleteafterrun = "deleteAfterRun"
@@ -2574,19 +2496,6 @@ public struct DevicePairRejectParams: Codable, Sendable {
     }
 }
 
-public struct DevicePairRemoveParams: Codable, Sendable {
-    public let deviceid: String
-
-    public init(
-        deviceid: String
-    ) {
-        self.deviceid = deviceid
-    }
-    private enum CodingKeys: String, CodingKey {
-        case deviceid = "deviceId"
-    }
-}
-
 public struct DeviceTokenRotateParams: Codable, Sendable {
     public let deviceid: String
     public let role: String

apps/shared/OpenClawKit/Tests/OpenClawKitTests/AnyCodableTests.swift

@@ -1,40 +0,0 @@
-import Foundation
-import Testing
-import OpenClawProtocol
-
-struct AnyCodableTests {
-    @Test
-    func encodesNSNumberBooleansAsJSONBooleans() throws {
-        let trueData = try JSONEncoder().encode(AnyCodable(NSNumber(value: true)))
-        let falseData = try JSONEncoder().encode(AnyCodable(NSNumber(value: false)))
-
-        #expect(String(data: trueData, encoding: .utf8) == "true")
-        #expect(String(data: falseData, encoding: .utf8) == "false")
-    }
-
-    @Test
-    func preservesBooleanLiteralsFromJSONSerializationBridge() throws {
-        let raw = try #require(
-            JSONSerialization.jsonObject(with: Data(#"{"enabled":true,"nested":{"active":false}}"#.utf8))
-                as? [String: Any]
-        )
-        let enabled = try #require(raw["enabled"])
-        let nested = try #require(raw["nested"])
-
-        struct RequestEnvelope: Codable {
-            let params: [String: AnyCodable]
-        }
-
-        let envelope = RequestEnvelope(
-            params: [
-                "enabled": AnyCodable(enabled),
-                "nested": AnyCodable(nested),
-            ]
-        )
-        let data = try JSONEncoder().encode(envelope)
-        let json = try #require(String(data: data, encoding: .utf8))
-
-        #expect(json.contains(#""enabled":true"#))
-        #expect(json.contains(#""active":false"#))
-    }
-}

apps/shared/OpenClawKit/Tests/OpenClawKitTests/ChatViewModelTests.swift

@@ -215,153 +215,6 @@ extension TestChatTransportState {
         #expect(await MainActor.run { vm.pendingToolCalls.isEmpty })
     }
 
-    @Test func acceptsCanonicalSessionKeyEventsForOwnPendingRun() async throws {
-        let history1 = OpenClawChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [],
-            thinkingLevel: "off")
-        let history2 = OpenClawChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [
-                AnyCodable([
-                    "role": "assistant",
-                    "content": [["type": "text", "text": "from history"]],
-                    "timestamp": Date().timeIntervalSince1970 * 1000,
-                ]),
-            ],
-            thinkingLevel: "off")
-
-        let transport = TestChatTransport(historyResponses: [history1, history2])
-        let vm = await MainActor.run { OpenClawChatViewModel(sessionKey: "main", transport: transport) }
-
-        await MainActor.run { vm.load() }
-        try await waitUntil("bootstrap") { await MainActor.run { vm.healthOK } }
-
-        await MainActor.run {
-            vm.input = "hi"
-            vm.send()
-        }
-        try await waitUntil("pending run starts") { await MainActor.run { vm.pendingRunCount == 1 } }
-
-        let runId = try #require(await transport.lastSentRunId())
-        transport.emit(
-            .chat(
-                OpenClawChatEventPayload(
-                    runId: runId,
-                    sessionKey: "agent:main:main",
-                    state: "final",
-                    message: nil,
-                    errorMessage: nil)))
-
-        try await waitUntil("pending run clears") { await MainActor.run { vm.pendingRunCount == 0 } }
-        try await waitUntil("history refresh") {
-            await MainActor.run { vm.messages.contains(where: { $0.role == "assistant" }) }
-        }
-    }
-
-    @Test func acceptsCanonicalSessionKeyEventsForExternalRuns() async throws {
-        let now = Date().timeIntervalSince1970 * 1000
-        let history1 = OpenClawChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [
-                AnyCodable([
-                    "role": "user",
-                    "content": [["type": "text", "text": "first"]],
-                    "timestamp": now,
-                ]),
-            ],
-            thinkingLevel: "off")
-        let history2 = OpenClawChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [
-                AnyCodable([
-                    "role": "user",
-                    "content": [["type": "text", "text": "first"]],
-                    "timestamp": now,
-                ]),
-                AnyCodable([
-                    "role": "assistant",
-                    "content": [["type": "text", "text": "from external run"]],
-                    "timestamp": now + 1,
-                ]),
-            ],
-            thinkingLevel: "off")
-
-        let transport = TestChatTransport(historyResponses: [history1, history2])
-        let vm = await MainActor.run { OpenClawChatViewModel(sessionKey: "main", transport: transport) }
-
-        await MainActor.run { vm.load() }
-        try await waitUntil("bootstrap") { await MainActor.run { vm.messages.count == 1 } }
-
-        transport.emit(
-            .chat(
-                OpenClawChatEventPayload(
-                    runId: "external-run",
-                    sessionKey: "agent:main:main",
-                    state: "final",
-                    message: nil,
-                    errorMessage: nil)))
-
-        try await waitUntil("history refresh after canonical external event") {
-            await MainActor.run { vm.messages.count == 2 }
-        }
-    }
-
-    @Test func preservesMessageIDsAcrossHistoryRefreshes() async throws {
-        let now = Date().timeIntervalSince1970 * 1000
-        let history1 = OpenClawChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [
-                AnyCodable([
-                    "role": "user",
-                    "content": [["type": "text", "text": "hello"]],
-                    "timestamp": now,
-                ]),
-            ],
-            thinkingLevel: "off")
-        let history2 = OpenClawChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [
-                AnyCodable([
-                    "role": "user",
-                    "content": [["type": "text", "text": "hello"]],
-                    "timestamp": now,
-                ]),
-                AnyCodable([
-                    "role": "assistant",
-                    "content": [["type": "text", "text": "world"]],
-                    "timestamp": now + 1,
-                ]),
-            ],
-            thinkingLevel: "off")
-
-        let transport = TestChatTransport(historyResponses: [history1, history2])
-        let vm = await MainActor.run { OpenClawChatViewModel(sessionKey: "main", transport: transport) }
-
-        await MainActor.run { vm.load() }
-        try await waitUntil("bootstrap") { await MainActor.run { vm.messages.count == 1 } }
-        let firstIdBefore = try #require(await MainActor.run { vm.messages.first?.id })
-
-        transport.emit(
-            .chat(
-                OpenClawChatEventPayload(
-                    runId: "other-run",
-                    sessionKey: "main",
-                    state: "final",
-                    message: nil,
-                    errorMessage: nil)))
-
-        try await waitUntil("history refresh") { await MainActor.run { vm.messages.count == 2 } }
-        let firstIdAfter = try #require(await MainActor.run { vm.messages.first?.id })
-        #expect(firstIdAfter == firstIdBefore)
-    }
-
     @Test func clearsStreamingOnExternalFinalEvent() async throws {
         let sessionId = "sess-main"
         let history = OpenClawChatHistoryPayload(

apps/shared/OpenClawKit/Tests/OpenClawKitTests/TalkPromptBuilderTests.swift

@@ -12,18 +12,4 @@ final class TalkPromptBuilderTests: XCTestCase {
         let prompt = TalkPromptBuilder.build(transcript: "Hi", interruptedAtSeconds: 1.234)
         XCTAssertTrue(prompt.contains("Assistant speech interrupted at 1.2s."))
     }
-
-    func testBuildIncludesVoiceDirectiveHintByDefault() {
-        let prompt = TalkPromptBuilder.build(transcript: "Hello", interruptedAtSeconds: nil)
-        XCTAssertTrue(prompt.contains("ElevenLabs voice"))
-    }
-
-    func testBuildExcludesVoiceDirectiveHintWhenDisabled() {
-        let prompt = TalkPromptBuilder.build(
-            transcript: "Hello",
-            interruptedAtSeconds: nil,
-            includeVoiceDirectiveHint: false)
-        XCTAssertFalse(prompt.contains("ElevenLabs voice"))
-        XCTAssertTrue(prompt.contains("Talk Mode active."))
-    }
 }

apps/shared/OpenClawKit/Tools/CanvasA2UI/bootstrap.js

@@ -451,6 +451,7 @@ class OpenClawA2UIHost extends LitElement {
     if (this.surfaces.length === 0) {
       return html`<div class="empty">
         <div class="empty-title">Canvas (A2UI)</div>
+        <div>Waiting for A2UI messages…</div>
       </div>`;
     }
 

assets/chrome-extension/README.md

@@ -20,4 +20,3 @@ Purpose: attach OpenClaw to an existing Chrome tab so the Gateway can automate i
 ## Options
 
 - `Relay port`: defaults to `18792`.
-- `Gateway token`: required. Set this to `gateway.auth.token` (or `OPENCLAW_GATEWAY_TOKEN`).

assets/chrome-extension/background.js

@@ -42,12 +42,6 @@ async function getRelayPort() {
   return n
 }
 
-async function getGatewayToken() {
-  const stored = await chrome.storage.local.get(['gatewayToken'])
-  const token = String(stored.gatewayToken || '').trim()
-  return token || ''
-}
-
 function setBadge(tabId, kind) {
   const cfg = BADGE[kind]
   void chrome.action.setBadgeText({ tabId, text: cfg.text })
@@ -61,11 +55,8 @@ async function ensureRelayConnection() {
 
   relayConnectPromise = (async () => {
     const port = await getRelayPort()
-    const gatewayToken = await getGatewayToken()
     const httpBase = `http://127.0.0.1:${port}`
-    const wsUrl = gatewayToken
-      ? `ws://127.0.0.1:${port}/extension?token=${encodeURIComponent(gatewayToken)}`
-      : `ws://127.0.0.1:${port}/extension`
+    const wsUrl = `ws://127.0.0.1:${port}/extension`
 
     // Fast preflight: is the relay server up?
     try {
@@ -74,12 +65,6 @@ async function ensureRelayConnection() {
       throw new Error(`Relay server not reachable at ${httpBase} (${String(err)})`)
     }
 
-    if (!gatewayToken) {
-      throw new Error(
-        'Missing gatewayToken in extension settings (chrome.storage.local.gatewayToken)',
-      )
-    }
-
     const ws = new WebSocket(wsUrl)
     relayWs = ws
 

assets/chrome-extension/options.html

@@ -176,19 +176,15 @@
         </div>
 
         <div class="card">
-          <h2>Relay connection</h2>
+          <h2>Relay port</h2>
           <label for="port">Port</label>
           <div class="row">
             <input id="port" inputmode="numeric" pattern="[0-9]*" />
-          </div>
-          <label for="token" style="margin-top: 10px">Gateway token</label>
-          <div class="row">
-            <input id="token" type="password" autocomplete="off" style="width: min(520px, 100%)" />
             <button id="save" type="button">Save</button>
           </div>
           <div class="hint">
-            Default port: <code>18792</code>. Extension connects to: <code id="relay-url">http://127.0.0.1:&lt;port&gt;/</code>.
-            Gateway token must match <code>gateway.auth.token</code> (or <code>OPENCLAW_GATEWAY_TOKEN</code>).
+            Default: <code>18792</code>. Extension connects to: <code id="relay-url">http://127.0.0.1:&lt;port&gt;/</code>.
+            Only change this if your OpenClaw profile uses a different <code>cdpUrl</code> port.
           </div>
           <div class="status" id="status"></div>
         </div>

assets/chrome-extension/options.js

@@ -13,12 +13,6 @@ function updateRelayUrl(port) {
   el.textContent = `http://127.0.0.1:${port}/`
 }
 
-function relayHeaders(token) {
-  const t = String(token || '').trim()
-  if (!t) return {}
-  return { 'x-openclaw-relay-token': t }
-}
-
 function setStatus(kind, message) {
   const status = document.getElementById('status')
   if (!status) return
@@ -26,31 +20,18 @@ function setStatus(kind, message) {
   status.textContent = message || ''
 }
 
-async function checkRelayReachable(port, token) {
-  const url = `http://127.0.0.1:${port}/json/version`
-  const trimmedToken = String(token || '').trim()
-  if (!trimmedToken) {
-    setStatus('error', 'Gateway token required. Save your gateway token to connect.')
-    return
-  }
+async function checkRelayReachable(port) {
+  const url = `http://127.0.0.1:${port}/`
   const ctrl = new AbortController()
-  const t = setTimeout(() => ctrl.abort(), 1200)
+  const t = setTimeout(() => ctrl.abort(), 900)
   try {
-    const res = await fetch(url, {
-      method: 'GET',
-      headers: relayHeaders(trimmedToken),
-      signal: ctrl.signal,
-    })
-    if (res.status === 401) {
-      setStatus('error', 'Gateway token rejected. Check token and save again.')
-      return
-    }
+    const res = await fetch(url, { method: 'HEAD', signal: ctrl.signal })
     if (!res.ok) throw new Error(`HTTP ${res.status}`)
-    setStatus('ok', `Relay reachable and authenticated at http://127.0.0.1:${port}/`)
+    setStatus('ok', `Relay reachable at ${url}`)
   } catch {
     setStatus(
       'error',
-      `Relay not reachable/authenticated at http://127.0.0.1:${port}/. Start OpenClaw browser relay and verify token.`,
+      `Relay not reachable at ${url}. Start OpenClaw’s browser relay on this machine, then click the toolbar button again.`,
     )
   } finally {
     clearTimeout(t)
@@ -58,25 +39,20 @@ async function checkRelayReachable(port, token) {
 }
 
 async function load() {
-  const stored = await chrome.storage.local.get(['relayPort', 'gatewayToken'])
+  const stored = await chrome.storage.local.get(['relayPort'])
   const port = clampPort(stored.relayPort)
-  const token = String(stored.gatewayToken || '').trim()
   document.getElementById('port').value = String(port)
-  document.getElementById('token').value = token
   updateRelayUrl(port)
-  await checkRelayReachable(port, token)
+  await checkRelayReachable(port)
 }
 
 async function save() {
-  const portInput = document.getElementById('port')
-  const tokenInput = document.getElementById('token')
-  const port = clampPort(portInput.value)
-  const token = String(tokenInput.value || '').trim()
-  await chrome.storage.local.set({ relayPort: port, gatewayToken: token })
-  portInput.value = String(port)
-  tokenInput.value = token
+  const input = document.getElementById('port')
+  const port = clampPort(input.value)
+  await chrome.storage.local.set({ relayPort: port })
+  input.value = String(port)
   updateRelayUrl(port)
-  await checkRelayReachable(port, token)
+  await checkRelayReachable(port)
 }
 
 document.getElementById('save').addEventListener('click', () => void save())

docker-setup.sh

@@ -8,11 +8,6 @@ IMAGE_NAME="${OPENCLAW_IMAGE:-openclaw:local}"
 EXTRA_MOUNTS="${OPENCLAW_EXTRA_MOUNTS:-}"
 HOME_VOLUME_NAME="${OPENCLAW_HOME_VOLUME:-}"
 
-fail() {
-  echo "ERROR: $*" >&2
-  exit 1
-}
-
 require_cmd() {
   if ! command -v "$1" >/dev/null 2>&1; then
     echo "Missing dependency: $1" >&2
@@ -20,44 +15,6 @@ require_cmd() {
   fi
 }
 
-contains_disallowed_chars() {
-  local value="$1"
-  [[ "$value" == *$'\n'* || "$value" == *$'\r'* || "$value" == *$'\t'* ]]
-}
-
-validate_mount_path_value() {
-  local label="$1"
-  local value="$2"
-  if [[ -z "$value" ]]; then
-    fail "$label cannot be empty."
-  fi
-  if contains_disallowed_chars "$value"; then
-    fail "$label contains unsupported control characters."
-  fi
-  if [[ "$value" =~ [[:space:]] ]]; then
-    fail "$label cannot contain whitespace."
-  fi
-}
-
-validate_named_volume() {
-  local value="$1"
-  if [[ ! "$value" =~ ^[A-Za-z0-9][A-Za-z0-9_.-]*$ ]]; then
-    fail "OPENCLAW_HOME_VOLUME must match [A-Za-z0-9][A-Za-z0-9_.-]* when using a named volume."
-  fi
-}
-
-validate_mount_spec() {
-  local mount="$1"
-  if contains_disallowed_chars "$mount"; then
-    fail "OPENCLAW_EXTRA_MOUNTS entries cannot contain control characters."
-  fi
-  # Keep mount specs strict to avoid YAML structure injection.
-  # Expected format: source:target[:options]
-  if [[ ! "$mount" =~ ^[^[:space:],:]+:[^[:space:],:]+(:[^[:space:],:]+)?$ ]]; then
-    fail "Invalid mount format '$mount'. Expected source:target[:options] without spaces."
-  fi
-}
-
 require_cmd docker
 if ! docker compose version >/dev/null 2>&1; then
   echo "Docker Compose not available (try: docker compose version)" >&2
@@ -67,19 +24,6 @@ fi
 OPENCLAW_CONFIG_DIR="${OPENCLAW_CONFIG_DIR:-$HOME/.openclaw}"
 OPENCLAW_WORKSPACE_DIR="${OPENCLAW_WORKSPACE_DIR:-$HOME/.openclaw/workspace}"
 
-validate_mount_path_value "OPENCLAW_CONFIG_DIR" "$OPENCLAW_CONFIG_DIR"
-validate_mount_path_value "OPENCLAW_WORKSPACE_DIR" "$OPENCLAW_WORKSPACE_DIR"
-if [[ -n "$HOME_VOLUME_NAME" ]]; then
-  if [[ "$HOME_VOLUME_NAME" == *"/"* ]]; then
-    validate_mount_path_value "OPENCLAW_HOME_VOLUME" "$HOME_VOLUME_NAME"
-  else
-    validate_named_volume "$HOME_VOLUME_NAME"
-  fi
-fi
-if contains_disallowed_chars "$EXTRA_MOUNTS"; then
-  fail "OPENCLAW_EXTRA_MOUNTS cannot contain control characters."
-fi
-
 mkdir -p "$OPENCLAW_CONFIG_DIR"
 mkdir -p "$OPENCLAW_WORKSPACE_DIR"
 
@@ -113,9 +57,6 @@ write_extra_compose() {
   local home_volume="$1"
   shift
   local mount
-  local gateway_home_mount
-  local gateway_config_mount
-  local gateway_workspace_mount
 
   cat >"$EXTRA_COMPOSE_FILE" <<'YAML'
 services:
@@ -124,19 +65,12 @@ services:
 YAML
 
   if [[ -n "$home_volume" ]]; then
-    gateway_home_mount="${home_volume}:/home/node"
-    gateway_config_mount="${OPENCLAW_CONFIG_DIR}:/home/node/.openclaw"
-    gateway_workspace_mount="${OPENCLAW_WORKSPACE_DIR}:/home/node/.openclaw/workspace"
-    validate_mount_spec "$gateway_home_mount"
-    validate_mount_spec "$gateway_config_mount"
-    validate_mount_spec "$gateway_workspace_mount"
-    printf '      - %s\n' "$gateway_home_mount" >>"$EXTRA_COMPOSE_FILE"
-    printf '      - %s\n' "$gateway_config_mount" >>"$EXTRA_COMPOSE_FILE"
-    printf '      - %s\n' "$gateway_workspace_mount" >>"$EXTRA_COMPOSE_FILE"
+    printf '      - %s:/home/node\n' "$home_volume" >>"$EXTRA_COMPOSE_FILE"
+    printf '      - %s:/home/node/.openclaw\n' "$OPENCLAW_CONFIG_DIR" >>"$EXTRA_COMPOSE_FILE"
+    printf '      - %s:/home/node/.openclaw/workspace\n' "$OPENCLAW_WORKSPACE_DIR" >>"$EXTRA_COMPOSE_FILE"
   fi
 
   for mount in "$@"; do
-    validate_mount_spec "$mount"
     printf '      - %s\n' "$mount" >>"$EXTRA_COMPOSE_FILE"
   done
 
@@ -146,18 +80,16 @@ YAML
 YAML
 
   if [[ -n "$home_volume" ]]; then
-    printf '      - %s\n' "$gateway_home_mount" >>"$EXTRA_COMPOSE_FILE"
-    printf '      - %s\n' "$gateway_config_mount" >>"$EXTRA_COMPOSE_FILE"
-    printf '      - %s\n' "$gateway_workspace_mount" >>"$EXTRA_COMPOSE_FILE"
+    printf '      - %s:/home/node\n' "$home_volume" >>"$EXTRA_COMPOSE_FILE"
+    printf '      - %s:/home/node/.openclaw\n' "$OPENCLAW_CONFIG_DIR" >>"$EXTRA_COMPOSE_FILE"
+    printf '      - %s:/home/node/.openclaw/workspace\n' "$OPENCLAW_WORKSPACE_DIR" >>"$EXTRA_COMPOSE_FILE"
   fi
 
   for mount in "$@"; do
-    validate_mount_spec "$mount"
     printf '      - %s\n' "$mount" >>"$EXTRA_COMPOSE_FILE"
   done
 
   if [[ -n "$home_volume" && "$home_volume" != *"/"* ]]; then
-    validate_named_volume "$home_volume"
     cat >>"$EXTRA_COMPOSE_FILE" <<YAML
 volumes:
   ${home_volume}:

docs/automation/cron-jobs.md

@@ -115,22 +115,11 @@ Cron supports three schedule kinds:
 
 - `at`: one-shot timestamp via `schedule.at` (ISO 8601).
 - `every`: fixed interval (ms).
-- `cron`: 5-field cron expression (or 6-field with seconds) with optional IANA timezone.
+- `cron`: 5-field cron expression with optional IANA timezone.
 
 Cron expressions use `croner`. If a timezone is omitted, the Gateway host’s
 local timezone is used.
 
-To reduce top-of-hour load spikes across many gateways, OpenClaw applies a
-deterministic per-job stagger window of up to 5 minutes for recurring
-top-of-hour expressions (for example `0 * * * *`, `0 */2 * * *`). Fixed-hour
-expressions such as `0 7 * * *` remain exact.
-
-For any cron schedule, you can set an explicit stagger window with `schedule.staggerMs`
-(`0` keeps exact timing). CLI shortcuts:
-
-- `--stagger 30s` (or `1m`, `5m`) to set an explicit stagger window.
-- `--exact` to force `staggerMs = 0`.
-
 ### Main vs isolated execution
 
 #### Main session jobs (system events)
@@ -155,7 +144,7 @@ Key behaviors:
 - Default behavior: if `delivery` is omitted, isolated jobs announce a summary (`delivery.mode = "announce"`).
 - `delivery.mode` chooses what happens:
   - `announce`: deliver a summary to the target channel and post a brief summary to the main session.
-  - `webhook`: POST the finished event payload to `delivery.to` when the finished event includes a summary.
+  - `webhook`: POST the finished event payload to `delivery.to`.
   - `none`: internal only (no delivery, no main-session summary).
 - `wakeMode` controls when the main-session summary posts:
   - `now`: immediate heartbeat.
@@ -208,7 +197,7 @@ Behavior details:
 
 #### Webhook delivery flow
 
-When `delivery.mode = "webhook"`, cron posts the finished event payload to `delivery.to` when the finished event includes a summary.
+When `delivery.mode = "webhook"`, cron posts the finished event payload to `delivery.to`.
 
 Behavior details:
 
@@ -370,7 +359,7 @@ Webhook behavior:
 
 - Preferred: set `delivery.mode: "webhook"` with `delivery.to: "https://..."` per job.
 - Webhook URLs must be valid `http://` or `https://` URLs.
-- When posted, payload is the cron finished event JSON.
+- Payload is the cron finished event JSON.
 - If `cron.webhookToken` is set, auth header is `Authorization: Bearer <cron.webhookToken>`.
 - If `cron.webhookToken` is not set, no `Authorization` header is sent.
 - Deprecated fallback: stored legacy jobs with `notify: true` still use `cron.webhook` when present.
@@ -419,19 +408,6 @@ openclaw cron add \
   --to "+15551234567"
 ```
 
-Recurring cron job with explicit 30-second stagger:
-
-```bash
-openclaw cron add \
-  --name "Minute watcher" \
-  --cron "0 * * * * *" \
-  --tz "UTC" \
-  --stagger 30s \
-  --session isolated \
-  --message "Run minute watcher checks." \
-  --announce
-```
-
 Recurring isolated job (deliver to a Telegram topic):
 
 ```bash
@@ -489,12 +465,6 @@ openclaw cron edit <jobId> \
   --thinking low
 ```
 
-Force an existing cron job to run exactly on schedule (no stagger):
-
-```bash
-openclaw cron edit <jobId> --exact
-```
-
 Run history:
 
 ```bash
@@ -533,10 +503,3 @@ openclaw system event --mode now --text "Next heartbeat: check battery."
 - For forum topics, use `-100…:topic:<id>` so it’s explicit and unambiguous.
 - If you see `telegram:...` prefixes in logs or stored “last route” targets, that’s normal;
   cron delivery accepts them and still parses topic IDs correctly.
-
-### Subagent announce delivery retries
-
-- When a subagent run completes, the gateway announces the result to the requester session.
-- If the announce flow returns `false` (e.g. requester session is busy), the gateway retries up to 3 times with tracking via `announceRetryCount`.
-- Announces older than 5 minutes past `endedAt` are force-expired to prevent stale entries from looping indefinitely.
-- If you see repeated announce deliveries in logs, check the subagent registry for entries with high `announceRetryCount` values.

docs/automation/cron-vs-heartbeat.md

@@ -74,9 +74,7 @@ See [Heartbeat](/gateway/heartbeat) for full configuration.
 
 ## Cron: Precise Scheduling
 
-Cron jobs run at precise times and can run in isolated sessions without affecting main context.
-Recurring top-of-hour schedules are automatically spread by a deterministic
-per-job offset in a 0-5 minute window.
+Cron jobs run at **exact times** and can run in isolated sessions without affecting main context.
 
 ### When to use cron
 
@@ -89,9 +87,7 @@ per-job offset in a 0-5 minute window.
 
 ### Cron advantages
 
-- **Precise timing**: 5-field or 6-field (seconds) cron expressions with timezone support.
-- **Built-in load spreading**: recurring top-of-hour schedules are staggered by up to 5 minutes by default.
-- **Per-job control**: override stagger with `--stagger <duration>` or force exact timing with `--exact`.
+- **Exact timing**: 5-field cron expressions with timezone support.
 - **Session isolation**: Runs in `cron:<jobId>` without polluting main history.
 - **Model overrides**: Use a cheaper or more powerful model per job.
 - **Delivery control**: Isolated jobs default to `announce` (summary); choose `none` as needed.

docs/automation/hooks.md

@@ -207,13 +207,12 @@ Each event includes:
 
 ```typescript
 {
-  type: 'command' | 'session' | 'agent' | 'gateway' | 'message',
-  action: string,              // e.g., 'new', 'reset', 'stop', 'received', 'sent'
+  type: 'command' | 'session' | 'agent' | 'gateway',
+  action: string,              // e.g., 'new', 'reset', 'stop'
   sessionKey: string,          // Session identifier
   timestamp: Date,             // When the event occurred
   messages: string[],          // Push messages here to send to user
   context: {
-    // Command events:
     sessionEntry?: SessionEntry,
     sessionId?: string,
     sessionFile?: string,
@@ -221,13 +220,7 @@ Each event includes:
     senderId?: string,
     workspaceDir?: string,
     bootstrapFiles?: WorkspaceBootstrapFile[],
-    cfg?: OpenClawConfig,
-    // Message events (see Message Events section for full details):
-    from?: string,             // message:received
-    to?: string,               // message:sent
-    content?: string,
-    channelId?: string,
-    success?: boolean,         // message:sent
+    cfg?: OpenClawConfig
   }
 }
 ```
@@ -253,70 +246,6 @@ Triggered when the gateway starts:
 
 - **`gateway:startup`**: After channels start and hooks are loaded
 
-### Message Events
-
-Triggered when messages are received or sent:
-
-- **`message`**: All message events (general listener)
-- **`message:received`**: When an inbound message is received from any channel
-- **`message:sent`**: When an outbound message is successfully sent
-
-#### Message Event Context
-
-Message events include rich context about the message:
-
-```typescript
-// message:received context
-{
-  from: string,           // Sender identifier (phone number, user ID, etc.)
-  content: string,        // Message content
-  timestamp?: number,     // Unix timestamp when received
-  channelId: string,      // Channel (e.g., "whatsapp", "telegram", "discord")
-  accountId?: string,     // Provider account ID for multi-account setups
-  conversationId?: string, // Chat/conversation ID
-  messageId?: string,     // Message ID from the provider
-  metadata?: {            // Additional provider-specific data
-    to?: string,
-    provider?: string,
-    surface?: string,
-    threadId?: string,
-    senderId?: string,
-    senderName?: string,
-    senderUsername?: string,
-    senderE164?: string,
-  }
-}
-
-// message:sent context
-{
-  to: string,             // Recipient identifier
-  content: string,        // Message content that was sent
-  success: boolean,       // Whether the send succeeded
-  error?: string,         // Error message if sending failed
-  channelId: string,      // Channel (e.g., "whatsapp", "telegram", "discord")
-  accountId?: string,     // Provider account ID
-  conversationId?: string, // Chat/conversation ID
-  messageId?: string,     // Message ID returned by the provider
-}
-```
-
-#### Example: Message Logger Hook
-
-```typescript
-import type { HookHandler } from "../../src/hooks/hooks.js";
-import { isMessageReceivedEvent, isMessageSentEvent } from "../../src/hooks/internal-hooks.js";
-
-const handler: HookHandler = async (event) => {
-  if (isMessageReceivedEvent(event)) {
-    console.log(`[message-logger] Received from ${event.context.from}: ${event.context.content}`);
-  } else if (isMessageSentEvent(event)) {
-    console.log(`[message-logger] Sent to ${event.context.to}: ${event.context.content}`);
-  }
-};
-
-export default handler;
-```
-
 ### Tool Result Hooks (Plugin API)
 
 These hooks are not event-stream listeners; they let plugins synchronously adjust tool results before OpenClaw persists them.
@@ -330,6 +259,8 @@ Planned event types:
 - **`session:start`**: When a new session begins
 - **`session:end`**: When a session ends
 - **`agent:error`**: When an agent encounters an error
+- **`message:sent`**: When a message is sent
+- **`message:received`**: When a message is received
 
 ## Creating Custom Hooks