feat(qa): forward shared suite flags to multipass runner

.github/labeler.yml

@@ -293,10 +293,6 @@
   - changed-files:
       - any-glob-to-any-file:
           - "extensions/lobster/**"
-"extensions: llama-cpp":
-  - changed-files:
-      - any-glob-to-any-file:
-          - "extensions/llama-cpp/**"
 "extensions: memory-core":
   - changed-files:
       - any-glob-to-any-file:

.github/workflows/ci.yml

@@ -2093,7 +2093,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ~/.android-sdk
-          key: ${{ runner.os }}-android-sdk-v1-cmdline-14742923-platform-37.0-build-tools-36.0.0
+          key: ${{ runner.os }}-android-sdk-v1-cmdline-12266719-platform-36-build-tools-36.0.0
           restore-keys: |
             ${{ runner.os }}-android-sdk-v1-
 
@@ -2101,7 +2101,7 @@ jobs:
         run: |
           set -euo pipefail
           ANDROID_SDK_ROOT="$HOME/.android-sdk"
-          CMDLINE_TOOLS_VERSION="14742923"
+          CMDLINE_TOOLS_VERSION="12266719"
           ARCHIVE="commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip"
           URL="https://dl.google.com/android/repository/${ARCHIVE}"
 
@@ -2123,7 +2123,7 @@ jobs:
           yes | sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses >/dev/null
           sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --install \
             "platform-tools" \
-            "platforms;android-37.0" \
+            "platforms;android-36" \
             "build-tools;36.0.0"
 
       - name: Run Android ${{ matrix.task }}

.github/workflows/codeql-android-critical-security.yml

@@ -35,7 +35,7 @@ jobs:
           java-version: "21"
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: java-kotlin
           build-mode: manual
@@ -46,6 +46,6 @@ jobs:
         run: ./gradlew --no-daemon :app:assemblePlayDebug
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-security/android"

.github/workflows/codeql-critical-quality.yml

@@ -342,13 +342,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-core-auth-secrets-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/core-auth-secrets"
 
@@ -365,13 +365,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-config-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/config-boundary"
 
@@ -388,13 +388,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-gateway-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/gateway-runtime-boundary"
 
@@ -411,13 +411,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-channel-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/channel-runtime-boundary"
 
@@ -460,7 +460,7 @@ jobs:
 
       - name: Initialize CodeQL
         if: ${{ github.event_name != 'pull_request' }}
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-network-runtime-boundary-critical-quality.yml
@@ -468,7 +468,7 @@ jobs:
       - name: Analyze
         id: analyze
         if: ${{ github.event_name != 'pull_request' }}
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           output: sarif-results
           category: "/codeql-critical-quality/network-runtime-boundary"
@@ -518,13 +518,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-agent-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/agent-runtime-boundary"
 
@@ -541,13 +541,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-mcp-process-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/mcp-process-runtime-boundary"
 
@@ -564,13 +564,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-memory-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/memory-runtime-boundary"
 
@@ -587,13 +587,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-session-diagnostics-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/session-diagnostics-boundary"
 
@@ -610,13 +610,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-plugin-sdk-reply-runtime-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/plugin-sdk-reply-runtime"
 
@@ -633,13 +633,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-provider-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/provider-runtime-boundary"
 
@@ -655,13 +655,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-ui-control-plane-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/ui-control-plane"
 
@@ -677,13 +677,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-web-media-runtime-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/web-media-runtime-boundary"
 
@@ -700,13 +700,13 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-plugin-boundary-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/plugin-boundary"
 
@@ -723,12 +723,12 @@ jobs:
           submodules: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: javascript-typescript
           config-file: ./.github/codeql/codeql-plugin-sdk-package-contract-critical-quality.yml
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-critical-quality/plugin-sdk-package-contract"

.github/workflows/codeql-macos-critical-security.yml

@@ -35,7 +35,7 @@ jobs:
           swift --version
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: swift
           build-mode: manual
@@ -46,7 +46,7 @@ jobs:
 
       - name: Analyze
         id: analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           output: sarif-results
           upload: failure-only
@@ -83,7 +83,7 @@ jobs:
           done
 
       - name: Upload filtered SARIF
-        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           sarif_file: sarif-results-filtered
           category: "/codeql-critical-security/macos"

.github/workflows/codeql.yml

@@ -101,12 +101,12 @@ jobs:
             .github/codeql
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           languages: ${{ matrix.language }}
           config-file: ${{ matrix.config_file }}
 
       - name: Analyze
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
+        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4
         with:
           category: "/codeql-security-high/${{ matrix.category }}"

.github/workflows/docker-release.yml

@@ -88,30 +88,11 @@ jobs:
           ref: ${{ github.event_name == 'workflow_dispatch' && format('refs/tags/{0}', inputs.tag) || github.ref }}
           fetch-depth: 0
 
-      - name: Pre-pull BuildKit image
-        shell: bash
-        env:
-          BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1
-        run: |
-          set -euo pipefail
-          for attempt in 1 2 3 4; do
-            if docker pull "${BUILDKIT_IMAGE}"; then
-              exit 0
-            fi
-            if [[ "${attempt}" == "4" ]]; then
-              echo "::error::Failed to pull ${BUILDKIT_IMAGE} after ${attempt} attempts"
-              exit 1
-            fi
-            sleep_seconds=$((attempt * 10))
-            echo "BuildKit image pull failed; retrying in ${sleep_seconds}s (${attempt}/4)."
-            sleep "${sleep_seconds}"
-          done
-
       - name: Set up Docker Builder
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
@@ -298,30 +279,11 @@ jobs:
           ref: ${{ github.event_name == 'workflow_dispatch' && format('refs/tags/{0}', inputs.tag) || github.ref }}
           fetch-depth: 0
 
-      - name: Pre-pull BuildKit image
-        shell: bash
-        env:
-          BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1
-        run: |
-          set -euo pipefail
-          for attempt in 1 2 3 4; do
-            if docker pull "${BUILDKIT_IMAGE}"; then
-              exit 0
-            fi
-            if [[ "${attempt}" == "4" ]]; then
-              echo "::error::Failed to pull ${BUILDKIT_IMAGE} after ${attempt} attempts"
-              exit 1
-            fi
-            sleep_seconds=$((attempt * 10))
-            echo "BuildKit image pull failed; retrying in ${sleep_seconds}s (${attempt}/4)."
-            sleep "${sleep_seconds}"
-          done
-
       - name: Set up Docker Builder
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
@@ -506,7 +468,7 @@ jobs:
           fetch-depth: 0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
@@ -599,30 +561,11 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Pre-pull BuildKit image
-        shell: bash
-        env:
-          BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1
-        run: |
-          set -euo pipefail
-          for attempt in 1 2 3 4; do
-            if docker pull "${BUILDKIT_IMAGE}"; then
-              exit 0
-            fi
-            if [[ "${attempt}" == "4" ]]; then
-              echo "::error::Failed to pull ${BUILDKIT_IMAGE} after ${attempt} attempts"
-              exit 1
-            fi
-            sleep_seconds=$((attempt * 10))
-            echo "BuildKit image pull failed; retrying in ${sleep_seconds}s (${attempt}/4)."
-            sleep "${sleep_seconds}"
-          done
-
       - name: Set up Docker Builder
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}

.github/workflows/install-smoke.yml

@@ -112,7 +112,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up Blacksmith Docker Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 
@@ -223,7 +223,7 @@ jobs:
           persist-credentials: false
 
       - name: Log in to GHCR
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -245,7 +245,7 @@ jobs:
 
       - name: Set up Blacksmith Docker Builder
         if: steps.existing.outputs.exists != 'true'
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 
@@ -311,7 +311,7 @@ jobs:
           persist-credentials: false
 
       - name: Log in to GHCR
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -417,7 +417,7 @@ jobs:
           persist-credentials: false
 
       - name: Log in to GHCR
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -429,7 +429,7 @@ jobs:
         run: timeout --kill-after=30s 600s docker pull "$IMAGE_REF"
 
       - name: Set up Blacksmith Docker Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 
@@ -503,7 +503,7 @@ jobs:
           persist-credentials: false
 
       - name: Log in to GHCR
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -542,7 +542,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up Blacksmith Docker Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 

.github/workflows/live-media-runner-image.yml

@@ -29,14 +29,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Login to GHCR
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Set up Blacksmith Docker Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 

.github/workflows/mantis-discord-smoke.yml

@@ -37,7 +37,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const allowed = new Set(["admin", "maintain", "write"]);

.github/workflows/mantis-discord-status-reactions.yml

@@ -56,7 +56,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const allowed = new Set(["admin", "maintain", "write"]);
@@ -91,7 +91,7 @@ jobs:
     steps:
       - name: Resolve refs and target PR
         id: resolve
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const defaultBaseline = "0bf06e953fdda290799fc9fb9244a8f67fdae593";
@@ -581,7 +581,7 @@ jobs:
       issues: write
     steps:
       - name: Remove workflow eyes reaction
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const { owner, repo } = context.repo;

.github/workflows/mantis-discord-thread-attachment.yml

@@ -56,7 +56,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const allowed = new Set(["admin", "maintain", "write"]);
@@ -91,7 +91,7 @@ jobs:
     steps:
       - name: Resolve refs and target PR
         id: resolve
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const defaultBaseline = "synthetic-reverted-thread-filepath-fix";
@@ -603,7 +603,7 @@ jobs:
       issues: write
     steps:
       - name: Remove workflow eyes reaction
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const { owner, repo } = context.repo;

.github/workflows/mantis-slack-desktop-smoke.yml

@@ -81,7 +81,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const allowed = new Set(["admin", "maintain", "write"]);
@@ -180,7 +180,7 @@ jobs:
         run: pnpm build
 
       - name: Cache Mantis candidate pnpm store
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: |
             ~/.local/share/pnpm/store

.github/workflows/mantis-telegram-desktop-proof.yml

@@ -79,7 +79,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             if (context.eventName === "pull_request_target") {
@@ -125,7 +125,7 @@ jobs:
     steps:
       - name: Resolve refs and target PR
         id: resolve
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const eventName = context.eventName;
@@ -709,7 +709,7 @@ jobs:
       issues: write
     steps:
       - name: Remove workflow eyes reaction
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const { owner, repo } = context.repo;

.github/workflows/mantis-telegram-live.yml

@@ -68,7 +68,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const allowed = new Set(["admin", "maintain", "write"]);
@@ -105,7 +105,7 @@ jobs:
     steps:
       - name: Resolve refs and target PR
         id: resolve
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const eventName = context.eventName;
@@ -327,7 +327,7 @@ jobs:
         run: pnpm build
 
       - name: Cache Mantis candidate pnpm store
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: |
             ~/.local/share/pnpm/store
@@ -573,7 +573,7 @@ jobs:
       issues: write
     steps:
       - name: Remove workflow eyes reaction
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const { owner, repo } = context.repo;

.github/workflows/npm-telegram-beta-e2e.yml

@@ -126,7 +126,7 @@ jobs:
           fetch-depth: 1
 
       - name: Set up Blacksmith Docker Builder
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 

.github/workflows/openclaw-live-and-e2e-checks-reusable.yml

@@ -1497,72 +1497,37 @@ jobs:
 
       - name: Setup Docker builder
         if: steps.image_exists.outputs.needs_build == '1'
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 
       - name: Build and push bare Docker E2E image
         if: steps.plan.outputs.needs_bare_image == '1' && steps.image_exists.outputs.bare_exists != '1'
-        shell: bash
-        env:
-          IMAGE_REF: ${{ steps.image.outputs.bare_image }}
-        run: |
-          set -euo pipefail
-          build_cmd=(
-            docker buildx build
-            --file ./scripts/e2e/Dockerfile
-            --target bare
-            --platform linux/amd64
-            --tag "$IMAGE_REF"
-            --sbom=true
-            --provenance=mode=max
-            --push
-            .
-          )
-          for attempt in 1 2 3 4; do
-            if "${build_cmd[@]}"; then
-              exit 0
-            fi
-            if [[ "$attempt" == "4" ]]; then
-              echo "::error::Failed to build Docker E2E bare image after ${attempt} attempts"
-              exit 1
-            fi
-            sleep_seconds=$((attempt * 20))
-            echo "Docker E2E bare image build failed; retrying in ${sleep_seconds}s (${attempt}/4)."
-            sleep "$sleep_seconds"
-          done
+        uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
+        with:
+          context: .
+          file: ./scripts/e2e/Dockerfile
+          target: bare
+          platforms: linux/amd64
+          tags: ${{ steps.image.outputs.bare_image }}
+          sbom: true
+          provenance: mode=max
+          push: true
 
       - name: Build and push functional Docker E2E image
         if: steps.plan.outputs.needs_functional_image == '1' && steps.image_exists.outputs.functional_exists != '1'
-        shell: bash
-        env:
-          IMAGE_REF: ${{ steps.image.outputs.functional_image }}
-        run: |
-          set -euo pipefail
-          build_cmd=(
-            docker buildx build
-            --file ./scripts/e2e/Dockerfile
-            --target functional
-            --build-context openclaw_package=.artifacts/docker-e2e-package
-            --platform linux/amd64
-            --tag "$IMAGE_REF"
-            --sbom=true
-            --provenance=mode=max
-            --push
-            .
-          )
-          for attempt in 1 2 3 4; do
-            if "${build_cmd[@]}"; then
-              exit 0
-            fi
-            if [[ "$attempt" == "4" ]]; then
-              echo "::error::Failed to build Docker E2E functional image after ${attempt} attempts"
-              exit 1
-            fi
-            sleep_seconds=$((attempt * 20))
-            echo "Docker E2E functional image build failed; retrying in ${sleep_seconds}s (${attempt}/4)."
-            sleep "$sleep_seconds"
-          done
+        uses: useblacksmith/build-push-action@fb9e3e6a9299c78462bfadd0d93352c316adc9b8 # v2
+        with:
+          context: .
+          file: ./scripts/e2e/Dockerfile
+          target: functional
+          build-contexts: |
+            openclaw_package=.artifacts/docker-e2e-package
+          platforms: linux/amd64
+          tags: ${{ steps.image.outputs.functional_image }}
+          sbom: true
+          provenance: mode=max
+          push: true
 
   prepare_live_test_image:
     needs: validate_selected_ref
@@ -1593,11 +1558,8 @@ jobs:
         run: |
           set -euo pipefail
           repository="${GITHUB_REPOSITORY,,}"
-          live_image_extensions="matrix,acpx"
-          live_image_tag_suffix="${live_image_extensions//,/-}"
-          live_image="ghcr.io/${repository}-live-test:${SELECTED_SHA}-${live_image_tag_suffix}"
+          live_image="ghcr.io/${repository}-live-test:${SELECTED_SHA}"
           echo "live_image=${live_image}" >> "$GITHUB_OUTPUT"
-          echo "live_image_extensions=${live_image_extensions}" >> "$GITHUB_OUTPUT"
           echo "Shared live-test image: \`${live_image}\`" >> "$GITHUB_STEP_SUMMARY"
 
       - name: Log in to GHCR
@@ -1620,7 +1582,7 @@ jobs:
 
       - name: Setup Docker builder
         if: steps.image_exists.outputs.exists != '1'
-        uses: useblacksmith/setup-docker-builder@ab5c1da94f53f5cd75c1038092aa276dddfccbba # v1
+        uses: useblacksmith/setup-docker-builder@722e97d12b1d06a961800dd6c05d79d951ad3c80 # v1
         with:
           max-cache-size-mb: 800000
 
@@ -1632,7 +1594,7 @@ jobs:
           file: ./Dockerfile
           target: build
           build-args: |
-            OPENCLAW_EXTENSIONS=${{ steps.image.outputs.live_image_extensions }}
+            OPENCLAW_EXTENSIONS=matrix
           platforms: linux/amd64
           tags: ${{ steps.image.outputs.live_image }}
           sbom: true

.github/workflows/opengrep-precise-full.yml

@@ -53,7 +53,7 @@ jobs:
           scripts/run-opengrep.sh --sarif --error
 
       - name: Upload SARIF to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v4.36.2
+        uses: github/codeql-action/upload-sarif@v4.36.1
         # Only upload if the scan actually produced a SARIF file.
         if: always() && hashFiles('.opengrep-out/precise.sarif') != ''
         with:

.github/workflows/opengrep-precise.yml

@@ -84,7 +84,7 @@ jobs:
           scripts/run-opengrep.sh --changed --sarif --error
 
       - name: Upload SARIF to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v4.36.2
+        uses: github/codeql-action/upload-sarif@v4.36.1
         # Only upload if the scan actually produced a SARIF file.
         if: always() && hashFiles('.opengrep-out/precise.sarif') != ''
         with:

.github/workflows/plugin-clawhub-release.yml

@@ -24,11 +24,6 @@ on:
         description: Approved OpenClaw Release Publish workflow run id
         required: false
         type: string
-      dry_run:
-        description: Validate the full ClawHub artifact handoff without publishing.
-        required: false
-        default: false
-        type: boolean
 
 concurrency:
   group: plugin-clawhub-release-${{ github.event_name == 'workflow_dispatch' && inputs.ref || github.sha }}
@@ -40,7 +35,7 @@ env:
   CLAWHUB_REGISTRY: "https://clawhub.ai"
   CLAWHUB_REPOSITORY: "openclaw/clawhub"
   # Pinned to a reviewed ClawHub commit so release behavior stays reproducible.
-  CLAWHUB_REF: "c9bb13023598dcc547fdf4a93b9d42512b8c8854"
+  CLAWHUB_REF: "facf20ceb6cc459e2872d941e71335a784bbc55c"
 
 jobs:
   preview_plugins_clawhub:
@@ -61,6 +56,12 @@ jobs:
           ref: ${{ github.ref }}
           fetch-depth: 0
 
+      - name: Setup Node environment
+        uses: ./.github/actions/setup-node-env
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          install-bun: "false"
+
       - name: Resolve checked-out ref
         id: ref
         env:
@@ -106,12 +107,6 @@ jobs:
           echo "Plugin ClawHub publishes must target a commit reachable from main, release/*, or the matching Tideclaw alpha branch." >&2
           exit 1
 
-      - name: Setup Node environment
-        uses: ./.github/actions/setup-node-env
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          install-bun: "false"
-
       - name: Validate publishable plugin metadata
         env:
           PUBLISH_SCOPE: ${{ github.event_name == 'workflow_dispatch' && inputs.publish_scope || '' }}
@@ -331,12 +326,15 @@ jobs:
           PACKAGE_DIR: ${{ matrix.plugin.packageDir }}
         run: bash scripts/plugin-clawhub-publish.sh --dry-run "${PACKAGE_DIR}"
 
-  pack_plugins_clawhub_artifacts:
+  publish_plugins_clawhub:
     needs: [preview_plugins_clawhub, preview_plugin_pack, validate_release_publish_approval]
     if: github.event_name == 'workflow_dispatch' && needs.preview_plugins_clawhub.outputs.has_candidates == 'true'
     runs-on: ubuntu-latest
+    environment: clawhub-plugin-release
     permissions:
+      actions: read
       contents: read
+      id-token: write
     strategy:
       fail-fast: false
       max-parallel: 32
@@ -409,7 +407,73 @@ jobs:
           chmod +x "$RUNNER_TEMP/clawhub"
           echo "$RUNNER_TEMP" >> "$GITHUB_PATH"
 
-      - name: Pack ClawHub package artifact
+      - name: Write ClawHub token config
+        env:
+          CLAWHUB_TOKEN: ${{ secrets.CLAWHUB_TOKEN }}
+          CLAWHUB_REGISTRY: ${{ env.CLAWHUB_REGISTRY }}
+        run: |
+          set -euo pipefail
+          if [[ -z "${CLAWHUB_TOKEN}" ]]; then
+            echo "No CLAWHUB_TOKEN secret configured; publish will rely on GitHub OIDC trusted publishing."
+            exit 0
+          fi
+          node --input-type=module <<'EOF'
+          import { writeFileSync } from "node:fs";
+          import { join } from "node:path";
+
+          const path = join(process.env.RUNNER_TEMP, "clawhub-config.json");
+          writeFileSync(
+            path,
+            `${JSON.stringify(
+              {
+                registry: process.env.CLAWHUB_REGISTRY,
+                token: process.env.CLAWHUB_TOKEN,
+              },
+              null,
+              2,
+            )}\n`,
+          );
+          console.log(path);
+          EOF
+          echo "CLAWHUB_CONFIG_PATH=${RUNNER_TEMP}/clawhub-config.json" >> "$GITHUB_ENV"
+
+      - name: Check ClawHub package version
+        id: clawhub_package_version
+        env:
+          PACKAGE_NAME: ${{ matrix.plugin.packageName }}
+          PACKAGE_VERSION: ${{ matrix.plugin.version }}
+          CLAWHUB_REGISTRY: ${{ env.CLAWHUB_REGISTRY }}
+        run: |
+          set -euo pipefail
+          encoded_name="$(node -e 'console.log(encodeURIComponent(process.env.PACKAGE_NAME ?? ""))')"
+          encoded_version="$(node -e 'console.log(encodeURIComponent(process.env.PACKAGE_VERSION ?? ""))')"
+          url="${CLAWHUB_REGISTRY%/}/api/v1/packages/${encoded_name}/versions/${encoded_version}"
+          status=""
+          for attempt in $(seq 1 8); do
+            status="$(curl --silent --show-error --output /dev/null --write-out '%{http_code}' "${url}")"
+            if [[ "${status}" == "404" || "${status}" =~ ^2 ]]; then
+              break
+            fi
+            if [[ "${status}" == "429" || "${status}" =~ ^5 ]]; then
+              echo "ClawHub availability check returned ${status} for ${PACKAGE_NAME}@${PACKAGE_VERSION}; retrying (${attempt}/8)."
+              sleep 60
+              continue
+            fi
+            break
+          done
+          if [[ "${status}" =~ ^2 ]]; then
+            echo "${PACKAGE_NAME}@${PACKAGE_VERSION} is already published on ClawHub."
+            echo "already_published=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          if [[ "${status}" != "404" ]]; then
+            echo "Unexpected ClawHub response (${status}) for ${PACKAGE_NAME}@${PACKAGE_VERSION}."
+            exit 1
+          fi
+          echo "already_published=false" >> "$GITHUB_OUTPUT"
+
+      - name: Publish
+        if: steps.clawhub_package_version.outputs.already_published != 'true'
         env:
           CLAWHUB_REGISTRY: ${{ env.CLAWHUB_REGISTRY }}
           SOURCE_REPO: ${{ github.repository }}
@@ -417,65 +481,8 @@ jobs:
           SOURCE_REF: ${{ github.ref }}
           PACKAGE_TAG: ${{ matrix.plugin.publishTag }}
           PACKAGE_DIR: ${{ matrix.plugin.packageDir }}
-          OPENCLAW_CLAWHUB_PACK_OUTPUT_DIR: ${{ runner.temp }}/clawhub-package-artifact
-        run: bash scripts/plugin-clawhub-publish.sh --pack "${PACKAGE_DIR}"
+        run: bash scripts/plugin-clawhub-publish.sh --publish "${PACKAGE_DIR}"
 
-      - name: Upload ClawHub package artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: ${{ matrix.plugin.artifactName }}
-          path: ${{ runner.temp }}/clawhub-package-artifact/*.tgz
-          if-no-files-found: error
-          retention-days: 7
-
-  approve_plugin_clawhub_release:
-    needs: [preview_plugins_clawhub, pack_plugins_clawhub_artifacts]
-    if: github.event_name == 'workflow_dispatch' && inputs.dry_run != true && needs.preview_plugins_clawhub.outputs.has_candidates == 'true'
-    runs-on: ubuntu-latest
-    environment: clawhub-plugin-release
-    permissions: {}
-    steps:
-      - name: Approve ClawHub package publish
-        run: echo "ClawHub package publish approved."
-
-  publish_plugins_clawhub:
-    needs: [preview_plugins_clawhub, pack_plugins_clawhub_artifacts, approve_plugin_clawhub_release]
-    if: always() && github.event_name == 'workflow_dispatch' && needs.preview_plugins_clawhub.outputs.has_candidates == 'true' && needs.pack_plugins_clawhub_artifacts.result == 'success' && (inputs.dry_run == true || needs.approve_plugin_clawhub_release.result == 'success')
-    permissions:
-      actions: read
-      contents: read
-      id-token: write
-    strategy:
-      fail-fast: false
-      max-parallel: 32
-      matrix:
-        plugin: ${{ fromJson(needs.preview_plugins_clawhub.outputs.matrix) }}
-    uses: openclaw/clawhub/.github/workflows/package-publish.yml@c9bb13023598dcc547fdf4a93b9d42512b8c8854
-    with:
-      dry_run: ${{ inputs.dry_run }}
-      json: true
-      package_artifact_name: ${{ matrix.plugin.artifactName }}
-      registry: https://clawhub.ai
-      site: https://clawhub.ai
-      source_repo: ${{ github.repository }}
-      source_commit: ${{ needs.preview_plugins_clawhub.outputs.ref_revision }}
-      source_ref: ${{ github.ref }}
-      tags: ${{ matrix.plugin.publishTag }}
-    secrets:
-      clawhub_token: ${{ secrets.CLAWHUB_TOKEN }}
-
-  verify_published_clawhub_package:
-    needs: [preview_plugins_clawhub, publish_plugins_clawhub]
-    if: github.event_name == 'workflow_dispatch' && inputs.dry_run != true && needs.preview_plugins_clawhub.outputs.has_candidates == 'true'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    strategy:
-      fail-fast: false
-      max-parallel: 32
-      matrix:
-        plugin: ${{ fromJson(needs.preview_plugins_clawhub.outputs.matrix) }}
-    steps:
       - name: Verify published ClawHub package
         env:
           CLAWHUB_REGISTRY: ${{ env.CLAWHUB_REGISTRY }}

.github/workflows/qa-live-transports-convex.yml

@@ -65,7 +65,7 @@ jobs:
     steps:
       - name: Require maintainer-level repository access
         id: permission
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             if (context.eventName === "schedule") {
@@ -159,7 +159,7 @@ jobs:
   run_mock_parity:
     name: Run QA Lab mock parity lane
     needs: [validate_selected_ref]
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 30
     env:
       QA_PARITY_CONCURRENCY: "1"
@@ -186,7 +186,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run OpenAI candidate lane
@@ -232,7 +232,7 @@ jobs:
     name: Run live runtime token-efficiency lane
     needs: [authorize_actor, validate_selected_ref]
     if: github.event_name == 'schedule'
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 45
     environment: qa-live-shared
     env:
@@ -267,7 +267,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run live runtime parity lane
@@ -321,7 +321,7 @@ jobs:
     name: Run Matrix live QA lane
     needs: [authorize_actor, validate_selected_ref]
     if: ${{ !(github.event_name == 'workflow_dispatch' && inputs.matrix_profile == 'all') }}
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     environment: qa-live-shared
     steps:
@@ -352,7 +352,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run Matrix live lane
@@ -397,7 +397,7 @@ jobs:
     name: Run Matrix live QA lane (${{ matrix.profile }})
     needs: [authorize_actor, validate_selected_ref]
     if: ${{ github.event_name == 'workflow_dispatch' && inputs.matrix_profile == 'all' }}
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     environment: qa-live-shared
     strategy:
@@ -437,7 +437,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run Matrix live lane shard
@@ -480,7 +480,7 @@ jobs:
   run_live_telegram:
     name: Run Telegram live QA lane with Convex leases
     needs: [authorize_actor, validate_selected_ref]
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     environment: qa-live-shared
     steps:
@@ -520,7 +520,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run Telegram live lane
@@ -575,7 +575,7 @@ jobs:
   run_live_discord:
     name: Run Discord live QA lane with Convex leases
     needs: [authorize_actor, validate_selected_ref]
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     environment: qa-live-shared
     steps:
@@ -615,7 +615,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run Discord live lane
@@ -669,7 +669,7 @@ jobs:
   run_live_whatsapp:
     name: Run WhatsApp live QA lane with Convex leases
     needs: [authorize_actor, validate_selected_ref]
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     concurrency:
       group: qa-live-whatsapp-shared
@@ -712,7 +712,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run WhatsApp live lane
@@ -766,7 +766,7 @@ jobs:
   run_live_slack:
     name: Run Slack live QA lane with Convex leases
     needs: [authorize_actor, validate_selected_ref]
-    runs-on: blacksmith-16vcpu-ubuntu-2404
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     environment: qa-live-shared
     steps:
@@ -806,7 +806,7 @@ jobs:
 
       - name: Build private QA runtime
         env:
-          NODE_OPTIONS: --max-old-space-size=12288
+          NODE_OPTIONS: --max-old-space-size=8192
         run: pnpm build
 
       - name: Run Slack live lane

.github/workflows/stale.yml

@@ -509,62 +509,60 @@ jobs:
 
             let locked = 0;
             let inspected = 0;
-            let cursor = null;
 
+            let page = 1;
             while (true) {
-              const result = await github.graphql(
-                `query ClosedIssuesForLocking(
-                  $owner: String!
-                  $repo: String!
-                  $cursor: String
-                  $perPage: Int!
-                ) {
-                  repository(owner: $owner, name: $repo) {
-                    issues(
-                      first: $perPage
-                      after: $cursor
-                      states: CLOSED
-                      orderBy: { field: CREATED_AT, direction: ASC }
-                    ) {
-                      nodes {
-                        number
-                        locked
-                        closedAt
-                        comments(last: 1) {
-                          nodes {
-                            createdAt
-                          }
-                        }
-                      }
-                      pageInfo {
-                        hasNextPage
-                        endCursor
-                      }
-                    }
-                  }
-                }`,
-                {
-                  owner,
-                  repo,
-                  cursor,
-                  perPage,
-                },
-              );
-              const issues = result.repository.issues;
+              const { data: issues } = await github.rest.issues.listForRepo({
+                owner,
+                repo,
+                state: "closed",
+                sort: "updated",
+                direction: "desc",
+                per_page: perPage,
+                page,
+              });
 
-              for (const issue of issues.nodes) {
-                if (issue.locked || !issue.closedAt) {
+              if (issues.length === 0) {
+                break;
+              }
+
+              for (const issue of issues) {
+                if (issue.pull_request) {
+                  continue;
+                }
+                if (issue.locked) {
+                  continue;
+                }
+                if (!issue.closed_at) {
                   continue;
                 }
 
                 inspected += 1;
-                const closedAtMs = Date.parse(issue.closedAt);
-                if (!Number.isFinite(closedAtMs) || closedAtMs > cutoffMs) {
+                const closedAtMs = Date.parse(issue.closed_at);
+                if (!Number.isFinite(closedAtMs)) {
+                  continue;
+                }
+                if (closedAtMs > cutoffMs) {
                   continue;
                 }
 
-                const lastComment = issue.comments.nodes[0];
-                const lastCommentMs = lastComment ? Date.parse(lastComment.createdAt) : 0;
+                let lastCommentMs = 0;
+                if (issue.comments > 0) {
+                  const { data: comments } = await github.rest.issues.listComments({
+                    owner,
+                    repo,
+                    issue_number: issue.number,
+                    per_page: 1,
+                    page: 1,
+                    sort: "created",
+                    direction: "desc",
+                  });
+
+                  if (comments.length > 0) {
+                    lastCommentMs = Date.parse(comments[0].created_at);
+                  }
+                }
+
                 const lastActivityMs = Math.max(closedAtMs, lastCommentMs || 0);
                 if (lastActivityMs > cutoffMs) {
                   continue;
@@ -580,10 +578,7 @@ jobs:
                 locked += 1;
               }
 
-              if (!issues.pageInfo.hasNextPage || !issues.pageInfo.endCursor) {
-                break;
-              }
-              cursor = issues.pageInfo.endCursor;
+              page += 1;
             }
 
             core.info(`Inspected ${inspected} closed issues; locked ${locked}.`);

.github/workflows/workflow-sanity.yml

@@ -34,25 +34,10 @@ jobs:
           git init "$GITHUB_WORKSPACE"
           git -C "$GITHUB_WORKSPACE" config gc.auto 0
           git -C "$GITHUB_WORKSPACE" remote add origin "https://github.com/${CHECKOUT_REPO}.git"
-          fetch_checkout_ref() {
-            local fetch_status
-            for attempt in 1 2 3; do
-              timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
-                -c protocol.version=2 \
-                fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
-                "+${CHECKOUT_SHA}:refs/remotes/origin/checkout" && return 0
-              fetch_status="$?"
-              if [ "$fetch_status" != "124" ] && [ "$fetch_status" != "137" ]; then
-                return "$fetch_status"
-              fi
-              if [ "$attempt" = "3" ]; then
-                return "$fetch_status"
-              fi
-              echo "::warning::checkout fetch for '$CHECKOUT_SHA' timed out on attempt $attempt; retrying"
-              sleep 5
-            done
-          }
-          fetch_checkout_ref
+          timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
+            -c protocol.version=2 \
+            fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
+            "+${CHECKOUT_SHA}:refs/remotes/origin/checkout"
           git -C "$GITHUB_WORKSPACE" checkout --detach refs/remotes/origin/checkout
 
       - name: Fail on tabs in workflow files
@@ -93,25 +78,10 @@ jobs:
           git init "$GITHUB_WORKSPACE"
           git -C "$GITHUB_WORKSPACE" config gc.auto 0
           git -C "$GITHUB_WORKSPACE" remote add origin "https://github.com/${CHECKOUT_REPO}.git"
-          fetch_checkout_ref() {
-            local fetch_status
-            for attempt in 1 2 3; do
-              timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
-                -c protocol.version=2 \
-                fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
-                "+${CHECKOUT_SHA}:refs/remotes/origin/checkout" && return 0
-              fetch_status="$?"
-              if [ "$fetch_status" != "124" ] && [ "$fetch_status" != "137" ]; then
-                return "$fetch_status"
-              fi
-              if [ "$attempt" = "3" ]; then
-                return "$fetch_status"
-              fi
-              echo "::warning::checkout fetch for '$CHECKOUT_SHA' timed out on attempt $attempt; retrying"
-              sleep 5
-            done
-          }
-          fetch_checkout_ref
+          timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
+            -c protocol.version=2 \
+            fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
+            "+${CHECKOUT_SHA}:refs/remotes/origin/checkout"
           git -C "$GITHUB_WORKSPACE" checkout --detach refs/remotes/origin/checkout
 
       - name: Setup Python
@@ -220,25 +190,10 @@ jobs:
           git init "$GITHUB_WORKSPACE"
           git -C "$GITHUB_WORKSPACE" config gc.auto 0
           git -C "$GITHUB_WORKSPACE" remote add origin "https://github.com/${CHECKOUT_REPO}.git"
-          fetch_checkout_ref() {
-            local fetch_status
-            for attempt in 1 2 3; do
-              timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
-                -c protocol.version=2 \
-                fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
-                "+${CHECKOUT_SHA}:refs/remotes/origin/checkout" && return 0
-              fetch_status="$?"
-              if [ "$fetch_status" != "124" ] && [ "$fetch_status" != "137" ]; then
-                return "$fetch_status"
-              fi
-              if [ "$attempt" = "3" ]; then
-                return "$fetch_status"
-              fi
-              echo "::warning::checkout fetch for '$CHECKOUT_SHA' timed out on attempt $attempt; retrying"
-              sleep 5
-            done
-          }
-          fetch_checkout_ref
+          timeout --signal=TERM --kill-after=10s 30s git -C "$GITHUB_WORKSPACE" \
+            -c protocol.version=2 \
+            fetch --no-tags --prune --no-recurse-submodules --depth=1 origin \
+            "+${CHECKOUT_SHA}:refs/remotes/origin/checkout"
           git -C "$GITHUB_WORKSPACE" checkout --detach refs/remotes/origin/checkout
 
       - name: Setup Node environment

CHANGELOG.md

@@ -27,7 +27,8 @@ Docs: https://docs.openclaw.ai
 - Docs/tooling: add Parallel search docs, refresh weather-skill guidance toward `web_fetch`, clarify legacy `openai-codex` auth, document release/test helper scripts, and tighten changed-test routing docs for CI/debugging work. (#90028, #90250) Thanks @fuller-stack-dev.
 - Release/process: switch release trains to `YYYY.M.PATCH` monthly patch numbering, keep pre-transition tags compatible, and pin the June 2026 floor at `2026.6.5` after the published beta.
 - Platform maintenance: refresh Android, Swift/macOS, Docker, CodeQL, Buildx, Docker build/push, and Codex Action dependencies for this release train. (#74980, #81757, #86481, #86483, #90601)
-- QQBot: add `/bot-group-allways on|off` slash command (with named-account and default-account support) to toggle whether group messages require an `@mention` before the bot replies, and clear the runtime config snapshot after the write so the new account-level `defaultRequireMention` takes effect immediately without restart. (#91423) Thanks @cxyhhhhh.
+- QA Lab: add a host-only Crabline channel-driver seam for deterministic SDK-backed Telegram coverage metadata and capability-matrix artifacts. (#91502) Thanks @RomneyDa.
+- QA Lab: preserve shared suite plugin and channel-driver selections across QA suite runners. (#91506) Thanks @RomneyDa.
 
 ### Fixes
 
@@ -40,12 +41,10 @@ Docs: https://docs.openclaw.ai
 - Cron/update/service env: doctor config preflight now migrates legacy cron JSON stores into SQLite before runtime reads, service env planning skips unresolved placeholders that would mask state-dir `.env` values, and session transcript rewrites keep registry markers/discriminants consistent. (#90072, #90208, #90277, #90488) Thanks @MonkeyLeeT and @sallyom.
 - Security/config/tooling: guard MCP HTTP redirects, protect global agent config defaults, and keep release/test/tooling proof failures bounded and explicit. (#89732, #90145)
 - Channels: WhatsApp restarts when per-account config changes, bounds background startup waits, closes failed sockets, and preserves reconnect behavior; Mattermost slash commands keep their state on `globalThis`; Feishu streaming cards preserve full merged content; voice-call tracks Twilio streams after connect; ClickClack reply tools respect `toolsAllow`. (#87951, #87965, #90486, #68113, #90534, #90181, #90607, #89500) Thanks @MukundaKatta, @mcaxtr, @infoanton, @mushuiyu886, and @sahibzada-allahyar.
-- Feishu: retry transient send rate-limit errors (HTTP 429, per-chat code 230020, tenant-level code 11232) with linear backoff, including SDK responses that fulfill with rate-limit bodies instead of throwing, and route streaming-card sends through the retry wrapper. (#89659) Thanks @ladygege.
 - Release/CI/E2E: main CI guard drift, PR merge diff scoping, live Docker credential staging, base-image qualification, installer Docker classification, Playwright dependency install recovery, API-key auth for Codex live Docker lanes, Parallels option terminators, and JSON-mode progress handling are tighter so release proof fails cleaner. (#90532, #90287, #90058) Thanks @RomneyDa, @hxy91819, and @mrunalp.
 - Release/CI/E2E: Docker E2E and live Docker harness runs now apply default memory, CPU, and process ceilings while preserving explicit per-lane overrides.
 - Release/CI/E2E: plugin lifecycle matrix resource sampling now fails phases that exceed RSS, wall-clock, or CPU ceilings instead of only logging the measurements.
 - Release/CI/E2E: Codex npm plugin live assertions now cap transcript discovery and diagnostic log reads so failure proof stays bounded.
-- Memory: keep doctor REM harness previews aligned with live REM by dropping short-term recall snippets whose source files disappeared before rendering preview output. Thanks @samzong and @frankekn.
 - Tests/state isolation: QA Lab valid-tool-call metrics now require runtime tool-call evidence when runtime parity data is available instead of counting tool-backed scenario pass status alone.
 - Tests/state isolation: QA Lab runtime parity now fails planned-only tool-call rows without matching tool results instead of treating matching mock plans as real tool evidence.
 - Tests/state isolation: provider, media, auth, cron, task, session, sandbox, Gateway, and Codex timeout fixtures now scope more home/state/env data per test, reducing cross-test leakage and making release validation failures less noisy. (#90027, #89974)

SECURITY.md

@@ -48,7 +48,6 @@ These patterns are usually not vulnerabilities by themselves:
 
 - Prompt injection without a policy, auth, approval, sandbox, or tool-boundary bypass.
 - A trusted operator using an intentional local feature, such as local shell access or browser/script execution.
-- A report whose only primitive is changing the process or child-process environment before running OpenClaw or an executable OpenClaw invokes.
 - A malicious plugin after a trusted operator installs or enables it.
 - Multiple adversarial users sharing one Gateway host/config and expecting per-user isolation.
 - Scanner-only, dependency-only, or stale-path reports without a working repro and demonstrated OpenClaw impact.
@@ -104,7 +103,6 @@ These are frequently reported but are typically closed with no code change:
 - ReDoS/DoS claims that require trusted operator configuration input (for example catastrophic regex in `sessionFilter` or `logging.redactPatterns`) without a trust-boundary bypass.
 - Archive/install extraction claims that require pre-existing local filesystem priming in trusted state (for example planting symlink/hardlink aliases under destination directories such as skills/tools paths) without showing an untrusted path that can create/control that primitive.
 - Reports that depend on replacing or rewriting an already-approved executable path on a trusted host (same-path inode/content swap) without showing an untrusted path to perform that write.
-- Reports that depend on attacker-controlled environment variables changing executable behavior, including variables that redirect lookup paths, preload code, select wrappers/interpreters, alter package-manager or runtime hooks, or make one executable call another executable. Control of the process or child-process environment is trusted host/operator control in OpenClaw's model; these reports need a separate OpenClaw boundary bypass that lets untrusted input set or mutate that environment.
 - Reports that depend on pre-existing symlinked skill/workspace filesystem state (for example symlink chains involving `skills/*/SKILL.md`) without showing an untrusted path that can create/control that state.
 - Missing HSTS findings on default local/loopback deployments.
 - Reports against test-only harnesses, QA Lab, QE Lab, E2E fixtures, benchmark rigs, or maintainer-only debugging tools when the vulnerable code is not shipped as a supported production surface.
@@ -163,7 +161,6 @@ Plugins/extensions are part of OpenClaw's trusted computing base for a gateway.
 - Reports where exploitability depends on attacker-controlled pre-existing symlink/hardlink filesystem state in trusted local paths (for example extraction/install target trees) unless a separate untrusted boundary bypass is shown that creates that state.
 - Reports whose only claim is sandbox/workspace read expansion through trusted local skill/workspace symlink state (for example `skills/*/SKILL.md` symlink chains) unless a separate untrusted boundary bypass is shown that creates/controls that state.
 - Reports whose only claim is post-approval executable identity drift on a trusted host via same-path file replacement/rewrite unless a separate untrusted boundary bypass is shown for that host write primitive.
-- Reports whose only claim is environment-variable-driven executable behavior change, including path lookup changes, preload hooks, wrapper/interpreter selection, package-manager/runtime hooks, or variables that make an executable invoke another executable, unless a separate OpenClaw boundary bypass lets untrusted input set or mutate that environment.
 - Reports where the only demonstrated impact is an already-authorized sender intentionally invoking a local-action command (for example `/export-session` writing to an absolute host path) without bypassing auth, sandbox, or another documented boundary
 - Reports whose only claim is use of an explicit trusted-operator control surface (for example `canvas.eval`, browser evaluate/script execution, or direct `node.invoke` execution) without demonstrating an auth, policy, allowlist, approval, or sandbox bypass.
 - Reports where the only claim is that a trusted-installed/enabled plugin can execute with gateway/host privileges (documented trust model behavior).
@@ -184,7 +181,6 @@ Plugins/extensions are part of OpenClaw's trusted computing base for a gateway.
 OpenClaw security guidance assumes:
 
 - The host where OpenClaw runs is within a trusted OS/admin boundary.
-- Anyone who can set or mutate the OpenClaw process environment, launcher environment, or child-process environment is inside that trusted host/operator boundary.
 - Anyone who can modify `~/.openclaw` state/config (including `openclaw.json`) is effectively a trusted operator.
 - A single Gateway shared by mutually untrusted people is **not a recommended setup**. Use separate gateways (or at minimum separate OS users/hosts) per trust boundary.
 - Authenticated Gateway callers are treated as trusted operators. Session identifiers (for example `sessionKey`) are routing controls, not per-user authorization boundaries.

appcast.xml

@@ -2,86 +2,6 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
     <channel>
         <title>OpenClaw</title>
-        <item>
-            <title>2026.6.5</title>
-            <pubDate>Tue, 09 Jun 2026 19:06:49 +0000</pubDate>
-            <link>https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml</link>
-            <sparkle:version>2606000590</sparkle:version>
-            <sparkle:shortVersionString>2026.6.5</sparkle:shortVersionString>
-            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
-            <description><![CDATA[<h2>OpenClaw 2026.6.5</h2>
-<h3>Highlights</h3>
-<ul>
-<li>QQBot now strips model reasoning/thinking scaffolding before native delivery, preventing raw <code><thinking></code> content from leaking into channel replies. (#89913, #90132) Thanks @openperf.</li>
-<li>MCP tool results now coerce <code>resource_link</code>, <code>resource</code>, <code>audio</code>, malformed image, and future non-text/image blocks at the materialize boundary, preventing Anthropic 400s and poisoned session history after a tool returns richer MCP content. (#90710, #90728) Thanks @RanSHammer and @849261680.</li>
-<li>Anthropic extended-thinking sessions recover after prompt-cache expiry or Gateway restart because stream start events wait for <code>message_start</code>, letting pre-generation signature errors trigger the existing recovery retry. (#90667, #90697) Thanks @openperf.</li>
-<li>Parallel is now a bundled <code>web_search</code> provider with <code>PARALLEL_API_KEY</code> discovery, guarded endpoint handling, cache-safe session ids, onboarding picker support, and docs. (#85158) Thanks @NormallyGaussian.</li>
-<li>Google Vertex ADC users get static catalog rows and runtime model resolution again, while single-provider cooldown recovery and memory adapter status checks are more reliable. (#90506, #90609, #90717, #90816) Thanks @849261680.</li>
-<li>Matrix can preflight voice notes before mention gating, preserve thread reads/replies through Matrix relations pagination, and carry QA coverage for voice and thread flows. (#78016, #90415)</li>
-<li>Auth and plugin install state is more durable: auth profiles now live in SQLite, official npm plugin install records keep their trusted pins, and prerelease fallback integrity checks avoid carrying stale integrity forward. (#89102, #88585)</li>
-<li>Agent, tool, and provider loops are stricter around MCP lease timestamps, prompt-cache tool names, local tool catalogs, unreadable dynamic tools, owner-only HTTP tools, and provider catalog metadata, reducing hidden retries and unsafe exposure. (#91124, #91233, #90022, #90261)</li>
-<li>macOS node mode no longer silently self-reconnects away from a healthy direct Gateway session, reducing unexpected companion app session churn. (#90668, #90815) Thanks @vrurg.</li>
-<li>Upgrade and service paths are safer: cron legacy JSON stores migrate during doctor preflight, service env placeholders no longer mask state-dir secrets, WhatsApp startup waits are bounded, and disabled WhatsApp accounts tear down on config reload. (#90072, #90208, #90277, #90488, #90486, #87951, #87965) Thanks @MonkeyLeeT, @sallyom, @mcaxtr, and @MukundaKatta.</li>
-</ul>
-<h3>Changes</h3>
-<ul>
-<li>Search/providers: add the Parallel bundled web-search plugin, live provider tests, registration contracts, onboarding/docs wiring, and guarded <code>api.parallel.ai/v1/search</code> support. (#85158) Thanks @NormallyGaussian.</li>
-<li>Matrix/channels: add voice-message preflight and thread-aware read/reply behavior, including Matrix QA scenario wiring and docs for voice-message behavior. (#78016, #90415)</li>
-<li>Skills/ClawHub: install ClawHub skills backed by GitHub repositories through the resolved install API, download the pinned GitHub commit, keep install-policy checks, and report install telemetry after success. (#90478) Thanks @Patrick-Erichsen.</li>
-<li>Skills/ClawHub: avoid one filesystem watcher per skill file during refresh, keeping large skill trees from exhausting watcher limits.</li>
-<li>Google Chat/channels: add native approval card actions and click handling so Google Chat approvals use platform-native cards instead of generic message flow.</li>
-<li>Mobile: Android provider/model screens now surface expiring, unavailable, unresolved, and attention states more clearly, Android adds theme mode selection, and iOS settings and Talk tabs keep diagnostics, gateway rows, attachment labels, fallback copy, and unavailable Talk controls reachable. (#90752, #91201)</li>
-<li>Memory: QMD search can use the new rerank toggle, and memory adapter status uses the resolved default model identity when checking plain status. (#61834)</li>
-<li>Docs/tooling: add Parallel search docs, refresh weather-skill guidance toward <code>web_fetch</code>, clarify legacy <code>openai-codex</code> auth, document release/test helper scripts, and tighten changed-test routing docs for CI/debugging work. (#90028, #90250) Thanks @fuller-stack-dev.</li>
-<li>Release/process: switch release trains to <code>YYYY.M.PATCH</code> monthly patch numbering, keep pre-transition tags compatible, and pin the June 2026 floor at <code>2026.6.5</code>.</li>
-<li>Release/process: defer the session-metadata SQLite migration from the <code>2026.6.5</code> beta train so this release keeps the existing JSON-backed session metadata path while the migration risk is worked on <code>main</code>.</li>
-<li>Release metadata: align OpenClaw, publishable plugin manifests, generated shrinkwraps, app version metadata, iOS release notes, Matrix plugin changelog, and generated release baselines with the <code>2026.6.5</code> release train.</li>
-<li>Platform maintenance: refresh Android, Swift/macOS, Docker, CodeQL, Buildx, Docker build/push, and Codex Action dependencies for this release train. (#74980, #81757, #86481, #86483, #90601)</li>
-</ul>
-<h3>Fixes</h3>
-<ul>
-<li>Channel content boundaries: QQBot now strips reasoning/thinking tags before sending, preserving final answers while hiding internal model narration from users. (#89913, #90132) Thanks @openperf.</li>
-<li>Agents/MCP/providers: coerce non-text/image MCP tool-result blocks before they reach provider converters, preserving valid images and turning richer MCP content into text instead of malformed image blocks. (#90710, #90728) Thanks @RanSHammer and @849261680.</li>
-<li>Anthropic/Codex/ACP/agent recovery: defer Anthropic stream start events until <code>message_start</code>, strip stale compaction thinking signatures before Anthropic replay, detect unsigned thinking-only stalls, refresh prompt fences after compaction writes, reject empty completion handoffs, preserve parent streaming-off overrides/shared progress commentary, forward heartbeat metadata to context-engine hooks, and cover Codex session/thread migration edge cases. (#90667, #90697, #90163, #90108, #89874, #89505, #90632, #89302, #90729, #90317, #90319) Thanks @openperf, @100yenadmin, and @ooiuuii.</li>
-<li>Agents/Codex/tools: MCP lease release no longer refreshes <code>lastUsedAt</code>, prompt-cache tool names are guarded, lean local tool catalogs stay compact, unreadable dynamic tools are quarantined, orphan tool errors still surface, native subagent completion results survive app-server monitoring, and background-session name derivation avoids regex backtracking risk. (#91124, #90612, #90022, #91235, #91233)</li>
-<li>Provider/model resolution: preserve Google Vertex ADC auth markers in generated catalogs, re-probe a single-provider primary after cooldown, share Codex model visibility, fail closed for unknown model auth, preserve Codex alias availability, keep unresolved profile refs unknown, and avoid resolving auth while listing models. (#90506, #90609, #90717, #90702) Thanks @849261680.</li>
-<li>Provider/model resolution: live provider model catalogs keep helper coverage, Ollama catalog metadata is preserved, Google provider prefixes are stripped from Gemini paths, Foundry Responses reasoning replay ids survive, MiniMax M3 thinking stays enabled, Vertex multi-region calls use the right regional host, and OpenRouter streamed generation cost is reconciled. (#91125)</li>
-<li>Gateway/macOS/mobile: avoid duplicate Gateway probe warnings by identity, rate-limit node pairing requests while preserving paired-node reconnects, keep macOS node mode on a healthy direct Gateway session, keep iOS diagnostics and gateway rows reachable, and avoid Linux ARM Gradle resource tasks during Android builds. (#85791, #90147, #90668, #90815) Thanks @giodl73-repo and @vrurg.</li>
-<li>Gateway/security/config: owner-only HTTP tools are gated, sandbox skills remain readable in writable sandboxes, legacy agent registry and Codex model metadata migrate safely, and stalled MCP response bodies time out instead of tying up Gateway workers. (#90261)</li>
-<li>Gateway/config: <code>config.patch</code> now preserves explicit array replacement semantics for arrays without merge keys, so replacement patches do not accidentally merge stale entries. (#91551)</li>
-<li>SDK: event pump failures now surface to clients instead of being swallowed behind a quiet iterator shutdown.</li>
-<li>Agents/transcripts: inline image payload redaction now catches data URLs and repaired transcript images before they can leak raw image bytes into stored or exported transcripts. (#91529)</li>
-<li>Plugins/Gateway: legacy flat Control UI descriptors from shipped JavaScript plugins now normalize <code>name</code> and missing surface fields into session descriptors, restoring Kitchen Sink RPC descriptor proof for package-backed plugin validation.</li>
-<li>TUI/chat/Workboard/auto-reply: optimistic user messages stay stable across stale history reloads, runId reassignment, and abort windows instead of disappearing, jumping, or lingering as ghost rows; Workboard stale lifecycle bulk updates no longer overwrite newer status/provenance; message-tool sends now count as delivery. (#86205, #89600, #88592, #90123) Thanks @RomneyDa.</li>
-<li>Cron/update/service env: doctor config preflight now migrates legacy cron JSON stores into SQLite before runtime reads, isolated agent turn payload messages preserve timeout context, service env planning skips unresolved placeholders that would mask state-dir <code>.env</code> values, and session transcript rewrites keep registry markers/discriminants consistent. (#90072, #90208, #91230, #90277, #90488) Thanks @MonkeyLeeT and @sallyom.</li>
-<li>State/storage: Matrix sync and crypto sidecars, memory-wiki import/source-sync state, sandbox registry state, ACPX process state, device-pair notify state, Zalo hosted media, and plugin SDK dedupe state now use SQLite-owned storage instead of ad hoc runtime files. (#91100, #91108, #91056)</li>
-<li>Security/config/tooling: guard MCP HTTP redirects, protect global agent config defaults, and keep release/test/tooling proof failures bounded and explicit. (#89732, #90145)</li>
-<li>Channels: WhatsApp restarts when per-account config changes, bounds background startup waits, closes failed sockets, and preserves reconnect behavior; Mattermost slash commands keep their state on <code>globalThis</code> and default replies stay inside existing Mattermost threads instead of starting new ones; Feishu streaming cards preserve full merged content; iMessage private-API failures and send timeouts explain themselves while split-send coalescing honors balloon metadata; voice-call tracks Twilio streams after connect; ClickClack reply tools respect <code>toolsAllow</code>; Discord runtime adapters stay resolvable; and outbound delivery retries survive budget deferrals. (#87951, #87965, #90486, #68113, #90534, #90181, #90607, #89500, #91041, #90858, #91119, #91241) Thanks @MukundaKatta, @mcaxtr, @infoanton, @mushuiyu886, @sahibzada-allahyar, and @jacobtomlinson.</li>
-<li>Feishu: retry transient send rate-limit errors (HTTP 429, per-chat code 230020, tenant-level code 11232) with linear backoff, including SDK responses that fulfill with rate-limit bodies instead of throwing, and route streaming-card sends through the retry wrapper. (#89659) Thanks @ladygege.</li>
-<li>WhatsApp: captured replies after restart now route through the successor controller instead of the stale pre-restart controller. (#85823)</li>
-<li>Release/CI/E2E: main CI guard drift, PR merge diff scoping, live Docker credential staging, base-image qualification, installer Docker classification, Playwright dependency install recovery, API-key auth for Codex live Docker lanes, Parallels option terminators, and JSON-mode progress handling are tighter so release proof fails cleaner. (#90532, #90287, #90058) Thanks @RomneyDa, @hxy91819, and @mrunalp.</li>
-<li>Release/CI/E2E: installed-package root dist verification now allows the current package's JavaScript file count while keeping dependency, per-file-size, and scan-bound checks active.</li>
-<li>Release/CI/E2E: Chutes OAuth model-discovery proof now accepts standard <code>Headers</code> requests, and QR package install smoke caps Docker CPU requests to the hosted runner capacity so beta validation fails on real package regressions.</li>
-<li>Release/CI/E2E: Docker E2E and live Docker harness runs now apply default memory, CPU, and process ceilings while preserving explicit per-lane overrides.</li>
-<li>Release/CI/E2E: Docker E2E CPU limits now cap to the runner capacity, keeping package Telegram acceptance on hosted 8-vCPU runners focused on package regressions instead of impossible Docker resource requests.</li>
-<li>Release/CI/E2E: task maintenance release checks now reset pinned config around isolated temp state dirs, keeping normal CI focused on the active session-store fixture instead of stale process snapshots.</li>
-<li>Release/CI/E2E: plugin lifecycle matrix resource sampling now fails phases that exceed RSS, wall-clock, or CPU ceilings instead of only logging the measurements.</li>
-<li>Release/CI/E2E: Codex npm plugin live assertions now cap transcript discovery and diagnostic log reads so failure proof stays bounded.</li>
-<li>Release/CI/E2E: browser snapshot, release-scenario, release-user-journey, Telegram desktop/RTT/package, web-search, Parallels update, plugin update, doctor switch, and upgrade-survivor diagnostics now stream or bound log/artifact reads so failed proof stays inspectable without unbounded output.</li>
-<li>Release/CI/E2E: Parallels smoke validation now runs without requiring <code>pnpm</code> on the host, supports already-started Windows/Linux guests without snapshots, reports empty snapshot metadata clearly, and finds portable user-local Node on Windows.</li>
-<li>Release/CI/E2E: ClawHub publish jobs prepare dependencies after checking out the target ref, and Docker store seed package discovery now targets the intended production packages. (#91547)</li>
-<li>Release/CI/E2E: QA Lab capability-flip release validation now marks intentional <code>tools.deny</code> restores as array replacements, so beta validation fails only on real capability regressions.</li>
-<li>Tests/state isolation: QA Lab valid-tool-call metrics now require runtime tool-call evidence when runtime parity data is available instead of counting tool-backed scenario pass status alone.</li>
-<li>Tests/state isolation: QA Lab runtime parity now fails planned-only tool-call rows without matching tool results instead of treating matching mock plans as real tool evidence.</li>
-<li>Tests/state isolation: QA Lab runtime parity now treats matching controlled tool errors as equivalent and falls back to transcript tool results when mock debug rows miss async image-generation starts.</li>
-<li>Tests/state isolation: QA suites now fail closed on skipped summaries, missing runtime tool proof, planned-only rows, loose release limits, missing live/provider artifacts, failed agent reply markers, and package Telegram summary failures.</li>
-<li>Tests/state isolation: provider, media, auth, cron, task, session, sandbox, Gateway, and Codex timeout fixtures now scope more home/state/env data per test, reducing cross-test leakage and making release validation failures less noisy. (#90027, #89974)</li>
-<li>Sessions: the beta SQLite downgrade rescue now skips extra pre-reads for active non-empty JSON session stores, preserving cache race detection while still restoring missing or empty beta session files.</li>
-</ul>
-<p><a href="https://github.com/openclaw/openclaw/blob/main/CHANGELOG.md">View full changelog</a></p>
-]]></description>
-            <enclosure url="https://github.com/openclaw/openclaw/releases/download/v2026.6.5/OpenClaw-2026.6.5.zip" length="55725877" type="application/octet-stream" sparkle:edSignature="EKr7gCfpEVStis9HSADJk1CWYbmH2MHMqSgNfZvLbBFCBWmk3pjBJS6K2qkxkq5lIbTj4H+Lo7Iri6ip/xTGDA=="/>
-        </item>
         <item>
             <title>2026.6.1</title>
             <pubDate>Wed, 03 Jun 2026 21:26:22 +0000</pubDate>
@@ -273,5 +193,52 @@
 ]]></description>
             <enclosure url="https://github.com/openclaw/openclaw/releases/download/v2026.5.28/OpenClaw-2026.5.28.zip" length="54750142" type="application/octet-stream" sparkle:edSignature="U4O55uMdPU+OqSx9QR1ApUJ8wg65wxTydzD7iyCn1GHtm1MBK9noEeiA/yoUKkqb/bx0hzi1gNhn+ye19RXnCA=="/>
         </item>
+        <item>
+            <title>2026.5.27</title>
+            <pubDate>Thu, 28 May 2026 12:12:19 +0000</pubDate>
+            <link>https://raw.githubusercontent.com/openclaw/openclaw/main/appcast.xml</link>
+            <sparkle:version>2026052790</sparkle:version>
+            <sparkle:shortVersionString>2026.5.27</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+            <description><![CDATA[<h2>OpenClaw 2026.5.27</h2>
+<h3>Highlights</h3>
+<ul>
+<li>Stronger security and content boundaries: group prompt text is kept out of the system prompt, repeated-dot hostnames are normalized, side-effecting command wrappers and unsafe Node runtime env overrides are blocked, no-auth Tailscale exposure is rejected, and node/device-role approvals now require admin authority. (#87144, #87305, #87292, #87308, #87146) Thanks @eleqtrizit and @pgondhi987.</li>
+<li>More reliable Codex app-server runs: Codex runtime models resolve first, workspace memory is routed through tools, shared app-server clients survive startup and spawned-helper failures, native hook relay generations survive restarts and rotate on fresh fallbacks, and false runtime live switches are avoided. (#87383, #87403, #87375, #72574, #87428) Thanks @yetval.</li>
+<li>Faster Gateway and reply paths: session reads, plugin metadata fingerprints, auth env snapshots, auto-enabled plugin config, tool-search catalogs, and stable metadata caches do less hot-path rediscovery while visible replies no longer inherit hidden cleanup timeouts. (#86439, #87044) Thanks @keshavbotagent.</li>
+<li>Better provider and model coverage: OpenAI-compatible embedding providers are core, DeepInfra catalog browsing loads the full credential-aware model set, Pixverse adds video generation and API region selection, VLLM thinking params are wired, Claude CLI OAuth overlays load for PI auth profiles, and bare direct Anthropic model ids work. (#85269, #84549, #87167) Thanks @dutifulbob, @ats3v, and @joshavant.</li>
+<li>Channel delivery is steadier: Telegram <code>sendMessage</code> actions use durable outbound delivery, iMessage suppresses duplicate native exec approval prompts and sends, Slack keeps delivered final replies during late cleanup, Matrix mention previews/finals are stricter, QQBot fallback approval buttons honor slash-command auth, Discord guild requester checks are tighter, recovered Discord tool-warning artifacts stay out of successful replies, and Google Chat stops thread sends in DMs. (#87261, #87154) Thanks @mbelinky and @eleqtrizit.</li>
+<li>Release, package, and CI proof paths are harder to wedge: npm/package inventory honors dist exclusions, shrinkwrap override pins merge correctly, Docker runtime workspace templates are packaged and smoked, release postpublish checks are stricter, beta smoke rejects empty runs, and E2E log/probe waits are bounded.</li>
+</ul>
+<h3>Changes</h3>
+<ul>
+<li>Memory: add a core OpenAI-compatible embedding provider for local and hosted OpenAI-style endpoints, with config, doctor, and docs support. (#85269) Thanks @dutifulbob.</li>
+<li>Plugin SDK: mark memory-specific embedding provider registration as deprecated compatibility and surface non-bundled usage in plugin compatibility diagnostics. (#85072) Thanks @mbelinky.</li>
+<li>Providers: add the Pixverse video generation provider, API region selection, docs, and external plugin packaging support.</li>
+<li>DeepInfra: load the full model catalog when users browse models during onboarding, preserve configured API-key catalogs, refresh media/video defaults, and keep pricing/default model metadata aligned. (#84549) Thanks @ats3v.</li>
+<li>Plugin SDK: expose plugin approval action metadata and stop exporting Vitest test helpers from the public SDK surface. (#87120) Thanks @RomneyDa.</li>
+<li>Channel SDK: move channel message compatibility into core, remove old channel turn runtime aliases, and preserve runtime catalog markdown metadata for plugins.</li>
+<li>ClawHub: add plugin display metadata so catalog/package listings use cleaner names. (#87354) Thanks @thewilloftheshadow.</li>
+<li>Agents: split the heartbeat runtime template out of docs assets and add compatibility repair for legacy heartbeat template content. (#85416) Thanks @hxy91819.</li>
+</ul>
+<h3>Fixes</h3>
+<ul>
+<li>Security/content boundaries: route untrusted group prompt metadata outside system prompts, normalize repeated trailing hostname dots, block side-effecting command wrappers, reject unsafe Node runtime env overrides, reject no-auth Tailscale exposure, block untrusted Microsoft Teams service URLs, enforce <code>/allowlist configWrites</code> origin policy, gate QQBot fallback approval buttons, and require admin for node/device-role approvals. (#87144, #87305, #87292, #87308, #87146, #87154, #87334) Thanks @eleqtrizit and @pgondhi987.</li>
+<li>Codex: resolve Codex runtime models before generic routing, route workspace memory through tools, preserve shared app-server clients after startup and spawned-helper failures, preserve native hook relay generations across restarts and fresh fallbacks, keep raw reasoning/source-reply guards intact, report quarantined dynamic tools, keep the attempt watchdog armed for queued terminal turns, and route Codex OAuth compaction through OpenAI-Codex. (#87383, #87403, #87375, #72574, #87428) Thanks @yetval.</li>
+<li>Agents/runtime: avoid session event queue self-waits, bound compaction wake and steering retries, preserve grace for pending error diagnostics, avoid false Codex runtime live switches, avoid stale restart continuation reuse, preserve session fallback errors, suppress duplicate Claude CLI skill prompts, keep runtime context before active user turns, strip stale Anthropic thinking, quarantine unsupported tool schemas, recover completed write timeouts safely, release retained session write locks on timeout abort, and validate forced plugin harness support before pinning. (#86123, #55424, #86855, #74341, #87278) Thanks @luoyanglang, @cathrynlavery, and @openperf.</li>
+<li>Reply/session delivery: keep visible turn admission unbounded, keep visible fallback delivery on latest targets, preserve bridge hook context, classify direct fallback targets by channel grammar, report approval resolutions in bridge mode, and avoid stale source-reply artifacts. (#87044) Thanks @keshavbotagent.</li>
+<li>Channels: make Telegram <code>sendMessage</code> action replies durable and preserve SecretRef prompt config, suppress duplicate iMessage native exec approval prompts and sends, keep iMessage approval polling alive after denied reactions, keep Slack delivered final replies during late cleanup, keep Matrix mention previews/finals mention-inert and normally delivered, ignore filename-embedded Matrix IDs, suppress recovered Discord tool-warning artifacts from successful replies, suppress Google Chat thread sends in DMs, and harden Discord guild requester checks. (#87261, #87452) Thanks @mbelinky.</li>
+<li>Memory: salvage QMD search JSON after nonzero exits and keep workspace memory routing through the Codex tool path where possible. (#87225, #87383, #87403) Thanks @osolmaz.</li>
+<li>Providers/models: forward cached token usage in OpenAI-compatible chat completions, load Claude CLI OAuth overlays for PI auth profiles, send bare direct Anthropic model ids, wire configured VLLM thinking params, honor OpenAI-compatible cache retention, normalize OpenAI Responses replay tool ids, resolve OpenAI <code>gpt-5.5</code> without a cached catalog, preserve <code>retry-after</code> fallback handling, bound GitHub Copilot auth requests, and load DeepInfra custom/live catalogs consistently. (#82062, #87167, #84549) Thanks @caz0075, @joshavant, and @ats3v.</li>
+<li>Gateway/performance: borrow read-only session metadata and active session working stores, cache current/stable plugin metadata fingerprints, cache auto-enabled plugin config, slim metadata identity caches, trust current metadata lifecycle caches, stabilize isolated cron prompt-cache affinity, persist model auth profile suffixes, drain probe client closes, expire browser tokens after auth rotation, and keep default status fast paths bounded. Thanks @ferminquant.</li>
+<li>CLI/help/config: reject loose or malformed numeric options for gateway timeouts, model limits, directory limits, message options, webhooks, and partial values; respect subcommand version options; route generated/root/plugin help targets correctly; keep skills JSON output flushing naturally; and keep plugin descriptor loading quiet in root help. (#87398) Thanks @Patrick-Erichsen.</li>
+<li>Plugin state/tool search: evict the current namespace when plugin rows hit caps, reuse unchanged tool-search catalogs, align the release catalog reuse wrapper, and keep fallback tool warnings mention-inert.</li>
+<li>Install/package/release: match npm globstar exclusions, honor dist package exclusions in inventory, omit unpacked test helpers, skip Homebrew until macOS packages need it, package Docker runtime workspace templates, smoke Docker runtime templates during full validation, merge nested shrinkwrap override pins, preserve forked shrinkwrap pins, pin aged <code>lru-cache</code>, harden postpublish verification, accept main full-validation proof, and reject empty beta smoke runs.</li>
+<li>E2E/QA/Crabbox: bound Telegram, Open WebUI, ClawHub, Matrix, Tool Search, MCP, gateway network, bundled runtime, kitchen-sink, codex media, config reload, and agent-turn assertion waits; prefer Azure for Windows targets; reinitialize invalid changed-gate git dirs; full-sync sparse container runs; and fail empty explicit test requests. (#87186)</li>
+</ul>
+<p><a href="https://github.com/openclaw/openclaw/blob/main/CHANGELOG.md">View full changelog</a></p>
+]]></description>
+            <enclosure url="https://github.com/openclaw/openclaw/releases/download/v2026.5.27/OpenClaw-2026.5.27.zip" length="54488811" type="application/octet-stream" sparkle:edSignature="c5w2T1UO6vpPs70hyYH93cIyWEOd5sl5z2NkhU53E+XQBSd+jAr+xd0qf3KzWbeX2mfXYMQmnx+VMls3L22EDg=="/>
+        </item>
     </channel>
 </rss>

apps/android/app/build.gradle.kts

@@ -41,7 +41,7 @@ plugins {
 
 android {
   namespace = "ai.openclaw.app"
-  compileSdk = 37
+  compileSdk = 36
 
   // Release signing is local-only; keep the keystore path and passwords out of the repo.
   signingConfigs {

apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewayDiscovery.kt

@@ -49,19 +49,6 @@ import java.util.concurrent.Executors
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
-private fun createDnsResolver(context: Context): DnsResolver =
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CINNAMON_BUN) {
-    createContextDnsResolver(context)
-  } else {
-    createLegacyDnsResolver()
-  }
-
-@TargetApi(Build.VERSION_CODES.CINNAMON_BUN)
-private fun createContextDnsResolver(context: Context): DnsResolver = DnsResolver(context, null)
-
-@Suppress("DEPRECATION")
-private fun createLegacyDnsResolver(): DnsResolver = DnsResolver.getInstance()
-
 /**
  * Watches local DNS-SD and optional wide-area DNS-SD for reachable OpenClaw gateways.
  */
@@ -71,7 +58,7 @@ class GatewayDiscovery(
 ) {
   private val nsd = context.getSystemService(NsdManager::class.java)
   private val connectivity = context.getSystemService(ConnectivityManager::class.java)
-  private val dns = createDnsResolver(context)
+  private val dns = DnsResolver.getInstance()
   private val serviceType = "_openclaw-gw._tcp."
   private val wideAreaDomain = System.getenv("OPENCLAW_WIDE_AREA_DOMAIN")
   private val logTag = "OpenClaw/GatewayDiscovery"

apps/android/benchmark/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 android {
   namespace = "ai.openclaw.app.benchmark"
-  compileSdk = 37
+  compileSdk = 36
 
   defaultConfig {
     minSdk = 31

apps/android/gradle/libs.versions.toml

@@ -4,7 +4,7 @@ androidx-activity = "1.13.0"
 androidx-benchmark = "1.4.1"
 androidx-camera = "1.6.0"
 androidx-compose-bom = "2026.05.01"
-androidx-core = "1.19.0"
+androidx-core = "1.18.0"
 androidx-exifinterface = "1.4.2"
 androidx-lifecycle = "2.10.0"
 androidx-security = "1.1.0"
@@ -19,7 +19,7 @@ junit = "4.13.2"
 junit-vintage = "6.1.0"
 kotest = "6.1.11"
 ktlint-gradle = "14.2.0"
-kotlin = "2.4.0"
+kotlin = "2.3.21"
 material = "1.14.0"
 okhttp = "5.3.2"
 play-services-code-scanner = "16.1.0"

apps/ios/Sources/Design/AgentProDreamingDestination.swift

@@ -4,7 +4,6 @@ import SwiftUI
 
 struct AgentProDreamingDestination: View {
     @Environment(NodeAppModel.self) private var appModel
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
     let overview: AgentOverviewSnapshot?
     let gatewayConnected: Bool
     let overviewLoading: Bool
@@ -21,7 +20,6 @@ struct AgentProDreamingDestination: View {
             OpenClawProBackground()
             ScrollView {
                 VStack(alignment: .leading, spacing: 16) {
-                    self.header
                     self.detailSummaryCard(
                         icon: "moon",
                         title: "Dreaming",
@@ -59,23 +57,6 @@ struct AgentProDreamingDestination: View {
         .navigationBarTitleDisplayMode(.inline)
     }
 
-    @ViewBuilder
-    private var header: some View {
-        if let headerLeadingAction {
-            OpenClawAdaptiveHeaderRow(
-                title: "Dreaming",
-                subtitle: self.dreamingDetail,
-                titleFont: .title3.weight(.semibold),
-                subtitleFont: .callout)
-            {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            } accessory: {
-                EmptyView()
-            }
-            .padding(.horizontal, OpenClawProMetric.pagePadding)
-        }
-    }
-
     private enum DreamAction: String, CaseIterable, Identifiable {
         case backfill
         case repair

apps/ios/Sources/Design/AgentProModels.swift

@@ -329,13 +329,6 @@ struct AgentConfigLite: Decodable {
 struct ConfigPatchParams: Encodable {
     let raw: String
     let baseHash: String
-    let replacePaths: [String]?
-
-    init(raw: String, baseHash: String, replacePaths: [String]? = nil) {
-        self.raw = raw
-        self.baseHash = baseHash
-        self.replacePaths = replacePaths
-    }
 }
 
 enum SkillMutationError: LocalizedError {

apps/ios/Sources/Design/AgentProNodesDestination.swift

@@ -3,7 +3,6 @@ import SwiftUI
 import UIKit
 
 struct AgentProNodesDestination: View {
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
     let overview: AgentOverviewSnapshot?
     let gatewayConnected: Bool
     let agentCount: Int
@@ -17,7 +16,6 @@ struct AgentProNodesDestination: View {
             OpenClawProBackground()
             ScrollView {
                 VStack(alignment: .leading, spacing: 16) {
-                    self.header
                     self.summaryCard
                     self.totalsCard
                     self.nodesList
@@ -29,33 +27,16 @@ struct AgentProNodesDestination: View {
             }
             .safeAreaPadding(.bottom, OpenClawProMetric.bottomScrollInset)
         }
-        .navigationTitle("Instances")
+        .navigationTitle("Nodes")
         .navigationBarTitleDisplayMode(.inline)
     }
 
-    @ViewBuilder
-    private var header: some View {
-        if let headerLeadingAction {
-            OpenClawAdaptiveHeaderRow(
-                title: "Instances",
-                subtitle: self.instancesDetail,
-                titleFont: .title3.weight(.semibold),
-                subtitleFont: .callout)
-            {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            } accessory: {
-                EmptyView()
-            }
-            .padding(.horizontal, OpenClawProMetric.pagePadding)
-        }
-    }
-
     private var summaryCard: some View {
         ProCard {
             HStack(spacing: 12) {
                 ProIconBadge(systemName: "display", color: self.instancesColor)
                 VStack(alignment: .leading, spacing: 3) {
-                    Text("Instances")
+                    Text("Nodes")
                         .font(.headline)
                     Text(self.instancesDetail)
                         .font(.caption)
@@ -89,16 +70,16 @@ struct AgentProNodesDestination: View {
 
     private var nodesList: some View {
         VStack(alignment: .leading, spacing: 8) {
-            ProSectionHeader(title: "Connected Instances")
+            ProSectionHeader(title: "Connected Nodes")
             ProCard(padding: 0) {
                 let nodes = self.sortedPresenceEntries
                 if nodes.isEmpty {
                     self.emptyRow(
                         icon: "display",
-                        title: self.gatewayConnected ? "No instances connected" : "Instances unavailable",
+                        title: self.gatewayConnected ? "No nodes connected" : "Nodes unavailable",
                         detail: self.gatewayConnected
                             ? "The gateway did not report any system presence entries."
-                            : "Connect a gateway to inspect connected instances.")
+                            : "Connect a gateway to inspect connected nodes.")
                         .padding(14)
                 } else {
                     VStack(spacing: 0) {
@@ -133,7 +114,7 @@ struct AgentProNodesDestination: View {
         HStack(alignment: .top, spacing: 12) {
             ProIconBadge(systemName: Self.presenceIcon(entry), color: Self.presenceColor(entry))
             VStack(alignment: .leading, spacing: 4) {
-                Text(Self.presenceLabel(entry) ?? "Instance")
+                Text(Self.presenceLabel(entry) ?? "Node")
                     .font(.subheadline.weight(.semibold))
                     .lineLimit(1)
                 Text(Self.presenceDetail(entry))
@@ -172,7 +153,7 @@ struct AgentProNodesDestination: View {
                         HStack(spacing: 12) {
                             ProIconBadge(systemName: Self.presenceIcon(entry), color: Self.presenceColor(entry))
                             VStack(alignment: .leading, spacing: 3) {
-                                Text(Self.presenceLabel(entry) ?? "Instance")
+                                Text(Self.presenceLabel(entry) ?? "Node")
                                     .font(.headline)
                                 Text(Self.presenceDetail(entry))
                                     .font(.caption)
@@ -211,7 +192,7 @@ struct AgentProNodesDestination: View {
             }
             .safeAreaPadding(.bottom, OpenClawProMetric.bottomScrollInset)
         }
-        .navigationTitle(Self.presenceLabel(entry) ?? "Instance")
+        .navigationTitle(Self.presenceLabel(entry) ?? "Node")
         .navigationBarTitleDisplayMode(.inline)
     }
 

apps/ios/Sources/Design/AgentProTab+Destinations.swift

@@ -6,12 +6,10 @@ extension AgentProTab {
     @ViewBuilder
     func destination(for route: AgentRoute) -> some View {
         switch route {
-        case .agents:
-            self.agentsDestination
         case .skills:
             self.skillsDestination
-        case .instances:
-            self.instancesDestination
+        case .nodes:
+            self.nodesDestination
         case .cron:
             self.cronDestination
         case .usage:
@@ -21,26 +19,6 @@ extension AgentProTab {
         }
     }
 
-    var agentsDestination: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 16) {
-                    self.rosterHeader
-                    self.agentFilters
-                    self.agentsSection
-                }
-                .padding(.vertical, 18)
-            }
-            .refreshable {
-                await self.refreshOverview(force: true)
-            }
-            .safeAreaPadding(.bottom, OpenClawProMetric.bottomScrollInset)
-        }
-        .navigationTitle("Agents")
-        .navigationBarTitleDisplayMode(.inline)
-    }
-
     var skillsDestination: some View {
         ZStack {
             OpenClawProBackground()
@@ -68,9 +46,8 @@ extension AgentProTab {
         .navigationBarTitleDisplayMode(.inline)
     }
 
-    var instancesDestination: some View {
+    var nodesDestination: some View {
         AgentProNodesDestination(
-            headerLeadingAction: self.directHeaderLeadingAction(for: .instances),
             overview: self.overview,
             gatewayConnected: self.gatewayConnected,
             agentCount: self.appModel.gatewayAgents.count,
@@ -87,10 +64,6 @@ extension AgentProTab {
             OpenClawProBackground()
             ScrollView {
                 VStack(alignment: .leading, spacing: 16) {
-                    self.directHeader(
-                        for: .cron,
-                        title: "Cron Jobs",
-                        subtitle: self.cronDetail)
                     self.detailSummaryCard(
                         icon: "clock.arrow.circlepath",
                         title: "Cron Jobs",
@@ -116,10 +89,6 @@ extension AgentProTab {
             OpenClawProBackground()
             ScrollView {
                 VStack(alignment: .leading, spacing: 16) {
-                    self.directHeader(
-                        for: .usage,
-                        title: "Usage",
-                        subtitle: self.usageDetail)
                     self.detailSummaryCard(
                         icon: "chart.line.uptrend.xyaxis",
                         title: "Usage",
@@ -142,7 +111,6 @@ extension AgentProTab {
 
     var dreamingDestination: some View {
         AgentProDreamingDestination(
-            headerLeadingAction: self.directHeaderLeadingAction(for: .dreaming),
             overview: self.overview,
             gatewayConnected: self.gatewayConnected,
             overviewLoading: self.overviewLoading,
@@ -154,27 +122,6 @@ extension AgentProTab {
             })
     }
 
-    @ViewBuilder
-    func directHeader(for route: AgentRoute, title: String, subtitle: String) -> some View {
-        if let headerLeadingAction = self.directHeaderLeadingAction(for: route) {
-            OpenClawAdaptiveHeaderRow(
-                title: title,
-                subtitle: subtitle,
-                titleFont: .title3.weight(.semibold),
-                subtitleFont: .callout)
-            {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            } accessory: {
-                EmptyView()
-            }
-            .padding(.horizontal, OpenClawProMetric.pagePadding)
-        }
-    }
-
-    func directHeaderLeadingAction(for route: AgentRoute) -> OpenClawSidebarHeaderAction? {
-        self.directRoute == route ? self.headerLeadingAction : nil
-    }
-
     func detailSummaryCard(
         icon: String,
         title: String,

apps/ios/Sources/Design/AgentProTab+Overview.swift

@@ -5,19 +5,18 @@ import SwiftUI
 extension AgentProTab {
     var rosterHeader: some View {
         VStack(alignment: .leading, spacing: 10) {
-            OpenClawAdaptiveHeaderRow(
-                title: self.headerTitle,
-                subtitle: "\(self.sortedAgents.count) total",
-                titleFont: .system(size: 28, weight: .bold),
-                subtitleFont: .subheadline,
-                subtitleLineLimit: 1)
-            {
-                if let headerLeadingAction {
-                    OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
+            HStack(alignment: .top, spacing: 12) {
+                VStack(alignment: .leading, spacing: 3) {
+                    Text("Agents")
+                        .font(.system(size: 28, weight: .bold))
+                    Text("\(self.sortedAgents.count) total")
+                        .font(.subheadline)
+                        .foregroundStyle(.secondary)
                 }
-            } accessory: {
+
+                Spacer(minLength: 8)
+
                 HStack(spacing: 10) {
-                    self.gatewayPillButton
                     self.headerIconButton(
                         systemName: "magnifyingglass",
                         label: "Search agents",
@@ -57,19 +56,6 @@ extension AgentProTab {
         .padding(.top, 6)
     }
 
-    @ViewBuilder
-    private var gatewayPillButton: some View {
-        if let openSettings {
-            Button(action: openSettings) {
-                OpenClawGatewayCompactPill()
-            }
-            .buttonStyle(.plain)
-            .accessibilityHint("Opens Settings / Gateway")
-        } else {
-            OpenClawGatewayCompactPill()
-        }
-    }
-
     var agentFilters: some View {
         ScrollView(.horizontal, showsIndicators: false) {
             HStack(spacing: 8) {
@@ -154,7 +140,7 @@ extension AgentProTab {
                     value: self.instancesValue,
                     detail: self.instancesDetail,
                     color: self.instancesColor,
-                    route: .instances)
+                    route: .nodes)
                 self.metricTile(
                     icon: "clock.arrow.circlepath",
                     title: "Cron",

apps/ios/Sources/Design/AgentProTab+Skills.swift

@@ -621,10 +621,7 @@ extension AgentProTab {
             }
 
             let raw = try Self.agentSkillsPatchRaw(agentId: self.activeAgentID, skills: skills)
-            let params = ConfigPatchParams(
-                raw: raw,
-                baseHash: baseHash,
-                replacePaths: ["agents.list[].skills"])
+            let params = ConfigPatchParams(raw: raw, baseHash: baseHash)
             let data = try JSONEncoder().encode(params)
             guard let json = String(data: data, encoding: .utf8) else {
                 throw SkillMutationError.invalidPatchPayload

apps/ios/Sources/Design/AgentProTab.swift

@@ -6,12 +6,6 @@ struct AgentProTab: View {
     @Environment(NodeAppModel.self) var appModel
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.scenePhase) var scenePhase
-    let initialRoute: AgentRoute?
-    let directRoute: AgentRoute?
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-    let headerTitle: String
-    let openSettings: (() -> Void)?
-    @State var navigationPath: [AgentRoute] = []
     @State var overview: AgentOverviewSnapshot?
     @State var overviewErrorText: String?
     @State var overviewLoading: Bool = false
@@ -37,9 +31,8 @@ struct AgentProTab: View {
     @State var cronActionStatusText: String?
 
     enum AgentRoute: Hashable {
-        case agents
         case skills
-        case instances
+        case nodes
         case cron
         case usage
         case dreaming
@@ -126,42 +119,8 @@ struct AgentProTab: View {
         }
     }
 
-    init(
-        initialRoute: AgentRoute? = nil,
-        directRoute: AgentRoute? = nil,
-        headerLeadingAction: OpenClawSidebarHeaderAction? = nil,
-        headerTitle: String = "Agents",
-        openSettings: (() -> Void)? = nil)
-    {
-        self.initialRoute = initialRoute
-        self.directRoute = directRoute
-        self.headerLeadingAction = headerLeadingAction
-        self.headerTitle = headerTitle
-        self.openSettings = openSettings
-    }
-
     var body: some View {
-        Group {
-            if let directRoute {
-                self.directDestination(for: directRoute)
-            } else {
-                self.overviewNavigation
-            }
-        }
-        .task(id: self.overviewTaskID) {
-            await self.refreshOverview(force: false)
-        }
-        .sheet(item: self.$skillEditorSelection) { selection in
-            if let skill = self.skillByKey(selection.id) {
-                self.skillEditorSheet(skill)
-            } else {
-                self.missingSkillEditorSheet
-            }
-        }
-    }
-
-    private var overviewNavigation: some View {
-        NavigationStack(path: self.$navigationPath) {
+        NavigationStack {
             ZStack {
                 OpenClawProBackground()
                 ScrollView {
@@ -184,22 +143,15 @@ struct AgentProTab: View {
                 self.destination(for: route)
             }
         }
-        .onAppear {
-            self.applyInitialRouteIfNeeded()
+        .task(id: self.overviewTaskID) {
+            await self.refreshOverview(force: false)
+        }
+        .sheet(item: self.$skillEditorSelection) { selection in
+            if let skill = self.skillByKey(selection.id) {
+                self.skillEditorSheet(skill)
+            } else {
+                self.missingSkillEditorSheet
+            }
         }
     }
-
-    private func directDestination(for route: AgentRoute) -> some View {
-        self.destination(for: route)
-            .toolbar(
-                self.directHeaderLeadingAction(for: route) == nil ? .visible : .hidden,
-                for: .navigationBar)
-    }
-
-    private func applyInitialRouteIfNeeded() {
-        guard self.directRoute == nil else { return }
-        guard let initialRoute else { return }
-        guard self.navigationPath != [initialRoute] else { return }
-        self.navigationPath = [initialRoute]
-    }
 }

apps/ios/Sources/Design/ChatProTab.swift

@@ -7,25 +7,6 @@ struct ChatProTab: View {
     @Environment(\.colorScheme) private var colorScheme
     @State private var viewModel: OpenClawChatViewModel?
     @State private var viewModelUsesAppleReviewDemoTransport = false
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-    let headerTitle: String?
-    let headerSubtitle: String?
-    let showsAgentBadge: Bool
-    let openSettings: (() -> Void)?
-
-    init(
-        headerLeadingAction: OpenClawSidebarHeaderAction? = nil,
-        headerTitle: String? = nil,
-        headerSubtitle: String? = nil,
-        showsAgentBadge: Bool = true,
-        openSettings: (() -> Void)? = nil)
-    {
-        self.headerLeadingAction = headerLeadingAction
-        self.headerTitle = headerTitle
-        self.headerSubtitle = headerSubtitle
-        self.showsAgentBadge = showsAgentBadge
-        self.openSettings = openSettings
-    }
 
     var body: some View {
         NavigationStack {
@@ -86,30 +67,7 @@ struct ChatProTab: View {
     }
 
     private var header: some View {
-        OpenClawAdaptiveHeaderRow(
-            title: self.headerDisplayTitle,
-            subtitle: self.headerDisplaySubtitle,
-            titleFont: .headline.weight(.semibold),
-            subtitleFont: .caption,
-            subtitleLineLimit: 1)
-        {
-            HStack(spacing: 11) {
-                if let headerLeadingAction {
-                    OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-                }
-                self.headerIdentityBadge
-            }
-        } accessory: {
-            self.connectionPillButton
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-        .padding(.top, 8)
-        .padding(.bottom, 4)
-    }
-
-    @ViewBuilder
-    private var headerIdentityBadge: some View {
-        if self.showsAgentBadge {
+        HStack(spacing: 11) {
             Text(self.agentBadge)
                 .font(.system(size: self.agentBadge.count > 2 ? 13 : 16, weight: .bold, design: .rounded))
                 .foregroundStyle(.white)
@@ -128,9 +86,24 @@ struct ChatProTab: View {
                                 endPoint: .bottomTrailing)))
                 .overlay(Circle().strokeBorder(.white.opacity(0.18), lineWidth: 1))
                 .shadow(color: OpenClawBrand.accent.opacity(0.18), radius: 10, y: 5)
-        } else {
-            ProIconBadge(systemName: "bubble.left", color: OpenClawBrand.accent)
+
+            VStack(alignment: .leading, spacing: 1) {
+                Text(self.agentDisplayName)
+                    .font(.headline.weight(.semibold))
+                    .lineLimit(1)
+                Text("AI Assistant")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .lineLimit(1)
+            }
+
+            Spacer(minLength: 8)
+
+            self.connectionPill
         }
+        .padding(.horizontal, OpenClawProMetric.pagePadding)
+        .padding(.top, 8)
+        .padding(.bottom, 4)
     }
 
     private func syncChatViewModel() {
@@ -189,93 +162,37 @@ struct ChatProTab: View {
             ?? "main"
     }
 
-    @ViewBuilder
-    private var connectionPillButton: some View {
-        if let openSettings {
-            Button(action: openSettings) {
-                self.connectionPill
-            }
-            .buttonStyle(.plain)
-            .accessibilityHint("Opens Settings / Gateway")
-        } else {
-            self.connectionPill
-        }
-    }
-
     private var connectionPill: some View {
         HStack(spacing: 6) {
-            ProStatusDot(color: self.gatewayPillColor)
-            Text(Self.gatewayPillTitle(state: self.gatewayDisplayState, isGatewayUsable: self.gatewayConnected))
+            ProStatusDot(color: self.gatewayConnected ? OpenClawBrand.ok : .orange)
+            Text(self.gatewayConnected ? "Connected" : "Connecting")
                 .font(.caption.weight(.semibold))
                 .lineLimit(1)
         }
-        .foregroundStyle(self.gatewayPillColor)
+        .foregroundStyle(self.gatewayConnected ? OpenClawBrand.ok : .orange)
         .padding(.horizontal, 10)
         .frame(height: 30)
         .background {
             Capsule()
-                .fill(self.gatewayPillColor.opacity(0.11))
+                .fill((self.gatewayConnected ? OpenClawBrand.ok : Color.orange).opacity(0.11))
         }
         .overlay {
             Capsule()
-                .strokeBorder(self.gatewayPillColor.opacity(0.16), lineWidth: 1)
+                .strokeBorder((self.gatewayConnected ? OpenClawBrand.ok : Color.orange).opacity(0.16), lineWidth: 1)
         }
     }
 
     private var gatewayConnected: Bool {
-        guard self.gatewayDisplayState == .connected else {
+        guard GatewayStatusBuilder.build(appModel: self.appModel) == .connected else {
             return false
         }
         return self.appModel.isAppleReviewDemoModeEnabled || self.appModel.isOperatorGatewayConnected
     }
 
-    private var gatewayDisplayState: GatewayDisplayState {
-        GatewayStatusBuilder.build(appModel: self.appModel)
-    }
-
-    private var gatewayPillColor: Color {
-        switch self.gatewayDisplayState {
-        case .connected:
-            self.gatewayConnected ? OpenClawBrand.ok : .secondary
-        case .connecting:
-            OpenClawBrand.accent
-        case .error:
-            OpenClawBrand.warn
-        case .disconnected:
-            .secondary
-        }
-    }
-
-    nonisolated static func gatewayPillTitle(state: GatewayDisplayState, isGatewayUsable: Bool) -> String {
-        switch state {
-        case .connected:
-            isGatewayUsable ? "Connected" : "Unavailable"
-        case .connecting:
-            "Connecting"
-        case .error:
-            "Attention"
-        case .disconnected:
-            "Offline"
-        }
-    }
-
     private var messagePlaceholder: String {
         self.gatewayConnected ? "Message \(self.agentDisplayName)..." : "Connect to a gateway"
     }
 
-    private var headerDisplayTitle: String {
-        self.normalized(self.headerTitle)
-            ?? Self.defaultHeaderTitle(showsAgentBadge: self.showsAgentBadge, agentDisplayName: self.agentDisplayName)
-    }
-
-    private var headerDisplaySubtitle: String {
-        self.normalized(self.headerSubtitle) ?? "AI Assistant"
-    }
-
-    nonisolated static func defaultHeaderTitle(showsAgentBadge: Bool, agentDisplayName: String) -> String {
-        showsAgentBadge ? agentDisplayName : "Chat"
-    }
-
     private var chatUserAccent: Color {
         self.colorScheme == .light ? Color(red: 0 / 255.0, green: 122 / 255.0, blue: 255 / 255.0) : OpenClawBrand.accent
     }

apps/ios/Sources/Design/CommandCenterSupport.swift

@@ -23,7 +23,7 @@ struct CommandPanel<Content: View>: View {
             tint: self.tint,
             isProminent: self.isProminent,
             padding: self.padding,
-            radius: OpenClawProMetric.cardRadius)
+            radius: 12)
         {
             self.content
         }
@@ -34,15 +34,40 @@ struct CommandControlBackground: View {
     @Environment(\.colorScheme) private var colorScheme
 
     var body: some View {
-        Color(uiColor: self.colorScheme == .dark ? .systemBackground : .systemGroupedBackground)
+        LinearGradient(
+            colors: self.colorScheme == .dark ? self.darkColors : self.lightColors,
+            startPoint: .top,
+            endPoint: .bottom)
             .overlay(alignment: .top) {
                 if self.colorScheme == .light {
-                    Color.white.opacity(0.20)
-                        .frame(height: 140)
+                    LinearGradient(
+                        colors: [
+                            Color.white.opacity(0.34),
+                            Color.clear,
+                        ],
+                        startPoint: .topLeading,
+                        endPoint: .bottomTrailing)
+                        .frame(height: 260)
                 }
             }
             .ignoresSafeArea()
     }
+
+    private var darkColors: [Color] {
+        [
+            Color(red: 12 / 255, green: 13 / 255, blue: 15 / 255),
+            Color(red: 7 / 255, green: 8 / 255, blue: 10 / 255),
+            Color(red: 4 / 255, green: 5 / 255, blue: 6 / 255),
+        ]
+    }
+
+    private var lightColors: [Color] {
+        [
+            Color(red: 247 / 255, green: 248 / 255, blue: 249 / 255),
+            Color(red: 251 / 255, green: 252 / 255, blue: 253 / 255),
+            .white,
+        ]
+    }
 }
 
 struct CommandSessionRow: View {
@@ -89,12 +114,12 @@ struct CommandSessionRow: View {
             }
         }
         .padding(.horizontal, 10)
-        .padding(.vertical, 8)
+        .padding(.vertical, 9)
         .background {
-            RoundedRectangle(cornerRadius: OpenClawProMetric.controlRadius, style: .continuous)
+            RoundedRectangle(cornerRadius: 10, style: .continuous)
                 .fill(self.rowFill)
                 .overlay {
-                    RoundedRectangle(cornerRadius: OpenClawProMetric.controlRadius, style: .continuous)
+                    RoundedRectangle(cornerRadius: 10, style: .continuous)
                         .strokeBorder(self.rowBorder, lineWidth: 1)
                 }
         }
@@ -111,11 +136,11 @@ struct CommandSessionRow: View {
     }
 
     private var rowFill: Color {
-        self.colorScheme == .dark ? Color.white.opacity(0.035) : Color(uiColor: .systemBackground)
+        self.colorScheme == .dark ? Color.white.opacity(0.035) : Color.black.opacity(0.025)
     }
 
     private var rowBorder: Color {
-        Color(uiColor: .separator).opacity(self.colorScheme == .dark ? 0.24 : 0.22)
+        self.colorScheme == .dark ? Color.white.opacity(0.065) : Color.black.opacity(0.045)
     }
 }
 
@@ -129,21 +154,21 @@ struct CommandViewMoreRow: View {
             .frame(maxWidth: .infinity)
             .padding(.vertical, 10)
             .background {
-                RoundedRectangle(cornerRadius: OpenClawProMetric.controlRadius, style: .continuous)
+                RoundedRectangle(cornerRadius: 10, style: .continuous)
                     .fill(self.rowFill)
                     .overlay {
-                        RoundedRectangle(cornerRadius: OpenClawProMetric.controlRadius, style: .continuous)
+                        RoundedRectangle(cornerRadius: 10, style: .continuous)
                             .strokeBorder(self.rowBorder, lineWidth: 1)
                     }
             }
     }
 
     private var rowFill: Color {
-        self.colorScheme == .dark ? Color.white.opacity(0.035) : Color(uiColor: .systemBackground)
+        self.colorScheme == .dark ? Color.white.opacity(0.035) : Color.black.opacity(0.025)
     }
 
     private var rowBorder: Color {
-        Color(uiColor: .separator).opacity(self.colorScheme == .dark ? 0.24 : 0.22)
+        self.colorScheme == .dark ? Color.white.opacity(0.065) : Color.black.opacity(0.045)
     }
 }
 
@@ -174,13 +199,13 @@ struct CommandEmptyStateRow: View {
             Spacer(minLength: 0)
         }
         .padding(.horizontal, 8)
-        .padding(.vertical, 8)
+        .padding(.vertical, 9)
         .background {
-            RoundedRectangle(cornerRadius: OpenClawProMetric.controlRadius, style: .continuous)
-                .fill(Color(uiColor: .systemBackground))
+            RoundedRectangle(cornerRadius: 10, style: .continuous)
+                .fill(Color.black.opacity(0.06))
                 .overlay {
-                    RoundedRectangle(cornerRadius: OpenClawProMetric.controlRadius, style: .continuous)
-                        .strokeBorder(Color(uiColor: .separator).opacity(0.22), lineWidth: 1)
+                    RoundedRectangle(cornerRadius: 10, style: .continuous)
+                        .strokeBorder(Color.primary.opacity(0.055), lineWidth: 1)
                 }
         }
     }

apps/ios/Sources/Design/CommandCenterTab.swift

@@ -2,17 +2,13 @@ import OpenClawChatUI
 import SwiftUI
 
 struct CommandCenterTab: View {
-    static let recentSessionsFetchLimit = 200
+    fileprivate static let recentSessionsFetchLimit = 200
 
     @Environment(NodeAppModel.self) private var appModel
     @Environment(\.colorScheme) private var colorScheme
-    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @Environment(\.scenePhase) private var scenePhase
     @State private var defaultChatSessionEntry: OpenClawChatSessionEntry?
     @State private var recentChatSessions: [OpenClawChatSessionEntry] = []
-    var headerTitle: String = "OpenClaw"
-    var headerLeadingAction: OpenClawSidebarHeaderAction?
-    var showsHeaderMark: Bool = true
     var openChat: () -> Void
     var openSettings: () -> Void
 
@@ -35,37 +31,20 @@ struct CommandCenterTab: View {
 
     var body: some View {
         NavigationStack {
-            GeometryReader { geometry in
-                ZStack {
-                    CommandControlBackground()
-                    self.commandAmbientOverlay
-                    ScrollView {
-                        VStack(alignment: .leading, spacing: 14) {
-                            self.header
-                            self.gatewayCard
-                            if Self.usesSplitSectionsLayout(
-                                horizontalSizeClass: self.horizontalSizeClass,
-                                containerWidth: geometry.size.width)
-                            {
-                                HStack(alignment: .top, spacing: 12) {
-                                    self.defaultChatSessionSection
-                                        .frame(maxWidth: .infinity, alignment: .topLeading)
-                                    self.recentSessions
-                                        .frame(maxWidth: .infinity, alignment: .topLeading)
-                                }
-                                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                            } else {
-                                self.defaultChatSessionSection
-                                    .padding(.horizontal, OpenClawProMetric.pagePadding)
-                                self.recentSessions
-                                    .padding(.horizontal, OpenClawProMetric.pagePadding)
-                            }
-                        }
-                        .padding(.top, 18)
-                        .padding(.bottom, 18)
+            ZStack {
+                CommandControlBackground()
+                self.commandAmbientOverlay
+                ScrollView {
+                    VStack(alignment: .leading, spacing: 10) {
+                        self.header
+                        self.gatewayCard
+                        self.defaultChatSessionSection
+                        self.recentSessions
                     }
-                    .safeAreaPadding(.bottom, OpenClawProMetric.bottomScrollInset)
+                    .padding(.top, 16)
+                    .padding(.bottom, 18)
                 }
+                .safeAreaPadding(.bottom, OpenClawProMetric.bottomScrollInset)
             }
             .navigationBarHidden(true)
         }
@@ -74,47 +53,12 @@ struct CommandCenterTab: View {
         }
     }
 
-    static func usesSplitSectionsLayout(
-        horizontalSizeClass: UserInterfaceSizeClass?,
-        containerWidth: CGFloat) -> Bool
-    {
-        guard horizontalSizeClass == .regular else { return false }
-        return containerWidth >= 1000
-    }
-
-    static func shouldShowHeaderMark(
-        hasLeadingAction: Bool,
-        showsHeaderMark: Bool) -> Bool
-    {
-        !hasLeadingAction && showsHeaderMark
-    }
-
     private var header: some View {
-        OpenClawAdaptiveHeaderRow(
-            title: self.headerTitle,
-            subtitle: self.gatewaySubtitle,
-            titleFont: .title3.weight(.semibold),
-            subtitleFont: .caption,
-            subtitleLineLimit: 1)
-        {
-            if let headerLeadingAction {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            } else if Self.shouldShowHeaderMark(
-                hasLeadingAction: headerLeadingAction != nil,
-                showsHeaderMark: self.showsHeaderMark)
-            {
-                OpenClawProMark(size: 28, shadowRadius: 5)
-            }
-        } accessory: {
-            Button(action: self.openSettings) {
-                ProCapsule(
-                    title: self.gatewayStateText,
-                    color: self.gatewayStatusColor,
-                    icon: self.gatewayConnected ? "checkmark.circle.fill" : "wifi.slash")
-            }
-            .buttonStyle(.plain)
-            .accessibilityLabel("Gateway \(self.gatewayStateText)")
-            .accessibilityHint("Opens Settings / Gateway")
+        HStack(alignment: .center, spacing: 11) {
+            OpenClawProMark(size: 31, shadowRadius: 9)
+            Text("OpenClaw")
+                .font(.system(size: 27, weight: .bold, design: .rounded))
+            Spacer()
         }
         .padding(.horizontal, OpenClawProMetric.pagePadding)
     }
@@ -142,7 +86,7 @@ struct CommandCenterTab: View {
                     title: "Gateway",
                     value: self.gatewayStateText,
                     color: self.gatewayStatusColor,
-                    icon: self.gatewayConnected ? "checkmark.circle.fill" : "wifi.slash")
+                    icon: self.gatewayConnected ? "hourglass" : "wifi.slash")
 
                 HStack(spacing: 0) {
                     self.gatewayFact(
@@ -216,6 +160,7 @@ struct CommandCenterTab: View {
                 .buttonStyle(.plain)
             }
         }
+        .padding(.horizontal, OpenClawProMetric.pagePadding)
     }
 
     private var recentSessions: some View {
@@ -255,6 +200,7 @@ struct CommandCenterTab: View {
                 }
             }
         }
+        .padding(.horizontal, OpenClawProMetric.pagePadding)
     }
 
     private func cardHeader(
@@ -267,8 +213,7 @@ struct CommandCenterTab: View {
     {
         HStack(spacing: 8) {
             Text(title)
-                .font(.subheadline.weight(.semibold))
-                .foregroundStyle(.secondary)
+                .font(.subheadline.weight(.bold))
             if let badgeValue {
                 Text(badgeValue)
                     .font(.caption2.weight(.bold))
@@ -458,7 +403,7 @@ struct CommandCenterTab: View {
         return result
     }
 
-    static func sessionWorkItem(
+    fileprivate static func sessionWorkItem(
         for session: OpenClawChatSessionEntry,
         currentSessionKey: String) -> WorkItem
     {
@@ -613,20 +558,14 @@ struct CommandCenterTab: View {
     }
 }
 
-struct CommandSessionsScreen: View {
+private struct CommandSessionsScreen: View {
     @Environment(NodeAppModel.self) private var appModel
     @Environment(\.dismiss) private var dismiss
     @State private var sessions: [OpenClawChatSessionEntry] = []
     @State private var isLoading = false
     @State private var loadErrorText: String?
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
     let openChat: () -> Void
 
-    init(headerLeadingAction: OpenClawSidebarHeaderAction? = nil, openChat: @escaping () -> Void) {
-        self.headerLeadingAction = headerLeadingAction
-        self.openChat = openChat
-    }
-
     var body: some View {
         ZStack {
             CommandControlBackground()
@@ -648,18 +587,12 @@ struct CommandSessionsScreen: View {
     }
 
     private var header: some View {
-        HStack(alignment: .top, spacing: 12) {
-            if let headerLeadingAction {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            }
-
-            VStack(alignment: .leading, spacing: 4) {
-                Text("Sessions")
-                    .font(.system(size: 27, weight: .bold, design: .rounded))
-                Text(self.headerDetail)
-                    .font(.caption.weight(.medium))
-                    .foregroundStyle(.secondary)
-            }
+        VStack(alignment: .leading, spacing: 4) {
+            Text("Sessions")
+                .font(.system(size: 27, weight: .bold, design: .rounded))
+            Text(self.headerDetail)
+                .font(.caption.weight(.medium))
+                .foregroundStyle(.secondary)
         }
         .padding(.horizontal, OpenClawProMetric.pagePadding)
     }

apps/ios/Sources/Design/IPadActivityScreen.swift

@@ -1,244 +0,0 @@
-import OpenClawChatUI
-import OpenClawKit
-import SwiftUI
-
-struct IPadActivityScreen: View {
-    @Environment(NodeAppModel.self) private var appModel
-    @Environment(\.scenePhase) private var scenePhase
-    @State private var sessions: [OpenClawChatSessionEntry] = []
-    @State private var isLoading = false
-    @State private var loadErrorText: String?
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-    let openChat: () -> Void
-    let openSettings: () -> Void
-
-    init(
-        headerLeadingAction: OpenClawSidebarHeaderAction? = nil,
-        openChat: @escaping () -> Void,
-        openSettings: @escaping () -> Void)
-    {
-        self.headerLeadingAction = headerLeadingAction
-        self.openChat = openChat
-        self.openSettings = openSettings
-    }
-
-    var body: some View {
-        IPadSidebarScreenChrome(
-            title: "Activity",
-            subtitle: "Live device and gateway activity.",
-            headerLeadingAction: self.headerLeadingAction,
-            gatewayAction: self.openSettings)
-        {
-            ProMetricGrid(metrics: self.metrics)
-            self.activityFeed
-        }
-        .task(id: self.refreshID) {
-            await self.refreshSessions()
-        }
-        .refreshable {
-            await self.refreshSessions()
-        }
-    }
-
-    private var metrics: [ProMetric] {
-        [
-            ProMetric(
-                icon: self.gatewayConnected ? "checkmark.circle.fill" : "wifi.slash",
-                title: "Gateway",
-                value: self.gatewayStateText,
-                color: self.gatewayConnected ? OpenClawBrand.ok : .secondary),
-            ProMetric(
-                icon: "person.2.fill",
-                title: "Agents",
-                value: self.gatewayConnected ? "\(self.appModel.gatewayAgents.count)" : "offline",
-                color: OpenClawBrand.accent),
-            ProMetric(
-                icon: "bubble.left.and.text.bubble.right",
-                title: "Sessions",
-                value: self.isLoading ? "..." : "\(self.sessionRows.count)",
-                color: OpenClawBrand.accentHot),
-        ]
-    }
-
-    private var activityFeed: some View {
-        ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-            VStack(spacing: 0) {
-                ProPanelHeader(
-                    title: "Recent activity",
-                    value: self.isLoading ? "Loading" : nil,
-                    actionTitle: "Refresh",
-                    action: {
-                        Task { await self.refreshSessions() }
-                    })
-
-                if let pendingExecApprovalPrompt = self.appModel.pendingExecApprovalPrompt {
-                    ProStatusRow(
-                        icon: "hand.raised.fill",
-                        title: "Approval needed",
-                        detail: pendingExecApprovalPrompt.commandPreview ?? pendingExecApprovalPrompt.commandText,
-                        value: "pending",
-                        color: OpenClawBrand.warn,
-                        actionTitle: nil,
-                        action: nil)
-                    Divider().padding(.leading, 58)
-                }
-
-                ProStatusRow(
-                    icon: self.gatewayConnected ? "network" : "wifi.slash",
-                    title: "Gateway",
-                    detail: self.gatewayDetailText,
-                    value: self.gatewayStateText.lowercased(),
-                    color: self.gatewayConnected ? OpenClawBrand.ok : .secondary,
-                    actionTitle: self.gatewayConnected ? nil : "Settings",
-                    action: self.gatewayConnected ? nil : self.openSettings)
-
-                Divider().padding(.leading, 58)
-
-                ProStatusRow(
-                    icon: "square.and.arrow.down",
-                    title: "Share intake",
-                    detail: self.appModel.lastShareEventText,
-                    value: "iPad",
-                    color: OpenClawBrand.accent,
-                    actionTitle: nil,
-                    action: nil)
-
-                if self.isLoading, self.sessions.isEmpty {
-                    Divider().padding(.leading, 58)
-                    ProStatusRow(
-                        icon: "hourglass",
-                        title: "Loading sessions",
-                        detail: "Fetching recent activity from the gateway.",
-                        value: "loading",
-                        color: OpenClawBrand.accent,
-                        actionTitle: nil,
-                        action: nil)
-                } else if let loadErrorText {
-                    Divider().padding(.leading, 58)
-                    ProStatusRow(
-                        icon: "exclamationmark.triangle.fill",
-                        title: "Sessions unavailable",
-                        detail: loadErrorText,
-                        value: "error",
-                        color: OpenClawBrand.warn,
-                        actionTitle: nil,
-                        action: nil)
-                } else if self.sessionRows.isEmpty {
-                    Divider().padding(.leading, 58)
-                    ProStatusRow(
-                        icon: "bubble.left.and.text.bubble.right",
-                        title: self.sessionsAvailable ? "No recent sessions" : "Session activity offline",
-                        detail: self.sessionsAvailable
-                            ? "Start a chat and it will appear here."
-                            : "Connect to the gateway to load recent chat activity.",
-                        value: self.sessionsAvailable ? "empty" : "offline",
-                        color: .secondary,
-                        actionTitle: self.sessionsAvailable ? "Chat" : nil,
-                        action: self.sessionsAvailable ? self.openChat : nil)
-                } else {
-                    ForEach(self.sessionRows) { row in
-                        Divider().padding(.leading, 58)
-                        ProStatusRow(
-                            icon: row.icon,
-                            title: row.title,
-                            detail: row.detail,
-                            value: row.state,
-                            color: row.color,
-                            actionTitle: "Open",
-                            action: {
-                                self.open(row)
-                            })
-                    }
-                }
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    private var refreshID: String {
-        [
-            self.sessionsMode,
-            self.appModel.chatSessionKey,
-            self.scenePhase == .active ? "active" : "inactive",
-        ].joined(separator: ":")
-    }
-
-    private var gatewayConnected: Bool {
-        GatewayStatusBuilder.build(appModel: self.appModel) == .connected
-    }
-
-    private var gatewayStateText: String {
-        guard !self.gatewayConnected else { return "Online" }
-        let status = self.appModel.gatewayDisplayStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
-        return status.isEmpty ? "Offline" : status
-    }
-
-    private var gatewayDetailText: String {
-        self.normalized(self.appModel.gatewayRemoteAddress)
-            ?? self.normalized(self.appModel.gatewayServerName)
-            ?? "No gateway connection"
-    }
-
-    private var sessionsAvailable: Bool {
-        self.appModel.isAppleReviewDemoModeEnabled || self.appModel.isOperatorGatewayConnected
-    }
-
-    private var sessionsMode: String {
-        if self.appModel.isAppleReviewDemoModeEnabled { return "demo" }
-        return self.appModel.isOperatorGatewayConnected ? "operator" : "offline"
-    }
-
-    private var sessionRows: [CommandCenterTab.WorkItem] {
-        self.sessions
-            .filter { CommandCenterTab.isRecentChatSession(
-                $0.key,
-                defaultSessionKey: self.appModel.defaultChatSessionKey) }
-            .sorted { ($0.updatedAt ?? 0) > ($1.updatedAt ?? 0) }
-            .prefix(8)
-            .map {
-                CommandCenterTab.sessionWorkItem(
-                    for: $0,
-                    currentSessionKey: self.appModel.chatSessionKey)
-            }
-    }
-
-    private func refreshSessions() async {
-        guard self.scenePhase == .active else { return }
-        guard self.sessionsAvailable else {
-            self.sessions = []
-            self.loadErrorText = nil
-            return
-        }
-
-        self.isLoading = true
-        self.loadErrorText = nil
-        defer { self.isLoading = false }
-
-        do {
-            let transport: any OpenClawChatTransport = self.appModel.isAppleReviewDemoModeEnabled
-                ? AppleReviewDemoChatTransport()
-                : IOSGatewayChatTransport(gateway: self.appModel.operatorSession)
-            let response = try await transport.listSessions(limit: CommandCenterTab.recentSessionsFetchLimit)
-            self.sessions = response.sessions
-        } catch {
-            self.sessions = []
-            self.loadErrorText = "Try again after the gateway reconnects."
-        }
-    }
-
-    private func open(_ item: CommandCenterTab.WorkItem) {
-        switch item.route {
-        case let .chat(sessionKey):
-            self.appModel.openChat(sessionKey: sessionKey)
-            self.openChat()
-        case .settings:
-            self.openSettings()
-        }
-    }
-
-    private func normalized(_ value: String?) -> String? {
-        guard let value else { return nil }
-        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
-        return trimmed.isEmpty ? nil : trimmed
-    }
-}

apps/ios/Sources/Design/IPadSidebarFeaturePreviews.swift

@@ -1,672 +0,0 @@
-import SwiftUI
-
-#if DEBUG
-#Preview("Activity states") {
-    IPadActivityStatesPreview()
-}
-
-#Preview("Workboard states") {
-    IPadWorkboardStatesPreview()
-}
-
-#Preview("Skill Workshop states") {
-    IPadSkillWorkshopStatesPreview()
-}
-
-#Preview(
-    "Skill Workshop iPad kanban lanes",
-    traits: .fixedLayout(width: 1180, height: 820))
-{
-    IPadSkillWorkshopKanbanPreview()
-}
-
-#Preview("Workboard phone queue rows") {
-    IPadWorkboardCompactRowsPreview()
-}
-
-#Preview("Skill Workshop phone queue rows") {
-    IPadSkillWorkshopCompactRowsPreview()
-}
-
-#Preview(
-    "Workboard phone landscape",
-    traits: .fixedLayout(width: 852, height: 393),
-    .landscapeLeft)
-{
-    IPadSidebarTaskScreenPreviewHost {
-        IPadWorkboardScreen(openChat: {}, openSettings: {})
-    }
-}
-
-#Preview(
-    "Skill Workshop phone landscape",
-    traits: .fixedLayout(width: 852, height: 393),
-    .landscapeLeft)
-{
-    IPadSidebarTaskScreenPreviewHost {
-        IPadSkillWorkshopScreen(openSettings: {})
-    }
-}
-
-private struct IPadWorkboardCompactRowsPreview: View {
-    private let statuses = ["todo", "ready", "running", "review", "blocked", "done"]
-    private let cards = IPadWorkboardPreviewFixtures.cards
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 12) {
-                    self.previewHeader
-                    ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-                        VStack(spacing: 0) {
-                            ProPanelHeader(
-                                title: "Queue",
-                                value: "\(self.cards.count)",
-                                actionTitle: nil,
-                                action: nil)
-                            ForEach(Array(self.cards.enumerated()), id: \.element.id) { index, card in
-                                if index > 0 {
-                                    Divider().padding(.leading, 58)
-                                }
-                                IPadWorkboardQueueRow(
-                                    card: card,
-                                    statuses: self.statuses,
-                                    isBusy: card.id == "preview-running",
-                                    inspect: {},
-                                    openSession: {},
-                                    move: { _ in },
-                                    archive: {})
-                            }
-                        }
-                    }
-
-                    ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-                        ProStatusRow(
-                            icon: "tray",
-                            title: "No cards",
-                            detail: "Create a card or change the filter.",
-                            value: "empty",
-                            color: .secondary,
-                            actionTitle: nil,
-                            action: nil)
-                    }
-                }
-                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                .padding(.vertical, 18)
-            }
-        }
-        .environment(\.horizontalSizeClass, .compact)
-        .environment(\.verticalSizeClass, .regular)
-    }
-
-    private var previewHeader: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            Text("Phone queue")
-                .font(.headline)
-            Text("Tap for detail, swipe or long-press for card actions.")
-                .font(.caption)
-                .foregroundStyle(.secondary)
-        }
-    }
-}
-
-private struct IPadSkillWorkshopCompactRowsPreview: View {
-    private let proposals = IPadSkillWorkshopPreviewFixtures.proposals
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 12) {
-                    self.previewHeader
-                    ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-                        VStack(spacing: 0) {
-                            ProPanelHeader(
-                                title: "Queue",
-                                value: "\(self.proposals.count)",
-                                actionTitle: nil,
-                                action: nil)
-                            ForEach(Array(self.proposals.enumerated()), id: \.element.id) { index, proposal in
-                                if index > 0 {
-                                    Divider().padding(.leading, 58)
-                                }
-                                IPadSkillProposalRow(
-                                    proposal: proposal,
-                                    isSelected: proposal.id == "preview-pending",
-                                    isBusy: proposal.id == "preview-held")
-                            }
-                        }
-                    }
-
-                    ProCard(radius: OpenClawProMetric.cardRadius) {
-                        ProStatusRow(
-                            icon: "hammer",
-                            title: "No proposals",
-                            detail: "New proposals will appear here when agents draft skills.",
-                            value: "empty",
-                            color: .secondary,
-                            actionTitle: nil,
-                            action: nil)
-                    }
-                }
-                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                .padding(.vertical, 18)
-            }
-        }
-        .environment(\.horizontalSizeClass, .compact)
-        .environment(\.verticalSizeClass, .regular)
-    }
-
-    private var previewHeader: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            Text("Phone proposals")
-                .font(.headline)
-            Text("Tap for detail, swipe or long-press for proposal actions.")
-                .font(.caption)
-                .foregroundStyle(.secondary)
-        }
-    }
-}
-
-private struct IPadSidebarTaskScreenPreviewHost<Content: View>: View {
-    @State private var appModel = NodeAppModel()
-    @ViewBuilder var content: Content
-
-    var body: some View {
-        NavigationStack {
-            self.content
-        }
-        .environment(self.appModel)
-        .environment(\.horizontalSizeClass, .regular)
-        .environment(\.verticalSizeClass, .compact)
-    }
-}
-
-private struct IPadActivityStatesPreview: View {
-    private let connectedSessions = [
-        CommandCenterTab.WorkItem(
-            id: "preview-main",
-            icon: "bubble.left.and.text.bubble.right",
-            title: "Main",
-            detail: "Updated just now",
-            state: "active",
-            trailing: "open",
-            color: OpenClawBrand.ok,
-            progress: nil,
-            route: .chat("main")),
-        CommandCenterTab.WorkItem(
-            id: "preview-ipad-audit",
-            icon: "bubble.left.and.text.bubble.right",
-            title: "iPad audit",
-            detail: "Updated 8m ago",
-            state: "recent",
-            trailing: "open",
-            color: OpenClawBrand.accent,
-            progress: nil,
-            route: .chat("ipad-audit")),
-    ]
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 18) {
-                    self.previewHeader("Connected")
-                    self.activityCard(
-                        gatewayTitle: "Gateway",
-                        gatewayDetail: "tailscale.local:18789",
-                        gatewayValue: "online",
-                        gatewayColor: OpenClawBrand.ok,
-                        sessionRows: self.connectedSessions,
-                        tailRows: [])
-
-                    self.previewHeader("Loading")
-                    self.activityCard(
-                        gatewayTitle: "Gateway",
-                        gatewayDetail: "Fetching recent activity from the gateway.",
-                        gatewayValue: "online",
-                        gatewayColor: OpenClawBrand.ok,
-                        sessionRows: [],
-                        tailRows: [
-                            ActivityPreviewRow(
-                                icon: "hourglass",
-                                title: "Loading sessions",
-                                detail: "Fetching recent activity from the gateway.",
-                                value: "loading",
-                                color: OpenClawBrand.accent),
-                        ])
-
-                    self.previewHeader("Empty")
-                    self.activityCard(
-                        gatewayTitle: "Gateway",
-                        gatewayDetail: "tailscale.local:18789",
-                        gatewayValue: "online",
-                        gatewayColor: OpenClawBrand.ok,
-                        sessionRows: [],
-                        tailRows: [
-                            ActivityPreviewRow(
-                                icon: "bubble.left.and.text.bubble.right",
-                                title: "No recent sessions",
-                                detail: "Start a chat and it will appear here.",
-                                value: "empty",
-                                color: .secondary),
-                        ])
-
-                    self.previewHeader("Error")
-                    self.activityCard(
-                        gatewayTitle: "Gateway",
-                        gatewayDetail: "No gateway connection",
-                        gatewayValue: "offline",
-                        gatewayColor: .secondary,
-                        sessionRows: [],
-                        tailRows: [
-                            ActivityPreviewRow(
-                                icon: "exclamationmark.triangle.fill",
-                                title: "Sessions unavailable",
-                                detail: "Try again after the gateway reconnects.",
-                                value: "error",
-                                color: OpenClawBrand.warn),
-                        ])
-                }
-                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                .padding(.vertical, 18)
-            }
-        }
-    }
-
-    private func previewHeader(_ title: String) -> some View {
-        Text(title)
-            .font(.caption.weight(.semibold))
-            .foregroundStyle(.secondary)
-            .textCase(.uppercase)
-    }
-
-    private func activityCard(
-        gatewayTitle: String,
-        gatewayDetail: String,
-        gatewayValue: String,
-        gatewayColor: Color,
-        sessionRows: [CommandCenterTab.WorkItem],
-        tailRows: [ActivityPreviewRow]) -> some View
-    {
-        ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-            VStack(spacing: 0) {
-                ProPanelHeader(
-                    title: "Recent activity",
-                    value: nil,
-                    actionTitle: "Refresh",
-                    action: {})
-                ProStatusRow(
-                    icon: gatewayValue == "online" ? "network" : "wifi.slash",
-                    title: gatewayTitle,
-                    detail: gatewayDetail,
-                    value: gatewayValue,
-                    color: gatewayColor,
-                    actionTitle: gatewayValue == "online" ? nil : "Settings",
-                    action: {})
-                Divider().padding(.leading, 58)
-                ProStatusRow(
-                    icon: "square.and.arrow.down",
-                    title: "Share intake",
-                    detail: "No share events yet.",
-                    value: "iPad",
-                    color: OpenClawBrand.accent,
-                    actionTitle: nil,
-                    action: nil)
-                ForEach(sessionRows) { row in
-                    Divider().padding(.leading, 58)
-                    ProStatusRow(
-                        icon: row.icon,
-                        title: row.title,
-                        detail: row.detail,
-                        value: row.state,
-                        color: row.color,
-                        actionTitle: "Open",
-                        action: {})
-                }
-                ForEach(tailRows) { row in
-                    Divider().padding(.leading, 58)
-                    ProStatusRow(
-                        icon: row.icon,
-                        title: row.title,
-                        detail: row.detail,
-                        value: row.value,
-                        color: row.color,
-                        actionTitle: nil,
-                        action: nil)
-                }
-            }
-        }
-    }
-
-    private struct ActivityPreviewRow: Identifiable {
-        let id = UUID()
-        let icon: String
-        let title: String
-        let detail: String
-        let value: String
-        let color: Color
-    }
-}
-
-private struct IPadWorkboardStatesPreview: View {
-    private let statuses = ["todo", "running", "review"]
-    private let connectedCards = IPadWorkboardPreviewFixtures.cards
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 18) {
-                    self.previewHeader("Connected")
-                    self.connectedBoard
-
-                    self.previewHeader("Empty")
-                    IPadWorkboardKanbanColumn(
-                        status: "todo",
-                        cards: [],
-                        statuses: self.statuses,
-                        busyCardID: nil,
-                        openSession: { _ in },
-                        inspect: { _ in },
-                        move: { _, _ in },
-                        archive: { _ in })
-                        .frame(maxWidth: 320)
-
-                    self.previewHeader("Loading")
-                    ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-                        ProStatusRow(
-                            icon: "arrow.clockwise",
-                            title: "Loading cards",
-                            detail: "Refreshing the workboard from the gateway.",
-                            value: "loading",
-                            color: OpenClawBrand.accent,
-                            actionTitle: nil,
-                            action: nil)
-                    }
-
-                    self.previewHeader("Error")
-                    ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-                        ProStatusRow(
-                            icon: "exclamationmark.triangle",
-                            title: "Cards unavailable",
-                            detail: "Check the gateway connection, then refresh.",
-                            value: "error",
-                            color: OpenClawBrand.warn,
-                            actionTitle: "Retry",
-                            action: {})
-                    }
-                }
-                .padding(18)
-            }
-        }
-    }
-
-    private var connectedBoard: some View {
-        ScrollView(.horizontal) {
-            HStack(alignment: .top, spacing: 12) {
-                ForEach(self.statuses, id: \.self) { status in
-                    IPadWorkboardKanbanColumn(
-                        status: status,
-                        cards: self.connectedCards.filter { $0.status == status },
-                        statuses: self.statuses,
-                        busyCardID: nil,
-                        openSession: { _ in },
-                        inspect: { _ in },
-                        move: { _, _ in },
-                        archive: { _ in })
-                        .frame(width: 282)
-                }
-            }
-        }
-    }
-
-    private func previewHeader(_ title: String) -> some View {
-        Text(title)
-            .font(.caption.weight(.semibold))
-            .foregroundStyle(.secondary)
-            .textCase(.uppercase)
-    }
-}
-
-private enum IPadWorkboardPreviewFixtures {
-    static let cards = [
-        IPadWorkboardCard(
-            id: "preview-todo",
-            title: "Prep iPad sidebar audit",
-            notes: "Confirm portrait drawer behavior before device install.",
-            status: "todo",
-            priority: "normal",
-            labels: ["iPad", "UI"],
-            agentId: "main",
-            sessionKey: nil,
-            position: 0,
-            updatedAt: nil,
-            metadata: nil),
-        IPadWorkboardCard(
-            id: "preview-running",
-            title: "Verify phone workboard queue",
-            notes: "Single-list compact flow with detail sheet actions.",
-            status: "running",
-            priority: "high",
-            labels: ["phone"],
-            agentId: "main",
-            sessionKey: "session-preview",
-            position: 1,
-            updatedAt: nil,
-            metadata: nil),
-        IPadWorkboardCard(
-            id: "preview-review",
-            title: "Review adaptive shell",
-            notes: "Make sure shared destinations stay device-specific.",
-            status: "review",
-            priority: "normal",
-            labels: ["shell"],
-            agentId: "main",
-            sessionKey: nil,
-            position: 2,
-            updatedAt: nil,
-            metadata: nil),
-    ]
-}
-
-private struct IPadSkillWorkshopStatesPreview: View {
-    private let proposals = IPadSkillWorkshopPreviewFixtures.proposals
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 18) {
-                    self.previewHeader("Connected")
-                    self.queueCard(self.proposals, selectedID: "preview-pending", busyID: nil)
-
-                    self.previewHeader("Loading")
-                    self.queueCard(self.proposals, selectedID: "preview-pending", busyID: "preview-pending")
-
-                    self.previewHeader("Empty")
-                    ProCard(radius: OpenClawProMetric.cardRadius) {
-                        ProStatusRow(
-                            icon: "hammer",
-                            title: "No proposals",
-                            detail: "New proposals will appear here when agents draft skills.",
-                            value: "empty",
-                            color: .secondary,
-                            actionTitle: nil,
-                            action: nil)
-                    }
-
-                    self.previewHeader("Offline / Error")
-                    ProCard(radius: OpenClawProMetric.cardRadius) {
-                        ProStatusRow(
-                            icon: "wifi.slash",
-                            title: "Workshop offline",
-                            detail: "Connect to the gateway to load Skill Workshop proposals.",
-                            value: "offline",
-                            color: .secondary,
-                            actionTitle: nil,
-                            action: nil)
-                        Divider().padding(.leading, 58)
-                        ProStatusRow(
-                            icon: "exclamationmark.triangle",
-                            title: "Proposal unavailable",
-                            detail: "Try again after the gateway reconnects.",
-                            value: "error",
-                            color: OpenClawBrand.warn,
-                            actionTitle: nil,
-                            action: nil)
-                    }
-                }
-                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                .padding(.vertical, 18)
-            }
-        }
-    }
-
-    private func previewHeader(_ title: String) -> some View {
-        Text(title)
-            .font(.subheadline.weight(.semibold))
-            .foregroundStyle(.secondary)
-    }
-
-    private func queueCard(
-        _ proposals: [IPadSkillProposal],
-        selectedID: String?,
-        busyID: String?) -> some View
-    {
-        ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-            VStack(spacing: 0) {
-                ProPanelHeader(
-                    title: "Queue",
-                    value: "\(proposals.count)",
-                    actionTitle: nil,
-                    action: nil)
-                ForEach(Array(proposals.enumerated()), id: \.element.id) { index, proposal in
-                    if index > 0 {
-                        Divider().padding(.leading, 58)
-                    }
-                    IPadSkillProposalRow(
-                        proposal: proposal,
-                        isSelected: proposal.id == selectedID,
-                        isBusy: proposal.id == busyID)
-                }
-            }
-        }
-    }
-}
-
-private struct IPadSkillWorkshopKanbanPreview: View {
-    private let lanes = IPadSkillWorkshopPreviewFixtures.kanbanStatuses
-    private let proposals = IPadSkillWorkshopPreviewFixtures.proposals
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            VStack(alignment: .leading, spacing: 18) {
-                self.previewHeader
-                ScrollView(.horizontal) {
-                    HStack(alignment: .top, spacing: 12) {
-                        ForEach(self.lanes, id: \.self) { status in
-                            IPadSkillProposalKanbanColumn(
-                                status: status,
-                                proposals: self.proposals.filter { $0.status == status },
-                                selectedProposalID: "preview-pending",
-                                inspectingProposalID: "preview-needs-review",
-                                canApplyProposalMutations: true,
-                                busyAction: nil,
-                                select: { _ in },
-                                inspect: { _ in },
-                                apply: { _ in },
-                                reject: { _ in })
-                                .frame(width: 282)
-                        }
-                    }
-                    .padding(.horizontal, OpenClawProMetric.pagePadding)
-                }
-            }
-            .padding(.vertical, 22)
-        }
-        .environment(\.horizontalSizeClass, .regular)
-        .environment(\.verticalSizeClass, .regular)
-    }
-
-    private var previewHeader: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            Text("iPad kanban")
-                .font(.headline)
-            Text("Wide layout with populated, empty, held, and custom proposal lanes.")
-                .font(.caption)
-                .foregroundStyle(.secondary)
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-}
-
-private enum IPadSkillWorkshopPreviewFixtures {
-    static let kanbanStatuses = [
-        "pending",
-        "quarantined",
-        "stale",
-        "applied",
-        "rejected",
-        "needs-review",
-        "manual_QA",
-    ]
-
-    static let proposals = [
-        Self.proposal(
-            id: "preview-pending",
-            status: "pending",
-            title: "Add Tailscale gateway helper",
-            description: "Drafts a helper skill for checking local Tailscale reachability before pairing.",
-            minutesAgo: 9),
-        Self.proposal(
-            id: "preview-applied",
-            status: "applied",
-            title: "Summarize channel health",
-            description: "Adds a lightweight status summary for channel clients and recent routing failures.",
-            minutesAgo: 47),
-        Self.proposal(
-            id: "preview-held",
-            status: "quarantined",
-            title: "Desktop automation bridge",
-            description: "Held for review because it requests broader file access than mobile should expose.",
-            minutesAgo: 128),
-        Self.proposal(
-            id: "preview-needs-review",
-            status: "needs-review",
-            title: "Review pairing diagnostics",
-            description: "Adds a diagnostic checklist before trusting a new gateway certificate.",
-            minutesAgo: 32),
-        Self.proposal(
-            id: "preview-manual-qa",
-            status: "manual_QA",
-            title: "Manual QA runbook",
-            description: "Generates a device checklist for iPhone portrait and iPad split layouts.",
-            minutesAgo: 15),
-    ]
-
-    private static func proposal(
-        id: String,
-        status: String,
-        title: String,
-        description: String,
-        minutesAgo: Int) -> IPadSkillProposal
-    {
-        let updatedAt = ISO8601DateFormatter().string(from: Date().addingTimeInterval(Double(-minutesAgo * 60)))
-        return IPadSkillProposal(
-            entry: IPadSkillProposalManifestEntry(
-                id: id,
-                kind: "skill",
-                status: status,
-                title: title,
-                description: description,
-                skillName: title,
-                skillKey: id,
-                createdAt: updatedAt,
-                updatedAt: updatedAt,
-                scanState: "complete"),
-            previous: nil)
-    }
-}
-#endif

apps/ios/Sources/Design/IPadSidebarFeatureScreens.swift

@@ -1,17 +0,0 @@
-import Foundation
-
-struct EmptyParams: Encodable {}
-
-enum IPadSidebarGatewayError: Error {
-    case offline
-    case invalidPayload
-
-    var message: String {
-        switch self {
-        case .offline:
-            "Gateway offline."
-        case .invalidPayload:
-            "Could not encode request."
-        }
-    }
-}

apps/ios/Sources/Design/IPadSidebarScreenChrome.swift

@@ -1,71 +0,0 @@
-import SwiftUI
-
-struct IPadSidebarScreenChrome<Content: View>: View {
-    @Environment(\.verticalSizeClass) private var verticalSizeClass
-    let title: String
-    let subtitle: String
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-    let gatewayAction: (() -> Void)?
-    @ViewBuilder var content: Content
-
-    init(
-        title: String,
-        subtitle: String,
-        headerLeadingAction: OpenClawSidebarHeaderAction? = nil,
-        gatewayAction: (() -> Void)? = nil,
-        @ViewBuilder content: () -> Content)
-    {
-        self.title = title
-        self.subtitle = subtitle
-        self.headerLeadingAction = headerLeadingAction
-        self.gatewayAction = gatewayAction
-        self.content = content()
-    }
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: self.isCompactHeight ? 10 : 16) {
-                    OpenClawAdaptiveHeaderRow(
-                        title: self.title,
-                        subtitle: self.subtitle,
-                        titleFont: self.isCompactHeight ? .headline.weight(.semibold) : .title2.weight(.semibold),
-                        subtitleLineLimit: self.isCompactHeight ? 1 : 2)
-                    {
-                        if let headerLeadingAction {
-                            OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-                        }
-                    } accessory: {
-                        self.gatewayPill
-                    }
-                    .padding(.horizontal, OpenClawProMetric.pagePadding)
-                    self.content
-                }
-                .padding(.vertical, self.isCompactHeight ? 10 : 18)
-            }
-            .safeAreaPadding(.bottom, self.bottomScrollInset)
-        }
-    }
-
-    private var isCompactHeight: Bool {
-        self.verticalSizeClass == .compact
-    }
-
-    @ViewBuilder
-    private var gatewayPill: some View {
-        if let gatewayAction {
-            Button(action: gatewayAction) {
-                OpenClawGatewayCompactPill()
-            }
-            .buttonStyle(.plain)
-            .accessibilityHint("Opens Settings / Gateway")
-        } else {
-            OpenClawGatewayCompactPill()
-        }
-    }
-
-    private var bottomScrollInset: CGFloat {
-        self.isCompactHeight ? 150 : OpenClawProMetric.bottomScrollInset
-    }
-}

apps/ios/Sources/Design/OpenClawDocsScreen.swift

@@ -1,129 +0,0 @@
-import SwiftUI
-
-struct OpenClawDocsScreen: View {
-    private let docsURL = URL(string: "https://docs.openclaw.ai")!
-    private let gatewayURL = URL(string: "https://docs.openclaw.ai/gateway")!
-    private let pairingURL = URL(string: "https://docs.openclaw.ai/channels/pairing")!
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-    let gatewayAction: (() -> Void)?
-
-    init(headerLeadingAction: OpenClawSidebarHeaderAction? = nil, gatewayAction: (() -> Void)? = nil) {
-        self.headerLeadingAction = headerLeadingAction
-        self.gatewayAction = gatewayAction
-    }
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 16) {
-                    self.headerCard
-                    self.linkCard
-                    self.versionCard
-                }
-                .padding(.vertical, 18)
-            }
-        }
-        .navigationTitle("Docs")
-        .navigationBarTitleDisplayMode(.inline)
-    }
-
-    private var headerCard: some View {
-        ProCard(radius: OpenClawProMetric.cardRadius) {
-            OpenClawAdaptiveHeaderRow(
-                title: "Docs",
-                subtitle: "Gateway setup, pairing, channels, and mobile node reference.",
-                titleFont: .headline,
-                subtitleFont: .caption)
-            {
-                HStack(alignment: .top, spacing: 12) {
-                    if let headerLeadingAction {
-                        OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-                    }
-                    ProIconBadge(systemName: "book", color: OpenClawBrand.accent)
-                }
-            } accessory: {
-                self.gatewayPill
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    @ViewBuilder
-    private var gatewayPill: some View {
-        if let gatewayAction {
-            Button(action: gatewayAction) {
-                OpenClawGatewayCompactPill()
-            }
-            .buttonStyle(.plain)
-            .accessibilityHint("Opens Settings / Gateway")
-        } else {
-            OpenClawGatewayCompactPill()
-        }
-    }
-
-    private var linkCard: some View {
-        ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-            VStack(spacing: 0) {
-                self.docsLinkRow(
-                    title: "Docs Home",
-                    detail: "Browse the current OpenClaw reference.",
-                    icon: "book",
-                    url: self.docsURL)
-                Divider().padding(.leading, 58)
-                self.docsLinkRow(
-                    title: "Gateway",
-                    detail: "Connection, auth, and diagnostics.",
-                    icon: "network",
-                    url: self.gatewayURL)
-                Divider().padding(.leading, 58)
-                self.docsLinkRow(
-                    title: "Pairing",
-                    detail: "Mobile setup codes, QR, and node approval.",
-                    icon: "qrcode",
-                    url: self.pairingURL)
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    private var versionCard: some View {
-        ProCard(radius: OpenClawProMetric.cardRadius) {
-            HStack(spacing: 10) {
-                Text("Version")
-                    .font(.caption.weight(.semibold))
-                    .foregroundStyle(.secondary)
-                Spacer(minLength: 8)
-                Text("v\(DeviceInfoHelper.openClawVersionString())")
-                    .font(.caption.weight(.bold))
-                    .foregroundStyle(.primary)
-                    .textSelection(.enabled)
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    private func docsLinkRow(title: String, detail: String, icon: String, url: URL) -> some View {
-        Link(destination: url) {
-            HStack(spacing: 12) {
-                ProIconBadge(systemName: icon, color: OpenClawBrand.accent)
-                VStack(alignment: .leading, spacing: 3) {
-                    Text(title)
-                        .font(.subheadline.weight(.semibold))
-                    Text(detail)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .lineLimit(1)
-                }
-                Spacer(minLength: 8)
-                Image(systemName: "arrow.up.right")
-                    .font(.caption.weight(.bold))
-                    .foregroundStyle(.secondary)
-            }
-            .padding(.horizontal, 14)
-            .padding(.vertical, 12)
-            .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-    }
-}

apps/ios/Sources/Design/OpenClawProComponents.swift

@@ -1,23 +1,33 @@
 import SwiftUI
 
 enum OpenClawProMetric {
-    static let pagePadding: CGFloat = 18
-    static let cardRadius: CGFloat = 10
-    static let controlRadius: CGFloat = 8
+    static let pagePadding: CGFloat = 20
+    static let cardRadius: CGFloat = 14
+    static let controlRadius: CGFloat = 12
     static let bottomScrollInset: CGFloat = 96
-    static let heroRadius: CGFloat = 12
+    static let heroRadius: CGFloat = 22
 }
 
 struct OpenClawProBackground: View {
     @Environment(\.colorScheme) private var colorScheme
 
     var body: some View {
-        Color(uiColor: self.colorScheme == .dark ? .systemBackground : .systemGroupedBackground)
+        LinearGradient(
+            colors: OpenClawBrand.canvasColors(for: self.colorScheme),
+            startPoint: .top,
+            endPoint: .bottom)
             .ignoresSafeArea()
             .overlay(alignment: .top) {
                 if self.colorScheme == .light {
-                    Color.white.opacity(0.22)
-                        .frame(height: 140)
+                    LinearGradient(
+                        colors: [
+                            OpenClawBrand.accent.opacity(0.05),
+                            OpenClawBrand.accent.opacity(0.02),
+                            .clear,
+                        ],
+                        startPoint: .topTrailing,
+                        endPoint: .bottomLeading)
+                        .frame(height: 620)
                         .ignoresSafeArea()
                 }
             }
@@ -56,7 +66,7 @@ struct ProSectionHeader: View {
 struct ProCard<Content: View>: View {
     var tint: Color?
     var isProminent: Bool = false
-    var padding: CGFloat = 12
+    var padding: CGFloat = 14
     var radius: CGFloat = OpenClawProMetric.cardRadius
     @ViewBuilder var content: Content
 
@@ -81,39 +91,78 @@ private struct ProPanelBackground: View {
         let shape = RoundedRectangle(cornerRadius: self.radius, style: .continuous)
         shape
             .fill(self.fill)
+            .overlay {
+                ProPanelTexture()
+                    .opacity(self.colorScheme == .dark ? 0.22 : 0.08)
+                    .clipShape(shape)
+            }
             .overlay {
                 shape.strokeBorder(self.borderStyle, lineWidth: 1)
             }
             .overlay {
-                if self.isProminent {
-                    shape.strokeBorder(
-                        OpenClawBrand.accent.opacity(self.colorScheme == .dark ? 0.12 : 0.07),
-                        lineWidth: 1)
-                        .padding(1)
-                }
+                shape
+                    .strokeBorder(Color.black.opacity(self.colorScheme == .dark ? 0.40 : 0.055), lineWidth: 0.7)
+                    .padding(1)
+            }
+            .overlay(alignment: .top) {
+                shape
+                    .strokeBorder(Color.white.opacity(self.colorScheme == .dark ? 0.07 : 0.36), lineWidth: 0.7)
+                    .mask(alignment: .top) {
+                        Rectangle().frame(height: 28)
+                    }
             }
     }
 
     private var fill: AnyShapeStyle {
-        let base = self.isProminent
-            ? Color(uiColor: .systemBackground)
-            : Color(uiColor: .secondarySystemGroupedBackground)
-        if let tint {
-            let gradient = LinearGradient(
-                colors: [
-                    base,
-                    tint.opacity(self.colorScheme == .dark ? 0.08 : 0.045),
-                    base,
-                ],
-                startPoint: .topLeading,
-                endPoint: .bottomTrailing)
-            return AnyShapeStyle(gradient)
+        if self.colorScheme == .dark {
+            let base = self.isProminent
+                ? Color(red: 15 / 255, green: 17 / 255, blue: 19 / 255)
+                : Color(red: 10 / 255, green: 12 / 255, blue: 14 / 255)
+            return AnyShapeStyle(base)
         }
-        return AnyShapeStyle(base)
+
+        let gradient = LinearGradient(
+            colors: [
+                Color.white.opacity(0.98),
+                (self.tint ?? Color.white).opacity(self.tint == nil ? 0.92 : 0.12),
+                Color(red: 246 / 255, green: 247 / 255, blue: 249 / 255),
+            ],
+            startPoint: .topLeading,
+            endPoint: .bottomTrailing)
+        return AnyShapeStyle(gradient)
     }
 
     private var borderStyle: AnyShapeStyle {
-        AnyShapeStyle(Color(uiColor: .separator).opacity(self.colorScheme == .dark ? 0.26 : 0.30))
+        if self.colorScheme == .dark {
+            return AnyShapeStyle(Color.white.opacity(self.isProminent ? 0.15 : 0.11))
+        }
+
+        let gradient = LinearGradient(
+            colors: [
+                Color.white.opacity(0.72),
+                (self.tint ?? OpenClawBrand.accent).opacity(0.10),
+                Color.black.opacity(0.08),
+            ],
+            startPoint: .topLeading,
+            endPoint: .bottomTrailing)
+        return AnyShapeStyle(gradient)
+    }
+}
+
+private struct ProPanelTexture: View {
+    @Environment(\.colorScheme) private var colorScheme
+
+    var body: some View {
+        Canvas { context, size in
+            let color = self.colorScheme == .dark ? Color.white.opacity(0.11) : Color.black.opacity(0.08)
+            for y in stride(from: 2.0, through: size.height, by: 6.5) {
+                let offset = Int(y / 6.5).isMultiple(of: 2) ? 0.0 : 3.25
+                for x in stride(from: 2.0 + offset, through: size.width, by: 6.5) {
+                    let dot = CGRect(x: x, y: y, width: 0.7, height: 0.7)
+                    context.fill(Path(ellipseIn: dot), with: .color(color))
+                }
+            }
+        }
     }
 }
 
@@ -202,9 +251,9 @@ private struct ProPanelSurfaceModifier: ViewModifier {
             }
             .modifier(ProLightGlassModifier(radius: self.radius))
             .shadow(
-                color: self.colorScheme == .dark ? .black.opacity(0.22) : .black.opacity(0.028),
-                radius: self.isProminent ? 9 : 4,
-                y: self.isProminent ? 4 : 1)
+                color: self.colorScheme == .dark ? .black.opacity(0.60) : .black.opacity(0.045),
+                radius: self.isProminent ? 20 : 12,
+                y: self.isProminent ? 10 : 6)
     }
 }
 
@@ -214,160 +263,16 @@ struct ProIconBadge: View {
 
     var body: some View {
         Image(systemName: self.systemName)
-            .font(.caption.weight(.semibold))
+            .font(.subheadline.weight(.semibold))
             .foregroundStyle(self.color)
-            .frame(width: 30, height: 30)
+            .frame(width: 34, height: 34)
             .background {
-                RoundedRectangle(cornerRadius: 8, style: .continuous)
+                RoundedRectangle(cornerRadius: 10, style: .continuous)
                     .fill(self.color.opacity(0.12))
             }
     }
 }
 
-struct OpenClawSidebarHeaderAction {
-    let systemName: String
-    let accessibilityLabel: String
-    let accessibilityIdentifier: String?
-    let action: () -> Void
-
-    init(
-        systemName: String,
-        accessibilityLabel: String,
-        accessibilityIdentifier: String? = nil,
-        action: @escaping () -> Void)
-    {
-        self.systemName = systemName
-        self.accessibilityLabel = accessibilityLabel
-        self.accessibilityIdentifier = accessibilityIdentifier
-        self.action = action
-    }
-}
-
-struct OpenClawSidebarRevealButton: View {
-    let headerAction: OpenClawSidebarHeaderAction
-
-    init(action: OpenClawSidebarHeaderAction) {
-        self.headerAction = action
-    }
-
-    init(action: @escaping () -> Void) {
-        self.headerAction = OpenClawSidebarHeaderAction(
-            systemName: "sidebar.left",
-            accessibilityLabel: "Show Sidebar",
-            action: action)
-    }
-
-    var body: some View {
-        let button = Button(action: self.headerAction.action) {
-            Image(systemName: self.headerAction.systemName)
-                .font(.system(size: 16, weight: .semibold))
-                .frame(width: 38, height: 38)
-                .contentShape(Rectangle())
-        }
-        .buttonStyle(.plain)
-        .foregroundStyle(OpenClawBrand.accent)
-        .accessibilityLabel(self.headerAction.accessibilityLabel)
-
-        if let accessibilityIdentifier = self.headerAction.accessibilityIdentifier {
-            button.accessibilityIdentifier(accessibilityIdentifier)
-        } else {
-            button
-        }
-    }
-}
-
-struct OpenClawSidebarHeaderLeadingSlot: View {
-    let action: OpenClawSidebarHeaderAction
-
-    var body: some View {
-        OpenClawSidebarRevealButton(action: self.action)
-            .frame(width: 44, height: 44, alignment: .center)
-    }
-}
-
-struct OpenClawAdaptiveHeaderRow<Leading: View, Accessory: View>: View {
-    let title: String
-    let subtitle: String
-    var titleFont: Font = .title3.weight(.semibold)
-    var subtitleFont: Font = .subheadline
-    var subtitleLineLimit: Int? = 2
-    @ViewBuilder let leading: Leading
-    @ViewBuilder let accessory: Accessory
-
-    init(
-        title: String,
-        subtitle: String,
-        titleFont: Font = .title3.weight(.semibold),
-        subtitleFont: Font = .subheadline,
-        subtitleLineLimit: Int? = 2,
-        @ViewBuilder leading: () -> Leading,
-        @ViewBuilder accessory: () -> Accessory)
-    {
-        self.title = title
-        self.subtitle = subtitle
-        self.titleFont = titleFont
-        self.subtitleFont = subtitleFont
-        self.subtitleLineLimit = subtitleLineLimit
-        self.leading = leading()
-        self.accessory = accessory()
-    }
-
-    var body: some View {
-        ViewThatFits(in: .horizontal) {
-            self.horizontalLayout
-            self.stackedLayout
-        }
-    }
-
-    private var horizontalLayout: some View {
-        HStack(alignment: .top, spacing: 12) {
-            self.leading
-
-            self.titleBlock
-                .layoutPriority(1)
-
-            Spacer(minLength: 8)
-
-            self.accessory
-                .fixedSize(horizontal: true, vertical: false)
-        }
-    }
-
-    private var stackedLayout: some View {
-        VStack(alignment: .leading, spacing: 10) {
-            HStack(alignment: .top, spacing: 12) {
-                self.leading
-
-                self.titleBlock
-                    .layoutPriority(1)
-
-                Spacer(minLength: 8)
-            }
-
-            HStack {
-                Spacer(minLength: 0)
-                self.accessory
-                    .fixedSize(horizontal: true, vertical: false)
-            }
-        }
-    }
-
-    private var titleBlock: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            Text(self.title)
-                .font(self.titleFont)
-                .lineLimit(2)
-                .minimumScaleFactor(0.86)
-                .fixedSize(horizontal: false, vertical: true)
-            Text(self.subtitle)
-                .font(self.subtitleFont)
-                .foregroundStyle(.secondary)
-                .lineLimit(self.subtitleLineLimit)
-                .fixedSize(horizontal: false, vertical: true)
-        }
-    }
-}
-
 struct ProStatusDot: View {
     var color: Color
 
@@ -375,6 +280,7 @@ struct ProStatusDot: View {
         Circle()
             .fill(self.color)
             .frame(width: 8, height: 8)
+            .shadow(color: self.color.opacity(0.35), radius: 4)
     }
 }
 
@@ -406,7 +312,7 @@ struct OpenClawProMark: View {
             .resizable()
             .scaledToFit()
             .frame(width: self.size, height: self.size)
-            .shadow(color: OpenClawBrand.accent.opacity(0.18), radius: self.shadowRadius, y: self.shadowRadius / 3)
+            .shadow(color: OpenClawBrand.accent.opacity(0.28), radius: self.shadowRadius, y: self.shadowRadius / 2)
             .accessibilityLabel("OpenClaw")
     }
 }
@@ -484,10 +390,7 @@ struct ProCapsule: View {
             }
             Text(self.title)
                 .font(.caption.weight(.semibold))
-                .lineLimit(1)
-                .minimumScaleFactor(0.78)
         }
-        .fixedSize(horizontal: true, vertical: false)
         .foregroundStyle(self.color)
         .padding(.horizontal, 10)
         .padding(.vertical, 7)
@@ -502,57 +405,6 @@ struct ProCapsule: View {
     }
 }
 
-struct OpenClawGatewayCompactPill: View {
-    @Environment(NodeAppModel.self) private var appModel
-
-    var body: some View {
-        ProCapsule(
-            title: self.title,
-            color: self.color,
-            icon: self.icon)
-            .accessibilityLabel("Gateway \(self.title)")
-    }
-
-    private var title: String {
-        switch GatewayStatusBuilder.build(appModel: self.appModel) {
-        case .connected:
-            "Online"
-        case .connecting:
-            "Connecting"
-        case .error:
-            "Attention"
-        case .disconnected:
-            "Offline"
-        }
-    }
-
-    private var color: Color {
-        switch GatewayStatusBuilder.build(appModel: self.appModel) {
-        case .connected:
-            OpenClawBrand.ok
-        case .connecting:
-            OpenClawBrand.accent
-        case .error:
-            OpenClawBrand.warn
-        case .disconnected:
-            .secondary
-        }
-    }
-
-    private var icon: String {
-        switch GatewayStatusBuilder.build(appModel: self.appModel) {
-        case .connected:
-            "checkmark.circle.fill"
-        case .connecting:
-            "arrow.triangle.2.circlepath"
-        case .error:
-            "exclamationmark.triangle.fill"
-        case .disconnected:
-            "wifi.slash"
-        }
-    }
-}
-
 struct ProSegmentedControl: View {
     @Environment(\.colorScheme) private var colorScheme
     let labels: [String]
@@ -679,120 +531,28 @@ struct ProMetricTile: View {
     }
 }
 
-struct ProMetric: Identifiable {
-    let id = UUID()
-    let icon: String
-    let title: String
-    let value: String
-    let color: Color
-}
-
-struct ProMetricGrid: View {
-    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
-    let metrics: [ProMetric]
-
-    var body: some View {
-        LazyVGrid(
-            columns: Array(repeating: GridItem(.flexible()), count: self.columnCount),
-            spacing: 10)
-        {
-            ForEach(self.metrics) { metric in
-                ProMetricTile(
-                    title: metric.title,
-                    value: metric.value,
-                    icon: metric.icon,
-                    color: metric.color)
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    private var columnCount: Int {
-        guard self.horizontalSizeClass != .compact else { return 1 }
-        return min(max(self.metrics.count, 1), 3)
-    }
-}
-
-struct ProPanelHeader: View {
-    let title: String
-    var value: String?
-    var actionTitle: String?
-    var actionIcon: String?
-    var actionAccessibilityLabel: String?
-    var isActionDisabled = false
-    var action: (() -> Void)?
-
-    var body: some View {
-        HStack(spacing: 8) {
-            Text(self.title)
-                .font(.subheadline.weight(.semibold))
-            if let value {
-                Text(value)
-                    .font(.caption2.weight(.bold))
-                    .foregroundStyle(.secondary)
-            }
-            Spacer(minLength: 8)
-            self.actionControl
-        }
-        .padding(.horizontal, 14)
-        .padding(.top, 12)
-        .padding(.bottom, 8)
-    }
-
-    @ViewBuilder
-    private var actionControl: some View {
-        if let action {
-            if let actionIcon {
-                Button(action: action) {
-                    Image(systemName: actionIcon)
-                }
-                .accessibilityLabel(self.actionAccessibilityLabel ?? self.actionTitle ?? self.title)
-                .disabled(self.isActionDisabled)
-            } else if let actionTitle {
-                Button(actionTitle, action: action)
-                    .font(.caption.weight(.semibold))
-                    .disabled(self.isActionDisabled)
-            }
-        }
-    }
-}
-
 struct ProStatusRow: View {
     let icon: String
     let title: String
     let detail: String
-    let value: String?
+    let value: String
     let color: Color
-    var actionTitle: String?
-    var action: (() -> Void)?
 
     var body: some View {
-        HStack(alignment: .top, spacing: 12) {
+        HStack(alignment: .center, spacing: 12) {
             ProIconBadge(systemName: self.icon, color: self.color)
             VStack(alignment: .leading, spacing: 4) {
                 Text(self.title)
                     .font(.subheadline.weight(.semibold))
-                    .lineLimit(1)
                 Text(self.detail)
                     .font(.caption)
                     .foregroundStyle(.secondary)
-                    .lineLimit(2)
+                    .lineLimit(1)
             }
             Spacer(minLength: 8)
-            VStack(alignment: .trailing, spacing: 6) {
-                if let value {
-                    ProValuePill(value: value, color: self.color)
-                }
-                if let actionTitle, let action {
-                    Button(actionTitle, action: action)
-                        .font(.caption.weight(.semibold))
-                        .buttonStyle(.bordered)
-                        .controlSize(.mini)
-                }
-            }
+            ProValuePill(value: self.value, color: self.color)
         }
-        .padding(.horizontal, 14)
-        .padding(.vertical, 10)
+        .padding(.vertical, 11)
     }
 }
 

apps/ios/Sources/Design/RootTabsPhoneControlHub.swift

@@ -1,417 +0,0 @@
-import OpenClawProtocol
-import SwiftUI
-
-struct RootTabsPhoneControlHub: View {
-    @Environment(NodeAppModel.self) private var appModel
-    @Environment(\.verticalSizeClass) private var verticalSizeClass
-    @State private var navigationPath: [RootTabs.SidebarDestination] = []
-    @State private var didApplyInitialDestination = false
-
-    let groups: [RootTabs.SidebarGroup]
-    let initialDestination: RootTabs.SidebarDestination?
-    let openRootDestination: (RootTabs.SidebarDestination) -> Void
-
-    var body: some View {
-        NavigationStack(path: self.$navigationPath) {
-            ZStack {
-                OpenClawProBackground()
-                ScrollView {
-                    VStack(alignment: .leading, spacing: self.isCompactHeight ? 10 : 16) {
-                        self.headerCard
-                        ForEach(self.groups) { group in
-                            self.groupSection(group)
-                        }
-                        self.versionFooter
-                    }
-                    .padding(.vertical, self.isCompactHeight ? 10 : 16)
-                }
-                .safeAreaPadding(.bottom, self.bottomScrollInset)
-            }
-            .navigationTitle("Control")
-            .navigationBarTitleDisplayMode(.inline)
-            .navigationDestination(for: RootTabs.SidebarDestination.self) { destination in
-                self.detail(for: destination)
-                    .navigationBarBackButtonHidden(true)
-                    .toolbar(.hidden, for: .navigationBar)
-            }
-            .onAppear {
-                self.applyInitialDestinationIfNeeded()
-            }
-        }
-    }
-
-    @ViewBuilder
-    private var headerCard: some View {
-        if self.isCompactHeight {
-            ProCard(padding: 8, radius: OpenClawProMetric.cardRadius) {
-                HStack(spacing: 12) {
-                    OpenClawProMark(size: 24, shadowRadius: 3)
-                    VStack(alignment: .leading, spacing: 3) {
-                        Text(self.sidebarActiveAgentTitle)
-                            .font(.subheadline.weight(.semibold))
-                            .lineLimit(1)
-                        Text(self.gatewayDisplayLabel)
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                            .lineLimit(1)
-                            .truncationMode(.middle)
-                    }
-                    Spacer(minLength: 8)
-                    ProValuePill(value: self.gatewayStateText, color: self.gatewayStateColor)
-                }
-            }
-            .padding(.horizontal, OpenClawProMetric.pagePadding)
-        } else {
-            ProCard(radius: OpenClawProMetric.cardRadius) {
-                VStack(alignment: .leading, spacing: 12) {
-                    HStack(spacing: 12) {
-                        OpenClawProMark(size: 32, shadowRadius: 4)
-                        VStack(alignment: .leading, spacing: 3) {
-                            Text(self.sidebarActiveAgentTitle)
-                                .font(.headline)
-                                .lineLimit(1)
-                            Text(self.gatewayDisplayLabel)
-                                .font(.caption)
-                                .foregroundStyle(.secondary)
-                                .lineLimit(1)
-                                .truncationMode(.middle)
-                        }
-                        Spacer(minLength: 8)
-                        ProValuePill(value: self.gatewayStateText, color: self.gatewayStateColor)
-                    }
-
-                    self.gatewayActionRow
-                }
-            }
-            .padding(.horizontal, OpenClawProMetric.pagePadding)
-        }
-    }
-
-    private var gatewayActionRow: some View {
-        Button {
-            self.openRootDestination(.gateway)
-        } label: {
-            HStack(spacing: 10) {
-                ProStatusDot(color: self.gatewayStateColor)
-                VStack(alignment: .leading, spacing: 2) {
-                    Text(self.gatewayStateText)
-                        .font(.subheadline.weight(.semibold))
-                        .foregroundStyle(.primary)
-                    Text(self.gatewayDisplayLabel)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .lineLimit(1)
-                        .truncationMode(.middle)
-                }
-                Spacer(minLength: 8)
-                Text(self.gatewayActionTitle)
-                    .font(.caption.weight(.semibold))
-                    .foregroundStyle(OpenClawBrand.accent)
-                Image(systemName: "chevron.right")
-                    .font(.caption2.weight(.bold))
-                    .foregroundStyle(.secondary)
-            }
-            .padding(10)
-            .background(Color.primary.opacity(0.055), in: RoundedRectangle(cornerRadius: 8, style: .continuous))
-        }
-        .buttonStyle(.plain)
-        .accessibilityLabel("Gateway \(self.gatewayStateText)")
-        .accessibilityHint("Opens Settings / Gateway")
-    }
-
-    private func groupSection(_ group: RootTabs.SidebarGroup) -> some View {
-        VStack(alignment: .leading, spacing: self.isCompactHeight ? 6 : 8) {
-            ProSectionHeader(title: group.title.capitalized)
-            ProCard(padding: 0, radius: OpenClawProMetric.cardRadius) {
-                VStack(spacing: 0) {
-                    ForEach(Array(group.destinations.enumerated()), id: \.element.id) { index, destination in
-                        if index > 0 {
-                            Divider().padding(.leading, 58)
-                        }
-                        self.destinationRow(destination)
-                    }
-                }
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    @ViewBuilder
-    private func destinationRow(_ destination: RootTabs.SidebarDestination) -> some View {
-        if self.opensRootTab(destination) {
-            Button {
-                self.openRootDestination(destination)
-            } label: {
-                self.rowLabel(destination)
-            }
-            .buttonStyle(.plain)
-        } else {
-            Button {
-                self.navigationPath.append(destination)
-            } label: {
-                self.rowLabel(destination)
-            }
-            .buttonStyle(.plain)
-        }
-    }
-
-    private func rowLabel(_ destination: RootTabs.SidebarDestination) -> some View {
-        HStack(alignment: .center, spacing: 12) {
-            ProIconBadge(systemName: destination.systemImage, color: self.color(for: destination))
-            VStack(alignment: .leading, spacing: 3) {
-                Text(destination.title)
-                    .font(.subheadline.weight(.semibold))
-                    .foregroundStyle(.primary)
-                Text(destination.subtitle)
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .lineLimit(1)
-            }
-            Spacer(minLength: 8)
-            Image(systemName: "chevron.right")
-                .font(.caption2.weight(.bold))
-                .foregroundStyle(.secondary)
-        }
-        .padding(.vertical, self.isCompactHeight ? 8 : 10)
-        .padding(.horizontal, 14)
-        .contentShape(Rectangle())
-    }
-
-    private var versionFooter: some View {
-        ProCard(radius: OpenClawProMetric.cardRadius) {
-            HStack {
-                Spacer()
-                Text("v\(DeviceInfoHelper.openClawVersionString())")
-                    .font(.caption.weight(.semibold))
-                    .foregroundStyle(.secondary)
-                    .lineLimit(1)
-                Spacer()
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    @ViewBuilder
-    private func detail(for destination: RootTabs.SidebarDestination) -> some View {
-        switch destination {
-        case .chat, .talk, .agents, .gateway:
-            EmptyView()
-        case .overview:
-            CommandCenterTab(
-                headerTitle: "Overview",
-                headerLeadingAction: self.phoneDetailBackAction,
-                showsHeaderMark: false,
-                openChat: { self.openRootDestination(.chat) },
-                openSettings: { self.openRootDestination(.gateway) })
-        case .activity:
-            IPadActivityScreen(
-                headerLeadingAction: self.phoneDetailBackAction,
-                openChat: { self.openRootDestination(.chat) },
-                openSettings: { self.openRootDestination(.gateway) })
-        case .workboard:
-            IPadWorkboardScreen(
-                headerLeadingAction: self.phoneDetailBackAction,
-                openChat: { self.openRootDestination(.chat) },
-                openSettings: { self.openRootDestination(.gateway) })
-        case .skillWorkshop:
-            IPadSkillWorkshopScreen(
-                headerLeadingAction: self.phoneDetailBackAction,
-                openSettings: { self.openRootDestination(.gateway) })
-        case .instances:
-            AgentProTab(
-                directRoute: .instances,
-                headerLeadingAction: self.phoneDetailBackAction,
-                headerTitle: "Instances",
-                openSettings: { self.openRootDestination(.gateway) })
-        case .sessions:
-            CommandSessionsScreen(
-                headerLeadingAction: self.phoneDetailBackAction,
-                openChat: { self.openRootDestination(.chat) })
-        case .dreaming:
-            AgentProTab(
-                directRoute: .dreaming,
-                headerLeadingAction: self.phoneDetailBackAction,
-                headerTitle: "Dreaming",
-                openSettings: { self.openRootDestination(.gateway) })
-        case .usage:
-            AgentProTab(
-                directRoute: .usage,
-                headerLeadingAction: self.phoneDetailBackAction,
-                headerTitle: "Usage",
-                openSettings: { self.openRootDestination(.gateway) })
-        case .cron:
-            AgentProTab(
-                directRoute: .cron,
-                headerLeadingAction: self.phoneDetailBackAction,
-                headerTitle: "Cron Jobs",
-                openSettings: { self.openRootDestination(.gateway) })
-        case .docs:
-            OpenClawDocsScreen(
-                headerLeadingAction: self.phoneDetailBackAction,
-                gatewayAction: { self.openRootDestination(.gateway) })
-        case .settings:
-            EmptyView()
-        }
-    }
-
-    private var phoneDetailBackAction: OpenClawSidebarHeaderAction {
-        OpenClawSidebarHeaderAction(
-            systemName: "chevron.left",
-            accessibilityLabel: "Back to Control",
-            accessibilityIdentifier: "OpenClawPhoneDetailBackButton",
-            action: { self.popPhoneDetail() })
-    }
-
-    private func popPhoneDetail() {
-        guard !self.navigationPath.isEmpty else { return }
-        self.navigationPath.removeLast()
-    }
-
-    private func opensRootTab(_ destination: RootTabs.SidebarDestination) -> Bool {
-        RootTabs.shouldOpenRootTabFromPhoneHub(destination)
-    }
-
-    private func applyInitialDestinationIfNeeded() {
-        guard !self.didApplyInitialDestination else { return }
-        self.didApplyInitialDestination = true
-        guard let initialDestination, initialDestination != .overview else { return }
-        if self.opensRootTab(initialDestination) {
-            self.openRootDestination(initialDestination)
-        } else {
-            self.navigationPath = [initialDestination]
-        }
-    }
-
-    private var sidebarActiveAgentTitle: String {
-        let selectedID = self.normalized(self.appModel.selectedAgentId) ?? self.resolveDefaultAgentID()
-        if let agent = self.appModel.gatewayAgents.first(where: { $0.id == selectedID }) {
-            return self.agentTitle(for: agent)
-        }
-        return self.normalized(self.appModel.activeAgentName) ?? "Default Agent"
-    }
-
-    private var gatewayDisplayLabel: String {
-        self.normalized(self.appModel.gatewayServerName)
-            ?? self.normalized(self.appModel.gatewayRemoteAddress)
-            ?? self.appModel.gatewayDisplayStatusText
-    }
-
-    private var gatewayStateText: String {
-        switch GatewayStatusBuilder.build(appModel: self.appModel) {
-        case .connected: "Online"
-        case .connecting: "Connecting"
-        case .error: "Attention"
-        case .disconnected: "Offline"
-        }
-    }
-
-    private var gatewayStateColor: Color {
-        switch GatewayStatusBuilder.build(appModel: self.appModel) {
-        case .connected:
-            OpenClawBrand.ok
-        case .connecting:
-            OpenClawBrand.accent
-        case .error:
-            OpenClawBrand.warn
-        case .disconnected:
-            .secondary
-        }
-    }
-
-    private var gatewayActionTitle: String {
-        switch GatewayStatusBuilder.build(appModel: self.appModel) {
-        case .connected:
-            "Manage"
-        case .connecting:
-            "Details"
-        case .error:
-            "Fix"
-        case .disconnected:
-            "Connect"
-        }
-    }
-
-    private var isCompactHeight: Bool {
-        self.verticalSizeClass == .compact
-    }
-
-    private var bottomScrollInset: CGFloat {
-        Self.bottomScrollInset(verticalSizeClass: self.verticalSizeClass)
-    }
-
-    static func bottomScrollInset(verticalSizeClass: UserInterfaceSizeClass?) -> CGFloat {
-        verticalSizeClass == .compact ? 72 : 112
-    }
-
-    private func color(for destination: RootTabs.SidebarDestination) -> Color {
-        switch destination {
-        case .chat, .talk, .overview, .gateway:
-            OpenClawBrand.accent
-        case .instances:
-            Color.secondary
-        case .activity, .usage, .docs:
-            OpenClawBrand.accentHot
-        case .agents, .workboard, .skillWorkshop, .sessions, .dreaming, .cron, .settings:
-            OpenClawBrand.ok
-        }
-    }
-
-    private func resolveDefaultAgentID() -> String {
-        self.normalized(self.appModel.gatewayDefaultAgentId) ?? ""
-    }
-
-    private func agentTitle(for agent: AgentSummary) -> String {
-        let name = self.normalized(agent.name) ?? agent.id
-        return name == agent.id ? name : "\(name) (\(agent.id))"
-    }
-
-    private func normalized(_ value: String?) -> String? {
-        guard let value else { return nil }
-        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
-        return trimmed.isEmpty ? nil : trimmed
-    }
-}
-
-#if DEBUG
-#Preview("Phone control hub offline") {
-    RootTabsPhoneControlHub.preview(appModel: NodeAppModel())
-}
-
-#Preview("Phone control hub connected") {
-    let appModel = NodeAppModel()
-    appModel.enterAppleReviewDemoMode()
-    return RootTabsPhoneControlHub.preview(appModel: appModel)
-}
-
-#Preview("Phone control hub connecting") {
-    let appModel = NodeAppModel()
-    appModel.gatewayStatusText = "Connecting..."
-    return RootTabsPhoneControlHub.preview(appModel: appModel)
-}
-
-#Preview("Phone control hub gateway error") {
-    let appModel = NodeAppModel()
-    appModel.gatewayStatusText = "Gateway error: connection refused"
-    return RootTabsPhoneControlHub.preview(appModel: appModel)
-}
-
-#Preview(
-    "Phone control hub landscape",
-    traits: .fixedLayout(width: 852, height: 393),
-    .landscapeLeft)
-{
-    RootTabsPhoneControlHub.preview(appModel: NodeAppModel())
-        .environment(\.horizontalSizeClass, .regular)
-        .environment(\.verticalSizeClass, .compact)
-}
-
-extension RootTabsPhoneControlHub {
-    fileprivate static func preview(appModel: NodeAppModel) -> some View {
-        RootTabsPhoneControlHub(
-            groups: RootTabs.phoneControlGroups,
-            initialDestination: nil,
-            openRootDestination: { _ in })
-            .environment(appModel)
-    }
-}
-#endif

apps/ios/Sources/Design/SettingsChannelsDestination.swift

@@ -1,726 +0,0 @@
-import OpenClawKit
-import OpenClawProtocol
-import SwiftUI
-
-struct SettingsChannelsDestination: View {
-    @Environment(NodeAppModel.self) private var appModel
-    @Environment(\.scenePhase) private var scenePhase
-    let showsSummaryCard: Bool
-    @State private var snapshot: ChannelsStatusResult?
-    @State private var isLoading = false
-    @State private var errorText: String?
-    @State private var busyOperation: SettingsChannelOperation?
-
-    init(showsSummaryCard: Bool = true) {
-        self.showsSummaryCard = showsSummaryCard
-    }
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 14) {
-            if self.showsSummaryCard {
-                self.summaryCard
-            }
-            self.channelsCard
-        }
-        .task(id: self.refreshID) {
-            await self.loadChannels(force: false)
-        }
-        .refreshable {
-            await self.loadChannels(force: true)
-        }
-    }
-
-    private var summaryCard: some View {
-        ProCard(radius: SettingsLayout.cardRadius) {
-            HStack(spacing: 12) {
-                ProIconBadge(systemName: "point.3.connected.trianglepath.dotted", color: self.summaryColor)
-                VStack(alignment: .leading, spacing: 3) {
-                    Text("Channels / Integrations")
-                        .font(.headline)
-                    Text(self.summaryDetail)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                }
-                Spacer(minLength: 8)
-                ProValuePill(value: self.summaryValue, color: self.summaryColor)
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    private var channelsCard: some View {
-        ProCard(padding: 0, radius: SettingsLayout.cardRadius) {
-            VStack(spacing: 0) {
-                ProPanelHeader(
-                    title: "Message Routing",
-                    value: self.headerValue,
-                    actionIcon: self.isLoading ? "hourglass" : "arrow.clockwise",
-                    actionAccessibilityLabel: "Refresh Channels",
-                    isActionDisabled: self.isLoading,
-                    action: {
-                        Task { await self.loadChannels(force: true) }
-                    })
-
-                if let errorText {
-                    ProStatusRow(
-                        icon: "exclamationmark.triangle",
-                        title: "Channel status unavailable",
-                        detail: errorText,
-                        value: "error",
-                        color: OpenClawBrand.warn)
-                } else if !self.canRead {
-                    ProStatusRow(
-                        icon: "wifi.slash",
-                        title: "Gateway offline",
-                        detail: "Connect to the gateway to load installed channels, accounts, and routing status.",
-                        value: "offline",
-                        color: .secondary)
-                } else if self.isLoading, self.snapshot == nil {
-                    ProStatusRow(
-                        icon: "hourglass",
-                        title: "Loading channels",
-                        detail: "Fetching installed channels, accounts, and routing status from the gateway.",
-                        value: "loading",
-                        color: OpenClawBrand.accent)
-                } else if self.channelEntries.isEmpty {
-                    ProStatusRow(
-                        icon: "tray",
-                        title: "No channel plugins reported",
-                        detail: "Install or enable channel plugins on the gateway, then refresh.",
-                        value: "empty",
-                        color: .secondary)
-                } else {
-                    ForEach(Array(self.channelEntries.enumerated()), id: \.element.id) { index, entry in
-                        if index > 0 {
-                            Divider().padding(.leading, 58)
-                        }
-                        SettingsChannelRow(
-                            entry: entry,
-                            canAdmin: self.canAdmin,
-                            busyOperation: self.busyOperation,
-                            start: { accountID in
-                                Task { await self.run(.start, channelID: entry.id, accountID: accountID) }
-                            },
-                            stop: { accountID in
-                                Task { await self.run(.stop, channelID: entry.id, accountID: accountID) }
-                            },
-                            logout: { accountID in
-                                Task { await self.run(.logout, channelID: entry.id, accountID: accountID) }
-                            })
-                    }
-                }
-            }
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    private var refreshID: String {
-        [
-            self.canRead ? "connected" : "offline",
-            self.scenePhase == .active ? "active" : "inactive",
-        ].joined(separator: ":")
-    }
-
-    private var canRead: Bool {
-        self.appModel.isOperatorGatewayConnected
-    }
-
-    private var canAdmin: Bool {
-        self.appModel.hasOperatorAdminScope
-    }
-
-    static func shouldEnableChannelOperation(canRead: Bool, hasOperatorAdminScope: Bool) -> Bool {
-        canRead && hasOperatorAdminScope
-    }
-
-    private var headerValue: String? {
-        if self.isLoading { return "Loading" }
-        guard self.canRead else { return "Offline" }
-        return "\(self.channelEntries.count)"
-    }
-
-    private var summaryDetail: String {
-        guard self.canRead else {
-            return "Connect to load channel integrations."
-        }
-        if let errorText {
-            return errorText
-        }
-        return "Installed channel clients, account state, and message-routing readiness."
-    }
-
-    private var summaryValue: String {
-        guard self.canRead else { return "offline" }
-        if self.isLoading { return "loading" }
-        if self.errorText != nil { return "error" }
-        let configured = self.channelEntries.count(where: { $0.configured })
-        return "\(configured)/\(self.channelEntries.count)"
-    }
-
-    private var summaryColor: Color {
-        guard self.canRead else { return .secondary }
-        if self.errorText != nil { return OpenClawBrand.warn }
-        return self.channelEntries.contains(where: { $0.running || $0.connected }) ? OpenClawBrand.ok : OpenClawBrand
-            .accent
-    }
-
-    private var channelEntries: [SettingsChannelEntry] {
-        guard let snapshot else { return [] }
-        let ids = snapshot.channelorder.isEmpty ? Array(snapshot.channels.keys).sorted() : snapshot.channelorder
-        return ids.map { self.entry(channelID: $0, snapshot: snapshot) }
-    }
-
-    private func entry(channelID: String, snapshot: ChannelsStatusResult) -> SettingsChannelEntry {
-        let summary = snapshot.channels[channelID]?.dictionaryValue ?? [:]
-        let accounts = self.accounts(channelID: channelID, snapshot: snapshot)
-        let configured = accounts.contains(where: \.configured) || summary["configured"]?.boolValue == true
-        let running = accounts.contains(where: \.running)
-        let connected = accounts.contains(where: \.connected)
-        let linked = accounts.contains(where: \.linked)
-        let label = snapshot.channellabels[channelID]?.stringValue ?? Self.fallbackLabel(channelID)
-        let detail = snapshot.channeldetaillabels?[channelID]?.stringValue ?? Self.fallbackDetail(channelID)
-        let systemImage = snapshot.channelsystemimages?[channelID]?.stringValue ?? Self.fallbackSystemImage(channelID)
-        let lastActivity = accounts.compactMap(\.lastActivityMs).max()
-        let lastError = accounts.compactMap(\.lastError).first ?? summary["lastError"]?.stringValue
-        return SettingsChannelEntry(
-            id: channelID,
-            label: label,
-            detail: detail,
-            systemImage: systemImage,
-            configured: configured,
-            running: running,
-            connected: connected,
-            linked: linked,
-            lastActivityText: lastActivity.map(Self.relativeTime),
-            lastError: lastError,
-            unavailableReason: configured ? nil : "Configure this channel on the gateway.",
-            accounts: accounts)
-    }
-
-    private func accounts(channelID: String, snapshot: ChannelsStatusResult) -> [SettingsChannelAccount] {
-        let rawAccounts = snapshot.channelaccounts[channelID]?.arrayValue ?? []
-        return rawAccounts.compactMap { raw in
-            guard let dict = raw.dictionaryValue else { return nil }
-            let accountID = dict["accountId"]?.stringValue ?? "default"
-            let name = dict["name"]?.stringValue
-            let lastActivity = [
-                dict["lastInboundAt"]?.intValue,
-                dict["lastOutboundAt"]?.intValue,
-                dict["lastTransportActivityAt"]?.intValue,
-            ]
-                .compactMap(\.self)
-                .max()
-            return SettingsChannelAccount(
-                id: accountID,
-                name: name,
-                configured: dict["configured"]?.boolValue == true,
-                enabled: dict["enabled"]?.boolValue != false,
-                running: dict["running"]?.boolValue == true,
-                connected: dict["connected"]?.boolValue == true,
-                linked: dict["linked"]?.boolValue == true,
-                healthState: dict["healthState"]?.stringValue,
-                lastError: dict["lastError"]?.stringValue,
-                lastActivityMs: lastActivity)
-        }
-    }
-
-    private func loadChannels(force: Bool) async {
-        guard self.scenePhase == .active else { return }
-        guard self.canRead else {
-            self.snapshot = nil
-            self.errorText = nil
-            return
-        }
-        if self.isLoading { return }
-
-        self.isLoading = true
-        self.errorText = nil
-        defer { self.isLoading = false }
-
-        do {
-            let params = ChannelsStatusParams(probe: false, timeoutms: 10000, channel: nil)
-            let data = try await self.request(method: "channels.status", params: params, timeoutSeconds: 12)
-            self.snapshot = try JSONDecoder().decode(ChannelsStatusResult.self, from: data)
-        } catch {
-            if force || self.snapshot == nil {
-                self.errorText = Self.message(for: error)
-            }
-        }
-    }
-
-    private func run(_ kind: SettingsChannelOperation.Kind, channelID: String, accountID: String?) async {
-        guard Self.shouldEnableChannelOperation(canRead: self.canRead, hasOperatorAdminScope: self.canAdmin),
-              self.busyOperation == nil
-        else {
-            return
-        }
-        self.busyOperation = SettingsChannelOperation(kind: kind, channelID: channelID, accountID: accountID)
-        self.errorText = nil
-        defer { self.busyOperation = nil }
-
-        do {
-            switch kind {
-            case .start:
-                let params = ChannelsStartParams(channel: channelID, accountid: accountID)
-                _ = try await self.request(method: "channels.start", params: params, timeoutSeconds: 20)
-            case .stop:
-                let params = ChannelsStopParams(channel: channelID, accountid: accountID)
-                _ = try await self.request(method: "channels.stop", params: params, timeoutSeconds: 20)
-            case .logout:
-                let params = ChannelsLogoutParams(channel: channelID, accountid: accountID)
-                _ = try await self.request(method: "channels.logout", params: params, timeoutSeconds: 20)
-            }
-            await self.loadChannels(force: true)
-        } catch {
-            self.errorText = Self.message(for: error)
-        }
-    }
-
-    private func request(method: String, params: some Encodable, timeoutSeconds: Int) async throws -> Data {
-        let data = try JSONEncoder().encode(params)
-        guard let json = String(data: data, encoding: .utf8) else {
-            throw SettingsChannelError.invalidPayload
-        }
-        return try await self.appModel.operatorSession.request(
-            method: method,
-            paramsJSON: json,
-            timeoutSeconds: timeoutSeconds)
-    }
-
-    static func fallbackLabel(_ id: String) -> String {
-        if let metadata = self.fallbackMetadata[id.lowercased()] {
-            return metadata.label
-        }
-        return id.replacingOccurrences(of: "-", with: " ")
-            .replacingOccurrences(of: "_", with: " ")
-            .split(separator: " ")
-            .map { $0.prefix(1).uppercased() + $0.dropFirst() }
-            .joined(separator: " ")
-    }
-
-    static func fallbackDetail(_ id: String) -> String {
-        self.fallbackMetadata[id.lowercased()]?.detail ?? "Channel integration"
-    }
-
-    static func fallbackSystemImage(_ id: String) -> String {
-        self.fallbackMetadata[id.lowercased()]?.systemImage ?? "bubble.left.and.text.bubble.right"
-    }
-
-    private static let fallbackMetadata: [String: SettingsChannelFallbackMetadata] = [
-        "clickclack": SettingsChannelFallbackMetadata(
-            label: "ClickClack",
-            detail: "Self-hosted chat bot routing.",
-            systemImage: "bubble.left.and.bubble.right"),
-    ]
-
-    private static func relativeTime(_ milliseconds: Int) -> String {
-        let age = max(0, Int(Date().timeIntervalSince1970 * 1000) - milliseconds)
-        let minutes = age / 60000
-        if minutes < 1 { return "now" }
-        if minutes < 60 { return "\(minutes)m ago" }
-        let hours = minutes / 60
-        if hours < 24 { return "\(hours)h ago" }
-        return "\(hours / 24)d ago"
-    }
-
-    private static func message(for error: Error) -> String {
-        if let channelError = error as? SettingsChannelError {
-            return channelError.message
-        }
-        return error.localizedDescription
-    }
-}
-
-struct SettingsChannelsScreen: View {
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-    let gatewayAction: (() -> Void)?
-
-    init(headerLeadingAction: OpenClawSidebarHeaderAction? = nil, gatewayAction: (() -> Void)? = nil) {
-        self.headerLeadingAction = headerLeadingAction
-        self.gatewayAction = gatewayAction
-    }
-
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 14) {
-                    self.header
-                    SettingsChannelsDestination(showsSummaryCard: false)
-                }
-                .padding(.top, 18)
-                .padding(.bottom, OpenClawProMetric.bottomScrollInset)
-            }
-        }
-        .navigationTitle("Channels")
-        .navigationBarTitleDisplayMode(.inline)
-    }
-
-    private var header: some View {
-        HStack(alignment: .top, spacing: 12) {
-            if let headerLeadingAction {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            }
-
-            VStack(alignment: .leading, spacing: 5) {
-                Text("Channels / Integrations")
-                    .font(.title3.weight(.semibold))
-                Text("Message routing and external channel clients.")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                    .fixedSize(horizontal: false, vertical: true)
-            }
-            Spacer(minLength: 8)
-            self.gatewayPill
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-    }
-
-    @ViewBuilder
-    private var gatewayPill: some View {
-        if let gatewayAction {
-            Button(action: gatewayAction) {
-                OpenClawGatewayCompactPill()
-            }
-            .buttonStyle(.plain)
-            .accessibilityHint("Opens Settings / Gateway")
-        } else {
-            OpenClawGatewayCompactPill()
-        }
-    }
-}
-
-private struct SettingsChannelRow: View {
-    let entry: SettingsChannelEntry
-    let canAdmin: Bool
-    let busyOperation: SettingsChannelOperation?
-    let start: (String?) -> Void
-    let stop: (String?) -> Void
-    let logout: (String?) -> Void
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 10) {
-            HStack(alignment: .top, spacing: 12) {
-                ProIconBadge(systemName: self.entry.systemImage, color: self.entry.color)
-                VStack(alignment: .leading, spacing: 4) {
-                    Text(self.entry.label)
-                        .font(.subheadline.weight(.semibold))
-                    Text(self.entry.detailText)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                        .fixedSize(horizontal: false, vertical: true)
-                    if let lastError = self.entry.lastError {
-                        Text(lastError)
-                            .font(.caption2.weight(.medium))
-                            .foregroundStyle(OpenClawBrand.warn)
-                            .lineLimit(2)
-                    }
-                }
-                Spacer(minLength: 8)
-                ProValuePill(value: self.entry.statusValue, color: self.entry.color)
-            }
-
-            if !self.entry.accounts.isEmpty {
-                VStack(spacing: 0) {
-                    ForEach(Array(self.entry.accounts.enumerated()), id: \.element.id) { index, account in
-                        if index > 0 {
-                            Divider().padding(.leading, 38)
-                        }
-                        self.accountRow(account)
-                    }
-                }
-            }
-        }
-        .padding(.horizontal, 14)
-        .padding(.vertical, 10)
-    }
-
-    private func accountRow(_ account: SettingsChannelAccount) -> some View {
-        HStack(spacing: 10) {
-            Image(systemName: account.running || account.connected ? "checkmark.circle.fill" : "circle")
-                .foregroundStyle(account.color)
-                .frame(width: 28, height: 28)
-            VStack(alignment: .leading, spacing: 2) {
-                Text(account.displayName)
-                    .font(.caption.weight(.semibold))
-                Text(account.detailText)
-                    .font(.caption2)
-                    .foregroundStyle(.secondary)
-                    .lineLimit(1)
-            }
-            Spacer(minLength: 8)
-            Menu {
-                if account.running {
-                    Button("Stop") {
-                        self.stop(account.id)
-                    }
-                } else {
-                    Button("Start") {
-                        self.start(account.id)
-                    }
-                    .disabled(!account.configured || !account.enabled)
-                }
-                if account.linked {
-                    Button("Logout", role: .destructive) {
-                        self.logout(account.id)
-                    }
-                }
-            } label: {
-                Image(systemName: self.actionMenuIcon(account))
-            }
-            .buttonStyle(.bordered)
-            .controlSize(.mini)
-            .disabled(!self.canAdmin || self.isBusy(account))
-        }
-        .padding(.vertical, 8)
-    }
-
-    private func actionMenuIcon(_ account: SettingsChannelAccount) -> String {
-        if self.isBusy(account) {
-            return "hourglass"
-        }
-        if !self.canAdmin {
-            return "lock.shield"
-        }
-        return "ellipsis.circle"
-    }
-
-    private func isBusy(_ account: SettingsChannelAccount) -> Bool {
-        self.busyOperation?.channelID == self.entry.id && self.busyOperation?.accountID == account.id
-    }
-}
-
-private struct SettingsChannelEntry: Identifiable {
-    let id: String
-    let label: String
-    let detail: String
-    let systemImage: String
-    let configured: Bool
-    let running: Bool
-    let connected: Bool
-    let linked: Bool
-    let lastActivityText: String?
-    let lastError: String?
-    let unavailableReason: String?
-    let accounts: [SettingsChannelAccount]
-
-    var color: Color {
-        if self.connected || self.running { return OpenClawBrand.ok }
-        if self.lastError != nil { return OpenClawBrand.warn }
-        return self.configured ? OpenClawBrand.accent : .secondary
-    }
-
-    var statusValue: String {
-        if self.connected { return "connected" }
-        if self.running { return "running" }
-        if self.linked { return "linked" }
-        if self.configured { return "configured" }
-        return "not set"
-    }
-
-    var detailText: String {
-        if let lastActivityText {
-            return "\(self.detail) • active \(lastActivityText)"
-        }
-        if let unavailableReason {
-            return unavailableReason
-        }
-        return self.detail
-    }
-}
-
-private struct SettingsChannelFallbackMetadata {
-    let label: String
-    let detail: String
-    let systemImage: String
-}
-
-private struct SettingsChannelAccount: Identifiable {
-    let id: String
-    let name: String?
-    let configured: Bool
-    let enabled: Bool
-    let running: Bool
-    let connected: Bool
-    let linked: Bool
-    let healthState: String?
-    let lastError: String?
-    let lastActivityMs: Int?
-
-    var displayName: String {
-        let trimmedName = self.name?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        return trimmedName.isEmpty ? self.id : "\(trimmedName) (\(self.id))"
-    }
-
-    var detailText: String {
-        let state = if self.connected {
-            "connected"
-        } else if self.running {
-            "running"
-        } else if self.linked {
-            "linked"
-        } else if self.configured {
-            "configured"
-        } else {
-            "not configured"
-        }
-        let enabledText = self.enabled ? "enabled" : "disabled"
-        if let healthState, !healthState.isEmpty {
-            return "\(state), \(enabledText), \(healthState)"
-        }
-        if let lastError, !lastError.isEmpty {
-            return "\(state), \(enabledText), error"
-        }
-        return "\(state), \(enabledText)"
-    }
-
-    var color: Color {
-        if self.connected || self.running { return OpenClawBrand.ok }
-        if self.lastError != nil { return OpenClawBrand.warn }
-        return self.configured ? OpenClawBrand.accent : .secondary
-    }
-}
-
-private struct SettingsChannelOperation: Equatable {
-    enum Kind {
-        case start
-        case stop
-        case logout
-    }
-
-    let kind: Kind
-    let channelID: String
-    let accountID: String?
-}
-
-private enum SettingsChannelError: Error {
-    case invalidPayload
-
-    var message: String {
-        switch self {
-        case .invalidPayload:
-            "Could not encode channel request."
-        }
-    }
-}
-
-#if DEBUG
-#Preview("Channels states") {
-    SettingsChannelsStatesPreview()
-}
-
-private struct SettingsChannelsStatesPreview: View {
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 16) {
-                    self.stateSection("Connected") {
-                        SettingsChannelRow(
-                            entry: Self.telegramEntry,
-                            canAdmin: true,
-                            busyOperation: nil,
-                            start: { _ in },
-                            stop: { _ in },
-                            logout: { _ in })
-                    }
-
-                    self.stateSection("Loading") {
-                        ProPanelHeader(
-                            title: "Message Routing",
-                            value: "Loading",
-                            actionIcon: "hourglass",
-                            actionAccessibilityLabel: "Refresh Channels",
-                            isActionDisabled: true,
-                            action: {})
-                        ProStatusRow(
-                            icon: "hourglass",
-                            title: "Loading channel status",
-                            detail: "Checking installed channel clients and account state.",
-                            value: "loading",
-                            color: OpenClawBrand.accent)
-                    }
-
-                    self.stateSection("Empty") {
-                        ProPanelHeader(
-                            title: "Message Routing",
-                            value: "0",
-                            actionIcon: "arrow.clockwise",
-                            actionAccessibilityLabel: "Refresh Channels",
-                            action: {})
-                        ProStatusRow(
-                            icon: "tray",
-                            title: "No channel plugins reported",
-                            detail: "Install or enable channel plugins on the gateway, then refresh.",
-                            value: "empty",
-                            color: .secondary)
-                    }
-
-                    self.stateSection("Error") {
-                        ProStatusRow(
-                            icon: "exclamationmark.triangle",
-                            title: "Channel status unavailable",
-                            detail: "Gateway returned an unexpected channel status response.",
-                            value: "error",
-                            color: OpenClawBrand.warn)
-                    }
-
-                    self.stateSection("Offline") {
-                        ProStatusRow(
-                            icon: "wifi.slash",
-                            title: "Gateway offline",
-                            detail: "Connect to the gateway to load installed channels, accounts, and routing status.",
-                            value: "offline",
-                            color: .secondary)
-                    }
-                }
-                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                .padding(.vertical, 18)
-            }
-        }
-    }
-
-    private func stateSection(
-        _ title: String,
-        @ViewBuilder content: () -> some View) -> some View
-    {
-        VStack(alignment: .leading, spacing: 8) {
-            Text(title)
-                .font(.subheadline.weight(.semibold))
-                .foregroundStyle(.secondary)
-            ProCard(padding: 0, radius: SettingsLayout.cardRadius) {
-                VStack(spacing: 0) {
-                    content()
-                }
-            }
-        }
-    }
-
-    private static let telegramEntry = SettingsChannelEntry(
-        id: "telegram",
-        label: "Telegram",
-        detail: "Message routing client",
-        systemImage: "paperplane",
-        configured: true,
-        running: true,
-        connected: true,
-        linked: true,
-        lastActivityText: "4m ago",
-        lastError: nil,
-        unavailableReason: nil,
-        accounts: [
-            SettingsChannelAccount(
-                id: "main",
-                name: "OpenClaw Ops",
-                configured: true,
-                enabled: true,
-                running: true,
-                connected: true,
-                linked: true,
-                healthState: "healthy",
-                lastError: nil,
-                lastActivityMs: nil),
-        ])
-}
-#endif

apps/ios/Sources/Design/SettingsProTab.swift

@@ -58,38 +58,9 @@ struct SettingsProTab: View {
     @State var diagnosticsLastRunText = "Not run"
     @State var diagnosticsIssueCount: Int?
     @State var showTalkIssueDetails = false
-    @State private var navigationPath: [SettingsRoute] = []
-    let initialRoute: SettingsRoute?
-    let directRoute: SettingsRoute?
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
-
-    init(
-        initialRoute: SettingsRoute? = nil,
-        directRoute: SettingsRoute? = nil,
-        headerLeadingAction: OpenClawSidebarHeaderAction? = nil)
-    {
-        self.initialRoute = initialRoute
-        self.directRoute = directRoute
-        self.headerLeadingAction = headerLeadingAction
-    }
 
     var body: some View {
-        self.settingsModalPresentation(
-            self.settingsLifecycle(
-                self.settingsContent))
-    }
-
-    @ViewBuilder
-    private var settingsContent: some View {
-        if let directRoute {
-            self.destination(for: directRoute)
-        } else {
-            self.settingsNavigationStack
-        }
-    }
-
-    private var settingsNavigationStack: some View {
-        NavigationStack(path: self.$navigationPath) {
+        NavigationStack {
             ZStack {
                 OpenClawProBackground()
                 ScrollView {
@@ -107,17 +78,11 @@ struct SettingsProTab: View {
             .navigationDestination(for: SettingsRoute.self) { route in
                 self.destination(for: route)
             }
-        }
-    }
-
-    private func settingsLifecycle(_ content: some View) -> some View {
-        content
             .task {
                 self.previousLocationModeRaw = self.locationModeRaw
                 self.syncSettingsState()
                 self.refreshNotificationSettings()
                 self.applyPendingGatewaySetupLinkIfNeeded()
-                self.applyInitialRouteIfNeeded()
             }
             .onChange(of: self.scenePhase) { _, phase in
                 if phase == .active {
@@ -154,76 +119,66 @@ struct SettingsProTab: View {
             .onChange(of: self.appModel.gatewaySetupRequestID) { _, _ in
                 self.applyPendingGatewaySetupLinkIfNeeded()
             }
-    }
-
-    private func settingsModalPresentation(_ content: some View) -> some View {
-        content
-            .sheet(isPresented: self.$showGatewayProblemDetails) {
-                if let gatewayProblem = self.appModel.lastGatewayProblem {
-                    GatewayProblemDetailsSheet(
-                        problem: gatewayProblem,
-                        primaryActionTitle: self.gatewayProblemPrimaryActionTitle(gatewayProblem),
-                        onPrimaryAction: {
-                            Task { await self.handleGatewayProblemPrimaryAction(gatewayProblem) }
-                        })
-                }
+        }
+        .sheet(isPresented: self.$showGatewayProblemDetails) {
+            if let gatewayProblem = self.appModel.lastGatewayProblem {
+                GatewayProblemDetailsSheet(
+                    problem: gatewayProblem,
+                    primaryActionTitle: self.gatewayProblemPrimaryActionTitle(gatewayProblem),
+                    onPrimaryAction: {
+                        Task { await self.handleGatewayProblemPrimaryAction(gatewayProblem) }
+                    })
             }
-            .sheet(isPresented: self.$showTalkIssueDetails) {
-                if let issue = self.appModel.talkMode.gatewayTalkCurrentFallbackIssue {
-                    TalkRuntimeIssueDetailsSheet(issue: issue)
-                }
+        }
+        .sheet(isPresented: self.$showTalkIssueDetails) {
+            if let issue = self.appModel.talkMode.gatewayTalkCurrentFallbackIssue {
+                TalkRuntimeIssueDetailsSheet(issue: issue)
             }
-            .sheet(isPresented: self.$showQRScanner) {
-                NavigationStack {
-                    QRScannerView(
-                        onGatewayLink: { link in
-                            self.handleScannedGatewayLink(link)
-                        },
-                        onSetupCode: { code in
-                            self.handleScannedSetupCode(code)
-                        },
-                        onError: { error in
-                            self.showQRScanner = false
-                            self.setupStatusText = "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 }
-                            }
+        }
+        .sheet(isPresented: self.$showQRScanner) {
+            NavigationStack {
+                QRScannerView(
+                    onGatewayLink: { link in
+                        self.handleScannedGatewayLink(link)
+                    },
+                    onSetupCode: { code in
+                        self.handleScannedSetupCode(code)
+                    },
+                    onError: { error in
+                        self.showQRScanner = false
+                        self.setupStatusText = "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 }
                         }
-                }
+                    }
             }
-            .alert("Reset Onboarding?", isPresented: self.$showResetOnboardingAlert) {
-                Button("Reset", role: .destructive) {
-                    self.resetOnboarding()
-                }
-                Button("Cancel", role: .cancel) {}
-            } message: {
-                Text("This disconnects, clears saved gateway credentials, and reopens onboarding.")
+        }
+        .alert("Reset Onboarding?", isPresented: self.$showResetOnboardingAlert) {
+            Button("Reset", role: .destructive) {
+                self.resetOnboarding()
             }
-            .alert(
-                "QR Scanner Unavailable",
-                isPresented: Binding(
-                    get: { self.scannerError != nil },
-                    set: { if !$0 { self.scannerError = nil } }))
-            {
-                Button("OK", role: .cancel) {}
-            } message: {
-                Text(self.scannerError ?? "")
-            }
-    }
-
-    private func applyInitialRouteIfNeeded() {
-        guard self.directRoute == nil else { return }
-        guard let initialRoute else { return }
-        guard self.navigationPath != [initialRoute] else { return }
-        self.navigationPath = [initialRoute]
+            Button("Cancel", role: .cancel) {}
+        } message: {
+            Text("This disconnects, clears saved gateway credentials, and reopens onboarding.")
+        }
+        .alert(
+            "QR Scanner Unavailable",
+            isPresented: Binding(
+                get: { self.scannerError != nil },
+                set: { if !$0 { self.scannerError = nil } }))
+        {
+            Button("OK", role: .cancel) {}
+        } message: {
+            Text(self.scannerError ?? "")
+        }
     }
 }

apps/ios/Sources/Design/SettingsProTabActions.swift

@@ -495,7 +495,6 @@ extension SettingsProTab {
         case .gateway: "Gateway"
         case .approvals: "Approvals"
         case .permissions: "Permissions"
-        case .channels: "Channels"
         case .voice: "Voice & Talk"
         case .diagnostics: "Diagnostics"
         case .privacy: "Privacy"
@@ -504,20 +503,6 @@ extension SettingsProTab {
         }
     }
 
-    func subtitle(for route: SettingsRoute) -> String {
-        switch route {
-        case .gateway: "Pairing, diagnostics, and Tailscale checks."
-        case .approvals: "Review pending agent actions."
-        case .permissions: "Control device capabilities."
-        case .channels: "Message routing and external clients."
-        case .voice: "Talk mode and wake phrase settings."
-        case .diagnostics: "Run local health checks."
-        case .privacy: "Data and device privacy controls."
-        case .notifications: "Alert permissions and delivery."
-        case .about: "Version and support details."
-        }
-    }
-
     var manualPortBinding: Binding<String> {
         Binding(
             get: { self.manualGatewayPortText },

apps/ios/Sources/Design/SettingsProTabSections.swift

@@ -3,20 +3,10 @@ import SwiftUI
 
 extension SettingsProTab {
     var settingsHeader: some View {
-        OpenClawAdaptiveHeaderRow(
-            title: "Settings",
-            subtitle: "Gateway, permissions, voice, and device controls.",
-            titleFont: .title3.weight(.semibold),
-            subtitleFont: .callout)
-        {
-            if let headerLeadingAction {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            }
-        } accessory: {
-            EmptyView()
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-        .padding(.top, 6)
+        Text("Settings")
+            .font(.system(size: 28, weight: .bold))
+            .padding(.horizontal, OpenClawProMetric.pagePadding)
+            .padding(.top, 6)
     }
 
     var appearanceSection: some View {
@@ -141,11 +131,6 @@ extension SettingsProTab {
                 title: "Permissions",
                 detail: self.permissionsDetail,
                 route: .permissions)
-            self.settingsListRow(
-                icon: "point.3.connected.trianglepath.dotted",
-                title: "Channels / Integrations",
-                detail: "Message routing and external channel clients.",
-                route: .channels)
             self.settingsListRow(
                 icon: "waveform",
                 title: "Voice & Talk",
@@ -214,9 +199,6 @@ extension SettingsProTab {
             OpenClawProBackground()
             ScrollView {
                 VStack(alignment: .leading, spacing: 14) {
-                    if self.headerLeadingAction != nil {
-                        self.routeHeader(for: route)
-                    }
                     switch route {
                     case .gateway:
                         self.gatewayDestination
@@ -224,8 +206,6 @@ extension SettingsProTab {
                         self.approvalsDestination
                     case .permissions:
                         self.permissionsDestination
-                    case .channels:
-                        SettingsChannelsDestination()
                     case .voice:
                         self.voiceDestination
                     case .diagnostics:
@@ -244,24 +224,6 @@ extension SettingsProTab {
         }
         .navigationTitle(self.title(for: route))
         .navigationBarTitleDisplayMode(.inline)
-        .toolbar(self.headerLeadingAction == nil ? .visible : .hidden, for: .navigationBar)
-    }
-
-    func routeHeader(for route: SettingsRoute) -> some View {
-        OpenClawAdaptiveHeaderRow(
-            title: self.title(for: route),
-            subtitle: self.subtitle(for: route),
-            titleFont: .title3.weight(.semibold),
-            subtitleFont: .callout)
-        {
-            if let headerLeadingAction {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            }
-        } accessory: {
-            EmptyView()
-        }
-        .padding(.horizontal, OpenClawProMetric.pagePadding)
-        .padding(.top, 6)
     }
 
     var gatewayDestination: some View {

apps/ios/Sources/Design/SettingsProTabSupport.swift

@@ -1,12 +1,10 @@
 import Darwin
-import OpenClawKit
 import SwiftUI
 
 enum SettingsRoute: Hashable {
     case gateway
     case approvals
     case permissions
-    case channels
     case voice
     case diagnostics
     case privacy
@@ -152,176 +150,3 @@ extension SettingsProTab {
         return a == 100 && b >= 64 && b <= 127
     }
 }
-
-#if DEBUG
-#Preview("Gateway settings states") {
-    SettingsGatewayStatesPreview()
-}
-
-private struct SettingsGatewayStatesPreview: View {
-    var body: some View {
-        ZStack {
-            OpenClawProBackground()
-            ScrollView {
-                VStack(alignment: .leading, spacing: 16) {
-                    self.stateSection("Connected") {
-                        self.gatewayStatusCard(
-                            title: "Gateway online",
-                            detail: "Connected to openclaw-gateway.tailnet.ts.net.",
-                            value: "online",
-                            color: OpenClawBrand.ok)
-                        self.gatewayFactsCard(
-                            address: "100.88.41.20:18789",
-                            server: "openclaw-gateway",
-                            discovered: "3",
-                            agent: "Aiden")
-                    }
-
-                    self.stateSection("Loading") {
-                        self.gatewayStatusCard(
-                            title: "Checking gateway",
-                            detail: "Refreshing connection, discovery, and device trust state.",
-                            value: "loading",
-                            color: OpenClawBrand.accent)
-                        self.gatewayActionsCard(isBusy: true)
-                    }
-
-                    self.stateSection("Empty") {
-                        self.gatewayStatusCard(
-                            title: "No gateway configured",
-                            detail: "Scan a setup QR code, paste a setup code, or choose a discovered gateway.",
-                            value: "setup",
-                            color: .secondary)
-                        self.setupActionsCard
-                    }
-
-                    self.stateSection("Error") {
-                        GatewayProblemBanner(
-                            problem: Self.pairingProblem,
-                            primaryActionTitle: "Retry",
-                            onPrimaryAction: {},
-                            onShowDetails: {})
-                        self.gatewayStatusCard(
-                            title: "Tailscale warning",
-                            detail: "Tailscale is off on this device. Turn it on, then try again.",
-                            value: "network",
-                            color: OpenClawBrand.warn)
-                    }
-                }
-                .padding(.horizontal, OpenClawProMetric.pagePadding)
-                .padding(.vertical, 18)
-            }
-        }
-    }
-
-    private func stateSection(
-        _ title: String,
-        @ViewBuilder content: () -> some View) -> some View
-    {
-        VStack(alignment: .leading, spacing: 8) {
-            Text(title)
-                .font(.subheadline.weight(.semibold))
-                .foregroundStyle(.secondary)
-            content()
-        }
-    }
-
-    private func gatewayStatusCard(
-        title: String,
-        detail: String,
-        value: String,
-        color: Color) -> some View
-    {
-        ProCard(padding: 0, radius: SettingsLayout.cardRadius) {
-            ProStatusRow(
-                icon: value == "online" ? "antenna.radiowaves.left.and.right" : "wifi.slash",
-                title: title,
-                detail: detail,
-                value: value,
-                color: color,
-                actionTitle: value == "setup" ? "Scan QR" : nil,
-                action: value == "setup" ? {} : nil)
-        }
-    }
-
-    private func gatewayFactsCard(
-        address: String,
-        server: String,
-        discovered: String,
-        agent: String) -> some View
-    {
-        ProCard(radius: SettingsLayout.cardRadius) {
-            VStack(spacing: 0) {
-                self.factRow("Address", value: address)
-                Divider()
-                self.factRow("Server", value: server)
-                Divider()
-                self.factRow("Discovered", value: discovered)
-                Divider()
-                self.factRow("Default Agent", value: agent)
-            }
-        }
-    }
-
-    private func factRow(_ label: String, value: String) -> some View {
-        HStack {
-            Text(label)
-                .font(.caption)
-                .foregroundStyle(.secondary)
-            Spacer(minLength: 8)
-            Text(value)
-                .font(.caption.weight(.medium))
-                .lineLimit(1)
-                .truncationMode(.middle)
-        }
-        .frame(height: SettingsLayout.rowHeight)
-    }
-
-    private func gatewayActionsCard(isBusy: Bool) -> some View {
-        ProCard(radius: SettingsLayout.cardRadius) {
-            HStack(spacing: 10) {
-                self.previewButton("Reconnect", systemImage: "arrow.triangle.2.circlepath", isBusy: isBusy)
-                self.previewButton("Diagnose", systemImage: "cross.case", isBusy: isBusy)
-            }
-        }
-    }
-
-    private var setupActionsCard: some View {
-        ProCard(radius: SettingsLayout.cardRadius) {
-            VStack(alignment: .leading, spacing: 10) {
-                HStack(spacing: 10) {
-                    self.previewButton("Scan QR", systemImage: "qrcode.viewfinder", isBusy: false)
-                    self.previewButton("Connect", systemImage: "link", isBusy: false)
-                }
-                Text("Discovered gateways and manual setup live here when the gateway has not connected yet.")
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-            }
-        }
-    }
-
-    private func previewButton(
-        _ title: String,
-        systemImage: String,
-        isBusy: Bool) -> some View
-    {
-        Button {} label: {
-            Label(title, systemImage: systemImage)
-                .frame(maxWidth: .infinity)
-        }
-        .buttonStyle(.bordered)
-        .controlSize(.small)
-        .disabled(isBusy)
-    }
-
-    private static let pairingProblem = GatewayConnectionProblem(
-        kind: .pairingRequired,
-        owner: .gateway,
-        title: "Pairing required",
-        message: "Run /pair approve in your OpenClaw chat before this iPad can connect.",
-        actionCommand: "/pair approve req-ipad-preview",
-        requestId: "req-ipad-preview",
-        retryable: false,
-        pauseReconnect: true)
-}
-#endif

apps/ios/Sources/Design/TalkProTab.swift

@@ -9,17 +9,8 @@ struct TalkProTab: View {
     @AppStorage("talk.background.enabled") private var talkBackgroundEnabled: Bool = false
     @State private var showPermissionPrompt = false
     @State private var showTalkIssueDetails = false
-    let headerLeadingAction: OpenClawSidebarHeaderAction?
     var openSettings: () -> Void
 
-    init(
-        headerLeadingAction: OpenClawSidebarHeaderAction? = nil,
-        openSettings: @escaping () -> Void)
-    {
-        self.headerLeadingAction = headerLeadingAction
-        self.openSettings = openSettings
-    }
-
     private var state: TalkProState {
         TalkProState(
             gatewayConnected: self.gatewayConnected,
@@ -94,9 +85,6 @@ struct TalkProTab: View {
 
     private var header: some View {
         HStack(alignment: .center, spacing: 11) {
-            if let headerLeadingAction {
-                OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)
-            }
             OpenClawProMark(size: 31, shadowRadius: 9)
             VStack(alignment: .leading, spacing: 2) {
                 Text("Talk")

apps/ios/Sources/Model/NodeAppModel.swift

@@ -116,8 +116,6 @@ final class NodeAppModel {
         self.operatorConnected
     }
 
-    private(set) var hasOperatorAdminScope: Bool = false
-
     var gatewayServerName: String?
     var gatewayRemoteAddress: String?
     var connectedGatewayID: String?
@@ -299,7 +297,6 @@ final class NodeAppModel {
         let enabled = UserDefaults.standard.bool(forKey: "voiceWake.enabled")
         self.voiceWake.setEnabled(enabled)
         self.talkMode.attachGateway(self.operatorGateway)
-        self.refreshOperatorAdminScopeFromStore()
         self.refreshLastShareEventFromRelay()
         let talkEnabled = UserDefaults.standard.bool(forKey: "talk.enabled")
         self.setTalkEnabled(talkEnabled)
@@ -2760,15 +2757,6 @@ extension NodeAppModel {
     private func setOperatorConnected(_ connected: Bool) {
         self.operatorConnected = connected
         self.operatorStatusText = connected ? "Connected" : "Offline"
-        self.refreshOperatorAdminScopeFromStore()
-    }
-
-    private func refreshOperatorAdminScopeFromStore() {
-        let identity = DeviceIdentityStore.loadOrCreate()
-        self.hasOperatorAdminScope = DeviceAuthStore
-            .loadToken(deviceId: identity.deviceId, role: "operator")?
-            .scopes
-            .contains("operator.admin") == true
     }
 }
 
@@ -4648,10 +4636,6 @@ extension NodeAppModel {
         self.gatewayConnected
     }
 
-    func _test_refreshOperatorAdminScopeFromStore() {
-        self.refreshOperatorAdminScopeFromStore()
-    }
-
     func _test_applyPendingForegroundNodeActions(
         _ actions: [(id: String, command: String, paramsJSON: String?)]) async
     {

apps/ios/Sources/RootTabs.swift

@@ -8,8 +8,6 @@ struct RootTabs: View {
     @Environment(VoiceWakeManager.self) private var voiceWake
     @Environment(GatewayConnectionController.self) private var gatewayController
     @Environment(\.accessibilityReduceMotion) private var reduceMotion
-    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
-    @Environment(\.rootTabsUserInterfaceIdiomOverride) private var userInterfaceIdiomOverride
     @Environment(\.scenePhase) private var scenePhase
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
     @AppStorage("onboarding.requestID") private var onboardingRequestID: Int = 0
@@ -23,14 +21,10 @@ struct RootTabs: View {
     @AppStorage(AppAppearancePreference.storageKey) private var appearancePreferenceRaw: String =
         AppAppearancePreference.system.rawValue
     @State private var selectedTab: AppTab = Self.initialTab
-    @State private var selectedSidebarDestination: SidebarDestination = Self.initialSidebarDestination
-    @State private var isSidebarVisible: Bool = Self.initialSidebarVisibility ?? false
-    @State private var sidebarVisibilityUserOverridden: Bool = Self.initialSidebarVisibility != nil
-    @State private var isSidebarDrawerLayout: Bool = false
-    @State private var didResolveSidebarLayout: Bool = false
     @State private var voiceWakeToastText: String?
     @State private var toastDismissTask: Task<Void, Never>?
     @State private var presentedSheet: PresentedSheet?
+    @State private var showGatewayActions: Bool = false
     @State private var showGatewayProblemDetails: Bool = false
     @State private var showOnboarding: Bool = false
     @State private var onboardingAllowSkip: Bool = true
@@ -40,6 +34,14 @@ struct RootTabs: View {
     @State private var didApplyInitialChatSession: Bool = false
     @State private var handledGatewaySetupRequestID: Int = 0
 
+    private enum AppTab: Hashable {
+        case control
+        case chat
+        case talk
+        case agent
+        case settings
+    }
+
     private static var initialTab: AppTab {
         let arguments = ProcessInfo.processInfo.arguments
         guard let flagIndex = arguments.firstIndex(of: "--openclaw-initial-tab") else {
@@ -64,28 +66,6 @@ struct RootTabs: View {
         }
     }
 
-    private static var initialSidebarDestination: SidebarDestination {
-        if let requested = requestedInitialSidebarDestination {
-            return requested
-        }
-        return Self.defaultSidebarDestination(for: initialTab)
-    }
-
-    private static var requestedInitialSidebarDestination: SidebarDestination? {
-        let arguments = ProcessInfo.processInfo.arguments
-        guard let flagIndex = arguments.firstIndex(of: "--openclaw-initial-destination") else {
-            return nil
-        }
-        let valueIndex = arguments.index(after: flagIndex)
-        guard arguments.indices.contains(valueIndex) else { return nil }
-        let requested = arguments[valueIndex].trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        return SidebarDestination.allCases.first { $0.rawValue.lowercased() == requested }
-    }
-
-    private static var initialSidebarVisibility: Bool? {
-        requestedInitialSidebarVisibility(arguments: ProcessInfo.processInfo.arguments)
-    }
-
     private static var initialChatSessionKey: String? {
         let arguments = ProcessInfo.processInfo.arguments
         guard let flagIndex = arguments.firstIndex(of: "--openclaw-chat-session") else {
@@ -107,11 +87,45 @@ struct RootTabs: View {
         }
     }
 
-    static func shouldUseSidebarTabs(
-        idiom: UIUserInterfaceIdiom,
-        horizontalSizeClass _: UserInterfaceSizeClass?) -> Bool
+    enum StartupPresentationRoute: Equatable {
+        case none
+        case onboarding
+        case settings
+    }
+
+    static func startupPresentationRoute(
+        gatewayConnected: Bool,
+        hasConnectedOnce: Bool,
+        onboardingComplete: Bool,
+        hasExistingGatewayConfig: Bool,
+        shouldPresentOnLaunch: Bool) -> StartupPresentationRoute
     {
-        idiom == .pad
+        if gatewayConnected {
+            return .none
+        }
+        if shouldPresentOnLaunch || !hasConnectedOnce || !onboardingComplete {
+            return .onboarding
+        }
+        if !hasExistingGatewayConfig {
+            return .settings
+        }
+        return .none
+    }
+
+    static func shouldPresentQuickSetup(
+        quickSetupDismissed: Bool,
+        showOnboarding: Bool,
+        hasPresentedSheet: Bool,
+        gatewayConnected: Bool,
+        hasExistingGatewayConfig: Bool,
+        discoveredGatewayCount: Int) -> Bool
+    {
+        guard !quickSetupDismissed else { return false }
+        guard !showOnboarding else { return false }
+        guard !hasPresentedSheet else { return false }
+        guard !gatewayConnected else { return false }
+        guard !hasExistingGatewayConfig else { return false }
+        return discoveredGatewayCount > 0
     }
 
     var body: some View {
@@ -122,30 +136,20 @@ struct RootTabs: View {
                         .tint(OpenClawBrand.accent))))
     }
 
-    @ViewBuilder
     private var tabContent: some View {
-        if self.usesSidebarTabs {
-            self.sidebarSplitContent
-        } else {
-            self.phoneTabContent
-        }
-    }
-
-    private var phoneTabContent: some View {
         TabView(selection: self.$selectedTab) {
-            RootTabsPhoneControlHub(
-                groups: Self.phoneControlGroups,
-                initialDestination: Self.requestedInitialSidebarDestination,
-                openRootDestination: { self.selectSidebarDestination($0) })
-                .tabItem { Label("Control", systemImage: "square.grid.2x2") }
+            CommandCenterTab(
+                openChat: { self.selectedTab = .chat },
+                openSettings: { self.selectedTab = .settings })
+                .tabItem { Label("Command", systemImage: "target") }
                 .badge(self.appModel.pendingExecApprovalPrompt == nil ? 0 : 1)
                 .tag(AppTab.control)
 
-            ChatProTab(openSettings: { self.selectSidebarDestination(.gateway) })
+            ChatProTab()
                 .tabItem { Label("Chat", systemImage: "bubble.left.fill") }
                 .tag(AppTab.chat)
 
-            TalkProTab(openSettings: { self.selectSidebarDestination(.gateway) })
+            TalkProTab(openSettings: { self.selectedTab = .settings })
                 .tabItem {
                     Label(
                         "Talk",
@@ -153,394 +157,16 @@ struct RootTabs: View {
                 }
                 .tag(AppTab.talk)
 
-            NavigationStack {
-                AgentProTab(
-                    directRoute: .agents,
-                    openSettings: { self.selectSidebarDestination(.gateway) })
-            }
-            .tabItem { Label("Agent", systemImage: "person.2.fill") }
-            .tag(AppTab.agent)
+            AgentProTab()
+                .tabItem { Label("Agent", systemImage: "person.2.fill") }
+                .tag(AppTab.agent)
 
-            SettingsProTab(initialRoute: self.selectedSidebarDestination.settingsRoute)
-                .id(self.selectedSidebarDestination.settingsRoute.map { "\($0)" } ?? "settings")
+            SettingsProTab()
                 .tabItem { Label("Settings", systemImage: "gearshape.fill") }
                 .tag(AppTab.settings)
         }
     }
 
-    private var sidebarSplitContent: some View {
-        GeometryReader { proxy in
-            let isDrawerLayout = self.shouldUseSidebarDrawer(containerSize: proxy.size)
-            let sidebarWidth = self.sidebarWidth(containerWidth: proxy.size.width, isDrawerLayout: isDrawerLayout)
-            Group {
-                if isDrawerLayout {
-                    self.sidebarDrawerContent(sidebarWidth: sidebarWidth)
-                } else {
-                    self.sidebarNavigationSplitContent(sidebarWidth: sidebarWidth)
-                }
-            }
-            .animation(.easeInOut(duration: 0.22), value: self.isSidebarVisible)
-            .onAppear {
-                self.updateSidebarLayout(containerSize: proxy.size, force: false)
-            }
-            .onChange(of: proxy.size) { _, size in
-                self.updateSidebarLayout(containerSize: size, force: false)
-            }
-        }
-    }
-
-    private func sidebarNavigationSplitContent(sidebarWidth: CGFloat) -> some View {
-        HStack(spacing: 0) {
-            if self.isSidebarVisible {
-                self.sidebarColumn
-                    .frame(width: sidebarWidth, alignment: .topLeading)
-                    .frame(maxHeight: .infinity, alignment: .topLeading)
-                    .overlay(alignment: .trailing) {
-                        self.sidebarVerticalSeparator
-                    }
-                    .transition(.move(edge: .leading).combined(with: .opacity))
-            }
-
-            self.sidebarDetailNavigationShell
-                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
-        }
-        .background(OpenClawProBackground())
-    }
-
-    private func sidebarDrawerContent(sidebarWidth: CGFloat) -> some View {
-        ZStack(alignment: .topLeading) {
-            self.sidebarDetailNavigationShell
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-
-            if self.isSidebarVisible {
-                Color.black.opacity(0.28)
-                    .ignoresSafeArea()
-                    .contentShape(Rectangle())
-                    .onTapGesture {
-                        self.hideSidebar()
-                    }
-                    .transition(.opacity)
-
-                self.sidebarColumn
-                    .frame(width: sidebarWidth, alignment: .topLeading)
-                    .frame(maxHeight: .infinity, alignment: .topLeading)
-                    .overlay(alignment: .trailing) {
-                        self.sidebarVerticalSeparator
-                    }
-                    .shadow(color: .black.opacity(0.26), radius: 18, x: 8, y: 0)
-                    .transition(.move(edge: .leading).combined(with: .opacity))
-            }
-        }
-    }
-
-    private var sidebarDetailShell: some View {
-        self.sidebarDetail
-            .id(self.selectedSidebarDestination.id)
-    }
-
-    private var sidebarColumn: some View {
-        VStack(spacing: 0) {
-            self.sidebarIdentityHeader
-            self.sidebarList
-            self.sidebarFooter
-        }
-        .safeAreaPadding(.top, 8)
-        .safeAreaPadding(.bottom, 8)
-        .background(Color(uiColor: .systemBackground))
-    }
-
-    private var sidebarIdentityHeader: some View {
-        HStack(spacing: 10) {
-            OpenClawProMark(size: 30, shadowRadius: 3)
-                .accessibilityHidden(true)
-
-            VStack(alignment: .leading, spacing: 2) {
-                Text("OpenClaw")
-                    .font(.headline.weight(.semibold))
-                    .foregroundStyle(.primary)
-                    .lineLimit(1)
-
-                HStack(spacing: 4) {
-                    Image(systemName: "circle.fill")
-                        .font(.system(size: 7, weight: .bold))
-                        .foregroundStyle(self.sidebarGatewayStatusColor)
-                    Text(self.sidebarGatewayStatusTitle)
-                        .lineLimit(1)
-                }
-                .font(.caption.weight(.medium))
-                .foregroundStyle(.secondary)
-            }
-
-            Spacer(minLength: 8)
-
-            if self.isSidebarDrawerLayout {
-                self.sidebarHideButton
-            }
-        }
-        .padding(.horizontal, 18)
-        .padding(.vertical, 12)
-        .background(Color(uiColor: .systemBackground))
-        .overlay(alignment: .bottom) {
-            self.sidebarHorizontalSeparator
-        }
-        .accessibilityElement(children: .combine)
-        .accessibilityLabel("OpenClaw \(self.sidebarGatewayStatusTitle)")
-    }
-
-    private var sidebarGatewayStatusTitle: String {
-        switch self.gatewayStatus {
-        case .connected:
-            "Online"
-        case .connecting:
-            "Connecting"
-        case .error:
-            "Needs attention"
-        case .disconnected:
-            "Offline"
-        }
-    }
-
-    private var sidebarList: some View {
-        List {
-            ForEach(Self.sidebarGroups) { group in
-                Section(group.title.capitalized) {
-                    ForEach(group.destinations) { destination in
-                        self.sidebarDestinationButton(destination)
-                    }
-                }
-                .listSectionSeparator(.hidden, edges: .all)
-            }
-        }
-        .listStyle(.sidebar)
-        .tint(OpenClawBrand.accent)
-        .scrollContentBackground(.hidden)
-        .background(Color(uiColor: .systemBackground))
-    }
-
-    private var sidebarFooter: some View {
-        VStack(spacing: 0) {
-            self.sidebarHorizontalSeparator
-            HStack(spacing: 10) {
-                Text("VERSION")
-                    .font(.caption2.weight(.semibold))
-                    .foregroundStyle(.secondary)
-                Spacer(minLength: 8)
-                Text("v\(DeviceInfoHelper.openClawVersionString())")
-                    .font(.caption.weight(.semibold))
-                    .foregroundStyle(.primary)
-                    .lineLimit(1)
-                    .minimumScaleFactor(0.72)
-                ProStatusDot(color: self.sidebarGatewayStatusColor)
-            }
-            .padding(.horizontal, 18)
-            .padding(.vertical, 12)
-        }
-    }
-
-    private var sidebarHorizontalSeparator: some View {
-        Rectangle()
-            .fill(Color(uiColor: .separator))
-            .frame(height: 1 / UIScreen.main.scale)
-    }
-
-    private var sidebarVerticalSeparator: some View {
-        Rectangle()
-            .fill(Color(uiColor: .separator))
-            .frame(width: 1 / UIScreen.main.scale)
-    }
-
-    private var sidebarGatewayStatusColor: Color {
-        switch self.gatewayStatus {
-        case .connected:
-            OpenClawBrand.ok
-        case .connecting:
-            OpenClawBrand.accent
-        case .error:
-            OpenClawBrand.warn
-        case .disconnected:
-            .secondary
-        }
-    }
-
-    private func sidebarDestinationButton(
-        _ destination: SidebarDestination,
-        title: String? = nil) -> some View
-    {
-        Button {
-            self.selectSidebarDestination(destination)
-        } label: {
-            Label(title ?? destination.sidebarTitle, systemImage: destination.systemImage)
-                .lineLimit(1)
-                .minimumScaleFactor(0.82)
-                .truncationMode(.tail)
-                .frame(maxWidth: .infinity, alignment: .leading)
-        }
-        .buttonStyle(.plain)
-        .foregroundStyle(destination == self.selectedSidebarDestination ? OpenClawBrand.accent : .primary)
-        .listRowBackground(
-            destination == self.selectedSidebarDestination
-                ? OpenClawBrand.accent.opacity(0.12)
-                : Color.clear)
-        .listRowSeparator(.hidden, edges: .all)
-    }
-
-    @ViewBuilder
-    private var sidebarDetail: some View {
-        switch self.selectedSidebarDestination {
-        case .chat:
-            ChatProTab(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                headerTitle: "Chat",
-                headerSubtitle: "Agent conversation",
-                showsAgentBadge: false,
-                openSettings: { self.selectSidebarDestination(.gateway) })
-        case .talk:
-            TalkProTab(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                openSettings: { self.selectSidebarDestination(.gateway) })
-        case .overview:
-            CommandCenterTab(
-                headerTitle: "Overview",
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                showsHeaderMark: false,
-                openChat: { self.selectSidebarDestination(.chat) },
-                openSettings: { self.selectSidebarDestination(.gateway) })
-        case .activity:
-            IPadActivityScreen(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                openChat: { self.selectSidebarDestination(.chat) },
-                openSettings: { self.selectSidebarDestination(.gateway) })
-        case .workboard:
-            IPadWorkboardScreen(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                openChat: { self.selectSidebarDestination(.chat) },
-                openSettings: { self.selectSidebarDestination(.gateway) })
-        case .skillWorkshop:
-            IPadSkillWorkshopScreen(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                openSettings: { self.selectSidebarDestination(.gateway) })
-        case .agents:
-            AgentProTab(
-                directRoute: .agents,
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                headerTitle: "Agents",
-                openSettings: { self.selectSidebarDestination(.gateway) })
-                .id(self.selectedSidebarDestination.id)
-        case .instances:
-            AgentProTab(
-                directRoute: .instances,
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                headerTitle: "Instances",
-                openSettings: { self.selectSidebarDestination(.gateway) })
-                .id(self.selectedSidebarDestination.id)
-        case .sessions:
-            CommandSessionsScreen(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                openChat: { self.selectSidebarDestination(.chat) })
-        case .dreaming:
-            AgentProTab(
-                directRoute: .dreaming,
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                headerTitle: "Dreaming",
-                openSettings: { self.selectSidebarDestination(.gateway) })
-                .id(self.selectedSidebarDestination.id)
-        case .usage:
-            AgentProTab(
-                directRoute: .usage,
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                headerTitle: "Usage",
-                openSettings: { self.selectSidebarDestination(.gateway) })
-                .id(self.selectedSidebarDestination.id)
-        case .cron:
-            AgentProTab(
-                directRoute: .cron,
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                headerTitle: "Cron Jobs",
-                openSettings: { self.selectSidebarDestination(.gateway) })
-                .id(self.selectedSidebarDestination.id)
-        case .docs:
-            OpenClawDocsScreen(
-                headerLeadingAction: self.sidebarHeaderLeadingAction,
-                gatewayAction: { self.selectSidebarDestination(.gateway) })
-        case .settings:
-            SettingsProTab(headerLeadingAction: self.sidebarHeaderLeadingAction)
-        case .gateway:
-            SettingsProTab(
-                directRoute: self.selectedSidebarDestination.settingsRoute ?? .gateway,
-                headerLeadingAction: self.sidebarHeaderLeadingAction)
-        }
-    }
-
-    private var sidebarDetailNavigationShell: some View {
-        NavigationStack {
-            self.sidebarDetailShell
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
-        .clipped()
-    }
-
-    private var usesSidebarTabs: Bool {
-        Self.shouldUseSidebarTabs(
-            idiom: self.userInterfaceIdiom,
-            horizontalSizeClass: self.horizontalSizeClass)
-    }
-
-    private var userInterfaceIdiom: UIUserInterfaceIdiom {
-        if let userInterfaceIdiomOverride {
-            return userInterfaceIdiomOverride
-        }
-        return UIDevice.current.userInterfaceIdiom
-    }
-
-    private var shouldCollapseSidebarAfterSelection: Bool {
-        Self.shouldCollapseSidebarAfterSelection(
-            layoutMode: self.isSidebarDrawerLayout ? .drawer : .split)
-    }
-
-    private var sidebarHeaderLeadingAction: OpenClawSidebarHeaderAction? {
-        guard Self.shouldShowSidebarRevealInDestinationHeader(
-            isSidebarVisible: self.isSidebarVisible,
-            layoutMode: self.isSidebarDrawerLayout ? .drawer : .split)
-        else {
-            return nil
-        }
-        if self.isSidebarVisible {
-            return OpenClawSidebarHeaderAction(
-                systemName: "sidebar.left",
-                accessibilityLabel: "Hide Sidebar",
-                accessibilityIdentifier: Self.sidebarHideButtonAccessibilityIdentifier,
-                action: { self.hideSidebar() })
-        }
-        return OpenClawSidebarHeaderAction(
-            systemName: "sidebar.left",
-            accessibilityLabel: "Show Sidebar",
-            accessibilityIdentifier: Self.sidebarShowButtonAccessibilityIdentifier,
-            action: { self.showSidebar() })
-    }
-
-    private var sidebarHideButton: some View {
-        Button {
-            self.hideSidebar()
-        } label: {
-            Image(systemName: self.isSidebarDrawerLayout ? "xmark" : "sidebar.left")
-                .font(.system(size: 15, weight: .semibold))
-        }
-        .frame(width: 44, height: 44)
-        .contentShape(Rectangle())
-        .buttonStyle(.plain)
-        .foregroundStyle(OpenClawBrand.accent)
-        .accessibilityLabel("Hide Sidebar")
-        .accessibilityIdentifier(Self.sidebarHideButtonAccessibilityIdentifier)
-    }
-
-    private func shouldUseSidebarDrawer(containerSize: CGSize) -> Bool {
-        Self.sidebarLayoutMode(containerSize: containerSize) == .drawer
-    }
-
-    private func sidebarWidth(containerWidth: CGFloat, isDrawerLayout: Bool) -> CGFloat {
-        Self.sidebarWidth(containerWidth: containerWidth, isDrawerLayout: isDrawerLayout)
-    }
-
     private func rootOverlays(_ content: some View) -> some View {
         content
             .overlay(alignment: .top) {
@@ -569,7 +195,6 @@ struct RootTabs: View {
                         .transition(.move(edge: .top).combined(with: .opacity))
                 }
             }
-
             .overlay {
                 if self.appModel.cameraFlashNonce != 0 {
                     RootCameraFlashOverlay(nonce: self.appModel.cameraFlashNonce)
@@ -700,7 +325,7 @@ struct RootTabs: View {
                 self.evaluateOnboardingPresentation(force: true)
             }
             .onChange(of: self.appModel.openChatRequestID) { _, _ in
-                self.selectSidebarDestination(.chat)
+                self.selectedTab = .chat
             }
             .onChange(of: self.appModel.gatewaySetupRequestID) { _, _ in
                 self.maybeOpenSettingsForGatewaySetup()
@@ -709,6 +334,10 @@ struct RootTabs: View {
 
     private func rootPresentation(_ content: some View) -> some View {
         content
+            .gatewayActionsDialog(
+                isPresented: self.$showGatewayActions,
+                onDisconnect: { self.appModel.disconnectGateway() },
+                onOpenSettings: { self.selectedTab = .settings })
             .sheet(isPresented: self.$showGatewayProblemDetails) {
                 if let gatewayProblem = self.appModel.lastGatewayProblem {
                     GatewayProblemDetailsSheet(
@@ -875,50 +504,6 @@ struct RootTabs: View {
         self.normalized(agent.name) ?? agent.id
     }
 
-    private func selectSidebarDestination(_ destination: SidebarDestination) {
-        self.selectedSidebarDestination = destination
-        self.selectedTab = destination.appTab
-        guard self.usesSidebarTabs, self.shouldCollapseSidebarAfterSelection else { return }
-        withAnimation(.easeInOut(duration: 0.22)) {
-            self.setSidebarVisible(false)
-        }
-    }
-
-    private func showSidebar() {
-        self.sidebarVisibilityUserOverridden = true
-        withAnimation(.easeInOut(duration: 0.22)) {
-            self.setSidebarVisible(true)
-        }
-    }
-
-    private func hideSidebar() {
-        self.sidebarVisibilityUserOverridden = true
-        withAnimation(.easeInOut(duration: 0.22)) {
-            self.setSidebarVisible(false)
-        }
-    }
-
-    private func updateSidebarLayout(containerSize: CGSize, force: Bool) {
-        let layoutMode = Self.sidebarLayoutMode(containerSize: containerSize)
-        let previousLayoutMode: SidebarLayoutMode = self.isSidebarDrawerLayout ? .drawer : .split
-        let didResolvePreviousLayout = self.didResolveSidebarLayout
-        let layoutModeDidChange = layoutMode != previousLayoutMode
-        self.didResolveSidebarLayout = true
-        self.isSidebarDrawerLayout = layoutMode == .drawer
-        if layoutModeDidChange && didResolvePreviousLayout {
-            self.sidebarVisibilityUserOverridden = false
-        }
-        guard force || !self.sidebarVisibilityUserOverridden else { return }
-
-        let preferredVisibility = Self.preferredSidebarVisibility(layoutMode: layoutMode)
-        guard self.isSidebarVisible != preferredVisibility else { return }
-        self.setSidebarVisible(preferredVisibility)
-    }
-
-    private func setSidebarVisible(_ isVisible: Bool) {
-        self.isSidebarVisible = isVisible
-    }
-
     private func homeCanvasBadge(for agent: AgentSummary) -> String {
         if let identity = agent.identity,
            let emoji = identity["emoji"]?.value as? String,
@@ -953,7 +538,7 @@ struct RootTabs: View {
         } else if problem.retryable {
             Task { await self.gatewayController.connectLastKnown() }
         } else {
-            self.selectSidebarDestination(.gateway)
+            self.selectedTab = .settings
         }
     }
 
@@ -980,7 +565,7 @@ struct RootTabs: View {
             self.showOnboarding = true
         case .settings:
             self.didAutoOpenSettings = true
-            self.selectSidebarDestination(.gateway)
+            self.selectedTab = .settings
         }
     }
 
@@ -1006,7 +591,7 @@ struct RootTabs: View {
             shouldPresentOnLaunch: false)
         guard route == .settings else { return }
         self.didAutoOpenSettings = true
-        self.selectSidebarDestination(.gateway)
+        self.selectedTab = .settings
     }
 
     private func maybeOpenSettingsForGatewaySetup() {
@@ -1016,7 +601,7 @@ struct RootTabs: View {
         self.showOnboarding = false
         self.presentedSheet = nil
         self.didAutoOpenSettings = true
-        self.selectSidebarDestination(.gateway)
+        self.selectedTab = .settings
     }
 
     private func applyInitialChatSessionIfNeeded() {
@@ -1096,120 +681,3 @@ private struct RootCameraFlashOverlay: View {
             }
     }
 }
-
-extension EnvironmentValues {
-    @Entry var rootTabsUserInterfaceIdiomOverride: UIUserInterfaceIdiom?
-}
-
-#if DEBUG
-#Preview(
-    "Shell iPhone portrait",
-    traits: .fixedLayout(width: 393, height: 852),
-    .portrait)
-{
-    RootTabsPreviewHost(idiom: .phone)
-}
-
-#Preview(
-    "Shell iPhone connected",
-    traits: .fixedLayout(width: 393, height: 852),
-    .portrait)
-{
-    RootTabsPreviewHost(idiom: .phone, gatewayState: .connected)
-}
-
-#Preview(
-    "Shell iPhone gateway error",
-    traits: .fixedLayout(width: 393, height: 852),
-    .portrait)
-{
-    RootTabsPreviewHost(idiom: .phone, gatewayState: .error)
-}
-
-#Preview(
-    "Shell iPhone landscape",
-    traits: .fixedLayout(width: 852, height: 393),
-    .landscapeLeft)
-{
-    RootTabsPreviewHost(idiom: .phone)
-        .environment(\.horizontalSizeClass, .regular)
-        .environment(\.verticalSizeClass, .compact)
-}
-
-#Preview(
-    "Shell iPad portrait drawer",
-    traits: .fixedLayout(width: 1024, height: 1366),
-    .portrait)
-{
-    RootTabsPreviewHost(idiom: .pad)
-}
-
-#Preview(
-    "Shell iPad landscape split",
-    traits: .fixedLayout(width: 1366, height: 1024),
-    .landscapeLeft)
-{
-    RootTabsPreviewHost(idiom: .pad, gatewayState: .connected)
-}
-
-#Preview(
-    "Shell iPad connecting",
-    traits: .fixedLayout(width: 1366, height: 1024),
-    .landscapeLeft)
-{
-    RootTabsPreviewHost(idiom: .pad, gatewayState: .connecting)
-}
-
-#Preview(
-    "Shell iPad gateway error",
-    traits: .fixedLayout(width: 1366, height: 1024),
-    .landscapeLeft)
-{
-    RootTabsPreviewHost(idiom: .pad, gatewayState: .error)
-}
-
-private struct RootTabsPreviewHost: View {
-    @State private var appModel: NodeAppModel
-    @State private var gatewayController: GatewayConnectionController
-    private let idiom: UIUserInterfaceIdiom
-
-    init(idiom: UIUserInterfaceIdiom, gatewayState: RootTabsPreviewGatewayState = .offline) {
-        let appModel = NodeAppModel()
-        gatewayState.apply(to: appModel)
-        self.idiom = idiom
-        _appModel = State(initialValue: appModel)
-        _gatewayController = State(
-            initialValue: GatewayConnectionController(appModel: appModel, startDiscovery: false))
-    }
-
-    var body: some View {
-        RootTabs()
-            .environment(self.appModel)
-            .environment(self.appModel.voiceWake)
-            .environment(self.gatewayController)
-            .environment(\.rootTabsUserInterfaceIdiomOverride, self.idiom)
-    }
-}
-
-private enum RootTabsPreviewGatewayState {
-    case offline
-    case connecting
-    case connected
-    case error
-
-    @MainActor
-    func apply(to appModel: NodeAppModel) {
-        switch self {
-        case .offline:
-            break
-        case .connecting:
-            appModel.gatewayStatusText = "Connecting..."
-        case .connected:
-            appModel.enterAppleReviewDemoMode()
-        case .error:
-            appModel.gatewayStatusText = "Gateway error: connection refused"
-        }
-    }
-}
-
-#endif

apps/ios/Sources/RootTabsNavigation.swift

@@ -1,308 +0,0 @@
-import CoreGraphics
-import Foundation
-import SwiftUI
-
-extension RootTabs {
-    private static var sidebarPersistentWidthThreshold: CGFloat {
-        980
-    }
-
-    static let sidebarSplitMinimumWidth: CGFloat = 292
-    static let sidebarSplitIdealWidth: CGFloat = 316
-    static let sidebarSplitMaximumWidth: CGFloat = 340
-    static let sidebarDrawerMaximumWidth: CGFloat = 340
-    static let sidebarShowButtonAccessibilityIdentifier = "RootTabs.Sidebar.Show"
-    static let sidebarHideButtonAccessibilityIdentifier = "RootTabs.Sidebar.Hide"
-
-    enum AppTab: Hashable {
-        case control
-        case chat
-        case talk
-        case agent
-        case settings
-    }
-
-    enum SidebarDestination: String, CaseIterable, Hashable, Identifiable {
-        case chat
-        case talk
-        case overview
-        case activity
-        case agents
-        case workboard
-        case skillWorkshop
-        case instances
-        case sessions
-        case dreaming
-        case usage
-        case cron
-        case docs
-        case settings
-        case gateway
-
-        var id: String {
-            rawValue
-        }
-
-        var title: String {
-            switch self {
-            case .chat: "Chat"
-            case .talk: "Talk"
-            case .overview: "Overview"
-            case .activity: "Activity"
-            case .agents: "Agents"
-            case .workboard: "Workboard"
-            case .skillWorkshop: "Skill Workshop"
-            case .instances: "Instances"
-            case .sessions: "Sessions"
-            case .dreaming: "Dreaming"
-            case .usage: "Usage"
-            case .cron: "Cron Jobs"
-            case .docs: "Docs"
-            case .settings: "Settings"
-            case .gateway: "Settings / Gateway"
-            }
-        }
-
-        var sidebarTitle: String {
-            switch self {
-            case .gateway: "Connection"
-            default: self.title
-            }
-        }
-
-        var subtitle: String {
-            switch self {
-            case .chat: "Agent chat and recent work."
-            case .talk: "Realtime voice and fallback controls."
-            case .overview: "Status, entry points, health."
-            case .activity: "Gateway, session, and device activity."
-            case .agents: "Agent roster and readiness."
-            case .workboard: "Agent work queue and session handoff."
-            case .skillWorkshop: "Review and apply proposed skills."
-            case .instances: "Latest presence from OpenClaw nodes."
-            case .sessions: "Active sessions and defaults."
-            case .dreaming: "Memory signals and background synthesis."
-            case .usage: "API usage and costs."
-            case .cron: "Wakeups and recurring runs."
-            case .docs: "Reference docs and setup guides."
-            case .settings: "Connection, permissions, channels, and app options."
-            case .gateway: "Pairing, diagnostics, permissions, and device controls."
-            }
-        }
-
-        var systemImage: String {
-            switch self {
-            case .chat: "bubble.left"
-            case .talk: "waveform.circle"
-            case .overview: "chart.bar"
-            case .activity: "waveform.path.ecg"
-            case .agents: "person.2"
-            case .workboard: "folder"
-            case .skillWorkshop: "hammer"
-            case .instances: "dot.radiowaves.left.and.right"
-            case .sessions: "doc.text"
-            case .dreaming: "moon.stars"
-            case .usage: "chart.bar.xaxis"
-            case .cron: "timer"
-            case .docs: "book"
-            case .settings: "gearshape"
-            case .gateway: "gearshape"
-            }
-        }
-
-        var appTab: AppTab {
-            switch self {
-            case .chat:
-                .chat
-            case .talk:
-                .talk
-            case .agents:
-                .agent
-            case .settings, .gateway:
-                .settings
-            case .overview, .activity, .workboard, .skillWorkshop, .instances, .sessions, .dreaming,
-                 .usage,
-                 .cron, .docs:
-                .control
-            }
-        }
-
-        var settingsRoute: SettingsRoute? {
-            switch self {
-            case .gateway:
-                .gateway
-            case .chat, .talk, .overview, .activity, .agents, .workboard, .skillWorkshop, .instances, .sessions,
-                 .dreaming,
-                 .usage, .cron, .settings, .docs:
-                nil
-            }
-        }
-    }
-
-    enum SidebarLayoutMode: Equatable {
-        case drawer
-        case split
-    }
-
-    static func sidebarLayoutMode(containerSize: CGSize) -> SidebarLayoutMode {
-        containerSize.width < self.sidebarPersistentWidthThreshold || containerSize.height > containerSize.width
-            ? .drawer
-            : .split
-    }
-
-    static func preferredSidebarVisibility(layoutMode: SidebarLayoutMode) -> Bool {
-        layoutMode == .split
-    }
-
-    static func shouldCollapseSidebarAfterSelection(layoutMode: SidebarLayoutMode) -> Bool {
-        layoutMode == .drawer
-    }
-
-    static func sidebarWidth(containerWidth: CGFloat, isDrawerLayout: Bool) -> CGFloat {
-        if isDrawerLayout {
-            return min(self.sidebarDrawerMaximumWidth, max(280, containerWidth * 0.86))
-        }
-        return min(self.sidebarSplitMaximumWidth, max(self.sidebarSplitIdealWidth, containerWidth * 0.25))
-    }
-
-    static func shouldShowSidebarRevealControl(isSidebarVisible: Bool) -> Bool {
-        !isSidebarVisible
-    }
-
-    static func shouldShowSidebarRevealInDestinationHeader(
-        isSidebarVisible: Bool,
-        layoutMode: SidebarLayoutMode) -> Bool
-    {
-        switch layoutMode {
-        case .split:
-            true
-        case .drawer:
-            self.shouldShowSidebarRevealControl(isSidebarVisible: isSidebarVisible)
-        }
-    }
-
-    static func requestedInitialSidebarVisibility(arguments: [String]) -> Bool? {
-        guard let flagIndex = arguments.firstIndex(of: "--openclaw-sidebar-visibility") else {
-            return nil
-        }
-        let valueIndex = arguments.index(after: flagIndex)
-        guard arguments.indices.contains(valueIndex) else { return nil }
-
-        switch arguments[valueIndex].trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
-        case "visible", "show", "shown", "open", "true", "1":
-            return true
-        case "hidden", "hide", "closed", "false", "0":
-            return false
-        default:
-            return nil
-        }
-    }
-
-    static func shouldOpenRootTabFromPhoneHub(_ destination: SidebarDestination) -> Bool {
-        switch destination {
-        case .chat, .talk, .agents, .gateway, .settings:
-            true
-        case .overview, .activity, .workboard, .skillWorkshop, .instances, .sessions, .dreaming,
-             .usage,
-             .cron, .docs:
-            false
-        }
-    }
-
-    static func defaultSidebarDestination(for tab: AppTab) -> SidebarDestination {
-        switch tab {
-        case .control:
-            .overview
-        case .chat:
-            .chat
-        case .talk:
-            .talk
-        case .agent:
-            .agents
-        case .settings:
-            .settings
-        }
-    }
-
-    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
-        }
-        if shouldPresentOnLaunch || !hasConnectedOnce || !onboardingComplete {
-            return .onboarding
-        }
-        if !hasExistingGatewayConfig {
-            return .settings
-        }
-        return .none
-    }
-
-    static func shouldPresentQuickSetup(
-        quickSetupDismissed: Bool,
-        showOnboarding: Bool,
-        hasPresentedSheet: Bool,
-        gatewayConnected: Bool,
-        hasExistingGatewayConfig: Bool,
-        discoveredGatewayCount: Int) -> Bool
-    {
-        guard !quickSetupDismissed else { return false }
-        guard !showOnboarding else { return false }
-        guard !hasPresentedSheet else { return false }
-        guard !gatewayConnected else { return false }
-        guard !hasExistingGatewayConfig else { return false }
-        return discoveredGatewayCount > 0
-    }
-
-    struct SidebarGroup: Identifiable {
-        let title: String
-        let destinations: [SidebarDestination]
-
-        var id: String {
-            self.title
-        }
-    }
-
-    static let sidebarGroups: [SidebarGroup] = [
-        SidebarGroup(title: "CHAT", destinations: [.chat, .talk]),
-        SidebarGroup(
-            title: "CONTROL",
-            destinations: [
-                .overview,
-                .activity,
-                .agents,
-                .workboard,
-                .skillWorkshop,
-                .instances,
-                .sessions,
-                .dreaming,
-                .usage,
-                .cron,
-            ]),
-        SidebarGroup(
-            title: "SETTINGS",
-            destinations: [.settings]),
-        SidebarGroup(title: "REFERENCE", destinations: [.docs]),
-    ]
-
-    static var phoneControlGroups: [SidebarGroup] {
-        self.sidebarGroups
-            .map { group in
-                SidebarGroup(
-                    title: group.title,
-                    destinations: group.destinations.filter { $0 != .agents })
-            }
-            .filter { !$0.destinations.isEmpty }
-    }
-}

apps/ios/Sources/Status/GatewayActionsDialog.swift

@@ -0,0 +1,25 @@
+import SwiftUI
+
+extension View {
+    func gatewayActionsDialog(
+        isPresented: Binding<Bool>,
+        onDisconnect: @escaping () -> Void,
+        onOpenSettings: @escaping () -> Void) -> some View
+    {
+        self.confirmationDialog(
+            "Gateway",
+            isPresented: isPresented,
+            titleVisibility: .visible)
+        {
+            Button("Disconnect", role: .destructive) {
+                onDisconnect()
+            }
+            Button("Open Settings") {
+                onOpenSettings()
+            }
+            Button("Cancel", role: .cancel) {}
+        } message: {
+            Text("Disconnect from the gateway?")
+        }
+    }
+}

apps/ios/SwiftSources.input.xcfilelist

@@ -31,15 +31,6 @@ Sources/Design/AgentProTab+Usage.swift
 Sources/Design/AgentProTab+DetailComponents.swift
 Sources/Design/AgentProTab+GatewayData.swift
 Sources/Design/AgentProModels.swift
-Sources/Design/IPadActivityScreen.swift
-Sources/Design/IPadSidebarFeaturePreviews.swift
-Sources/Design/IPadSidebarFeatureScreens.swift
-Sources/Design/IPadSkillWorkshopScreen.swift
-Sources/Design/IPadSidebarScreenChrome.swift
-Sources/Design/IPadWorkboardScreen.swift
-Sources/Design/OpenClawDocsScreen.swift
-Sources/Design/RootTabsPhoneControlHub.swift
-Sources/Design/SettingsChannelsDestination.swift
 Sources/EventKit/EventKitAuthorization.swift
 Sources/Gateway/DeepLinkAgentPromptAlert.swift
 Sources/Gateway/ExecApprovalPromptDialog.swift
@@ -82,7 +73,6 @@ Sources/Push/PushRelayClient.swift
 Sources/Push/PushRelayKeychainStore.swift
 Sources/Reminders/RemindersService.swift
 Sources/RootTabs.swift
-Sources/RootTabsNavigation.swift
 Sources/RootView.swift
 Sources/Screen/ScreenController.swift
 Sources/Screen/ScreenRecordService.swift
@@ -96,6 +86,7 @@ Sources/SessionKey.swift
 Sources/Settings/PrivacyAccessSectionView.swift
 Sources/Settings/SettingsNetworkingHelpers.swift
 Sources/Settings/VoiceWakeWordsSettingsView.swift
+Sources/Status/GatewayActionsDialog.swift
 Sources/Status/GatewayStatusBuilder.swift
 Sources/Status/VoiceWakeToast.swift
 Sources/Voice/TalkGatewayPermissionState.swift

apps/ios/Tests/CommandCenterTabLayoutTests.swift

@@ -1,27 +0,0 @@
-import SwiftUI
-import Testing
-@testable import OpenClaw
-
-@MainActor
-@Suite struct CommandCenterTabLayoutTests {
-    @Test func splitLayoutDisabledForCompactWidth() {
-        #expect(
-            !CommandCenterTab.usesSplitSectionsLayout(
-                horizontalSizeClass: .compact,
-                containerWidth: 1_200))
-    }
-
-    @Test func splitLayoutDisabledBelowWidthThreshold() {
-        #expect(
-            !CommandCenterTab.usesSplitSectionsLayout(
-                horizontalSizeClass: .regular,
-                containerWidth: 900))
-    }
-
-    @Test func splitLayoutEnabledForRegularWideLayout() {
-        #expect(
-            CommandCenterTab.usesSplitSectionsLayout(
-                horizontalSizeClass: .regular,
-                containerWidth: 1_024))
-    }
-}

apps/ios/Tests/GatewayStatusBuilderTests.swift

@@ -33,12 +33,4 @@ import Testing
 
         #expect(state == .connecting)
     }
-
-    @Test func chatGatewayPillLabelsMatchDisplayState() {
-        #expect(ChatProTab.gatewayPillTitle(state: .disconnected, isGatewayUsable: false) == "Offline")
-        #expect(ChatProTab.gatewayPillTitle(state: .connecting, isGatewayUsable: false) == "Connecting")
-        #expect(ChatProTab.gatewayPillTitle(state: .error, isGatewayUsable: false) == "Attention")
-        #expect(ChatProTab.gatewayPillTitle(state: .connected, isGatewayUsable: true) == "Connected")
-        #expect(ChatProTab.gatewayPillTitle(state: .connected, isGatewayUsable: false) == "Unavailable")
-    }
 }

apps/ios/Tests/NodeAppModelInvokeTests.swift

@@ -1025,38 +1025,6 @@ private final class MockBootstrapNotificationCenter: NotificationCentering, @unc
         #expect(appModel.openChatRequestID == 1)
     }
 
-    @Test @MainActor func operatorAdminScopeCacheRefreshesFromStoredToken() throws {
-        let tempDir = FileManager.default.temporaryDirectory
-            .appendingPathComponent(UUID().uuidString, isDirectory: true)
-        try FileManager.default.createDirectory(at: tempDir, withIntermediateDirectories: true)
-        let previousStateDir = ProcessInfo.processInfo.environment["OPENCLAW_STATE_DIR"]
-        setenv("OPENCLAW_STATE_DIR", tempDir.path, 1)
-        defer {
-            if let previousStateDir {
-                setenv("OPENCLAW_STATE_DIR", previousStateDir, 1)
-            } else {
-                unsetenv("OPENCLAW_STATE_DIR")
-            }
-            try? FileManager.default.removeItem(at: tempDir)
-        }
-
-        let appModel = NodeAppModel()
-        let identity = DeviceIdentityStore.loadOrCreate()
-        #expect(appModel.hasOperatorAdminScope == false)
-
-        _ = DeviceAuthStore.storeToken(
-            deviceId: identity.deviceId,
-            role: "operator",
-            token: "operator-token",
-            scopes: ["operator.read", "operator.admin"])
-        appModel._test_refreshOperatorAdminScopeFromStore()
-        #expect(appModel.hasOperatorAdminScope == true)
-
-        DeviceAuthStore.clearToken(deviceId: identity.deviceId, role: "operator")
-        appModel._test_refreshOperatorAdminScopeFromStore()
-        #expect(appModel.hasOperatorAdminScope == false)
-    }
-
     @Test @MainActor func sendVoiceTranscriptThrowsWhenGatewayOffline() async {
         let appModel = NodeAppModel()
         await #expect(throws: Error.self) {

apps/ios/Tests/RootTabsPresentationTests.swift

@@ -1,6 +1,4 @@
-import SwiftUI
 import Testing
-import UIKit
 @testable import OpenClaw
 
 @MainActor
@@ -40,432 +38,4 @@ import UIKit
 
         #expect(!shouldPresent)
     }
-
-    @Test func sidebarTabsEnabledForIPadRegularWidth() {
-        #expect(
-            RootTabs.shouldUseSidebarTabs(
-                idiom: .pad,
-                horizontalSizeClass: .regular))
-    }
-
-    @Test func sidebarTabsEnabledForIPadCompactWidth() {
-        #expect(
-            RootTabs.shouldUseSidebarTabs(
-                idiom: .pad,
-                horizontalSizeClass: .compact))
-    }
-
-    @Test func sidebarTabsDisabledForIPhone() {
-        #expect(
-            !RootTabs.shouldUseSidebarTabs(
-                idiom: .phone,
-                horizontalSizeClass: .regular))
-    }
-
-    @Test func sidebarGroupsMatchAdaptiveNavigationModel() {
-        let groups = RootTabs.sidebarGroups
-        let destinationIDs = RootTabs.SidebarDestination.allCases.map(\.rawValue)
-
-        #expect(groups.map(\.title) == ["CHAT", "CONTROL", "SETTINGS", "REFERENCE"])
-        #expect(groups[0].destinations.map(\.rawValue) == ["chat", "talk"])
-        #expect(groups[1].destinations == [
-            .overview,
-            .activity,
-            .agents,
-            .workboard,
-            .skillWorkshop,
-            .instances,
-            .sessions,
-            .dreaming,
-            .usage,
-            .cron,
-        ])
-        #expect(groups[2].destinations == [.settings])
-        #expect(groups[3].destinations == [.docs])
-        #expect(destinationIDs == [
-            "chat",
-            "talk",
-            "overview",
-            "activity",
-            "agents",
-            "workboard",
-            "skillWorkshop",
-            "instances",
-            "sessions",
-            "dreaming",
-            "usage",
-            "cron",
-            "docs",
-            "settings",
-            "gateway",
-        ])
-        #expect(!destinationIDs.contains("agent"))
-        #expect(!RootTabs.sidebarGroups.flatMap(\.destinations).contains(.gateway))
-    }
-
-    @Test func phoneControlGroupsAvoidDuplicatingTheAgentTab() {
-        let groups = RootTabs.phoneControlGroups
-        let destinations = groups.flatMap(\.destinations)
-
-        #expect(groups.map(\.title) == ["CHAT", "CONTROL", "SETTINGS", "REFERENCE"])
-        #expect(!destinations.contains(.agents))
-        #expect(RootTabs.sidebarGroups.flatMap(\.destinations).contains(.agents))
-        #expect(destinations.contains(.dreaming))
-        #expect(destinations.contains(.instances))
-    }
-
-    @Test func sidebarUsesCompactLabelsForLongRoutes() {
-        #expect(RootTabs.SidebarDestination.settings.title == "Settings")
-        #expect(RootTabs.SidebarDestination.gateway.title == "Settings / Gateway")
-        #expect(RootTabs.SidebarDestination.gateway.sidebarTitle == "Connection")
-    }
-
-    @Test func phoneHubUsesRootTabsOnlyForNativeChatAgentAndGateway() {
-        #expect(RootTabs.shouldOpenRootTabFromPhoneHub(.chat))
-        #expect(RootTabs.shouldOpenRootTabFromPhoneHub(.talk))
-        #expect(RootTabs.shouldOpenRootTabFromPhoneHub(.agents))
-        #expect(RootTabs.shouldOpenRootTabFromPhoneHub(.gateway))
-        #expect(RootTabs.shouldOpenRootTabFromPhoneHub(.settings))
-
-        for destination in RootTabs.SidebarDestination.allCases
-            where destination != .chat && destination != .talk && destination != .agents && destination != .gateway && destination != .settings
-        {
-            #expect(!RootTabs.shouldOpenRootTabFromPhoneHub(destination))
-        }
-    }
-
-    @Test func legacyInitialTabsMapToMatchingSidebarDestinations() {
-        #expect(RootTabs.defaultSidebarDestination(for: .control) == .overview)
-        #expect(RootTabs.defaultSidebarDestination(for: .chat) == .chat)
-        #expect(RootTabs.defaultSidebarDestination(for: .talk) == .talk)
-        #expect(RootTabs.defaultSidebarDestination(for: .agent) == .agents)
-        #expect(RootTabs.defaultSidebarDestination(for: .settings) == .settings)
-    }
-
-    @Test func skillWorkshopMutationsRequireAdminScope() {
-        #expect(IPadSkillWorkshopScreen.shouldEnableProposalMutation(canWrite: true, hasOperatorAdminScope: true))
-        #expect(!IPadSkillWorkshopScreen.shouldEnableProposalMutation(canWrite: true, hasOperatorAdminScope: false))
-        #expect(!IPadSkillWorkshopScreen.shouldEnableProposalMutation(canWrite: false, hasOperatorAdminScope: true))
-    }
-
-    @Test func skillWorkshopHeldFilterIncludesQuarantinedAndStale() {
-        #expect(IPadSkillWorkshopScreen.proposalStatusFilters.contains("held"))
-        #expect(IPadSkillWorkshopScreen.proposalStatusMatchesFilter(status: "quarantined", filter: "held"))
-        #expect(IPadSkillWorkshopScreen.proposalStatusMatchesFilter(status: "stale", filter: "held"))
-        #expect(!IPadSkillWorkshopScreen.proposalStatusMatchesFilter(status: "pending", filter: "held"))
-    }
-
-    @Test func skillWorkshopBoardLanesMatchStatusFilter() {
-        #expect(
-            IPadSkillWorkshopScreen.proposalStatusBoardLanes(
-                filter: "pending",
-                proposalStatuses: ["pending", "applied"]) == ["pending"])
-        #expect(
-            IPadSkillWorkshopScreen.proposalStatusBoardLanes(
-                filter: "held",
-                proposalStatuses: ["quarantined", "stale"]) == ["quarantined", "stale"])
-        #expect(
-            IPadSkillWorkshopScreen.proposalStatusBoardLanes(
-                filter: "all",
-                proposalStatuses: ["pending", "needs-review"]) == [
-                "pending",
-                "quarantined",
-                "stale",
-                "applied",
-                "rejected",
-                "needs-review",
-            ])
-        #expect(IPadSkillWorkshopScreen.proposalLaneLabel("quarantined") == "Quarantined")
-        #expect(IPadSkillWorkshopScreen.proposalLaneLabel("pending") == "Pending")
-        #expect(IPadSkillWorkshopScreen.proposalLaneLabel("needs-review") == "Needs Review")
-        #expect(IPadSkillWorkshopScreen.proposalLaneLabel("manual_QA") == "Manual QA")
-    }
-
-    @Test func skillWorkshopSelectionStaysInsideActiveFilter() {
-        let proposals = [
-            (id: "applied-1", status: "applied"),
-            (id: "pending-1", status: "pending"),
-            (id: "held-1", status: "quarantined"),
-        ]
-
-        #expect(
-            IPadSkillWorkshopScreen.nextSelectedProposalID(
-                current: "applied-1",
-                proposals: proposals,
-                filter: "pending") == "pending-1")
-        #expect(
-            IPadSkillWorkshopScreen.nextSelectedProposalID(
-                current: "held-1",
-                proposals: proposals,
-                filter: "held") == "held-1")
-        #expect(
-            IPadSkillWorkshopScreen.nextSelectedProposalID(
-                current: "pending-1",
-                visibleProposalIDs: ["held-1"]) == "held-1")
-        #expect(
-            IPadSkillWorkshopScreen.nextSelectedProposalID(
-                current: "pending-1",
-                visibleProposalIDs: []) == nil)
-    }
-
-    @Test func workboardBoardScopeLabelsStayCompact() {
-        #expect(IPadWorkboardScreen.normalizedScopeID("  planning ") == "planning")
-        #expect(IPadWorkboardScreen.boardScopeLabel(for: "") == "All boards")
-        #expect(IPadWorkboardScreen.boardScopeLabel(for: "planning") == "planning")
-        #expect(IPadWorkboardScreen.boardScopeOptions(
-            knownBoardIDs: ["default", " empty-board ", ""],
-            cardBoardIDs: ["planning", "default"]) == ["default", "empty-board", "planning"])
-        #expect(IPadWorkboardScreen
-            .workboardSubtitle(boardScopeLabel: "All boards", selectedStatus: "active") == "All boards / Active")
-        #expect(IPadWorkboardScreen
-            .workboardSubtitle(boardScopeLabel: "planning", selectedStatus: "running") == "planning / Running")
-    }
-
-    @Test func workboardCompactUnavailableCopyExplainsRealCapabilityState() {
-        #expect(IPadWorkboardScreen
-            .compactWriteUnavailableMessage(canRead: false) ==
-            "Connect from Settings to create, move, and dispatch cards.")
-        #expect(IPadWorkboardScreen.compactWriteUnavailableMessage(canRead: true) == "Read-only gateway.")
-    }
-
-    @Test func skillWorkshopAgentScopeNormalizesGatewayIds() {
-        #expect(IPadSkillWorkshopScreen.normalizedScopeID("  aiden ") == "aiden")
-        #expect(IPadSkillWorkshopScreen.normalizedScopeID(nil) == "")
-    }
-
-    @Test func channelLifecycleControlsRequireAdminScope() {
-        #expect(SettingsChannelsDestination.shouldEnableChannelOperation(canRead: true, hasOperatorAdminScope: true))
-        #expect(!SettingsChannelsDestination.shouldEnableChannelOperation(canRead: true, hasOperatorAdminScope: false))
-        #expect(!SettingsChannelsDestination.shouldEnableChannelOperation(canRead: false, hasOperatorAdminScope: true))
-    }
-
-    @Test func clickClackStaysInChannelsIntegrationMetadata() {
-        #expect(SettingsChannelsDestination.fallbackLabel("clickclack") == "ClickClack")
-        #expect(SettingsChannelsDestination.fallbackDetail("clickclack") == "Self-hosted chat bot routing.")
-        #expect(SettingsChannelsDestination.fallbackSystemImage("clickclack") == "bubble.left.and.bubble.right")
-    }
-
-    @Test func iPadOverviewCanSuppressStandaloneHeaderBranding() {
-        #expect(CommandCenterTab.shouldShowHeaderMark(hasLeadingAction: false, showsHeaderMark: true))
-        #expect(!CommandCenterTab.shouldShowHeaderMark(hasLeadingAction: true, showsHeaderMark: true))
-        #expect(!CommandCenterTab.shouldShowHeaderMark(hasLeadingAction: false, showsHeaderMark: false))
-    }
-
-    @Test func chatSidebarDestinationCanUseRouteHeaderInsteadOfAgentBranding() {
-        let standalone = ChatProTab()
-        let routed = ChatProTab(
-            headerTitle: "Chat",
-            headerSubtitle: "Agent conversation",
-            showsAgentBadge: false,
-            openSettings: {})
-
-        #expect(standalone.showsAgentBadge)
-        #expect(standalone.headerTitle == nil)
-        #expect(standalone.openSettings == nil)
-        #expect(routed.headerTitle == "Chat")
-        #expect(routed.headerSubtitle == "Agent conversation")
-        #expect(!routed.showsAgentBadge)
-        #expect(routed.openSettings != nil)
-        #expect(ChatProTab.defaultHeaderTitle(showsAgentBadge: true, agentDisplayName: "OpenClaw") == "OpenClaw")
-        #expect(ChatProTab.defaultHeaderTitle(showsAgentBadge: false, agentDisplayName: "OpenClaw") == "Chat")
-    }
-
-    @Test func agentRoutesCanOpenGatewaySettingsFromHeaderPill() {
-        let standalone = AgentProTab()
-        let routed = AgentProTab(
-            directRoute: .instances,
-            headerTitle: "Instances",
-            openSettings: {})
-
-        #expect(standalone.headerTitle == "Agents")
-        #expect(standalone.directRoute == nil)
-        #expect(standalone.openSettings == nil)
-        #expect(AgentProTab(directRoute: .agents).directRoute == .agents)
-        #expect(routed.directRoute == .instances)
-        #expect(routed.headerTitle == "Instances")
-        #expect(routed.openSettings != nil)
-    }
-
-    @Test func workboardDispatchSummaryReportsStartedAndFailures() throws {
-        let payload = Data(
-            """
-            {
-              "count": 2,
-              "started": [{}],
-              "startFailures": [{}],
-              "promoted": [],
-              "reclaimed": [],
-              "blocked": [],
-              "orchestrated": []
-            }
-            """.utf8)
-        let summary = try JSONDecoder().decode(IPadWorkboardDispatchSummary.self, from: payload)
-
-        #expect(summary.summaryText == "2 dispatched: 1 started, 1 failed.")
-    }
-
-    @Test func talkSidebarDestinationCanReceiveRevealAction() {
-        let action = OpenClawSidebarHeaderAction(
-            systemName: "sidebar.left",
-            accessibilityLabel: "Show Sidebar",
-            action: {})
-        let routed = TalkProTab(headerLeadingAction: action, openSettings: {})
-
-        #expect(routed.headerLeadingAction?.systemName == "sidebar.left")
-        #expect(routed.headerLeadingAction?.accessibilityLabel == "Show Sidebar")
-    }
-
-    @Test func iPadPortraitUsesHiddenDrawerSidebar() {
-        let mode = RootTabs.sidebarLayoutMode(containerSize: CGSize(width: 1024, height: 1366))
-
-        #expect(mode == .drawer)
-        #expect(!RootTabs.preferredSidebarVisibility(layoutMode: mode))
-    }
-
-    @Test func iPadWideLandscapeUsesVisibleSplitSidebar() {
-        let mode = RootTabs.sidebarLayoutMode(containerSize: CGSize(width: 1366, height: 1024))
-
-        #expect(mode == .split)
-        #expect(RootTabs.preferredSidebarVisibility(layoutMode: mode))
-    }
-
-    @Test func iPadSplitSidebarWidthStaysUsable() {
-        let width = RootTabs.sidebarWidth(containerWidth: 1366, isDrawerLayout: false)
-
-        #expect(width >= RootTabs.sidebarSplitIdealWidth)
-        #expect(width <= RootTabs.sidebarSplitMaximumWidth)
-    }
-
-    @Test func iPadCollapsedSplitSidebarUsesHeaderRevealWithoutReservedRail() {
-        #expect(
-            RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: false,
-                layoutMode: .split))
-        #expect(
-            RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: true,
-                layoutMode: .split))
-        #expect(
-            RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: false,
-                layoutMode: .drawer))
-        #expect(
-            !RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: true,
-                layoutMode: .drawer))
-    }
-
-    @Test func initialSidebarVisibilityParsesLaunchArgument() {
-        #expect(
-            RootTabs.requestedInitialSidebarVisibility(arguments: [
-                "OpenClaw",
-                "--openclaw-sidebar-visibility",
-                "hidden",
-            ]) == false)
-        #expect(
-            RootTabs.requestedInitialSidebarVisibility(arguments: [
-                "OpenClaw",
-                "--openclaw-sidebar-visibility",
-                "visible",
-            ]) == true)
-        #expect(
-            RootTabs.requestedInitialSidebarVisibility(arguments: [
-                "OpenClaw",
-                "--openclaw-sidebar-visibility",
-                "unknown",
-            ]) == nil)
-    }
-
-    @Test func sidebarControlsHaveStableAccessibilityIdentifiers() {
-        #expect(RootTabs.sidebarShowButtonAccessibilityIdentifier == "RootTabs.Sidebar.Show")
-        #expect(RootTabs.sidebarHideButtonAccessibilityIdentifier == "RootTabs.Sidebar.Hide")
-    }
-
-    @Test func iPadDrawerSidebarWidthStaysInsideScreen() {
-        let width = RootTabs.sidebarWidth(containerWidth: 744, isDrawerLayout: true)
-
-        #expect(width >= 280)
-        #expect(width <= RootTabs.sidebarDrawerMaximumWidth)
-    }
-
-    @Test func narrowLandscapeKeepsDrawerSidebar() {
-        let mode = RootTabs.sidebarLayoutMode(containerSize: CGSize(width: 900, height: 600))
-
-        #expect(mode == .drawer)
-        #expect(!RootTabs.preferredSidebarVisibility(layoutMode: mode))
-    }
-
-    @Test func drawerSelectionCollapsesSidebarButSplitSelectionDoesNot() {
-        #expect(RootTabs.shouldCollapseSidebarAfterSelection(layoutMode: .drawer))
-        #expect(!RootTabs.shouldCollapseSidebarAfterSelection(layoutMode: .split))
-    }
-
-    @Test func hiddenSidebarShowsRevealControl() {
-        #expect(RootTabs.shouldShowSidebarRevealControl(isSidebarVisible: false))
-    }
-
-    @Test func sidebarRevealControlsHideWhenSidebarIsVisible() {
-        #expect(!RootTabs.shouldShowSidebarRevealControl(isSidebarVisible: true))
-    }
-
-    @Test func iPadSplitPrefersIntegratedVisibleSidebar() {
-        #expect(RootTabs.preferredSidebarVisibility(layoutMode: .split))
-        #expect(!RootTabs.shouldCollapseSidebarAfterSelection(layoutMode: .split))
-        #expect(!RootTabs.preferredSidebarVisibility(layoutMode: .drawer))
-        #expect(RootTabs.shouldCollapseSidebarAfterSelection(layoutMode: .drawer))
-    }
-
-    @Test func destinationHeadersOwnHiddenSidebarRevealControl() {
-        #expect(
-            RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: false,
-                layoutMode: .drawer))
-        #expect(
-            RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: false,
-                layoutMode: .split))
-        #expect(
-            !RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: true,
-                layoutMode: .drawer))
-        #expect(
-            RootTabs.shouldShowSidebarRevealInDestinationHeader(
-                isSidebarVisible: true,
-                layoutMode: .split))
-    }
-
-    @Test func workboardAndSkillWorkshopUseCompactTaskFlowOnPhoneSizes() {
-        #expect(
-            IPadWorkboardScreen.usesCompactTaskFlow(
-                horizontalSizeClass: .compact,
-                verticalSizeClass: .regular))
-        #expect(
-            IPadSkillWorkshopScreen.usesCompactTaskFlow(
-                horizontalSizeClass: .compact,
-                verticalSizeClass: .regular))
-        #expect(
-            IPadWorkboardScreen.usesCompactTaskFlow(
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .compact))
-        #expect(
-            IPadSkillWorkshopScreen.usesCompactTaskFlow(
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .compact))
-    }
-
-    @Test func workboardAndSkillWorkshopKeepRegularTaskFlowOnWideIPadSizes() {
-        #expect(
-            !IPadWorkboardScreen.usesCompactTaskFlow(
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .regular))
-        #expect(
-            !IPadSkillWorkshopScreen.usesCompactTaskFlow(
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .regular))
-    }
-
-    @Test func phoneHubLeavesRoomForFloatingTabBar() {
-        #expect(RootTabsPhoneControlHub.bottomScrollInset(verticalSizeClass: .regular) == 112)
-        #expect(RootTabsPhoneControlHub.bottomScrollInset(verticalSizeClass: .compact) == 72)
-    }
 }

apps/ios/Tests/RootTabsSidebarRegressionTests.swift

@@ -1,65 +0,0 @@
-import Foundation
-import Testing
-
-@Suite struct RootTabsSidebarRegressionTests {
-    @Test func iPadSplitHiddenSidebarUsesHeaderRevealInsteadOfReservedRail() throws {
-        let source = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let navigationSource = try String(contentsOf: Self.rootTabsNavigationSourceURL(), encoding: .utf8)
-        let splitContent = try Self.extract(
-            source,
-            from: "private func sidebarNavigationSplitContent(sidebarWidth: CGFloat) -> some View",
-            to: "private func sidebarDrawerContent(sidebarWidth: CGFloat) -> some View")
-
-        #expect(splitContent.contains("HStack(spacing: 0)"))
-        #expect(splitContent.contains("self.sidebarColumn"))
-        #expect(splitContent.contains(".frame(width: sidebarWidth, alignment: .topLeading)"))
-        #expect(splitContent.contains(".overlay(alignment: .trailing)"))
-        #expect(!splitContent.contains("self.syncSidebarVisibility(from: visibility)"))
-        #expect(!source.contains("NavigationSplitViewVisibility"))
-        #expect(!source.contains("@State private var splitColumnVisibility: NavigationSplitViewVisibility"))
-        #expect(!splitContent.contains("NavigationSplitView"))
-        #expect(!splitContent.contains("self.collapsedSidebarRail"))
-        #expect(!source.contains("private var collapsedSidebarRail: some View"))
-        #expect(!source.contains("Self.sidebarCollapsedRailWidth"))
-        #expect(source.contains("shouldShowSidebarRevealInDestinationHeader"))
-        #expect(!navigationSource.contains("static let sidebarCollapsedRailWidth"))
-        #expect(!navigationSource.contains("static func sidebarSplitColumnVisibility(isSidebarVisible: Bool)"))
-        #expect(!navigationSource
-            .contains("static func sidebarIsVisible(splitColumnVisibility: NavigationSplitViewVisibility)"))
-    }
-
-    @Test func initialSidebarVisibilitySurvivesFirstLayoutMeasurement() throws {
-        let source = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let layoutUpdate = try Self.extract(
-            source,
-            from: "private func updateSidebarLayout(containerSize: CGSize, force: Bool)",
-            to: "private func setSidebarVisible(_ isVisible: Bool)")
-
-        #expect(source.contains("@State private var didResolveSidebarLayout: Bool = false"))
-        #expect(layoutUpdate.contains("let didResolvePreviousLayout = self.didResolveSidebarLayout"))
-        #expect(layoutUpdate.contains("self.didResolveSidebarLayout = true"))
-        #expect(layoutUpdate.contains("if layoutModeDidChange && didResolvePreviousLayout"))
-        #expect(layoutUpdate.contains("guard force || !self.sidebarVisibilityUserOverridden else { return }"))
-    }
-
-    private static func rootTabsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/RootTabs.swift")
-    }
-
-    private static func rootTabsNavigationSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/RootTabsNavigation.swift")
-    }
-
-    private static func extract(_ source: String, from start: String, to end: String) throws -> String {
-        let startRange = try #require(source.range(of: start))
-        let tail = source[startRange.lowerBound...]
-        let endRange = try #require(tail.range(of: end))
-        return String(tail[..<endRange.lowerBound])
-    }
-}

apps/ios/Tests/RootTabsSourceGuardTests.swift

@@ -1,812 +0,0 @@
-import Foundation
-import Testing
-
-@Suite struct RootTabsSourceGuardTests {
-    @Test func hiddenSidebarRevealUsesDestinationHeaderWithoutReservedRail() throws {
-        let source = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let componentSource = try String(contentsOf: Self.proComponentsSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("sidebarHeaderLeadingAction"))
-        #expect(source.contains("Hide Sidebar"))
-        #expect(source.contains("Show Sidebar"))
-        #expect(source.contains("shouldShowSidebarRevealInDestinationHeader"))
-        #expect(source.contains("layoutMode: self.isSidebarDrawerLayout ? .drawer : .split"))
-        #expect(componentSource.contains("OpenClawSidebarHeaderLeadingSlot"))
-        #expect(componentSource.contains(".frame(width: 44, height: 44, alignment: .center)"))
-        #expect(source.contains(".safeAreaPadding(.top, 8)"))
-        #expect(source.contains("Self.sidebarShowButtonAccessibilityIdentifier"))
-        #expect(source.contains("Self.sidebarHideButtonAccessibilityIdentifier"))
-        #expect(source.contains("accessibilityLabel: \"Hide Sidebar\""))
-        #expect(source.contains("accessibilityLabel: \"Show Sidebar\""))
-        #expect(source.contains("action: { self.hideSidebar() }"))
-        #expect(source.contains("action: { self.showSidebar() }"))
-        #expect(!source.contains("private var collapsedSidebarRail: some View"))
-        #expect(!source.contains("Self.sidebarCollapsedRailWidth"))
-        #expect(source.contains("requestedInitialSidebarVisibility"))
-        #expect(!source.contains("@State private var splitColumnVisibility: NavigationSplitViewVisibility"))
-        #expect(!source.contains("NavigationSplitView(columnVisibility: self.$splitColumnVisibility)"))
-        #expect(source.contains("HStack(spacing: 0)"))
-        #expect(!source.contains("self.syncSidebarVisibility(from: visibility)"))
-        #expect(!source.contains("shouldReserveSidebarRevealInset"))
-        #expect(!source.contains("safeAreaInset(edge: .top"))
-        #expect(!source.contains("thinMaterial, in: Circle"))
-        #expect(!source.contains("sidebarRevealInset"))
-        #expect(source.contains("Color.black.opacity(0.28)"))
-        #expect(source.contains(".background(Color(uiColor: .systemBackground))"))
-        #expect(!source.contains("sidebarRevealCornerButton"))
-        #expect(!source.contains("shouldShowSidebarRevealOverlay"))
-        #expect(!source.contains("shouldShowOverviewHeaderSidebarReveal"))
-    }
-
-    @Test func iPadSplitUsesSlidingSidebarWhilePortraitKeepsDrawerOverlay() throws {
-        let source = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let splitContent = try Self.extract(
-            source,
-            from: "private func sidebarNavigationSplitContent(sidebarWidth: CGFloat) -> some View",
-            to: "private func sidebarDrawerContent(sidebarWidth: CGFloat) -> some View")
-        let drawerContent = try Self.extract(
-            source,
-            from: "private func sidebarDrawerContent(sidebarWidth: CGFloat) -> some View",
-            to: "private var sidebarDetailShell: some View")
-
-        #expect(!source.contains("@State private var splitColumnVisibility: NavigationSplitViewVisibility"))
-        #expect(!source.contains("Self.sidebarSplitColumnVisibility(isSidebarVisible:"))
-        #expect(!source.contains("self.syncSidebarVisibility(from: visibility)"))
-        #expect(splitContent.contains("HStack(spacing: 0)"))
-        #expect(splitContent.contains("self.sidebarColumn"))
-        #expect(splitContent.contains(".frame(width: sidebarWidth, alignment: .topLeading)"))
-        #expect(splitContent.contains(".overlay(alignment: .trailing)"))
-        #expect(splitContent.contains("self.sidebarVerticalSeparator"))
-        #expect(splitContent.contains("self.sidebarDetailNavigationShell"))
-        #expect(!splitContent.contains("NavigationSplitView"))
-        #expect(!splitContent.contains("self.collapsedSidebarRail"))
-        #expect(!source.contains("Self.sidebarCollapsedRailWidth"))
-        #expect(drawerContent.contains("ZStack(alignment: .topLeading)"))
-        #expect(drawerContent.contains("Color.black.opacity(0.28)"))
-        #expect(drawerContent.contains(".transition(.move(edge: .leading).combined(with: .opacity))"))
-        #expect(!drawerContent.contains("NavigationSplitView"))
-    }
-
-    @Test func sidebarKeepsNavigationModelDestinationOnly() throws {
-        let source = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let navigationSource = try String(contentsOf: Self.rootTabsNavigationSourceURL(), encoding: .utf8)
-        let sidebarColumn = try Self.extract(
-            source,
-            from: "private var sidebarColumn: some View",
-            to: "private var sidebarList: some View")
-
-        #expect(source.contains("ForEach(Self.sidebarGroups)"))
-        #expect(!source.contains("Section(\"Context\")"))
-        #expect(!source.contains("sidebarAgentMenu"))
-        #expect(!source.contains("sidebarDeviceMenu"))
-        #expect(sidebarColumn.contains("self.sidebarIdentityHeader"))
-        #expect(source.contains("private var sidebarIdentityHeader: some View"))
-        #expect(source.contains("OpenClawProMark(size: 30"))
-        #expect(source.contains("Text(\"OpenClaw\")"))
-        #expect(source.contains("private var sidebarGatewayStatusTitle: String"))
-        #expect(source.contains("private var sidebarGatewayStatusColor: Color"))
-        #expect(!sidebarColumn.contains("activeAgent"))
-        #expect(!source.contains("shouldShowSidebarColumnHeader"))
-        #expect(!source.contains("private var sidebarColumnHeader: some View"))
-        #expect(sidebarColumn.contains(".safeAreaPadding(.top, 8)"))
-        #expect(source.contains(".scrollContentBackground(.hidden)"))
-        #expect(source.contains(".listStyle(.sidebar)"))
-        #expect(source.contains("private var sidebarHorizontalSeparator: some View"))
-        #expect(source.contains("private var sidebarVerticalSeparator: some View"))
-        #expect(source.contains("1 / UIScreen.main.scale"))
-        #expect(!source.contains("geometry.size.height >= Self.sidebarListNonScrollingMinimumHeight"))
-        #expect(!source.contains("private var sidebarListContent: some View"))
-        #expect(source.contains(".listRowSeparator(.hidden, edges: .all)"))
-        #expect(source.contains(".listSectionSeparator(.hidden, edges: .all)"))
-        #expect(source.contains("if self.isSidebarDrawerLayout {"))
-        #expect(source.contains("private var sidebarFooter: some View"))
-        #expect(!source.contains("LabeledContent(\"Version\""))
-        #expect(navigationSource.contains("SidebarGroup(title: \"CHAT\", destinations: [.chat, .talk])"))
-        #expect(!navigationSource.contains("title: \"AGENT\""))
-        #expect(navigationSource.contains("case settings"))
-        #expect(!navigationSource.contains("case settingsChannels"))
-        #expect(!navigationSource.contains("case settingsApprovals"))
-        #expect(!navigationSource.contains("case settingsPrivacy"))
-        #expect(navigationSource.contains("SidebarGroup(\n            title: \"SETTINGS\""))
-        #expect(navigationSource.contains("destinations: [.settings]"))
-        #expect(!navigationSource.contains("destinations: [.gateway"))
-        #expect(!navigationSource.contains("SidebarGroup(title: \"REFERENCE\", destinations: [.settings"))
-        #expect(navigationSource.contains("SidebarGroup(title: \"REFERENCE\", destinations: [.docs])"))
-    }
-
-    @Test func sidebarRoutesUseDestinationHeadersInsteadOfRepeatedProductBranding() throws {
-        let rootSource = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let agentOverviewSource = try String(contentsOf: Self.agentProTabOverviewSourceURL(), encoding: .utf8)
-        let docsSource = try String(contentsOf: Self.docsSourceURL(), encoding: .utf8)
-        let sidebarDetail = try Self.extract(
-            rootSource,
-            from: "private var sidebarDetail: some View",
-            to: "private var sidebarDetailNavigationShell: some View")
-
-        #expect(sidebarDetail.contains("headerTitle: \"Chat\""))
-        #expect(sidebarDetail.contains("headerTitle: \"Overview\""))
-        #expect(sidebarDetail.contains("headerTitle: \"Agents\""))
-        #expect(sidebarDetail.contains("headerTitle: \"Instances\""))
-        #expect(!sidebarDetail.contains("headerTitle: \"Nodes\""))
-        #expect(sidebarDetail.contains("directRoute: .agents"))
-        #expect(sidebarDetail.contains("directRoute: .instances"))
-        #expect(sidebarDetail.contains("directRoute: .dreaming"))
-        #expect(sidebarDetail.contains("directRoute: .usage"))
-        #expect(sidebarDetail.contains("directRoute: .cron"))
-        #expect(!sidebarDetail.contains("initialRoute: .nodes"))
-        #expect(!sidebarDetail.contains("initialRoute: .usage"))
-        #expect(!sidebarDetail.contains("initialRoute: .cron"))
-        #expect(sidebarDetail.contains("headerTitle: \"Dreaming\""))
-        #expect(sidebarDetail.contains("headerTitle: \"Usage\""))
-        #expect(sidebarDetail.contains("headerTitle: \"Cron Jobs\""))
-        #expect(!sidebarDetail.contains("headerTitle: \"OpenClaw\""))
-        #expect(agentOverviewSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(agentOverviewSource.contains("title: self.headerTitle"))
-        #expect(!agentOverviewSource.contains("Text(\"OpenClaw\")"))
-        #expect(docsSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(docsSource.contains("title: \"Docs\""))
-        #expect(!docsSource.contains("Text(\"OpenClaw Docs\")"))
-    }
-
-    @Test func agentsDirectRouteKeepsSingleSidebarControl() throws {
-        let source = try String(contentsOf: Self.agentProTabSourceURL(), encoding: .utf8)
-        let destinationsSource = try String(contentsOf: Self.agentProTabDestinationsSourceURL(), encoding: .utf8)
-        let nodesSource = try String(contentsOf: Self.agentProNodesDestinationSourceURL(), encoding: .utf8)
-        let dreamingSource = try String(contentsOf: Self.agentProDreamingDestinationSourceURL(), encoding: .utf8)
-        let directDestination = try Self.extract(
-            source,
-            from: "private func directDestination(for route: AgentRoute) -> some View",
-            to: "private func applyInitialRouteIfNeeded()")
-
-        #expect(!directDestination.contains("ToolbarItem"))
-        #expect(directDestination.contains("self.directHeaderLeadingAction(for: route) == nil ? .visible : .hidden"))
-        #expect(destinationsSource.contains("self.directHeaderLeadingAction(for: .instances)"))
-        #expect(destinationsSource.contains("self.directHeaderLeadingAction(for: .dreaming)"))
-        #expect(destinationsSource.contains("self.directHeader(\n                        for: .usage"))
-        #expect(destinationsSource.contains("self.directHeader(\n                        for: .cron"))
-        #expect(destinationsSource.contains("self.directRoute == route ? self.headerLeadingAction : nil"))
-        #expect(nodesSource.contains("OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)"))
-        #expect(dreamingSource.contains("OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)"))
-    }
-
-    @Test func routedHeadersUseSharedAdaptiveLayout() throws {
-        let componentsSource = try String(contentsOf: Self.proComponentsSourceURL(), encoding: .utf8)
-        let featureChromeSource = try String(contentsOf: Self.iPadSidebarScreenChromeSourceURL(), encoding: .utf8)
-        let docsSource = try String(contentsOf: Self.docsSourceURL(), encoding: .utf8)
-        let overviewSource = try String(contentsOf: Self.commandCenterSourceURL(), encoding: .utf8)
-        let chatSource = try String(contentsOf: Self.chatProTabSourceURL(), encoding: .utf8)
-        let agentOverviewSource = try String(contentsOf: Self.agentProTabOverviewSourceURL(), encoding: .utf8)
-        let settingsSource = try String(contentsOf: Self.settingsProTabSectionsSourceURL(), encoding: .utf8)
-
-        #expect(componentsSource.contains("struct OpenClawAdaptiveHeaderRow<Leading: View, Accessory: View>: View"))
-        #expect(componentsSource.contains("ViewThatFits(in: .horizontal)"))
-        #expect(componentsSource.contains("private var stackedLayout: some View"))
-        #expect(componentsSource.contains(".layoutPriority(1)"))
-        #expect(componentsSource.contains(".fixedSize(horizontal: true, vertical: false)"))
-        #expect(featureChromeSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(docsSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(overviewSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(chatSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(agentOverviewSource.contains("OpenClawAdaptiveHeaderRow("))
-        #expect(settingsSource.contains("OpenClawAdaptiveHeaderRow("))
-    }
-
-    @Test func phoneHubKeepsDocsAsDestinationOnly() throws {
-        let source = try String(contentsOf: Self.phoneHubSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("case .docs:"))
-        #expect(source.contains("OpenClawDocsScreen("))
-        #expect(source.contains("headerLeadingAction: self.phoneDetailBackAction"))
-        #expect(source.contains("gatewayAction: { self.openRootDestination(.gateway) }"))
-        #expect(!source.contains("Label(\"Docs\", systemImage: \"book\")"))
-        #expect(!source.contains("https://docs.openclaw.ai"))
-    }
-
-    @Test func rootShellPreviewMatrixCoversPhoneAndIPadStates() throws {
-        let source = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("#Preview(\n    \"Shell iPhone portrait\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPhone landscape\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPhone connected\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPhone gateway error\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPad portrait drawer\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPad landscape split\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPad connecting\""))
-        #expect(source.contains("#Preview(\n    \"Shell iPad gateway error\""))
-    }
-
-    @Test func sharedChatPreviewMatrixCoversConnectionStates() throws {
-        let source = try String(contentsOf: Self.sharedChatPreviewSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("#Preview(\"Chat connected\")"))
-        #expect(source.contains("#Preview(\"Chat empty\")"))
-        #expect(source.contains("#Preview(\"Chat loading\")"))
-        #expect(source.contains("#Preview(\"Chat gateway error\")"))
-        #expect(source.contains("enum Scenario"))
-        #expect(source.contains("case connected"))
-        #expect(source.contains("case empty"))
-        #expect(source.contains("case loading"))
-        #expect(source.contains("case error"))
-        #expect(source.contains("Gateway not connected. Check Tailscale and retry."))
-    }
-
-    @Test func phoneHubKeepsContentAboveFloatingTabBar() throws {
-        let source = try String(contentsOf: Self.phoneHubSourceURL(), encoding: .utf8)
-
-        #expect(source.contains(".safeAreaPadding(.bottom, self.bottomScrollInset)"))
-        #expect(!source.contains(".padding(.bottom, self.bottomScrollInset)"))
-        #expect(!source.contains("bottomViewportInset"))
-        #expect(!source.contains("bottomTabBarClearance"))
-    }
-
-    @Test func phoneHubHeaderStaysTaskFirst() throws {
-        let source = try String(contentsOf: Self.phoneHubSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("private var gatewayActionRow: some View"))
-        #expect(source.contains("self.openRootDestination(.gateway)"))
-        #expect(source.contains("private var phoneDetailBackAction: OpenClawSidebarHeaderAction"))
-        #expect(source.contains("accessibilityLabel: \"Back to Control\""))
-        #expect(source.contains("accessibilityIdentifier: \"OpenClawPhoneDetailBackButton\""))
-        #expect(source.contains(".navigationBarBackButtonHidden(true)"))
-        #expect(source.contains(".toolbar(.hidden, for: .navigationBar)"))
-        #expect(source.matches(of: /headerLeadingAction: self\.phoneDetailBackAction/).count == 10)
-        #expect(!source.contains("directRoute: .agents"))
-        #expect(!source.contains("ToolbarItem(placement: .topBarTrailing)"))
-        #expect(!source.contains("Image(systemName: \"gearshape\")"))
-        #expect(!source.contains("self.metric(label:"))
-        #expect(!source.contains("private func metric(label:"))
-    }
-
-    @Test func workboardUsesRealGatewayMethods() throws {
-        let source = try String(contentsOf: Self.iPadWorkboardScreenSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("workboard.cards.list"))
-        #expect(source.contains("workboard.cards.create"))
-        #expect(source.contains("workboard.cards.move"))
-        #expect(source.contains("workboard.cards.archive"))
-        #expect(source.contains("workboard.cards.dispatch"))
-        #expect(source.contains(".padding(.bottom, 12)"))
-        #expect(!source.contains("Workboard gateway contract unavailable"))
-        #expect(!source.contains("supportsGatewayContract"))
-        #expect(!source.contains("Compact mobile queue control"))
-        #expect(!source.contains("Multi-column queue control"))
-    }
-
-    @Test func workboardCreateActionSurfacesUnavailableReasons() throws {
-        let source = try String(contentsOf: Self.iPadWorkboardScreenSourceURL(), encoding: .utf8)
-        let createFunction = try Self.extract(
-            source,
-            from: "private func createCard() async -> Bool",
-            to: "private func move(_ card: IPadWorkboardCard, to status: String) async")
-
-        #expect(source.contains("private var createUnavailableMessage: String?"))
-        #expect(source.contains("Enter a title to create a card."))
-        #expect(source.contains("Card creation is already in progress."))
-        #expect(source.contains("private func newCardButton(expands: Bool) -> some View"))
-        #expect(source.contains("private func beginCreateCard()"))
-        #expect(source.contains("self.newCardButton(expands: false)"))
-        #expect(source.contains("self.newCardButton(expands: true)"))
-        #expect(source.contains("Label(\"New Card\", systemImage: \"plus\")"))
-        #expect(source.contains(".accessibilityHint(\"Opens card title and notes entry\")"))
-        #expect(source.contains(".accessibilityHint(self.createUnavailableMessage ?? \"Creates a workboard card\")"))
-        #expect(source.contains("if await self.createCard()"))
-        #expect(source.contains(".disabled(self.isCreatingCard)"))
-        #expect(!source.contains("Button(\"Create\")"))
-        #expect(!source.contains("TextField(\"New card\""))
-        #expect(!source.contains(".disabled(!self.canWrite || self.draftTitle"))
-        #expect(createFunction.contains("self.errorText = createUnavailableMessage"))
-        #expect(createFunction.contains("return false"))
-        #expect(createFunction.contains("return true"))
-    }
-
-    @Test func taskScopeControlsSendRealGatewayParams() throws {
-        let source = try Self.iPadTaskFeatureScreensSource()
-
-        #expect(source.contains("private var boardScopeMenu: some View"))
-        #expect(source.contains("method: \"workboard.boards.list\""))
-        #expect(source.contains("IPadWorkboardListParams(boardId: selectedBoardParam)"))
-        #expect(source.contains("boardId: selectedBoardParam"))
-        #expect(source
-            .matches(
-                of: /method: "workboard\.cards\.dispatch"[\s\S]*?IPadWorkboardListParams\(boardId: selectedBoardParam\)/)
-            .count == 1)
-        #expect(source.contains("private var agentScopeMenu: some View"))
-        #expect(source.contains("IPadSkillProposalListParams(agentId: selectedAgentParam)"))
-        #expect(source.contains("agentId: selectedAgentParam"))
-        #expect(!source
-            .contains(
-                "params: EmptyParams(),\n                timeoutSeconds: 20)\n            let response = try JSONDecoder().decode(IPadSkillProposalManifest.self"))
-    }
-
-    @Test func compactTaskRowsKeepPhoneNativeActions() throws {
-        let source = try Self.iPadTaskFeatureScreensSource()
-        let compactControls = try Self.extract(
-            source,
-            from: "private var compactQueueControls: some View",
-            to: "private var compactRefreshButton: some View")
-
-        #expect(source.contains("struct IPadWorkboardQueueRow"))
-        #expect(source.contains("private var actionMenuItems: some View"))
-        #expect(source.components(separatedBy: ".contextMenu {").count - 1 >= 2)
-        #expect(source.components(separatedBy: ".swipeActions(edge: .leading").count - 1 >= 2)
-        #expect(source.components(separatedBy: ".swipeActions(edge: .trailing").count - 1 >= 2)
-        #expect(source.contains("@State private var presentedProposalRoute: IPadSkillProposalSheetRoute?"))
-        #expect(source.contains(".sheet(item: self.$presentedProposalRoute)"))
-        #expect(source.contains("private func selectProposal("))
-        #expect(!source.contains("proposalSheetPresented"))
-        #expect(source.contains("self.presentedSheet = .card(card)"))
-        #expect(!source.contains("Label(\"Gateway\", systemImage: \"network\")"))
-        #expect(!source.contains("Button(\"Gateway\")"))
-        #expect(!source.contains("actionTitle: self.canRead ? nil : \"Gateway\""))
-        #expect(!source.contains("Workboard offline"))
-        #expect(!source.contains("Workshop offline"))
-        #expect(!source.contains("Connect gateway to"))
-        #expect(source.contains("private var compactRefreshButton: some View"))
-        #expect(source.contains("private var compactBoardScopeMenu: some View"))
-        #expect(source.contains("Color(uiColor: .secondarySystemGroupedBackground)"))
-        #expect(source.contains(".allowsHitTesting(false)"))
-        #expect(compactControls.contains("self.compactRefreshButton"))
-        #expect(compactControls.contains("self.compactBoardScopeMenu"))
-        #expect(!compactControls.contains("Self.workboardSubtitle("))
-        #expect(!compactControls.contains("Label(\"Refresh\""))
-        #expect(compactControls.contains("Label(\"Dispatch\""))
-    }
-
-    @Test func skillWorkshopUsesKanbanLanesOnWideIPad() throws {
-        let source = try String(contentsOf: Self.iPadSkillWorkshopScreenSourceURL(), encoding: .utf8)
-        let previewSource = try String(contentsOf: Self.iPadSidebarFeaturePreviewsSourceURL(), encoding: .utf8)
-        let content = try Self.extract(
-            source,
-            from: "private var proposalContent: some View",
-            to: "private var proposalBoard: some View")
-        let board = try Self.extract(
-            source,
-            from: "private var proposalBoard: some View",
-            to: "private var proposalList: some View")
-
-        #expect(content.contains("if self.isCompactWidth"))
-        #expect(content.contains("self.proposalList"))
-        #expect(content.contains("self.proposalBoard"))
-        #expect(!content.contains("self.proposalDetail"))
-        #expect(board.contains("ScrollView(.horizontal)"))
-        #expect(board.contains("IPadSkillProposalKanbanColumn("))
-        #expect(source.contains("private struct IPadSkillProposalKanbanCard"))
-        #expect(source.contains("static let defaultProposalStatusBoardLanes"))
-        #expect(source.contains("private func proposals(forLaneStatus status: String)"))
-        #expect(previewSource.contains("#Preview(\n    \"Skill Workshop iPad kanban lanes\""))
-        #expect(previewSource.contains("private struct IPadSkillWorkshopKanbanPreview"))
-        #expect(previewSource.contains("IPadSkillProposalKanbanColumn("))
-        #expect(previewSource.contains("status: \"needs-review\""))
-        #expect(previewSource.contains("status: \"manual_QA\""))
-    }
-
-    @Test func compactTaskRowsHavePopulatedPhonePreviews() throws {
-        let source = try String(contentsOf: Self.iPadSidebarFeaturePreviewsSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("#Preview(\"Workboard phone queue rows\")"))
-        #expect(source.contains("#Preview(\"Skill Workshop phone queue rows\")"))
-        #expect(source.contains("private struct IPadWorkboardCompactRowsPreview"))
-        #expect(source.contains("private struct IPadSkillWorkshopCompactRowsPreview"))
-        #expect(source.contains("IPadWorkboardPreviewFixtures.cards"))
-        #expect(source.contains("IPadSkillWorkshopPreviewFixtures.proposals"))
-    }
-
-    @Test func taskScreenPreviewMatricesCoverPrimaryStates() throws {
-        let source = try String(contentsOf: Self.iPadSidebarFeaturePreviewsSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("#Preview(\"Workboard states\")"))
-        #expect(source.contains("private struct IPadWorkboardStatesPreview"))
-        #expect(source.contains("self.previewHeader(\"Connected\")"))
-        #expect(source.contains("self.previewHeader(\"Empty\")"))
-        #expect(source.contains("self.previewHeader(\"Loading\")"))
-        #expect(source.contains("self.previewHeader(\"Error\")"))
-        #expect(source.contains("title: \"Loading cards\""))
-        #expect(source.contains("title: \"Cards unavailable\""))
-        #expect(source.contains("IPadWorkboardKanbanColumn("))
-
-        #expect(source.contains("#Preview(\"Skill Workshop states\")"))
-        #expect(source.contains("private struct IPadSkillWorkshopStatesPreview"))
-        #expect(source.contains("self.previewHeader(\"Offline / Error\")"))
-        #expect(source.contains("title: \"No proposals\""))
-        #expect(source.contains("title: \"Workshop offline\""))
-        #expect(source.contains("title: \"Proposal unavailable\""))
-        #expect(source.contains("#Preview(\n    \"Skill Workshop iPad kanban lanes\""))
-        #expect(source.contains("private struct IPadSkillWorkshopKanbanPreview"))
-        #expect(source.contains("\"needs-review\""))
-        #expect(source.contains("\"manual_QA\""))
-    }
-
-    @Test func activityPreviewMatrixCoversConnectionStates() throws {
-        let source = try String(contentsOf: Self.iPadSidebarFeaturePreviewsSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("#Preview(\"Activity states\")"))
-        #expect(source.contains("private struct IPadActivityStatesPreview"))
-        #expect(source.contains("self.previewHeader(\"Connected\")"))
-        #expect(source.contains("self.previewHeader(\"Loading\")"))
-        #expect(source.contains("self.previewHeader(\"Empty\")"))
-        #expect(source.contains("self.previewHeader(\"Error\")"))
-        #expect(source.contains("title: \"Sessions unavailable\""))
-        #expect(source.contains("title: \"No recent sessions\""))
-        #expect(source.contains("title: \"Loading sessions\""))
-    }
-
-    @Test func routedFeatureScreensReuseSharedProComponents() throws {
-        let source = try Self.iPadTaskFeatureScreensSource()
-        let componentsSource = try String(contentsOf: Self.proComponentsSourceURL(), encoding: .utf8)
-        let channelsSource = try String(contentsOf: Self.channelsSourceURL(), encoding: .utf8)
-
-        #expect(source.contains("ProMetricGrid(metrics: self.metrics)"))
-        #expect(source.contains("ProPanelHeader("))
-        #expect(source.contains("ProStatusRow("))
-        #expect(!source.contains("private struct ProMetricGrid"))
-        #expect(!source.contains("private struct ProMetric"))
-        #expect(!source.contains("private struct ProPanelHeader"))
-        #expect(!source.contains("private struct ProStatusRow"))
-        #expect(!channelsSource.contains("private struct SettingsChannelPanelHeader"))
-        #expect(!channelsSource.contains("private struct SettingsChannelInfoRow"))
-        #expect(componentsSource.contains("struct ProMetricGrid"))
-        #expect(componentsSource.contains("struct ProPanelHeader"))
-        #expect(componentsSource.contains("struct ProStatusRow"))
-    }
-
-    @Test func activityScreenStaysSplitFromTaskFeatureScreens() throws {
-        let taskSource = try Self.iPadTaskFeatureScreensSource()
-        let activitySource = try String(contentsOf: Self.iPadActivityScreenSourceURL(), encoding: .utf8)
-        let projectSource = try String(contentsOf: Self.xcodeProjectSourceURL(), encoding: .utf8)
-
-        #expect(activitySource.contains("struct IPadActivityScreen: View"))
-        #expect(activitySource.contains("IOSGatewayChatTransport(gateway: self.appModel.operatorSession)"))
-        #expect(activitySource.contains("IPadSidebarScreenChrome("))
-        #expect(!taskSource.contains("struct IPadActivityScreen"))
-        #expect(!taskSource.contains("import OpenClawChatUI"))
-        #expect(projectSource.contains("IPadActivityScreen.swift in Sources"))
-    }
-
-    @Test func routedFeatureChromeStaysSplitFromTaskFeatureScreens() throws {
-        let taskSource = try Self.iPadTaskFeatureScreensSource()
-        let chromeSource = try String(contentsOf: Self.iPadSidebarScreenChromeSourceURL(), encoding: .utf8)
-        let projectSource = try String(contentsOf: Self.xcodeProjectSourceURL(), encoding: .utf8)
-
-        #expect(chromeSource.contains("struct IPadSidebarScreenChrome<Content: View>: View"))
-        #expect(chromeSource.contains("OpenClawSidebarHeaderLeadingSlot(action: headerLeadingAction)"))
-        #expect(chromeSource.contains("OpenClawGatewayCompactPill()"))
-        #expect(!taskSource.contains("struct IPadSidebarScreenChrome"))
-        #expect(projectSource.contains("IPadSidebarScreenChrome.swift in Sources"))
-    }
-
-    @Test func routedFeatureChromeKeepsGatewayPillActionable() throws {
-        let chromeSource = try String(contentsOf: Self.iPadSidebarScreenChromeSourceURL(), encoding: .utf8)
-        let featureSource = try Self.iPadTaskFeatureScreensSource()
-        let rootSource = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-
-        #expect(chromeSource.contains("let gatewayAction: (() -> Void)?"))
-        #expect(chromeSource.contains("private var gatewayPill: some View"))
-        #expect(chromeSource.contains("Button(action: gatewayAction)"))
-        #expect(chromeSource.contains(".accessibilityHint(\"Opens Settings / Gateway\")"))
-        #expect(featureSource.matches(of: /gatewayAction: self\.openSettings/).count == 2)
-        #expect(rootSource.contains("IPadActivityScreen("))
-        #expect(rootSource
-            .matches(of: /IPadActivityScreen\([\s\S]*?openSettings: \{ self\.selectSidebarDestination\(\.gateway\) \}/)
-            .count == 1)
-    }
-
-    @Test func routedGatewayPillsOpenGatewaySettings() throws {
-        let rootSource = try String(contentsOf: Self.rootTabsSourceURL(), encoding: .utf8)
-        let agentSource = try String(contentsOf: Self.agentProTabSourceURL(), encoding: .utf8)
-        let agentOverviewSource = try String(contentsOf: Self.agentProTabOverviewSourceURL(), encoding: .utf8)
-        let overviewSource = try String(contentsOf: Self.commandCenterSourceURL(), encoding: .utf8)
-        let chatSource = try String(contentsOf: Self.chatProTabSourceURL(), encoding: .utf8)
-        let docsSource = try String(contentsOf: Self.docsSourceURL(), encoding: .utf8)
-        let settingsSource = try String(contentsOf: Self.settingsProTabSectionsSourceURL(), encoding: .utf8)
-        let channelsSource = try String(contentsOf: Self.channelsSourceURL(), encoding: .utf8)
-
-        #expect(rootSource.matches(of: /openSettings: \{ self\.selectSidebarDestination\(\.gateway\) \}/).count >= 2)
-        #expect(rootSource.matches(of: /gatewayAction: \{ self\.selectSidebarDestination\(\.gateway\) \}/).count == 1)
-        #expect(!rootSource.contains("showGatewayActions"))
-        #expect(!rootSource.contains("gatewayActionsDialog"))
-        #expect(overviewSource.contains("Button(action: self.openSettings)"))
-        #expect(overviewSource.contains(".accessibilityHint(\"Opens Settings / Gateway\")"))
-        #expect(agentSource.contains("let openSettings: (() -> Void)?"))
-        #expect(agentOverviewSource.contains("OpenClawGatewayCompactPill()"))
-        #expect(agentOverviewSource.contains("Button(action: openSettings)"))
-        #expect(rootSource
-            .matches(of: /AgentProTab\([\s\S]*?openSettings: \{ self\.selectSidebarDestination\(\.gateway\) \}/)
-            .count >= 3)
-        #expect(chatSource.contains("let openSettings: (() -> Void)?"))
-        #expect(chatSource.contains("private var connectionPillButton: some View"))
-        #expect(docsSource.contains("let gatewayAction: (() -> Void)?"))
-        #expect(settingsSource.contains("NavigationLink(value: SettingsRoute.gateway)"))
-        #expect(rootSource.contains("case .settings:"))
-        #expect(rootSource.contains("SettingsProTab(headerLeadingAction: self.sidebarHeaderLeadingAction)"))
-        #expect(rootSource.contains("directRoute: self.selectedSidebarDestination.settingsRoute ?? .gateway"))
-        #expect(rootSource.contains("SettingsProTab(initialRoute: self.selectedSidebarDestination.settingsRoute)"))
-        #expect(settingsSource.contains("title: \"Channels / Integrations\""))
-        #expect(settingsSource.contains("route: .channels"))
-        #expect(channelsSource.contains("let gatewayAction: (() -> Void)?"))
-        #expect(docsSource.contains(".accessibilityHint(\"Opens Settings / Gateway\")"))
-        #expect(channelsSource.contains(".accessibilityHint(\"Opens Settings / Gateway\")"))
-    }
-
-    @Test func gatewaySettingsKeepsPairingTrustDiagnosticsAndTailscaleActions() throws {
-        let settingsSource = try String(contentsOf: Self.settingsProTabSourceURL(), encoding: .utf8)
-        let sectionsSource = try String(contentsOf: Self.settingsProTabSectionsSourceURL(), encoding: .utf8)
-        let actionsSource = try String(contentsOf: Self.settingsProTabActionsSourceURL(), encoding: .utf8)
-        let trustSource = try String(contentsOf: Self.gatewayTrustPromptAlertSourceURL(), encoding: .utf8)
-        let controllerSource = try String(contentsOf: Self.gatewayConnectionControllerSourceURL(), encoding: .utf8)
-
-        #expect(sectionsSource.contains("var gatewayDestination: some View"))
-        #expect(sectionsSource.contains("self.gatewayActions"))
-        #expect(sectionsSource.contains("self.manualGatewayCard"))
-        #expect(sectionsSource.contains("self.gatewaySetupCard"))
-        #expect(sectionsSource.contains("self.discoveredGatewaysCard"))
-        #expect(sectionsSource.contains("self.gatewayAdvancedCard"))
-        #expect(sectionsSource.contains("title: \"Reconnect\""))
-        #expect(sectionsSource.contains("Task { await self.reconnectGateway() }"))
-        #expect(sectionsSource.contains("title: \"Diagnose\""))
-        #expect(sectionsSource.contains("Task { await self.runDiagnostics() }"))
-        #expect(sectionsSource.contains("title: \"Scan QR\""))
-        #expect(sectionsSource.contains("self.openGatewayQRScanner()"))
-        #expect(sectionsSource.contains("title: \"Connect\""))
-        #expect(sectionsSource.contains("Task { await self.applySetupCodeAndConnect() }"))
-        #expect(sectionsSource.contains("Task { await self.connect(gateway) }"))
-        #expect(sectionsSource.contains("tailnetWarningText"))
-        #expect(sectionsSource.contains("GatewayProblemBanner("))
-        #expect(sectionsSource.contains("Task { await self.handleGatewayProblemPrimaryAction(problem) }"))
-
-        #expect(actionsSource.contains("await self.gatewayController.connectLastKnown()"))
-        #expect(actionsSource.contains("self.gatewayController.refreshActiveGatewayRegistrationFromSettings()"))
-        #expect(actionsSource.contains("self.gatewayController.restartDiscovery()"))
-        #expect(actionsSource.contains("await self.appModel.refreshGatewayOverviewIfConnected()"))
-        #expect(actionsSource.contains("await TCPProbe.probe(host: trimmed, port: port"))
-        #expect(actionsSource.contains("Check Tailscale or LAN."))
-        #expect(actionsSource.contains("Tailscale is off on this device. Turn it on, then try again."))
-        #expect(actionsSource.contains("Run /pair approve in your OpenClaw chat"))
-        #expect(actionsSource.contains("self.resetOnboarding()"))
-        #expect(actionsSource.contains("self.gatewayController.trustRotatedGatewayCertificate(from: problem)"))
-        #expect(actionsSource.contains("await self.retryGatewayConnectionFromProblem()"))
-
-        #expect(settingsSource.contains("GatewayProblemDetailsSheet("))
-        #expect(settingsSource.contains("QRScannerView("))
-        #expect(trustSource.contains("Trust this gateway?"))
-        #expect(trustSource.contains("Trust and connect"))
-        #expect(controllerSource.contains("acceptPendingTrustPrompt()"))
-        #expect(controllerSource.contains("trustRotatedGatewayCertificate(from problem: GatewayConnectionProblem)"))
-    }
-
-    @Test func gatewaySettingsPreviewMatrixCoversPrimaryStates() throws {
-        let supportSource = try String(contentsOf: Self.settingsProTabSupportSourceURL(), encoding: .utf8)
-
-        #expect(supportSource.contains("#Preview(\"Gateway settings states\")"))
-        #expect(supportSource.contains("private struct SettingsGatewayStatesPreview"))
-        #expect(supportSource.contains("self.stateSection(\"Connected\")"))
-        #expect(supportSource.contains("self.stateSection(\"Loading\")"))
-        #expect(supportSource.contains("self.stateSection(\"Empty\")"))
-        #expect(supportSource.contains("self.stateSection(\"Error\")"))
-        #expect(supportSource.contains("GatewayProblemBanner("))
-        #expect(supportSource.contains("kind: .pairingRequired"))
-        #expect(supportSource.contains("Run /pair approve in your OpenClaw chat"))
-        #expect(supportSource.contains("Tailscale is off on this device. Turn it on, then try again."))
-        #expect(supportSource.contains("self.previewButton(\"Scan QR\""))
-        #expect(supportSource.contains("self.previewButton(\"Connect\""))
-        #expect(supportSource.contains("self.previewButton(\"Reconnect\""))
-        #expect(supportSource.contains("self.previewButton(\"Diagnose\""))
-    }
-
-    @Test func nativeChatUsesGatewayTransport() throws {
-        let chatSource = try String(contentsOf: Self.chatProTabSourceURL(), encoding: .utf8)
-        let channelsSource = try String(contentsOf: Self.channelsSourceURL(), encoding: .utf8)
-
-        #expect(chatSource.contains("IOSGatewayChatTransport(gateway: self.appModel.operatorSession)"))
-        #expect(channelsSource.contains("Message routing and external channel clients."))
-        #expect(channelsSource.contains("\"clickclack\": SettingsChannelFallbackMetadata"))
-        #expect(channelsSource.contains("label: \"ClickClack\""))
-        #expect(channelsSource.contains("Self-hosted chat bot routing."))
-    }
-
-    private static func rootTabsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/RootTabs.swift")
-    }
-
-    private static func phoneHubSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/RootTabsPhoneControlHub.swift")
-    }
-
-    private static func proComponentsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/OpenClawProComponents.swift")
-    }
-
-    private static func commandCenterSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/CommandCenterTab.swift")
-    }
-
-    private static func agentProTabSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/AgentProTab.swift")
-    }
-
-    private static func agentProTabOverviewSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/AgentProTab+Overview.swift")
-    }
-
-    private static func agentProTabDestinationsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/AgentProTab+Destinations.swift")
-    }
-
-    private static func agentProNodesDestinationSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/AgentProNodesDestination.swift")
-    }
-
-    private static func agentProDreamingDestinationSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/AgentProDreamingDestination.swift")
-    }
-
-    private static func rootTabsNavigationSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/RootTabsNavigation.swift")
-    }
-
-    private static func iPadSidebarFeatureScreensSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/IPadSidebarFeatureScreens.swift")
-    }
-
-    private static func iPadTaskFeatureScreensSource() throws -> String {
-        try [
-            self.iPadWorkboardScreenSourceURL(),
-            self.iPadSkillWorkshopScreenSourceURL(),
-            self.iPadSidebarFeatureScreensSourceURL(),
-        ]
-            .map { try String(contentsOf: $0, encoding: .utf8) }
-            .joined(separator: "\n")
-    }
-
-    private static func iPadWorkboardScreenSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/IPadWorkboardScreen.swift")
-    }
-
-    private static func iPadSkillWorkshopScreenSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/IPadSkillWorkshopScreen.swift")
-    }
-
-    private static func iPadSidebarFeaturePreviewsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/IPadSidebarFeaturePreviews.swift")
-    }
-
-    private static func iPadActivityScreenSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/IPadActivityScreen.swift")
-    }
-
-    private static func iPadSidebarScreenChromeSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/IPadSidebarScreenChrome.swift")
-    }
-
-    private static func chatProTabSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/ChatProTab.swift")
-    }
-
-    private static func docsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/OpenClawDocsScreen.swift")
-    }
-
-    private static func settingsProTabSectionsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/SettingsProTabSections.swift")
-    }
-
-    private static func settingsProTabSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/SettingsProTab.swift")
-    }
-
-    private static func settingsProTabActionsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/SettingsProTabActions.swift")
-    }
-
-    private static func settingsProTabSupportSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/SettingsProTabSupport.swift")
-    }
-
-    private static func gatewayTrustPromptAlertSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Gateway/GatewayTrustPromptAlert.swift")
-    }
-
-    private static func gatewayConnectionControllerSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Gateway/GatewayConnectionController.swift")
-    }
-
-    private static func channelsSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("Sources/Design/SettingsChannelsDestination.swift")
-    }
-
-    private static func sharedChatPreviewSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("shared/OpenClawKit/Sources/OpenClawChatUI/ChatView+Previews.swift")
-    }
-
-    private static func xcodeProjectSourceURL() -> URL {
-        URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("OpenClaw.xcodeproj/project.pbxproj")
-    }
-
-    private static func extract(_ source: String, from start: String, to end: String) throws -> String {
-        let startRange = try #require(source.range(of: start))
-        let tail = source[startRange.lowerBound...]
-        let endRange = try #require(tail.range(of: end))
-        return String(tail[..<endRange.lowerBound])
-    }
-}

apps/ios/Tests/SwiftUIRenderSmokeTests.swift

@@ -5,9 +5,8 @@ import UIKit
 @testable import OpenClaw
 
 @Suite struct SwiftUIRenderSmokeTests {
-    @MainActor private static func host(_ view: some View, size: CGSize? = nil) -> UIWindow {
-        let frame = CGRect(origin: .zero, size: size ?? UIScreen.main.bounds.size)
-        let window = UIWindow(frame: frame)
+    @MainActor private static func host(_ view: some View) -> UIWindow {
+        let window = UIWindow(frame: UIScreen.main.bounds)
         window.rootViewController = UIHostingController(rootView: view)
         window.makeKeyAndVisible()
         window.rootViewController?.view.setNeedsLayout()
@@ -42,102 +41,18 @@ import UIKit
         }
     }
 
-    @Test @MainActor func rootTabsBuildsDeviceOrientationShellMatrix() {
-        for scenario in Self.rootTabsShellScenarios() {
-            let appModel = NodeAppModel()
-            let gatewayController = GatewayConnectionController(appModel: appModel, startDiscovery: false)
-
-            let root = RootTabs()
-                .environment(appModel)
-                .environment(appModel.voiceWake)
-                .environment(gatewayController)
-                .environment(\.rootTabsUserInterfaceIdiomOverride, scenario.idiom)
-                .environment(\.horizontalSizeClass, scenario.horizontalSizeClass)
-                .environment(\.verticalSizeClass, scenario.verticalSizeClass)
-
-            _ = Self.host(root, size: scenario.size)
-        }
-    }
-
-    @Test @MainActor func rootTabsBuildGatewayStateViewHierarchies() {
-        for appModel in Self.rootTabsGatewayStateModels() {
-            let gatewayController = GatewayConnectionController(appModel: appModel, startDiscovery: false)
-
-            let root = RootTabs()
-                .environment(appModel)
-                .environment(appModel.voiceWake)
-                .environment(gatewayController)
-
-            _ = Self.host(root)
-        }
-    }
-
-    @Test @MainActor func phoneControlHubBuildsGatewayStateViewHierarchies() {
-        for appModel in Self.rootTabsGatewayStateModels() {
-            let root = RootTabsPhoneControlHub(
-                groups: RootTabs.phoneControlGroups,
-                initialDestination: nil,
-                openRootDestination: { _ in })
-                .environment(appModel)
-
-            _ = Self.host(root)
-        }
-    }
-
-    @Test @MainActor func phoneControlHubBuildsLandscapeCompactState() {
+    @Test @MainActor func rootTabsBuildAViewHierarchy() {
         let appModel = NodeAppModel()
-        let root = RootTabsPhoneControlHub(
-            groups: RootTabs.phoneControlGroups,
-            initialDestination: nil,
-            openRootDestination: { _ in })
+        let gatewayController = GatewayConnectionController(appModel: appModel, startDiscovery: false)
+
+        let root = RootTabs()
             .environment(appModel)
-            .environment(\.horizontalSizeClass, .regular)
-            .environment(\.verticalSizeClass, .compact)
+            .environment(appModel.voiceWake)
+            .environment(gatewayController)
 
         _ = Self.host(root)
     }
 
-    @Test @MainActor func routedSidebarScreensBuildOfflineStates() {
-        let appModel = NodeAppModel()
-        let screens: [AnyView] = [
-            AnyView(CommandCenterTab(openChat: {}, openSettings: {})),
-            AnyView(IPadActivityScreen(openChat: {}, openSettings: {})),
-            AnyView(OpenClawDocsScreen()),
-            AnyView(SettingsChannelsScreen()),
-            AnyView(IPadWorkboardScreen(openChat: {}, openSettings: {})),
-            AnyView(IPadSkillWorkshopScreen(openSettings: {})),
-            AnyView(AgentProTab(directRoute: .agents)),
-            AnyView(AgentProTab(directRoute: .instances)),
-            AnyView(CommandSessionsScreen(openChat: {})),
-            AnyView(AgentProTab(directRoute: .dreaming)),
-            AnyView(AgentProTab(directRoute: .usage)),
-            AnyView(AgentProTab(directRoute: .cron)),
-        ]
-
-        for screen in screens {
-            let root = NavigationStack { screen }
-                .environment(appModel)
-            _ = Self.host(root)
-        }
-    }
-
-    @Test @MainActor func taskScreensBuildPhoneLandscapeCompactStates() {
-        let appModel = NodeAppModel()
-        let screens: [AnyView] = [
-            AnyView(IPadWorkboardScreen(openChat: {}, openSettings: {})),
-            AnyView(IPadSkillWorkshopScreen(openSettings: {})),
-        ]
-
-        for screen in screens {
-            let root = NavigationStack { screen }
-                .environment(appModel)
-                .environment(\.horizontalSizeClass, .regular)
-                .environment(\.verticalSizeClass, .compact)
-
-            _ = Self.host(root)
-        }
-    }
-
     @Test @MainActor func voiceWakeWordsViewBuildsAViewHierarchy() {
         let appModel = NodeAppModel()
         let root = NavigationStack { VoiceWakeWordsSettingsView() }
@@ -149,51 +64,4 @@ import UIKit
         let root = VoiceWakeToast(command: "openclaw: do something")
         _ = Self.host(root)
     }
-
-    @MainActor private static func rootTabsGatewayStateModels() -> [NodeAppModel] {
-        let offlineModel = NodeAppModel()
-
-        let connectingModel = NodeAppModel()
-        connectingModel.gatewayStatusText = "Connecting..."
-
-        let connectedModel = NodeAppModel()
-        connectedModel.enterAppleReviewDemoMode()
-
-        let errorModel = NodeAppModel()
-        errorModel.gatewayStatusText = "Gateway error: connection refused"
-
-        return [offlineModel, connectingModel, connectedModel, errorModel]
-    }
-
-    private static func rootTabsShellScenarios() -> [RootTabsShellScenario] {
-        [
-            RootTabsShellScenario(
-                idiom: .phone,
-                size: CGSize(width: 393, height: 852),
-                horizontalSizeClass: .compact,
-                verticalSizeClass: .regular),
-            RootTabsShellScenario(
-                idiom: .phone,
-                size: CGSize(width: 852, height: 393),
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .compact),
-            RootTabsShellScenario(
-                idiom: .pad,
-                size: CGSize(width: 1024, height: 1366),
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .regular),
-            RootTabsShellScenario(
-                idiom: .pad,
-                size: CGSize(width: 1366, height: 1024),
-                horizontalSizeClass: .regular,
-                verticalSizeClass: .regular),
-        ]
-    }
-
-    private struct RootTabsShellScenario {
-        let idiom: UIUserInterfaceIdiom
-        let size: CGSize
-        let horizontalSizeClass: UserInterfaceSizeClass
-        let verticalSizeClass: UserInterfaceSizeClass
-    }
 }

apps/ios/project.yml

@@ -97,7 +97,7 @@ targets:
         DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)"
         PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_APP_BUNDLE_ID)"
         PROVISIONING_PROFILE_SPECIFIER: "$(OPENCLAW_APP_PROFILE)"
-        TARGETED_DEVICE_FAMILY: "1,2"
+        TARGETED_DEVICE_FAMILY: "1"
         SWIFT_VERSION: "6.0"
         SWIFT_STRICT_CONCURRENCY: complete
         SUPPORTS_LIVE_ACTIVITIES: YES
@@ -183,7 +183,7 @@ targets:
         ENABLE_APP_INTENTS_METADATA_GENERATION: NO
         PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_SHARE_BUNDLE_ID)"
         PROVISIONING_PROFILE_SPECIFIER: "$(OPENCLAW_SHARE_PROFILE)"
-        TARGETED_DEVICE_FAMILY: "1,2"
+        TARGETED_DEVICE_FAMILY: "1"
         SWIFT_VERSION: "6.0"
         SWIFT_STRICT_CONCURRENCY: complete
     info:
@@ -220,7 +220,7 @@ targets:
         CODE_SIGN_STYLE: "$(OPENCLAW_CODE_SIGN_STYLE)"
         DEVELOPMENT_TEAM: "$(OPENCLAW_DEVELOPMENT_TEAM)"
         PRODUCT_BUNDLE_IDENTIFIER: "$(OPENCLAW_ACTIVITY_WIDGET_BUNDLE_ID)"
-        TARGETED_DEVICE_FAMILY: "1,2"
+        TARGETED_DEVICE_FAMILY: "1"
         SWIFT_VERSION: "6.0"
         SWIFT_STRICT_CONCURRENCY: complete
         SUPPORTS_LIVE_ACTIVITIES: YES

apps/macos/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "035a4fe955164c62c1628de75f6437a14443a947eea2a1b0176ba484d6fde6f8",
+  "originHash" : "a88730a64ccb5fd092108256c37d6c80bc7b92a5b6b563d83a9a26988550234d",
   "pins" : [
     {
       "identity" : "axorcist",
@@ -42,8 +42,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/steipete/Peekaboo.git",
       "state" : {
-        "revision" : "3a56ed2aa769bfefb5a78722dfce3c34088cfba1",
-        "version" : "3.4.0"
+        "revision" : "faf843032772c2074d834b931911bf0002704136",
+        "version" : "3.3.0"
       }
     },
     {

apps/macos/Package.swift

@@ -19,7 +19,7 @@ let package = Package(
         .package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.4.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.10.1"),
         .package(url: "https://github.com/sparkle-project/Sparkle", from: "2.9.0"),
-        .package(url: "https://github.com/steipete/Peekaboo.git", exact: "3.4.0"),
+        .package(url: "https://github.com/steipete/Peekaboo.git", exact: "3.3.0"),
         .package(path: "../shared/OpenClawKit"),
         .package(path: "../swabble"),
     ],

apps/macos/Sources/OpenClaw/HostEnvSanitizer.swift

@@ -24,15 +24,6 @@ enum HostEnvSanitizer {
         "NO_COLOR",
         "FORCE_COLOR",
     ]
-    private static let gitAllowProtocolKey = "GIT_ALLOW_PROTOCOL"
-    private static let gitProtocolFromUserKey = "GIT_PROTOCOL_FROM_USER"
-    private static let gitProtocolFromUserDisabledValue = "0"
-    private static let gitDefaultAlwaysAllowedProtocols: Set<String> = [
-        "git",
-        "http",
-        "https",
-        "ssh",
-    ]
 
     private static func isBlocked(_ upperKey: String) -> Bool {
         if self.blockedKeys.contains(upperKey) { return true }
@@ -91,25 +82,6 @@ enum HostEnvSanitizer {
         Array(Set(values)).sorted()
     }
 
-    private static func isPermissiveGitProtocolFromUserValue(_ value: String) -> Bool {
-        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        if normalized == "true" || normalized == "yes" || normalized == "on" {
-            return true
-        }
-        let isInteger = normalized.range(of: #"^[+-]?[0-9]+$"#, options: .regularExpression) != nil
-        let isZero = normalized.range(of: #"^[+-]?0+$"#, options: .regularExpression) != nil
-        return isInteger && !isZero
-    }
-
-    private static func sanitizeInheritedGitAllowProtocolValue(_ value: String) -> String {
-        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines)
-        if normalized.isEmpty { return "" }
-        let safeProtocols = normalized
-            .split(separator: ":", omittingEmptySubsequences: false)
-            .filter { self.gitDefaultAlwaysAllowedProtocols.contains(String($0)) }
-        return safeProtocols.joined(separator: ":")
-    }
-
     static func inspectOverrides(
         overrides: [String: String]?,
         blockPathOverrides: Bool = true) -> HostEnvOverrideDiagnostics
@@ -148,22 +120,6 @@ enum HostEnvSanitizer {
             let key = rawKey.trimmingCharacters(in: .whitespacesAndNewlines)
             guard !key.isEmpty else { continue }
             let upper = key.uppercased()
-            // Preserve inherited Git allowlists without widening malformed or unsafe entries by
-            // deletion. Protocols outside Git's safe default set are removed instead.
-            if upper == self.gitAllowProtocolKey {
-                merged[key] = self.sanitizeInheritedGitAllowProtocolValue(value)
-                continue
-            }
-            // Preserve non-permissive Git boolean values. Permissive values must become explicit
-            // `0` because Git's unset default still permits protocols with policy `user`.
-            if upper == self.gitProtocolFromUserKey {
-                if !self.isPermissiveGitProtocolFromUserValue(value) {
-                    merged[key] = value
-                } else {
-                    merged[key] = self.gitProtocolFromUserDisabledValue
-                }
-                continue
-            }
             if self.isBlockedInherited(upper) { continue }
             merged[key] = value
         }

apps/macos/Sources/OpenClaw/HostEnvSecurityPolicy.generated.swift

@@ -28,7 +28,6 @@ enum HostEnvSecurityPolicy {
         "AWS_SESSION_TOKEN",
         "AZURE_CLIENT_ID",
         "AZURE_CLIENT_SECRET",
-        "BASHOPTS",
         "BASH_ENV",
         "BROWSER",
         "BUNDLE_GEMFILE",
@@ -71,14 +70,12 @@ enum HostEnvSecurityPolicy {
         "ERL_ZFLAGS",
         "EXINIT",
         "FCEDIT",
-        "FPATH",
         "GCONV_PATH",
         "GEM_HOME",
         "GEM_PATH",
         "GH_TOKEN",
         "GITHUB_TOKEN",
         "GITLAB_TOKEN",
-        "GIT_ALLOW_PROTOCOL",
         "GIT_ALTERNATE_OBJECT_DIRECTORIES",
         "GIT_ASKPASS",
         "GIT_COMMON_DIR",
@@ -90,7 +87,6 @@ enum HostEnvSecurityPolicy {
         "GIT_INDEX_FILE",
         "GIT_NAMESPACE",
         "GIT_OBJECT_DIRECTORY",
-        "GIT_PROTOCOL_FROM_USER",
         "GIT_PROXY_COMMAND",
         "GIT_SEQUENCE_EDITOR",
         "GIT_SSH",
@@ -120,7 +116,6 @@ enum HostEnvSecurityPolicy {
         "JAVA_TOOL_OPTIONS",
         "JDK_JAVA_OPTIONS",
         "JULIA_EDITOR",
-        "KSH_ENV",
         "LDFLAGS",
         "LESSCLOSE",
         "LESSOPEN",
@@ -188,7 +183,6 @@ enum HostEnvSecurityPolicy {
         "SUDO_EDITOR",
         "SVN_EDITOR",
         "SVN_SSH",
-        "TCLLIBPATH",
         "TF_CLI_CONFIG_FILE",
         "TF_PLUGIN_CACHE_DIR",
         "UV_DEFAULT_INDEX",
@@ -213,7 +207,6 @@ enum HostEnvSecurityPolicy {
 
     static let blockedKeys: Set<String> = [
         "ANT_OPTS",
-        "BASHOPTS",
         "BASH_ENV",
         "BROWSER",
         "BZR_EDITOR",
@@ -239,9 +232,7 @@ enum HostEnvSecurityPolicy {
         "ERL_FLAGS",
         "ERL_ZFLAGS",
         "EXINIT",
-        "FPATH",
         "GCONV_PATH",
-        "GIT_ALLOW_PROTOCOL",
         "GIT_ALTERNATE_OBJECT_DIRECTORIES",
         "GIT_COMMON_DIR",
         "GIT_DIR",
@@ -252,7 +243,6 @@ enum HostEnvSecurityPolicy {
         "GIT_INDEX_FILE",
         "GIT_NAMESPACE",
         "GIT_OBJECT_DIRECTORY",
-        "GIT_PROTOCOL_FROM_USER",
         "GIT_SEQUENCE_EDITOR",
         "GIT_SSL_CAINFO",
         "GIT_SSL_CAPATH",
@@ -270,7 +260,6 @@ enum HostEnvSecurityPolicy {
         "JAVA_TOOL_OPTIONS",
         "JDK_JAVA_OPTIONS",
         "JULIA_EDITOR",
-        "KSH_ENV",
         "LUA_INIT",
         "LUA_INIT_5_1",
         "LUA_INIT_5_2",
@@ -308,7 +297,6 @@ enum HostEnvSecurityPolicy {
         "SUDO_ASKPASS",
         "SVN_EDITOR",
         "SVN_SSH",
-        "TCLLIBPATH",
         "VAGRANT_VAGRANTFILE",
         "VIMINIT",
         "_JAVA_OPTIONS"
@@ -437,11 +425,6 @@ enum HostEnvSecurityPolicy {
         "REQUESTS_CA_BUNDLE",
         "RUSTC_WRAPPER",
         "RUSTFLAGS",
-        "RUSTUP_DIST_ROOT",
-        "RUSTUP_DIST_SERVER",
-        "RUSTUP_HOME",
-        "RUSTUP_TOOLCHAIN",
-        "RUSTUP_UPDATE_ROOT",
         "R_LIBS_USER",
         "SSH_ASKPASS",
         "SSH_AUTH_SOCK",

apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatView+Previews.swift

@@ -1,256 +0,0 @@
-import Foundation
-import OpenClawKit
-import SwiftUI
-
-private struct OpenClawChatPreviewTransport: OpenClawChatTransport {
-    enum Scenario {
-        case connected
-        case empty
-        case loading
-        case error
-    }
-
-    let scenario: Scenario
-
-    init(scenario: Scenario = .connected) {
-        self.scenario = scenario
-    }
-
-    func requestHistory(sessionKey: String) async throws -> OpenClawChatHistoryPayload {
-        switch self.scenario {
-        case .connected:
-            break
-        case .empty:
-            return OpenClawChatHistoryPayload(
-                sessionKey: sessionKey,
-                sessionId: "preview-empty-session",
-                messages: [],
-                thinkingLevel: "medium")
-        case .loading:
-            try await Task.sleep(nanoseconds: 60_000_000_000)
-            return OpenClawChatHistoryPayload(
-                sessionKey: sessionKey,
-                sessionId: "preview-loading-session",
-                messages: [],
-                thinkingLevel: "medium")
-        case .error:
-            throw NSError(
-                domain: "OpenClawChatPreviewTransport",
-                code: 1,
-                userInfo: [NSLocalizedDescriptionKey: "Gateway not connected. Check Tailscale and retry."])
-        }
-
-        return OpenClawChatHistoryPayload(
-            sessionKey: sessionKey,
-            sessionId: "preview-session",
-            messages: [
-                Self.message(
-                    role: "user",
-                    text: "Can you check the gateway status and summarize anything risky?",
-                    timestamp: 1),
-                Self.message(
-                    role: "assistant",
-                    text: "Gateway is reachable. The only notable item is that push relay is still using local distribution, so device tests should stay on the local lane.",
-                    timestamp: 2),
-                Self.toolCall(
-                    id: "tool-preview-1",
-                    name: "gateway.status",
-                    arguments: ["deep": AnyCodable(true)],
-                    timestamp: 3),
-                Self.toolResult(
-                    toolCallId: "tool-preview-1",
-                    name: "gateway.status",
-                    text: "status=ok, channels=ios,macos, lastHeartbeat=12s",
-                    timestamp: 4),
-            ],
-            thinkingLevel: "medium")
-    }
-
-    func listModels() async throws -> [OpenClawChatModelChoice] {
-        [
-            OpenClawChatModelChoice(
-                modelID: "gpt-5.5",
-                name: "GPT-5.5",
-                provider: "openai",
-                contextWindow: 400_000),
-            OpenClawChatModelChoice(
-                modelID: "sonnet-4.6",
-                name: "Claude Sonnet 4.6",
-                provider: "anthropic",
-                contextWindow: 200_000),
-        ]
-    }
-
-    func sendMessage(
-        sessionKey _: String,
-        message _: String,
-        thinking _: String,
-        idempotencyKey: String,
-        attachments _: [OpenClawChatAttachmentPayload]) async throws -> OpenClawChatSendResponse
-    {
-        OpenClawChatSendResponse(runId: idempotencyKey, status: "ok")
-    }
-
-    func listSessions(limit _: Int?) async throws -> OpenClawChatSessionsListResponse {
-        OpenClawChatSessionsListResponse(
-            ts: 0,
-            path: nil,
-            count: 2,
-            defaults: OpenClawChatSessionsDefaults(
-                modelProvider: "openai",
-                model: "gpt-5.5",
-                contextTokens: 400_000,
-                thinkingLevels: [
-                    OpenClawChatThinkingLevelOption(id: "off", label: "off"),
-                    OpenClawChatThinkingLevelOption(id: "medium", label: "medium"),
-                    OpenClawChatThinkingLevelOption(id: "high", label: "high"),
-                ],
-                thinkingDefault: "medium",
-                mainSessionKey: "main"),
-            sessions: [
-                Self.session(key: "main", displayName: "Main", updatedAt: 2),
-                Self.session(key: "ios-preview", displayName: "iOS preview", updatedAt: 1),
-            ])
-    }
-
-    func requestHealth(timeoutMs _: Int) async throws -> Bool {
-        switch self.scenario {
-        case .connected, .empty, .loading:
-            true
-        case .error:
-            false
-        }
-    }
-
-    func events() -> AsyncStream<OpenClawChatTransportEvent> {
-        AsyncStream { continuation in
-            continuation.finish()
-        }
-    }
-
-    func setActiveSessionKey(_: String) async throws {}
-
-    private static func message(role: String, text: String, timestamp: Double) -> AnyCodable {
-        AnyCodable([
-            "role": role,
-            "content": [["type": "text", "text": text]],
-            "timestamp": timestamp,
-        ])
-    }
-
-    private static func toolCall(
-        id: String,
-        name: String,
-        arguments: [String: AnyCodable],
-        timestamp: Double) -> AnyCodable
-    {
-        AnyCodable([
-            "role": "assistant",
-            "content": [
-                [
-                    "type": "toolCall",
-                    "id": id,
-                    "name": name,
-                    "arguments": AnyCodable(arguments),
-                ],
-            ],
-            "timestamp": timestamp,
-        ])
-    }
-
-    private static func toolResult(
-        toolCallId: String,
-        name: String,
-        text: String,
-        timestamp: Double) -> AnyCodable
-    {
-        AnyCodable([
-            "role": "tool",
-            "content": [["type": "text", "text": text]],
-            "timestamp": timestamp,
-            "toolCallId": toolCallId,
-            "toolName": name,
-        ])
-    }
-
-    private static func session(
-        key: String,
-        displayName: String,
-        updatedAt: Double) -> OpenClawChatSessionEntry
-    {
-        OpenClawChatSessionEntry(
-            key: key,
-            kind: nil,
-            displayName: displayName,
-            surface: "ios",
-            subject: nil,
-            room: nil,
-            space: nil,
-            updatedAt: updatedAt,
-            sessionId: nil,
-            systemSent: nil,
-            abortedLastRun: nil,
-            thinkingLevel: "medium",
-            verboseLevel: nil,
-            inputTokens: 2500,
-            outputTokens: 900,
-            totalTokens: 3400,
-            modelProvider: "openai",
-            model: "gpt-5.5",
-            contextTokens: 400_000)
-    }
-}
-
-#Preview("Chat") {
-    OpenClawChatPreview(scenario: .connected)
-}
-
-#Preview("Chat connected") {
-    OpenClawChatPreview(scenario: .connected)
-}
-
-#Preview("Chat empty") {
-    OpenClawChatPreview(
-        scenario: .empty,
-        sessionKey: "empty-preview")
-}
-
-#Preview("Chat loading") {
-    OpenClawChatPreview(
-        scenario: .loading,
-        sessionKey: "loading-preview")
-}
-
-#Preview("Chat gateway error") {
-    OpenClawChatPreview(
-        scenario: .error,
-        sessionKey: "error-preview")
-}
-
-#Preview("Onboarding chat") {
-    OpenClawChatView(
-        viewModel: OpenClawChatViewModel(
-            sessionKey: "ios-preview",
-            transport: OpenClawChatPreviewTransport()),
-        showsSessionSwitcher: false,
-        style: .onboarding,
-        markdownVariant: .standard,
-        userAccent: .blue)
-}
-
-private struct OpenClawChatPreview: View {
-    let scenario: OpenClawChatPreviewTransport.Scenario
-    var sessionKey: String = "main"
-
-    var body: some View {
-        OpenClawChatView(
-            viewModel: OpenClawChatViewModel(
-                sessionKey: self.sessionKey,
-                transport: OpenClawChatPreviewTransport(scenario: self.scenario)),
-            showsSessionSwitcher: true,
-            style: .standard,
-            markdownVariant: .standard,
-            userAccent: .blue,
-            showsAssistantTrace: true)
-    }
-}

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

@@ -2773,7 +2773,6 @@ public struct ConfigPatchParams: Codable, Sendable {
     public let deliverycontext: [String: AnyCodable]?
     public let note: String?
     public let restartdelayms: Int?
-    public let replacepaths: [String]?
 
     public init(
         raw: String,
@@ -2781,8 +2780,7 @@ public struct ConfigPatchParams: Codable, Sendable {
         sessionkey: String?,
         deliverycontext: [String: AnyCodable]?,
         note: String?,
-        restartdelayms: Int?,
-        replacepaths: [String]?)
+        restartdelayms: Int?)
     {
         self.raw = raw
         self.basehash = basehash
@@ -2790,7 +2788,6 @@ public struct ConfigPatchParams: Codable, Sendable {
         self.deliverycontext = deliverycontext
         self.note = note
         self.restartdelayms = restartdelayms
-        self.replacepaths = replacepaths
     }
 
     private enum CodingKeys: String, CodingKey {
@@ -2800,7 +2797,6 @@ public struct ConfigPatchParams: Codable, Sendable {
         case deliverycontext = "deliveryContext"
         case note
         case restartdelayms = "restartDelayMs"
-        case replacepaths = "replacePaths"
     }
 }
 

config/knip.config.ts

@@ -217,16 +217,6 @@ const config = {
       entry: ["index.js!", "scripts/postinstall.js!"],
       project: ["index.js!", "scripts/**/*.js!"],
     },
-    [`${BUNDLED_PLUGIN_ROOT_DIR}/llama-cpp`]: {
-      entry: bundledPluginEntries,
-      project: ["index.ts!", "src/**/*.{js,mjs,ts}!"],
-      ignoreDependencies: [
-        // The provider resolves node-llama-cpp from its own package at runtime
-        // so local embeddings use the plugin-owned native dependency.
-        "node-llama-cpp",
-        ...bundledPluginIgnoredRuntimeDependencies,
-      ],
-    },
     [`${BUNDLED_PLUGIN_ROOT_DIR}/*`]: {
       // Bundled plugins often load their public surface via string specifiers in
       // `index.ts` contracts, so Knip needs these convention-based entry files.

docs/.generated/plugin-sdk-api-baseline.sha256

@@ -1,2 +1,2 @@
-4768607253fdc720cb2bc280ac285ccfa7f7057a01659691f5be5b1f58422789  plugin-sdk-api-baseline.json
-7901bc511cf6f9628df4cd619035265f48c40939e4e8e51c5c10dc73a263f183  plugin-sdk-api-baseline.jsonl
+de06fd99257e4b010e54578ea46605c3bc631c31cac5f68aaed4e301f924f8af  plugin-sdk-api-baseline.json
+1c7a5420c4bcb1ec08544ff43b83fa4d43f3c0dcda597a5a25aa5f5bab0cb199  plugin-sdk-api-baseline.jsonl

docs/channels/feishu.md

@@ -42,7 +42,7 @@ Requires OpenClaw 2026.5.29 or above. Run `openclaw --version` to check. Upgrade
 Configure `dmPolicy` to control who can DM the bot:
 
 - `"pairing"` - unknown users receive a pairing code; approve via CLI
-- `"allowlist"` - only users listed in `allowFrom` can chat
+- `"allowlist"` - only users listed in `allowFrom` can chat (default: bot owner only)
 - `"open"` - allow public DMs only when `allowFrom` includes `"*"`; with restrictive entries, only matching users can chat
 - `"disabled"` - disable all DMs
 
@@ -567,8 +567,8 @@ Full configuration: [Gateway configuration](/gateway/configuration)
 | `channels.feishu.accounts.<id>.appSecret`                | App Secret                                                                       | -                                    |
 | `channels.feishu.accounts.<id>.domain`                   | Per-account domain override                                                      | `feishu`                             |
 | `channels.feishu.accounts.<id>.tts`                      | Per-account TTS override                                                         | `messages.tts`                       |
-| `channels.feishu.dmPolicy`                               | DM policy                                                                        | `pairing`                            |
-| `channels.feishu.allowFrom`                              | DM allowlist (open_id list)                                                      | -                                    |
+| `channels.feishu.dmPolicy`                               | DM policy                                                                        | `allowlist`                          |
+| `channels.feishu.allowFrom`                              | DM allowlist (open_id list)                                                      | [BotOwnerId]                         |
 | `channels.feishu.groupPolicy`                            | Group policy                                                                     | `allowlist`                          |
 | `channels.feishu.groupAllowFrom`                         | Group allowlist                                                                  | -                                    |
 | `channels.feishu.requireMention`                         | Require @mention in groups                                                       | `true`                               |

docs/channels/imessage.md

@@ -763,31 +763,6 @@ imessage: suppressed stale inbound backlog account=<id> sent=<iso> recovery=<boo
 
   </Accordion>
 
-  <Accordion title="Messages send but inbound iMessages do not arrive">
-    First prove whether the message reached the local Mac. If `chat.db` does not change, OpenClaw cannot receive the message even when `imsg status --json` reports a healthy bridge.
-
-```bash
-imsg chats --limit 10 --json
-imsg watch --chat-id <chat-id> --json
-sqlite3 ~/Library/Messages/chat.db \
-  "select datetime(max(date)/1000000000 + 978307200, 'unixepoch', 'localtime'), max(ROWID) from message;"
-```
-
-    If phone-sent messages create no new rows, repair the macOS Messages and Apple Push layer before changing OpenClaw config. A one-shot service refresh is often enough:
-
-```bash
-launchctl kickstart -k system/com.apple.apsd
-launchctl kickstart -k gui/$(id -u)/com.apple.CommCenter
-launchctl kickstart -k gui/$(id -u)/com.apple.identityservicesd
-launchctl kickstart -k gui/$(id -u)/com.apple.imagent
-imsg launch
-openclaw gateway restart
-```
-
-    Send a fresh iMessage from the phone and confirm a new `chat.db` row or `imsg watch` event before debugging OpenClaw sessions. Do not run this as a periodic bridge-relaunch loop; repeated `imsg launch` plus gateway restarts during active work can interrupt deliveries and strand in-flight channel runs.
-
-  </Accordion>
-
   <Accordion title="Gateway is not running on macOS">
     The default `cliPath: "imsg"` must run on the Mac signed into Messages. On Linux or Windows, set `channels.imessage.cliPath` to a wrapper script that SSHes to that Mac and runs `imsg "$@"`.
 

docs/channels/matrix-migration.md

@@ -17,11 +17,6 @@ For most users, the upgrade is in place:
 - runtime state stays under `~/.openclaw/matrix/`
 
 You do not need to rename config keys or reinstall the plugin under a new name.
-The root `openclaw` package no longer bundles Matrix runtime code or Matrix SDK
-dependencies. If `openclaw channels status` shows Matrix is configured but the
-plugin is missing after an update, run `openclaw doctor --fix` or
-`openclaw plugins install @openclaw/matrix`; do not install Matrix SDK packages
-into the root OpenClaw package.
 
 ## What the migration does automatically
 

docs/cli/mcp.md

@@ -673,7 +673,7 @@ Launches a local child process and communicates over stdin/stdout.
 <Warning>
 **Stdio env safety filter**
 
-OpenClaw rejects interpreter-startup env keys that can alter how a stdio MCP server starts up before the first RPC, even if they appear in a server's `env` block. Blocked keys include `BASHOPTS`, `FPATH`, `KSH_ENV`, `NODE_OPTIONS`, `NODE_REDIRECT_WARNINGS`, `NODE_REPL_EXTERNAL_MODULE`, `NODE_REPL_HISTORY`, `NODE_V8_COVERAGE`, `PYTHONSTARTUP`, `PYTHONPATH`, `PERL5OPT`, `RUBYOPT`, `SHELLOPTS`, `PS4`, `TCLLIBPATH`, and similar runtime-control variables. Startup rejects these with a configuration error so they cannot inject an implicit prelude, swap the interpreter, enable a debugger, or redirect runtime output against the stdio process. Ordinary credential, proxy, and server-specific env vars (`GITHUB_TOKEN`, `HTTP_PROXY`, custom `*_API_KEY`, etc.) are unaffected.
+OpenClaw rejects interpreter-startup env keys that can alter how a stdio MCP server starts up before the first RPC, even if they appear in a server's `env` block. Blocked keys include `NODE_OPTIONS`, `NODE_REDIRECT_WARNINGS`, `NODE_REPL_EXTERNAL_MODULE`, `NODE_REPL_HISTORY`, `NODE_V8_COVERAGE`, `PYTHONSTARTUP`, `PYTHONPATH`, `PERL5OPT`, `RUBYOPT`, `SHELLOPTS`, `PS4`, and similar runtime-control variables. Startup rejects these with a configuration error so they cannot inject an implicit prelude, swap the interpreter, enable a debugger, or redirect runtime output against the stdio process. Ordinary credential, proxy, and server-specific env vars (`GITHUB_TOKEN`, `HTTP_PROXY`, custom `*_API_KEY`, etc.) are unaffected.
 
 If your MCP server genuinely needs one of the blocked variables, set it on the gateway host process instead of under the stdio server's `env`.
 </Warning>

docs/cli/plugins.md

@@ -417,7 +417,7 @@ openclaw plugins inspect <id> --runtime
 openclaw plugins inspect <id> --json
 ```
 
-Inspect shows identity, load status, source, manifest capabilities, policy flags, diagnostics, install metadata, bundle capabilities, and any detected MCP or LSP server support without importing plugin runtime by default. JSON output includes the plugin manifest contracts, such as `contracts.agentToolResultMiddleware` and `contracts.trustedToolPolicies`, so operators can audit trusted-surface declarations before enabling or restarting a plugin. Add `--runtime` to load the plugin module and include registered hooks, tools, commands, services, gateway methods, and HTTP routes. Runtime inspection reports missing plugin dependencies directly; installs and repairs stay in `openclaw plugins install`, `openclaw plugins update`, and `openclaw doctor --fix`.
+Inspect shows identity, load status, source, manifest capabilities, policy flags, diagnostics, install metadata, bundle capabilities, and any detected MCP or LSP server support without importing plugin runtime by default. Add `--runtime` to load the plugin module and include registered hooks, tools, commands, services, gateway methods, and HTTP routes. Runtime inspection reports missing plugin dependencies directly; installs and repairs stay in `openclaw plugins install`, `openclaw plugins update`, and `openclaw doctor --fix`.
 
 Plugin-owned CLI commands are usually installed as root `openclaw` command groups, but plugins may also register nested commands under a core parent such as `openclaw nodes`. After `inspect --runtime` shows a command under `cliCommands`, run it at the listed path; for example a plugin that registers `demo-git` can be verified with `openclaw demo-git ping`.
 

docs/cli/tui.md

@@ -40,7 +40,6 @@ Notes:
 - `--local` cannot be combined with `--url`, `--token`, or `--password`.
 - `tui` resolves configured gateway auth SecretRefs for token/password auth when possible (`env`/`file`/`exec` providers).
 - When launched from inside a configured agent workspace directory, TUI auto-selects that agent for the session key default (unless `--session` is explicitly `agent:<id>:...`).
-- To show the Gateway hostname in the footer for non-local URL-backed connections, run `openclaw config set tui.footer.showRemoteHost true`. The host label is off by default and never appears for loopback or embedded local connections.
 - Local mode uses the embedded agent runtime directly. Most local tools work, but Gateway-only features are unavailable.
 - Local mode adds `/auth [provider]` inside the TUI command surface.
 - Plugin approval gates still apply in local mode. Tools that require approval prompt for a decision in the terminal; nothing is silently auto-approved because the Gateway is not involved.

docs/concepts/memory-builtin.md

@@ -39,12 +39,9 @@ To set a provider explicitly:
 
 Without an embedding provider, only keyword search is available.
 
-To force local GGUF embeddings, install the official llama.cpp provider plugin,
-then point `local.modelPath` at a GGUF file:
-
-```bash
-openclaw plugins install @openclaw/llama-cpp-provider
-```
+To force the built-in local embedding provider, install the optional
+`node-llama-cpp` runtime package next to OpenClaw, then point `local.modelPath`
+at a GGUF file:
 
 ```json5
 {
@@ -70,7 +67,7 @@ openclaw plugins install @openclaw/llama-cpp-provider
 | DeepInfra         | `deepinfra`         | Default: `BAAI/bge-m3`              |
 | Gemini            | `gemini`            | Supports multimodal (image + audio) |
 | GitHub Copilot    | `github-copilot`    | Uses Copilot subscription           |
-| Local             | `local`             | `@openclaw/llama-cpp-provider`      |
+| Local             | `local`             | Optional `node-llama-cpp` runtime   |
 | Mistral           | `mistral`           |                                     |
 | Ollama            | `ollama`            | Local/self-hosted                   |
 | OpenAI            | `openai`            | Default: `text-embedding-3-small`   |

docs/concepts/memory-qmd.md

@@ -15,7 +15,7 @@ binary, and can index content beyond your workspace memory files.
 - **Reranking and query expansion** for better recall.
 - **Index extra directories** -- project docs, team notes, anything on disk.
 - **Index session transcripts** -- recall earlier conversations.
-- **Fully local** -- runs with the official llama.cpp provider plugin and
+- **Fully local** -- runs with the optional node-llama-cpp runtime package and
   auto-downloads GGUF models.
 - **Automatic fallback** -- if QMD is unavailable, OpenClaw falls back to the
   builtin engine seamlessly.

docs/concepts/memory-search.md

@@ -32,8 +32,7 @@ For multi-endpoint setups with memory-specific providers, `provider` can also
 be a custom `models.providers.<id>` entry, such as `ollama-5080`, when that
 provider sets `api: "ollama"` or another memory embedding adapter owner.
 
-For local embeddings with no API key, install
-`@openclaw/llama-cpp-provider` and set `provider: "local"`. Source checkouts
+For local embeddings with no API key, set `provider: "local"`. Source checkouts
 may still require native build approval: `pnpm approve-builds` then
 `pnpm rebuild node-llama-cpp`.
 

docs/concepts/model-providers.md

@@ -309,7 +309,7 @@ See [/providers/kilocode](/providers/kilocode) for setup details.
 | NVIDIA                                  | `nvidia`                         | `NVIDIA_API_KEY`                                             | `nvidia/nvidia/nemotron-3-ultra-550b-a55b`                 |
 | NovitaAI                                | `novita`                         | `NOVITA_API_KEY`                                             | `novita/deepseek/deepseek-v3-0324`                         |
 | [Ollama Cloud](/providers/ollama-cloud) | `ollama-cloud`                   | `OLLAMA_API_KEY`                                             | `ollama-cloud/kimi-k2.6`                                   |
-| OpenRouter                              | `openrouter`                     | OpenRouter OAuth or `OPENROUTER_API_KEY`                     | `openrouter/auto`                                          |
+| OpenRouter                              | `openrouter`                     | `OPENROUTER_API_KEY`                                         | `openrouter/auto`                                          |
 | Qianfan                                 | `qianfan`                        | `QIANFAN_API_KEY`                                            | `qianfan/deepseek-v3.2`                                    |
 | Qwen Cloud                              | `qwen`                           | `QWEN_API_KEY` / `MODELSTUDIO_API_KEY` / `DASHSCOPE_API_KEY` | `qwen/qwen3.5-plus`                                        |
 | [Qwen OAuth](/providers/qwen-oauth)     | `qwen-oauth`                     | `QWEN_API_KEY`                                               | `qwen-oauth/qwen3.5-plus`                                  |

docs/concepts/openclaw-sdk.md

@@ -0,0 +1,323 @@
+---
+summary: "Public OpenClaw App SDK for external apps, scripts, dashboards, CI jobs, and IDE extensions"
+title: "OpenClaw App SDK"
+sidebarTitle: "App SDK"
+read_when:
+  - You are building an external app, script, dashboard, CI job, or IDE extension that talks to OpenClaw
+  - You are choosing between the App SDK and the Plugin SDK
+  - You are integrating with Gateway agent runs, sessions, events, approvals, models, or tools
+---
+
+The **OpenClaw App SDK** is the public client API for apps outside the
+OpenClaw process. Use `@openclaw/sdk` when a script, dashboard, CI job, IDE
+extension, or other external app wants to connect to the Gateway, start agent
+runs, stream events, wait for results, cancel work, or inspect Gateway
+resources.
+
+<Note>
+  The App SDK is different from the [Plugin SDK](/plugins/sdk-overview).
+  `@openclaw/sdk` talks to the Gateway from outside OpenClaw.
+  `openclaw/plugin-sdk/*` is only for plugins that run inside OpenClaw and
+  register providers, channels, tools, hooks, or trusted runtimes.
+</Note>
+
+## What ships today
+
+`@openclaw/sdk` ships with:
+
+| Surface                   | Status  | What it does                                                                      |
+| ------------------------- | ------- | --------------------------------------------------------------------------------- |
+| `OpenClaw`                | Ready   | Main client entry point. Owns transport, connection, requests, and events.        |
+| `GatewayClientTransport`  | Ready   | WebSocket transport backed by the Gateway client.                                 |
+| `oc.agents`               | Ready   | Lists, creates, updates, deletes, and gets agent handles.                         |
+| `Agent.run()`             | Ready   | Starts a Gateway `agent` run and returns a `Run`.                                 |
+| `oc.runs`                 | Ready   | Creates, gets, waits for, cancels, and streams runs.                              |
+| `Run.events()`            | Ready   | Streams normalized per-run events with replay for fast runs.                      |
+| `Run.wait()`              | Ready   | Calls `agent.wait` and returns a stable `RunResult`.                              |
+| `Run.cancel()`            | Ready   | Calls `sessions.abort` by run id, with session key when available.                |
+| `oc.sessions`             | Ready   | Creates, resolves, sends to, patches, compacts, and gets session handles.         |
+| `Session.send()`          | Ready   | Calls `sessions.send` and returns a `Run`.                                        |
+| `oc.tasks`                | Ready   | Lists, reads, and cancels Gateway task ledger entries.                            |
+| `oc.models`               | Ready   | Calls `models.list` and the current `models.authStatus` status RPC.               |
+| `oc.tools`                | Ready   | Lists, scopes, and invokes Gateway tools through the policy pipeline.             |
+| `oc.artifacts`            | Ready   | Lists, gets, and downloads Gateway transcript artifacts.                          |
+| `oc.approvals`            | Ready   | Lists and resolves exec approvals through Gateway approval RPCs.                  |
+| `oc.environments`         | Partial | Lists Gateway-local and node environment candidates; create/delete are not wired. |
+| `oc.rawEvents()`          | Ready   | Exposes raw Gateway events for advanced consumers.                                |
+| `normalizeGatewayEvent()` | Ready   | Converts raw Gateway events into the stable SDK event shape.                      |
+
+The SDK also exports the core types used by those surfaces:
+`AgentRunParams`, `RunResult`, `RunStatus`, `OpenClawEvent`,
+`OpenClawEventType`, `GatewayEvent`, `OpenClawTransport`,
+`GatewayRequestOptions`, `SessionCreateParams`, `SessionSendParams`,
+`ArtifactSummary`, `ArtifactQuery`, `ArtifactsListResult`,
+`ArtifactsGetResult`, `ArtifactsDownloadResult`,
+`TaskSummary`, `TaskStatus`, `TasksListParams`, `TasksListResult`,
+`TasksGetResult`, `TasksCancelResult`, `RuntimeSelection`,
+`EnvironmentSelection`, `WorkspaceSelection`, `ApprovalMode`, and related
+result types.
+
+## Connect to a Gateway
+
+Create a client with an explicit Gateway URL, or inject a custom transport for
+tests and embedded app runtimes.
+
+```typescript
+import { OpenClaw } from "@openclaw/sdk";
+
+const oc = new OpenClaw({
+  url: "ws://127.0.0.1:18789",
+  token: process.env.OPENCLAW_GATEWAY_TOKEN,
+  requestTimeoutMs: 30_000,
+});
+
+await oc.connect();
+```
+
+`new OpenClaw({ gateway: "ws://..." })` is equivalent to `url`. The
+`gateway: "auto"` option is accepted by the constructor, but automatic Gateway
+discovery is not a separate SDK feature yet; pass `url` when the app does not
+already know how to discover the Gateway.
+
+For tests, pass an object that implements `OpenClawTransport`:
+
+```typescript
+const oc = new OpenClaw({
+  transport: {
+    async request(method, params) {
+      return { method, params };
+    },
+    async *events() {},
+  },
+});
+```
+
+## Run an agent
+
+Use `oc.agents.get(id)` when the app wants an agent handle, then call
+`agent.run()`.
+
+```typescript
+const agent = await oc.agents.get("main");
+
+const run = await agent.run({
+  input: "Review this pull request and suggest the smallest safe fix.",
+  model: "openai/gpt-5.5",
+  sessionKey: "main",
+  timeoutMs: 30_000,
+});
+
+for await (const event of run.events()) {
+  const data = event.data as { delta?: unknown };
+  if (event.type === "assistant.delta" && typeof data.delta === "string") {
+    process.stdout.write(data.delta);
+  }
+}
+
+const result = await run.wait({ timeoutMs: 120_000 });
+console.log(result.status);
+```
+
+Provider-qualified model refs such as `openai/gpt-5.5` are split into Gateway
+`provider` and `model` overrides. `timeoutMs` stays milliseconds in the SDK and
+is converted to Gateway timeout seconds for the `agent` RPC.
+
+`run.wait()` uses the Gateway `agent.wait` RPC. A wait deadline that expires
+while the run is still active returns `status: "accepted"` instead of pretending
+the run itself timed out. Runtime timeouts, aborted runs, and cancelled runs are
+normalized into `timed_out` or `cancelled`.
+
+## Create and reuse sessions
+
+Use sessions when the app wants durable transcript state.
+
+```typescript
+const session = await oc.sessions.create({
+  agentId: "main",
+  label: "release-review",
+});
+
+const run = await session.send("Prepare release notes from the current diff.");
+await run.wait();
+```
+
+`Session.send()` calls `sessions.send` and returns a `Run`. Session handles also
+support:
+
+```typescript
+await session.abort(run.id);
+await session.patch({ label: "renamed-session" });
+await session.compact({ maxLines: 200 });
+```
+
+## Stream events
+
+The SDK normalizes raw Gateway events into a stable `OpenClawEvent` envelope:
+
+```typescript
+type OpenClawEvent = {
+  version: 1;
+  id: string;
+  ts: number;
+  type: OpenClawEventType;
+  runId?: string;
+  sessionId?: string;
+  sessionKey?: string;
+  taskId?: string;
+  agentId?: string;
+  data: unknown;
+  raw?: GatewayEvent;
+};
+```
+
+Common event types include:
+
+| Event type            | Source Gateway event                        |
+| --------------------- | ------------------------------------------- |
+| `run.started`         | `agent` lifecycle start                     |
+| `run.completed`       | `agent` lifecycle end                       |
+| `run.failed`          | `agent` lifecycle error                     |
+| `run.cancelled`       | Aborted/cancelled lifecycle end             |
+| `run.timed_out`       | Timeout lifecycle end                       |
+| `assistant.delta`     | Assistant streaming delta                   |
+| `assistant.message`   | Assistant message                           |
+| `thinking.delta`      | Thinking or plan stream                     |
+| `tool.call.started`   | Tool/item/command start                     |
+| `tool.call.delta`     | Tool/item/command update                    |
+| `tool.call.completed` | Tool/item/command completion                |
+| `tool.call.failed`    | Tool/item/command failure or blocked status |
+| `approval.requested`  | Exec or plugin approval request             |
+| `approval.resolved`   | Exec or plugin approval resolution          |
+| `session.created`     | `sessions.changed` create                   |
+| `session.updated`     | `sessions.changed` update                   |
+| `session.compacted`   | `sessions.changed` compaction               |
+| `task.updated`        | Task update events                          |
+| `artifact.updated`    | Patch stream events                         |
+| `raw`                 | Any event without a stable SDK mapping yet  |
+
+`Run.events()` filters events to one run id and replays already-seen events for
+fast runs. That means the documented flow is safe:
+
+```typescript
+const run = await agent.run("Summarize the latest session.");
+
+for await (const event of run.events()) {
+  if (event.type === "run.completed") {
+    break;
+  }
+}
+```
+
+For app-wide streams, use `oc.events()`. For raw Gateway frames, use
+`oc.rawEvents()`.
+
+## Models, tools, artifacts, and approvals
+
+Model helpers map to current Gateway methods:
+
+```typescript
+await oc.models.list();
+await oc.models.status({ probe: false }); // calls models.authStatus
+```
+
+Tool helpers expose the Gateway catalog, effective tool view, and direct
+Gateway tool invocation. `oc.tools.invoke()` returns a typed envelope instead
+of throwing for policy or approval refusals.
+
+```typescript
+await oc.tools.list();
+await oc.tools.effective({ sessionKey: "main" });
+await oc.tools.invoke("tool-name", {
+  args: { input: "value" },
+  sessionKey: "main",
+  confirm: false,
+  idempotencyKey: "tool-call-1",
+});
+```
+
+Artifact helpers expose the Gateway artifact projection for session, run, or
+task context. Each call requires one explicit `sessionKey`, `runId`, or
+`taskId` scope:
+
+```typescript
+const { artifacts } = await oc.artifacts.list({ sessionKey: "main" });
+const first = artifacts[0];
+
+if (first) {
+  const { artifact } = await oc.artifacts.get(first.id, { sessionKey: "main" });
+  const download = await oc.artifacts.download(artifact.id, { sessionKey: "main" });
+  console.log(download.encoding, download.url);
+}
+```
+
+Approval helpers use the exec approval RPCs:
+
+```typescript
+const approvals = await oc.approvals.list();
+await oc.approvals.respond("approval-id", { decision: "approve" });
+```
+
+Task helpers use the durable task ledger that also backs `openclaw tasks`:
+
+```typescript
+const tasks = await oc.tasks.list({ status: "running", sessionKey: "agent:main:main" });
+const task = await oc.tasks.get(tasks.tasks[0].id);
+await oc.tasks.cancel(task.task.id, { reason: "user stopped task" });
+```
+
+Environment helpers expose read-only Gateway-local and node discovery:
+
+```typescript
+const { environments } = await oc.environments.list();
+await oc.environments.status(environments[0].id);
+```
+
+## Explicitly unsupported today
+
+The SDK includes names for the product model we want, but it does not silently
+pretend Gateway RPCs exist. These calls currently throw explicit unsupported
+errors:
+
+```typescript
+await oc.environments.create({});
+await oc.environments.delete("environment-id");
+```
+
+Per-run `workspace`, `runtime`, `environment`, and `approvals` fields are typed
+as future shape, but the current Gateway does not support those overrides on
+the `agent` RPC. If callers pass them, the SDK throws before submitting the run
+so work does not accidentally execute with default workspace, runtime,
+environment, or approval behavior.
+
+## App SDK vs Plugin SDK
+
+Use the App SDK when code lives outside OpenClaw:
+
+- Node scripts that start or observe agent runs
+- CI jobs that call a Gateway
+- dashboards and admin panels
+- IDE extensions
+- external bridges that do not need to become channel plugins
+- integration tests with fake or real Gateway transports
+
+Use the Plugin SDK when code runs inside OpenClaw:
+
+- provider plugins
+- channel plugins
+- tool or lifecycle hooks
+- agent harness plugins
+- trusted runtime helpers
+
+App SDK code should import from `@openclaw/sdk`. Plugin code should import from
+documented `openclaw/plugin-sdk/*` subpaths. Do not mix the two contracts.
+
+## Related
+
+- [OpenClaw App SDK API design](/reference/openclaw-sdk-api-design)
+- [Gateway RPC reference](/reference/rpc)
+- [Agent loop](/concepts/agent-loop)
+- [Agent runtimes](/concepts/agent-runtimes)
+- [Sessions](/concepts/session)
+- [Background tasks](/automation/tasks)
+- [ACP agents](/tools/acp-agents)
+- [Plugin SDK overview](/plugins/sdk-overview)

docs/docs.json

@@ -60,14 +60,6 @@
       "source": "/install/migrating-matrix",
       "destination": "/channels/matrix-migration"
     },
-    {
-      "source": "/concepts/openclaw-sdk",
-      "destination": "/gateway/external-apps"
-    },
-    {
-      "source": "/reference/openclaw-sdk-api-design",
-      "destination": "/gateway/external-apps"
-    },
     {
       "source": "/mcp",
       "destination": "/cli/mcp"
@@ -1249,7 +1241,6 @@
                   "plugins/admin-http-rpc",
                   "plugins/voice-call",
                   "plugins/memory-wiki",
-                  "plugins/llama-cpp",
                   "plugins/memory-lancedb",
                   "plugins/oc-path",
                   "plugins/zalouser"
@@ -1374,7 +1365,6 @@
                 "pages": [
                   "clawhub/cli",
                   "clawhub/publishing",
-                  "clawhub/plugin-validation-fixes",
                   "clawhub/skill-format",
                   "clawhub/soul-format",
                   "clawhub/auth",
@@ -1751,7 +1741,8 @@
                 "group": "RPC and API",
                 "pages": [
                   "reference/rpc",
-                  "gateway/external-apps",
+                  "concepts/openclaw-sdk",
+                  "reference/openclaw-sdk-api-design",
                   "reference/code-mode",
                   "reference/device-models"
                 ]

docs/gateway/config-channels.md

@@ -615,7 +615,6 @@ Before relying on an SSH wrapper for production sends, verify an outbound `imsg
       remoteAttachmentRoots: ["/Users/*/Library/Messages/Attachments"],
       mediaMaxMb: 16,
       service: "auto",
-      sendTransport: "auto",
       region: "US",
       actions: {
         reactions: true,
@@ -638,7 +637,6 @@ Before relying on an SSH wrapper for production sends, verify an outbound `imsg
 - `attachmentRoots` and `remoteAttachmentRoots` restrict inbound attachment paths (default: `/Users/*/Library/Messages/Attachments`).
 - SCP uses strict host-key checking, so ensure the relay host key already exists in `~/.ssh/known_hosts`.
 - `channels.imessage.configWrites`: allow or deny iMessage-initiated config writes.
-- `channels.imessage.sendTransport`: preferred `imsg` RPC send transport for normal outbound replies. `auto` (default) uses the IMCore bridge for existing chats when it is running, then falls back to AppleScript; `bridge` requires private-API delivery; `applescript` forces the public Messages automation path.
 - `channels.imessage.actions.*`: enable private API actions that are also gated by `imsg status` / `openclaw channels status --probe`.
 - `channels.imessage.includeAttachments` is off by default; set it to `true` before expecting inbound media in agent turns.
 - Inbound recovery after a bridge/gateway restart is automatic (GUID dedupe plus a stale-backlog age fence). Existing `channels.imessage.catchup.enabled: true` configs are still honored as a deprecated compatibility profile.

docs/gateway/configuration.md

@@ -601,8 +601,7 @@ For tooling that writes config over the gateway API, prefer this flow:
   summaries)
 - `config.get` to fetch the current snapshot plus `hash`
 - `config.patch` for partial updates (JSON merge patch: objects merge, `null`
-  deletes, arrays replace when explicitly confirmed with `replacePaths` if
-  entries would be removed)
+  deletes, arrays replace)
 - `config.apply` only when you intend to replace the entire config
 - `update.run` for explicit self-update plus restart; include `continuationMessage` when the post-restart session should run one follow-up turn
 - `update.status` to inspect the latest update restart sentinel and verify the running version after a restart
@@ -634,14 +633,6 @@ Both `config.apply` and `config.patch` accept `raw`, `baseHash`, `sessionKey`,
 `note`, and `restartDelayMs`. `baseHash` is required for both methods when a
 config already exists.
 
-`config.patch` also accepts `replacePaths`, an array of config paths whose array
-replacement is intentional. If a patch would replace or delete an existing array
-with fewer entries, the Gateway rejects the write unless that exact path appears
-in `replacePaths`; nested arrays under array entries use `[]`, such as
-`agents.list[].skills`. This prevents truncated `config.get` snapshots from
-silently clobbering routing or allowlist arrays. Use `config.apply` when you
-intend to replace the full config.
-
 ## Environment variables
 
 OpenClaw reads env vars from the parent process plus:

docs/gateway/external-apps.md

@@ -1,86 +0,0 @@
----
-summary: "Current integration path for external apps, scripts, dashboards, CI jobs, and IDE extensions"
-title: "Gateway integrations for external apps"
-sidebarTitle: "External apps"
-read_when:
-  - You are building an external app, script, dashboard, CI job, or IDE extension that talks to OpenClaw
-  - You are choosing between Gateway RPC and the Plugin SDK
-  - You are integrating with Gateway agent runs, sessions, events, approvals, models, or tools
----
-
-External apps should talk to OpenClaw through the Gateway protocol today. Use
-Gateway WebSocket and RPC methods when a script, dashboard, CI job, IDE
-extension, or another process wants to start agent runs, stream events, wait for
-results, cancel work, or inspect Gateway resources.
-
-<Warning>
-  There is no public npm client package yet. Do not add OpenClaw client package
-  names as application dependencies until release notes announce a published
-  package and this page includes install instructions.
-</Warning>
-
-<Note>
-  This page is for code outside the OpenClaw process. Plugin code that runs
-  inside OpenClaw should use documented `openclaw/plugin-sdk/*` subpaths instead.
-</Note>
-
-## What is available today
-
-| Surface                                 | Status | Use it for                                                                                    |
-| --------------------------------------- | ------ | --------------------------------------------------------------------------------------------- |
-| [Gateway protocol](/gateway/protocol)   | Ready  | WebSocket transport, connect handshake, auth scopes, protocol versioning, and events.         |
-| [Gateway RPC reference](/reference/rpc) | Ready  | Current Gateway methods for agents, sessions, tasks, models, tools, artifacts, and approvals. |
-| [`openclaw agent`](/cli/agent)          | Ready  | One-shot script integration when shelling out to the CLI is enough.                           |
-| [`openclaw message`](/cli/message)      | Ready  | Sending messages or channel actions from scripts.                                             |
-
-The source tree contains internal package work for a future client library, but
-that is not a public install surface. Treat it as preview implementation detail
-until the packages are published and versioned.
-
-## Recommended path
-
-1. Run or discover a Gateway.
-2. Connect over the [Gateway protocol](/gateway/protocol).
-3. Call documented RPC methods from [Gateway RPC reference](/reference/rpc).
-4. Pin the OpenClaw version you test against.
-5. Recheck the RPC reference when upgrading OpenClaw.
-
-For agent runs, start with the `agent` RPC and pair it with `agent.wait` when
-you need a terminal result. For durable conversation state, use the `sessions.*`
-methods. For UI integrations, subscribe to Gateway events and render only the
-event families your app understands.
-
-## App code vs plugin code
-
-Use Gateway RPC when code lives outside OpenClaw:
-
-- Node scripts that start or observe agent runs
-- CI jobs that call a Gateway
-- dashboards and admin panels
-- IDE extensions
-- external bridges that do not need to become channel plugins
-- integration tests with fake or real Gateway transports
-
-Use the Plugin SDK when code runs inside OpenClaw:
-
-- provider plugins
-- channel plugins
-- tool or lifecycle hooks
-- agent harness plugins
-- trusted runtime helpers
-
-External apps should not import `openclaw/plugin-sdk/*`; those subpaths are for
-plugins loaded by OpenClaw.
-
-## Related
-
-- [Gateway protocol](/gateway/protocol)
-- [Gateway RPC reference](/reference/rpc)
-- [CLI agent command](/cli/agent)
-- [CLI message command](/cli/message)
-- [Agent loop](/concepts/agent-loop)
-- [Agent runtimes](/concepts/agent-runtimes)
-- [Sessions](/concepts/session)
-- [Background tasks](/automation/tasks)
-- [ACP agents](/tools/acp-agents)
-- [Plugin SDK overview](/plugins/sdk-overview)

docs/gateway/opentelemetry.md

@@ -161,13 +161,6 @@ When any subkey is enabled, model and tool spans get bounded, redacted
 `captureContent: true` only for broad diagnostics captures where OTLP log
 message bodies are also approved for export.
 
-`toolInputs`/`toolOutputs` content is captured for the built-in agent runtime's
-tool executions (`openclaw.content.tool_input` on completed/error spans,
-`openclaw.content.tool_output` on completed spans). External harness tool calls
-(Codex, Claude CLI) emit `tool.execution.*` spans without content payloads.
-Captured content travels on a trusted, listener-only channel and is never placed
-on the public diagnostic event bus.
-
 ## Sampling and flushing
 
 - **Traces:** `diagnostics.otel.sampleRate` (root-span only, `0.0` drops all,

docs/gateway/protocol.md

@@ -405,9 +405,7 @@ enumeration of `src/gateway/server-methods/*.ts`.
     - `secrets.resolve` resolves command-target secret assignments for a specific command/target set.
     - `config.get` returns the current config snapshot and hash.
     - `config.set` writes a validated config payload.
-    - `config.patch` merges a partial config update. Destructive array
-      replacement requires the affected path in `replacePaths`; nested arrays
-      under array entries use `[]` paths such as `agents.list[].skills`.
+    - `config.patch` merges a partial config update.
     - `config.apply` validates + replaces the full config payload.
     - `config.schema` returns the live config schema payload used by Control UI and CLI tooling: schema, `uiHints`, version, and generation metadata, including plugin + channel schema metadata when the runtime can load it. The schema includes field `title` / `description` metadata derived from the same labels and help text used by the UI, including nested object, wildcard, array-item, and `anyOf` / `oneOf` / `allOf` composition branches when matching field documentation exists.
     - `config.schema.lookup` returns a path-scoped lookup payload for one config path: normalized path, a shallow schema node, matched hint + `hintPath`, optional `reloadKind`, and immediate child summaries for UI/CLI drill-down. `reloadKind` is one of `restart`, `hot`, or `none` and mirrors the Gateway config reload planner for the requested path. Lookup schema nodes keep the user-facing docs and common validation fields (`title`, `description`, `type`, `enum`, `const`, `format`, `pattern`, numeric/string/array/object bounds, and flags like `additionalProperties`, `deprecated`, `readOnly`, `writeOnly`). Child summaries expose `key`, normalized `path`, `type`, `required`, `hasChildren`, optional `reloadKind`, plus the matched `hint` / `hintPath`.
@@ -780,19 +778,16 @@ rather than the pre-handshake defaults.
   - `gateway.controlUi.allowInsecureAuth=true` for localhost-only insecure HTTP compatibility.
   - successful `gateway.auth.mode: "trusted-proxy"` operator Control UI auth.
   - `gateway.controlUi.dangerouslyDisableDeviceAuth=true` (break-glass, severe security downgrade).
-  - direct-loopback `gateway-client` backend RPCs on the reserved internal
-    helper path.
-- Omitting device identity has scope consequences. When a device-less operator
-  connection is allowed through an explicit trust path, OpenClaw still clears
-  self-declared scopes to an empty set unless that path has a named
-  scope-preservation exception. Scope-gated methods then fail with
-  `missing scope`.
-- `gateway.controlUi.dangerouslyDisableDeviceAuth=true` is a Control UI
-  break-glass scope-preservation path. It does not grant scopes to arbitrary
-  custom backend or CLI-shaped WebSocket clients.
-- The reserved direct-loopback `gateway-client` backend helper path preserves
-  scopes only for internal local control-plane RPCs; custom backend IDs do not
-  receive this exception.
+  - direct-loopback `gateway-client` backend RPCs authenticated with the shared
+    gateway token/password.
+- Omitting device identity has scope consequences. When a Control UI connection
+  lacks device identity, `shouldClearUnboundScopesForMissingDeviceIdentity`
+  clears self-declared scopes to an empty set for token, password, and
+  trusted-proxy auth. The connection is allowed on explicit trust paths, but
+  scope-gated methods fail. The exception is local Control UI token/password
+  sessions with `allowInsecureAuth`, which preserve scopes. For other cases,
+  set `gateway.controlUi.dangerouslyDisableDeviceAuth=true` only as a
+  break-glass scope-preservation path.
 - All connections must sign the server-provided `connect.challenge` nonce.
 
 ### Device auth migration diagnostics

docs/gateway/trusted-proxy-auth.md

@@ -53,23 +53,24 @@ Use `trusted-proxy` auth mode when:
 
 When `gateway.auth.mode = "trusted-proxy"` is active and the request passes trusted-proxy checks, Control UI WebSocket sessions can connect without device pairing identity.
 
-Scope implications:
-
-- Device-less Control UI WebSocket sessions connect but receive no operator scopes by default. OpenClaw clears the requested scope list to `[]` so a session that is not bound to an approved paired device/token cannot self-declare permissions.
-- If methods fail with `missing scope` after a successful WebSocket connect, use HTTPS so the browser can generate device identity and complete pairing. See [Control UI insecure HTTP](/web/control-ui#insecure-http).
-- Break-glass only: `gateway.controlUi.dangerouslyDisableDeviceAuth=true` preserves requested scopes even without device identity. This is a severe security downgrade; revert quickly. See [Control UI insecure HTTP](/web/control-ui#insecure-http).
-
-Reverse-proxy scope capping:
-
-- If your proxy sends `x-openclaw-scopes` on the Control UI WebSocket upgrade request, OpenClaw caps the session scopes to the intersection of the requested scopes and the declared scopes. This header does not grant scopes; it only narrows what the session can hold.
-
 Implications:
 
 - Pairing is no longer the primary gate for Control UI access in this mode.
 - Your reverse proxy auth policy and `allowUsers` become the effective access control.
 - Keep gateway ingress locked to trusted proxy IPs only (`gateway.trustedProxies` + firewall).
 
-Custom WebSocket clients are not Control UI sessions. `gateway.controlUi.dangerouslyDisableDeviceAuth` does not grant scopes to arbitrary `client.mode: "backend"` or CLI-shaped clients. Custom automation should use device identity/pairing, the reserved direct-local `client.id: "gateway-client"` backend helper path, or the [admin HTTP RPC plugin](/plugins/admin-http-rpc) when an HTTP request/response surface is a better fit.
+**Scope clearing without device identity:** Because the browser over plain HTTP
+cannot create the device identity that OpenClaw uses to bind operator scopes,
+trusted-proxy WebSocket connections that lack device identity have their
+self-declared scopes cleared to an empty set. The connection is allowed, but
+scope-gated methods (`operator.read`, `operator.write`, etc.) fail with
+`missing scope`.
+
+To preserve operator scopes on trusted-proxy WebSocket connections without
+device identity, set `gateway.controlUi.dangerouslyDisableDeviceAuth: true`.
+This is a break-glass flag (`openclaw security audit` reports it as critical).
+Use it only when the reverse proxy is the sole path to the Gateway and device
+identity cannot be established.
 
 ## Configuration
 
@@ -321,9 +322,12 @@ Loopback trusted-proxy identity headers still fail closed: same-host callers are
 
 ## Operator scopes header
 
-Trusted-proxy auth is an **identity-bearing** HTTP mode, so callers may optionally declare operator scopes with `x-openclaw-scopes` on HTTP API requests.
+Trusted-proxy auth is an **identity-bearing** HTTP mode, so callers may optionally declare operator scopes with `x-openclaw-scopes`.
 
-Note: WebSocket scopes are determined by the Gateway protocol handshake and device identity binding. On Control UI WebSocket upgrade requests, `x-openclaw-scopes` is only a cap on the negotiated session scopes, not a grant. For WebSocket scope behavior with trusted-proxy, see [Control UI pairing behavior](#control-ui-pairing-behavior).
+Note: `x-openclaw-scopes` applies to HTTP endpoints only. WebSocket scopes are
+determined by the Gateway protocol handshake and device identity binding. For
+WebSocket scope behavior with trusted-proxy, see
+[Control UI pairing behavior](#control-ui-pairing-behavior).
 
 Examples:
 
@@ -338,7 +342,6 @@ Behavior:
 - When the header is absent, normal identity-bearing HTTP APIs fall back to the standard operator default scope set.
 - Gateway-auth **plugin HTTP routes** are narrower by default: when `x-openclaw-scopes` is absent, their runtime scope falls back to `operator.write`.
 - Browser-origin HTTP requests still have to pass `gateway.controlUi.allowedOrigins` (or deliberate Host-header fallback mode) even after trusted-proxy auth succeeds.
-- For Control UI WebSocket sessions, `x-openclaw-scopes` is a scope cap when present on the upgrade request. An empty value yields no scopes.
 
 Practical rule: send `x-openclaw-scopes` explicitly when you want a trusted-proxy request to be narrower than the defaults, or when a gateway-auth plugin route needs something stronger than write scope.
 
@@ -424,20 +427,17 @@ The audit checks for:
 
   </Accordion>
   <Accordion title="Connection succeeds but methods report missing scope">
-    The WebSocket connects, but `chat.history`, `sessions.list`, or
-    `models.list` fails with `missing scope: operator.read`.
+    The WebSocket connects, but `chat.history` or `sessions.list` fails with
+    `missing scope: operator.read`.
 
-    Common causes:
-
-    - Device-less Control UI session: trusted-proxy auth can admit the WebSocket connection without device identity, but OpenClaw clears scopes on device-less sessions by design.
-    - Custom backend client: `gateway.controlUi.dangerouslyDisableDeviceAuth` is Control UI scoped and does not grant scopes to arbitrary backend or CLI-shaped WebSocket clients.
-    - Overly narrow `x-openclaw-scopes`: if your proxy injects this header on the Control UI WebSocket upgrade request, the session scopes are capped to that set. An empty header value yields no scopes.
+    This is expected for trusted-proxy WebSocket connections without device
+    identity. Connections lacking device identity have their scopes cleared. The
+    browser cannot generate device identity over plain HTTP.
 
     Fix:
 
-    - For Control UI, use HTTPS so the browser can generate device identity and complete pairing.
-    - For custom automation, use device identity/pairing, the reserved direct-local `gateway-client` backend helper path, or [admin HTTP RPC](/plugins/admin-http-rpc).
-    - Use `gateway.controlUi.dangerouslyDisableDeviceAuth: true` only as a temporary Control UI break-glass path.
+    - Set `gateway.controlUi.dangerouslyDisableDeviceAuth: true` to preserve operator scopes on trusted-proxy WebSocket connections, or
+    - Use device identity pairing so scopes are bound to the device token.
 
   </Accordion>
   <Accordion title="WebSocket still failing">