Merge branch 'main' into feat/twilio-region-support

2026-03-07 15:29:58 +01:00 · 2026-03-07 15:29:58 +01:00 · ca6421b99e
commit ca6421b99e
parent f3928a9ebf bdd0f74188
609 changed files with 16580 additions and 7235 deletions
--- a/.detect-secrets.cfg
+++ b/.detect-secrets.cfg
@ -7,10 +7,6 @@
 [exclude-files]
 # pnpm lockfiles contain lots of high-entropy package integrity blobs.
 pattern = (^|/)pnpm-lock\.yaml$
-# Generated output and vendored assets.
-pattern = (^|/)(dist|vendor)/
-# Local config file with allowlist patterns.
-pattern = (^|/)\.detect-secrets\.cfg$

 [exclude-lines]
 # Fastlane checks for private key marker; not a real key.
@ -28,3 +24,5 @@ pattern = "talk\.apiKey"
 pattern = === "string"
 # specific optional-chaining password check that didn't match the line above.
 pattern = typeof remote\?\.password === "string"
+# Docker apt signing key fingerprint constant; not a secret.
+pattern = OPENCLAW_DOCKER_GPG_FINGERPRINT=
--- a/.github/actions/ensure-base-commit/action.yml
+++ b/.github/actions/ensure-base-commit/action.yml
@ -0,0 +1,47 @@
+name: Ensure base commit
+description: Ensure a shallow checkout has enough history to diff against a base SHA.
+inputs:
+  base-sha:
+    description: Base commit SHA to diff against.
+    required: true
+  fetch-ref:
+    description: Branch or ref to deepen/fetch from origin when base-sha is missing.
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Ensure base commit is available
+      shell: bash
+      env:
+        BASE_SHA: ${{ inputs.base-sha }}
+        FETCH_REF: ${{ inputs.fetch-ref }}
+      run: |
+        set -euo pipefail
+
+        if [ -z "$BASE_SHA" ] || [[ "$BASE_SHA" =~ ^0+$ ]]; then
+          echo "No concrete base SHA available; skipping targeted fetch."
+          exit 0
+        fi
+
+        if git rev-parse --verify "$BASE_SHA^{commit}" >/dev/null 2>&1; then
+          echo "Base commit already present: $BASE_SHA"
+          exit 0
+        fi
+
+        for deepen_by in 25 100 300; do
+          echo "Base commit missing; deepening $FETCH_REF by $deepen_by."
+          git fetch --no-tags --deepen="$deepen_by" origin "$FETCH_REF" || true
+          if git rev-parse --verify "$BASE_SHA^{commit}" >/dev/null 2>&1; then
+            echo "Resolved base commit after deepening: $BASE_SHA"
+            exit 0
+          fi
+        done
+
+        echo "Base commit still missing; fetching full history for $FETCH_REF."
+        git fetch --no-tags origin "$FETCH_REF" || true
+        if git rev-parse --verify "$BASE_SHA^{commit}" >/dev/null 2>&1; then
+          echo "Resolved base commit after full ref fetch: $BASE_SHA"
+          exit 0
+        fi
+
+        echo "Base commit still unavailable after fetch attempts: $BASE_SHA"
--- a/.github/workflows/auto-response.yml
+++ b/.github/workflows/auto-response.yml
@ -49,6 +49,13 @@ jobs:
                message:
                  "Please use [our support server](https://discord.gg/clawd) and ask in #help or #users-helping-users to resolve this, or follow the stuck FAQ at https://docs.openclaw.ai/help/faq#im-stuck-whats-the-fastest-way-to-get-unstuck.",
              },
+              {
+                label: "r: no-ci-pr",
+                message:
+                  "Please don't make PRs for test failures on main.\n\n" +
+                  "The team is aware of those and will handle them directly on the codebase, not only fixing the tests but also investigating what the root cause is. Having to sift through test-fix-PRs (including some that have been out of date for weeks...) on top of that doesn't help. There are already way too many PRs for humans to manage; please don't make the flood worse.\n\n" +
+                  "Thank you.",
+              },
              {
                label: "r: too-many-prs",
                close: true,
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -21,10 +21,16 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4
        with:
-          fetch-depth: 50
+          fetch-depth: 1
          fetch-tags: false
          submodules: false

+      - name: Ensure docs-scope base commit
+        uses: ./.github/actions/ensure-base-commit
+        with:
+          base-sha: ${{ github.event_name == 'push' && github.event.before || github.event.pull_request.base.sha }}
+          fetch-ref: ${{ github.event_name == 'push' && github.ref_name || github.event.pull_request.base.ref }}
+
      - name: Detect docs-only changes
        id: check
        uses: ./.github/actions/detect-docs-changes
@ -46,10 +52,16 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4
        with:
-          fetch-depth: 50
+          fetch-depth: 1
          fetch-tags: false
          submodules: false

+      - name: Ensure changed-scope base commit
+        uses: ./.github/actions/ensure-base-commit
+        with:
+          base-sha: ${{ github.event_name == 'push' && github.event.before || github.event.pull_request.base.sha }}
+          fetch-ref: ${{ github.event_name == 'push' && github.ref_name || github.event.pull_request.base.ref }}
+
      - name: Detect changed scopes
        id: scope
        shell: bash
@ -75,6 +87,13 @@ jobs:
        with:
          submodules: false

+      - name: Ensure secrets base commit (PR fast path)
+        if: github.event_name == 'pull_request'
+        uses: ./.github/actions/ensure-base-commit
+        with:
+          base-sha: ${{ github.event.pull_request.base.sha }}
+          fetch-ref: ${{ github.event.pull_request.base.ref }}
+
      - name: Setup Node environment
        uses: ./.github/actions/setup-node-env
        with:
@ -194,25 +213,13 @@ jobs:
      - name: Enforce safe external URL opening policy
        run: pnpm lint:ui:no-raw-window-open

-  # Report-only dead-code scans. Runs after scope detection and stores machine-readable
-  # results as artifacts for later triage before we enable hard gates.
-  # Temporarily disabled in CI while we process initial findings.
+  # Report-only dead-code scan. Runs after scope detection and stores the Knip
+  # report as an artifact so we can triage findings before enabling hard gates.
  deadcode:
    name: dead-code report
    needs: [docs-scope, changed-scope]
-    # if: needs.docs-scope.outputs.docs_only != 'true' && (github.event_name == 'push' || needs.changed-scope.outputs.run_node == 'true')
-    if: false
+    if: needs.docs-scope.outputs.docs_only != 'true' && (github.event_name == 'push' || needs.changed-scope.outputs.run_node == 'true')
    runs-on: blacksmith-16vcpu-ubuntu-2404
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - tool: knip
-            command: pnpm deadcode:report:ci:knip
-          - tool: ts-prune
-            command: pnpm deadcode:report:ci:ts-prune
-          - tool: ts-unused-exports
-            command: pnpm deadcode:report:ci:ts-unused
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@ -225,13 +232,13 @@ jobs:
          install-bun: "false"
          use-sticky-disk: "true"

-      - name: Run ${{ matrix.tool }} dead-code scan
-        run: ${{ matrix.command }}
+      - name: Run Knip dead-code scan
+        run: pnpm deadcode:report:ci:knip

      - name: Upload dead-code results
        uses: actions/upload-artifact@v4
        with:
-          name: dead-code-${{ matrix.tool }}-${{ github.run_id }}
+          name: dead-code-knip-${{ github.run_id }}
          path: .artifacts/deadcode

  # Validate docs (format, lint, broken links) only when docs files changed.
@ -303,13 +310,34 @@ jobs:
      - name: Install pre-commit
        run: |
          python -m pip install --upgrade pip
-          python -m pip install pre-commit detect-secrets==1.5.0
+          python -m pip install pre-commit

      - name: Detect secrets
        run: |
-          if ! detect-secrets scan --baseline .secrets.baseline; then
-            echo "::error::Secret scanning failed. See docs/gateway/security.md#secret-scanning-detect-secrets"
-            exit 1
+          set -euo pipefail
+
+          if [ "${{ github.event_name }}" = "push" ]; then
+            echo "Running full detect-secrets scan on push."
+            pre-commit run --all-files detect-secrets
+            exit 0
+          fi
+
+          BASE="${{ github.event.pull_request.base.sha }}"
+          changed_files=()
+          if git rev-parse --verify "$BASE^{commit}" >/dev/null 2>&1; then
+            while IFS= read -r path; do
+              [ -n "$path" ] || continue
+              [ -f "$path" ] || continue
+              changed_files+=("$path")
+            done < <(git diff --name-only --diff-filter=ACMR "$BASE" HEAD)
+          fi
+
+          if [ "${#changed_files[@]}" -gt 0 ]; then
+            echo "Running detect-secrets on ${#changed_files[@]} changed file(s)."
+            pre-commit run detect-secrets --files "${changed_files[@]}"
+          else
+            echo "Falling back to full detect-secrets scan."
+            pre-commit run --all-files detect-secrets
          fi

      - name: Detect committed private keys
--- a/.github/workflows/install-smoke.yml
+++ b/.github/workflows/install-smoke.yml
@ -19,9 +19,15 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v4
        with:
-          fetch-depth: 50
+          fetch-depth: 1
          fetch-tags: false

+      - name: Ensure docs-scope base commit
+        uses: ./.github/actions/ensure-base-commit
+        with:
+          base-sha: ${{ github.event_name == 'push' && github.event.before || github.event.pull_request.base.sha }}
+          fetch-ref: ${{ github.event_name == 'push' && github.ref_name || github.event.pull_request.base.ref }}
+
      - name: Detect docs-only changes
        id: check
        uses: ./.github/actions/detect-docs-changes
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -30,7 +30,7 @@ repos:
          - --baseline
          - .secrets.baseline
          - --exclude-files
-          - '(^|/)(dist/|vendor/|pnpm-lock\.yaml$|\.detect-secrets\.cfg$)'
+          - '(^|/)pnpm-lock\.yaml$'
          - --exclude-lines
          - 'key_content\.include\?\("BEGIN PRIVATE KEY"\)'
          - --exclude-lines
@ -47,6 +47,8 @@ repos:
          - '=== "string"'
          - --exclude-lines
          - 'typeof remote\?\.password === "string"'
+          - --exclude-lines
+          - "OPENCLAW_DOCKER_GPG_FINGERPRINT="
  # Shell script linting
  - repo: https://github.com/koalaman/shellcheck-precommit
    rev: v0.11.0
--- a/.secrets.baseline
+++ b/.secrets.baseline
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,31 +2,32 @@

 Docs: https://docs.openclaw.ai

-## 2026.3.3
+## 2026.3.7

 ### Changes

- Web UI/i18n: add Spanish (`es`) locale support in the Control UI, including locale detection, lazy loading, and language picker labels across supported locales. (#35038) Thanks @DaoPromociones.
- Discord/allowBots mention gating: add `allowBots: "mentions"` to only accept bot-authored messages that mention the bot. Thanks @thewilloftheshadow.
- Docs/Web search: remove outdated Brave free-tier wording and replace prescriptive AI ToS guidance with neutral compliance language in Brave setup docs. (#26860) Thanks @HenryLoenwind.
- Tools/Web search: switch Perplexity provider to Search API with structured results plus new language/region/time filters. (#33822) Thanks @kesku.
- Tools/Diffs guidance loading: move diffs usage guidance from unconditional prompt-hook injection to the plugin companion skill path, reducing unrelated-turn prompt noise while keeping diffs tool behavior unchanged. (#32630) thanks @sircrumpet.
- Agents/tool-result truncation: preserve important tail diagnostics by using head+tail truncation for oversized tool results while keeping configurable truncation options. (#20076) thanks @jlwestsr.
- Telegram/topic agent routing: support per-topic `agentId` overrides in forum groups and DM topics so topics can route to dedicated agents with isolated sessions. (#33647; based on #31513) Thanks @kesor and @Sid-Qin.
- ACP/persistent channel bindings: add durable Discord channel and Telegram topic binding storage, routing resolution, and CLI/docs support so ACP thread targets survive restarts and can be managed consistently. (#34873) Thanks @dutifulbob.
- Slack/DM typing feedback: add `channels.slack.typingReaction` so Socket Mode DMs can show reaction-based processing status even when Slack native assistant typing is unavailable. (#19816) Thanks @dalefrieswthat.
- Cron/job snapshot persistence: skip backup during normalization persistence in `ensureLoaded` so `jobs.json.bak` keeps the pre-edit snapshot for recovery, while preserving backup creation on explicit user-driven writes. (#35234) Thanks @0xsline.
- TTS/OpenAI-compatible endpoints: add `messages.tts.openai.baseUrl` config support with config-over-env precedence, endpoint-aware directive validation, and OpenAI TTS request routing to the resolved base URL. (#34321) thanks @RealKai42.
- Plugins/before_prompt_build system-context fields: add `prependSystemContext` and `appendSystemContext` so static plugin guidance can be placed in system prompt space for provider caching and lower repeated prompt token cost. (#35177) thanks @maweibin.
- Gateway: add SecretRef support for gateway.auth.token with auth-mode guardrails. (#35094) Thanks @joshavant.
- Plugins/hook policy: add `plugins.entries.<id>.hooks.allowPromptInjection`, validate unknown typed hook names at runtime, and preserve legacy `before_agent_start` model/provider overrides while stripping prompt-mutating fields when prompt injection is disabled. (#36567) thanks @gumadeiras.
- Tools/Diffs guidance: restore a short system-prompt hint for enabled diffs while keeping the detailed instructions in the companion skill, so diffs usage guidance stays out of user-prompt space. (#36904) thanks @gumadeiras.
- Telegram/ACP topic bindings: accept Telegram Mac Unicode dash option prefixes in `/acp spawn`, support Telegram topic thread binding (`--thread here|auto`), route bound-topic follow-ups to ACP sessions, add actionable Telegram approval buttons with prefixed approval-id resolution, and pin successful bind confirmations in-topic. (#36683) Thanks @huntharo.
- Hooks/Compaction lifecycle: emit `session:compact:before` and `session:compact:after` internal events plus plugin compaction callbacks with session/count metadata, so automations can react to compaction runs consistently. (#16788) thanks @vincentkoc.
 - Agents/context engine plugin interface: add `ContextEngine` plugin slot with full lifecycle hooks (`bootstrap`, `ingest`, `assemble`, `compact`, `afterTurn`, `prepareSubagentSpawn`, `onSubagentEnded`), slot-based registry with config-driven resolution, `LegacyContextEngine` wrapper preserving existing compaction behavior, scoped subagent runtime for plugin runtimes via `AsyncLocalStorage`, and `sessions.get` gateway method. Enables plugins like `lossless-claw` to provide alternative context management strategies without modifying core compaction logic. Zero behavior change when no context engine plugin is configured. (#22201) thanks @jalehman.
- CLI: make read-only SecretRef status flows degrade safely (#37023) thanks @joshavant.
- Docker/Podman extension dependency baking: add `OPENCLAW_EXTENSIONS` so container builds can preinstall selected bundled extension npm dependencies into the image for faster and more reproducible startup in container deployments. (#32223) Thanks @sallyom.
+- ACP/persistent channel bindings: add durable Discord channel and Telegram topic binding storage, routing resolution, and CLI/docs support so ACP thread targets survive restarts and can be managed consistently. (#34873) Thanks @dutifulbob.
+- Telegram/ACP topic bindings: accept Telegram Mac Unicode dash option prefixes in `/acp spawn`, support Telegram topic thread binding (`--thread here|auto`), route bound-topic follow-ups to ACP sessions, add actionable Telegram approval buttons with prefixed approval-id resolution, and pin successful bind confirmations in-topic. (#36683) Thanks @huntharo.
+- Telegram/topic agent routing: support per-topic `agentId` overrides in forum groups and DM topics so topics can route to dedicated agents with isolated sessions. (#33647; based on #31513) Thanks @kesor and @Sid-Qin.
+- Web UI/i18n: add Spanish (`es`) locale support in the Control UI, including locale detection, lazy loading, and language picker labels across supported locales. (#35038) Thanks @DaoPromociones.
 - Onboarding/web search: add provider selection step and full provider list in configure wizard, with SecretRef ref-mode support during onboarding. (#34009) Thanks @kesku and @thewilloftheshadow.
+- Tools/Web search: switch Perplexity provider to Search API with structured results plus new language/region/time filters. (#33822) Thanks @kesku.
+- Gateway: add SecretRef support for gateway.auth.token with auth-mode guardrails. (#35094) Thanks @joshavant.
+- Docker/Podman extension dependency baking: add `OPENCLAW_EXTENSIONS` so container builds can preinstall selected bundled extension npm dependencies into the image for faster and more reproducible startup in container deployments. (#32223) Thanks @sallyom.
+- Plugins/before_prompt_build system-context fields: add `prependSystemContext` and `appendSystemContext` so static plugin guidance can be placed in system prompt space for provider caching and lower repeated prompt token cost. (#35177) thanks @maweibin.
+- Plugins/hook policy: add `plugins.entries.<id>.hooks.allowPromptInjection`, validate unknown typed hook names at runtime, and preserve legacy `before_agent_start` model/provider overrides while stripping prompt-mutating fields when prompt injection is disabled. (#36567) thanks @gumadeiras.
+- Hooks/Compaction lifecycle: emit `session:compact:before` and `session:compact:after` internal events plus plugin compaction callbacks with session/count metadata, so automations can react to compaction runs consistently. (#16788) thanks @vincentkoc.
+- Agents/compaction post-context configurability: add `agents.defaults.compaction.postCompactionSections` so deployments can choose which `AGENTS.md` sections are re-injected after compaction, while preserving legacy fallback behavior when the documented default pair is configured in any order. (#34556) thanks @efe-arv.
+- TTS/OpenAI-compatible endpoints: add `messages.tts.openai.baseUrl` config support with config-over-env precedence, endpoint-aware directive validation, and OpenAI TTS request routing to the resolved base URL. (#34321) thanks @RealKai42.
+- Slack/DM typing feedback: add `channels.slack.typingReaction` so Socket Mode DMs can show reaction-based processing status even when Slack native assistant typing is unavailable. (#19816) Thanks @dalefrieswthat.
+- Discord/allowBots mention gating: add `allowBots: "mentions"` to only accept bot-authored messages that mention the bot. Thanks @thewilloftheshadow.
+- Agents/tool-result truncation: preserve important tail diagnostics by using head+tail truncation for oversized tool results while keeping configurable truncation options. (#20076) thanks @jlwestsr.
+- Cron/job snapshot persistence: skip backup during normalization persistence in `ensureLoaded` so `jobs.json.bak` keeps the pre-edit snapshot for recovery, while preserving backup creation on explicit user-driven writes. (#35234) Thanks @0xsline.
+- CLI: make read-only SecretRef status flows degrade safely (#37023) thanks @joshavant.
+- Tools/Diffs guidance: restore a short system-prompt hint for enabled diffs while keeping the detailed instructions in the companion skill, so diffs usage guidance stays out of user-prompt space. (#36904) thanks @gumadeiras.
+- Tools/Diffs guidance loading: move diffs usage guidance from unconditional prompt-hook injection to the plugin companion skill path, reducing unrelated-turn prompt noise while keeping diffs tool behavior unchanged. (#32630) thanks @sircrumpet.
+- Docs/Web search: remove outdated Brave free-tier wording and replace prescriptive AI ToS guidance with neutral compliance language in Brave setup docs. (#26860) Thanks @HenryLoenwind.

 ### Breaking

@ -34,6 +35,7 @@ Docs: https://docs.openclaw.ai

 ### Fixes

+- Gateway/Telegram stale-socket restart guard: only apply stale-socket restarts to channels that publish event-liveness timestamps, preventing Telegram providers from being misclassified as stale solely due to long uptime and avoiding restart/pairing storms after upgrade. (openclaw#38464)
 - Onboarding/headless Linux daemon probe hardening: treat `systemctl --user is-enabled` probe failures as non-fatal during daemon install flow so onboarding no longer crashes on SSH/headless VPS environments before showing install guidance. (#37297) Thanks @acarbajal-web.
 - Memory/QMD mcporter Windows spawn hardening: when `mcporter.cmd` launch fails with `spawn EINVAL`, retry via bare `mcporter` shell resolution so QMD recall can continue instead of falling back to builtin memory search. (#27402) Thanks @i0ivi0i.
 - Tools/web_search Brave language-code validation: align `search_lang` handling with Brave-supported codes (including `zh-hans`, `zh-hant`, `en-gb`, and `pt-br`), map common alias inputs (`zh`, `ja`) to valid Brave values, and reject unsupported codes before upstream requests to prevent 422 failures. (#37260) Thanks @heyanming.
@ -88,6 +90,7 @@ Docs: https://docs.openclaw.ai
 - Auto-reply/system events: restore runtime system events to the message timeline (`System:` lines), preserve think-hint parsing with prepended events, and carry events into deferred followup/collect/steer-backlog prompts to keep cache behavior stable without dropping queued metadata. (#34794) Thanks @anisoptera.
 - Security/audit account handling: avoid prototype-chain account IDs in audit validation by using own-property checks for `accounts`. (#34982) Thanks @HOYALIM.
 - Cron/restart catch-up semantics: replay interrupted recurring jobs and missed immediate cron slots on startup without replaying interrupted one-shot jobs, with guarded missed-slot probing to avoid malformed-schedule startup aborts and duplicate-trigger drift after restart. (from #34466, #34896, #34625, #33206) Thanks @dunamismax, @dsantoreis, @Octane0411, and @Sid-Qin.
+- Venice/provider onboarding hardening: align per-model Venice completion-token limits with discovery metadata, clamp untrusted discovery values to safe bounds, sync the static Venice fallback catalog with current live model metadata, and disable tool wiring for Venice models that do not support function calling so default Venice setups no longer fail with `max_completion_tokens` or unsupported-tools 400s. Fixes #38168. Thanks @Sid-Qin, @powermaster888 and @vincentkoc.
 - Agents/session usage tracking: preserve accumulated usage metadata on embedded Pi runner error exits so failed turns still update session `totalTokens` from real usage instead of stale prior values. (#34275) thanks @RealKai42.
 - Slack/reaction thread context routing: carry Slack native DM channel IDs through inbound context and threading tool resolution so reaction targets resolve consistently for DM `To=user:*` sessions (including `toolContext.currentChannelId` fallback behavior). (from #34831; overlaps #34440, #34502, #34483, #32754) Thanks @dunamismax.
 - Subagents/announce completion scoping: scope nested direct-child completion aggregation to the current requester run window, harden frozen completion capture for deterministic descendant synthesis, and route completion announce delivery through parent-agent announce turns with provenance-aware internal events. (#35080) Thanks @tyler6204.
@ -101,6 +104,7 @@ Docs: https://docs.openclaw.ai
 - Gateway/HTTP tools invoke media compatibility: preserve raw media payload access for direct `/tools/invoke` clients by allowing media `nodes` invoke commands only in HTTP tool context, while keeping agent-context media invoke blocking to prevent base64 prompt bloat. (#34365) Thanks @obviyus.
 - Agents/Nodes media outputs: add dedicated `photos_latest` action handling, block media-returning `nodes invoke` commands, keep metadata-only `camera.list` invoke allowed, and normalize empty `photos_latest` results to a consistent response shape to prevent base64 context bloat. (#34332) Thanks @obviyus.
 - TUI/session-key canonicalization: normalize `openclaw tui --session` values to lowercase so uppercase session names no longer drop real-time streaming updates due to gateway/TUI key mismatches. (#33866, #34013) thanks @lynnzc.
+- iMessage/echo loop hardening: strip leaked assistant-internal scaffolding from outbound iMessage replies, drop reflected assistant-content messages before they re-enter inbound processing, extend echo-cache text retention for delayed reflections, and suppress repeated loop traffic before it amplifies into queue overflow. (#33295) Thanks @joelnishanth.
 - Outbound/send config threading: pass resolved SecretRef config through outbound adapters and helper send paths so send flows do not reload unresolved runtime config. (#33987) Thanks @joshavant.
 - Sessions/subagent attachments: remove `attachments[].content.maxLength` from `sessions_spawn` schema to avoid llama.cpp GBNF repetition overflow, and preflight UTF-8 byte size before buffer allocation while keeping runtime file-size enforcement unchanged. (#33648) Thanks @anisoptera.
 - Runtime/tool-state stability: recover from dangling Anthropic `tool_use` after compaction, serialize long-running Discord handler runs without blocking new inbound events, and prevent stale busy snapshots from suppressing stuck-channel recovery. (from #33630, #33583) Thanks @kevinWangSheng and @theotarr.
@ -121,6 +125,7 @@ Docs: https://docs.openclaw.ai
 - Security/auth labels: remove token and API-key snippets from user-facing auth status labels so `/status` and `/models` do not expose credential fragments. (#33262) thanks @cu1ch3n.
 - Auth/credential semantics: align profile eligibility + probe diagnostics with SecretRef/expiry rules and harden browser download atomic writes. (#33733) thanks @joshavant.
 - Security/audit denyCommands guidance: suggest likely exact node command IDs for unknown `gateway.nodes.denyCommands` entries so ineffective denylist entries are easier to correct. (#29713) thanks @liquidhorizon88-bot.
+- Agents/overload failover handling: classify overloaded provider failures separately from rate limits/status timeouts, add short overload backoff before retry/failover, record overloaded prompt/assistant failures as transient auth-profile cooldowns (with probeable same-provider fallback) instead of treating them like persistent auth/billing failures, and keep one-shot cron retry classification aligned so overloaded fallback summaries still count as transient retries.
 - Docs/security hardening guidance: document Docker `DOCKER-USER` + UFW policy and add cross-linking from Docker install docs for VPS/public-host setups. (#27613) thanks @dorukardahan.
 - Docs/security threat-model links: replace relative `.md` links with Mintlify-compatible root-relative routes in security docs to prevent broken internal navigation. (#27698) thanks @clawdoo.
 - Plugins/Update integrity drift: avoid false integrity drift prompts when updating npm-installed plugins from unpinned specs, while keeping drift checks for exact pinned versions. (#37179) Thanks @vincentkoc.
@ -200,14 +205,33 @@ Docs: https://docs.openclaw.ai
 - Agents/gateway config guidance: stop exposing `config.schema` through the agent `gateway` tool, remove prompt/docs guidance that told agents to call it, and keep agents on `config.get` plus `config.patch`/`config.apply` for config changes. (#7382) thanks @kakuteki.
 - Agents/failover: classify periodic provider limit exhaustion text (for example `Weekly/Monthly Limit Exhausted`) as `rate_limit` while keeping explicit `402 Payment Required` variants in billing, so failover continues without misclassifying billing-wrapped quota errors. (#33813) thanks @zhouhe-xydt.
 - Mattermost/interactive button callbacks: allow external callback base URLs and stop requiring loopback-origin requests so button clicks work when Mattermost reaches the gateway over Tailscale, LAN, or a reverse proxy. (#37543) thanks @mukhtharcm.
+- Gateway/chat.send route inheritance: keep explicit external delivery for channel-scoped sessions while preventing shared-main and other channel-agnostic webchat sessions from inheriting stale external routes, so Control UI replies stay on webchat without breaking selected channel-target sessions. (#34669) Thanks @vincentkoc.
 - Telegram/Discord media upload caps: make outbound uploads honor channel `mediaMaxMb` config, raise Telegram's default media cap to 100MB, and remove MIME fallback limits that kept some Telegram uploads at 16MB. Thanks @vincentkoc.
 - Skills/nano-banana-pro resolution override: respect explicit `--resolution` values during image editing and only auto-detect output size from input images when the flag is omitted. (#36880) Thanks @shuofengzhang and @vincentkoc.
 - Skills/openai-image-gen CLI validation: validate `--background` and `--style` inputs early, normalize supported values, and warn when those flags are ignored for incompatible models. (#36762) Thanks @shuofengzhang and @vincentkoc.
 - Skills/openai-image-gen output formats: validate `--output-format` values early, normalize aliases like `jpg -> jpeg`, and warn when the flag is ignored for incompatible models. (#36648) Thanks @shuofengzhang and @vincentkoc.
+- ACP/skill env isolation: strip skill-injected API keys from ACP harness child-process environments so tools like Codex CLI keep their own auth flow instead of inheriting billed provider keys from active skills. (#36316) Thanks @taw0002 and @vincentkoc.
 - WhatsApp media upload caps: make outbound media sends and auto-replies honor `channels.whatsapp.mediaMaxMb` with per-account overrides so inbound and outbound limits use the same channel config. Thanks @vincentkoc.
 - Windows/Plugin install: when OpenClaw runs on Windows via Bun and `npm-cli.js` is not colocated with the runtime binary, fall back to `npm.cmd`/`npx.cmd` through the existing `cmd.exe` wrapper so `openclaw plugins install` no longer fails with `spawn EINVAL`. (#38056) Thanks @0xlin2023.
 - Telegram/send retry classification: retry grammY `Network request ... failed after N attempts` envelopes in send flows without reclassifying plain `Network request ... failed!` wrappers as transient, restoring the intended retry path while keeping broad send-context message matching tight. (#38056) Thanks @0xlin2023.
- Gateway/probe route precedence: keep `/health`, `/healthz`, `/ready`, and `/readyz` reachable when the Control UI is mounted at `/`, so root-mounted SPA fallbacks no longer swallow machine probe routes while plugin-owned routes on those paths still keep precedence. (#18446) Thanks @vibecodooor and @vincentkoc.
+- Gateway/probes: keep `/health`, `/healthz`, `/ready`, and `/readyz` reachable when the Control UI is mounted at `/`, preserve plugin-owned route precedence on those paths, and make `/ready` and `/readyz` report channel-backed readiness with startup grace plus `503` on disconnected managed channels, while `/health` and `/healthz` stay shallow liveness probes. (#18446) Thanks @vibecodooor, @mahsumaktas, and @vincentkoc.
+- Feishu/media downloads: drop invalid timeout fields from SDK method calls now that client-level `httpTimeoutMs` applies to requests. (#38267) Thanks @ant1eicher and @thewilloftheshadow.
+- PI embedded runner/Feishu docs: propagate sender identity into embedded attempts so Feishu doc auto-grant restores requester access for embedded-runner executions. (#32915) thanks @cszhouwei.
+- Agents/usage normalization: normalize missing or partial assistant usage snapshots before compaction accounting so `openclaw agent --json` no longer crashes when provider payloads omit `totalTokens` or related usage fields. (#34977) thanks @sp-hk2ldn.
+- Venice/default model refresh: switch the built-in Venice default to `kimi-k2-5`, update onboarding aliasing, and refresh Venice provider docs/recommendations to match the current private and anonymized catalog. (from #12964) Fixes #20156. Thanks @sabrinaaquino and @vincentkoc.
+- Agents/skill API write pacing: add a global prompt guardrail that treats skill-driven external API writes as rate-limited by default, so runners prefer batched writes, avoid tight request loops, and respect `429`/`Retry-After`. Thanks @vincentkoc.
+- Google Chat/multi-account webhook auth fallback: when `channels.googlechat.accounts.default` carries shared webhook audience/path settings (for example after config normalization), inherit those defaults for named accounts while preserving top-level and per-account overrides, so inbound webhook verification no longer fails silently for named accounts missing duplicated audience fields. Fixes #38369.
+- Models/tool probing: raise the tool-capability probe budget from 32 to 256 tokens so reasoning models that spend tokens on thinking before returning a required tool call are less likely to be misclassified as not supporting tools. (#7521) Thanks @jakobdylanc.
+- Gateway/transient network classification: treat wrapped `...: fetch failed` transport messages as transient while avoiding broad matches like `Web fetch failed (404): ...`, preventing Discord reconnect wrappers from crashing the gateway without suppressing non-network tool failures. (#38530) Thanks @xinhuagu.
+- ACP/console silent reply suppression: filter ACP `NO_REPLY` lead fragments and silent-only finals before `openclaw agent` logging/delivery so console-backed ACP sessions no longer leak `NO`/`NO_REPLY` placeholders. (#38436) Thanks @ql-wade.
+- Feishu/reply delivery reliability: disable block streaming in Feishu reply options so plain-text auto-render replies are no longer silently dropped before final delivery. (#38258) Thanks @xinhuagu.
+- Agents/reply MEDIA delivery: normalize local assistant `MEDIA:` paths before block/final delivery, keep media dedupe aligned with message-tool sends, and contain malformed media normalization failures so generated files send reliably instead of falling back to empty responses. (#38572) Thanks @obviyus.
+- Sessions/bootstrap cache rollover invalidation: clear cached workspace bootstrap snapshots whenever an existing `sessionKey` rolls to a new `sessionId` across auto-reply, command, and isolated cron session resolvers, so `AGENTS.md`/`MEMORY.md`/`USER.md` updates are reloaded after daily, idle, or forced session resets instead of staying stale until gateway restart. (#38494) Thanks @LivingInDrm.
+- Gateway/Telegram polling health monitor: skip stale-socket restarts for Telegram long-polling channels and thread channel identity through shared health evaluation so polling connections are not restarted on the WebSocket stale-socket heuristic. (#38395) Thanks @ql-wade and @Takhoffman.
+- Daemon/systemd fresh-install probe: check for OpenClaw's managed user unit before running `systemctl --user is-enabled`, so first-time Linux installs no longer fail on generic missing-unit probe errors. (#38819) Thanks @adaHubble.
+- Gateway/Windows restart supervision: relaunch task-managed gateways through Scheduled Task with quoted helper-script command paths, distinguish restart-capable supervisors per platform, and stop orphaned Windows gateway children during self-restart. (#38825) Thanks @obviyus.
+- Telegram/native topic command routing: resolve forum-topic native commands through the same conversation route as inbound messages so topic `agentId` overrides and bound topic sessions target the active session instead of the default topic-parent session. (#38871) Thanks @obviyus.
+- Markdown/assistant image hardening: flatten remote markdown images to plain text across the Control UI, exported HTML, and shared Swift chat while keeping inline `data:image/...` markdown renderable, so model output no longer triggers automatic remote image fetches. (#38895) Thanks @obviyus.

 ## 2026.3.2

@ -234,6 +258,7 @@ Docs: https://docs.openclaw.ai
 - Plugin runtime/events: expose `runtime.events.onAgentEvent` and `runtime.events.onSessionTranscriptUpdate` for extension-side subscriptions, and isolate transcript-listener failures so one faulty listener cannot break the entire update fanout. (#16044) Thanks @scifantastic.
 - CLI/Banner taglines: add `cli.banner.taglineMode` (`random` | `default` | `off`) to control funny tagline behavior in startup output, with docs + FAQ guidance and regression tests for config override behavior.
 - Agents/compaction safeguard quality-audit rollout: keep summary quality audits disabled by default unless `agents.defaults.compaction.qualityGuard` is explicitly enabled, and add config plumbing for bounded retry control. (#25556) thanks @rodrigouroz.
+- Gateway/input_image MIME validation: sniff uploaded image bytes before MIME allowlist enforcement again so declared image types cannot mask concrete non-image payloads, while keeping HEIC/HEIF normalization behavior scoped to actual HEIC inputs. Thanks @vincentkoc.

 ### Breaking

@ -560,6 +585,7 @@ Docs: https://docs.openclaw.ai

 - Docs/Contributing: require before/after screenshots for UI or visual PRs in the pre-PR checklist. (#32206) Thanks @hydro13.
 - Models/OpenAI forward compat: add support for `openai/gpt-5.4`, `openai/gpt-5.4-pro`, and `openai-codex/gpt-5.4`, including direct OpenAI Responses `serviceTier` passthrough safeguards for valid values. (#36590) Thanks @dorukardahan.
+- Android/Play package ID: rename the Android app package to `ai.openclaw.app`, including matching benchmark and Android tooling references for Play publishing. (#38712) Thanks @obviyus.

 ### Fixes

@ -708,6 +734,7 @@ Docs: https://docs.openclaw.ai
 - Slack/Disabled channel startup: skip Slack monitor socket startup entirely when `channels.slack.enabled=false` (including configs that still contain valid tokens), preventing disabled accounts from opening websocket connections. (#30586) Thanks @liuxiaopai-ai.
 - Onboarding/Custom providers: use Azure OpenAI-specific verification auth/payload shape (`api-key`, deployment-path chat completions payload) when probing Azure endpoints so valid Azure custom-provider setup no longer fails preflight. (#29421) Thanks @kunalk16.
 - Feishu/Docx editing tools: add `feishu_doc` positional insert, table row/column operations, table-cell merge, and color-text updates; switch markdown write/append/insert to Descendant API insertion with large-document batching; and harden image uploads for data URI/base64/local-path inputs with strict validation and routing-safe upload metadata. (#29411) Thanks @Elarwei001.
+- Commands/Owner-only tools: treat identified direct-chat senders as owners when no owner allowlist is configured, while preserving internal `operator.admin` owner sessions. (#26331) thanks @widingmarcus-cyber

 ## 2026.2.26

@ -2878,6 +2905,7 @@ Docs: https://docs.openclaw.ai
 - BlueBubbles: resolve short message IDs safely and expose full IDs in templates. (#1387) Thanks @tyler6204.
 - Infra: preserve fetch helper methods when wrapping abort signals. (#1387)
 - macOS: default distribution packaging to universal binaries. (#1396) Thanks @JustYannicc.
+- Embedded runner: forward sender identity into attempt execution so Feishu doc auto-grant receives requester context again. (#32915) Thanks @cszhouwei.

 ## 2026.1.20

--- a/SECURITY.md
+++ b/SECURITY.md
@ -51,6 +51,7 @@ These are frequently reported but are typically closed with no code change:

 - Prompt-injection-only chains without a boundary bypass (prompt injection is out of scope).
 - Operator-intended local features (for example TUI local `!` shell) presented as remote injection.
+- Reports that treat explicit operator-control surfaces (for example `canvas.eval`, browser evaluate/script execution, or direct `node.invoke` execution primitives) as vulnerabilities without demonstrating an auth/policy/sandbox boundary bypass. These capabilities are intentional when enabled and are trusted-operator features, not standalone security bugs.
 - Authorized user-triggered local actions presented as privilege escalation. Example: an allowlisted/owner sender running `/export-session /absolute/path.html` to write on the host. In this trust model, authorized user actions are trusted host actions unless you demonstrate an auth/sandbox/boundary bypass.
 - Reports that only show a malicious plugin executing privileged actions after a trusted operator installs/enables it.
 - Reports that assume per-user multi-tenant authorization on a shared gateway host/config.
@ -119,6 +120,7 @@ Plugins/extensions are part of OpenClaw's trusted computing base for a gateway.
 - 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 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).
 - Any report whose only claim is that an operator-enabled `dangerous*`/`dangerously*` config option weakens defaults (these are explicit break-glass tradeoffs by design)
 - Reports that depend on trusted operator-supplied configuration values to trigger availability impact (for example custom regex patterns). These may still be fixed as defense-in-depth hardening, but are not security-boundary bypasses.
--- a/appcast.xml
+++ b/appcast.xml
@ -219,7 +219,7 @@
 </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.3.2/OpenClaw-2026.3.2.zip" length="23181513" type="application/octet-stream" sparkle:edSignature="THMgkcoMgz2vv5zse3Po3K7l3Or2RhBKurXZIi8iYVXN76yJy1YXAY6kXi6ovD+dbYn68JKYDIKA1Ya78bO7BQ=="/>
+            <enclosure url="https://github.com/openclaw/openclaw/releases/download/v2026.3.2/OpenClaw-2026.3.2.zip" length="23181513" type="application/octet-stream" sparkle:edSignature="THMgkcoMgz2vv5zse3Po3K7l3Or2RhBKurXZIi8iYVXN76yJy1YXAY6kXi6ovD+dbYn68JKYDIKA1Ya78bO7BQ=="/> <!-- pragma: allowlist secret -->
        </item>
        <item>
            <title>2026.3.1</title>
@ -357,7 +357,7 @@
 </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.3.1/OpenClaw-2026.3.1.zip" length="12804155" type="application/octet-stream" sparkle:edSignature="TF1otD4Vk3pG0iViX7mvix5DQEgAsk4JkSFvH7opjf9aawV16f29SUa2wRmiCFU6HEgyNgnGI/078O+A27eXCA=="/>
+            <enclosure url="https://github.com/openclaw/openclaw/releases/download/v2026.3.1/OpenClaw-2026.3.1.zip" length="12804155" type="application/octet-stream" sparkle:edSignature="TF1otD4Vk3pG0iViX7mvix5DQEgAsk4JkSFvH7opjf9aawV16f29SUa2wRmiCFU6HEgyNgnGI/078O+A27eXCA=="/> <!-- pragma: allowlist secret -->
        </item>
    </channel>
-</rss>
+</rss>
--- a/apps/android/app/build.gradle.kts
+++ b/apps/android/app/build.gradle.kts
@ -1,5 +1,35 @@
 import com.android.build.api.variant.impl.VariantOutputImpl

+val androidStoreFile = providers.gradleProperty("OPENCLAW_ANDROID_STORE_FILE").orNull?.takeIf { it.isNotBlank() }
+val androidStorePassword = providers.gradleProperty("OPENCLAW_ANDROID_STORE_PASSWORD").orNull?.takeIf { it.isNotBlank() }
+val androidKeyAlias = providers.gradleProperty("OPENCLAW_ANDROID_KEY_ALIAS").orNull?.takeIf { it.isNotBlank() }
+val androidKeyPassword = providers.gradleProperty("OPENCLAW_ANDROID_KEY_PASSWORD").orNull?.takeIf { it.isNotBlank() }
+val resolvedAndroidStoreFile =
+    androidStoreFile?.let { storeFilePath ->
+        if (storeFilePath.startsWith("~/")) {
+            "${System.getProperty("user.home")}/${storeFilePath.removePrefix("~/")}"
+        } else {
+            storeFilePath
+        }
+    }
+
+val hasAndroidReleaseSigning =
+    listOf(resolvedAndroidStoreFile, androidStorePassword, androidKeyAlias, androidKeyPassword).all { it != null }
+
+val wantsAndroidReleaseBuild =
+    gradle.startParameter.taskNames.any { taskName ->
+        taskName.contains("Release", ignoreCase = true) ||
+            Regex("""(^|:)(bundle|assemble)$""").containsMatchIn(taskName)
+    }
+
+if (wantsAndroidReleaseBuild && !hasAndroidReleaseSigning) {
+    error(
+        "Missing Android release signing properties. Set OPENCLAW_ANDROID_STORE_FILE, " +
+            "OPENCLAW_ANDROID_STORE_PASSWORD, OPENCLAW_ANDROID_KEY_ALIAS, and " +
+            "OPENCLAW_ANDROID_KEY_PASSWORD in ~/.gradle/gradle.properties.",
+    )
+}
+
 plugins {
    id("com.android.application")
    id("org.jlleitschuh.gradle.ktlint")
@ -8,9 +38,21 @@ plugins {
 }

 android {
-    namespace = "ai.openclaw.android"
+    namespace = "ai.openclaw.app"
    compileSdk = 36

+    // Release signing is local-only; keep the keystore path and passwords out of the repo.
+    signingConfigs {
+        if (hasAndroidReleaseSigning) {
+            create("release") {
+                storeFile = project.file(checkNotNull(resolvedAndroidStoreFile))
+                storePassword = checkNotNull(androidStorePassword)
+                keyAlias = checkNotNull(androidKeyAlias)
+                keyPassword = checkNotNull(androidKeyPassword)
+            }
+        }
+    }
+
    sourceSets {
        getByName("main") {
            assets.directories.add("../../shared/OpenClawKit/Sources/OpenClawKit/Resources")
@ -18,11 +60,11 @@ android {
    }

    defaultConfig {
-        applicationId = "ai.openclaw.android"
+        applicationId = "ai.openclaw.app"
        minSdk = 31
        targetSdk = 36
-        versionCode = 202603010
-        versionName = "2026.3.2"
+        versionCode = 202603070
+        versionName = "2026.3.7"
        ndk {
            // Support all major ABIs — native libs are tiny (~47 KB per ABI)
            abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@ -31,6 +73,9 @@ android {

    buildTypes {
        release {
+            if (hasAndroidReleaseSigning) {
+                signingConfig = signingConfigs.getByName("release")
+            }
            isMinifyEnabled = true
            isShrinkResources = true
            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
--- a/apps/android/app/proguard-rules.pro
+++ b/apps/android/app/proguard-rules.pro
@ -1,5 +1,5 @@
 # ── App classes ───────────────────────────────────────────────────
-keep class ai.openclaw.android.** { *; }
+-keep class ai.openclaw.app.** { *; }

 # ── Bouncy Castle ─────────────────────────────────────────────────
 -keep class org.bouncycastle.** { *; }
--- a/apps/android/app/src/main/java/ai/openclaw/android/CameraHudState.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/CameraHudState.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 enum class CameraHudKind {
  Photo,
--- a/apps/android/app/src/main/java/ai/openclaw/android/DeviceNames.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/DeviceNames.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.content.Context
 import android.os.Build
--- a/apps/android/app/src/main/java/ai/openclaw/android/InstallResultReceiver.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/InstallResultReceiver.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.content.BroadcastReceiver
 import android.content.Context
--- a/apps/android/app/src/main/java/ai/openclaw/android/LocationMode.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/LocationMode.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 enum class LocationMode(val rawValue: String) {
  Off("off"),
--- a/apps/android/app/src/main/java/ai/openclaw/android/MainActivity.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/MainActivity.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.os.Bundle
 import android.view.WindowManager
@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import ai.openclaw.android.ui.RootScreen
-import ai.openclaw.android.ui.OpenClawTheme
+import ai.openclaw.app.ui.RootScreen
+import ai.openclaw.app.ui.OpenClawTheme
 import kotlinx.coroutines.launch

 class MainActivity : ComponentActivity() {
--- a/apps/android/app/src/main/java/ai/openclaw/android/MainViewModel.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/MainViewModel.kt
@ -1,14 +1,14 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
-import ai.openclaw.android.gateway.GatewayEndpoint
-import ai.openclaw.android.chat.OutgoingAttachment
-import ai.openclaw.android.node.CameraCaptureManager
-import ai.openclaw.android.node.CanvasController
-import ai.openclaw.android.node.ScreenRecordManager
-import ai.openclaw.android.node.SmsManager
-import ai.openclaw.android.voice.VoiceConversationEntry
+import ai.openclaw.app.gateway.GatewayEndpoint
+import ai.openclaw.app.chat.OutgoingAttachment
+import ai.openclaw.app.node.CameraCaptureManager
+import ai.openclaw.app.node.CanvasController
+import ai.openclaw.app.node.ScreenRecordManager
+import ai.openclaw.app.node.SmsManager
+import ai.openclaw.app.voice.VoiceConversationEntry
 import kotlinx.coroutines.flow.StateFlow

 class MainViewModel(app: Application) : AndroidViewModel(app) {
--- a/apps/android/app/src/main/java/ai/openclaw/android/NodeApp.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/NodeApp.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.app.Application
 import android.os.StrictMode
--- a/apps/android/app/src/main/java/ai/openclaw/android/NodeForegroundService.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/NodeForegroundService.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.app.Notification
 import android.app.NotificationChannel
@ -163,7 +163,7 @@ class NodeForegroundService : Service() {
    private const val CHANNEL_ID = "connection"
    private const val NOTIFICATION_ID = 1

-    private const val ACTION_STOP = "ai.openclaw.android.action.STOP"
+    private const val ACTION_STOP = "ai.openclaw.app.action.STOP"

    fun start(context: Context) {
      val intent = Intent(context, NodeForegroundService::class.java)
--- a/apps/android/app/src/main/java/ai/openclaw/android/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/NodeRuntime.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.Manifest
 import android.content.Context
@ -6,22 +6,22 @@ import android.content.pm.PackageManager
 import android.os.SystemClock
 import android.util.Log
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.chat.ChatController
-import ai.openclaw.android.chat.ChatMessage
-import ai.openclaw.android.chat.ChatPendingToolCall
-import ai.openclaw.android.chat.ChatSessionEntry
-import ai.openclaw.android.chat.OutgoingAttachment
-import ai.openclaw.android.gateway.DeviceAuthStore
-import ai.openclaw.android.gateway.DeviceIdentityStore
-import ai.openclaw.android.gateway.GatewayDiscovery
-import ai.openclaw.android.gateway.GatewayEndpoint
-import ai.openclaw.android.gateway.GatewaySession
-import ai.openclaw.android.gateway.probeGatewayTlsFingerprint
-import ai.openclaw.android.node.*
-import ai.openclaw.android.protocol.OpenClawCanvasA2UIAction
-import ai.openclaw.android.voice.MicCaptureManager
-import ai.openclaw.android.voice.TalkModeManager
-import ai.openclaw.android.voice.VoiceConversationEntry
+import ai.openclaw.app.chat.ChatController
+import ai.openclaw.app.chat.ChatMessage
+import ai.openclaw.app.chat.ChatPendingToolCall
+import ai.openclaw.app.chat.ChatSessionEntry
+import ai.openclaw.app.chat.OutgoingAttachment
+import ai.openclaw.app.gateway.DeviceAuthStore
+import ai.openclaw.app.gateway.DeviceIdentityStore
+import ai.openclaw.app.gateway.GatewayDiscovery
+import ai.openclaw.app.gateway.GatewayEndpoint
+import ai.openclaw.app.gateway.GatewaySession
+import ai.openclaw.app.gateway.probeGatewayTlsFingerprint
+import ai.openclaw.app.node.*
+import ai.openclaw.app.protocol.OpenClawCanvasA2UIAction
+import ai.openclaw.app.voice.MicCaptureManager
+import ai.openclaw.app.voice.TalkModeManager
+import ai.openclaw.app.voice.VoiceConversationEntry
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
--- a/apps/android/app/src/main/java/ai/openclaw/android/PermissionRequester.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/PermissionRequester.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.content.pm.PackageManager
 import android.content.Intent
--- a/apps/android/app/src/main/java/ai/openclaw/android/ScreenCaptureRequester.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ScreenCaptureRequester.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.app.Activity
 import android.content.Context
--- a/apps/android/app/src/main/java/ai/openclaw/android/SecurePrefs.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/SecurePrefs.kt
@ -1,6 +1,6 @@
@file:Suppress("DEPRECATION")

-package ai.openclaw.android
+package ai.openclaw.app

 import android.content.Context
 import android.content.SharedPreferences
--- a/apps/android/app/src/main/java/ai/openclaw/android/SessionKey.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/SessionKey.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 internal fun normalizeMainKey(raw: String?): String {
  val trimmed = raw?.trim()
--- a/apps/android/app/src/main/java/ai/openclaw/android/VoiceWakeMode.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/VoiceWakeMode.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 enum class VoiceWakeMode(val rawValue: String) {
  Off("off"),
--- a/apps/android/app/src/main/java/ai/openclaw/android/WakeWords.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/WakeWords.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 object WakeWords {
  const val maxWords: Int = 32
--- a/apps/android/app/src/main/java/ai/openclaw/android/chat/ChatController.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/chat/ChatController.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.chat
+package ai.openclaw.app.chat

-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.CoroutineScope
--- a/apps/android/app/src/main/java/ai/openclaw/android/chat/ChatModels.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/chat/ChatModels.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.chat
+package ai.openclaw.app.chat

 data class ChatMessage(
  val id: String,
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/BonjourEscapes.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/BonjourEscapes.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 object BonjourEscapes {
  fun decode(input: String): String {
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/DeviceAuthPayload.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/DeviceAuthPayload.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 internal object DeviceAuthPayload {
  fun buildV3(
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/DeviceAuthStore.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/DeviceAuthStore.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

-import ai.openclaw.android.SecurePrefs
+import ai.openclaw.app.SecurePrefs

 interface DeviceAuthTokenStore {
  fun loadToken(deviceId: String, role: String): String?
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/DeviceIdentityStore.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/DeviceIdentityStore.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import android.content.Context
 import android.util.Base64
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayDiscovery.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayDiscovery.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import android.content.Context
 import android.net.ConnectivityManager
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayEndpoint.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayEndpoint.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 data class GatewayEndpoint(
  val stableId: String,
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayProtocol.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayProtocol.kt
@ -1,3 +1,3 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 const val GATEWAY_PROTOCOL_VERSION = 3
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewaySession.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewaySession.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import android.util.Log
 import java.util.Locale
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayTls.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/GatewayTls.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import android.annotation.SuppressLint
 import kotlinx.coroutines.Dispatchers
--- a/apps/android/app/src/main/java/ai/openclaw/android/gateway/InvokeErrorParser.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/gateway/InvokeErrorParser.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 data class ParsedInvokeError(
  val code: String,
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/A2UIHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/A2UIHandler.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.coroutines.delay
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/AppUpdateHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/AppUpdateHandler.kt
@ -1,12 +1,12 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import ai.openclaw.android.InstallResultReceiver
-import ai.openclaw.android.MainActivity
-import ai.openclaw.android.gateway.GatewayEndpoint
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.InstallResultReceiver
+import ai.openclaw.app.MainActivity
+import ai.openclaw.app.gateway.GatewayEndpoint
+import ai.openclaw.app.gateway.GatewaySession
 import java.io.File
 import java.net.URI
 import java.security.MessageDigest
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/CalendarHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/CalendarHandler.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.ContentResolver
@ -7,7 +7,7 @@ import android.content.ContentValues
 import android.content.Context
 import android.provider.CalendarContract
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import java.util.TimeZone
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/CameraCaptureManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/CameraCaptureManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.annotation.SuppressLint
@ -28,7 +28,7 @@ import androidx.camera.video.VideoRecordEvent
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.core.graphics.scale
-import ai.openclaw.android.PermissionRequester
+import ai.openclaw.app.PermissionRequester
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeout
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/CameraHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/CameraHandler.kt
@ -1,9 +1,9 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.content.Context
-import ai.openclaw.android.CameraHudKind
-import ai.openclaw.android.BuildConfig
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.CameraHudKind
+import ai.openclaw.app.BuildConfig
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.withContext
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/CanvasController.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/CanvasController.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.graphics.Bitmap
 import android.graphics.Canvas
@ -20,7 +20,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
-import ai.openclaw.android.BuildConfig
+import ai.openclaw.app.BuildConfig
 import kotlin.coroutines.resume

 class CanvasController {
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/ConnectionManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/ConnectionManager.kt
@ -1,14 +1,14 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.os.Build
-import ai.openclaw.android.BuildConfig
-import ai.openclaw.android.SecurePrefs
-import ai.openclaw.android.gateway.GatewayClientInfo
-import ai.openclaw.android.gateway.GatewayConnectOptions
-import ai.openclaw.android.gateway.GatewayEndpoint
-import ai.openclaw.android.gateway.GatewayTlsParams
-import ai.openclaw.android.LocationMode
-import ai.openclaw.android.VoiceWakeMode
+import ai.openclaw.app.BuildConfig
+import ai.openclaw.app.SecurePrefs
+import ai.openclaw.app.gateway.GatewayClientInfo
+import ai.openclaw.app.gateway.GatewayConnectOptions
+import ai.openclaw.app.gateway.GatewayEndpoint
+import ai.openclaw.app.gateway.GatewayTlsParams
+import ai.openclaw.app.LocationMode
+import ai.openclaw.app.VoiceWakeMode

 class ConnectionManager(
  private val prefs: SecurePrefs,
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/ContactsHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/ContactsHandler.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.ContentProviderOperation
@ -7,7 +7,7 @@ import android.content.ContentValues
 import android.content.Context
 import android.provider.ContactsContract
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/DebugHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/DebugHandler.kt
@ -1,9 +1,9 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.content.Context
-import ai.openclaw.android.BuildConfig
-import ai.openclaw.android.gateway.DeviceIdentityStore
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.BuildConfig
+import ai.openclaw.app.gateway.DeviceIdentityStore
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.serialization.json.JsonPrimitive

 class DebugHandler(
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/DeviceHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/DeviceHandler.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.app.ActivityManager
@ -15,8 +15,8 @@ import android.os.PowerManager
 import android.os.StatFs
 import android.os.SystemClock
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.BuildConfig
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.BuildConfig
+import ai.openclaw.app.gateway.GatewaySession
 import java.util.Locale
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonArray
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/DeviceNotificationListenerService.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/DeviceNotificationListenerService.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.app.Notification
 import android.app.NotificationManager
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/GatewayEventHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/GatewayEventHandler.kt
@ -1,7 +1,7 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.SecurePrefs
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.SecurePrefs
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/InvokeCommandRegistry.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/InvokeCommandRegistry.kt
@ -1,19 +1,19 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.protocol.OpenClawCalendarCommand
-import ai.openclaw.android.protocol.OpenClawCanvasA2UICommand
-import ai.openclaw.android.protocol.OpenClawCanvasCommand
-import ai.openclaw.android.protocol.OpenClawCameraCommand
-import ai.openclaw.android.protocol.OpenClawCapability
-import ai.openclaw.android.protocol.OpenClawContactsCommand
-import ai.openclaw.android.protocol.OpenClawDeviceCommand
-import ai.openclaw.android.protocol.OpenClawLocationCommand
-import ai.openclaw.android.protocol.OpenClawMotionCommand
-import ai.openclaw.android.protocol.OpenClawNotificationsCommand
-import ai.openclaw.android.protocol.OpenClawPhotosCommand
-import ai.openclaw.android.protocol.OpenClawScreenCommand
-import ai.openclaw.android.protocol.OpenClawSmsCommand
-import ai.openclaw.android.protocol.OpenClawSystemCommand
+import ai.openclaw.app.protocol.OpenClawCalendarCommand
+import ai.openclaw.app.protocol.OpenClawCanvasA2UICommand
+import ai.openclaw.app.protocol.OpenClawCanvasCommand
+import ai.openclaw.app.protocol.OpenClawCameraCommand
+import ai.openclaw.app.protocol.OpenClawCapability
+import ai.openclaw.app.protocol.OpenClawContactsCommand
+import ai.openclaw.app.protocol.OpenClawDeviceCommand
+import ai.openclaw.app.protocol.OpenClawLocationCommand
+import ai.openclaw.app.protocol.OpenClawMotionCommand
+import ai.openclaw.app.protocol.OpenClawNotificationsCommand
+import ai.openclaw.app.protocol.OpenClawPhotosCommand
+import ai.openclaw.app.protocol.OpenClawScreenCommand
+import ai.openclaw.app.protocol.OpenClawSmsCommand
+import ai.openclaw.app.protocol.OpenClawSystemCommand

 data class NodeRuntimeFlags(
  val cameraEnabled: Boolean,
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/InvokeDispatcher.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/InvokeDispatcher.kt
@ -1,18 +1,18 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.gateway.GatewaySession
-import ai.openclaw.android.protocol.OpenClawCalendarCommand
-import ai.openclaw.android.protocol.OpenClawCanvasA2UICommand
-import ai.openclaw.android.protocol.OpenClawCanvasCommand
-import ai.openclaw.android.protocol.OpenClawCameraCommand
-import ai.openclaw.android.protocol.OpenClawContactsCommand
-import ai.openclaw.android.protocol.OpenClawDeviceCommand
-import ai.openclaw.android.protocol.OpenClawLocationCommand
-import ai.openclaw.android.protocol.OpenClawMotionCommand
-import ai.openclaw.android.protocol.OpenClawNotificationsCommand
-import ai.openclaw.android.protocol.OpenClawScreenCommand
-import ai.openclaw.android.protocol.OpenClawSmsCommand
-import ai.openclaw.android.protocol.OpenClawSystemCommand
+import ai.openclaw.app.gateway.GatewaySession
+import ai.openclaw.app.protocol.OpenClawCalendarCommand
+import ai.openclaw.app.protocol.OpenClawCanvasA2UICommand
+import ai.openclaw.app.protocol.OpenClawCanvasCommand
+import ai.openclaw.app.protocol.OpenClawCameraCommand
+import ai.openclaw.app.protocol.OpenClawContactsCommand
+import ai.openclaw.app.protocol.OpenClawDeviceCommand
+import ai.openclaw.app.protocol.OpenClawLocationCommand
+import ai.openclaw.app.protocol.OpenClawMotionCommand
+import ai.openclaw.app.protocol.OpenClawNotificationsCommand
+import ai.openclaw.app.protocol.OpenClawScreenCommand
+import ai.openclaw.app.protocol.OpenClawSmsCommand
+import ai.openclaw.app.protocol.OpenClawSystemCommand

 class InvokeDispatcher(
  private val canvas: CanvasController,
@ -145,7 +145,7 @@ class InvokeDispatcher(
      OpenClawSystemCommand.Notify.rawValue -> systemHandler.handleSystemNotify(paramsJson)

      // Photos command
-      ai.openclaw.android.protocol.OpenClawPhotosCommand.Latest.rawValue -> photosHandler.handlePhotosLatest(
+      ai.openclaw.app.protocol.OpenClawPhotosCommand.Latest.rawValue -> photosHandler.handlePhotosLatest(
        paramsJson,
      )

--- a/apps/android/app/src/main/java/ai/openclaw/android/node/JpegSizeLimiter.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/JpegSizeLimiter.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import kotlin.math.max
 import kotlin.math.min
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/LocationCaptureManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/LocationCaptureManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.Context
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/LocationHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/LocationHandler.kt
@ -1,12 +1,12 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.Context
 import android.content.pm.PackageManager
 import android.location.LocationManager
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.LocationMode
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.LocationMode
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/MotionHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/MotionHandler.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.Context
@ -8,7 +8,7 @@ import android.hardware.SensorEventListener
 import android.hardware.SensorManager
 import android.os.SystemClock
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import java.time.Instant
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/NodeUtils.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/NodeUtils.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.gateway.parseInvokeErrorFromThrowable
+import ai.openclaw.app.gateway.parseInvokeErrorFromThrowable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonNull
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/NotificationsHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/NotificationsHandler.kt
@ -1,7 +1,7 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.content.Context
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/PhotosHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/PhotosHandler.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.ContentResolver
@ -12,7 +12,7 @@ import android.os.Bundle
 import android.provider.MediaStore
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.scale
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import java.io.ByteArrayOutputStream
 import java.time.Instant
 import kotlin.math.max
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/ScreenHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/ScreenHandler.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession

 class ScreenHandler(
  private val screenRecorder: ScreenRecordManager,
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/ScreenRecordManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/ScreenRecordManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.content.Context
 import android.hardware.display.DisplayManager
@ -6,7 +6,7 @@ import android.media.MediaRecorder
 import android.media.projection.MediaProjectionManager
 import android.os.Build
 import android.util.Base64
-import ai.openclaw.android.ScreenCaptureRequester
+import ai.openclaw.app.ScreenCaptureRequester
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
@ -18,13 +18,13 @@ class ScreenRecordManager(private val context: Context) {
  data class Payload(val payloadJson: String)

  @Volatile private var screenCaptureRequester: ScreenCaptureRequester? = null
-  @Volatile private var permissionRequester: ai.openclaw.android.PermissionRequester? = null
+  @Volatile private var permissionRequester: ai.openclaw.app.PermissionRequester? = null

  fun attachScreenCaptureRequester(requester: ScreenCaptureRequester) {
    screenCaptureRequester = requester
  }

-  fun attachPermissionRequester(requester: ai.openclaw.android.PermissionRequester) {
+  fun attachPermissionRequester(requester: ai.openclaw.app.PermissionRequester) {
    permissionRequester = requester
  }

--- a/apps/android/app/src/main/java/ai/openclaw/android/node/SmsHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/SmsHandler.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession

 class SmsHandler(
  private val sms: SmsManager,
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/SmsManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/SmsManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.content.Context
@ -11,7 +11,7 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.encodeToString
-import ai.openclaw.android.PermissionRequester
+import ai.openclaw.app.PermissionRequester

 /**
 * Sends SMS messages via the Android SMS API.
--- a/apps/android/app/src/main/java/ai/openclaw/android/node/SystemHandler.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/node/SystemHandler.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.node
+package ai.openclaw.app.node

 import android.Manifest
 import android.app.NotificationChannel
@ -9,7 +9,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.gateway.GatewaySession
+import ai.openclaw.app.gateway.GatewaySession
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
--- a/apps/android/app/src/main/java/ai/openclaw/android/protocol/OpenClawCanvasA2UIAction.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/protocol/OpenClawCanvasA2UIAction.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.protocol
+package ai.openclaw.app.protocol

 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
--- a/apps/android/app/src/main/java/ai/openclaw/android/protocol/OpenClawProtocolConstants.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/protocol/OpenClawProtocolConstants.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.protocol
+package ai.openclaw.app.protocol

 enum class OpenClawCapability(val rawValue: String) {
  Canvas("canvas"),
--- a/apps/android/app/src/main/java/ai/openclaw/android/tools/ToolDisplay.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/tools/ToolDisplay.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.tools
+package ai.openclaw.app.tools

 import android.content.Context
 import kotlinx.serialization.Serializable
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/CameraHudOverlay.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/CameraHudOverlay.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/CanvasScreen.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/CanvasScreen.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import android.annotation.SuppressLint
 import android.util.Log
@ -21,7 +21,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebViewFeature
-import ai.openclaw.android.MainViewModel
+import ai.openclaw.app.MainViewModel

@SuppressLint("SetJavaScriptEnabled")
@Composable
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/ChatSheet.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/ChatSheet.kt
@ -1,8 +1,8 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.runtime.Composable
-import ai.openclaw.android.MainViewModel
-import ai.openclaw.android.ui.chat.ChatSheetContent
+import ai.openclaw.app.MainViewModel
+import ai.openclaw.app.ui.chat.ChatSheetContent

@Composable
 fun ChatSheet(viewModel: MainViewModel) {
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/ConnectTabScreen.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/ConnectTabScreen.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.BorderStroke
@ -46,7 +46,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
-import ai.openclaw.android.MainViewModel
+import ai.openclaw.app.MainViewModel

 private enum class ConnectInputMode {
  SetupCode,
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/GatewayConfigResolver.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/GatewayConfigResolver.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.core.net.toUri
 import java.util.Base64
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/MobileUiTokens.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/MobileUiTokens.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
@ -7,7 +7,7 @@ import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import ai.openclaw.android.R
+import ai.openclaw.app.R

 internal val mobileBackgroundGradient =
  Brush.verticalGradient(
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/OnboardingFlow.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/OnboardingFlow.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import android.Manifest
 import android.content.Context
@ -84,10 +84,10 @@ import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import ai.openclaw.android.LocationMode
-import ai.openclaw.android.MainViewModel
-import ai.openclaw.android.R
-import ai.openclaw.android.node.DeviceNotificationListenerService
+import ai.openclaw.app.LocationMode
+import ai.openclaw.app.MainViewModel
+import ai.openclaw.app.R
+import ai.openclaw.app.node.DeviceNotificationListenerService
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions

--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/OpenClawTheme.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/OpenClawTheme.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/PostOnboardingTabs.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/PostOnboardingTabs.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.foundation.background
 import androidx.compose.foundation.BorderStroke
@ -44,7 +44,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import ai.openclaw.android.MainViewModel
+import ai.openclaw.app.MainViewModel

 private enum class HomeTab(
  val label: String,
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/RootScreen.kt
@ -1,11 +1,11 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import ai.openclaw.android.MainViewModel
+import ai.openclaw.app.MainViewModel

@Composable
 fun RootScreen(viewModel: MainViewModel) {
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/SettingsSheet.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/SettingsSheet.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import android.Manifest
 import android.content.Context
@ -66,10 +66,10 @@ import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import ai.openclaw.android.BuildConfig
-import ai.openclaw.android.LocationMode
-import ai.openclaw.android.MainViewModel
-import ai.openclaw.android.node.DeviceNotificationListenerService
+import ai.openclaw.app.BuildConfig
+import ai.openclaw.app.LocationMode
+import ai.openclaw.app.MainViewModel
+import ai.openclaw.app.node.DeviceNotificationListenerService

@Composable
 fun SettingsSheet(viewModel: MainViewModel) {
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/TalkOrbOverlay.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/TalkOrbOverlay.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.RepeatMode
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/VoiceTabScreen.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/VoiceTabScreen.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui
+package ai.openclaw.app.ui

 import android.Manifest
 import android.app.Activity
@ -66,9 +66,9 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import ai.openclaw.android.MainViewModel
-import ai.openclaw.android.voice.VoiceConversationEntry
-import ai.openclaw.android.voice.VoiceConversationRole
+import ai.openclaw.app.MainViewModel
+import ai.openclaw.app.voice.VoiceConversationEntry
+import ai.openclaw.app.voice.VoiceConversationRole
 import kotlin.math.max

@Composable
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/Base64ImageState.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/Base64ImageState.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

 import android.graphics.BitmapFactory
 import android.util.Base64
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatComposer.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatComposer.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.horizontalScroll
@ -46,17 +46,17 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ai.openclaw.android.ui.mobileAccent
-import ai.openclaw.android.ui.mobileAccentSoft
-import ai.openclaw.android.ui.mobileBorder
-import ai.openclaw.android.ui.mobileBorderStrong
-import ai.openclaw.android.ui.mobileCallout
-import ai.openclaw.android.ui.mobileCaption1
-import ai.openclaw.android.ui.mobileHeadline
-import ai.openclaw.android.ui.mobileSurface
-import ai.openclaw.android.ui.mobileText
-import ai.openclaw.android.ui.mobileTextSecondary
-import ai.openclaw.android.ui.mobileTextTertiary
+import ai.openclaw.app.ui.mobileAccent
+import ai.openclaw.app.ui.mobileAccentSoft
+import ai.openclaw.app.ui.mobileBorder
+import ai.openclaw.app.ui.mobileBorderStrong
+import ai.openclaw.app.ui.mobileCallout
+import ai.openclaw.app.ui.mobileCaption1
+import ai.openclaw.app.ui.mobileHeadline
+import ai.openclaw.app.ui.mobileSurface
+import ai.openclaw.app.ui.mobileText
+import ai.openclaw.app.ui.mobileTextSecondary
+import ai.openclaw.app.ui.mobileTextTertiary

@Composable
 fun ChatComposer(
@ -148,7 +148,7 @@ fun ChatComposer(
      Text(
        text = "Gateway is offline. Connect first in the Connect tab.",
        style = mobileCallout,
-        color = ai.openclaw.android.ui.mobileWarning,
+        color = ai.openclaw.app.ui.mobileWarning,
      )
    }

@ -346,7 +346,7 @@ private fun chatTextFieldColors() =
@Composable
 private fun mobileBodyStyle() =
  MaterialTheme.typography.bodyMedium.copy(
-    fontFamily = ai.openclaw.android.ui.mobileFontFamily,
+    fontFamily = ai.openclaw.app.ui.mobileFontFamily,
    fontWeight = FontWeight.Medium,
    fontSize = 15.sp,
    lineHeight = 22.sp,
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatMarkdown.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatMarkdown.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@ -34,12 +34,12 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ai.openclaw.android.ui.mobileAccent
-import ai.openclaw.android.ui.mobileCallout
-import ai.openclaw.android.ui.mobileCaption1
-import ai.openclaw.android.ui.mobileCodeBg
-import ai.openclaw.android.ui.mobileCodeText
-import ai.openclaw.android.ui.mobileTextSecondary
+import ai.openclaw.app.ui.mobileAccent
+import ai.openclaw.app.ui.mobileCallout
+import ai.openclaw.app.ui.mobileCaption1
+import ai.openclaw.app.ui.mobileCodeBg
+import ai.openclaw.app.ui.mobileCodeText
+import ai.openclaw.app.ui.mobileTextSecondary
 import org.commonmark.Extension
 import org.commonmark.ext.autolink.AutolinkExtension
 import org.commonmark.ext.gfm.strikethrough.Strikethrough
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatMessageListCard.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatMessageListCard.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@ -15,13 +15,13 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import ai.openclaw.android.chat.ChatMessage
-import ai.openclaw.android.chat.ChatPendingToolCall
-import ai.openclaw.android.ui.mobileBorder
-import ai.openclaw.android.ui.mobileCallout
-import ai.openclaw.android.ui.mobileHeadline
-import ai.openclaw.android.ui.mobileText
-import ai.openclaw.android.ui.mobileTextSecondary
+import ai.openclaw.app.chat.ChatMessage
+import ai.openclaw.app.chat.ChatPendingToolCall
+import ai.openclaw.app.ui.mobileBorder
+import ai.openclaw.app.ui.mobileCallout
+import ai.openclaw.app.ui.mobileHeadline
+import ai.openclaw.app.ui.mobileText
+import ai.openclaw.app.ui.mobileTextSecondary

@Composable
 fun ChatMessageListCard(
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatMessageViews.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatMessageViews.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@ -25,24 +25,24 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ai.openclaw.android.chat.ChatMessage
-import ai.openclaw.android.chat.ChatMessageContent
-import ai.openclaw.android.chat.ChatPendingToolCall
-import ai.openclaw.android.tools.ToolDisplayRegistry
-import ai.openclaw.android.ui.mobileAccent
-import ai.openclaw.android.ui.mobileAccentSoft
-import ai.openclaw.android.ui.mobileBorder
-import ai.openclaw.android.ui.mobileBorderStrong
-import ai.openclaw.android.ui.mobileCallout
-import ai.openclaw.android.ui.mobileCaption1
-import ai.openclaw.android.ui.mobileCaption2
-import ai.openclaw.android.ui.mobileCodeBg
-import ai.openclaw.android.ui.mobileCodeText
-import ai.openclaw.android.ui.mobileHeadline
-import ai.openclaw.android.ui.mobileText
-import ai.openclaw.android.ui.mobileTextSecondary
-import ai.openclaw.android.ui.mobileWarning
-import ai.openclaw.android.ui.mobileWarningSoft
+import ai.openclaw.app.chat.ChatMessage
+import ai.openclaw.app.chat.ChatMessageContent
+import ai.openclaw.app.chat.ChatPendingToolCall
+import ai.openclaw.app.tools.ToolDisplayRegistry
+import ai.openclaw.app.ui.mobileAccent
+import ai.openclaw.app.ui.mobileAccentSoft
+import ai.openclaw.app.ui.mobileBorder
+import ai.openclaw.app.ui.mobileBorderStrong
+import ai.openclaw.app.ui.mobileCallout
+import ai.openclaw.app.ui.mobileCaption1
+import ai.openclaw.app.ui.mobileCaption2
+import ai.openclaw.app.ui.mobileCodeBg
+import ai.openclaw.app.ui.mobileCodeText
+import ai.openclaw.app.ui.mobileHeadline
+import ai.openclaw.app.ui.mobileText
+import ai.openclaw.app.ui.mobileTextSecondary
+import ai.openclaw.app.ui.mobileWarning
+import ai.openclaw.app.ui.mobileWarningSoft
 import java.util.Locale

 private data class ChatBubbleStyle(
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatSheetContent.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/ChatSheetContent.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

 import android.content.ContentResolver
 import android.net.Uri
@ -32,22 +32,22 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import ai.openclaw.android.MainViewModel
-import ai.openclaw.android.chat.ChatSessionEntry
-import ai.openclaw.android.chat.OutgoingAttachment
-import ai.openclaw.android.ui.mobileAccent
-import ai.openclaw.android.ui.mobileBorder
-import ai.openclaw.android.ui.mobileBorderStrong
-import ai.openclaw.android.ui.mobileCallout
-import ai.openclaw.android.ui.mobileCaption1
-import ai.openclaw.android.ui.mobileCaption2
-import ai.openclaw.android.ui.mobileDanger
-import ai.openclaw.android.ui.mobileSuccess
-import ai.openclaw.android.ui.mobileSuccessSoft
-import ai.openclaw.android.ui.mobileText
-import ai.openclaw.android.ui.mobileTextSecondary
-import ai.openclaw.android.ui.mobileWarning
-import ai.openclaw.android.ui.mobileWarningSoft
+import ai.openclaw.app.MainViewModel
+import ai.openclaw.app.chat.ChatSessionEntry
+import ai.openclaw.app.chat.OutgoingAttachment
+import ai.openclaw.app.ui.mobileAccent
+import ai.openclaw.app.ui.mobileBorder
+import ai.openclaw.app.ui.mobileBorderStrong
+import ai.openclaw.app.ui.mobileCallout
+import ai.openclaw.app.ui.mobileCaption1
+import ai.openclaw.app.ui.mobileCaption2
+import ai.openclaw.app.ui.mobileDanger
+import ai.openclaw.app.ui.mobileSuccess
+import ai.openclaw.app.ui.mobileSuccessSoft
+import ai.openclaw.app.ui.mobileText
+import ai.openclaw.app.ui.mobileTextSecondary
+import ai.openclaw.app.ui.mobileWarning
+import ai.openclaw.app.ui.mobileWarningSoft
 import java.io.ByteArrayOutputStream
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
--- a/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/SessionFilters.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/ui/chat/SessionFilters.kt
@ -1,6 +1,6 @@
-package ai.openclaw.android.ui.chat
+package ai.openclaw.app.ui.chat

-import ai.openclaw.android.chat.ChatSessionEntry
+import ai.openclaw.app.chat.ChatSessionEntry

 private const val RECENT_WINDOW_MS = 24 * 60 * 60 * 1000L

--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/ElevenLabsStreamingTts.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/ElevenLabsStreamingTts.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 import android.media.AudioAttributes
 import android.media.AudioFormat
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/MicCaptureManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/MicCaptureManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 import android.Manifest
 import android.content.Context
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/StreamingMediaDataSource.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/StreamingMediaDataSource.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 import android.media.MediaDataSource
 import kotlin.math.min
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/TalkDirectiveParser.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/TalkDirectiveParser.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/TalkModeManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 import android.Manifest
 import android.content.Context
@ -21,9 +21,9 @@ import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import androidx.core.content.ContextCompat
-import ai.openclaw.android.gateway.GatewaySession
-import ai.openclaw.android.isCanonicalMainSessionKey
-import ai.openclaw.android.normalizeMainKey
+import ai.openclaw.app.gateway.GatewaySession
+import ai.openclaw.app.isCanonicalMainSessionKey
+import ai.openclaw.app.normalizeMainKey
 import java.io.File
 import java.net.HttpURLConnection
 import java.net.URL
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/VoiceWakeCommandExtractor.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/VoiceWakeCommandExtractor.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 object VoiceWakeCommandExtractor {
  fun extractCommand(text: String, triggerWords: List<String>): String? {
--- a/apps/android/app/src/main/java/ai/openclaw/android/voice/VoiceWakeManager.kt
+++ b/apps/android/app/src/main/java/ai/openclaw/android/voice/VoiceWakeManager.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.voice
+package ai.openclaw.app.voice

 import android.content.Context
 import android.content.Intent
--- a/apps/android/app/src/test/java/ai/openclaw/android/NodeForegroundServiceTest.kt
+++ b/apps/android/app/src/test/java/ai/openclaw/android/NodeForegroundServiceTest.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import android.app.Notification
 import android.content.Intent
--- a/apps/android/app/src/test/java/ai/openclaw/android/WakeWordsTest.kt
+++ b/apps/android/app/src/test/java/ai/openclaw/android/WakeWordsTest.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android
+package ai.openclaw.app

 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
--- a/apps/android/app/src/test/java/ai/openclaw/android/gateway/BonjourEscapesTest.kt
+++ b/apps/android/app/src/test/java/ai/openclaw/android/gateway/BonjourEscapesTest.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import org.junit.Assert.assertEquals
 import org.junit.Test
--- a/apps/android/app/src/test/java/ai/openclaw/android/gateway/DeviceAuthPayloadTest.kt
+++ b/apps/android/app/src/test/java/ai/openclaw/android/gateway/DeviceAuthPayloadTest.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import org.junit.Assert.assertEquals
 import org.junit.Test
--- a/apps/android/app/src/test/java/ai/openclaw/android/gateway/GatewaySessionInvokeTest.kt
+++ b/apps/android/app/src/test/java/ai/openclaw/android/gateway/GatewaySessionInvokeTest.kt
@ -1,4 +1,4 @@
-package ai.openclaw.android.gateway
+package ai.openclaw.app.gateway

 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
--- a/Show More
+++ b/Show More