feat: unified event bus, sealed state machines, and startup verification

Introduce a unified EventBus as the single broadcast channel for all system events, replacing the 6 disconnected event mechanisms. Seal Thread/Turn/ContainerState fields behind private accessors with validated transitions to prevent invalid state mutations. Fix TOCTOU races in thread_ops and session_manager. Event bus (src/event_bus/): - SystemEvent envelope with EventPayload (Domain, StateChange, Telemetry, StateTransition, ToolExecution, AuthEvent, ConfigChange) - Four sinks: SSE (→SseManager), audit (→DB with JSONL fallback), state (→StateBus), metrics (→Observer) - AuditStore trait + implementations for PostgreSQL and libSQL - V13 audit_log migration for both backends - Wired into AppComponents and AgentDeps (Option<EventBus> for compat) - Worker dual-emit through bus alongside legacy SSE+DB paths Sealed state machines: - Thread.state private with state() accessor, can_transition_to(), set_processing(), reset_to_idle() - Turn.state private with state() accessor - ContainerHandle.state private with new() constructor, mark_running/stopped/failed(), can_transition_to() - TOCTOU fix: thread_ops moves safety validation before lock, then checks state + starts turn atomically under single lock - SessionManager TOCTOU fix: atomic check-and-insert with write lock held for entire UUID adoption sequence Startup verification: - AppComponents::verify_readiness() checks component presence vs config - ToolRegistry::verify_expected_tools() validates builtin registration - Config::validate() checks cross-field invariants (Docker, WASM dir) [skip-regression-check] Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Merge remote-tracking branch 'origin/staging' into refactor/architectural-hardening
2026-08-26 15:40:18 +00:00 · 2026-03-16 00:54:21 -07:00 · 2026-03-15 22:07:55 -07:00 · 2026-03-14 21:17:25 -07:00
269 changed files with 10532 additions and 35781 deletions
@@ -4,7 +4,7 @@ DATABASE_POOL_SIZE=10

 # LLM Provider
 # LLM_BACKEND=nearai           # default
-# Possible values: nearai, ollama, openai_compatible, openai, anthropic, github_copilot, tinfoil, openai_codex
+# Possible values: nearai, ollama, openai_compatible, openai, anthropic, tinfoil
 # LLM_REQUEST_TIMEOUT_SECS=120  # Increase for local LLMs (Ollama, vLLM, LM Studio)

 # === Anthropic Direct ===
@@ -18,22 +18,6 @@ DATABASE_POOL_SIZE=10

 # === OpenAI Direct ===
 # OPENAI_API_KEY=sk-...
-# Reuse Codex CLI auth.json instead of setting OPENAI_API_KEY manually.
-# Works with both OpenAI API-key mode and Codex ChatGPT OAuth mode.
-# In ChatGPT mode this uses the private `chatgpt.com/backend-api/codex` endpoint.
-# LLM_USE_CODEX_AUTH=true
-# CODEX_AUTH_PATH=~/.codex/auth.json
-
-# === GitHub Copilot ===
-# Uses the OAuth token from your Copilot IDE sign-in (for example
-# ~/.config/github-copilot/apps.json on Linux/macOS), or run `ironclaw onboard`
-# and choose the GitHub device login flow.
-# LLM_BACKEND=github_copilot
-# GITHUB_COPILOT_TOKEN=gho_...
-# GITHUB_COPILOT_MODEL=gpt-4o
-# IronClaw injects standard VS Code Copilot headers automatically.
-# Optional advanced headers for custom overrides:
-# GITHUB_COPILOT_EXTRA_HEADERS=Copilot-Integration-Id:vscode-chat

 # === NEAR AI (Chat Completions API) ===
 # Two auth modes:
@@ -42,7 +26,7 @@ DATABASE_POOL_SIZE=10
 #      Base URL defaults to https://private.near.ai
 #   2. API key: Set NEARAI_API_KEY to use API key auth from cloud.near.ai.
 #      Base URL defaults to https://cloud-api.near.ai
-NEARAI_MODEL=Qwen/Qwen3.5-122B-A10B
+NEARAI_MODEL=zai-org/GLM-5-FP8
 NEARAI_BASE_URL=https://private.near.ai
 NEARAI_AUTH_URL=https://private.near.ai
 # NEARAI_SESSION_TOKEN=sess_...                  # hosting providers: set this
@@ -89,7 +73,7 @@ NEARAI_AUTH_URL=https://private.near.ai
 # === MiniMax ===
 # LLM_BACKEND=minimax
 # MINIMAX_API_KEY=...
-# MINIMAX_MODEL=MiniMax-M2.7
+# MINIMAX_MODEL=MiniMax-M2.5
 # MINIMAX_BASE_URL=https://api.minimax.io/v1   # default (global); use https://api.minimaxi.com/v1 for China

 # === Anthropic Direct ===
@@ -103,13 +87,6 @@ NEARAI_AUTH_URL=https://private.near.ai
 #   long  = 1-hour TTL, 2.0× (200%) write surcharge
 # ANTHROPIC_CACHE_RETENTION=short

-# === OpenAI Codex (ChatGPT subscription, OAuth) ===
-# LLM_BACKEND=openai_codex
-# OPENAI_CODEX_MODEL=gpt-5.3-codex              # default
-# OPENAI_CODEX_CLIENT_ID=app_EMoamEEZ73f0CkXaXp7hrann  # override (rare)
-# OPENAI_CODEX_AUTH_URL=https://auth.openai.com  # override (rare)
-# OPENAI_CODEX_API_URL=https://chatgpt.com/backend-api/codex  # override (rare)
-
 # For full provider setup guide see docs/LLM_PROVIDERS.md

 # Channel Configuration
@@ -174,7 +174,7 @@ jobs:

      - name: Run E2E tests
        run: |
-          pytest tests/e2e/ -v --timeout=120
+          pytest tests/e2e/ -v -x --timeout=120
        env:
          RUST_LOG: ironclaw=info
          RUST_BACKTRACE: "1"
@@ -5,8 +5,6 @@ on:
    - cron: "0 6 * * 1"  # Weekly Monday 6 AM UTC
  workflow_dispatch:
  pull_request:
-    branches:
-      - main
    paths:
      - "src/channels/web/**"
      - "tests/e2e/**"
@@ -52,11 +50,9 @@ jobs:
          - group: core
            files: "tests/e2e/scenarios/test_connection.py tests/e2e/scenarios/test_chat.py tests/e2e/scenarios/test_sse_reconnect.py tests/e2e/scenarios/test_html_injection.py tests/e2e/scenarios/test_csp.py"
          - group: features
-            files: "tests/e2e/scenarios/test_skills.py tests/e2e/scenarios/test_tool_approval.py tests/e2e/scenarios/test_webhook.py"
+            files: "tests/e2e/scenarios/test_skills.py tests/e2e/scenarios/test_tool_approval.py"
          - group: extensions
-            files: "tests/e2e/scenarios/test_extensions.py tests/e2e/scenarios/test_extension_oauth.py tests/e2e/scenarios/test_telegram_token_validation.py tests/e2e/scenarios/test_telegram_hot_activation.py tests/e2e/scenarios/test_wasm_lifecycle.py tests/e2e/scenarios/test_tool_execution.py tests/e2e/scenarios/test_pairing.py tests/e2e/scenarios/test_mcp_auth_flow.py tests/e2e/scenarios/test_oauth_credential_fallback.py tests/e2e/scenarios/test_routine_oauth_credential_injection.py"
-          - group: routines
-            files: "tests/e2e/scenarios/test_owner_scope.py tests/e2e/scenarios/test_routine_event_batch.py"
+            files: "tests/e2e/scenarios/test_extensions.py tests/e2e/scenarios/test_extension_oauth.py tests/e2e/scenarios/test_wasm_lifecycle.py tests/e2e/scenarios/test_tool_execution.py tests/e2e/scenarios/test_pairing.py tests/e2e/scenarios/test_oauth_credential_fallback.py tests/e2e/scenarios/test_routine_oauth_credential_injection.py"
    steps:
      - uses: actions/checkout@v6

@@ -43,42 +43,12 @@ jobs:
            fi
          fi

-          # --- 1b. Does this PR touch high-risk state machine or resilience code? ---
-          CHANGED_FILES=$(git diff --name-only "${BASE_REF}...${HEAD_REF}")
-
-          TOUCHES_HIGH_RISK=false
-          HIGH_RISK_PATTERNS=(
-            "src/context/state.rs"
-            "src/agent/session.rs"
-            "src/llm/circuit_breaker.rs"
-            "src/llm/retry.rs"
-            "src/llm/failover.rs"
-            "src/agent/self_repair.rs"
-            "src/agent/agentic_loop.rs"
-            "src/tools/execute.rs"
-            "crates/ironclaw_safety/src/"
-          )
-
-          for pattern in "${HIGH_RISK_PATTERNS[@]}"; do
-            if echo "$CHANGED_FILES" | grep -q "$pattern"; then
-              TOUCHES_HIGH_RISK=true
-              echo "High-risk file matched: $pattern"
-              break
-            fi
-          done
-
-          # Skip only if NEITHER condition holds — no double-firing on fix PRs
-          if [ "$IS_FIX" = false ] && [ "$TOUCHES_HIGH_RISK" = false ]; then
-            echo "Not a fix PR and no high-risk files changed — skipping."
+          if [ "$IS_FIX" = false ]; then
+            echo "Not a fix PR — skipping regression test check."
            exit 0
          fi

-          if [ "$IS_FIX" = true ]; then
-            echo "Fix PR detected."
-          fi
-          if [ "$TOUCHES_HIGH_RISK" = true ]; then
-            echo "High-risk state machine or resilience code modified."
-          fi
+          echo "Fix PR detected."

          # --- 2. Skip label or commit message marker ---
          if grep -qF ',skip-regression-check,' <<< ",$PR_LABELS,"; then
@@ -93,6 +63,8 @@ jobs:
          fi

          # --- 3. Exempt static-only / docs-only changes ---
+          CHANGED_FILES=$(git diff --name-only "${BASE_REF}...${HEAD_REF}")
+
          if [ -z "$CHANGED_FILES" ]; then
            echo "No changed files — skipping."
            exit 0
@@ -138,12 +110,5 @@ jobs:
          fi

          # --- 5. No tests found ---
-          if [ "$IS_FIX" = true ]; then
-            echo "::warning::This PR looks like a bug fix but contains no test changes."
-          fi
-          if [ "$TOUCHES_HIGH_RISK" = true ]; then
-            echo "::warning::This PR modifies high-risk state machine or resilience code but includes no test changes."
-          fi
-          echo "::warning::Please add tests exercising the changed behavior, or apply the 'skip-regression-check' label if not feasible."
+          echo "::warning::This PR looks like a bug fix but contains no test changes. Every fix should include a regression test. Add a #[test] or #[tokio::test], or apply the 'skip-regression-check' label if not feasible."
          exit 1
-
@@ -17,10 +17,7 @@ jobs:
      matrix:
        include:
          - name: all-features
-            # Keep product feature coverage broad without pulling in the
-            # test-only `integration` feature, which is exercised separately
-            # in the heavy integration job below.
-            flags: "--no-default-features --features postgres,libsql,html-to-markdown,bedrock,import"
+            flags: "--features postgres,libsql,html-to-markdown"
          - name: default
            flags: ""
          - name: libsql-only
@@ -42,26 +39,6 @@ jobs:
      - name: Run Tests
        run: cargo test ${{ matrix.flags }} -- --nocapture

-  heavy-integration-tests:
-    name: Heavy Integration Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: wasm32-wasip2
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: heavy-integration
-      - name: Build Telegram WASM channel
-        run: cargo build --manifest-path channels-src/telegram/Cargo.toml --target wasm32-wasip2 --release
-      - name: Run thread scheduling integration tests
-        run: cargo test --no-default-features --features libsql,integration --test e2e_thread_scheduling -- --nocapture
-      - name: Run Telegram thread-scope regression test
-        run: cargo test --features integration --test telegram_auth_integration test_private_messages_use_chat_id_as_thread_scope -- --exact
-
  telegram-tests:
    name: Telegram Channel Tests
    if: >
@@ -88,7 +65,7 @@ jobs:
      matrix:
        include:
          - name: all-features
-            flags: "--no-default-features --features postgres,libsql,html-to-markdown,bedrock,import"
+            flags: "--all-features"
          - name: default
            flags: ""
          - name: libsql-only
@@ -172,7 +149,7 @@ jobs:
    name: Run Tests
    runs-on: ubuntu-latest
    if: always()
-    needs: [tests, heavy-integration-tests, telegram-tests, wasm-wit-compat, docker-build, windows-build, version-check, bench-compile]
+    needs: [tests, telegram-tests, wasm-wit-compat, docker-build, windows-build, version-check, bench-compile]
    steps:
      - run: |
          # Unit tests must always pass
@@ -180,10 +157,6 @@ jobs:
            echo "Unit tests failed"
            exit 1
          fi
-          if [[ "${{ needs.heavy-integration-tests.result }}" != "success" ]]; then
-            echo "Heavy integration tests failed"
-            exit 1
-          fi
          # Gated jobs: must pass on promotion PRs / push, skipped on developer PRs
          for job in telegram-tests wasm-wit-compat docker-build windows-build version-check bench-compile; do
            case "$job" in
@@ -33,9 +33,3 @@ trace_*.json
 # Local Claude Code settings (machine-specific, should not be committed)
 .claude/settings.local.json
 .worktrees/
-
-# Python cache
-__pycache__/
-*.pyc
-*.pyo
-*.pyd
@@ -1,94 +1,6 @@
 # Agent Rules

-## Purpose and Precedence
+## Feature Parity Update Policy

- `AGENTS.md` is the quick-start contract for coding agents. It is not the full architecture spec.
- Read the relevant subsystem spec before changing a complex area. When a repo spec exists, treat it as authoritative.
-Start with these deeper docs as needed:
- `CLAUDE.md`
- `src/agent/CLAUDE.md`
- `src/channels/web/CLAUDE.md`
- `src/db/CLAUDE.md`
- `src/llm/CLAUDE.md`
- `src/setup/README.md`
- `src/tools/README.md`
- `src/workspace/README.md`
- `src/NETWORK_SECURITY.md`
- `tests/e2e/CLAUDE.md`
-
-## Architecture Mental Model
-
- Channels normalize external input into `IncomingMessage`; `ChannelManager` merges all active channel streams.
- `Agent` owns session/thread/turn handling, submission parsing, the LLM/tool loop, approvals, routines, and background runtime behavior.
- `AppBuilder` is the composition root that wires database, secrets, LLMs, tools, workspace, extensions, skills, hooks, and cost controls before the agent starts.
- The web gateway is a browser-facing API/UI layered on top of the same agent/session/tool systems, not a separate product path.
-
-## Where to Work
-
- Agent/runtime behavior: `src/agent/`
- Web gateway/API/SSE/WebSocket: `src/channels/web/`
- Persistence and DB abstractions: `src/db/`
- Setup/onboarding/configuration flow: `src/setup/`
- LLM providers and routing: `src/llm/`
- Workspace, memory, embeddings, search: `src/workspace/`
- Extensions, tools, channels, MCP, WASM: `src/extensions/`, `src/tools/`, `src/channels/`
-
-## Ownership and Composition Rules
-
- Keep `src/main.rs` and `src/app.rs` orchestration-focused. Do not move module-owned logic into entrypoints.
- Module-specific initialization should live in the owning module behind a public factory/helper, not be reimplemented ad hoc.
- Keep feature-flag branching inside the module that owns the abstraction whenever possible.
- Prefer extending existing traits and registries over hardcoding one-off integration paths.
-
-## Repo-Wide Coding Rules
-
- Avoid `.unwrap()` and `.expect()` in production; prefer proper error handling. They are fine in tests, and in production only for truly infallible invariants (e.g., literals/regexes) with a safety comment.
- Keep clippy clean with zero warnings.
- Prefer `crate::` imports for cross-module references.
- Use strong types and enums over stringly-typed control flow when the shape is known.
-
-## Database, Setup, and Config Rules
-
- New persistence behavior must support both PostgreSQL and libSQL.
- Add new DB operations to the shared DB trait first, then implement both backends.
- Treat bootstrap config, DB-backed settings, and encrypted secrets as distinct layers; do not collapse them casually.
- If onboarding or setup behavior changes, update `src/setup/README.md` in the same branch.
- Do not break config precedence, bootstrap env loading, DB-backed config reload, or post-secrets LLM re-resolution.
-
-## Security and Runtime Invariants
-
- Review any change touching listeners, routes, auth, secrets, sandboxing, approvals, or outbound HTTP with a security mindset.
- Do not weaken bearer-token auth, webhook auth, CORS/origin checks, body limits, rate limits, allowlists, or secret-handling guarantees.
- Treat Docker containers and external services as untrusted.
- Session/thread/turn state matters. Submission parsing happens before normal chat handling.
- Skills are selected deterministically. Tool approval and auth flows are special paths and must not be mixed into normal chat history carelessly.
- Persistent memory is the workspace system, not just transcript storage; preserve file-like semantics, chunking/search behavior, and identity/system-prompt loading.
-
-## Tools, Channels, and Extensions
-
- Use a built-in Rust tool for core internal capabilities tightly coupled to the runtime.
- Use WASM tools or WASM channels for sandboxed extensions and plugin-style integrations.
- Use MCP for external server integrations when the capability belongs outside the main binary.
- Preserve extension lifecycle expectations: install, authenticate/configure, activate, remove.
-
-## Docs, Parity, and Testing
-
- If behavior changes, update the relevant docs/specs in the same branch.
 - If you change implementation status for any feature tracked in `FEATURE_PARITY.md`, update that file in the same branch.
 - Do not open a PR that changes feature behavior without checking `FEATURE_PARITY.md` for needed status updates (`❌`, `🚧`, `✅`, notes, and priorities).
- Add the narrowest tests that validate the change: unit tests for local logic, integration tests for runtime/DB/routing behavior, and E2E or trace coverage for gateway, approvals, extensions, or other user-visible flows.
-
-## Risk and Change Discipline
-
- Keep changes scoped; avoid broad refactors unless the task truly requires them.
- Security, database schema, runtime, worker, CI, and secrets changes are high-risk. Call out rollback risks, compatibility concerns, and hidden side effects.
- Preserve existing defaults unless the task explicitly changes them.
- Avoid unrelated file churn and generated-file edits unless required.
- Respect a dirty worktree and never revert user changes you did not make.
-
-## Before Finishing
-
- Confirm whether behavior changes require updates to `FEATURE_PARITY.md`, specs, API docs, or `CHANGELOG.md`.
- Run the most targeted tests/checks that cover the change.
- Re-check security-sensitive paths when touching auth, secrets, network listeners, sandboxing, or approvals.
- Keep the final diff scoped to the task.
@@ -7,153 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

-## [0.19.0](https://github.com/nearai/ironclaw/compare/v0.18.0...v0.19.0) - 2026-03-17
-
-### Added
-
- verify telegram owner during hot activation ([#1157](https://github.com/nearai/ironclaw/pull/1157))
- *(config)* unify config resolution with Settings fallback (Phase 2, #1119) ([#1203](https://github.com/nearai/ironclaw/pull/1203))
- *(sandbox)* add retry logic for transient container failures ([#1232](https://github.com/nearai/ironclaw/pull/1232))
- *(heartbeat)* fire_at time-of-day scheduling with IANA timezone ([#1029](https://github.com/nearai/ironclaw/pull/1029))
- Reuse Codex CLI OAuth tokens for ChatGPT backend LLM calls ([#693](https://github.com/nearai/ironclaw/pull/693))
- add pre-push git hook with delta lint mode ([#833](https://github.com/nearai/ironclaw/pull/833))
- *(cli)* add `logs` command for gateway log access ([#1105](https://github.com/nearai/ironclaw/pull/1105))
- add Feishu/Lark WASM channel plugin ([#1110](https://github.com/nearai/ironclaw/pull/1110))
- add Criterion benchmarks for safety layer hot paths ([#836](https://github.com/nearai/ironclaw/pull/836))
- *(routines)* human-readable cron schedule summaries in web UI ([#1154](https://github.com/nearai/ironclaw/pull/1154))
- *(web)* add follow-up suggestion chips and ghost text ([#1156](https://github.com/nearai/ironclaw/pull/1156))
- *(ci)* include commit history in staging promotion PRs ([#952](https://github.com/nearai/ironclaw/pull/952))
- *(tools)* add reusable sensitive JSON redaction helper ([#457](https://github.com/nearai/ironclaw/pull/457))
- configurable hybrid search fusion strategy ([#234](https://github.com/nearai/ironclaw/pull/234))
- *(cli)* add cron subcommand for managing scheduled routines ([#1017](https://github.com/nearai/ironclaw/pull/1017))
- adds context-llm tool support ([#616](https://github.com/nearai/ironclaw/pull/616))
- *(web-chat)* add hover copy button for user/assistant messages ([#948](https://github.com/nearai/ironclaw/pull/948))
- add Slack approval buttons for tool execution in DMs ([#796](https://github.com/nearai/ironclaw/pull/796))
- enhance HTTP tool parameter parsing ([#911](https://github.com/nearai/ironclaw/pull/911))
- *(routines)* enable tool access in lightweight routine execution ([#257](https://github.com/nearai/ironclaw/pull/257)) ([#730](https://github.com/nearai/ironclaw/pull/730))
- add MiniMax as a built-in LLM provider ([#940](https://github.com/nearai/ironclaw/pull/940))
- *(cli)* add `ironclaw channels list` subcommand ([#933](https://github.com/nearai/ironclaw/pull/933))
- *(cli)* add `ironclaw skills list/search/info` subcommands ([#918](https://github.com/nearai/ironclaw/pull/918))
- add cargo-deny for supply chain safety ([#834](https://github.com/nearai/ironclaw/pull/834))
- *(setup)* display ASCII art banner during onboarding ([#851](https://github.com/nearai/ironclaw/pull/851))
- *(extensions)* unify auth and configure into single entrypoint ([#677](https://github.com/nearai/ironclaw/pull/677))
- *(i18n)* Add internationalization support with Chinese and English translations ([#929](https://github.com/nearai/ironclaw/pull/929))
- Import OpenClaw memory, history and settings ([#903](https://github.com/nearai/ironclaw/pull/903))
-
-### Fixed
-
- jobs limit ([#1274](https://github.com/nearai/ironclaw/pull/1274))
- misleading UI message ([#1265](https://github.com/nearai/ironclaw/pull/1265))
- bump channel registry versions for promotion ([#1264](https://github.com/nearai/ironclaw/pull/1264))
- cover staging CI all-features and routine batch regressions ([#1256](https://github.com/nearai/ironclaw/pull/1256))
- resolve merge conflict fallout and missing config fields
- web/CLI routine mutations do not refresh live event trigger cache ([#1255](https://github.com/nearai/ironclaw/pull/1255))
- *(jobs)* make completed->completed transition idempotent to prevent race errors ([#1068](https://github.com/nearai/ironclaw/pull/1068))
- *(llm)* persist refreshed Anthropic OAuth token after Keychain re-read ([#1213](https://github.com/nearai/ironclaw/pull/1213))
- *(worker)* prevent orphaned tool_results and fix parallel merging ([#1069](https://github.com/nearai/ironclaw/pull/1069))
- Telegram bot token validation fails intermittently (HTTP 404) ([#1166](https://github.com/nearai/ironclaw/pull/1166))
- *(security)* prevent metadata spoofing of internal job monitor flag ([#1195](https://github.com/nearai/ironclaw/pull/1195))
- *(security)* default webhook server to loopback when tunnel is configured ([#1194](https://github.com/nearai/ironclaw/pull/1194))
- *(auth)* avoid false success and block chat during pending auth ([#1111](https://github.com/nearai/ironclaw/pull/1111))
- *(config)* unify ChannelsConfig resolution to env > settings > default ([#1124](https://github.com/nearai/ironclaw/pull/1124))
- *(web-chat)* normalize chat copy to plain text ([#1114](https://github.com/nearai/ironclaw/pull/1114))
- *(skill)* treat empty url param as absent when installing skills ([#1128](https://github.com/nearai/ironclaw/pull/1128))
- preserve AuthError type in oauth_http_client cache ([#1152](https://github.com/nearai/ironclaw/pull/1152))
- *(web)* prevent Safari IME composition Enter from sending message ([#1140](https://github.com/nearai/ironclaw/pull/1140))
- *(mcp)* handle 400 auth errors, clear auth mode after OAuth, trim tokens ([#1158](https://github.com/nearai/ironclaw/pull/1158))
- eliminate panic paths in production code ([#1184](https://github.com/nearai/ironclaw/pull/1184))
- N+1 query pattern in event trigger loop (routine_engine) ([#1163](https://github.com/nearai/ironclaw/pull/1163))
- *(llm)* add stop_sequences parity for tool completions ([#1170](https://github.com/nearai/ironclaw/pull/1170))
- *(channels)* use live owner binding during wasm hot activation ([#1171](https://github.com/nearai/ironclaw/pull/1171))
- Non-transactional multi-step context updates between metadata/to… ([#1161](https://github.com/nearai/ironclaw/pull/1161))
- *(webhook)* avoid lock-held awaits in server lifecycle paths ([#1168](https://github.com/nearai/ironclaw/pull/1168))
- Google Sheets returns 403 PERMISSION_DENIED after completing OAuth ([#1164](https://github.com/nearai/ironclaw/pull/1164))
- HTTP webhook secret transmitted in request body rather than via header, docs inconsistency and security concern ([#1162](https://github.com/nearai/ironclaw/pull/1162))
- *(ci)* exclude ironclaw_safety from release automation ([#1146](https://github.com/nearai/ironclaw/pull/1146))
- *(registry)* bump versions for github, web-search, and discord extensions ([#1106](https://github.com/nearai/ironclaw/pull/1106))
- *(mcp)* address 14 audit findings across MCP module ([#1094](https://github.com/nearai/ironclaw/pull/1094))
- *(http)* replace .expect() with match in webhook handler ([#1133](https://github.com/nearai/ironclaw/pull/1133))
- *(time)* treat empty timezone string as absent ([#1127](https://github.com/nearai/ironclaw/pull/1127))
- 5 critical/high-priority bugs (auth bypass, relay failures, unbounded recursion, context growth) ([#1083](https://github.com/nearai/ironclaw/pull/1083))
- *(ci)* checkout promotion PR head for metadata refresh ([#1097](https://github.com/nearai/ironclaw/pull/1097))
- *(ci)* add missing attachments field and crates/ dir to Dockerfiles ([#1100](https://github.com/nearai/ironclaw/pull/1100))
- *(registry)* bump telegram channel version for capabilities change ([#1064](https://github.com/nearai/ironclaw/pull/1064))
- *(ci)* repair staging promotion workflow behavior ([#1091](https://github.com/nearai/ironclaw/pull/1091))
- *(wasm)* address #1086 review followups -- description hint and coercion safety ([#1092](https://github.com/nearai/ironclaw/pull/1092))
- *(ci)* repair staging-ci workflow parsing ([#1090](https://github.com/nearai/ironclaw/pull/1090))
- *(extensions)* fix lifecycle bugs + comprehensive E2E tests ([#1070](https://github.com/nearai/ironclaw/pull/1070))
- add tool_info schema discovery for WASM tools ([#1086](https://github.com/nearai/ironclaw/pull/1086))
- resolve bug_bash UX/logging issues (#1054 #1055 #1058) ([#1072](https://github.com/nearai/ironclaw/pull/1072))
- *(http)* fail closed when webhook secret is missing at runtime ([#1075](https://github.com/nearai/ironclaw/pull/1075))
- *(service)* set CLI_ENABLED=false in macOS launchd plist ([#1079](https://github.com/nearai/ironclaw/pull/1079))
- relax approval requirements for low-risk tools ([#922](https://github.com/nearai/ironclaw/pull/922))
- *(web)* make approval requests appear without page reload ([#996](https://github.com/nearai/ironclaw/pull/996)) ([#1073](https://github.com/nearai/ironclaw/pull/1073))
- *(routines)* run cron checks immediately on ticker startup ([#1066](https://github.com/nearai/ironclaw/pull/1066))
- *(web)* recompute cron next_fire_at when re-enabling routines ([#1080](https://github.com/nearai/ironclaw/pull/1080))
- *(memory)* reject absolute filesystem paths with corrective routing ([#934](https://github.com/nearai/ironclaw/pull/934))
- remove all inline event handlers for CSP script-src compliance ([#1063](https://github.com/nearai/ironclaw/pull/1063))
- *(mcp)* include OAuth state parameter in authorization URLs ([#1049](https://github.com/nearai/ironclaw/pull/1049))
- *(mcp)* open MCP OAuth in same browser as gateway ([#951](https://github.com/nearai/ironclaw/pull/951))
- *(deploy)* harden production container and bootstrap security ([#1014](https://github.com/nearai/ironclaw/pull/1014))
- release lock guards before awaiting channel send ([#869](https://github.com/nearai/ironclaw/pull/869)) ([#1003](https://github.com/nearai/ironclaw/pull/1003))
- *(registry)* use versioned artifact URLs and checksums for all WASM manifests ([#1007](https://github.com/nearai/ironclaw/pull/1007))
- *(setup)* preserve model selection on provider re-run ([#679](https://github.com/nearai/ironclaw/pull/679)) ([#987](https://github.com/nearai/ironclaw/pull/987))
- *(mcp)* attach session manager for non-OAuth HTTP clients ([#793](https://github.com/nearai/ironclaw/pull/793)) ([#986](https://github.com/nearai/ironclaw/pull/986))
- *(security)* migrate webhook auth to HMAC-SHA256 signature header ([#970](https://github.com/nearai/ironclaw/pull/970))
- *(security)* make unsafe env::set_var calls safe with explicit invariants ([#968](https://github.com/nearai/ironclaw/pull/968))
- *(security)* require explicit SANDBOX_ALLOW_FULL_ACCESS to enable FullAccess policy ([#967](https://github.com/nearai/ironclaw/pull/967))
- *(security)* add Content-Security-Policy header to web gateway ([#966](https://github.com/nearai/ironclaw/pull/966))
- *(test)* stabilize openai compat oversized-body regression ([#839](https://github.com/nearai/ironclaw/pull/839))
- *(ci)* disambiguate WASM bundle filenames to prevent tool/channel collision ([#964](https://github.com/nearai/ironclaw/pull/964))
- *(setup)* validate channel credentials during setup ([#684](https://github.com/nearai/ironclaw/pull/684))
- drain tunnel pipes to prevent zombie process ([#735](https://github.com/nearai/ironclaw/pull/735))
- *(mcp)* header safety validation and Authorization conflict bug from #704 ([#752](https://github.com/nearai/ironclaw/pull/752))
- *(agent)* block thread_id-based context pollution across users ([#760](https://github.com/nearai/ironclaw/pull/760))
- *(mcp)* stdio/unix transports skip initialize handshake ([#890](https://github.com/nearai/ironclaw/pull/890)) ([#935](https://github.com/nearai/ironclaw/pull/935))
- *(setup)* drain residual events and filter key kind in onboard prompts ([#937](https://github.com/nearai/ironclaw/pull/937)) ([#949](https://github.com/nearai/ironclaw/pull/949))
- *(security)* load WASM tool description and schema from capabilities.json ([#520](https://github.com/nearai/ironclaw/pull/520))
- *(security)* resolve DNS once and reuse for SSRF validation to prevent rebinding ([#518](https://github.com/nearai/ironclaw/pull/518))
- *(security)* replace regex HTML sanitizer with DOMPurify to prevent XSS ([#510](https://github.com/nearai/ironclaw/pull/510))
- *(ci)* improve Claude Code review reliability ([#955](https://github.com/nearai/ironclaw/pull/955))
- *(ci)* run gated test jobs during staging CI ([#956](https://github.com/nearai/ironclaw/pull/956))
- *(ci)* prevent staging-ci tag failure and chained PR auto-close ([#900](https://github.com/nearai/ironclaw/pull/900))
- *(ci)* WASM WIT compat sqlite3 duplicate symbol conflict ([#953](https://github.com/nearai/ironclaw/pull/953))
- resolve deferred review items from PRs #883, #848, #788 ([#915](https://github.com/nearai/ironclaw/pull/915))
- *(web)* improve UX readability and accessibility in chat UI ([#910](https://github.com/nearai/ironclaw/pull/910))
-
-### Other
-
- Fix Telegram auto-verify flow and routing ([#1273](https://github.com/nearai/ironclaw/pull/1273))
- *(e2e)* fix approval waiting regression coverage ([#1270](https://github.com/nearai/ironclaw/pull/1270))
- isolate heavy integration tests ([#1266](https://github.com/nearai/ironclaw/pull/1266))
- Merge branch 'main' into fix/resolve-conflicts
- Refactor owner scope across channels and fix default routing fallback ([#1151](https://github.com/nearai/ironclaw/pull/1151))
- *(extensions)* document relay manager init order ([#928](https://github.com/nearai/ironclaw/pull/928))
- *(setup)* extract init logic from wizard into owning modules ([#1210](https://github.com/nearai/ironclaw/pull/1210))
- mention MiniMax as built-in provider in all READMEs ([#1209](https://github.com/nearai/ironclaw/pull/1209))
- Fix schema-guided tool parameter coercion ([#1143](https://github.com/nearai/ironclaw/pull/1143))
- Make no-panics CI check test-aware ([#1160](https://github.com/nearai/ironclaw/pull/1160))
- *(mcp)* avoid reallocating SSE buffer on each chunk ([#1153](https://github.com/nearai/ironclaw/pull/1153))
- *(routines)* avoid full message history clone each tool iteration ([#1172](https://github.com/nearai/ironclaw/pull/1172))
- *(registry)* align manifest versions with published artifacts ([#1169](https://github.com/nearai/ironclaw/pull/1169))
- remove __pycache__ from repo and add to .gitignore ([#1177](https://github.com/nearai/ironclaw/pull/1177))
- *(registry)* move MCP servers from code to JSON manifests ([#1144](https://github.com/nearai/ironclaw/pull/1144))
- improve routine schema guidance ([#1089](https://github.com/nearai/ironclaw/pull/1089))
- add event-trigger routine e2e coverage ([#1088](https://github.com/nearai/ironclaw/pull/1088))
- enforce no .unwrap(), .expect(), or assert!() in production code ([#1087](https://github.com/nearai/ironclaw/pull/1087))
- periodic sync main into staging (resolved conflicts) ([#1098](https://github.com/nearai/ironclaw/pull/1098))
- fix formatting in cli/mod.rs and mcp/auth.rs ([#1071](https://github.com/nearai/ironclaw/pull/1071))
- Expose the shared agent session manager via AppComponents ([#532](https://github.com/nearai/ironclaw/pull/532))
- *(agent)* remove unnecessary Worker re-export ([#923](https://github.com/nearai/ironclaw/pull/923))
- Fix UTF-8 unsafe truncation in WASM emit_message ([#1015](https://github.com/nearai/ironclaw/pull/1015))
- extract safety module into ironclaw_safety crate ([#1024](https://github.com/nearai/ironclaw/pull/1024))
- Add Z.AI provider support for GLM-5 ([#938](https://github.com/nearai/ironclaw/pull/938))
- *(html_to_markdown)* refresh golden files after renderer bump ([#1016](https://github.com/nearai/ironclaw/pull/1016))
- Migrate GitHub webhook normalization into github tool ([#758](https://github.com/nearai/ironclaw/pull/758))
- Fix systemctl unit ([#472](https://github.com/nearai/ironclaw/pull/472))
- add Russian localization (README.ru.md) ([#850](https://github.com/nearai/ironclaw/pull/850))
- Add generic host-verified /webhook/tools/{tool} ingress ([#757](https://github.com/nearai/ironclaw/pull/757))
-
 ## [0.18.0](https://github.com/nearai/ironclaw/compare/v0.17.0...v0.18.0) - 2026-03-11

 ### Other
@@ -158,8 +158,6 @@ src/
 │
 ├── secrets/            # Secrets management (AES-256-GCM, OS keychain for master key)
 │
-├── profile.rs          # Psychographic profile types, 9-dimension analysis framework
-│
 ├── setup/              # 7-step onboarding wizard — see src/setup/README.md
 │
 ├── skills/             # SKILL.md prompt extension system — see .claude/rules/skills.md
@@ -2339,7 +2339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -3436,7 +3436,7 @@ dependencies = [

 [[package]]
 name = "ironclaw"
-version = "0.19.0"
+version = "0.18.0"
 dependencies = [
 "aes-gcm",
 "aho-corasick",
@@ -3461,7 +3461,6 @@ dependencies = [
 "dirs 6.0.0",
 "dotenvy",
 "ed25519-dalek",
- "eventsource-stream",
 "flate2",
 "fs4",
 "futures",
@@ -4365,9 +4364,9 @@ dependencies = [

 [[package]]
 name = "openssl"
-version = "0.10.76"
+version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
 "bitflags 2.11.0",
 "cfg-if",
@@ -4403,9 +4402,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"

 [[package]]
 name = "openssl-sys"
-version = "0.9.112"
+version = "0.9.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
 dependencies = [
 "cc",
 "libc",
@@ -5575,7 +5574,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys 0.12.1",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5624,7 +5623,7 @@ dependencies = [
 "once_cell",
 "ring",
 "rustls-pki-types",
- "rustls-webpki 0.103.10",
+ "rustls-webpki 0.103.9",
 "subtle",
 "zeroize",
 ]
@@ -5696,9 +5695,9 @@ dependencies = [

 [[package]]
 name = "rustls-webpki"
-version = "0.103.10"
+version = "0.103.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef"
+checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
 "aws-lc-rs",
 "ring",
@@ -6479,10 +6478,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
 "fastrand",
- "getrandom 0.4.2",
+ "getrandom 0.3.4",
 "once_cell",
 "rustix 1.1.4",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -20,7 +20,7 @@ exclude = [

 [package]
 name = "ironclaw"
-version = "0.19.0"
+version = "0.18.0"
 edition = "2024"
 rust-version = "1.92"
 description = "Secure personal AI assistant that protects your data and expands its capabilities on the fly"
@@ -40,7 +40,6 @@ eula = false
 tokio = { version = "1", features = ["full"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 futures = "0.3"
-eventsource-stream = "0.2"

 # HTTP client
 reqwest = { version = "0.12", default-features = false, features = ["json", "multipart", "rustls-tls-native-roots", "stream"] }
@@ -222,17 +221,11 @@ postgres = [
    "rust_decimal/db-tokio-postgres",
 ]
 libsql = ["dep:libsql"]
-# Opt-in feature for especially heavy integration-test targets that run in a
-# dedicated CI job instead of the default Rust test matrix.
 integration = []
 html-to-markdown = ["dep:html-to-markdown-rs", "dep:readabilityrs"]
 bedrock = ["dep:aws-config", "dep:aws-sdk-bedrockruntime", "dep:aws-smithy-types"]
 import = ["dep:json5", "libsql"]

-[[test]]
-name = "e2e_thread_scheduling"
-required-features = ["libsql", "integration"]
-
 [[test]]
 name = "html_to_markdown"
 required-features = ["html-to-markdown"]
@@ -20,9 +20,9 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 |---------|----------|----------|-------|
 | Hub-and-spoke architecture | ✅ | ✅ | Web gateway as central hub |
 | WebSocket control plane | ✅ | ✅ | Gateway with WebSocket + SSE |
-| Single-user system | ✅ | ✅ | Explicit instance owner scope for persistent routines, secrets, jobs, settings, extensions, and workspace memory |
+| Single-user system | ✅ | ✅ | |
 | Multi-agent routing | ✅ | ❌ | Workspace isolation per-agent |
-| Session-based messaging | ✅ | ✅ | Owner scope is separate from sender identity and conversation scope |
+| Session-based messaging | ✅ | ✅ | Per-sender sessions |
 | Loopback-first networking | ✅ | ✅ | HTTP binds to 0.0.0.0 but can be configured |

 ### Owner: _Unassigned_
@@ -66,9 +66,9 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | CLI/TUI | ✅ | ✅ | - | Ratatui-based TUI |
 | HTTP webhook | ✅ | ✅ | - | axum with secret validation |
 | REPL (simple) | ✅ | ✅ | - | For testing |
-| WASM channels | ❌ | ✅ | - | IronClaw innovation; host resolves owner scope vs sender identity |
+| WASM channels | ❌ | ✅ | - | IronClaw innovation |
 | WhatsApp | ✅ | ❌ | P1 | Baileys (Web), same-phone mode with echo detection |
-| Telegram | ✅ | ✅ | - | WASM channel(MTProto), DM pairing, caption, /start, bot_username, DM topics, setup-time owner auto-verification, owner-scoped persistence |
+| Telegram | ✅ | ✅ | - | WASM channel(MTProto), DM pairing, caption, /start, bot_username, DM topics |
 | Discord | ✅ | ❌ | P2 | discord.js, thread parent binding inheritance |
 | Signal | ✅ | ✅ | P2 | signal-cli daemonPC, SSE listener HTTP/JSON-R, user/group allowlists, DM pairing |
 | Slack | ✅ | ✅ | - | WASM tool |
@@ -242,7 +242,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | OpenRouter | ✅ | ✅ | - | Via OpenAI-compatible provider (RigAdapter) |
 | Tinfoil | ❌ | ✅ | - | Private inference provider (IronClaw-only) |
 | OpenAI-compatible | ❌ | ✅ | - | Generic OpenAI-compatible endpoint (RigAdapter) |
-| GitHub Copilot | ✅ | ✅ | - | Dedicated provider with OAuth token exchange (`GithubCopilotProvider`) |
 | Ollama (local) | ✅ | ✅ | - | via `rig::providers::ollama` (full support) |
 | Perplexity | ✅ | ❌ | P3 | Freshness parameter for web_search |
 | MiniMax | ✅ | ❌ | P3 | Regional endpoint selection |
@@ -466,7 +465,7 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Device pairing | ✅ | ❌ | |
 | Tailscale identity | ✅ | ❌ | |
 | Trusted-proxy auth | ✅ | ❌ | Header-based reverse proxy auth |
-| OAuth flows | ✅ | 🚧 | NEAR AI OAuth plus hosted extension/MCP OAuth broker; external auth-proxy rollout still pending |
+| OAuth flows | ✅ | 🚧 | NEAR AI OAuth |
 | DM pairing verification | ✅ | ✅ | ironclaw pairing approve, host APIs |
 | Allowlist/blocklist | ✅ | 🚧 | allow_from + pairing store |
 | Per-group tool policies | ✅ | ❌ | |
@@ -1,330 +0,0 @@
-<p align="center">
-  <img src="ironclaw.png?v=2" alt="IronClaw" width="200"/>
-</p>
-
-<h1 align="center">IronClaw</h1>
-
-<p align="center">
-  <strong>あなたの味方になる、安全なパーソナルAIアシスタント</strong>
-</p>
-
-<p align="center">
-  <a href="#license"><img src="https://img.shields.io/badge/license-MIT%20OR%20Apache%202.0-blue.svg" alt="License: MIT OR Apache-2.0" /></a>
-  <a href="https://t.me/ironclawAI"><img src="https://img.shields.io/badge/Telegram-%40ironclawAI-26A5E4?style=flat&logo=telegram&logoColor=white" alt="Telegram: @ironclawAI" /></a>
-  <a href="https://www.reddit.com/r/ironclawAI/"><img src="https://img.shields.io/badge/Reddit-r%2FironclawAI-FF4500?style=flat&logo=reddit&logoColor=white" alt="Reddit: r/ironclawAI" /></a>
-</p>
-
-<p align="center">
-  <a href="README.md">English</a> |
-  <a href="README.zh-CN.md">简体中文</a> |
-  <a href="README.ru.md">Русский</a> |
-  <a href="README.ja.md">日本語</a>
-</p>
-
-<p align="center">
-  <a href="#フィロソフィー">フィロソフィー</a> •
-  <a href="#機能">機能</a> •
-  <a href="#インストール">インストール</a> •
-  <a href="#設定">設定</a> •
-  <a href="#セキュリティ">セキュリティ</a> •
-  <a href="#アーキテクチャ">アーキテクチャ</a>
-</p>
-
---
-
-## フィロソフィー
-
-IronClawはシンプルな原則に基づいて構築されています：**あなたのAIアシスタントは、あなたのために働くべきであり、あなたに不利益をもたらすべきではありません。**
-
-AIシステムがデータの取り扱いについて不透明になり、企業の利益に沿って調整されることが増えている世界で、IronClawは異なるアプローチを取ります：
-
- **あなたのデータはあなたのもの** - すべての情報はローカルに保存・暗号化され、あなたの管理下から離れることはありません
- **設計段階からの透明性** - オープンソース、監査可能、隠れたテレメトリやデータ収集なし
- **自己拡張する能力** - ベンダーのアップデートを待たずに、新しいツールをその場で構築
- **多層防御** - 複数のセキュリティレイヤーがプロンプトインジェクションやデータ流出から保護
-
-IronClawは、個人生活にも仕事にも本当に信頼できるAIアシスタントです。
-
-## 機能
-
-### セキュリティファースト
-
- **WASMサンドボックス** - 信頼されていないツールは、機能ベースの権限を持つ隔離されたWebAssemblyコンテナで実行
- **認証情報の保護** - シークレットはツールに公開されず、リーク検出付きでホスト境界で注入
- **プロンプトインジェクション防御** - パターン検出、コンテンツサニタイズ、ポリシー適用
- **エンドポイントの許可リスト** - HTTPリクエストは明示的に許可されたホストとパスのみに制限
-
-### 常時利用可能
-
- **マルチチャネル** - REPL、HTTPウェブフック、WASMチャネル（Telegram、Slack）、Webゲートウェイ
- **Dockerサンドボックス** - ジョブごとのトークンとオーケストレーター/ワーカーパターンによる隔離されたコンテナ実行
- **Webゲートウェイ** - リアルタイムSSE/WebSocketストリーミング対応のブラウザUI
- **ルーティン** - cronスケジュール、イベントトリガー、ウェブフックハンドラーによるバックグラウンド自動化
- **ハートビートシステム** - 監視・保守タスクのためのプロアクティブなバックグラウンド実行
- **並列ジョブ** - 隔離されたコンテキストで複数のリクエストを同時に処理
- **自己修復** - スタックした操作の自動検出と復旧
-
-### 自己拡張
-
- **動的ツール構築** - 必要なものを説明すると、IronClawがWASMツールとして構築
- **MCPプロトコル** - Model Context Protocolサーバーに接続して追加機能を利用
- **プラグインアーキテクチャ** - 再起動なしで新しいWASMツールやチャネルを追加
-
-### 永続メモリ
-
- **ハイブリッド検索** - Reciprocal Rank Fusionを使用した全文検索+ベクトル検索
- **ワークスペースファイルシステム** - メモ、ログ、コンテキストのための柔軟なパスベースストレージ
- **アイデンティティファイル** - セッション間で一貫した人格と設定を維持
-
-## インストール
-
-### 前提条件
-
- Rust 1.85+
- PostgreSQL 15+ ([pgvector](https://github.com/pgvector/pgvector)拡張機能を含む)
- NEAR AIアカウント（セットアップウィザードで認証を処理）
-
-## ダウンロードまたはビルド
-
-最新のアップデートは[リリースページ](https://github.com/nearai/ironclaw/releases/)をご覧ください。
-
-<details>
-  <summary>Windowsインストーラーでインストール（Windows）</summary>
-
-[Windowsインストーラー](https://github.com/nearai/ironclaw/releases/latest/download/ironclaw-x86_64-pc-windows-msvc.msi)をダウンロードして実行してください。
-
-</details>
-
-<details>
-  <summary>PowerShellスクリプトでインストール（Windows）</summary>
-
-```sh
-irm https://github.com/nearai/ironclaw/releases/latest/download/ironclaw-installer.ps1 | iex
-```
-
-</details>
-
-<details>
-  <summary>シェルスクリプトでインストール（macOS、Linux、Windows/WSL）</summary>
-
-```sh
-curl --proto '=https' --tlsv1.2 -LsSf https://github.com/nearai/ironclaw/releases/latest/download/ironclaw-installer.sh | sh
-```
-</details>
-
-<details>
-  <summary>Homebrewでインストール（macOS/Linux）</summary>
-
-```sh
-brew install ironclaw
-```
-
-</details>
-
-<details>
-  <summary>ソースコードからコンパイル（Windows、Linux、macOSでCargo）</summary>
-
-`cargo`でインストールします。コンピューターに[Rust](https://rustup.rs)がインストールされていることを確認してください。
-
-```bash
-# リポジトリをクローン
-git clone https://github.com/nearai/ironclaw.git
-cd ironclaw
-
-# ビルド
-cargo build --release
-
-# テストを実行
-cargo test
-```
-
-**フルリリース**（チャネルソースを変更した後）の場合、まず`./scripts/build-all.sh`を実行してチャネルを再ビルドしてください。
-
-</details>
-
-### データベースのセットアップ
-
-```bash
-# データベースを作成
-createdb ironclaw
-
-# pgvectorを有効化
-psql ironclaw -c "CREATE EXTENSION IF NOT EXISTS vector;"
-```
-
-## 設定
-
-セットアップウィザードを実行してIronClawを設定します：
-
-```bash
-ironclaw onboard
-```
-
-ウィザードは、データベース接続、NEAR AI認証（ブラウザOAuth経由）、シークレットの暗号化（システムキーチェーンを使用）を処理します。設定は接続されたデータベースに永続化されます。ブートストラップ変数（例：`DATABASE_URL`、`LLM_BACKEND`）は、データベース接続前に利用できるよう`~/.ironclaw/.env`に書き込まれます。
-
-### 代替LLMプロバイダー
-
-IronClawはデフォルトでNEAR AIを使用しますが、多くのLLMプロバイダーをすぐに利用できます。組み込みプロバイダーには**Anthropic**、**OpenAI**、**Google Gemini**、**MiniMax**、**Mistral**、**Ollama**（ローカル）が含まれます。**OpenRouter**（300以上のモデル）、**Together AI**、**Fireworks AI**、セルフホストサーバー（**vLLM**、**LiteLLM**）などのOpenAI互換サービスもサポートされています。
-
-ウィザードでプロバイダーを選択するか、環境変数を直接設定してください：
-
-```env
-# 例：MiniMax（組み込み、204Kコンテキスト）
-LLM_BACKEND=minimax
-MINIMAX_API_KEY=...
-
-# 例：OpenAI互換エンドポイント
-LLM_BACKEND=openai_compatible
-LLM_BASE_URL=https://openrouter.ai/api/v1
-LLM_API_KEY=sk-or-...
-LLM_MODEL=anthropic/claude-sonnet-4
-```
-
-完全なプロバイダーガイドは[docs/LLM_PROVIDERS.md](docs/LLM_PROVIDERS.md)をご覧ください。
-
-## セキュリティ
-
-IronClawは、データを保護し悪用を防ぐために多層防御を実装しています。
-
-### WASMサンドボックス
-
-すべての信頼されていないツールは、隔離されたWebAssemblyコンテナで実行されます：
-
- **機能ベースの権限** - HTTP、シークレット、ツール呼び出しの明示的なオプトイン
- **エンドポイントの許可リスト** - 許可されたホスト/パスへのHTTPリクエストのみ
- **認証情報の注入** - シークレットはホスト境界で注入され、WASMコードに公開されない
- **リーク検出** - リクエストとレスポンスのシークレット流出試行をスキャン
- **レート制限** - 悪用防止のためのツールごとのリクエスト制限
- **リソース制限** - メモリ、CPU、実行時間の制約
-
-```
-WASM ──► 許可リスト ──► リーク    ──► 認証情報 ──► リクエスト ──► リーク    ──► WASM
-         バリデーター    スキャン       注入        実行          スキャン
-                       (リクエスト)                             (レスポンス)
-```
-
-### プロンプトインジェクション防御
-
-外部コンテンツは複数のセキュリティレイヤーを通過します：
-
- パターンベースのインジェクション試行検出
- コンテンツのサニタイズとエスケープ
- 重要度レベル付きポリシールール（ブロック/警告/レビュー/サニタイズ）
- 安全なLLMコンテキスト注入のためのツール出力ラッピング
-
-### データ保護
-
- すべてのデータはローカルのPostgreSQLデータベースに保存
- AES-256-GCMでシークレットを暗号化
- テレメトリ、分析、データ共有なし
- すべてのツール実行の完全な監査ログ
-
-## アーキテクチャ
-
-```
-┌────────────────────────────────────────────────────────────────┐
-│                          チャネル                               │
-│  ┌──────┐  ┌──────┐   ┌─────────────┐  ┌─────────────┐         │
-│  │ REPL │  │ HTTP │   │WASMチャネル │  │ Web         │         │
-│  └──┬───┘  └──┬───┘   └──────┬──────┘  │ ゲートウェイ│         │
-│     │         │              │         │(SSE + WS)   │         │
-│     │         │              │         └──────┬──────┘         │
-│     └─────────┴──────────────┴────────────────┘                │
-│                              │                                 │
-│                    ┌─────────▼─────────┐                       │
-│                    │  エージェントループ │  インテントルーティング│
-│                    └────┬──────────┬───┘                       │
-│                         │          │                           │
-│              ┌──────────▼────┐  ┌──▼───────────────┐           │
-│              │ スケジューラー │  │ ルーティン       │           │
-│              │ (並列ジョブ)  │  │ エンジン         │           │
-│              └──────┬────────┘  │(cron,event,wh)   │           │
-│                     │           └────────┬─────────┘           │
-│       ┌─────────────┼────────────────────┘                     │
-│       │             │                                          │
-│   ┌───▼─────┐  ┌────▼────────────────┐                         │
-│   │ ローカル │  │  オーケストレーター  │                         │
-│   │ ワーカー │  │  ┌───────────────┐  │                         │
-│   │(プロセス │  │  │ Docker        │  │                         │
-│   │ 内)     │  │  │ サンドボックス│  │                         │
-│   └───┬─────┘  │  │ コンテナ      │  │                         │
-│       │        │  │ ┌───────────┐ │  │                         │
-│       │        │  │ │Worker / CC│ │  │                         │
-│       │        │  │ └───────────┘ │  │                         │
-│       │        │  └───────────────┘  │                         │
-│       │        └─────────┬───────────┘                         │
-│       └──────────────────┤                                     │
-│                          │                                     │
-│              ┌───────────▼──────────┐                          │
-│              │   ツールレジストリ    │                          │
-│              │ 組み込み, MCP, WASM  │                          │
-│              └──────────────────────┘                          │
-└────────────────────────────────────────────────────────────────┘
-```
-
-### コアコンポーネント
-
-| コンポーネント | 目的 |
-|---------------|------|
-| **エージェントループ** | メインのメッセージ処理とジョブの調整 |
-| **ルーター** | ユーザーの意図を分類（コマンド、クエリ、タスク） |
-| **スケジューラー** | 優先度付きの並列ジョブ実行を管理 |
-| **ワーカー** | LLM推論とツール呼び出しでジョブを実行 |
-| **オーケストレーター** | コンテナのライフサイクル、LLMプロキシ、ジョブごとの認証 |
-| **Webゲートウェイ** | チャット、メモリ、ジョブ、ログ、拡張機能、ルーティンのブラウザUI |
-| **ルーティンエンジン** | スケジュール（cron）とリアクティブ（イベント、ウェブフック）のバックグラウンドタスク |
-| **ワークスペース** | ハイブリッド検索付き永続メモリ |
-| **セーフティレイヤー** | プロンプトインジェクション防御とコンテンツサニタイズ |
-
-## 使い方
-
-```bash
-# 初回セットアップ（データベース、認証などを設定）
-ironclaw onboard
-
-# インタラクティブREPLを起動
-cargo run
-
-# デバッグログ付き
-RUST_LOG=ironclaw=debug cargo run
-```
-
-## 開発
-
-```bash
-# コードフォーマット
-cargo fmt
-
-# リント
-cargo clippy --all --benches --tests --examples --all-features
-
-# テスト実行
-createdb ironclaw_test
-cargo test
-
-# 特定のテストを実行
-cargo test test_name
-```
-
- **Telegramチャネル**: セットアップとDMペアリングについては[docs/TELEGRAM_SETUP.md](docs/TELEGRAM_SETUP.md)を参照してください。
- **チャネルソースの変更**: `cargo build`の前に`./channels-src/telegram/build.sh`を実行して、更新されたWASMをバンドルしてください。
-
-## OpenClawの系譜
-
-IronClawは[OpenClaw](https://github.com/openclaw/openclaw)にインスパイアされたRust再実装です。完全な対応表は[FEATURE_PARITY.md](FEATURE_PARITY.md)をご覧ください。
-
-主な違い：
-
- **Rust vs TypeScript** - ネイティブパフォーマンス、メモリ安全性、シングルバイナリ
- **WASMサンドボックス vs Docker** - 軽量、機能ベースのセキュリティ
- **PostgreSQL vs SQLite** - 本番環境対応の永続化
- **セキュリティファースト設計** - 複数の防御レイヤー、認証情報の保護
-
-## ライセンス
-
-以下のいずれかのライセンスの下で提供されています：
-
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE))
- MIT License ([LICENSE-MIT](LICENSE-MIT))
-
-お好みに応じて選択してください。
@@ -17,8 +17,7 @@
 <p align="center">
  <a href="README.md">English</a> |
  <a href="README.zh-CN.md">简体中文</a> |
-  <a href="README.ru.md">Русский</a> |
-  <a href="README.ja.md">日本語</a>
+  <a href="README.ru.md">Русский</a>
 </p>

 <p align="center">
@@ -168,7 +167,7 @@ written to `~/.ironclaw/.env` so they are available before the database connects
 ### Alternative LLM Providers

 IronClaw defaults to NEAR AI but supports many LLM providers out of the box.
-Built-in providers include **Anthropic**, **OpenAI**, **GitHub Copilot**, **Google Gemini**, **MiniMax**,
+Built-in providers include **Anthropic**, **OpenAI**, **Google Gemini**, **MiniMax**,
 **Mistral**, and **Ollama** (local). OpenAI-compatible services like **OpenRouter**
 (300+ models), **Together AI**, **Fireworks AI**, and self-hosted servers (**vLLM**,
 **LiteLLM**) are also supported.
@@ -17,8 +17,7 @@
 <p align="center">
  <a href="README.md">English</a> |
  <a href="README.zh-CN.md">简体中文</a> |
-  <a href="README.ru.md">Русский</a> |
-  <a href="README.ja.md">日本語</a>
+  <a href="README.ru.md">Русский</a>
 </p>

 <p align="center">
@@ -17,8 +17,7 @@
 <p align="center">
  <a href="README.md">English</a> |
  <a href="README.zh-CN.md">简体中文</a> |
-  <a href="README.ru.md">Русский</a> |
-  <a href="README.ja.md">日本語</a>
+  <a href="README.ru.md">Русский</a>
 </p>

 <p align="center">
@@ -165,7 +164,7 @@ ironclaw onboard
 ### 替代 LLM 提供商

 IronClaw 默认使用 NEAR AI，但开箱即用地支持多种 LLM 提供商。
-内置提供商包括 **Anthropic**、**OpenAI**、**GitHub Copilot**、**Google Gemini**、**MiniMax**、**Mistral** 和 **Ollama**（本地部署）。同时也支持 OpenAI 兼容服务，如 **OpenRouter**（300+ 模型）、**Together AI**、**Fireworks AI** 以及自托管服务器（**vLLM**、**LiteLLM**）。
+内置提供商包括 **Anthropic**、**OpenAI**、**Google Gemini**、**MiniMax**、**Mistral** 和 **Ollama**（本地部署）。同时也支持 OpenAI 兼容服务，如 **OpenRouter**（300+ 模型）、**Together AI**、**Fireworks AI** 以及自托管服务器（**vLLM**、**LiteLLM**）。

 在向导中选择你的提供商，或直接设置环境变量：

@@ -61,7 +61,7 @@ fn bench_validate_tool_params(c: &mut Criterion) {
    let validator = Validator::new();

    let simple_params: serde_json::Value =
-        serde_json::from_str(r#"{"command": "echo hello"}"#).unwrap();
+        serde_json::from_str(r#"{"command": "echo hello"}"#).unwrap(); // safety: bench-only constant JSON

    let complex_params: serde_json::Value = serde_json::from_str(
        r#"{
@@ -73,7 +73,7 @@ fn bench_validate_tool_params(c: &mut Criterion) {
        "capture_output": true
    }"#,
    )
-    .unwrap();
+    .unwrap(); // safety: bench-only constant JSON

    // Deeply nested JSON to stress the recursive validation walk
    let nested_params: serde_json::Value = serde_json::from_str(
@@ -84,7 +84,7 @@ fn bench_validate_tool_params(c: &mut Criterion) {
        "env": {"KEY1": "val1", "KEY2": "val2", "KEY3": "val3", "KEY4": "val4"}
    }"#,
    )
-    .unwrap();
+    .unwrap(); // safety: bench-only constant JSON

    group.bench_function("simple", |b| {
        b.iter(|| validator.validate_tool_params(black_box(&simple_params)))
@@ -206,17 +206,9 @@ struct FeishuApiResponse<T> {
    data: Option<T>,
 }

-/// Tenant access token response (flat format).
-///
-/// Unlike most Feishu APIs that nest results under `data`, the
-/// `/auth/v3/tenant_access_token/internal` endpoint returns `code`, `msg`,
-/// `tenant_access_token`, and `expire` at the top level.
-#[derive(Debug, Deserialize)]
-struct TenantAccessTokenResponse {
-    #[serde(default)]
-    code: i32,
-    #[serde(default)]
-    msg: String,
+/// Tenant access token response.
+#[derive(Debug, Default, Deserialize)]
+struct TenantAccessTokenData {
    tenant_access_token: String,
    expire: i64,
 }
@@ -778,8 +770,9 @@ fn obtain_tenant_token(api_base: &str) -> Result<String, String> {
                ));
            }

-            let token_resp: TenantAccessTokenResponse = serde_json::from_slice(&response.body)
-                .map_err(|e| format!("Failed to parse token response: {}", e))?;
+            let token_resp: FeishuApiResponse<TenantAccessTokenData> =
+                serde_json::from_slice(&response.body)
+                    .map_err(|e| format!("Failed to parse token response: {}", e))?;

            if token_resp.code != 0 {
                return Err(format!(
@@ -788,33 +781,23 @@ fn obtain_tenant_token(api_base: &str) -> Result<String, String> {
                ));
            }

-            if token_resp.tenant_access_token.is_empty() {
-                return Err("Token response missing tenant_access_token".to_string());
-            }
-
-            if token_resp.expire <= 0 {
-                return Err(format!(
-                    "Token response has invalid expire value: {}",
-                    token_resp.expire
-                ));
-            }
+            let data = token_resp
+                .data
+                .ok_or_else(|| "Token response missing data".to_string())?;

            // Cache the token with expiry.
            let now = channel_host::now_millis();
-            let expiry = now.saturating_add((token_resp.expire as u64).saturating_mul(1000));
+            let expiry = now + (data.expire as u64) * 1000;

-            let _ = channel_host::workspace_write(TOKEN_PATH, &token_resp.tenant_access_token);
+            let _ = channel_host::workspace_write(TOKEN_PATH, &data.tenant_access_token);
            let _ = channel_host::workspace_write(TOKEN_EXPIRY_PATH, &expiry.to_string());

            channel_host::log(
                channel_host::LogLevel::Debug,
-                &format!(
-                    "Tenant access token refreshed, expires in {}s",
-                    token_resp.expire
-                ),
+                &format!("Tenant access token refreshed, expires in {}s", data.expire),
            );

-            Ok(token_resp.tenant_access_token)
+            Ok(data.tenant_access_token)
        }
        Err(e) => Err(format!("Token exchange request failed: {}", e)),
    }
@@ -836,60 +819,3 @@ fn json_response(status: u16, body: serde_json::Value) -> OutgoingHttpResponse {
        body: body_bytes,
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parse_flat_token_response() {
-        let json = r#"{
-            "code": 0,
-            "msg": "ok",
-            "tenant_access_token": "t-abc123",
-            "expire": 7200
-        }"#;
-        let resp: TenantAccessTokenResponse = serde_json::from_str(json).unwrap();
-        assert_eq!(resp.code, 0);
-        assert_eq!(resp.msg, "ok");
-        assert_eq!(resp.tenant_access_token, "t-abc123");
-        assert_eq!(resp.expire, 7200);
-    }
-
-    #[test]
-    fn parse_token_response_rejects_missing_token() {
-        let json = r#"{"code": 0, "msg": "ok", "expire": 7200}"#;
-        let result: Result<TenantAccessTokenResponse, _> = serde_json::from_str(json);
-        assert!(result.is_err(), "should fail when tenant_access_token is missing");
-    }
-
-    #[test]
-    fn parse_token_response_rejects_missing_expire() {
-        let json = r#"{"code": 0, "msg": "ok", "tenant_access_token": "t-abc"}"#;
-        let result: Result<TenantAccessTokenResponse, _> = serde_json::from_str(json);
-        assert!(result.is_err(), "should fail when expire is missing");
-    }
-
-    #[test]
-    fn parse_token_response_defaults_code_and_msg() {
-        let json = r#"{"tenant_access_token": "t-abc", "expire": 3600}"#;
-        let resp: TenantAccessTokenResponse = serde_json::from_str(json).unwrap();
-        assert_eq!(resp.code, 0);
-        assert_eq!(resp.msg, "");
-        assert_eq!(resp.tenant_access_token, "t-abc");
-        assert_eq!(resp.expire, 3600);
-    }
-
-    #[test]
-    fn parse_token_error_response() {
-        let json = r#"{
-            "code": 10003,
-            "msg": "invalid app_id",
-            "tenant_access_token": "",
-            "expire": 0
-        }"#;
-        let resp: TenantAccessTokenResponse = serde_json::from_str(json).unwrap();
-        assert_eq!(resp.code, 10003);
-        assert!(resp.tenant_access_token.is_empty());
-    }
-}
@@ -100,14 +100,6 @@ struct TelegramMessage {

    /// Sticker.
    sticker: Option<TelegramSticker>,
-
-    /// Forum topic ID. Present when the message is sent inside a forum topic.
-    #[serde(default)]
-    message_thread_id: Option<i64>,
-
-    /// True when this message is sent inside a forum topic.
-    #[serde(default)]
-    is_topic_message: Option<bool>,
 }

 /// Telegram PhotoSize object.
@@ -298,10 +290,6 @@ struct TelegramMessageMetadata {

    /// Whether this is a private (DM) chat.
    is_private: bool,
-
-    /// Forum topic thread ID (for routing replies back to the correct topic).
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    message_thread_id: Option<i64>,
 }

 /// Channel configuration injected by host.
@@ -360,8 +348,6 @@ enum TelegramStatusAction {
 }

 const TELEGRAM_STATUS_MAX_CHARS: usize = 600;
-/// Telegram's hard limit for message text length.
-const TELEGRAM_MAX_MESSAGE_LEN: usize = 4096;

 fn truncate_status_message(input: &str, max_chars: usize) -> String {
    let mut iter = input.chars();
@@ -373,73 +359,6 @@ fn truncate_status_message(input: &str, max_chars: usize) -> String {
    }
 }

-/// Split a long message into chunks that fit within Telegram's 4096-char limit.
-///
-/// Tries to split at the most natural boundary available (in priority order):
-/// 1. Double newline (paragraph break)
-/// 2. Single newline
-/// 3. Sentence end (`. `, `! `, `? `)
-/// 4. Word boundary (space)
-/// 5. Hard cut at the limit (last resort for pathological input)
-fn split_message(text: &str) -> Vec<String> {
-    if text.chars().count() <= TELEGRAM_MAX_MESSAGE_LEN {
-        return vec![text.to_string()];
-    }
-
-    let mut chunks: Vec<String> = Vec::new();
-    let mut remaining = text;
-
-    while !remaining.is_empty() {
-        // Count chars to find the byte offset for our window.
-        let window_bytes = remaining
-            .char_indices()
-            .take(TELEGRAM_MAX_MESSAGE_LEN)
-            .last()
-            .map(|(byte_idx, ch)| byte_idx + ch.len_utf8())
-            .unwrap_or(remaining.len());
-
-        if window_bytes >= remaining.len() {
-            // Remainder fits entirely.
-            chunks.push(remaining.to_string());
-            break;
-        }
-
-        let window = &remaining[..window_bytes];
-
-        // 1. Double newline — best paragraph boundary
-        let split_at = window.rfind("\n\n")
-            // 2. Single newline
-            .or_else(|| window.rfind('\n'))
-            // 3. Sentence-ending punctuation followed by space.
-            //    Note: this only detects ASCII punctuation (. ! ?), not CJK
-            //    sentence-ending marks (。！？). CJK text falls through to
-            //    word-boundary or hard-cut splitting.
-            .or_else(|| {
-                let bytes = window.as_bytes();
-                // Search backwards for '. ', '! ', '? '
-                (1..bytes.len()).rev().find(|&i| {
-                    matches!(bytes[i - 1], b'.' | b'!' | b'?') && bytes[i] == b' '
-                })
-            })
-            // 4. Word boundary (last space)
-            .or_else(|| window.rfind(' '))
-            // 5. Hard cut
-            .unwrap_or(window_bytes);
-
-        // Avoid empty chunks (e.g. text starting with \n\n).
-        let split_at = if split_at == 0 { window_bytes } else { split_at };
-
-        // Trim whitespace at chunk boundaries for clean Telegram display.
-        // Note: this drops leading/trailing spaces at split points, which is
-        // acceptable for chat messages but means the concatenation of chunks
-        // may not exactly equal the original text when split at spaces.
-        chunks.push(remaining[..split_at].trim_end().to_string());
-        remaining = remaining[split_at..].trim_start();
-    }
-
-    chunks
-}
-
 fn status_message_for_user(update: &StatusUpdate) -> Option<String> {
    let message = update.message.trim();
    if message.is_empty() {
@@ -572,7 +491,8 @@ impl Guest for TelegramChannel {

            // Delete any existing webhook before polling. Telegram returns success
            // when no webhook exists, so any error here (e.g. 401) means a bad token.
-            delete_webhook().map_err(|e| format!("Bot token validation failed: {}", e))?;
+            delete_webhook()
+                .map_err(|e| format!("Bot token validation failed: {}", e))?;
        }

        // Configure polling only if not in webhook mode
@@ -760,12 +680,7 @@ impl Guest for TelegramChannel {
        let metadata: TelegramMessageMetadata = serde_json::from_str(&response.metadata_json)
            .map_err(|e| format!("Failed to parse metadata: {}", e))?;

-        send_response(
-            metadata.chat_id,
-            &response,
-            Some(metadata.message_id),
-            metadata.message_thread_id,
-        )
+        send_response(metadata.chat_id, &response, Some(metadata.message_id))
    }

    fn on_broadcast(user_id: String, response: AgentResponse) -> Result<(), String> {
@@ -773,7 +688,7 @@ impl Guest for TelegramChannel {
            .parse()
            .map_err(|e| format!("Invalid chat_id '{}': {}", user_id, e))?;

-        send_response(chat_id, &response, None, None)
+        send_response(chat_id, &response, None)
    }

    fn on_status(update: StatusUpdate) {
@@ -797,15 +712,11 @@ impl Guest for TelegramChannel {
        match action {
            TelegramStatusAction::Typing => {
                // POST /sendChatAction with action "typing"
-                let mut payload = serde_json::json!({
+                let payload = serde_json::json!({
                    "chat_id": metadata.chat_id,
                    "action": "typing"
                });

-                if let Some(thread_id) = metadata.message_thread_id {
-                    payload["message_thread_id"] = serde_json::Value::Number(thread_id.into());
-                }
-
                let payload_bytes = match serde_json::to_vec(&payload) {
                    Ok(b) => b,
                    Err(_) => return,
@@ -832,13 +743,9 @@ impl Guest for TelegramChannel {
            }
            TelegramStatusAction::Notify(prompt) => {
                // Send user-visible status updates for actionable events.
-                if let Err(first_err) = send_message(
-                    metadata.chat_id,
-                    &prompt,
-                    Some(metadata.message_id),
-                    None,
-                    metadata.message_thread_id,
-                ) {
+                if let Err(first_err) =
+                    send_message(metadata.chat_id, &prompt, Some(metadata.message_id), None)
+                {
                    channel_host::log(
                        channel_host::LogLevel::Warn,
                        &format!(
@@ -847,13 +754,7 @@ impl Guest for TelegramChannel {
                        ),
                    );

-                    if let Err(retry_err) = send_message(
-                        metadata.chat_id,
-                        &prompt,
-                        None,
-                        None,
-                        metadata.message_thread_id,
-                    ) {
+                    if let Err(retry_err) = send_message(metadata.chat_id, &prompt, None, None) {
                        channel_host::log(
                            channel_host::LogLevel::Debug,
                            &format!(
@@ -896,14 +797,6 @@ impl std::fmt::Display for SendError {
    }
 }

-/// Normalize `message_thread_id` for outbound API calls.
-///
-/// Telegram rejects `sendMessage` and file-send methods when
-/// `message_thread_id = 1` (the "General" topic), so omit it in that case.
-fn normalize_thread_id(thread_id: Option<i64>) -> Option<i64> {
-    thread_id.filter(|&id| id != 1)
-}
-
 /// Send a message via the Telegram Bot API.
 ///
 /// Returns the sent message_id on success. When `parse_mode` is set and
@@ -914,10 +807,7 @@ fn send_message(
    text: &str,
    reply_to_message_id: Option<i64>,
    parse_mode: Option<&str>,
-    message_thread_id: Option<i64>,
 ) -> Result<i64, SendError> {
-    let message_thread_id = normalize_thread_id(message_thread_id);
-
    let mut payload = serde_json::json!({
        "chat_id": chat_id,
        "text": text,
@@ -931,10 +821,6 @@ fn send_message(
        payload["parse_mode"] = serde_json::Value::String(mode.to_string());
    }

-    if let Some(thread_id) = message_thread_id {
-        payload["message_thread_id"] = serde_json::Value::Number(thread_id.into());
-    }
-
    let payload_bytes = serde_json::to_vec(&payload)
        .map_err(|e| SendError::Other(format!("Failed to serialize payload: {}", e)))?;

@@ -1025,20 +911,19 @@ fn download_telegram_file(file_id: &str) -> Result<Vec<u8>, String> {
    );

    let headers = serde_json::json!({});
-    let result = channel_host::http_request("GET", &get_file_url, &headers.to_string(), None, None);
+    let result =
+        channel_host::http_request("GET", &get_file_url, &headers.to_string(), None, None);

    let response = result.map_err(|e| format!("getFile request failed: {}", e))?;

    if response.status != 200 {
        let body_str = String::from_utf8_lossy(&response.body);
-        return Err(format!(
-            "getFile returned {}: {}",
-            response.status, body_str
-        ));
+        return Err(format!("getFile returned {}: {}", response.status, body_str));
    }

-    let api_response: TelegramApiResponse<TelegramFile> = serde_json::from_slice(&response.body)
-        .map_err(|e| format!("Failed to parse getFile response: {}", e))?;
+    let api_response: TelegramApiResponse<TelegramFile> =
+        serde_json::from_slice(&response.body)
+            .map_err(|e| format!("Failed to parse getFile response: {}", e))?;

    if !api_response.ok {
        return Err(format!(
@@ -1068,12 +953,16 @@ fn download_telegram_file(file_id: &str) -> Result<Vec<u8>, String> {
        file_path
    );

-    let result = channel_host::http_request("GET", &download_url, &headers.to_string(), None, None);
+    let result =
+        channel_host::http_request("GET", &download_url, &headers.to_string(), None, None);

    let response = result.map_err(|e| format!("File download failed: {}", e))?;

    if response.status != 200 {
-        return Err(format!("File download returned status {}", response.status));
+        return Err(format!(
+            "File download returned status {}",
+            response.status
+        ));
    }

    // Post-download size guard: Telegram metadata file_size is optional,
@@ -1147,10 +1036,7 @@ fn send_photo(
    mime_type: &str,
    data: &[u8],
    reply_to_message_id: Option<i64>,
-    message_thread_id: Option<i64>,
 ) -> Result<(), String> {
-    let message_thread_id = normalize_thread_id(message_thread_id);
-
    if data.len() > MAX_PHOTO_SIZE {
        channel_host::log(
            channel_host::LogLevel::Info,
@@ -1160,14 +1046,7 @@ fn send_photo(
                data.len()
            ),
        );
-        return send_document(
-            chat_id,
-            filename,
-            mime_type,
-            data,
-            reply_to_message_id,
-            message_thread_id,
-        );
+        return send_document(chat_id, filename, mime_type, data, reply_to_message_id);
    }

    let boundary = format!("ironclaw-{}", channel_host::now_millis());
@@ -1175,20 +1054,7 @@ fn send_photo(

    write_multipart_field(&mut body, &boundary, "chat_id", &chat_id.to_string());
    if let Some(msg_id) = reply_to_message_id {
-        write_multipart_field(
-            &mut body,
-            &boundary,
-            "reply_to_message_id",
-            &msg_id.to_string(),
-        );
-    }
-    if let Some(thread_id) = message_thread_id {
-        write_multipart_field(
-            &mut body,
-            &boundary,
-            "message_thread_id",
-            &thread_id.to_string(),
-        );
+        write_multipart_field(&mut body, &boundary, "reply_to_message_id", &msg_id.to_string());
    }
    write_multipart_file(&mut body, &boundary, "photo", filename, mime_type, data);
    body.extend_from_slice(format!("--{}--\r\n", boundary).as_bytes());
@@ -1231,29 +1097,13 @@ fn send_document(
    mime_type: &str,
    data: &[u8],
    reply_to_message_id: Option<i64>,
-    message_thread_id: Option<i64>,
 ) -> Result<(), String> {
-    let message_thread_id = normalize_thread_id(message_thread_id);
-
    let boundary = format!("ironclaw-{}", channel_host::now_millis());
    let mut body = Vec::new();

    write_multipart_field(&mut body, &boundary, "chat_id", &chat_id.to_string());
    if let Some(msg_id) = reply_to_message_id {
-        write_multipart_field(
-            &mut body,
-            &boundary,
-            "reply_to_message_id",
-            &msg_id.to_string(),
-        );
-    }
-    if let Some(thread_id) = message_thread_id {
-        write_multipart_field(
-            &mut body,
-            &boundary,
-            "message_thread_id",
-            &thread_id.to_string(),
-        );
+        write_multipart_field(&mut body, &boundary, "reply_to_message_id", &msg_id.to_string());
    }
    write_multipart_file(&mut body, &boundary, "document", filename, mime_type, data);
    body.extend_from_slice(format!("--{}--\r\n", boundary).as_bytes());
@@ -1290,7 +1140,12 @@ fn send_document(
 }

 /// Image MIME types that Telegram's sendPhoto API supports.
-const PHOTO_MIME_TYPES: &[&str] = &["image/jpeg", "image/png", "image/gif", "image/webp"];
+const PHOTO_MIME_TYPES: &[&str] = &[
+    "image/jpeg",
+    "image/png",
+    "image/gif",
+    "image/webp",
+];

 /// Send a full agent response (attachments + text) to a chat.
 ///
@@ -1299,11 +1154,10 @@ fn send_response(
    chat_id: i64,
    response: &AgentResponse,
    reply_to_message_id: Option<i64>,
-    message_thread_id: Option<i64>,
 ) -> Result<(), String> {
    // Send attachments first (photos/documents)
    for attachment in &response.attachments {
-        send_attachment(chat_id, attachment, reply_to_message_id, message_thread_id)?;
+        send_attachment(chat_id, attachment, reply_to_message_id)?;
    }

    // Skip text if empty and we already sent attachments
@@ -1311,64 +1165,16 @@ fn send_response(
        return Ok(());
    }

-    // Split large messages into chunks that fit Telegram's limit.
-    let chunks = split_message(&response.content);
-    let total = chunks.len();
-
-    // The first chunk replies to the original message; subsequent chunks
-    // reply to the previously sent chunk so they form a visual thread.
-    let mut reply_to = reply_to_message_id;
-
-    for (i, chunk) in chunks.into_iter().enumerate() {
-        // Try Markdown, fall back to plain text on parse errors
-        let result = send_message(chat_id, &chunk, reply_to, Some("Markdown"), message_thread_id);
-
-        let msg_id = match result {
-            Ok(id) => {
-                channel_host::log(
-                    channel_host::LogLevel::Debug,
-                    &format!(
-                        "Sent message chunk {}/{} to chat {}: message_id={}",
-                        i + 1,
-                        total,
-                        chat_id,
-                        id,
-                    ),
-                );
-                id
-            }
-            Err(SendError::ParseEntities(detail)) => {
-                channel_host::log(
-                    channel_host::LogLevel::Warn,
-                    &format!(
-                        "Markdown parse failed on chunk {}/{} ({}), retrying as plain text",
-                        i + 1,
-                        total,
-                        detail
-                    ),
-                );
-                let id = send_message(chat_id, &chunk, reply_to, None, message_thread_id)
-                    .map_err(|e| format!("Plain-text retry also failed: {}", e))?;
-                channel_host::log(
-                    channel_host::LogLevel::Debug,
-                    &format!(
-                        "Sent plain-text chunk {}/{} to chat {}: message_id={}",
-                        i + 1,
-                        total,
-                        chat_id,
-                        id,
-                    ),
-                );
-                id
-            }
-            Err(e) => return Err(e.to_string()),
-        };
-
-        // Each subsequent chunk threads off the previous sent message.
-        reply_to = Some(msg_id);
+    // Try Markdown, fall back to plain text on parse errors
+    match send_message(chat_id, &response.content, reply_to_message_id, Some("Markdown")) {
+        Ok(_) => Ok(()),
+        Err(SendError::ParseEntities(_)) => {
+            send_message(chat_id, &response.content, reply_to_message_id, None)
+                .map(|_| ())
+                .map_err(|e| format!("Plain-text retry also failed: {}", e))
+        }
+        Err(e) => Err(e.to_string()),
    }
-
-    Ok(())
 }

 /// Send a single attachment, choosing sendPhoto or sendDocument based on MIME type.
@@ -1376,7 +1182,6 @@ fn send_attachment(
    chat_id: i64,
    attachment: &Attachment,
    reply_to_message_id: Option<i64>,
-    message_thread_id: Option<i64>,
 ) -> Result<(), String> {
    if PHOTO_MIME_TYPES.contains(&attachment.mime_type.as_str()) {
        send_photo(
@@ -1385,7 +1190,6 @@ fn send_attachment(
            &attachment.mime_type,
            &attachment.data,
            reply_to_message_id,
-            message_thread_id,
        )
    } else {
        send_document(
@@ -1394,7 +1198,6 @@ fn send_attachment(
            &attachment.mime_type,
            &attachment.data,
            reply_to_message_id,
-            message_thread_id,
        )
    }
 }
@@ -1534,10 +1337,7 @@ fn register_webhook(tunnel_url: &str, webhook_secret: Option<&str>) -> Result<()
    let context = if retried { " (after retry)" } else { "" };
    channel_host::log(
        channel_host::LogLevel::Info,
-        &format!(
-            "Webhook registered successfully{}: {}",
-            context, webhook_url
-        ),
+        &format!("Webhook registered successfully{}: {}", context, webhook_url),
    );

    Ok(())
@@ -1557,7 +1357,6 @@ fn send_pairing_reply(chat_id: i64, code: &str) -> Result<(), String> {
        ),
        None,
        Some("Markdown"),
-        None,
    )
    .map(|_| ())
    .map_err(|e| e.to_string())
@@ -1639,9 +1438,7 @@ fn extract_attachments(message: &TelegramMessage) -> Vec<InboundAttachment> {
    if let Some(ref doc) = message.document {
        attachments.push(make_inbound_attachment(
            doc.file_id.clone(),
-            doc.mime_type
-                .clone()
-                .unwrap_or_else(|| "application/octet-stream".to_string()),
+            doc.mime_type.clone().unwrap_or_else(|| "application/octet-stream".to_string()),
            doc.file_name.clone(),
            doc.file_size.map(|s| s as u64),
            Some(get_file_url(&doc.file_id)),
@@ -1654,10 +1451,7 @@ fn extract_attachments(message: &TelegramMessage) -> Vec<InboundAttachment> {
    if let Some(ref audio) = message.audio {
        attachments.push(make_inbound_attachment(
            audio.file_id.clone(),
-            audio
-                .mime_type
-                .clone()
-                .unwrap_or_else(|| "audio/mpeg".to_string()),
+            audio.mime_type.clone().unwrap_or_else(|| "audio/mpeg".to_string()),
            audio.file_name.clone(),
            audio.file_size.map(|s| s as u64),
            Some(get_file_url(&audio.file_id)),
@@ -1670,10 +1464,7 @@ fn extract_attachments(message: &TelegramMessage) -> Vec<InboundAttachment> {
    if let Some(ref video) = message.video {
        attachments.push(make_inbound_attachment(
            video.file_id.clone(),
-            video
-                .mime_type
-                .clone()
-                .unwrap_or_else(|| "video/mp4".to_string()),
+            video.mime_type.clone().unwrap_or_else(|| "video/mp4".to_string()),
            video.file_name.clone(),
            video.file_size.map(|s| s as u64),
            Some(get_file_url(&video.file_id)),
@@ -1898,14 +1689,25 @@ fn handle_message(message: TelegramMessage) {

    let is_private = message.chat.chat_type == "private";

-    let owner_id = channel_host::workspace_read(OWNER_ID_PATH)
-        .filter(|s| !s.is_empty())
-        .and_then(|s| s.parse::<i64>().ok());
-    let is_owner = owner_id == Some(from.id);
+    // Owner validation: when owner_id is set, only that user can message
+    let owner_id_str = channel_host::workspace_read(OWNER_ID_PATH).filter(|s| !s.is_empty());

-    if !is_owner {
-        // Non-owner senders remain guests. Apply authorization based on
-        // dm_policy / allow_from before letting them chat in their own scope.
+    if let Some(ref id_str) = owner_id_str {
+        if let Ok(owner_id) = id_str.parse::<i64>() {
+            if from.id != owner_id {
+                channel_host::log(
+                    channel_host::LogLevel::Debug,
+                    &format!(
+                        "Dropping message from non-owner user {} (owner: {})",
+                        from.id, owner_id
+                    ),
+                );
+                return;
+            }
+        }
+    } else {
+        // No owner_id: apply authorization based on dm_policy and allow_from
+        // This applies to both private and group chats when owner_id is null
        let dm_policy =
            channel_host::workspace_read(DM_POLICY_PATH).unwrap_or_else(|| "pairing".to_string());

@@ -2012,7 +1814,6 @@ fn handle_message(message: TelegramMessage) {
        message_id: message.message_id,
        user_id: from.id,
        is_private,
-        message_thread_id: message.message_thread_id,
    };

    let metadata_json = serde_json::to_string(&metadata).unwrap_or_else(|_| "{}".to_string());
@@ -2037,7 +1838,7 @@ fn handle_message(message: TelegramMessage) {
        user_id: from.id.to_string(),
        user_name: Some(user_name),
        content: content_to_emit,
-        thread_id: Some(message.chat.id.to_string()),
+        thread_id: None, // Telegram doesn't have threads in the same way
        metadata_json,
        attachments,
    });
@@ -2150,102 +1951,6 @@ export!(TelegramChannel);
 mod tests {
    use super::*;

-    #[test]
-    fn test_split_message_short() {
-        let text = "Hello, world!";
-        let chunks = split_message(text);
-        assert_eq!(chunks, vec![text]);
-    }
-
-    #[test]
-    fn test_split_message_paragraph_boundary() {
-        let para_a = "A".repeat(3000);
-        let para_b = "B".repeat(3000);
-        let text = format!("{}\n\n{}", para_a, para_b);
-        let chunks = split_message(&text);
-        assert_eq!(chunks.len(), 2);
-        assert_eq!(chunks[0], para_a);
-        assert_eq!(chunks[1], para_b);
-    }
-
-    #[test]
-    fn test_split_message_word_boundary() {
-        // Build a string well over the limit with no newlines.
-        let words: Vec<String> = (0..1000).map(|i| format!("word{:04}", i)).collect();
-        let text = words.join(" ");
-        assert!(text.len() > TELEGRAM_MAX_MESSAGE_LEN);
-        let chunks = split_message(&text);
-        assert!(chunks.len() > 1, "expected multiple chunks");
-        for chunk in &chunks {
-            assert!(chunk.chars().count() <= TELEGRAM_MAX_MESSAGE_LEN);
-        }
-        // Rejoined chunks must equal the original text exactly.
-        let rejoined = chunks.join(" ");
-        assert_eq!(rejoined, text);
-    }
-
-    #[test]
-    fn test_split_message_each_chunk_fits() {
-        // Stress-test: 20 000 chars of mixed text.
-        let text: String = (0..500)
-            .map(|i| format!("Sentence number {}. ", i))
-            .collect();
-        assert!(text.len() > TELEGRAM_MAX_MESSAGE_LEN);
-        let chunks = split_message(&text);
-        for chunk in &chunks {
-            assert!(chunk.chars().count() <= TELEGRAM_MAX_MESSAGE_LEN);
-        }
-    }
-
-    #[test]
-    fn test_split_message_sentence_boundary() {
-        // Build text that exceeds the limit, with sentence boundaries inside.
-        let sentence = "This is a test sentence. ";
-        let repeat_count = TELEGRAM_MAX_MESSAGE_LEN / sentence.len() + 5;
-        let text: String = sentence.repeat(repeat_count);
-        assert!(text.chars().count() > TELEGRAM_MAX_MESSAGE_LEN);
-
-        let chunks = split_message(&text);
-        assert!(chunks.len() > 1);
-        // First chunk should end at a sentence boundary (trimmed)
-        let first = &chunks[0];
-        assert!(
-            first.ends_with('.'),
-            "First chunk should end at a sentence boundary, got: ...{}",
-            &first[first.len().saturating_sub(20)..]
-        );
-    }
-
-    #[test]
-    fn test_split_message_hard_cut_no_spaces() {
-        // Pathological input: a single huge "word" with no spaces or newlines.
-        let text = "x".repeat(TELEGRAM_MAX_MESSAGE_LEN * 2 + 100);
-        let chunks = split_message(&text);
-        assert!(chunks.len() >= 2);
-        for chunk in &chunks {
-            assert!(chunk.chars().count() <= TELEGRAM_MAX_MESSAGE_LEN);
-        }
-        // Rejoined must preserve all characters
-        let rejoined: String = chunks.concat();
-        assert_eq!(rejoined, text);
-    }
-
-    #[test]
-    fn test_split_message_multibyte_chars() {
-        // Emoji are 4 bytes each. Ensure we don't panic or split mid-character.
-        let emoji = "\u{1F600}"; // 😀
-        let text: String = emoji.repeat(TELEGRAM_MAX_MESSAGE_LEN + 100);
-        assert!(text.chars().count() > TELEGRAM_MAX_MESSAGE_LEN);
-
-        let chunks = split_message(&text);
-        assert!(chunks.len() >= 2);
-        for chunk in &chunks {
-            assert!(chunk.chars().count() <= TELEGRAM_MAX_MESSAGE_LEN);
-            // Every char should be a complete emoji
-            assert!(chunk.chars().all(|c| c == '\u{1F600}'));
-        }
-    }
-
    #[test]
    fn test_clean_message_text() {
        // Without bot_username: strips any leading @mention
@@ -2733,11 +2438,7 @@ mod tests {
        assert_eq!(attachments[0].id, "large_id"); // Largest photo
        assert_eq!(attachments[0].mime_type, "image/jpeg");
        assert_eq!(attachments[0].size_bytes, Some(54321));
-        assert!(attachments[0]
-            .source_url
-            .as_ref()
-            .unwrap()
-            .contains("large_id"));
+        assert!(attachments[0].source_url.as_ref().unwrap().contains("large_id"));
    }

    #[test]
@@ -2789,7 +2490,9 @@ mod tests {
            attachments[0].filename.as_deref(),
            Some("voice_voice_xyz.ogg")
        );
-        assert!(attachments[0].extras_json.contains("\"duration_secs\":5"));
+        assert!(attachments[0]
+            .extras_json
+            .contains("\"duration_secs\":5"));
    }

    #[test]
@@ -2935,33 +2638,18 @@ mod tests {
        };

        // PDFs and Office docs should be downloaded
-        assert!(is_downloadable_document(&make(
-            "application/pdf",
-            Some("report.pdf")
-        )));
+        assert!(is_downloadable_document(&make("application/pdf", Some("report.pdf"))));
        assert!(is_downloadable_document(&make(
            "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
            Some("doc.docx"),
        )));
-        assert!(is_downloadable_document(&make(
-            "text/plain",
-            Some("notes.txt")
-        )));
+        assert!(is_downloadable_document(&make("text/plain", Some("notes.txt"))));

        // Voice, image, audio, video should NOT be downloaded
-        assert!(!is_downloadable_document(&make(
-            "audio/ogg",
-            Some("voice_123.ogg")
-        )));
+        assert!(!is_downloadable_document(&make("audio/ogg", Some("voice_123.ogg"))));
        assert!(!is_downloadable_document(&make("image/jpeg", None)));
-        assert!(!is_downloadable_document(&make(
-            "audio/mpeg",
-            Some("song.mp3")
-        )));
-        assert!(!is_downloadable_document(&make(
-            "video/mp4",
-            Some("clip.mp4")
-        )));
+        assert!(!is_downloadable_document(&make("audio/mpeg", Some("song.mp3"))));
+        assert!(!is_downloadable_document(&make("video/mp4", Some("clip.mp4"))));
    }

    #[test]
@@ -2,13 +2,9 @@ coverage:
  status:
    project:
      default:
-        target: 80%
-        threshold: 2%
+        target: auto
+        threshold: 1%
    patch:
      default:
-        target: 90%
-
-comment:
-  layout: "reach,diff,flags"
-  behavior: default
-  require_changes: true
+        target: 80%
+        threshold: 5%
@@ -243,18 +243,6 @@ mod tests {
        assert!(wrapped.contains("Hello <world>"));
    }

-    #[test]
-    fn test_wrap_for_llm_escapes_attr_chars() {
-        let config = SafetyConfig {
-            max_output_length: 100_000,
-            injection_check_enabled: true,
-        };
-        let safety = SafetyLayer::new(&config);
-
-        let wrapped = safety.wrap_for_llm("bad&\"<>name", "ok", false);
-        assert!(wrapped.contains("name=\"bad&amp;&quot;&lt;&gt;name\"")); // safety: test assertion in #[cfg(test)] module
-    }
-
    #[test]
    fn test_sanitize_action_forces_sanitization_when_injection_check_disabled() {
        let config = SafetyConfig {
@@ -324,7 +324,7 @@ mod tests {
            let violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "excessive_urls pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -349,7 +349,7 @@ mod tests {
            let violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "obfuscated_string pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -370,7 +370,7 @@ mod tests {
            let _violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "shell_injection pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -387,7 +387,7 @@ mod tests {
            let _violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "sql_pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -405,7 +405,7 @@ mod tests {
            let _violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "crypto_private_key pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -423,7 +423,7 @@ mod tests {
            let _violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "system_file_access pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -441,7 +441,7 @@ mod tests {
            let _violations = policy.check(&payload);
            let elapsed = start.elapsed();
            assert!(
-                elapsed.as_millis() < 500,
+                elapsed.as_millis() < 100,
                "encoded_exploit pattern took {}ms on 100KB near-miss",
                elapsed.as_millis()
            );
@@ -623,7 +623,7 @@ mod tests {
            let combining_marks: Vec<char> =
                (0x0300u32..=0x0331).filter_map(char::from_u32).collect();
            assert!(combining_marks.len() >= 50);
-            let marks: String = combining_marks[..50].iter().collect();
+            let marks: String = combining_marks[..50].iter().collect(); // safety: Vec<char> slice, not byte slice
            let input = format!("prefix a{marks}suffix padding to reach minimum length for check");
            assert!(
                !has_excessive_repetition(&input),
@@ -15,8 +15,6 @@ ignore = [
    "RUSTSEC-2026-0020",
    # wasmtime wasi:http/types.fields panic — mitigated by fuel limits
    "RUSTSEC-2026-0021",
-    # rustls-webpki CRL distributionPoint matching — 0.102.8 pinned by libsql transitive dep
-    "RUSTSEC-2026-0049",
 ]

 [licenses]
@@ -15,9 +15,8 @@ configurations.
 | io.net | `ionet` | `IONET_API_KEY` | Intelligence API |
 | Mistral | `mistral` | `MISTRAL_API_KEY` | Mistral models |
 | Yandex AI Studio | `yandex` | `YANDEX_API_KEY` | YandexGPT models |
-| MiniMax | `minimax` | `MINIMAX_API_KEY` | MiniMax-M2.7 models |
+| MiniMax | `minimax` | `MINIMAX_API_KEY` | MiniMax-M2.5 models |
 | Cloudflare Workers AI | `cloudflare` | `CLOUDFLARE_API_KEY` | Access to Workers AI |
-| GitHub Copilot | `github_copilot` | `GITHUB_COPILOT_TOKEN` | Multi-models |
 | Ollama | `ollama` | No | Local inference |
 | AWS Bedrock | `bedrock` | AWS credentials | Native Converse API |
 | OpenRouter | `openai_compatible` | `LLM_API_KEY` | 300+ models |
@@ -62,34 +61,6 @@ Popular models: `gpt-4o`, `gpt-4o-mini`, `o3-mini`

 ---

-## GitHub Copilot
-
-GitHub Copilot exposes chat endpoint at
-`https://api.githubcopilot.com`. IronClaw uses that endpoint directly through the
-built-in `github_copilot` provider.
-
-```env
-LLM_BACKEND=github_copilot
-GITHUB_COPILOT_TOKEN=gho_...
-GITHUB_COPILOT_MODEL=gpt-4o
-# Optional advanced headers if your setup needs them:
-# GITHUB_COPILOT_EXTRA_HEADERS=Copilot-Integration-Id:vscode-chat
-```
-
-`ironclaw onboard` can acquire this token for you using GitHub device login. If you
-already signed into Copilot through VS Code or a JetBrains IDE, you can also reuse
-the `oauth_token` stored in `~/.config/github-copilot/apps.json`. If you prefer,
-`LLM_BACKEND=github-copilot` also works as an alias.
-
-Popular models vary by subscription, but `gpt-4o` is a safe default. IronClaw keeps
-model entry manual for this provider because GitHub Copilot model listing may require
-extra integration headers on some clients. IronClaw automatically injects the standard
-VS Code identity headers (`User-Agent`, `Editor-Version`, `Editor-Plugin-Version`,
-`Copilot-Integration-Id`) and lets you override them with
-`GITHUB_COPILOT_EXTRA_HEADERS`.
-
---
-
 ## Ollama (local)

 Install Ollama from [ollama.com](https://ollama.com), pull a model, then:
@@ -113,7 +84,7 @@ LLM_BACKEND=minimax
 MINIMAX_API_KEY=...
 ```

-Available models: `MiniMax-M2.7` (default), `MiniMax-M2.7-highspeed`, `MiniMax-M2.5`, `MiniMax-M2.5-highspeed`
+Available models: `MiniMax-M2.5` (default), `MiniMax-M2.5-highspeed`

 To use the China mainland endpoint, set:

@@ -0,0 +1,24 @@
+-- Append-only audit log for security-relevant system events.
+-- No UPDATE or DELETE should ever be issued on this table.
+
+CREATE TABLE IF NOT EXISTS audit_log (
+    id              BIGSERIAL PRIMARY KEY,
+    event_id        BIGINT NOT NULL,
+    event_type      VARCHAR(64) NOT NULL,
+    source_module   VARCHAR(64) NOT NULL,
+    source_component VARCHAR(64) NOT NULL,
+    category        VARCHAR(32) NOT NULL,
+    session_id      UUID,
+    thread_id       UUID,
+    job_id          UUID,
+    user_id         VARCHAR(255),
+    payload         JSONB NOT NULL DEFAULT '{}',
+    created_at      TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+-- Indexes for common query patterns
+CREATE INDEX IF NOT EXISTS idx_audit_log_created_at ON audit_log (created_at DESC);
+CREATE INDEX IF NOT EXISTS idx_audit_log_job_id ON audit_log (job_id) WHERE job_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_audit_log_session_id ON audit_log (session_id) WHERE session_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_audit_log_user_id ON audit_log (user_id) WHERE user_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_audit_log_event_type ON audit_log (event_type);
@@ -1,11 +0,0 @@
-- Remove the legacy 'default' sentinel from routine notifications.
-- A NULL notify_user now means "resolve the configured owner's last-seen
-- channel target at send time."
-
-ALTER TABLE routines
-    ALTER COLUMN notify_user DROP NOT NULL,
-    ALTER COLUMN notify_user DROP DEFAULT;
-
-UPDATE routines
-SET notify_user = NULL
-WHERE notify_user = 'default';
@@ -26,7 +26,7 @@ CREATE TABLE routines (

    -- Notification preferences
    notify_channel TEXT,                 -- NULL = use default
-    notify_user TEXT,
+    notify_user TEXT NOT NULL DEFAULT 'default',
    notify_on_success BOOLEAN NOT NULL DEFAULT false,
    notify_on_failure BOOLEAN NOT NULL DEFAULT true,
    notify_on_attention BOOLEAN NOT NULL DEFAULT true,
@@ -77,29 +77,6 @@
      "can_list_models": false
    }
  },
-  {
-    "id": "github_copilot",
-    "aliases": [
-      "github-copilot",
-      "githubcopilot",
-      "copilot"
-    ],
-    "protocol": "github_copilot",
-    "default_base_url": "https://api.githubcopilot.com",
-    "api_key_env": "GITHUB_COPILOT_TOKEN",
-    "api_key_required": true,
-    "model_env": "GITHUB_COPILOT_MODEL",
-    "default_model": "gpt-4o",
-    "extra_headers_env": "GITHUB_COPILOT_EXTRA_HEADERS",
-    "description": "GitHub Copilot Chat API (OAuth token from IDE sign-in)",
-    "setup": {
-      "kind": "api_key",
-      "secret_name": "llm_github_copilot_token",
-      "key_url": "https://docs.github.com/en/copilot",
-      "display_name": "GitHub Copilot",
-      "can_list_models": false
-    }
-  },
  {
    "id": "tinfoil",
    "aliases": [],
@@ -416,8 +393,8 @@
    "api_key_required": true,
    "base_url_env": "MINIMAX_BASE_URL",
    "model_env": "MINIMAX_MODEL",
-    "default_model": "MiniMax-M2.7",
-    "description": "MiniMax API (MiniMax-M2.7, MiniMax-M2.7-highspeed, MiniMax-M2.5 and MiniMax-M2.5-highspeed models)",
+    "default_model": "MiniMax-M2.5",
+    "description": "MiniMax API (MiniMax-M2.5 and MiniMax-M2.5-highspeed models)",
    "setup": {
      "kind": "api_key",
      "secret_name": "llm_minimax_api_key",
@@ -2,7 +2,7 @@
  "name": "discord",
  "display_name": "Discord Channel",
  "kind": "channel",
-  "version": "0.2.1",
+  "version": "0.2.0",
  "wit_version": "0.3.0",
  "description": "Talk to your agent in Discord",
  "keywords": [
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/channel-discord-0.2.1-wasm32-wasip2.tar.gz",
-      "sha256": "6159cb54aa44a9d8219e29bf0aea9404213b20ff567506fe75f23d4698d6ec18"
+      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/discord-0.2.0-wasm32-wasip2.tar.gz",
+      "sha256": "efa1b9019fa33e243f8db1e1fcc732731d45836336bdd26ca19b6fe227ca8b69"
    }
  },
  "auth_summary": {
@@ -2,7 +2,7 @@
  "name": "feishu",
  "display_name": "Feishu / Lark Channel",
  "kind": "channel",
-  "version": "0.1.1",
+  "version": "0.1.0",
  "wit_version": "0.3.0",
  "description": "Talk to your agent through a Feishu or Lark bot",
  "keywords": [
@@ -17,12 +17,7 @@
    "capabilities": "feishu.capabilities.json",
    "crate_name": "feishu-channel"
  },
-  "artifacts": {
-    "wasm32-wasip2": {
-      "sha256": "5fca74022264d1c8e78a0853766276f7ffa3cf0d8065b2f51ca10985acad4714",
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/channel-feishu-0.1.1-wasm32-wasip2.tar.gz"
-    }
-  },
+  "artifacts": {},
  "auth_summary": {
    "method": "manual",
    "provider": "Feishu / Lark",
@@ -2,7 +2,7 @@
  "name": "telegram",
  "display_name": "Telegram Channel",
  "kind": "channel",
-  "version": "0.2.5",
+  "version": "0.2.3",
  "wit_version": "0.3.0",
  "description": "Talk to your agent through a Telegram bot",
  "keywords": [
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/channel-telegram-0.2.4-wasm32-wasip2.tar.gz",
-      "sha256": "a7cb300ec1c946831cfceaa95c1dc8f30d0f42a3924f3cb5de8098821573f4b8"
+      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/telegram-0.2.3-wasm32-wasip2.tar.gz",
+      "sha256": "b9a83d5a2d1285ce0ec116b354336a1f245f893291ccb01dffbcaccf89d72aed"
    }
  },
  "auth_summary": {
@@ -2,7 +2,7 @@
  "name": "github",
  "display_name": "GitHub",
  "kind": "tool",
-  "version": "0.2.1",
+  "version": "0.2.0",
  "wit_version": "0.3.0",
  "description": "GitHub integration for issues, PRs, repos, and code search",
  "keywords": [
@@ -19,8 +19,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/tool-github-0.2.1-wasm32-wasip2.tar.gz",
-      "sha256": "92c530b3ad172e2372d819744b5233f1d8f65768e26eb5a6c213eba3ce1de758"
+      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/github-0.2.0-wasm32-wasip2.tar.gz",
+      "sha256": "da9fac56b6f20197a415489bbaec9fefb085a5cf6324cab79ea48a47eb19c13b"
    }
  },
  "auth_summary": {
@@ -21,8 +21,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/tool-llm-context-0.1.0-wasm32-wasip2.tar.gz",
-      "sha256": "d9ced2b1226b879135891e0ee40e072c7c95412e1b2462925a23853e1f92497e"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/llm-context-wasm32-wasip2.tar.gz",
+      "sha256": "581cc5867ef3b75116b7ddc8161e63dd92befe2b53e6ad8213c007639aa243c3"
    }
  },
  "auth_summary": {
@@ -17,8 +17,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/tool-slack-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "ccfb0415d7a04f9497726c712d15216de36e86f498b849101283c017f5ab4efb"
+      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/slack-0.2.1-wasm32-wasip2.tar.gz",
+      "sha256": "d4667e35126986509d862bc3a0088777305d8f41c75de83c1e223b42312ede48"
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/tool-telegram-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "c17065ca41fae5f2a7c43b36144686718cd310a2f22442313bb1aa82bbad0ae4"
+      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/telegram-0.2.2-wasm32-wasip2.tar.gz",
+      "sha256": "b9a83d5a2d1285ce0ec116b354336a1f245f893291ccb01dffbcaccf89d72aed"
    }
  },
  "auth_summary": {
@@ -2,7 +2,7 @@
  "name": "web-search",
  "display_name": "Web Search",
  "kind": "tool",
-  "version": "0.2.1",
+  "version": "0.2.0",
  "wit_version": "0.3.0",
  "description": "Search the web using Brave Search API",
  "keywords": [
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.19.0/tool-web-search-0.2.1-wasm32-wasip2.tar.gz",
-      "sha256": "bad275ca4ec314adea5241d6b92c44ccf9cebcbca8e30ba2493cc0bcb4b57218"
+      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/web-search-0.2.0-wasm32-wasip2.tar.gz",
+      "sha256": "56834573c54ea2a33cea1eb0f04bbdf59f1ef8d8702995cf431b0921302eeccc"
    }
  },
  "auth_summary": {
@@ -3,5 +3,4 @@ git_release_enable = false

 [[package]]
 name = "ironclaw_safety"
-publish = false
 release = false
@@ -134,8 +134,11 @@ fi
 #    Excludes test files, test modules, and debug_assert (compiled out in release).
 #    Suppress with "// safety: <reason>".
 PROD_DIFF="$DIFF_OUTPUT"
-# Strip hunks from test-only files (tests/ directory, *_test.rs, test_*.rs)
-PROD_DIFF=$(echo "$PROD_DIFF" | grep -v '^+++ b/tests/' || true)
+# Strip all hunks from test-only files (tests/ directory, *_test.rs, test_*.rs, benches/)
+PROD_DIFF=$(echo "$PROD_DIFF" | awk '
+    /^diff --git/ { in_test_file = ($0 ~ /tests\/|_test\.rs|test_.*\.rs|benches\//) }
+    !in_test_file { print }
+' || true)
 # Strip hunks whose @@ context line indicates a test module.
 # git diff includes the enclosing function/module name after @@.
 # Only match `mod tests` (the conventional #[cfg(test)] module) — do NOT
@@ -1,75 +0,0 @@
---
-name: delegation
-version: 0.1.0
-description: Helps users delegate tasks, break them into steps, set deadlines, and track progress via routines and memory.
-activation:
-  keywords:
-    - delegate
-    - hand off
-    - assign task
-    - help me with
-    - take care of
-    - remind me to
-    - schedule
-    - plan my
-    - manage my
-    - track this
-  patterns:
-    - "can you.*handle"
-    - "I need (help|someone) to"
-    - "take over"
-    - "set up a reminder"
-    - "follow up on"
-  tags:
-    - personal-assistant
-    - task-management
-    - delegation
-  max_context_tokens: 1500
---
-
-# Task Delegation Assistant
-
-When the user wants to delegate a task or get help managing something, follow this process:
-
-## 1. Clarify the Task
-
-Ask what needs to be done, by when, and any constraints. Get enough detail to act independently but don't over-interrogate. If the request is clear, skip straight to planning.
-
-## 2. Break It Down
-
-Decompose the task into concrete, actionable steps. Use `memory_write` to persist the task plan to a path like `tasks/{task-name}.md` with:
- Clear description
- Steps with checkboxes
- Due date (if any)
- Status: pending/in-progress/done
-
-## 3. Set Up Tracking
-
-If the task is recurring or has a deadline:
- Create a routine using `routine_create` for scheduled check-ins
- Add a heartbeat item if it needs daily monitoring
- Set up an event-triggered routine if it depends on external input
-
-## 4. Use Profile Context
-
-Check `USER.md` for the user's preferences:
- **Proactivity level**: High = check in frequently. Low = only report on completion.
- **Communication style**: Match their preferred tone and detail level.
- **Focus areas**: Prioritize tasks that align with their stated goals.
-
-## 5. Execute or Queue
-
- If you can do it now (search, draft, organize, calculate), do it immediately.
- If it requires waiting, external action, or follow-up, create a reminder routine.
- If it requires tools you don't have, explain what's needed and suggest alternatives.
-
-## 6. Report Back
-
-Always confirm the plan with the user before starting execution. After completing, update the task file in memory and notify the user with a concise summary.
-
-## Communication Guidelines
-
- Be direct and action-oriented
- Confirm understanding before acting on ambiguous requests
- When in doubt about autonomy level, ask once then remember the answer
- Use `memory_write` to track delegation preferences for future reference
@@ -8,21 +8,15 @@ Replace `{{...}}` placeholders before use.
 {
  "name": "wf-issue-plan",
  "description": "Create implementation plan when a new issue arrives",
+  "trigger_type": "system_event",
+  "event_source": "github",
+  "event_type": "issue.opened",
+  "event_filters": {
+    "repository_name": "{{repository}}"
+  },
+  "action_type": "full_job",
  "prompt": "For issue #{{issue_number}} in {{repository}}, produce a concrete implementation plan with milestones, edge cases, and tests. Post/update an issue comment with the plan.",
-  "request": {
-    "kind": "system_event",
-    "source": "github",
-    "event_type": "issue.opened",
-    "filters": {
-      "repository_name": "{{repository}}"
-    }
-  },
-  "execution": {
-    "mode": "full_job"
-  },
-  "advanced": {
-    "cooldown_secs": 30
-  }
+  "cooldown_secs": 30
 }
 ```

@@ -34,22 +28,16 @@ Trigger per-maintainer by creating one routine per handle, or maintain a shared
 {
  "name": "wf-maintainer-comment-gate-{{maintainer}}",
  "description": "React to maintainer guidance comments on issues/PRs",
+  "trigger_type": "system_event",
+  "event_source": "github",
+  "event_type": "pr.comment.created",
+  "event_filters": {
+    "repository_name": "{{repository}}",
+    "comment_author": "{{maintainer}}"
+  },
+  "action_type": "full_job",
  "prompt": "Read the maintainer comment and decide: update plan or start/continue implementation. If plan changes are requested, edit the plan artifact first. If implementation is requested, continue on the feature branch and update PR status/comment.",
-  "request": {
-    "kind": "system_event",
-    "source": "github",
-    "event_type": "pr.comment.created",
-    "filters": {
-      "repository_name": "{{repository}}",
-      "comment_author": "{{maintainer}}"
-    }
-  },
-  "execution": {
-    "mode": "full_job"
-  },
-  "advanced": {
-    "cooldown_secs": 20
-  }
+  "cooldown_secs": 20
 }
 ```

@@ -59,21 +47,15 @@ Trigger per-maintainer by creating one routine per handle, or maintain a shared
 {
  "name": "wf-pr-monitor-loop",
  "description": "Keep PR healthy: address review comments and refresh branch",
+  "trigger_type": "system_event",
+  "event_source": "github",
+  "event_type": "pr.synchronize",
+  "event_filters": {
+    "repository_name": "{{repository}}"
+  },
+  "action_type": "full_job",
  "prompt": "For PR #{{pr_number}}, collect open review comments and unresolved threads, apply fixes, push branch updates, and summarize remaining blockers. If conflict with {{main_branch}}, rebase/merge from origin/{{main_branch}} and resolve safely.",
-  "request": {
-    "kind": "system_event",
-    "source": "github",
-    "event_type": "pr.synchronize",
-    "filters": {
-      "repository_name": "{{repository}}"
-    }
-  },
-  "execution": {
-    "mode": "full_job"
-  },
-  "advanced": {
-    "cooldown_secs": 20
-  }
+  "cooldown_secs": 20
 }
 ```

@@ -83,22 +65,16 @@ Trigger per-maintainer by creating one routine per handle, or maintain a shared
 {
  "name": "wf-ci-fix-loop",
  "description": "Fix failing CI checks on active PRs",
+  "trigger_type": "system_event",
+  "event_source": "github",
+  "event_type": "ci.check_run.completed",
+  "event_filters": {
+    "repository_name": "{{repository}}",
+    "ci_conclusion": "failure"
+  },
+  "action_type": "full_job",
  "prompt": "Find failing check details for PR #{{pr_number}}, implement minimal safe fixes, rerun or await CI, and post concise status updates. Prioritize deterministic and test-backed fixes.",
-  "request": {
-    "kind": "system_event",
-    "source": "github",
-    "event_type": "ci.check_run.completed",
-    "filters": {
-      "repository_name": "{{repository}}",
-      "ci_conclusion": "failure"
-    }
-  },
-  "execution": {
-    "mode": "full_job"
-  },
-  "advanced": {
-    "cooldown_secs": 20
-  }
+  "cooldown_secs": 20
 }
 ```

@@ -108,17 +84,11 @@ Trigger per-maintainer by creating one routine per handle, or maintain a shared
 {
  "name": "wf-staging-batch-review",
  "description": "Batch correctness review through staging, then merge to main",
+  "trigger_type": "cron",
+  "schedule": "0 0 */{{batch_interval_hours}} * * *",
+  "action_type": "full_job",
  "prompt": "Every cycle: list ready PRs, merge ready ones into {{staging_branch}}, run deep correctness analysis in batch, fix discovered issues on affected branches, ensure CI green, then merge {{staging_branch}} into {{main_branch}} if clean.",
-  "request": {
-    "kind": "cron",
-    "schedule": "0 0 */{{batch_interval_hours}} * * *"
-  },
-  "execution": {
-    "mode": "full_job"
-  },
-  "advanced": {
-    "cooldown_secs": 120
-  }
+  "cooldown_secs": 120
 }
 ```

@@ -128,22 +98,16 @@ Trigger per-maintainer by creating one routine per handle, or maintain a shared
 {
  "name": "wf-learning-memory",
  "description": "Capture merge learnings into shared memory",
+  "trigger_type": "system_event",
+  "event_source": "github",
+  "event_type": "pr.closed",
+  "event_filters": {
+    "repository_name": "{{repository}}",
+    "pr_merged": "true"
+  },
+  "action_type": "full_job",
  "prompt": "From merged PR #{{pr_number}}, extract preventable mistakes, reviewer themes, CI failure causes, and successful patterns. Write/update a shared memory doc with actionable rules to reduce cycle time and regressions.",
-  "request": {
-    "kind": "system_event",
-    "source": "github",
-    "event_type": "pr.closed",
-    "filters": {
-      "repository_name": "{{repository}}",
-      "pr_merged": "true"
-    }
-  },
-  "execution": {
-    "mode": "full_job"
-  },
-  "advanced": {
-    "cooldown_secs": 30
-  }
+  "cooldown_secs": 30
 }
 ```

@@ -151,7 +115,7 @@ Trigger per-maintainer by creating one routine per handle, or maintain a shared

 ```json
 {
-  "event_source": "github",
+  "source": "github",
  "event_type": "issue.opened",
  "payload": {
    "repository_name": "{{repository}}",
@@ -1,118 +0,0 @@
---
-name: routine-advisor
-version: 0.1.0
-description: Suggests relevant cron routines based on user context, goals, and observed patterns
-activation:
-  keywords:
-    - every day
-    - every morning
-    - every week
-    - routine
-    - automate
-    - remind me
-    - check daily
-    - monitor
-    - recurring
-    - schedule
-    - habit
-    - workflow
-    - keep forgetting
-    - always have to
-    - repetitive
-    - notifications
-    - digest
-    - summary
-    - review daily
-    - weekly review
-  patterns:
-    - "I (always|usually|often|regularly) (check|do|look at|review)"
-    - "every (morning|evening|week|day|monday|friday)"
-    - "I (wish|want) (I|it) (could|would) (automatically|auto)"
-    - "is there a way to (auto|schedule|set up)"
-    - "can you (check|monitor|watch|track).*for me"
-    - "I keep (forgetting|missing|having to)"
-  tags:
-    - automation
-    - scheduling
-    - personal-assistant
-    - productivity
-  max_context_tokens: 1500
---
-
-# Routine Advisor
-
-When the conversation suggests the user has a repeatable task or could benefit from automation, consider suggesting a routine.
-
-## When to Suggest
-
-Suggest a routine when you notice:
- The user describes doing something repeatedly ("I check my PRs every morning")
- The user mentions forgetting recurring tasks ("I keep forgetting to...")
- The user asks you to do something that sounds periodic
- You've learned enough about the user to propose a relevant automation
- The user has installed extensions that enable new monitoring capabilities
-
-## How to Suggest
-
-Be specific and concrete. Not "Want me to set up a routine?" but rather: "I noticed you review PRs every morning. Want me to create a daily 9am routine that checks your open PRs and sends you a summary?"
-
-Always include:
-1. What the routine would do (specific action)
-2. When it would run (specific schedule in plain language)
-3. How it would notify them (which channel they're on)
-
-Wait for the user to confirm before creating.
-
-## Pacing
-
- First 1-3 conversations: Do NOT suggest routines. Focus on helping and learning.
- After learning 2-3 user patterns: Suggest your first routine. Keep it simple.
- After 5+ conversations: Suggest more routines as patterns emerge.
- Never suggest more than 1 routine per conversation unless the user is clearly interested.
- If the user declines, wait at least 3 conversations before suggesting again.
-
-## Creating Routines
-
-Use the `routine_create` tool. Before creating, check `routine_list` to avoid duplicates.
-
-Parameters:
- `trigger_type`: Usually "cron" for scheduled tasks
- `schedule`: Standard cron format. Common schedules:
-  - Daily 9am: `0 9 * * *`
-  - Weekday mornings: `0 9 * * MON-FRI`
-  - Weekly Monday: `0 9 * * MON`
-  - Every 2 hours during work: `0 9-17/2 * * MON-FRI`
-  - Sunday evening: `0 18 * * SUN`
- `action_type`: "lightweight" for simple checks, "full_job" for multi-step tasks
- `prompt`: Clear, specific instruction for what the routine should do
- `context_paths`: Workspace files to load as context (e.g., `["context/profile.json", "MEMORY.md"]`)
-
-## Routine Ideas by User Type
-
-**Developer:**
- Daily PR review digest (check open PRs, summarize what needs attention)
- CI/CD failure alerts (monitor build status)
- Weekly dependency update check
- Daily standup prep (summarize yesterday's work from daily logs)
-
-**Professional:**
- Morning briefing (today's priorities from memory + any pending tasks)
- End-of-day summary (what was accomplished, what's pending)
- Weekly goal review (check progress against stated goals)
- Meeting prep reminders
-
-**Health/Personal:**
- Daily exercise or habit check-in
- Weekly meal planning prompt
- Monthly budget review reminder
-
-**General:**
- Daily news digest on topics of interest
- Weekly reflection prompt (what went well, what to improve)
- Periodic task/reminder check-in
- Regular cleanup of stale tasks or notes
- Weekly profile evolution (if the user has a profile in `context/profile.json`, suggest a Monday routine that reads the profile via `memory_read`, searches recent conversations for new patterns with `memory_search`, and updates the profile via `memory_write` if any fields should change with confidence > 0.6 — be conservative, only update with clear evidence)
-
-## Awareness
-
-Before suggesting, consider what tools and extensions are currently available. Only suggest routines the agent can actually execute. If a routine would need a tool that isn't installed, mention that too: "If you connect your calendar, I could also send you a morning briefing with today's meetings."
@@ -113,7 +113,7 @@ Check-insert is done under a single write lock to prevent TOCTOU races. A cleanu
 4. Detects broken tools via `store.get_broken_tools(5)` (threshold: 5 failures). Requires `with_store()` to be called; returns empty without a store.
 5. Attempts to rebuild broken tools via `SoftwareBuilder`. Requires `with_builder()` to be called; returns `ManualRequired` without a builder.

-The `stuck_threshold` duration is used for time-based detection of `InProgress` jobs that have been running longer than the threshold. When `detect_stuck_jobs()` finds such jobs, it transitions them to `Stuck` before returning them, enabling the normal `attempt_recovery()` path.
+Note: the `stuck_threshold` duration is stored but currently unused (marked `#[allow(dead_code)]`). Stuck detection relies on `JobState::Stuck` being set by the state machine, not wall-clock time comparison.

 Repair results: `Success`, `Retry`, `Failed`, `ManualRequired`. `Retry` does NOT notify the user (to avoid spam).

@@ -17,12 +17,12 @@ use crate::agent::routine_engine::{RoutineEngine, spawn_cron_ticker};
 use crate::agent::self_repair::{DefaultSelfRepair, RepairResult, SelfRepair};
 use crate::agent::session_manager::SessionManager;
 use crate::agent::submission::{Submission, SubmissionParser, SubmissionResult};
-use crate::agent::{HeartbeatConfig as AgentHeartbeatConfig, Router, Scheduler, SchedulerDeps};
+use crate::agent::{HeartbeatConfig as AgentHeartbeatConfig, Router, Scheduler};
 use crate::channels::{ChannelManager, IncomingMessage, OutgoingResponse};
 use crate::config::{AgentConfig, HeartbeatConfig, RoutineConfig, SkillsConfig};
 use crate::context::ContextManager;
 use crate::db::Database;
-use crate::error::{ChannelError, Error};
+use crate::error::Error;
 use crate::extensions::ExtensionManager;
 use crate::hooks::HookRegistry;
 use crate::llm::LlmProvider;
@@ -31,13 +31,6 @@ use crate::skills::SkillRegistry;
 use crate::tools::ToolRegistry;
 use crate::workspace::Workspace;

-/// Static greeting persisted to DB and broadcast on first launch.
-///
-/// Sent before the LLM is involved so the user sees something immediately.
-/// The conversational onboarding (profile building, channel setup) happens
-/// organically in the subsequent turns driven by BOOTSTRAP.md.
-const BOOTSTRAP_GREETING: &str = include_str!("../workspace/seeds/GREETING.md");
-
 /// Collapse a tool output string into a single-line preview for display.
 pub(crate) fn truncate_for_preview(output: &str, max_chars: usize) -> String {
    let collapsed: String = output
@@ -61,86 +54,10 @@ pub(crate) fn truncate_for_preview(output: &str, max_chars: usize) -> String {
    }
 }

-#[cfg(test)]
-fn resolve_routine_notification_user(metadata: &serde_json::Value) -> Option<String> {
-    resolve_owner_scope_notification_user(
-        metadata.get("notify_user").and_then(|value| value.as_str()),
-        metadata.get("owner_id").and_then(|value| value.as_str()),
-    )
-}
-
-fn trimmed_option(value: Option<&str>) -> Option<String> {
-    value
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-        .map(ToOwned::to_owned)
-}
-
-fn resolve_owner_scope_notification_user(
-    explicit_user: Option<&str>,
-    owner_fallback: Option<&str>,
-) -> Option<String> {
-    trimmed_option(explicit_user).or_else(|| trimmed_option(owner_fallback))
-}
-
-async fn resolve_channel_notification_user(
-    extension_manager: Option<&Arc<ExtensionManager>>,
-    channel: Option<&str>,
-    explicit_user: Option<&str>,
-    owner_fallback: Option<&str>,
-) -> Option<String> {
-    if let Some(user) = trimmed_option(explicit_user) {
-        return Some(user);
-    }
-
-    if let Some(channel_name) = trimmed_option(channel)
-        && let Some(extension_manager) = extension_manager
-        && let Some(target) = extension_manager
-            .notification_target_for_channel(&channel_name)
-            .await
-    {
-        return Some(target);
-    }
-
-    resolve_owner_scope_notification_user(explicit_user, owner_fallback)
-}
-
-async fn resolve_routine_notification_target(
-    extension_manager: Option<&Arc<ExtensionManager>>,
-    metadata: &serde_json::Value,
-) -> Option<String> {
-    resolve_channel_notification_user(
-        extension_manager,
-        metadata
-            .get("notify_channel")
-            .and_then(|value| value.as_str()),
-        metadata.get("notify_user").and_then(|value| value.as_str()),
-        metadata.get("owner_id").and_then(|value| value.as_str()),
-    )
-    .await
-}
-
-pub(crate) fn chat_tool_execution_metadata(message: &IncomingMessage) -> serde_json::Value {
-    serde_json::json!({
-        "notify_channel": message.channel,
-        "notify_user": message
-            .routing_target()
-            .unwrap_or_else(|| message.user_id.clone()),
-        "notify_thread_id": message.thread_id,
-        "notify_metadata": message.metadata,
-    })
-}
-
-fn should_fallback_routine_notification(error: &ChannelError) -> bool {
-    !matches!(error, ChannelError::MissingRoutingTarget { .. })
-}
-
 /// Core dependencies for the agent.
 ///
 /// Bundles the shared components to reduce argument count.
 pub struct AgentDeps {
-    /// Resolved durable owner scope for the instance.
-    pub owner_id: String,
    pub store: Option<Arc<dyn Database>>,
    pub llm: Arc<dyn LlmProvider>,
    /// Cheap/fast LLM for lightweight tasks (heartbeat, routing, evaluation).
@@ -157,17 +74,15 @@ pub struct AgentDeps {
    /// Cost enforcement guardrails (daily budget, hourly rate limits).
    pub cost_guard: Arc<crate::agent::cost_guard::CostGuard>,
    /// SSE broadcast sender for live job event streaming to the web gateway.
-    pub sse_tx: Option<tokio::sync::broadcast::Sender<crate::channels::web::types::SseEvent>>,
+    pub sse_tx: Option<tokio::sync::broadcast::Sender<crate::events::DomainEvent>>,
+    /// Unified event bus. Optional for backward compatibility with tests.
+    pub event_bus: Option<crate::event_bus::EventBus>,
    /// HTTP interceptor for trace recording/replay.
    pub http_interceptor: Option<Arc<dyn crate::llm::recording::HttpInterceptor>>,
    /// Audio transcription middleware for voice messages.
    pub transcription: Option<Arc<crate::transcription::TranscriptionMiddleware>>,
    /// Document text extraction middleware for PDF, DOCX, PPTX, etc.
    pub document_extraction: Option<Arc<crate::document_extraction::DocumentExtractionMiddleware>>,
-    /// Sandbox readiness state for full-job routine dispatch.
-    pub sandbox_readiness: crate::agent::routine_engine::SandboxReadiness,
-    /// Software builder for self-repair tool rebuilding.
-    pub builder: Option<Arc<dyn crate::tools::SoftwareBuilder>>,
 }

 /// The main agent that coordinates all components.
@@ -183,25 +98,12 @@ pub struct Agent {
    pub(super) heartbeat_config: Option<HeartbeatConfig>,
    pub(super) hygiene_config: Option<crate::config::HygieneConfig>,
    pub(super) routine_config: Option<RoutineConfig>,
-    /// Shared routine-engine slot used for internal event matching and for exposing
-    /// the engine to gateway/manual trigger entry points.
+    /// Optional slot to expose the routine engine to the gateway for manual triggering.
    pub(super) routine_engine_slot:
-        Arc<tokio::sync::RwLock<Option<Arc<crate::agent::routine_engine::RoutineEngine>>>>,
+        Option<Arc<tokio::sync::RwLock<Option<Arc<crate::agent::routine_engine::RoutineEngine>>>>>,
 }

 impl Agent {
-    pub(super) fn owner_id(&self) -> &str {
-        if let Some(workspace) = self.deps.workspace.as_ref() {
-            debug_assert_eq!(
-                workspace.user_id(),
-                self.deps.owner_id,
-                "workspace.user_id() must stay aligned with deps.owner_id"
-            );
-        }
-
-        &self.deps.owner_id
-    }
-
    /// Create a new agent.
    ///
    /// Optionally accepts pre-created `ContextManager` and `SessionManager` for sharing
@@ -227,12 +129,9 @@ impl Agent {
            context_manager.clone(),
            deps.llm.clone(),
            deps.safety.clone(),
-            SchedulerDeps {
-                tools: deps.tools.clone(),
-                extension_manager: deps.extension_manager.clone(),
-                store: deps.store.clone(),
-                hooks: deps.hooks.clone(),
-            },
+            deps.tools.clone(),
+            deps.store.clone(),
+            deps.hooks.clone(),
        );
        if let Some(ref tx) = deps.sse_tx {
            scheduler.set_sse_sender(tx.clone());
@@ -254,21 +153,16 @@ impl Agent {
            heartbeat_config,
            hygiene_config,
            routine_config,
-            routine_engine_slot: Arc::new(tokio::sync::RwLock::new(None)),
+            routine_engine_slot: None,
        }
    }

-    /// Replace the routine-engine slot with a shared one so the gateway and
-    /// agent reference the same engine.
+    /// Set the routine engine slot for exposing the engine to the gateway.
    pub fn set_routine_engine_slot(
        &mut self,
        slot: Arc<tokio::sync::RwLock<Option<Arc<crate::agent::routine_engine::RoutineEngine>>>>,
    ) {
-        self.routine_engine_slot = slot;
-    }
-
-    async fn routine_engine(&self) -> Option<Arc<crate::agent::routine_engine::RoutineEngine>> {
-        self.routine_engine_slot.read().await.clone()
+        self.routine_engine_slot = Some(slot);
    }

    // Convenience accessors
@@ -361,51 +255,17 @@ impl Agent {

    /// Run the agent main loop.
    pub async fn run(self) -> Result<(), Error> {
-        // Proactive bootstrap: persist the static greeting to DB *before*
-        // starting channels so the first web client sees it via history.
-        let bootstrap_thread_id = if self
-            .workspace()
-            .is_some_and(|ws| ws.take_bootstrap_pending())
-        {
-            tracing::debug!(
-                "Fresh workspace detected — persisting static bootstrap greeting to DB"
-            );
-            if let Some(store) = self.store() {
-                let thread_id = store
-                    .get_or_create_assistant_conversation("default", "gateway")
-                    .await
-                    .ok();
-                if let Some(id) = thread_id {
-                    self.persist_assistant_response(id, "gateway", "default", BOOTSTRAP_GREETING)
-                        .await;
-                }
-                thread_id
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-
        // Start channels
        let mut message_stream = self.channels.start_all().await?;

        // Start self-repair task with notification forwarding
-        let mut self_repair = DefaultSelfRepair::new(
+        let repair = Arc::new(DefaultSelfRepair::new(
            self.context_manager.clone(),
            self.config.stuck_threshold,
            self.config.max_repair_attempts,
-        );
-        if let Some(ref store) = self.deps.store {
-            self_repair = self_repair.with_store(Arc::clone(store));
-        }
-        if let Some(ref builder) = self.deps.builder {
-            self_repair = self_repair.with_builder(Arc::clone(builder), Arc::clone(self.tools()));
-        }
-        let repair = Arc::new(self_repair);
+        ));
        let repair_interval = self.config.repair_check_interval;
        let repair_channels = self.channels.clone();
-        let repair_owner_id = self.owner_id().to_string();
        let repair_handle = tokio::spawn(async move {
            loop {
                tokio::time::sleep(repair_interval).await;
@@ -453,9 +313,7 @@ impl Agent {

                    if let Some(msg) = notification {
                        let response = OutgoingResponse::text(format!("Self-Repair: {}", msg));
-                        let _ = repair_channels
-                            .broadcast_all(&repair_owner_id, response)
-                            .await;
+                        let _ = repair_channels.broadcast_all("default", response).await;
                    }
                }

@@ -469,9 +327,7 @@ impl Agent {
                                "Self-Repair: Tool '{}' repaired: {}",
                                tool.name, message
                            ));
-                            let _ = repair_channels
-                                .broadcast_all(&repair_owner_id, response)
-                                .await;
+                            let _ = repair_channels.broadcast_all("default", response).await;
                        }
                        Ok(result) => {
                            tracing::info!("Tool repair result: {:?}", result);
@@ -508,12 +364,8 @@ impl Agent {
                        .timezone
                        .clone()
                        .or_else(|| Some(self.config.default_timezone.clone()));
-                    let heartbeat_notify_user = resolve_owner_scope_notification_user(
-                        hb_config.notify_user.as_deref(),
-                        Some(self.owner_id()),
-                    );
-                    if let Some(channel) = &hb_config.notify_channel
-                        && let Some(user) = heartbeat_notify_user.as_deref()
+                    if let (Some(user), Some(channel)) =
+                        (&hb_config.notify_user, &hb_config.notify_channel)
                    {
                        config = config.with_notify(user, channel);
                    }
@@ -524,22 +376,15 @@ impl Agent {

                    // Spawn notification forwarder that routes through channel manager
                    let notify_channel = hb_config.notify_channel.clone();
-                    let notify_target = resolve_channel_notification_user(
-                        self.deps.extension_manager.as_ref(),
-                        hb_config.notify_channel.as_deref(),
-                        hb_config.notify_user.as_deref(),
-                        Some(self.owner_id()),
-                    )
-                    .await;
-                    let notify_user = heartbeat_notify_user;
+                    let notify_user = hb_config.notify_user.clone();
                    let channels = self.channels.clone();
                    tokio::spawn(async move {
                        while let Some(response) = notify_rx.recv().await {
+                            let user = notify_user.as_deref().unwrap_or("default");
+
                            // Try the configured channel first, fall back to
                            // broadcasting on all channels.
-                            let targeted_ok = if let Some(ref channel) = notify_channel
-                                && let Some(ref user) = notify_target
-                            {
+                            let targeted_ok = if let Some(ref channel) = notify_channel {
                                channels
                                    .broadcast(channel, user, response.clone())
                                    .await
@@ -548,7 +393,7 @@ impl Agent {
                                false
                            };

-                            if !targeted_ok && let Some(ref user) = notify_user {
+                            if !targeted_ok {
                                let results = channels.broadcast_all(user, response).await;
                                for (ch, result) in results {
                                    if let Err(e) = result {
@@ -603,10 +448,8 @@ impl Agent {
                        Arc::clone(workspace),
                        notify_tx,
                        Some(self.scheduler.clone()),
-                        self.deps.extension_manager.clone(),
                        self.tools().clone(),
                        self.safety().clone(),
-                        self.deps.sandbox_readiness,
                    ));

                    // Register routine tools
@@ -619,60 +462,32 @@ impl Agent {

                    // Spawn notification forwarder (mirrors heartbeat pattern)
                    let channels = self.channels.clone();
-                    let extension_manager = self.deps.extension_manager.clone();
                    tokio::spawn(async move {
                        while let Some(response) = notify_rx.recv().await {
+                            let user = response
+                                .metadata
+                                .get("notify_user")
+                                .and_then(|v| v.as_str())
+                                .unwrap_or("default")
+                                .to_string();
                            let notify_channel = response
                                .metadata
                                .get("notify_channel")
                                .and_then(|v| v.as_str())
                                .map(|s| s.to_string());
-                            let fallback_user = resolve_owner_scope_notification_user(
-                                response
-                                    .metadata
-                                    .get("notify_user")
-                                    .and_then(|v| v.as_str()),
-                                response.metadata.get("owner_id").and_then(|v| v.as_str()),
-                            );
-                            let Some(user) = resolve_routine_notification_target(
-                                extension_manager.as_ref(),
-                                &response.metadata,
-                            )
-                            .await
-                            else {
-                                tracing::warn!(
-                                    notify_channel = ?notify_channel,
-                                    "Skipping routine notification with no explicit target or owner scope"
-                                );
-                                continue;
-                            };

                            // Try the configured channel first, fall back to
                            // broadcasting on all channels.
                            let targeted_ok = if let Some(ref channel) = notify_channel {
-                                match channels.broadcast(channel, &user, response.clone()).await {
-                                    Ok(()) => true,
-                                    Err(e) => {
-                                        let should_fallback =
-                                            should_fallback_routine_notification(&e);
-                                        tracing::warn!(
-                                            channel = %channel,
-                                            user = %user,
-                                            error = %e,
-                                            should_fallback,
-                                            "Failed to send routine notification to configured channel"
-                                        );
-                                        if !should_fallback {
-                                            continue;
-                                        }
-                                        false
-                                    }
-                                }
+                                channels
+                                    .broadcast(channel, &user, response.clone())
+                                    .await
+                                    .is_ok()
                            } else {
                                false
                            };

-                            if !targeted_ok && let Some(user) = fallback_user {
+                            if !targeted_ok {
                                let results = channels.broadcast_all(&user, response).await;
                                for (ch, result) in results {
                                    if let Err(e) = result {
@@ -699,7 +514,9 @@ impl Agent {
                    // via a local to use in the message loop below.

                    // Expose engine to gateway for manual triggering
-                    *self.routine_engine_slot.write().await = Some(Arc::clone(&engine));
+                    if let Some(ref slot) = self.routine_engine_slot {
+                        *slot.write().await = Some(Arc::clone(&engine));
+                    }

                    tracing::debug!(
                        "Routines enabled: cron ticker every {}s, max {} concurrent",
@@ -719,29 +536,8 @@ impl Agent {
            None
        };

-        // Bootstrap phase 2: register the thread in session manager and
-        // broadcast the greeting via SSE for any clients already connected.
-        // The greeting was already persisted to DB before start_all(), so
-        // clients that connect after this point will see it via history.
-        if let Some(id) = bootstrap_thread_id {
-            // Use get_or_create_session (not resolve_thread) to avoid creating
-            // an orphan thread. Then insert the DB-sourced thread directly.
-            let session = self.session_manager.get_or_create_session("default").await;
-            {
-                use crate::agent::session::Thread;
-                let mut sess = session.lock().await;
-                let thread = Thread::with_id(id, sess.id);
-                sess.active_thread = Some(id);
-                sess.threads.entry(id).or_insert(thread);
-            }
-            self.session_manager
-                .register_thread("default", "gateway", id, session)
-                .await;
-
-            let mut out = OutgoingResponse::text(BOOTSTRAP_GREETING.to_string());
-            out.thread_id = Some(id.to_string());
-            let _ = self.channels.broadcast("gateway", "default", out).await;
-        }
+        // Extract engine ref for use in message loop
+        let routine_engine_for_loop = routine_handle.as_ref().map(|(_, e)| Arc::clone(e));

        // Main message loop
        tracing::debug!("Agent {} ready and listening", self.config.name);
@@ -850,6 +646,14 @@ impl Agent {
                    }
                }
            }
+
+            // Check event triggers (cheap in-memory regex, fires async if matched)
+            if let Some(ref engine) = routine_engine_for_loop {
+                let fired = engine.check_event_triggers(&message).await;
+                if fired > 0 {
+                    tracing::debug!("Fired {} event-triggered routines", fired);
+                }
+            }
        }

        // Cleanup
@@ -936,6 +740,9 @@ impl Agent {
    }

    async fn handle_message(&self, message: &IncomingMessage) -> Result<Option<String>, Error> {
+        // Log at info level only for tracking without exposing PII (user_id can be a phone number)
+        tracing::info!(message_id = %message.id, "Processing message");
+
        // Log sensitive details at debug level for troubleshooting
        tracing::debug!(
            message_id = %message.id,
@@ -963,7 +770,10 @@ impl Agent {
        // For Signal, use signal_target from metadata (group:ID or phone number),
        // otherwise fall back to user_id
        let target = message
-            .routing_target()
+            .metadata
+            .get("signal_target")
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string())
            .unwrap_or_else(|| message.user_id.clone());
        self.tools()
            .set_message_tool_context(Some(message.channel.clone()), Some(target))
@@ -1002,77 +812,31 @@ impl Agent {
            }
        }

-        // Hydrate thread from DB if it's a historical thread not in memory.
-        // Capture the parsed UUID to avoid redundant re-parsing downstream.
-        let parsed_thread_uuid = if let Some(external_thread_id) = message.conversation_scope() {
+        // Hydrate thread from DB if it's a historical thread not in memory
+        if let Some(ref external_thread_id) = message.thread_id {
            tracing::trace!(
                message_id = %message.id,
                thread_id = %external_thread_id,
                "Hydrating thread from DB"
            );
-            match self.maybe_hydrate_thread(message, external_thread_id).await {
-                Ok(uuid) => uuid,
-                Err(rejection) => {
-                    return Ok(Some(format!("Error: {}", rejection)));
-                }
+            if let Some(rejection) = self.maybe_hydrate_thread(message, external_thread_id).await {
+                return Ok(Some(format!("Error: {}", rejection)));
            }
-        } else {
-            None
-        };
+        }

-        // Resolve session and thread. Approval submissions are allowed to
-        // target an already-loaded owned thread by UUID across channels so the
-        // web approval UI can approve work that originated from HTTP/other
-        // owner-scoped channels.
-        let approval_thread_uuid = if matches!(
-            submission,
-            Submission::ExecApproval { .. } | Submission::ApprovalResponse { .. }
-        ) {
-            parsed_thread_uuid
-        } else {
-            None
-        };
-
-        let (session, thread_id) = if let Some(target_thread_id) = approval_thread_uuid {
-            let session = self
-                .session_manager
-                .get_or_create_session(&message.user_id)
-                .await;
-            let mut sess = session.lock().await;
-            if sess.threads.contains_key(&target_thread_id) {
-                sess.active_thread = Some(target_thread_id);
-                sess.last_active_at = chrono::Utc::now();
-                drop(sess);
-                self.session_manager
-                    .register_thread(
-                        &message.user_id,
-                        &message.channel,
-                        target_thread_id,
-                        Arc::clone(&session),
-                    )
-                    .await;
-                (session, target_thread_id)
-            } else {
-                drop(sess);
-                self.session_manager
-                    .resolve_thread_with_parsed_uuid(
-                        &message.user_id,
-                        &message.channel,
-                        message.conversation_scope(),
-                        parsed_thread_uuid,
-                    )
-                    .await
-            }
-        } else {
-            self.session_manager
-                .resolve_thread_with_parsed_uuid(
-                    &message.user_id,
-                    &message.channel,
-                    message.conversation_scope(),
-                    parsed_thread_uuid,
-                )
-                .await
-        };
+        // Resolve session and thread
+        tracing::debug!(
+            message_id = %message.id,
+            "Resolving session and thread"
+        );
+        let (session, thread_id) = self
+            .session_manager
+            .resolve_thread(
+                &message.user_id,
+                &message.channel,
+                message.thread_id.as_deref(),
+            )
+            .await;
        tracing::debug!(
            message_id = %message.id,
            thread_id = %thread_id,
@@ -1137,24 +901,6 @@ impl Agent {
            message.content.len()
        );

-        if !message.is_internal
-            && let Submission::UserInput { ref content } = submission
-            && let Some(engine) = self.routine_engine().await
-        {
-            let fired = engine
-                .check_event_triggers(&message.user_id, &message.channel, content)
-                .await;
-            if fired > 0 {
-                tracing::debug!(
-                    channel = %message.channel,
-                    user = %message.user_id,
-                    fired,
-                    "Consumed inbound user message with matching event-triggered routine(s)"
-                );
-                return Ok(Some(String::new()));
-            }
-        }
-
        // Process based on submission type
        let result = match submission {
            Submission::UserInput { content } => {
@@ -1241,12 +987,7 @@ impl Agent {

 #[cfg(test)]
 mod tests {
-    use super::{
-        chat_tool_execution_metadata, resolve_routine_notification_user,
-        should_fallback_routine_notification, truncate_for_preview,
-    };
-    use crate::channels::IncomingMessage;
-    use crate::error::ChannelError;
+    use super::truncate_for_preview;

    #[test]
    fn test_truncate_short_input() {
@@ -1309,99 +1050,4 @@ mod tests {
        // 'h','e','l','l','o',' ','世','界' = 8 chars
        assert_eq!(result, "hello 世界...");
    }
-
-    #[test]
-    fn resolve_routine_notification_user_prefers_explicit_target() {
-        let metadata = serde_json::json!({
-            "notify_user": "12345",
-            "owner_id": "owner-scope",
-        });
-
-        let resolved = resolve_routine_notification_user(&metadata);
-        assert_eq!(resolved.as_deref(), Some("12345")); // safety: test-only assertion
-    }
-
-    #[test]
-    fn resolve_routine_notification_user_falls_back_to_owner_scope() {
-        let metadata = serde_json::json!({
-            "notify_user": null,
-            "owner_id": "owner-scope",
-        });
-
-        let resolved = resolve_routine_notification_user(&metadata);
-        assert_eq!(resolved.as_deref(), Some("owner-scope")); // safety: test-only assertion
-    }
-
-    #[test]
-    fn resolve_routine_notification_user_rejects_missing_values() {
-        let metadata = serde_json::json!({
-            "notify_user": "   ",
-        });
-
-        assert_eq!(resolve_routine_notification_user(&metadata), None); // safety: test-only assertion
-    }
-
-    #[test]
-    fn chat_tool_execution_metadata_prefers_message_routing_target() {
-        let message = IncomingMessage::new("telegram", "owner-scope", "hello")
-            .with_sender_id("telegram-user")
-            .with_thread("thread-7")
-            .with_metadata(serde_json::json!({
-                "chat_id": 424242,
-                "chat_type": "private",
-            }));
-
-        let metadata = chat_tool_execution_metadata(&message);
-        assert_eq!(
-            metadata.get("notify_channel").and_then(|v| v.as_str()),
-            Some("telegram")
-        ); // safety: test-only assertion
-        assert_eq!(
-            metadata.get("notify_user").and_then(|v| v.as_str()),
-            Some("424242")
-        ); // safety: test-only assertion
-        assert_eq!(
-            metadata.get("notify_thread_id").and_then(|v| v.as_str()),
-            Some("thread-7")
-        ); // safety: test-only assertion
-    }
-
-    #[test]
-    fn chat_tool_execution_metadata_falls_back_to_user_scope_without_route() {
-        let message = IncomingMessage::new("gateway", "owner-scope", "hello").with_sender_id("");
-
-        let metadata = chat_tool_execution_metadata(&message);
-        assert_eq!(
-            metadata.get("notify_channel").and_then(|v| v.as_str()),
-            Some("gateway")
-        ); // safety: test-only assertion
-        assert_eq!(
-            metadata.get("notify_user").and_then(|v| v.as_str()),
-            Some("owner-scope")
-        ); // safety: test-only assertion
-        assert_eq!(
-            metadata.get("notify_thread_id"),
-            Some(&serde_json::Value::Null)
-        ); // safety: test-only assertion
-    }
-
-    #[test]
-    fn targeted_routine_notifications_do_not_fallback_without_owner_route() {
-        let error = ChannelError::MissingRoutingTarget {
-            name: "telegram".to_string(),
-            reason: "No stored owner routing target for channel 'telegram'.".to_string(),
-        };
-
-        assert!(!should_fallback_routine_notification(&error)); // safety: test-only assertion
-    }
-
-    #[test]
-    fn targeted_routine_notifications_may_fallback_for_other_errors() {
-        let error = ChannelError::SendFailed {
-            name: "telegram".to_string(),
-            reason: "timeout talking to channel".to_string(),
-        };
-
-        assert!(should_fallback_routine_notification(&error)); // safety: test-only assertion
-    }
 }
@@ -836,10 +836,7 @@ impl Agent {
        // 1. Persist to DB if available.
        if let Some(store) = self.store() {
            let value = serde_json::Value::String(model.to_string());
-            if let Err(e) = store
-                .set_setting(self.owner_id(), "selected_model", &value)
-                .await
-            {
+            if let Err(e) = store.set_setting("default", "selected_model", &value).await {
                tracing::warn!("Failed to persist model to DB: {}", e);
            }
        }
@@ -29,7 +29,7 @@ pub(super) enum AgenticLoopResult {
    /// A tool requires approval before continuing.
    NeedApproval {
        /// The pending approval request to store.
-        pending: Box<PendingApproval>,
+        pending: PendingApproval,
    },
 }

@@ -140,11 +140,14 @@ impl Agent {

        // Create a JobContext for tool execution (chat doesn't have a real job)
        let mut job_ctx =
-            JobContext::with_user(&message.user_id, "chat", "Interactive chat session")
-                .with_requester_id(&message.sender_id);
+            JobContext::with_user(&message.user_id, "chat", "Interactive chat session");
        job_ctx.http_interceptor = self.deps.http_interceptor.clone();
        job_ctx.user_timezone = user_tz.name().to_string();
-        job_ctx.metadata = crate::agent::agent_loop::chat_tool_execution_metadata(message);
+        job_ctx.metadata = serde_json::json!({
+            "notify_channel": message.channel,
+            "notify_user": message.user_id,
+            "notify_thread_id": message.thread_id,
+        });

        // Build system prompts once for this turn. Two variants: with tools
        // (normal iterations) and without (force_text final iteration).
@@ -212,7 +215,9 @@ impl Agent {
                reason: format!("Exceeded maximum tool iterations ({max_tool_iterations})"),
            }
            .into()),
-            LoopOutcome::NeedApproval(pending) => Ok(AgenticLoopResult::NeedApproval { pending }),
+            LoopOutcome::NeedApproval(pending) => {
+                Ok(AgenticLoopResult::NeedApproval { pending: *pending })
+            }
        }
    }

@@ -252,7 +257,7 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
    async fn check_signals(&self) -> LoopSignal {
        let sess = self.session.lock().await;
        if let Some(thread) = sess.threads.get(&self.thread_id)
-            && thread.state == ThreadState::Interrupted
+            && thread.state() == ThreadState::Interrupted
        {
            return LoopSignal::Stop;
        }
@@ -475,7 +480,6 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
            usize,
            crate::llm::ToolCall,
            Arc<dyn crate::tools::Tool>,
-            bool, // allow_always
        )> = None;

        for (idx, original_tc) in tool_calls.iter().enumerate() {
@@ -545,8 +549,7 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
                && let Some(tool) = tool_opt
            {
                use crate::tools::ApprovalRequirement;
-                let requirement = tool.requires_approval(&tc.arguments);
-                let needs_approval = match requirement {
+                let needs_approval = match tool.requires_approval(&tc.arguments) {
                    ApprovalRequirement::Never => false,
                    ApprovalRequirement::UnlessAutoApproved => {
                        let sess = self.session.lock().await;
@@ -581,8 +584,7 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
                        continue;
                    }

-                    let allow_always = !matches!(requirement, ApprovalRequirement::Always);
-                    approval_needed = Some((idx, tc, tool, allow_always));
+                    approval_needed = Some((idx, tc, tool));
                    break;
                }
            }
@@ -883,7 +885,7 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
        }

        // Handle approval if a tool needed it
-        if let Some((approval_idx, tc, tool, allow_always)) = approval_needed {
+        if let Some((approval_idx, tc, tool)) = approval_needed {
            let display_params = redact_params(&tc.arguments, tool.sensitive_params());
            let pending = PendingApproval {
                request_id: Uuid::new_v4(),
@@ -895,7 +897,6 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
                context_messages: reason_ctx.messages.clone(),
                deferred_tool_calls: tool_calls[approval_idx + 1..].to_vec(),
                user_timezone: Some(self.user_tz.name().to_string()),
-                allow_always,
            };

            return Ok(Some(LoopOutcome::NeedApproval(Box::new(pending))));
@@ -1174,7 +1175,6 @@ mod tests {
    /// Build a minimal `Agent` for unit testing (no DB, no workspace, no extensions).
    fn make_test_agent() -> Agent {
        let deps = AgentDeps {
-            owner_id: "default".to_string(),
            store: None,
            llm: Arc::new(StaticLlmProvider),
            cheap_llm: None,
@@ -1194,8 +1194,7 @@ mod tests {
            http_interceptor: None,
            transcription: None,
            document_extraction: None,
-            sandbox_readiness: crate::agent::routine_engine::SandboxReadiness::DisabledByConfig,
-            builder: None,
+            event_bus: None,
        };

        Agent::new(
@@ -1363,35 +1362,6 @@ mod tests {
        assert!(always_needs, "Always must always require approval");
    }

-    /// Regression test: `allow_always` must be `false` for `Always` and
-    /// `true` for `UnlessAutoApproved`, so the UI hides the "always" button
-    /// for tools that truly cannot be auto-approved.
-    #[test]
-    fn test_allow_always_matches_approval_requirement() {
-        use crate::tools::ApprovalRequirement;
-
-        // Mirrors the expression used in dispatcher.rs and thread_ops.rs:
-        //   let allow_always = !matches!(requirement, ApprovalRequirement::Always);
-
-        // UnlessAutoApproved → allow_always = true
-        let req = ApprovalRequirement::UnlessAutoApproved;
-        let allow_always = !matches!(req, ApprovalRequirement::Always);
-        assert!(
-            allow_always,
-            "UnlessAutoApproved should set allow_always = true"
-        );
-
-        // Always → allow_always = false
-        let req = ApprovalRequirement::Always;
-        let allow_always = !matches!(req, ApprovalRequirement::Always);
-        assert!(!allow_always, "Always should set allow_always = false");
-
-        // Never → allow_always = true (approval is never needed, but if it were, always would be ok)
-        let req = ApprovalRequirement::Never;
-        let allow_always = !matches!(req, ApprovalRequirement::Always);
-        assert!(allow_always, "Never should set allow_always = true");
-    }
-
    #[test]
    fn test_pending_approval_serialization_backcompat_without_deferred_calls() {
        // PendingApproval from before the deferred_tool_calls field was added
@@ -1437,7 +1407,6 @@ mod tests {
                },
            ],
            user_timezone: None,
-            allow_always: true,
        };

        let json = serde_json::to_string(&pending).expect("serialize");
@@ -2046,7 +2015,6 @@ mod tests {
    /// `max_tool_iterations` override.
    fn make_test_agent_with_llm(llm: Arc<dyn LlmProvider>, max_tool_iterations: usize) -> Agent {
        let deps = AgentDeps {
-            owner_id: "default".to_string(),
            store: None,
            llm,
            cheap_llm: None,
@@ -2066,8 +2034,7 @@ mod tests {
            http_interceptor: None,
            transcription: None,
            document_extraction: None,
-            sandbox_readiness: crate::agent::routine_engine::SandboxReadiness::DisabledByConfig,
-            builder: None,
+            event_bus: None,
        };

        Agent::new(
@@ -2162,7 +2129,6 @@ mod tests {
        let max_iter = 3;
        let agent = {
            let deps = AgentDeps {
-                owner_id: "default".to_string(),
                store: None,
                llm,
                cheap_llm: None,
@@ -2186,8 +2152,7 @@ mod tests {
                http_interceptor: None,
                transcription: None,
                document_extraction: None,
-                sandbox_readiness: crate::agent::routine_engine::SandboxReadiness::DisabledByConfig,
-                builder: None,
+                event_bus: None,
            };

            Agent::new(
@@ -26,8 +26,6 @@
 use std::sync::Arc;
 use std::time::Duration;

-use chrono::TimeZone as _;
-use chrono_tz::Tz;
 use tokio::sync::mpsc;

 use crate::channels::OutgoingResponse;
@@ -39,7 +37,7 @@ use crate::workspace::hygiene::HygieneConfig;
 /// Configuration for the heartbeat runner.
 #[derive(Debug, Clone)]
 pub struct HeartbeatConfig {
-    /// Interval between heartbeat checks (used when fire_at is not set).
+    /// Interval between heartbeat checks.
    pub interval: Duration,
    /// Whether heartbeat is enabled.
    pub enabled: bool,
@@ -49,13 +47,11 @@ pub struct HeartbeatConfig {
    pub notify_user_id: Option<String>,
    /// Channel to notify on heartbeat findings.
    pub notify_channel: Option<String>,
-    /// Fixed time-of-day to fire (24h). When set, interval is ignored.
-    pub fire_at: Option<chrono::NaiveTime>,
    /// Hour (0-23) when quiet hours start.
    pub quiet_hours_start: Option<u32>,
    /// Hour (0-23) when quiet hours end.
    pub quiet_hours_end: Option<u32>,
-    /// Timezone for fire_at and quiet hours evaluation (IANA name).
+    /// Timezone for quiet hours evaluation (IANA name).
    pub timezone: Option<String>,
 }

@@ -67,7 +63,6 @@ impl Default for HeartbeatConfig {
            max_failures: 3,
            notify_user_id: None,
            notify_channel: None,
-            fire_at: None,
            quiet_hours_start: None,
            quiet_hours_end: None,
            timezone: None,
@@ -114,21 +109,6 @@ impl HeartbeatConfig {
        self.notify_channel = Some(channel.into());
        self
    }
-
-    /// Set a fixed time-of-day to fire (overrides interval).
-    pub fn with_fire_at(mut self, time: chrono::NaiveTime, tz: Option<String>) -> Self {
-        self.fire_at = Some(time);
-        self.timezone = tz;
-        self
-    }
-
-    /// Resolve timezone string to chrono_tz::Tz (defaults to UTC).
-    fn resolved_tz(&self) -> Tz {
-        self.timezone
-            .as_deref()
-            .and_then(crate::timezone::parse_timezone)
-            .unwrap_or(chrono_tz::UTC)
-    }
 }

 /// Result of a heartbeat check.
@@ -144,33 +124,6 @@ pub enum HeartbeatResult {
    Failed(String),
 }

-/// Compute how long to sleep until the next occurrence of `fire_at` in `tz`.
-///
-/// If the target time today is still in the future, sleep until then.
-/// Otherwise sleep until the same time tomorrow.
-fn duration_until_next_fire(fire_at: chrono::NaiveTime, tz: Tz) -> Duration {
-    let now = chrono::Utc::now().with_timezone(&tz);
-    let today = now.date_naive();
-
-    // Try to build today's target datetime in the given timezone.
-    // `.earliest()` picks the first occurrence if DST creates ambiguity.
-    let candidate = tz.from_local_datetime(&today.and_time(fire_at)).earliest();
-
-    let target = match candidate {
-        Some(t) if t > now => t,
-        _ => {
-            // Already past (or ambiguous) — schedule for tomorrow
-            let tomorrow = today + chrono::Duration::days(1);
-            tz.from_local_datetime(&tomorrow.and_time(fire_at))
-                .earliest()
-                .unwrap_or_else(|| now + chrono::Duration::days(1))
-        }
-    };
-
-    let secs = (target - now).num_seconds().max(1) as u64;
-    Duration::from_secs(secs)
-}
-
 /// Heartbeat runner for proactive periodic execution.
 pub struct HeartbeatRunner {
    config: HeartbeatConfig,
@@ -222,39 +175,17 @@ impl HeartbeatRunner {
            return;
        }

-        // Two scheduling modes:
-        //   fire_at → sleep until the next occurrence (recalculated each iteration)
-        //   interval → tokio::time::interval (drift-free, accounts for loop body time)
-        let mut tick_interval = if self.config.fire_at.is_none() {
-            let mut iv = tokio::time::interval(self.config.interval);
-            // Don't fire immediately on startup.
-            iv.tick().await;
-            Some(iv)
-        } else {
-            None
-        };
+        tracing::info!(
+            "Starting heartbeat loop with interval {:?}",
+            self.config.interval
+        );

-        if let Some(fire_at) = self.config.fire_at {
-            tracing::info!(
-                "Starting heartbeat loop: fire daily at {:?} {:?}",
-                fire_at,
-                self.config.timezone
-            );
-        } else {
-            tracing::info!(
-                "Starting heartbeat loop with interval {:?}",
-                self.config.interval
-            );
-        }
+        let mut interval = tokio::time::interval(self.config.interval);
+        // Don't run immediately on startup
+        interval.tick().await;

        loop {
-            if let Some(fire_at) = self.config.fire_at {
-                let sleep_dur = duration_until_next_fire(fire_at, self.config.resolved_tz());
-                tracing::info!("Next heartbeat in {:.1}h", sleep_dur.as_secs_f64() / 3600.0);
-                tokio::time::sleep(sleep_dur).await;
-            } else if let Some(ref mut iv) = tick_interval {
-                iv.tick().await;
-            }
+            interval.tick().await;

            // Skip during quiet hours
            if self.config.is_quiet_hours() {
@@ -402,11 +333,7 @@ impl HeartbeatRunner {
            return;
        };

-        let user_id = self
-            .config
-            .notify_user_id
-            .as_deref()
-            .unwrap_or_else(|| self.workspace.user_id());
+        let user_id = self.config.notify_user_id.as_deref().unwrap_or("default");

        // Persist to heartbeat conversation and get thread_id
        let thread_id = if let Some(ref store) = self.store {
@@ -435,7 +362,6 @@ impl HeartbeatRunner {
            attachments: Vec::new(),
            metadata: serde_json::json!({
                "source": "heartbeat",
-                "owner_id": self.workspace.user_id(),
            }),
        };

@@ -730,63 +656,4 @@ mod tests {
        ) -> tokio::task::JoinHandle<()> = spawn_heartbeat;
        let _ = _fn_ptr;
    }
-
-    // ==================== fire_at scheduling ====================
-
-    #[test]
-    fn test_default_config_has_no_fire_at() {
-        let config = HeartbeatConfig::default();
-        assert!(config.fire_at.is_none());
-        // Interval-based scheduling should be the default
-        assert_eq!(config.interval, Duration::from_secs(30 * 60));
-    }
-
-    #[test]
-    fn test_with_fire_at_builder() {
-        let time = chrono::NaiveTime::from_hms_opt(9, 0, 0).unwrap();
-        let config =
-            HeartbeatConfig::default().with_fire_at(time, Some("Pacific/Auckland".to_string()));
-        assert_eq!(config.fire_at, Some(time));
-        assert_eq!(config.timezone, Some("Pacific/Auckland".to_string()));
-    }
-
-    #[test]
-    fn test_duration_until_next_fire_is_bounded() {
-        // Result must always be between 1 second and ~24 hours
-        let time = chrono::NaiveTime::from_hms_opt(14, 0, 0).unwrap();
-        let dur = duration_until_next_fire(time, chrono_tz::UTC);
-        assert!(dur.as_secs() >= 1, "duration must be at least 1 second");
-        assert!(
-            dur.as_secs() <= 86_401,
-            "duration must be at most ~24 hours, got {}s",
-            dur.as_secs()
-        );
-    }
-
-    #[test]
-    fn test_duration_until_next_fire_dst_timezone_no_panic() {
-        // Use a timezone with DST (US Eastern) — should never panic
-        let tz: Tz = "America/New_York".parse().unwrap();
-        // Test a range of times including midnight boundaries
-        for hour in [0, 2, 3, 12, 23] {
-            let time = chrono::NaiveTime::from_hms_opt(hour, 30, 0).unwrap();
-            let dur = duration_until_next_fire(time, tz);
-            assert!(dur.as_secs() >= 1);
-            assert!(dur.as_secs() <= 86_401);
-        }
-    }
-
-    #[test]
-    fn test_resolved_tz_defaults_to_utc() {
-        let config = HeartbeatConfig::default();
-        assert_eq!(config.resolved_tz(), chrono_tz::UTC);
-    }
-
-    #[test]
-    fn test_resolved_tz_parses_iana() {
-        let time = chrono::NaiveTime::from_hms_opt(9, 0, 0).unwrap();
-        let config =
-            HeartbeatConfig::default().with_fire_at(time, Some("Europe/London".to_string()));
-        assert_eq!(config.resolved_tz(), chrono_tz::Europe::London);
-    }
 }
@@ -14,15 +14,12 @@
 //!                                                   Agent Loop
 //! ```

-use std::sync::Arc;
-
 use tokio::sync::{broadcast, mpsc};
 use tokio::task::JoinHandle;
 use uuid::Uuid;

 use crate::channels::IncomingMessage;
-use crate::channels::web::types::SseEvent;
-use crate::context::{ContextManager, JobState};
+use crate::events::DomainEvent as SseEvent;

 /// Route context for forwarding job monitor events back to the user's channel.
 #[derive(Debug, Clone)]
@@ -43,23 +40,10 @@ pub struct JobMonitorRoute {
 /// Tool use/result and status events are intentionally skipped (too noisy for
 /// the main agent's context window).
 pub fn spawn_job_monitor(
-    job_id: Uuid,
-    event_rx: broadcast::Receiver<(Uuid, SseEvent)>,
-    inject_tx: mpsc::Sender<IncomingMessage>,
-    route: JobMonitorRoute,
-) -> JoinHandle<()> {
-    spawn_job_monitor_with_context(job_id, event_rx, inject_tx, route, None)
-}
-
-/// Like `spawn_job_monitor`, but also transitions the job's in-memory state
-/// when it receives a `JobResult` event. This ensures fire-and-forget sandbox
-/// jobs don't stay `InProgress` forever in the `ContextManager`.
-pub fn spawn_job_monitor_with_context(
    job_id: Uuid,
    mut event_rx: broadcast::Receiver<(Uuid, SseEvent)>,
    inject_tx: mpsc::Sender<IncomingMessage>,
    route: JobMonitorRoute,
-    context_manager: Option<Arc<ContextManager>>,
 ) -> JoinHandle<()> {
    let short_id = job_id.to_string()[..8].to_string();

@@ -93,26 +77,6 @@ pub fn spawn_job_monitor_with_context(
                            }
                        }
                        SseEvent::JobResult { status, .. } => {
-                            // Transition in-memory state so the job frees its
-                            // max_jobs slot and query tools show the final state.
-                            if let Some(ref cm) = context_manager {
-                                let target = if status == "completed" {
-                                    JobState::Completed
-                                } else {
-                                    JobState::Failed
-                                };
-                                let reason = if status != "completed" {
-                                    Some(format!("Container finished: {}", status))
-                                } else {
-                                    None
-                                };
-                                let _ = cm
-                                    .update_context(job_id, |ctx| {
-                                        let _ = ctx.transition_to(target, reason);
-                                    })
-                                    .await;
-                            }
-
                            let mut msg = IncomingMessage::new(
                                route.channel.clone(),
                                route.user_id.clone(),
@@ -157,62 +121,6 @@ pub fn spawn_job_monitor_with_context(
    })
 }

-/// Lightweight watcher that only transitions ContextManager state on job
-/// completion. Used when monitor routing metadata is absent (no channel to
-/// inject messages into) but we still need to free the `max_jobs` slot.
-pub fn spawn_completion_watcher(
-    job_id: Uuid,
-    mut event_rx: broadcast::Receiver<(Uuid, SseEvent)>,
-    context_manager: Arc<ContextManager>,
-) -> JoinHandle<()> {
-    let short_id = job_id.to_string()[..8].to_string();
-
-    tokio::spawn(async move {
-        loop {
-            match event_rx.recv().await {
-                Ok((ev_job_id, SseEvent::JobResult { status, .. })) if ev_job_id == job_id => {
-                    let target = if status == "completed" {
-                        JobState::Completed
-                    } else {
-                        JobState::Failed
-                    };
-                    let reason = if status != "completed" {
-                        Some(format!("Container finished: {}", status))
-                    } else {
-                        None
-                    };
-                    let _ = context_manager
-                        .update_context(job_id, |ctx| {
-                            let _ = ctx.transition_to(target, reason);
-                        })
-                        .await;
-                    tracing::debug!(
-                        job_id = %short_id,
-                        status = %status,
-                        "Completion watcher exiting (job finished)"
-                    );
-                    break;
-                }
-                Ok(_) => {}
-                Err(broadcast::error::RecvError::Lagged(n)) => {
-                    tracing::warn!(
-                        job_id = %short_id,
-                        skipped = n,
-                        "Completion watcher lagged"
-                    );
-                }
-                Err(broadcast::error::RecvError::Closed) => {
-                    tracing::debug!(
-                        job_id = %short_id,
-                        "Broadcast channel closed, stopping completion watcher"
-                    );
-                    break;
-                }
-            }
-        }
-    })
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -303,7 +211,6 @@ mod tests {
                    job_id: job_id.to_string(),
                    status: "completed".to_string(),
                    session_id: None,
-                    fallback_deliverable: None,
                },
            ))
            .unwrap();
@@ -386,139 +293,4 @@ mod tests {
        let msg = IncomingMessage::new("monitor", "system", "test").into_internal();
        assert!(msg.is_internal);
    }
-
-    // === Regression: fire-and-forget sandbox jobs must transition out of InProgress ===
-    // Before this fix, spawn_job_monitor only forwarded SSE messages but never
-    // updated ContextManager. Background sandbox jobs stayed InProgress forever,
-    // permanently consuming a max_jobs slot.
-
-    #[tokio::test]
-    async fn test_monitor_transitions_context_on_completion() {
-        use crate::context::{ContextManager, JobState};
-
-        let cm = Arc::new(ContextManager::new(5));
-        let job_id = Uuid::new_v4();
-        cm.register_sandbox_job(job_id, "user-1", "Build app", "desc")
-            .await
-            .unwrap();
-
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let (inject_tx, mut inject_rx) = mpsc::channel::<IncomingMessage>(16);
-
-        let handle = spawn_job_monitor_with_context(
-            job_id,
-            event_tx.subscribe(),
-            inject_tx,
-            test_route(),
-            Some(Arc::clone(&cm)),
-        );
-
-        // Send completion event
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobResult {
-                    job_id: job_id.to_string(),
-                    status: "completed".to_string(),
-                    session_id: None,
-                    fallback_deliverable: None,
-                },
-            ))
-            .unwrap();
-
-        // Drain the injected message
-        let _ = tokio::time::timeout(std::time::Duration::from_secs(1), inject_rx.recv()).await;
-
-        // Wait for monitor to exit
-        tokio::time::timeout(std::time::Duration::from_secs(1), handle)
-            .await
-            .expect("monitor should exit")
-            .expect("monitor should not panic");
-
-        // Job should now be Completed, not InProgress
-        let ctx = cm.get_context(job_id).await.unwrap();
-        assert_eq!(ctx.state, JobState::Completed);
-    }
-
-    #[tokio::test]
-    async fn test_monitor_transitions_context_on_failure() {
-        use crate::context::{ContextManager, JobState};
-
-        let cm = Arc::new(ContextManager::new(5));
-        let job_id = Uuid::new_v4();
-        cm.register_sandbox_job(job_id, "user-1", "Build app", "desc")
-            .await
-            .unwrap();
-
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let (inject_tx, mut inject_rx) = mpsc::channel::<IncomingMessage>(16);
-
-        let handle = spawn_job_monitor_with_context(
-            job_id,
-            event_tx.subscribe(),
-            inject_tx,
-            test_route(),
-            Some(Arc::clone(&cm)),
-        );
-
-        // Send failure event
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobResult {
-                    job_id: job_id.to_string(),
-                    status: "failed".to_string(),
-                    session_id: None,
-                    fallback_deliverable: None,
-                },
-            ))
-            .unwrap();
-
-        let _ = tokio::time::timeout(std::time::Duration::from_secs(1), inject_rx.recv()).await;
-        tokio::time::timeout(std::time::Duration::from_secs(1), handle)
-            .await
-            .expect("monitor should exit")
-            .expect("monitor should not panic");
-
-        let ctx = cm.get_context(job_id).await.unwrap();
-        assert_eq!(ctx.state, JobState::Failed);
-    }
-
-    // === Regression: completion watcher (no route metadata) ===
-    // When monitor_route_from_ctx() returns None, spawn_completion_watcher
-    // must still transition the job so the max_jobs slot is freed.
-
-    #[tokio::test]
-    async fn test_completion_watcher_transitions_on_result() {
-        use crate::context::{ContextManager, JobState};
-
-        let cm = Arc::new(ContextManager::new(5));
-        let job_id = Uuid::new_v4();
-        cm.register_sandbox_job(job_id, "user-1", "Build app", "desc")
-            .await
-            .unwrap();
-
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let handle = spawn_completion_watcher(job_id, event_tx.subscribe(), Arc::clone(&cm));
-
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobResult {
-                    job_id: job_id.to_string(),
-                    status: "completed".to_string(),
-                    session_id: None,
-                    fallback_deliverable: None,
-                },
-            ))
-            .unwrap();
-
-        tokio::time::timeout(std::time::Duration::from_secs(1), handle)
-            .await
-            .expect("watcher should exit")
-            .expect("watcher should not panic");
-
-        let ctx = cm.get_context(job_id).await.unwrap();
-        assert_eq!(ctx.state, JobState::Completed);
-    }
 }
@@ -39,8 +39,8 @@ pub use context_monitor::{CompactionStrategy, ContextBreakdown, ContextMonitor};
 pub use heartbeat::{HeartbeatConfig, HeartbeatResult, HeartbeatRunner, spawn_heartbeat};
 pub use router::{MessageIntent, Router};
 pub use routine::{Routine, RoutineAction, RoutineRun, Trigger};
-pub use routine_engine::{RoutineEngine, SandboxReadiness};
-pub use scheduler::{Scheduler, SchedulerDeps};
+pub use routine_engine::RoutineEngine;
+pub use scheduler::Scheduler;
 pub use self_repair::{BrokenTool, RepairResult, RepairTask, SelfRepair, StuckJob};
 pub use session::{PendingApproval, PendingAuth, Session, Thread, ThreadState, Turn, TurnState};
 pub use session_manager::SessionManager;
@@ -9,19 +9,15 @@ use tokio::task::JoinHandle;
 use uuid::Uuid;

 use crate::agent::task::{Task, TaskContext, TaskOutput};
-use crate::channels::web::types::SseEvent;
 use crate::config::AgentConfig;
 use crate::context::{ContextManager, JobContext, JobState};
 use crate::db::Database;
 use crate::error::{Error, JobError};
-use crate::extensions::ExtensionManager;
+use crate::events::DomainEvent as SseEvent;
 use crate::hooks::HookRegistry;
 use crate::llm::LlmProvider;
 use crate::safety::SafetyLayer;
-use crate::tools::{
-    ApprovalContext, ToolRegistry, autonomous_allowed_tool_names, autonomous_unavailable_error,
-    prepare_tool_params,
-};
+use crate::tools::{ApprovalContext, ToolRegistry, prepare_tool_params};
 use crate::worker::job::{Worker, WorkerDeps};

 /// Message to send to a worker.
@@ -49,14 +45,6 @@ struct ScheduledSubtask {
    handle: JoinHandle<Result<TaskOutput, Error>>,
 }

-/// Shared scheduler-owned dependencies that are forwarded into autonomous runs.
-pub struct SchedulerDeps {
-    pub tools: Arc<ToolRegistry>,
-    pub extension_manager: Option<Arc<ExtensionManager>>,
-    pub store: Option<Arc<dyn Database>>,
-    pub hooks: Arc<HookRegistry>,
-}
-
 /// Schedules and manages parallel job execution.
 pub struct Scheduler {
    config: AgentConfig,
@@ -64,7 +52,6 @@ pub struct Scheduler {
    llm: Arc<dyn LlmProvider>,
    safety: Arc<SafetyLayer>,
    tools: Arc<ToolRegistry>,
-    extension_manager: Option<Arc<ExtensionManager>>,
    store: Option<Arc<dyn Database>>,
    hooks: Arc<HookRegistry>,
    /// SSE broadcast sender for live job event streaming.
@@ -84,17 +71,18 @@ impl Scheduler {
        context_manager: Arc<ContextManager>,
        llm: Arc<dyn LlmProvider>,
        safety: Arc<SafetyLayer>,
-        deps: SchedulerDeps,
+        tools: Arc<ToolRegistry>,
+        store: Option<Arc<dyn Database>>,
+        hooks: Arc<HookRegistry>,
    ) -> Self {
        Self {
            config,
            context_manager,
            llm,
            safety,
-            tools: deps.tools,
-            extension_manager: deps.extension_manager,
-            store: deps.store,
-            hooks: deps.hooks,
+            tools,
+            store,
+            hooks,
            sse_tx: None,
            http_interceptor: None,
            jobs: Arc::new(RwLock::new(HashMap::new())),
@@ -132,21 +120,14 @@ impl Scheduler {
        description: &str,
        metadata: Option<serde_json::Value>,
    ) -> Result<Uuid, JobError> {
-        let approval_context = self.autonomous_approval_context(user_id).await;
-        self.dispatch_job_inner(
-            user_id,
-            title,
-            description,
-            metadata,
-            Some(approval_context),
-        )
-        .await
+        self.dispatch_job_inner(user_id, title, description, metadata, None)
+            .await
    }

    /// Dispatch a job with an explicit approval context for autonomous execution.
    ///
    /// Same as `dispatch_job`, but the worker will use the given `ApprovalContext`
-    /// to determine the explicit autonomous allowlist for that job.
+    /// to determine which tools are pre-approved (instead of blocking all non-`Never` tools).
    pub async fn dispatch_job_with_context(
        &self,
        user_id: &str,
@@ -235,13 +216,6 @@ impl Scheduler {
        Ok(job_id)
    }

-    async fn autonomous_approval_context(&self, user_id: &str) -> ApprovalContext {
-        ApprovalContext::autonomous_with_tools(
-            autonomous_allowed_tool_names(&self.tools, self.extension_manager.as_ref(), user_id)
-                .await,
-        )
-    }
-
    /// Schedule a job for execution.
    pub async fn schedule(&self, job_id: Uuid) -> Result<(), JobError> {
        self.schedule_with_context(job_id, None).await
@@ -298,6 +272,7 @@ impl Scheduler {
                sse_tx: self.sse_tx.clone(),
                approval_context,
                http_interceptor: self.http_interceptor.clone(),
+                event_bus: None,
            };
            let worker = Worker::new(job_id, deps);

@@ -544,7 +519,10 @@ impl Scheduler {
        let blocked =
            ApprovalContext::is_blocked_or_default(&approval_context, tool_name, requirement);
        if blocked {
-            return Err(autonomous_unavailable_error(tool_name, &job_ctx.user_id).into());
+            return Err(crate::error::ToolError::AuthRequired {
+                name: tool_name.to_string(),
+            }
+            .into());
        }

        // Delegate to shared tool execution pipeline
@@ -799,18 +777,7 @@ mod tests {
        let tools = Arc::new(ToolRegistry::new());
        let hooks = Arc::new(HookRegistry::default());

-        Scheduler::new(
-            config,
-            cm,
-            llm,
-            safety,
-            SchedulerDeps {
-                tools,
-                extension_manager: None,
-                store: None,
-                hooks,
-            },
-        )
+        Scheduler::new(config, cm, llm, safety, tools, None, hooks)
    }

    #[tokio::test]
@@ -1037,14 +1004,12 @@ mod tests {
    async fn test_execute_tool_task_autonomous_unblocks_soft() {
        let (tools, cm, safety, job_id) = setup_tools_and_job().await;

-        // Autonomous execution only allows tools explicitly in scope.
+        // Autonomous context auto-approves UnlessAutoApproved
        let result = Scheduler::execute_tool_task(
            tools.clone(),
            cm.clone(),
            safety.clone(),
-            Some(ApprovalContext::autonomous_with_tools([
-                "soft_gate".to_string()
-            ])),
+            Some(ApprovalContext::autonomous()),
            job_id,
            "soft_gate",
            serde_json::json!({}),
@@ -1076,11 +1041,8 @@ mod tests {
    async fn test_execute_tool_task_autonomous_with_permissions() {
        let (tools, cm, safety, job_id) = setup_tools_and_job().await;

-        // Autonomous context with explicit permission for both tools.
-        let ctx = ApprovalContext::autonomous_with_tools([
-            "soft_gate".to_string(),
-            "hard_gate".to_string(),
-        ]);
+        // Autonomous context with explicit permission for hard_gate
+        let ctx = ApprovalContext::autonomous_with_tools(["hard_gate".to_string()]);

        let result = Scheduler::execute_tool_task(
            tools.clone(),
@@ -22,17 +22,11 @@ pub struct StuckJob {
    pub repair_attempts: u32,
 }

-/// A tool that has been detected as broken.
-#[derive(Debug, Clone)]
-pub struct BrokenTool {
-    pub name: String,
-    pub failure_count: u32,
-    pub last_error: Option<String>,
-    pub first_failure: DateTime<Utc>,
-    pub last_failure: DateTime<Utc>,
-    pub last_build_result: Option<serde_json::Value>,
-    pub repair_attempts: u32,
-}
+/// Backward-compatible alias for `ToolFailureRecord`.
+///
+/// The canonical type now lives in `crate::models::tool_failure` to break
+/// the circular dependency between `db` and `agent`.
+pub type BrokenTool = crate::models::tool_failure::ToolFailureRecord;

 /// Result of a repair attempt.
 #[derive(Debug)]
@@ -66,11 +60,14 @@ pub trait SelfRepair: Send + Sync {
 /// Default self-repair implementation.
 pub struct DefaultSelfRepair {
    context_manager: Arc<ContextManager>,
-    /// Jobs in `InProgress` longer than this are treated as stuck.
+    // TODO: use for time-based stuck detection (currently only max_repair_attempts is checked)
+    #[allow(dead_code)]
    stuck_threshold: Duration,
    max_repair_attempts: u32,
    store: Option<Arc<dyn Database>>,
    builder: Option<Arc<dyn SoftwareBuilder>>,
+    // TODO: use for tool hot-reload after repair
+    #[allow(dead_code)]
    tools: Option<Arc<ToolRegistry>>,
 }

@@ -92,13 +89,15 @@ impl DefaultSelfRepair {
    }

    /// Add a Store for tool failure tracking.
-    pub fn with_store(mut self, store: Arc<dyn Database>) -> Self {
+    #[allow(dead_code)] // TODO: wire up in main.rs when persistence is needed
+    pub(crate) fn with_store(mut self, store: Arc<dyn Database>) -> Self {
        self.store = Some(store);
        self
    }

    /// Add a Builder and ToolRegistry for automatic tool repair.
-    pub fn with_builder(
+    #[allow(dead_code)] // TODO: wire up in main.rs when auto-repair is needed
+    pub(crate) fn with_builder(
        mut self,
        builder: Arc<dyn SoftwareBuilder>,
        tools: Arc<ToolRegistry>,
@@ -112,82 +111,25 @@ impl DefaultSelfRepair {
 #[async_trait]
 impl SelfRepair for DefaultSelfRepair {
    async fn detect_stuck_jobs(&self) -> Vec<StuckJob> {
-        let stuck_ids = self
-            .context_manager
-            .find_stuck_jobs_with_threshold(Some(self.stuck_threshold))
-            .await;
+        let stuck_ids = self.context_manager.find_stuck_jobs().await;
        let mut stuck_jobs = Vec::new();

        for job_id in stuck_ids {
            if let Ok(ctx) = self.context_manager.get_context(job_id).await
-                && matches!(ctx.state, JobState::Stuck | JobState::InProgress)
+                && ctx.state == JobState::Stuck
            {
-                // InProgress jobs detected by threshold need to be transitioned
-                // to Stuck before they can be repaired (attempt_recovery requires
-                // Stuck state). These jobs already passed the threshold check in
-                // find_stuck_jobs_with_threshold, so skip the duration filter below.
-                let just_transitioned = ctx.state == JobState::InProgress;
-                if just_transitioned {
-                    let reason = "exceeded stuck_threshold";
-                    let transition = self
-                        .context_manager
-                        .update_context(job_id, |ctx| ctx.mark_stuck(reason))
-                        .await;
-                    match transition {
-                        Ok(Ok(())) => {}
-                        Ok(Err(e)) => {
-                            tracing::warn!(
-                                job = %job_id,
-                                "Failed to mark InProgress job as Stuck: {}",
-                                e
-                            );
-                            continue;
-                        }
-                        Err(e) => {
-                            tracing::warn!(
-                                job = %job_id,
-                                "Failed to transition InProgress job to Stuck: {}",
-                                e
-                            );
-                            continue;
-                        }
-                    }
-                }
-
-                // Re-fetch context after potential InProgress->Stuck transition
-                // so that stuck_since picks up the new transition timestamp.
-                let ctx = match self.context_manager.get_context(job_id).await {
-                    Ok(c) => c,
-                    Err(_) => continue,
-                };
-
-                // Use the timestamp of the most recent Stuck transition, not started_at.
-                // A job that ran for hours before becoming stuck should not immediately
-                // exceed the threshold — we measure from when it actually became stuck.
-                let stuck_since = ctx
-                    .transitions
-                    .iter()
-                    .rev()
-                    .find(|t| t.to == JobState::Stuck)
-                    .map(|t| t.timestamp);
-
-                let stuck_duration = stuck_since
-                    .map(|ts| {
-                        let duration = Utc::now().signed_duration_since(ts);
+                let stuck_duration = ctx
+                    .started_at
+                    .map(|start| {
+                        let now = Utc::now();
+                        let duration = now.signed_duration_since(start);
                        Duration::from_secs(duration.num_seconds().max(0) as u64)
                    })
                    .unwrap_or_default();

-                // Only report already-Stuck jobs that have been stuck long enough.
-                // Jobs just transitioned from InProgress skip this check — they
-                // were already vetted by find_stuck_jobs_with_threshold.
-                if !just_transitioned && stuck_duration < self.stuck_threshold {
-                    continue;
-                }
-
                stuck_jobs.push(StuckJob {
                    job_id,
-                    last_activity: stuck_since.unwrap_or(ctx.created_at),
+                    last_activity: ctx.started_at.unwrap_or(ctx.created_at),
                    stuck_duration,
                    last_error: None,
                    repair_attempts: ctx.repair_attempts,
@@ -209,17 +151,10 @@ impl SelfRepair for DefaultSelfRepair {
            });
        }

-        // Try to recover the job.
-        // If the job is still InProgress (detected via stuck_threshold), transition
-        // it to Stuck first so that attempt_recovery() can move it back to InProgress.
+        // Try to recover the job
        let result = self
            .context_manager
-            .update_context(job.job_id, |ctx| {
-                if ctx.state == JobState::InProgress {
-                    ctx.transition_to(JobState::Stuck, Some("exceeded stuck_threshold".into()))?;
-                }
-                ctx.attempt_recovery()
-            })
+            .update_context(job.job_id, |ctx| ctx.attempt_recovery())
            .await;

        match result {
@@ -332,8 +267,9 @@ impl SelfRepair for DefaultSelfRepair {
                    tracing::warn!("Failed to mark tool as repaired: {}", e);
                }

+                // Log if the tool was auto-registered
                if result.registered {
-                    tracing::info!("Repaired tool '{}' auto-registered by builder", tool.name);
+                    tracing::info!("Repaired tool '{}' auto-registered", tool.name);
                }

                Ok(RepairResult::Success {
@@ -475,8 +411,7 @@ mod tests {
        .unwrap()
        .unwrap();

-        // Use zero threshold so the just-stuck job is detected immediately.
-        let repair = DefaultSelfRepair::new(cm, Duration::from_secs(0), 3);
+        let repair = DefaultSelfRepair::new(cm, Duration::from_secs(60), 3);
        let stuck = repair.detect_stuck_jobs().await;
        assert_eq!(stuck.len(), 1);
        assert_eq!(stuck[0].job_id, job_id);
@@ -542,49 +477,6 @@ mod tests {
        );
    }

-    #[tokio::test]
-    async fn detect_and_repair_in_progress_job_via_threshold() {
-        let cm = Arc::new(ContextManager::new(10));
-        let job_id = cm.create_job("Long running", "desc").await.unwrap();
-
-        // Transition to InProgress.
-        cm.update_context(job_id, |ctx| ctx.transition_to(JobState::InProgress, None))
-            .await
-            .unwrap()
-            .unwrap();
-
-        // Backdate started_at to simulate a job running for 10 minutes.
-        cm.update_context(job_id, |ctx| {
-            ctx.started_at = Some(Utc::now() - chrono::Duration::seconds(600));
-        })
-        .await
-        .unwrap();
-
-        // Use a 5-minute threshold so the 10-minute job is detected.
-        let repair = DefaultSelfRepair::new(Arc::clone(&cm), Duration::from_secs(300), 3);
-
-        // detect_stuck_jobs should find it and transition InProgress -> Stuck.
-        let stuck = repair.detect_stuck_jobs().await;
-        assert_eq!(stuck.len(), 1);
-        assert_eq!(stuck[0].job_id, job_id);
-
-        // After detection the job should now be in Stuck state.
-        let ctx = cm.get_context(job_id).await.unwrap();
-        assert_eq!(ctx.state, JobState::Stuck);
-
-        // Repair should recover it: Stuck -> InProgress.
-        let result = repair.repair_stuck_job(&stuck[0]).await.unwrap();
-        assert!(
-            matches!(result, RepairResult::Success { .. }),
-            "Expected Success, got: {:?}",
-            result
-        );
-
-        // Job should be back to InProgress after recovery.
-        let ctx = cm.get_context(job_id).await.unwrap();
-        assert_eq!(ctx.state, JobState::InProgress);
-    }
-
    #[tokio::test]
    async fn detect_broken_tools_returns_empty_without_store() {
        let cm = Arc::new(ContextManager::new(10));
@@ -617,240 +509,4 @@ mod tests {
            result
        );
    }
-
-    #[tokio::test]
-    async fn detect_stuck_jobs_filters_by_threshold() {
-        let cm = Arc::new(ContextManager::new(10));
-        let job_id = cm.create_job("Stuck job", "desc").await.unwrap();
-
-        // Transition to InProgress, then to Stuck.
-        cm.update_context(job_id, |ctx| ctx.transition_to(JobState::InProgress, None))
-            .await
-            .unwrap()
-            .unwrap();
-        cm.update_context(job_id, |ctx| {
-            ctx.transition_to(JobState::Stuck, Some("timed out".to_string()))
-        })
-        .await
-        .unwrap()
-        .unwrap();
-
-        // Use a very large threshold (1 hour). Job just became stuck, so
-        // stuck_duration < threshold. It should be filtered out.
-        let repair = DefaultSelfRepair::new(cm, Duration::from_secs(3600), 3);
-        let stuck = repair.detect_stuck_jobs().await;
-        assert!(
-            stuck.is_empty(),
-            "Job stuck for <1s should be filtered by 1h threshold"
-        );
-    }
-
-    #[tokio::test]
-    async fn detect_stuck_jobs_includes_when_over_threshold() {
-        let cm = Arc::new(ContextManager::new(10));
-        let job_id = cm.create_job("Stuck job", "desc").await.unwrap();
-
-        // Transition to InProgress, then to Stuck.
-        cm.update_context(job_id, |ctx| ctx.transition_to(JobState::InProgress, None))
-            .await
-            .unwrap()
-            .unwrap();
-        cm.update_context(job_id, |ctx| {
-            ctx.transition_to(JobState::Stuck, Some("timed out".to_string()))
-        })
-        .await
-        .unwrap()
-        .unwrap();
-
-        // Use a zero threshold -- any stuck duration should be included.
-        let repair = DefaultSelfRepair::new(cm, Duration::from_secs(0), 3);
-        let stuck = repair.detect_stuck_jobs().await;
-        assert_eq!(stuck.len(), 1, "Job should be detected with zero threshold");
-        assert_eq!(stuck[0].job_id, job_id);
-    }
-
-    /// Regression: stuck_duration must be measured from the Stuck transition,
-    /// not from started_at. A job that ran for 2 hours before becoming stuck
-    /// should NOT immediately exceed a 5-minute threshold.
-    #[tokio::test]
-    async fn stuck_duration_measured_from_stuck_transition_not_started_at() {
-        let cm = Arc::new(ContextManager::new(10));
-        let job_id = cm.create_job("Long runner", "desc").await.unwrap();
-
-        // Transition to InProgress (sets started_at to now).
-        cm.update_context(job_id, |ctx| ctx.transition_to(JobState::InProgress, None))
-            .await
-            .unwrap()
-            .unwrap();
-
-        // Backdate started_at to 2 hours ago to simulate a long-running job.
-        cm.update_context(job_id, |ctx| {
-            ctx.started_at = Some(Utc::now() - chrono::Duration::hours(2));
-            Ok::<(), crate::error::Error>(())
-        })
-        .await
-        .unwrap()
-        .unwrap();
-
-        // Now transition to Stuck (stuck transition timestamp is ~now).
-        cm.update_context(job_id, |ctx| {
-            ctx.transition_to(JobState::Stuck, Some("wedged".into()))
-        })
-        .await
-        .unwrap()
-        .unwrap();
-
-        // With a 5-minute threshold, the job JUST became stuck — should NOT be detected.
-        let repair = DefaultSelfRepair::new(cm, Duration::from_secs(300), 3);
-        let stuck = repair.detect_stuck_jobs().await;
-        assert!(
-            stuck.is_empty(),
-            "Job stuck for <1s should not exceed 5min threshold, \
-             but stuck_duration was computed from started_at (2h ago)"
-        );
-    }
-
-    /// Mock SoftwareBuilder that returns a successful build result.
-    struct MockBuilder {
-        build_count: std::sync::atomic::AtomicU32,
-    }
-
-    impl MockBuilder {
-        fn new() -> Self {
-            Self {
-                build_count: std::sync::atomic::AtomicU32::new(0),
-            }
-        }
-
-        fn builds(&self) -> u32 {
-            self.build_count.load(std::sync::atomic::Ordering::Relaxed)
-        }
-    }
-
-    #[async_trait]
-    impl crate::tools::SoftwareBuilder for MockBuilder {
-        async fn analyze(
-            &self,
-            _description: &str,
-        ) -> Result<crate::tools::BuildRequirement, crate::error::ToolError> {
-            Ok(crate::tools::BuildRequirement {
-                name: "mock-tool".to_string(),
-                description: "mock".to_string(),
-                software_type: crate::tools::SoftwareType::WasmTool,
-                language: crate::tools::Language::Rust,
-                input_spec: None,
-                output_spec: None,
-                dependencies: vec![],
-                capabilities: vec![],
-            })
-        }
-
-        async fn build(
-            &self,
-            requirement: &crate::tools::BuildRequirement,
-        ) -> Result<crate::tools::BuildResult, crate::error::ToolError> {
-            self.build_count
-                .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-            Ok(crate::tools::BuildResult {
-                build_id: Uuid::new_v4(),
-                requirement: requirement.clone(),
-                artifact_path: std::path::PathBuf::from("/tmp/mock.wasm"),
-                logs: vec![],
-                success: true,
-                error: None,
-                started_at: Utc::now(),
-                completed_at: Utc::now(),
-                iterations: 1,
-                validation_warnings: vec![],
-                tests_passed: 1,
-                tests_failed: 0,
-                registered: true,
-            })
-        }
-
-        async fn repair(
-            &self,
-            _result: &crate::tools::BuildResult,
-            _error: &str,
-        ) -> Result<crate::tools::BuildResult, crate::error::ToolError> {
-            unimplemented!("not needed for this test")
-        }
-    }
-
-    /// E2E test: stuck job detected -> repaired -> transitions back to InProgress,
-    /// and broken tool detected -> builder invoked -> tool marked repaired.
-    #[cfg(feature = "libsql")]
-    #[tokio::test]
-    async fn e2e_stuck_job_repair_and_tool_rebuild() {
-        // --- Setup ---
-        let cm = Arc::new(ContextManager::new(10));
-        let job_id = cm.create_job("E2E stuck job", "desc").await.unwrap();
-
-        // Transition job: Pending -> InProgress -> Stuck
-        cm.update_context(job_id, |ctx| ctx.transition_to(JobState::InProgress, None))
-            .await
-            .unwrap()
-            .unwrap();
-        cm.update_context(job_id, |ctx| {
-            ctx.transition_to(JobState::Stuck, Some("deadlocked".to_string()))
-        })
-        .await
-        .unwrap()
-        .unwrap();
-
-        // Create a mock builder and a real test database (for store)
-        let builder = Arc::new(MockBuilder::new());
-        let tools = Arc::new(ToolRegistry::new());
-        let (db, _tmp_dir) = crate::testing::test_db().await;
-
-        // Create self-repair with zero threshold (detect immediately),
-        // wired with store, builder, and tools.
-        let repair = DefaultSelfRepair::new(Arc::clone(&cm), Duration::from_secs(0), 3)
-            .with_store(Arc::clone(&db))
-            .with_builder(
-                Arc::clone(&builder) as Arc<dyn crate::tools::SoftwareBuilder>,
-                tools,
-            );
-
-        // --- Phase 1: Detect and repair stuck job ---
-        let stuck_jobs = repair.detect_stuck_jobs().await;
-        assert_eq!(stuck_jobs.len(), 1, "Should detect the stuck job");
-        assert_eq!(stuck_jobs[0].job_id, job_id);
-
-        let result = repair.repair_stuck_job(&stuck_jobs[0]).await.unwrap();
-        assert!(
-            matches!(result, RepairResult::Success { .. }),
-            "Job repair should succeed: {:?}",
-            result
-        );
-
-        // Verify job transitioned back to InProgress
-        let ctx = cm.get_context(job_id).await.unwrap();
-        assert_eq!(
-            ctx.state,
-            JobState::InProgress,
-            "Job should be back to InProgress after repair"
-        );
-
-        // --- Phase 2: Repair a broken tool via builder ---
-        let broken = BrokenTool {
-            name: "broken-wasm-tool".to_string(),
-            failure_count: 10,
-            last_error: Some("panic in tool execution".to_string()),
-            first_failure: Utc::now() - chrono::Duration::hours(1),
-            last_failure: Utc::now(),
-            last_build_result: None,
-            repair_attempts: 0,
-        };
-
-        let tool_result = repair.repair_broken_tool(&broken).await.unwrap();
-        assert!(
-            matches!(tool_result, RepairResult::Success { .. }),
-            "Tool repair should succeed with mock builder: {:?}",
-            tool_result
-        );
-
-        // Verify builder was actually invoked
-        assert_eq!(builder.builds(), 1, "Builder should have been called once");
-    }
 }
@@ -16,8 +16,8 @@ use chrono::{DateTime, TimeDelta, Utc};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;

-use crate::channels::web::util::truncate_preview;
 use crate::llm::{ChatMessage, ToolCall};
+use crate::util::truncate_preview;

 /// A session containing one or more threads.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -133,6 +133,28 @@ pub enum ThreadState {
    Interrupted,
 }

+impl ThreadState {
+    /// Check whether a transition from this state to `target` is valid.
+    pub fn can_transition_to(self, target: ThreadState) -> bool {
+        use ThreadState::*;
+        matches!(
+            (self, target),
+            // From Idle
+            (Idle, Processing) |
+            // From Processing
+            (Processing, Idle) |
+            (Processing, AwaitingApproval) |
+            (Processing, Interrupted) |
+            // From AwaitingApproval
+            (AwaitingApproval, Idle) |
+            (AwaitingApproval, Processing) |
+            (AwaitingApproval, Interrupted) |
+            // From Interrupted
+            (Interrupted, Idle)
+        )
+    }
+}
+
 /// Pending auth token request.
 ///
 /// Auth mode TTL — must stay in sync with
@@ -188,15 +210,6 @@ pub struct PendingApproval {
    /// through the approval flow even if the approval message lacks timezone.
    #[serde(default)]
    pub user_timezone: Option<String>,
-    /// Whether the "always" auto-approve option should be offered to the user.
-    /// `false` when the tool returned `ApprovalRequirement::Always` (e.g.
-    /// destructive shell commands), meaning every invocation must be confirmed.
-    #[serde(default = "default_true")]
-    pub allow_always: bool,
-}
-
-fn default_true() -> bool {
-    true
 }

 /// A conversation thread within a session.
@@ -206,8 +219,8 @@ pub struct Thread {
    pub id: Uuid,
    /// Parent session ID.
    pub session_id: Uuid,
-    /// Current state.
-    pub state: ThreadState,
+    /// Current state. Private — use `state()` to read, transition methods to mutate.
+    state: ThreadState,
    /// Turns in this thread.
    pub turns: Vec<Turn>,
    /// When the thread was created.
@@ -257,6 +270,33 @@ impl Thread {
        }
    }

+    /// Get the current thread state.
+    pub fn state(&self) -> ThreadState {
+        self.state
+    }
+
+    /// Force-reset the state to Idle (for clear/restore operations that
+    /// bypass normal transitions). Prefer the transition methods for
+    /// normal state changes.
+    pub fn reset_to_idle(&mut self) {
+        self.state = ThreadState::Idle;
+        self.updated_at = Utc::now();
+    }
+
+    /// Force-set state to Processing (for approval flow resumption where
+    /// state was AwaitingApproval → Processing). Validates the transition.
+    pub fn set_processing(&mut self) -> Result<(), String> {
+        if !self.state.can_transition_to(ThreadState::Processing) {
+            return Err(format!(
+                "Cannot transition from {:?} to Processing",
+                self.state
+            ));
+        }
+        self.state = ThreadState::Processing;
+        self.updated_at = Utc::now();
+        Ok(())
+    }
+
    /// Get the current turn number (1-indexed for display).
    pub fn turn_number(&self) -> usize {
        self.turns.len() + 1
@@ -527,8 +567,8 @@ pub struct Turn {
    pub response: Option<String>,
    /// Tool calls made during this turn.
    pub tool_calls: Vec<TurnToolCall>,
-    /// Turn state.
-    pub state: TurnState,
+    /// Turn state. Private — use `state()` to read, transition methods to mutate.
+    state: TurnState,
    /// When the turn started.
    pub started_at: DateTime<Utc>,
    /// When the turn completed.
@@ -558,6 +598,11 @@ impl Turn {
        }
    }

+    /// Get the current turn state.
+    pub fn state(&self) -> TurnState {
+        self.state
+    }
+
    /// Complete this turn.
    pub fn complete(&mut self, response: impl Into<String>) {
        self.response = Some(response.into());
@@ -638,11 +683,11 @@ mod tests {
        let mut thread = Thread::new(Uuid::new_v4());

        thread.start_turn("Hello");
-        assert_eq!(thread.state, ThreadState::Processing);
+        assert_eq!(thread.state(), ThreadState::Processing);
        assert_eq!(thread.turns.len(), 1);

        thread.complete_turn("Hi there!");
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
        assert_eq!(thread.turns[0].response, Some("Hi there!".to_string()));
    }

@@ -692,7 +737,7 @@ mod tests {
        assert_eq!(thread.turns[0].response, Some("Hi there!".to_string()));
        assert_eq!(thread.turns[1].user_input, "How are you?");
        assert_eq!(thread.turns[1].response, Some("I'm good!".to_string()));
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
    }

    #[test]
@@ -792,7 +837,7 @@ mod tests {

        assert_eq!(thread.id, specific_id);
        assert_eq!(thread.session_id, session_id);
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
        assert!(thread.turns.is_empty());
    }

@@ -830,7 +875,7 @@ mod tests {

        // Should clear all turns and stay idle
        assert!(thread.turns.is_empty());
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
    }

    #[test]
@@ -949,17 +994,17 @@ mod tests {
        let mut thread = Thread::new(Uuid::new_v4());

        thread.start_turn("do something");
-        assert_eq!(thread.state, ThreadState::Processing);
+        assert_eq!(thread.state(), ThreadState::Processing);

        thread.interrupt();
-        assert_eq!(thread.state, ThreadState::Interrupted);
+        assert_eq!(thread.state(), ThreadState::Interrupted);

        let last_turn = thread.last_turn().unwrap();
-        assert_eq!(last_turn.state, TurnState::Interrupted);
+        assert_eq!(last_turn.state(), TurnState::Interrupted);
        assert!(last_turn.completed_at.is_some());

        thread.resume();
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
    }

    #[test]
@@ -967,15 +1012,15 @@ mod tests {
        let mut thread = Thread::new(Uuid::new_v4());

        // Idle thread: resume should be a no-op
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
        thread.resume();
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);

        // Processing thread: resume should not change state
        thread.start_turn("work");
-        assert_eq!(thread.state, ThreadState::Processing);
+        assert_eq!(thread.state(), ThreadState::Processing);
        thread.resume();
-        assert_eq!(thread.state, ThreadState::Processing);
+        assert_eq!(thread.state(), ThreadState::Processing);
    }

    #[test]
@@ -985,10 +1030,10 @@ mod tests {
        thread.start_turn("risky operation");
        thread.fail_turn("connection timed out");

-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);

        let turn = thread.last_turn().unwrap();
-        assert_eq!(turn.state, TurnState::Failed);
+        assert_eq!(turn.state(), TurnState::Failed);
        assert_eq!(turn.error, Some("connection timed out".to_string()));
        assert!(turn.response.is_none());
        assert!(turn.completed_at.is_some());
@@ -1087,7 +1132,7 @@ mod tests {

        // Completing a turn when there are no turns should be a safe no-op
        thread.complete_turn("phantom response");
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
        assert!(thread.turns.is_empty());
    }

@@ -1097,7 +1142,7 @@ mod tests {

        // Failing a turn when there are no turns should be a safe no-op
        thread.fail_turn("phantom error");
-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
        assert!(thread.turns.is_empty());
    }

@@ -1115,11 +1160,10 @@ mod tests {
            context_messages: vec![ChatMessage::user("do it")],
            deferred_tool_calls: vec![],
            user_timezone: None,
-            allow_always: false,
        };

        thread.await_approval(approval);
-        assert_eq!(thread.state, ThreadState::AwaitingApproval);
+        assert_eq!(thread.state(), ThreadState::AwaitingApproval);
        assert!(thread.pending_approval.is_some());

        let taken = thread.take_pending_approval();
@@ -1142,13 +1186,12 @@ mod tests {
            context_messages: vec![],
            deferred_tool_calls: vec![],
            user_timezone: None,
-            allow_always: true,
        };

        thread.await_approval(approval);
        thread.clear_pending_approval();

-        assert_eq!(thread.state, ThreadState::Idle);
+        assert_eq!(thread.state(), ThreadState::Idle);
        assert!(thread.pending_approval.is_none());
    }

@@ -1167,7 +1210,7 @@ mod tests {
        // Mutably modify through accessor
        session.active_thread_mut().unwrap().start_turn("test");
        assert_eq!(
-            session.active_thread().unwrap().state,
+            session.active_thread().unwrap().state(),
            ThreadState::Processing
        );
    }
@@ -1392,4 +1435,71 @@ mod tests {
        );
        assert!(tool_result_content.ends_with("..."));
    }
+
+    #[test]
+    fn thread_state_transition_table() {
+        use ThreadState::*;
+
+        // Valid transitions
+        assert!(Idle.can_transition_to(Processing));
+        assert!(Processing.can_transition_to(Idle));
+        assert!(Processing.can_transition_to(AwaitingApproval));
+        assert!(Processing.can_transition_to(Interrupted));
+        assert!(AwaitingApproval.can_transition_to(Idle));
+        assert!(AwaitingApproval.can_transition_to(Processing));
+        assert!(AwaitingApproval.can_transition_to(Interrupted));
+        assert!(Interrupted.can_transition_to(Idle));
+
+        // Invalid transitions
+        assert!(!Idle.can_transition_to(Idle));
+        assert!(!Idle.can_transition_to(AwaitingApproval));
+        assert!(!Idle.can_transition_to(Interrupted));
+        assert!(!Idle.can_transition_to(Completed));
+        assert!(!Processing.can_transition_to(Processing));
+        assert!(!Processing.can_transition_to(Completed));
+        assert!(!AwaitingApproval.can_transition_to(AwaitingApproval));
+        assert!(!Interrupted.can_transition_to(Processing));
+        assert!(!Interrupted.can_transition_to(Interrupted));
+        assert!(!Completed.can_transition_to(Idle));
+        assert!(!Completed.can_transition_to(Processing));
+    }
+
+    #[test]
+    fn thread_state_is_private() {
+        let thread = Thread::new(Uuid::new_v4());
+        // Can read via accessor
+        assert_eq!(thread.state(), ThreadState::Idle);
+    }
+
+    #[test]
+    fn set_processing_validates_transition() {
+        let mut thread = Thread::new(Uuid::new_v4());
+
+        // Idle → Processing: valid
+        assert!(thread.set_processing().is_ok());
+        assert_eq!(thread.state(), ThreadState::Processing);
+
+        // Processing → Processing: invalid
+        assert!(thread.set_processing().is_err());
+
+        // Complete the turn so we can test from AwaitingApproval
+        thread.complete_turn("done");
+
+        // AwaitingApproval → Processing: valid
+        thread.start_turn("test");
+        thread.await_approval(PendingApproval {
+            request_id: Uuid::new_v4(),
+            tool_name: "echo".into(),
+            parameters: serde_json::json!({}),
+            display_parameters: serde_json::json!({}),
+            description: "test".into(),
+            tool_call_id: "tc1".into(),
+            context_messages: vec![],
+            deferred_tool_calls: vec![],
+            user_timezone: None,
+        });
+        assert_eq!(thread.state(), ThreadState::AwaitingApproval);
+        assert!(thread.set_processing().is_ok());
+        assert_eq!(thread.state(), ThreadState::Processing);
+    }
 }
@@ -107,82 +107,78 @@ impl SessionManager {
        user_id: &str,
        channel: &str,
        external_thread_id: Option<&str>,
-    ) -> (Arc<Mutex<Session>>, Uuid) {
-        let parsed_uuid = external_thread_id.and_then(|tid| Uuid::parse_str(tid).ok());
-        self.resolve_thread_inner(user_id, channel, external_thread_id, parsed_uuid)
-            .await
-    }
-
-    /// Resolve an external thread ID to an internal thread, accepting a
-    /// pre-parsed UUID to avoid redundant parsing in hot paths.
-    pub async fn resolve_thread_with_parsed_uuid(
-        &self,
-        user_id: &str,
-        channel: &str,
-        external_thread_id: Option<&str>,
-        parsed_uuid: Option<Uuid>,
-    ) -> (Arc<Mutex<Session>>, Uuid) {
-        self.resolve_thread_inner(user_id, channel, external_thread_id, parsed_uuid)
-            .await
-    }
-
-    /// Inner implementation for thread resolution.
-    async fn resolve_thread_inner(
-        &self,
-        user_id: &str,
-        channel: &str,
-        external_thread_id: Option<&str>,
-        parsed_uuid: Option<Uuid>,
    ) -> (Arc<Mutex<Session>>, Uuid) {
        let session = self.get_or_create_session(user_id).await;
+
        let key = ThreadKey {
            user_id: user_id.to_string(),
            channel: channel.to_string(),
            external_thread_id: external_thread_id.map(String::from),
        };
+
+        // Check if we have a mapping
        {
            let thread_map = self.thread_map.read().await;
            if let Some(&thread_id) = thread_map.get(&key) {
+                // Verify thread still exists in session
                let sess = session.lock().await;
                if sess.threads.contains_key(&thread_id) {
                    return (Arc::clone(&session), thread_id);
                }
            }
        }
-        if let Some(ext_uuid) = parsed_uuid {
-            let thread_map = self.thread_map.read().await;
+
+        // Check if external_thread_id is itself a known thread UUID that
+        // exists in the session but was never registered in the thread_map
+        // (e.g. created by chat_new_thread_handler or hydrated from DB).
+        // We only adopt it if no thread_map entry maps to this UUID —
+        // otherwise it belongs to a different channel scope.
+        if let Some(ext_tid) = external_thread_id
+            && let Ok(ext_uuid) = Uuid::parse_str(ext_tid)
+        {
+            // Atomic check-and-insert: acquire write lock for the entire
+            // sequence to prevent TOCTOU races where another task could map
+            // this UUID between our check and insert.
+            let mut thread_map = self.thread_map.write().await;
            let mapped_elsewhere = thread_map.values().any(|&v| v == ext_uuid);
-            drop(thread_map);
+
            if !mapped_elsewhere {
                let sess = session.lock().await;
-                if sess.threads.contains_key(&ext_uuid) {
-                    drop(sess);
-                    let mut thread_map = self.thread_map.write().await;
-                    if !thread_map.values().any(|&v| v == ext_uuid) {
-                        thread_map.insert(key, ext_uuid);
-                        drop(thread_map);
-                        let mut undo_managers = self.undo_managers.write().await;
-                        undo_managers
-                            .entry(ext_uuid)
-                            .or_insert_with(|| Arc::new(Mutex::new(UndoManager::new())));
-                        return (session, ext_uuid);
-                    }
+                let exists_in_session = sess.threads.contains_key(&ext_uuid);
+                drop(sess);
+
+                if exists_in_session {
+                    thread_map.insert(key, ext_uuid);
+                    drop(thread_map);
+                    // Ensure undo manager exists
+                    let mut undo_managers = self.undo_managers.write().await;
+                    undo_managers
+                        .entry(ext_uuid)
+                        .or_insert_with(|| Arc::new(Mutex::new(UndoManager::new())));
+                    return (session, ext_uuid);
                }
            }
        }
+
+        // Create new thread (always create a new one for a new key)
        let thread_id = {
            let mut sess = session.lock().await;
            let thread = sess.create_thread();
            thread.id
        };
+
+        // Store mapping
        {
            let mut thread_map = self.thread_map.write().await;
            thread_map.insert(key, thread_id);
        }
+
+        // Create undo manager for thread
        {
            let mut undo_managers = self.undo_managers.write().await;
            undo_managers.insert(thread_id, Arc::new(Mutex::new(UndoManager::new())));
        }
+
        (session, thread_id)
    }

@@ -772,33 +768,6 @@ mod tests {
        assert_ne!(resolved, tid);
    }

-    #[tokio::test]
-    async fn test_register_then_resolve_same_uuid_on_second_channel_reuses_thread() {
-        use crate::agent::session::{Session, Thread};
-
-        let manager = SessionManager::new();
-        let tid = Uuid::new_v4();
-
-        let session = Arc::new(Mutex::new(Session::new("user-cross")));
-        {
-            let mut sess = session.lock().await;
-            let thread = Thread::with_id(tid, sess.id);
-            sess.threads.insert(tid, thread);
-        }
-
-        manager
-            .register_thread("user-cross", "http", tid, Arc::clone(&session))
-            .await;
-        manager
-            .register_thread("user-cross", "gateway", tid, Arc::clone(&session))
-            .await;
-
-        let (_, resolved) = manager
-            .resolve_thread("user-cross", "gateway", Some(&tid.to_string()))
-            .await;
-        assert_eq!(resolved, tid);
-    }
-
    // === QA Plan P3 - 4.2: Concurrent session stress tests ===

    #[tokio::test]
@@ -947,33 +916,4 @@ mod tests {
            "should have exactly 1 thread, not a duplicate"
        );
    }
-
-    #[tokio::test]
-    async fn test_resolve_thread_with_parsed_uuid_matches_resolve_thread() {
-        use crate::agent::session::{Session, Thread};
-        let manager = SessionManager::new();
-        let tid = Uuid::new_v4();
-        let session = Arc::new(Mutex::new(Session::new("user-parsed")));
-        {
-            let mut sess = session.lock().await;
-            let thread = Thread::with_id(tid, sess.id);
-            sess.threads.insert(tid, thread);
-        }
-        {
-            let mut sessions = manager.sessions.write().await;
-            sessions.insert("user-parsed".to_string(), Arc::clone(&session));
-        }
-        let tid_str = tid.to_string();
-        let (_, resolved_normal) = manager
-            .resolve_thread("user-parsed", "gateway", Some(&tid_str))
-            .await;
-        let (_, resolved_parsed) = manager
-            .resolve_thread_with_parsed_uuid("user-parsed", "gateway", Some(&tid_str), Some(tid))
-            .await;
-        assert_eq!(
-            resolved_normal, resolved_parsed,
-            "resolve_thread and resolve_thread_with_parsed_uuid must return the same thread"
-        );
-        assert_eq!(resolved_normal, tid);
-    }
 }
@@ -382,8 +382,6 @@ pub enum SubmissionResult {
        description: String,
        /// Parameters being passed.
        parameters: serde_json::Value,
-        /// Whether "always" auto-approve should be offered to the user.
-        allow_always: bool,
    },

    /// Successfully processed (for control commands).
@@ -429,14 +427,6 @@ impl SubmissionResult {
            message: message.into(),
        }
    }
-
-    /// Create a non-error status message (e.g., for blocking states like approval waiting).
-    /// Uses Ok variant to avoid "Error:" prefix in rendering.
-    pub fn pending(message: impl Into<String>) -> Self {
-        Self::Ok {
-            message: Some(message.into()),
-        }
-    }
 }

 #[cfg(test)]
@@ -16,12 +16,12 @@ use crate::agent::dispatcher::{
 };
 use crate::agent::session::{PendingApproval, Session, ThreadState};
 use crate::agent::submission::SubmissionResult;
-use crate::channels::web::util::truncate_preview;
 use crate::channels::{IncomingMessage, StatusUpdate};
 use crate::context::JobContext;
 use crate::error::Error;
 use crate::llm::{ChatMessage, ToolCall};
 use crate::tools::redact_params;
+use crate::util::truncate_preview;

 const FORGED_THREAD_ID_ERROR: &str = "Invalid or unauthorized thread ID.";

@@ -45,11 +45,11 @@ impl Agent {
        &self,
        message: &IncomingMessage,
        external_thread_id: &str,
-    ) -> Result<Option<Uuid>, String> {
+    ) -> Option<String> {
        // Only hydrate UUID-shaped thread IDs (web gateway uses UUIDs)
        let thread_uuid = match Uuid::parse_str(external_thread_id) {
            Ok(id) => id,
-            Err(_) => return Ok(None),
+            Err(_) => return None,
        };

        // Check if already in memory
@@ -60,7 +60,7 @@ impl Agent {
        {
            let sess = session.lock().await;
            if sess.threads.contains_key(&thread_uuid) {
-                return Ok(Some(thread_uuid));
+                return None;
            }
        }

@@ -83,9 +83,9 @@ impl Agent {
                        e
                    );
                    if requires_preexisting_uuid_thread(&message.channel) {
-                        return Err(FORGED_THREAD_ID_ERROR.to_string());
+                        return Some(FORGED_THREAD_ID_ERROR.to_string());
                    }
-                    return Ok(Some(thread_uuid));
+                    return None;
                }
            };
            if !owned {
@@ -99,9 +99,9 @@ impl Agent {
                            e
                        );
                        if requires_preexisting_uuid_thread(&message.channel) {
-                            return Err(FORGED_THREAD_ID_ERROR.to_string());
+                            return Some(FORGED_THREAD_ID_ERROR.to_string());
                        }
-                        return Ok(Some(thread_uuid));
+                        return None;
                    }
                };

@@ -113,7 +113,7 @@ impl Agent {
                        exists,
                        "Rejected message for unavailable thread id"
                    );
-                    return Err(FORGED_THREAD_ID_ERROR.to_string());
+                    return Some(FORGED_THREAD_ID_ERROR.to_string());
                }

                tracing::warn!(
@@ -122,7 +122,7 @@ impl Agent {
                    exists,
                    "Skipped hydration for thread id not owned by sender"
                );
-                return Ok(Some(thread_uuid));
+                return None;
            }

            let db_messages = store
@@ -169,7 +169,7 @@ impl Agent {
            msg_count
        );

-        Ok(Some(thread_uuid))
+        None
    }

    pub(super) async fn process_user_input(
@@ -186,70 +186,9 @@ impl Agent {
            "Processing user input"
        );

-        // First check thread state without holding lock during I/O
-        let (thread_state, approval_context) = {
-            let sess = session.lock().await;
-            let thread = sess
-                .threads
-                .get(&thread_id)
-                .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;
-            let approval_context = thread.pending_approval.as_ref().map(|a| {
-                let desc_preview =
-                    crate::agent::agent_loop::truncate_for_preview(&a.description, 80);
-                (a.tool_name.clone(), desc_preview)
-            });
-            (thread.state, approval_context)
-        };
-
-        tracing::debug!(
-            message_id = %message.id,
-            thread_id = %thread_id,
-            thread_state = ?thread_state,
-            "Checked thread state"
-        );
-
-        // Check thread state
-        match thread_state {
-            ThreadState::Processing => {
-                tracing::warn!(
-                    message_id = %message.id,
-                    thread_id = %thread_id,
-                    "Thread is processing, rejecting new input"
-                );
-                return Ok(SubmissionResult::error(
-                    "Turn in progress. Use /interrupt to cancel.",
-                ));
-            }
-            ThreadState::AwaitingApproval => {
-                tracing::warn!(
-                    message_id = %message.id,
-                    thread_id = %thread_id,
-                    "Thread awaiting approval, rejecting new input"
-                );
-                let msg = match approval_context {
-                    Some((tool_name, desc_preview)) => format!(
-                        "Waiting for approval: {tool_name} — {desc_preview}. Use /interrupt to cancel."
-                    ),
-                    None => "Waiting for approval. Use /interrupt to cancel.".to_string(),
-                };
-                return Ok(SubmissionResult::pending(msg));
-            }
-            ThreadState::Completed => {
-                tracing::warn!(
-                    message_id = %message.id,
-                    thread_id = %thread_id,
-                    "Thread completed, rejecting new input"
-                );
-                return Ok(SubmissionResult::error(
-                    "Thread completed. Use /thread new.",
-                ));
-            }
-            ThreadState::Idle | ThreadState::Interrupted => {
-                // Can proceed
-            }
-        }
-
-        // Safety validation for user input
+        // Safety validation BEFORE state check — these don't need the session
+        // lock and are the slowest part, so run them first. Then we can do the
+        // state check + start_turn atomically under one lock (TOCTOU fix).
        let validation = self.safety().validate_input(content);
        if !validation.is_valid {
            let details = validation
@@ -299,7 +238,10 @@ impl Agent {
        // Natural language goes through the agentic loop
        // Job tools (create_job, list_jobs, etc.) are in the tool registry

-        // Auto-compact if needed BEFORE adding new turn
+        // Check thread state and auto-compact under a single lock acquisition.
+        // The state check must happen under the lock to prevent TOCTOU races
+        // where another task could change the state between our check and
+        // the start_turn call.
        {
            let mut sess = session.lock().await;
            let thread = sess
@@ -307,6 +249,35 @@ impl Agent {
                .get_mut(&thread_id)
                .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;

+            let thread_state = thread.state();
+            tracing::debug!(
+                message_id = %message.id,
+                thread_id = %thread_id,
+                thread_state = ?thread_state,
+                "Checked thread state"
+            );
+
+            match thread_state {
+                ThreadState::Processing => {
+                    return Ok(SubmissionResult::error(
+                        "Turn in progress. Use /interrupt to cancel.",
+                    ));
+                }
+                ThreadState::AwaitingApproval => {
+                    return Ok(SubmissionResult::error(
+                        "Waiting for approval. Use /interrupt to cancel.",
+                    ));
+                }
+                ThreadState::Completed => {
+                    return Ok(SubmissionResult::error(
+                        "Thread completed. Use /thread new.",
+                    ));
+                }
+                ThreadState::Idle | ThreadState::Interrupted => {
+                    // Can proceed
+                }
+            }
+
            let messages = thread.messages();
            if let Some(strategy) = self.context_monitor.suggest_compaction(&messages) {
                let pct = self.context_monitor.usage_percent(&messages);
@@ -414,7 +385,7 @@ impl Agent {
            .get_mut(&thread_id)
            .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;

-        if thread.state == ThreadState::Interrupted {
+        if thread.state() == ThreadState::Interrupted {
            let _ = self
                .channels
                .send_status(
@@ -506,8 +477,7 @@ impl Agent {
                let tool_name = pending.tool_name.clone();
                let description = pending.description.clone();
                let parameters = pending.display_parameters.clone();
-                let allow_always = pending.allow_always;
-                thread.await_approval(*pending);
+                thread.await_approval(pending);
                let _ = self
                    .channels
                    .send_status(
@@ -517,7 +487,6 @@ impl Agent {
                            tool_name: tool_name.clone(),
                            description: description.clone(),
                            parameters: parameters.clone(),
-                            allow_always,
                        },
                        &message.metadata,
                    )
@@ -527,7 +496,6 @@ impl Agent {
                    tool_name,
                    description,
                    parameters,
-                    allow_always,
                })
            }
            Err(e) => {
@@ -790,7 +758,7 @@ impl Agent {
            .get_mut(&thread_id)
            .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;

-        match thread.state {
+        match thread.state() {
            ThreadState::Processing | ThreadState::AwaitingApproval => {
                thread.interrupt();
                Ok(SubmissionResult::ok_with_message("Interrupted."))
@@ -849,7 +817,7 @@ impl Agent {
            .get_mut(&thread_id)
            .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;
        thread.turns.clear();
-        thread.state = ThreadState::Idle;
+        thread.reset_to_idle();

        // Clear undo history too
        let undo_mgr = self.session_manager.get_undo_manager(thread_id).await;
@@ -876,11 +844,11 @@ impl Agent {
                .get_mut(&thread_id)
                .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;

-            if thread.state != ThreadState::AwaitingApproval {
+            if thread.state() != ThreadState::AwaitingApproval {
                // Stale or duplicate approval (tool already executed) — silently ignore.
                tracing::debug!(
                    %thread_id,
-                    state = ?thread.state,
+                    state = ?thread.state(),
                    "Ignoring stale approval: thread not in AwaitingApproval state"
                );
                return Ok(SubmissionResult::ok_with_message(""));
@@ -926,20 +894,20 @@ impl Agent {
                );
            }

-            // Reset thread state to processing
+            // Reset thread state to processing (AwaitingApproval → Processing)
            {
                let mut sess = session.lock().await;
-                if let Some(thread) = sess.threads.get_mut(&thread_id) {
-                    thread.state = ThreadState::Processing;
+                if let Some(thread) = sess.threads.get_mut(&thread_id)
+                    && let Err(e) = thread.set_processing()
+                {
+                    tracing::warn!(%thread_id, "Invalid approval state transition: {}", e);
                }
            }

            // Execute the approved tool and continue the loop
            let mut job_ctx =
-                JobContext::with_user(&message.user_id, "chat", "Interactive chat session")
-                    .with_requester_id(&message.sender_id);
+                JobContext::with_user(&message.user_id, "chat", "Interactive chat session");
            job_ctx.http_interceptor = self.deps.http_interceptor.clone();
-            job_ctx.metadata = crate::agent::agent_loop::chat_tool_execution_metadata(message);
            // Prefer a valid timezone from the approval message, fall back to the
            // resolved timezone stored when the approval was originally requested.
            let tz_candidate = message
@@ -1073,31 +1041,28 @@ impl Agent {
                usize,
                crate::llm::ToolCall,
                Arc<dyn crate::tools::Tool>,
-                bool, // allow_always
            )> = None;

            for (idx, tc) in deferred_tool_calls.iter().enumerate() {
                if let Some(tool) = self.tools().get(&tc.name).await {
                    // Match dispatcher.rs: when auto_approve_tools is true, skip
                    // all approval checks (including ApprovalRequirement::Always).
-                    let (needs_approval, allow_always) = if self.config.auto_approve_tools {
-                        (false, true)
+                    let needs_approval = if self.config.auto_approve_tools {
+                        false
                    } else {
                        use crate::tools::ApprovalRequirement;
-                        let requirement = tool.requires_approval(&tc.arguments);
-                        let needs = match requirement {
+                        match tool.requires_approval(&tc.arguments) {
                            ApprovalRequirement::Never => false,
                            ApprovalRequirement::UnlessAutoApproved => {
                                let sess = session.lock().await;
                                !sess.is_tool_auto_approved(&tc.name)
                            }
                            ApprovalRequirement::Always => true,
-                        };
-                        (needs, !matches!(requirement, ApprovalRequirement::Always))
+                        }
                    };

                    if needs_approval {
-                        approval_needed = Some((idx, tc.clone(), tool, allow_always));
+                        approval_needed = Some((idx, tc.clone(), tool));
                        break; // remaining tools stay deferred
                    }
                }
@@ -1305,7 +1270,7 @@ impl Agent {
            }

            // Handle approval if a tool needed it
-            if let Some((approval_idx, tc, tool, allow_always)) = approval_needed {
+            if let Some((approval_idx, tc, tool)) = approval_needed {
                let new_pending = PendingApproval {
                    request_id: Uuid::new_v4(),
                    tool_name: tc.name.clone(),
@@ -1317,7 +1282,6 @@ impl Agent {
                    deferred_tool_calls: deferred_tool_calls[approval_idx + 1..].to_vec(),
                    // Carry forward the resolved timezone from the original pending approval
                    user_timezone: pending.user_timezone.clone(),
-                    allow_always,
                };

                let request_id = new_pending.request_id;
@@ -1341,7 +1305,6 @@ impl Agent {
                            tool_name: tool_name.clone(),
                            description: description.clone(),
                            parameters: parameters.clone(),
-                            allow_always,
                        },
                        &message.metadata,
                    )
@@ -1352,7 +1315,6 @@ impl Agent {
                    tool_name,
                    description,
                    parameters,
-                    allow_always,
                });
            }

@@ -1421,8 +1383,7 @@ impl Agent {
                    let tool_name = new_pending.tool_name.clone();
                    let description = new_pending.description.clone();
                    let parameters = new_pending.display_parameters.clone();
-                    let allow_always = new_pending.allow_always;
-                    thread.await_approval(*new_pending);
+                    thread.await_approval(new_pending);
                    let _ = self
                        .channels
                        .send_status(
@@ -1432,7 +1393,6 @@ impl Agent {
                                tool_name: tool_name.clone(),
                                description: description.clone(),
                                parameters: parameters.clone(),
-                                allow_always,
                            },
                            &message.metadata,
                        )
@@ -1442,7 +1402,6 @@ impl Agent {
                        tool_name,
                        description,
                        parameters,
-                        allow_always,
                    })
                }
                Err(e) => {
@@ -1939,104 +1898,4 @@ mod tests {
            created_at: chrono::Utc::now(),
        }
    }
-
-    #[tokio::test]
-    async fn test_awaiting_approval_rejection_includes_tool_context() {
-        // Test that when a thread is in AwaitingApproval state and receives a new message,
-        // process_user_input rejects it with a non-error status that includes tool context.
-        use crate::agent::session::{PendingApproval, Session, Thread, ThreadState};
-        use uuid::Uuid;
-
-        let session_id = Uuid::new_v4();
-        let thread_id = Uuid::new_v4();
-        let mut thread = Thread::with_id(thread_id, session_id);
-
-        // Set thread to AwaitingApproval with a pending tool approval
-        let pending = PendingApproval {
-            request_id: Uuid::new_v4(),
-            tool_name: "shell".to_string(),
-            parameters: serde_json::json!({"command": "echo hello"}),
-            display_parameters: serde_json::json!({"command": "[REDACTED]"}),
-            description: "Execute: echo hello".to_string(),
-            tool_call_id: "call_0".to_string(),
-            context_messages: vec![],
-            deferred_tool_calls: vec![],
-            user_timezone: None,
-            allow_always: false,
-        };
-        thread.await_approval(pending);
-
-        let mut session = Session::new("test-user");
-        session.threads.insert(thread_id, thread);
-
-        // Verify thread is in AwaitingApproval state
-        assert_eq!(
-            session.threads[&thread_id].state,
-            ThreadState::AwaitingApproval
-        );
-
-        let result = extract_approval_message(&session, thread_id);
-
-        // Verify result is an Ok with a message (not an Error)
-        match result {
-            Ok(Some(msg)) => {
-                // Should NOT start with "Error:"
-                assert!(
-                    !msg.to_lowercase().starts_with("error:"),
-                    "Approval rejection should not have 'Error:' prefix. Got: {}",
-                    msg
-                );
-
-                // Should contain "waiting for approval"
-                assert!(
-                    msg.to_lowercase().contains("waiting for approval"),
-                    "Should contain 'waiting for approval'. Got: {}",
-                    msg
-                );
-
-                // Should contain the tool name
-                assert!(
-                    msg.contains("shell"),
-                    "Should contain tool name 'shell'. Got: {}",
-                    msg
-                );
-
-                // Should contain the description (or truncated version)
-                assert!(
-                    msg.contains("echo hello"),
-                    "Should contain description 'echo hello'. Got: {}",
-                    msg
-                );
-            }
-            _ => panic!("Expected approval rejection message"),
-        }
-    }
-
-    // Helper function to extract the approval message without needing a full Agent instance
-    fn extract_approval_message(
-        session: &crate::agent::session::Session,
-        thread_id: Uuid,
-    ) -> Result<Option<String>, crate::error::Error> {
-        let thread = session.threads.get(&thread_id).ok_or_else(|| {
-            crate::error::Error::from(crate::error::JobError::NotFound { id: thread_id })
-        })?;
-
-        if thread.state == ThreadState::AwaitingApproval {
-            let approval_context = thread.pending_approval.as_ref().map(|a| {
-                let desc_preview =
-                    crate::agent::agent_loop::truncate_for_preview(&a.description, 80);
-                (a.tool_name.clone(), desc_preview)
-            });
-
-            let msg = match approval_context {
-                Some((tool_name, desc_preview)) => format!(
-                    "Waiting for approval: {tool_name} — {desc_preview}. Use /interrupt to cancel."
-                ),
-                None => "Waiting for approval. Use /interrupt to cancel.".to_string(),
-            };
-            Ok(Some(msg))
-        } else {
-            Ok(None)
-        }
-    }
 }
@@ -14,6 +14,7 @@ use crate::channels::web::log_layer::LogBroadcaster;
 use crate::config::Config;
 use crate::context::ContextManager;
 use crate::db::Database;
+use crate::event_bus::EventBus;
 use crate::extensions::ExtensionManager;
 use crate::hooks::HookRegistry;
 use crate::llm::{LlmProvider, RecordingLlm, SessionManager};
@@ -25,7 +26,7 @@ use crate::tools::ToolRegistry;
 use crate::tools::mcp::{McpProcessManager, McpSessionManager};
 use crate::tools::wasm::SharedCredentialRegistry;
 use crate::tools::wasm::WasmToolRuntime;
-use crate::workspace::{EmbeddingCacheConfig, EmbeddingProvider, Workspace};
+use crate::workspace::{EmbeddingProvider, Workspace};

 /// Fully initialized application components, ready for channel wiring
 /// and agent construction.
@@ -56,7 +57,62 @@ pub struct AppComponents {
    pub session: Arc<SessionManager>,
    pub catalog_entries: Vec<crate::extensions::RegistryEntry>,
    pub dev_loaded_tool_names: Vec<String>,
-    pub builder: Option<Arc<dyn crate::tools::SoftwareBuilder>>,
+    /// Unified event bus for all system events.
+    pub event_bus: EventBus,
+}
+
+impl AppComponents {
+    /// Verify that all components expected by the config are actually present.
+    ///
+    /// Logs warnings for any missing components. Called at end of `build_all()`
+    /// to catch wiring bugs early.
+    pub fn verify_readiness(&self) {
+        let mut warnings = Vec::new();
+
+        // Config cross-field validation
+        for issue in self.config.validate() {
+            warnings.push("config validation issue");
+            tracing::warn!(component = "startup_verification", "{}", issue);
+        }
+
+        // Note: db can legitimately be None if --no-db was passed.
+        // We only warn if workspace is expected but missing.
+
+        if self.workspace.is_none() && self.db.is_some() {
+            warnings.push("Workspace is None but database is available");
+        }
+
+        if self.wasm_tool_runtime.is_none() && self.config.wasm.enabled {
+            warnings.push("WASM runtime is None but config.wasm.enabled=true");
+        }
+
+        if self.extension_manager.is_none() {
+            warnings.push("Extension manager is None");
+        }
+
+        if self.skill_registry.is_none() && self.config.skills.enabled {
+            warnings.push("Skill registry is None but config.skills.enabled=true");
+        }
+
+        // Check tool registration
+        let missing_tools = self.tools.verify_expected_tools(&self.config);
+        for tool_name in &missing_tools {
+            warnings.push("missing expected tool");
+            tracing::warn!(
+                component = "startup_verification",
+                tool = tool_name,
+                "Expected tool not registered"
+            );
+        }
+
+        for warning in &warnings {
+            tracing::warn!(component = "startup_verification", "{}", warning);
+        }
+
+        if warnings.is_empty() {
+            tracing::debug!("All expected components initialized successfully");
+        }
+    }
 }

 /// Options that control optional init phases.
@@ -141,14 +197,12 @@ impl AppBuilder {
        self.handles = Some(handles);

        // Post-init: migrate disk config, reload config from DB, attach session, cleanup
-        if let Err(e) =
-            crate::bootstrap::migrate_disk_to_db(db.as_ref(), &self.config.owner_id).await
-        {
+        if let Err(e) = crate::bootstrap::migrate_disk_to_db(db.as_ref(), "default").await {
            tracing::warn!("Disk-to-DB settings migration failed: {}", e);
        }

        let toml_path = self.toml_path.as_deref();
-        match Config::from_db_with_toml(db.as_ref(), &self.config.owner_id, toml_path).await {
+        match Config::from_db_with_toml(db.as_ref(), "default", toml_path).await {
            Ok(db_config) => {
                self.config = db_config;
                tracing::debug!("Configuration reloaded from database");
@@ -161,9 +215,7 @@ impl AppBuilder {
            }
        }

-        self.session
-            .attach_store(db.clone(), &self.config.owner_id)
-            .await;
+        self.session.attach_store(db.clone(), "default").await;

        // Fire-and-forget housekeeping — no need to block startup.
        let db_cleanup = db.clone();
@@ -198,10 +250,9 @@ impl AppBuilder {
                let store: Option<&(dyn crate::db::SettingsStore + Sync)> =
                    self.db.as_ref().map(|db| db.as_ref() as _);
                let toml_path = self.toml_path.as_deref();
-                let owner_id = self.config.owner_id.clone();
                if let Err(e) = self
                    .config
-                    .re_resolve_llm(store, &owner_id, toml_path)
+                    .re_resolve_llm(store, "default", toml_path)
                    .await
                {
                    tracing::warn!(
@@ -230,17 +281,15 @@ impl AppBuilder {

        if let Some(ref secrets) = store {
            // Inject LLM API keys from encrypted storage
-            crate::config::inject_llm_keys_from_secrets(secrets.as_ref(), &self.config.owner_id)
-                .await;
+            crate::config::inject_llm_keys_from_secrets(secrets.as_ref(), "default").await;

            // Re-resolve only the LLM config with newly available keys.
            let store: Option<&(dyn crate::db::SettingsStore + Sync)> =
                self.db.as_ref().map(|db| db.as_ref() as _);
            let toml_path = self.toml_path.as_deref();
-            let owner_id = self.config.owner_id.clone();
            if let Err(e) = self
                .config
-                .re_resolve_llm(store, &owner_id, toml_path)
+                .re_resolve_llm(store, "default", toml_path)
                .await
            {
                tracing::warn!("Failed to re-resolve LLM config after secret injection: {e}");
@@ -281,7 +330,6 @@ impl AppBuilder {
            Arc<ToolRegistry>,
            Option<Arc<dyn EmbeddingProvider>>,
            Option<Arc<Workspace>>,
-            Option<Arc<dyn crate::tools::SoftwareBuilder>>,
        ),
        anyhow::Error,
    > {
@@ -312,23 +360,12 @@ impl AppBuilder {
            .create_provider(&self.config.llm.nearai.base_url, self.session.clone());

        // Register memory tools if database is available
-        let workspace_user_id = self
-            .config
-            .channels
-            .gateway
-            .as_ref()
-            .map(|gw| gw.user_id.as_str())
-            .unwrap_or("default");
        let workspace = if let Some(ref db) = self.db {
-            let emb_cache_config = EmbeddingCacheConfig {
-                max_entries: self.config.embeddings.cache_size,
-            };
-            let mut ws = Workspace::new_with_db(workspace_user_id, db.clone())
+            let mut ws = Workspace::new_with_db("default", db.clone())
                .with_search_config(&self.config.search);
            if let Some(ref emb) = embeddings {
-                ws = ws.with_embeddings_cached(emb.clone(), emb_cache_config);
+                ws = ws.with_embeddings(emb.clone());
            }
-            ws = ws.with_memory_layers(self.config.workspace.memory_layers.clone());
            let ws = Arc::new(ws);
            tools.register_memory_tools(Arc::clone(&ws));
            Some(ws)
@@ -380,19 +417,16 @@ impl AppBuilder {
        }

        // Register builder tool if enabled
-        let builder = if self.config.builder.enabled
+        if self.config.builder.enabled
            && (self.config.agent.allow_local_tools || !self.config.sandbox.enabled)
        {
-            let b = tools
+            tools
                .register_builder_tool(llm.clone(), Some(self.config.builder.to_builder_config()))
                .await;
-            tracing::info!("Builder mode enabled");
-            Some(b)
-        } else {
-            None
-        };
+            tracing::debug!("Builder mode enabled");
+        }

-        Ok((safety, tools, embeddings, workspace, builder))
+        Ok((safety, tools, embeddings, workspace))
    }

    /// Phase 5: Load WASM tools, MCP servers, and create extension manager.
@@ -492,10 +526,9 @@ impl AppBuilder {
            let tools = Arc::clone(tools);
            let mcp_sm = Arc::clone(&mcp_session_manager);
            let pm = Arc::clone(&mcp_process_manager);
-            let owner_id = self.config.owner_id.clone();
            async move {
                let servers_result = if let Some(ref d) = db {
-                    load_mcp_servers_from_db(d.as_ref(), &owner_id).await
+                    load_mcp_servers_from_db(d.as_ref(), "default").await
                } else {
                    crate::tools::mcp::config::load_mcp_servers().await
                };
@@ -515,7 +548,6 @@ impl AppBuilder {
                            let secrets = secrets_store.clone();
                            let tools = Arc::clone(&tools);
                            let pm = Arc::clone(&pm);
-                            let owner_id = owner_id.clone();

                            join_set.spawn(async move {
                                let server_name = server.name.clone();
@@ -525,7 +557,7 @@ impl AppBuilder {
                                    &mcp_sm,
                                    &pm,
                                    secrets,
-                                    &owner_id,
+                                    "default",
                                )
                                .await
                                {
@@ -536,7 +568,7 @@ impl AppBuilder {
                                            server_name,
                                            e
                                        );
-                                        return None;
+                                        return;
                                    }
                                };

@@ -553,10 +585,6 @@ impl AppBuilder {
                                                    tool_count,
                                                    server_name
                                                );
-                                                return Some((
-                                                    server_name,
-                                                    Arc::new(client),
-                                                ));
                                            }
                                            Err(e) => {
                                                tracing::warn!(
@@ -587,27 +615,14 @@ impl AppBuilder {
                                        }
                                    }
                                }
-                                None
                            });
                        }

-                        let mut startup_clients = Vec::new();
                        while let Some(result) = join_set.join_next().await {
-                            match result {
-                                Ok(Some(client_pair)) => {
-                                    startup_clients.push(client_pair);
-                                }
-                                Ok(None) => {}
-                                Err(e) => {
-                                    if e.is_panic() {
-                                        tracing::error!("MCP server loading task panicked: {}", e);
-                                    } else {
-                                        tracing::warn!("MCP server loading task failed: {}", e);
-                                    }
-                                }
+                            if let Err(e) = result {
+                                tracing::warn!("MCP server loading task panicked: {}", e);
                            }
                        }
-                        return startup_clients;
                    }
                    Err(e) => {
                        if matches!(
@@ -625,12 +640,10 @@ impl AppBuilder {
                        }
                    }
                }
-                Vec::new()
            }
        };

-        let (dev_loaded_tool_names, startup_mcp_clients) =
-            tokio::join!(wasm_tools_future, mcp_servers_future);
+        let (dev_loaded_tool_names, _) = tokio::join!(wasm_tools_future, mcp_servers_future);

        // Load registry catalog entries for extension discovery
        let mut catalog_entries = match crate::registry::RegistryCatalog::load_or_embedded() {
@@ -686,23 +699,12 @@ impl AppBuilder {
                self.config.wasm.tools_dir.clone(),
                self.config.channels.wasm_channels_dir.clone(),
                self.config.tunnel.public_url.clone(),
-                self.config.owner_id.clone(),
+                "default".to_string(),
                self.db.clone(),
                catalog_entries.clone(),
            ));
            tools.register_extension_tools(Arc::clone(&manager));
            tracing::debug!("Extension manager initialized with in-chat discovery tools");
-
-            if !startup_mcp_clients.is_empty() {
-                tracing::info!(
-                    count = startup_mcp_clients.len(),
-                    "Injecting startup MCP clients into extension manager"
-                );
-                for (name, client) in startup_mcp_clients {
-                    manager.inject_mcp_client(name, client).await;
-                }
-            }
-
            Some(manager)
        };

@@ -732,11 +734,7 @@ impl AppBuilder {
        // Post-init validation: if a non-nearai backend was selected but
        // credentials were never resolved (deferred resolution found no keys),
        // fail early with a clear error instead of a confusing runtime failure.
-        if self.config.llm.backend != "nearai"
-            && self.config.llm.backend != "bedrock"
-            && self.config.llm.backend != "openai_codex"
-            && self.config.llm.provider.is_none()
-        {
+        if self.config.llm.backend != "nearai" && self.config.llm.provider.is_none() {
            let backend = &self.config.llm.backend;
            anyhow::bail!(
                "LLM_BACKEND={backend} is configured but no credentials were found. \
@@ -749,7 +747,7 @@ impl AppBuilder {
        } else {
            self.init_llm().await?
        };
-        let (safety, tools, embeddings, workspace, builder) = self.init_tools(&llm).await?;
+        let (safety, tools, embeddings, workspace) = self.init_tools(&llm).await?;

        // Create hook registry early so runtime extension activation can register hooks.
        let hooks = Arc::new(HookRegistry::new());
@@ -765,17 +763,6 @@ impl AppBuilder {
            dev_loaded_tool_names,
        ) = self.init_extensions(&tools, &hooks).await?;

-        // Load bootstrap-completed flag from settings so that existing users
-        // who already completed onboarding don't re-get bootstrap injection.
-        if let Some(ref ws) = workspace {
-            let toml_path = crate::settings::Settings::default_toml_path();
-            if let Ok(Some(settings)) = crate::settings::Settings::load_toml(&toml_path)
-                && settings.profile_onboarding_completed
-            {
-                ws.mark_bootstrap_completed();
-            }
-        }
-
        // Seed workspace and backfill embeddings
        if let Some(ref ws) = workspace {
            // Import workspace files from disk FIRST if WORKSPACE_IMPORT_DIR is set.
@@ -842,6 +829,9 @@ impl AppBuilder {
            (None, None)
        };

+        // Create unified event bus
+        let event_bus = EventBus::new();
+
        let context_manager = Arc::new(ContextManager::new(self.config.agent.max_parallel_jobs));
        let cost_guard = Arc::new(crate::agent::cost_guard::CostGuard::new(
            crate::agent::cost_guard::CostGuardConfig {
@@ -855,7 +845,7 @@ impl AppBuilder {
            tools.count()
        );

-        Ok(AppComponents {
+        let components = AppComponents {
            config: self.config,
            db: self.db,
            secrets_store: self.secrets_store,
@@ -880,8 +870,12 @@ impl AppBuilder {
            session: self.session,
            catalog_entries,
            dev_loaded_tool_names,
-            builder,
-        })
+            event_bus,
+        };
+
+        components.verify_readiness();
+
+        Ok(components)
    }
 }

@@ -67,24 +67,14 @@ pub struct IncomingMessage {
    pub id: Uuid,
    /// Channel this message came from.
    pub channel: String,
-    /// Storage/persistence scope for this interaction.
-    ///
-    /// For owner-capable channels this is the stable instance owner ID when the
-    /// configured owner is speaking; otherwise it can be a guest/sender-scoped
-    /// identifier to preserve isolation.
+    /// User identifier within the channel.
    pub user_id: String,
-    /// Stable instance owner scope for this IronClaw deployment.
-    pub owner_id: String,
-    /// Channel-specific sender/actor identifier.
-    pub sender_id: String,
    /// Optional display name.
    pub user_name: Option<String>,
    /// Message content.
    pub content: String,
    /// Thread/conversation ID for threaded conversations.
    pub thread_id: Option<String>,
-    /// Stable channel/chat/thread scope for this conversation.
-    pub conversation_scope_id: Option<String>,
    /// When the message was received.
    pub received_at: DateTime<Utc>,
    /// Channel-specific metadata.
@@ -94,8 +84,9 @@ pub struct IncomingMessage {
    /// File or media attachments on this message.
    pub attachments: Vec<IncomingAttachment>,
    /// Internal-only flag: message was generated inside the process (e.g. job
-    /// monitor) and must bypass the normal user-input pipeline. This field is
-    /// not settable via metadata, so external channels cannot spoof it.
+    /// monitor) and must bypass the normal user-input pipeline.  This field is
+    /// **not** settable via `with_metadata()` — only trusted code paths inside
+    /// the binary can set it, preventing external channels from spoofing it.
    pub(crate) is_internal: bool,
 }

@@ -106,17 +97,13 @@ impl IncomingMessage {
        user_id: impl Into<String>,
        content: impl Into<String>,
    ) -> Self {
-        let user_id = user_id.into();
        Self {
            id: Uuid::new_v4(),
            channel: channel.into(),
-            owner_id: user_id.clone(),
-            sender_id: user_id.clone(),
-            user_id,
+            user_id: user_id.into(),
            user_name: None,
            content: content.into(),
            thread_id: None,
-            conversation_scope_id: None,
            received_at: Utc::now(),
            metadata: serde_json::Value::Null,
            timezone: None,
@@ -127,27 +114,7 @@ impl IncomingMessage {

    /// Set the thread ID.
    pub fn with_thread(mut self, thread_id: impl Into<String>) -> Self {
-        let thread_id = thread_id.into();
-        self.conversation_scope_id = Some(thread_id.clone());
-        self.thread_id = Some(thread_id);
-        self
-    }
-
-    /// Set the stable owner scope for this message.
-    pub fn with_owner_id(mut self, owner_id: impl Into<String>) -> Self {
-        self.owner_id = owner_id.into();
-        self
-    }
-
-    /// Set the channel-specific sender/actor identifier.
-    pub fn with_sender_id(mut self, sender_id: impl Into<String>) -> Self {
-        self.sender_id = sender_id.into();
-        self
-    }
-
-    /// Set the conversation scope for this message.
-    pub fn with_conversation_scope(mut self, scope_id: impl Into<String>) -> Self {
-        self.conversation_scope_id = Some(scope_id.into());
+        self.thread_id = Some(thread_id.into());
        self
    }

@@ -180,49 +147,6 @@ impl IncomingMessage {
        self.is_internal = true;
        self
    }
-
-    /// Effective conversation scope, falling back to thread_id for legacy callers.
-    pub fn conversation_scope(&self) -> Option<&str> {
-        self.conversation_scope_id
-            .as_deref()
-            .or(self.thread_id.as_deref())
-    }
-
-    /// Best-effort routing target for proactive replies on the current channel.
-    pub fn routing_target(&self) -> Option<String> {
-        routing_target_from_metadata(&self.metadata).or_else(|| {
-            if self.sender_id.is_empty() {
-                None
-            } else {
-                Some(self.sender_id.clone())
-            }
-        })
-    }
-}
-
-/// Extract a channel-specific proactive routing target from message metadata.
-pub fn routing_target_from_metadata(metadata: &serde_json::Value) -> Option<String> {
-    metadata
-        .get("signal_target")
-        .and_then(|value| match value {
-            serde_json::Value::String(s) => Some(s.clone()),
-            serde_json::Value::Number(n) => Some(n.to_string()),
-            _ => None,
-        })
-        .or_else(|| {
-            metadata.get("chat_id").and_then(|value| match value {
-                serde_json::Value::String(s) => Some(s.clone()),
-                serde_json::Value::Number(n) => Some(n.to_string()),
-                _ => None,
-            })
-        })
-        .or_else(|| {
-            metadata.get("target").and_then(|value| match value {
-                serde_json::Value::String(s) => Some(s.clone()),
-                serde_json::Value::Number(n) => Some(n.to_string()),
-                _ => None,
-            })
-        })
 }

 /// Stream of incoming messages.
@@ -305,11 +229,6 @@ pub enum StatusUpdate {
        tool_name: String,
        description: String,
        parameters: serde_json::Value,
-        /// When `true`, the UI should offer an "always" option that auto-approves
-        /// future calls to this tool for the rest of the session.  When `false`
-        /// (i.e. `ApprovalRequirement::Always`), the tool must be approved every
-        /// time and the "always" button should be hidden.
-        allow_always: bool,
    },
    /// Extension needs user authentication (token or OAuth).
    AuthRequired {
@@ -133,8 +133,7 @@ impl HttpChannel {

 #[derive(Debug, Deserialize)]
 struct WebhookRequest {
-    /// Optional caller or client identifier for sender-scoped routing.
-    /// The channel owner/storage scope remains fixed by server config.
+    /// User or client identifier (ignored, user is fixed by server config).
    #[serde(default)]
    user_id: Option<String>,
    /// Message content.
@@ -404,38 +403,12 @@ async fn process_authenticated_request(
    state: Arc<HttpChannelState>,
    req: WebhookRequest,
 ) -> axum::response::Response {
-    let normalized_user_id = req
-        .user_id
-        .as_deref()
-        .map(str::trim)
-        .filter(|user_id| !user_id.is_empty());
-
-    match (req.user_id.as_deref(), normalized_user_id) {
-        (Some(raw_user_id), Some(user_id)) if raw_user_id != user_id => {
-            tracing::debug!(
-                provided_user_id = %raw_user_id,
-                normalized_sender_id = %user_id,
-                configured_owner_id = %state.user_id,
-                "HTTP webhook request provided user_id; trimming and using it as sender_id while keeping the configured owner scope"
-            );
-        }
-        (Some(user_id), Some(_)) => {
-            tracing::debug!(
-                provided_user_id = %user_id,
-                configured_owner_id = %state.user_id,
-                "HTTP webhook request provided user_id; using it as sender_id while keeping the configured owner scope"
-            );
-        }
-        (Some(raw_user_id), None) => {
-            tracing::debug!(
-                provided_user_id = %raw_user_id,
-                configured_owner_id = %state.user_id,
-                "HTTP webhook request provided a blank user_id; falling back to the configured owner scope for sender_id"
-            );
-        }
-        (None, None) => {}
-        (None, Some(_)) => unreachable!("normalized user_id requires a raw user_id"),
-    }
+    let _ = req.user_id.as_ref().map(|user_id| {
+        tracing::debug!(
+            provided_user_id = %user_id,
+            "HTTP webhook request provided user_id, ignoring in favor of configured user_id"
+        );
+    });

    if req.content.len() > MAX_CONTENT_BYTES {
        return (
@@ -541,13 +514,11 @@ async fn process_authenticated_request(
        Vec::new()
    };

-    let sender_id = normalized_user_id.unwrap_or(&state.user_id).to_string();
-    let mut msg = IncomingMessage::new("http", &state.user_id, &req.content)
-        .with_owner_id(&state.user_id)
-        .with_sender_id(sender_id)
-        .with_metadata(serde_json::json!({
+    let mut msg = IncomingMessage::new("http", &state.user_id, &req.content).with_metadata(
+        serde_json::json!({
            "wait_for_response": wait_for_response,
-        }));
+        }),
+    );

    if !attachments.is_empty() {
        msg = msg.with_attachments(attachments);
@@ -711,7 +682,6 @@ mod tests {
    use axum::body::Body;
    use axum::http::{HeaderValue, Request};
    use secrecy::SecretString;
-    use tokio_stream::StreamExt;
    use tower::ServiceExt;

    use super::*;
@@ -850,70 +820,6 @@ mod tests {
        assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
    }

-    #[tokio::test]
-    async fn webhook_blank_user_id_falls_back_to_owner_scope() {
-        let secret = "test-secret-123";
-        let channel = test_channel(Some(secret));
-        let mut stream = channel.start().await.unwrap();
-        let app = channel.routes();
-
-        let body = serde_json::json!({
-            "content": "hello",
-            "user_id": "   "
-        });
-        let body_bytes = serde_json::to_vec(&body).unwrap();
-        let signature = compute_signature(secret, &body_bytes);
-        let req = Request::builder()
-            .method("POST")
-            .uri("/webhook")
-            .header("content-type", "application/json")
-            .header("x-hub-signature-256", signature)
-            .body(Body::from(body_bytes))
-            .unwrap();
-
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::OK);
-
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(1), stream.next())
-            .await
-            .expect("timed out waiting for webhook message")
-            .expect("stream should yield a webhook message");
-        assert_eq!(msg.sender_id, "http");
-        assert_eq!(msg.owner_id, "http");
-    }
-
-    #[tokio::test]
-    async fn webhook_user_id_is_trimmed_before_becoming_sender_id() {
-        let secret = "test-secret-123";
-        let channel = test_channel(Some(secret));
-        let mut stream = channel.start().await.unwrap();
-        let app = channel.routes();
-
-        let body = serde_json::json!({
-            "content": "hello",
-            "user_id": "  alice  "
-        });
-        let body_bytes = serde_json::to_vec(&body).unwrap();
-        let signature = compute_signature(secret, &body_bytes);
-        let req = Request::builder()
-            .method("POST")
-            .uri("/webhook")
-            .header("content-type", "application/json")
-            .header("x-hub-signature-256", signature)
-            .body(Body::from(body_bytes))
-            .unwrap();
-
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::OK);
-
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(1), stream.next())
-            .await
-            .expect("timed out waiting for webhook message")
-            .expect("stream should yield a webhook message");
-        assert_eq!(msg.sender_id, "alice");
-        assert_eq!(msg.owner_id, "http");
-    }
-
    /// Regression test for issue #869: RwLock read guard was held across
    /// tx.send(msg).await in `process_message()`, blocking shutdown() from
    /// acquiring the write lock when the channel buffer was full.
@@ -239,11 +239,6 @@ impl ChannelManager {
    pub async fn get_channel(&self, name: &str) -> Option<Arc<dyn Channel>> {
        self.channels.read().await.get(name).cloned()
    }
-
-    /// Remove a channel from the manager.
-    pub async fn remove(&self, name: &str) -> Option<Arc<dyn Channel>> {
-        self.channels.write().await.remove(name)
-    }
 }

 impl Default for ChannelManager {
@@ -39,7 +39,7 @@ mod webhook_server;

 pub use channel::{
    AttachmentKind, Channel, ChannelSecretUpdater, IncomingAttachment, IncomingMessage,
-    MessageStream, OutgoingResponse, StatusUpdate, routing_target_from_metadata,
+    MessageStream, OutgoingResponse, StatusUpdate,
 };
 pub use http::{HttpChannel, HttpChannelState};
 pub use manager::ChannelManager;
@@ -1,16 +1,16 @@
-//! Channel trait implementation for channel-relay webhook callbacks.
+//! Channel trait implementation for channel-relay SSE streams.
 //!
-//! `RelayChannel` receives events from channel-relay via HTTP POST callbacks
-//! (pushed through an mpsc channel by the webhook handler), converts them
-//! to `IncomingMessage`s, and sends responses via the relay's provider-specific
-//! proxy API (Slack).
+//! `RelayChannel` connects to a channel-relay service via SSE, converts
+//! incoming events to `IncomingMessage`s, and sends responses via the
+//! relay's provider-specific proxy API (Slack).

 use std::collections::HashMap;
+use std::sync::Arc;

 use async_trait::async_trait;
-use tokio::sync::mpsc;
+use tokio::sync::{RwLock, mpsc};

-use crate::channels::relay::client::{ChannelEvent, RelayClient};
+use crate::channels::relay::client::{RelayClient, RelayError};
 use crate::channels::{Channel, IncomingMessage, MessageStream, OutgoingResponse, StatusUpdate};
 use crate::error::ChannelError;

@@ -39,34 +39,44 @@ impl RelayProvider {
    }
 }

-/// Channel implementation that receives events from channel-relay via webhook callbacks.
+/// Channel implementation that connects to a channel-relay SSE stream.
 pub struct RelayChannel {
    client: RelayClient,
    provider: RelayProvider,
+    stream_token: Arc<RwLock<String>>,
    team_id: String,
    instance_id: String,
-    /// Sender side of the event channel — shared with the webhook handler.
-    event_tx: mpsc::Sender<ChannelEvent>,
-    /// Receiver side — taken once by `start()`.
-    event_rx: tokio::sync::Mutex<Option<mpsc::Receiver<ChannelEvent>>>,
+    user_id: String,
+    /// SSE stream long-poll timeout in seconds.
+    stream_timeout_secs: u64,
+    /// Initial exponential backoff in milliseconds.
+    backoff_initial_ms: u64,
+    /// Maximum exponential backoff in milliseconds.
+    backoff_max_ms: u64,
+    /// Handle to the reconnect task for clean shutdown.
+    reconnect_handle: RwLock<Option<tokio::task::JoinHandle<()>>>,
+    /// Handle to the SSE parser task for clean shutdown.
+    parser_handle: Arc<RwLock<Option<tokio::task::JoinHandle<()>>>>,
+    /// Maximum consecutive reconnect failures before giving up.
+    max_consecutive_failures: u64,
 }

 impl RelayChannel {
    /// Create a new relay channel for Slack (default provider).
    pub fn new(
        client: RelayClient,
+        stream_token: String,
        team_id: String,
        instance_id: String,
-        event_tx: mpsc::Sender<ChannelEvent>,
-        event_rx: mpsc::Receiver<ChannelEvent>,
+        user_id: String,
    ) -> Self {
        Self::new_with_provider(
            client,
            RelayProvider::Slack,
+            stream_token,
            team_id,
            instance_id,
-            event_tx,
-            event_rx,
+            user_id,
        )
    }

@@ -74,24 +84,44 @@ impl RelayChannel {
    pub fn new_with_provider(
        client: RelayClient,
        provider: RelayProvider,
+        stream_token: String,
        team_id: String,
        instance_id: String,
-        event_tx: mpsc::Sender<ChannelEvent>,
-        event_rx: mpsc::Receiver<ChannelEvent>,
+        user_id: String,
    ) -> Self {
        Self {
            client,
            provider,
+            stream_token: Arc::new(RwLock::new(stream_token)),
            team_id,
            instance_id,
-            event_tx,
-            event_rx: tokio::sync::Mutex::new(Some(event_rx)),
+            user_id,
+            stream_timeout_secs: 86400,
+            backoff_initial_ms: 1000,
+            backoff_max_ms: 60000,
+            reconnect_handle: RwLock::new(None),
+            parser_handle: Arc::new(RwLock::new(None)),
+            max_consecutive_failures: 50,
        }
    }

-    /// Get a clone of the event sender for wiring into the webhook endpoint.
-    pub fn event_sender(&self) -> mpsc::Sender<ChannelEvent> {
-        self.event_tx.clone()
+    /// Set backoff/timeout parameters from relay config values.
+    pub fn with_timeouts(
+        mut self,
+        stream_timeout_secs: u64,
+        backoff_initial_ms: u64,
+        backoff_max_ms: u64,
+    ) -> Self {
+        self.stream_timeout_secs = stream_timeout_secs;
+        self.backoff_initial_ms = backoff_initial_ms;
+        self.backoff_max_ms = backoff_max_ms;
+        self
+    }
+
+    /// Set the maximum number of consecutive reconnect failures before giving up.
+    pub fn with_max_failures(mut self, max: u64) -> Self {
+        self.max_consecutive_failures = max;
+        self
    }

    /// Build a provider-appropriate proxy body for sending a message.
@@ -121,9 +151,15 @@ impl RelayChannel {
        team_id: &str,
        method: &str,
        body: serde_json::Value,
-    ) -> Result<serde_json::Value, crate::channels::relay::client::RelayError> {
+    ) -> Result<serde_json::Value, RelayError> {
        self.client
-            .proxy_provider(self.provider.as_str(), team_id, method, body)
+            .proxy_provider(
+                self.provider.as_str(),
+                team_id,
+                method,
+                body,
+                Some(&self.instance_id),
+            )
            .await
    }
 }
@@ -136,83 +172,205 @@ impl Channel for RelayChannel {

    async fn start(&self) -> Result<MessageStream, ChannelError> {
        let channel_name = self.name().to_string();
+        let token = self.stream_token.read().await.clone();
+        let (stream, initial_parser_handle) = self
+            .client
+            .connect_stream(&token, self.stream_timeout_secs)
+            .await
+            .map_err(|e| ChannelError::StartupFailed {
+                name: channel_name.clone(),
+                reason: e.to_string(),
+            })?;

-        // Take the receiver (can only start once)
-        let mut event_rx =
-            self.event_rx
-                .lock()
-                .await
-                .take()
-                .ok_or_else(|| ChannelError::StartupFailed {
-                    name: channel_name.clone(),
-                    reason: "RelayChannel already started".to_string(),
-                })?;
+        *self.parser_handle.write().await = Some(initial_parser_handle);

        let (tx, rx) = mpsc::channel(64);
+
+        // Spawn the stream reader + reconnect task
+        let client = self.client.clone();
+        let stream_token = Arc::clone(&self.stream_token);
+        let instance_id = self.instance_id.clone();
+        let user_id = self.user_id.clone();
+        let team_id = self.team_id.clone();
+        let stream_timeout_secs = self.stream_timeout_secs;
+        let backoff_initial_ms = self.backoff_initial_ms;
+        let backoff_max_ms = self.backoff_max_ms;
+        let max_consecutive_failures = self.max_consecutive_failures;
+        let parser_handle = Arc::clone(&self.parser_handle);
        let provider_str = self.provider.as_str().to_string();
        let relay_name = channel_name.clone();

-        // Spawn a task that reads events from the webhook handler and converts to IncomingMessage
-        tokio::spawn(async move {
-            while let Some(event) = event_rx.recv().await {
-                // Validate required fields
-                if event.sender_id.is_empty()
-                    || event.channel_id.is_empty()
-                    || event.provider_scope.is_empty()
-                {
-                    tracing::debug!(
+        let handle = tokio::spawn(async move {
+            use futures::StreamExt;
+
+            let mut current_stream = stream;
+            let mut backoff_ms = backoff_initial_ms;
+            let mut consecutive_failures: u64 = 0;
+
+            loop {
+                // Read events from the current stream
+                while let Some(event) = current_stream.next().await {
+                    // Reset backoff and failure count on successful event
+                    backoff_ms = backoff_initial_ms;
+                    consecutive_failures = 0;
+
+                    // Validate required fields
+                    if event.sender_id.is_empty()
+                        || event.channel_id.is_empty()
+                        || event.provider_scope.is_empty()
+                    {
+                        tracing::debug!(
+                            event_type = %event.event_type,
+                            sender_id = %event.sender_id,
+                            channel_id = %event.channel_id,
+                            "Relay: skipping event with missing required fields"
+                        );
+                        continue;
+                    }
+
+                    // Skip non-message events
+                    if !event.is_message() {
+                        tracing::debug!(
+                            event_type = %event.event_type,
+                            "Relay: skipping non-message event"
+                        );
+                        continue;
+                    }
+
+                    tracing::info!(
                        event_type = %event.event_type,
-                        sender_id = %event.sender_id,
-                        channel_id = %event.channel_id,
-                        "Relay: skipping event with missing required fields"
+                        sender = %event.sender_id,
+                        channel = %event.channel_id,
+                        provider = %provider_str,
+                        "Relay: received message from {}", provider_str
                    );
-                    continue;
+
+                    let msg = IncomingMessage::new(&relay_name, &event.sender_id, event.text())
+                        .with_user_name(event.display_name())
+                        .with_metadata(serde_json::json!({
+                            "team_id": event.team_id(),
+                            "channel_id": event.channel_id,
+                            "sender_id": event.sender_id,
+                            "sender_name": event.display_name(),
+                            "event_type": event.event_type,
+                            "thread_id": event.thread_id,
+                            "provider": event.provider,
+                        }));
+
+                    let msg = if let Some(ref thread_id) = event.thread_id {
+                        msg.with_thread(thread_id)
+                    } else {
+                        msg.with_thread(&event.channel_id)
+                    };
+
+                    if tx.send(msg).await.is_err() {
+                        tracing::info!("Relay channel receiver dropped, stopping");
+                        return;
+                    }
                }

-                // Skip non-message events
-                if !event.is_message() {
-                    tracing::debug!(
-                        event_type = %event.event_type,
-                        "Relay: skipping non-message event"
+                // Stream ended, attempt reconnect with backoff
+                consecutive_failures += 1;
+                if consecutive_failures >= max_consecutive_failures {
+                    tracing::error!(
+                        channel = %relay_name,
+                        failures = consecutive_failures,
+                        "Relay channel giving up after {} consecutive failures",
+                        consecutive_failures
                    );
-                    continue;
+                    break;
                }

-                tracing::info!(
-                    event_type = %event.event_type,
-                    sender = %event.sender_id,
-                    channel = %event.channel_id,
-                    provider = %provider_str,
-                    "Relay: received message from {}", provider_str
+                tracing::warn!(
+                    backoff_ms = backoff_ms,
+                    failures = consecutive_failures,
+                    "Relay SSE stream ended, reconnecting..."
                );
+                tokio::time::sleep(std::time::Duration::from_millis(backoff_ms)).await;
+                backoff_ms = (backoff_ms * 2).min(backoff_max_ms);

-                let msg = IncomingMessage::new(&relay_name, &event.sender_id, event.text())
-                    .with_user_name(event.display_name())
-                    .with_metadata(serde_json::json!({
-                        "team_id": event.team_id(),
-                        "channel_id": event.channel_id,
-                        "sender_id": event.sender_id,
-                        "sender_name": event.display_name(),
-                        "event_type": event.event_type,
-                        "thread_id": event.thread_id,
-                        "provider": event.provider,
-                    }));
+                // Try to reconnect
+                let token = stream_token.read().await.clone();
+                match client.connect_stream(&token, stream_timeout_secs).await {
+                    Ok((new_stream, new_parser)) => {
+                        tracing::info!("Relay SSE stream reconnected");
+                        consecutive_failures = 0;
+                        backoff_ms = backoff_initial_ms;
+                        current_stream = new_stream;
+                        // Abort old parser before replacing
+                        if let Some(old) = parser_handle.write().await.take() {
+                            old.abort();
+                        }
+                        *parser_handle.write().await = Some(new_parser);
+                    }
+                    Err(RelayError::TokenExpired) => {
+                        // Attempt token renewal
+                        tracing::info!("Relay stream token expired, renewing...");
+                        match client.renew_token(&instance_id, &user_id).await {
+                            Ok(new_token) => {
+                                *stream_token.write().await = new_token.clone();
+                                match client.connect_stream(&new_token, stream_timeout_secs).await {
+                                    Ok((new_stream, new_parser)) => {
+                                        tracing::info!(
+                                            "Relay SSE stream reconnected with new token"
+                                        );
+                                        consecutive_failures = 0;
+                                        backoff_ms = backoff_initial_ms;
+                                        current_stream = new_stream;
+                                        if let Some(old) = parser_handle.write().await.take() {
+                                            old.abort();
+                                        }
+                                        *parser_handle.write().await = Some(new_parser);
+                                    }
+                                    Err(e) => {
+                                        tracing::error!(
+                                            error = %e,
+                                            "Failed to reconnect after token renewal"
+                                        );
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                tracing::error!(
+                                    error = %e,
+                                    "Failed to renew relay stream token"
+                                );
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        tracing::error!(error = %e, "Failed to reconnect relay SSE stream");
+                    }
+                }

-                let msg = if let Some(ref thread_id) = event.thread_id {
-                    msg.with_thread(thread_id)
-                } else {
-                    msg.with_thread(&event.channel_id)
-                };
-
-                if tx.send(msg).await.is_err() {
-                    tracing::info!("Relay channel receiver dropped, stopping");
-                    return;
+                // Check if the team is still valid (skip when team_id is unknown,
+                // e.g. when no DB store was available at activation time)
+                if !team_id.is_empty() {
+                    match client.list_connections(&instance_id).await {
+                        Ok(conns) => {
+                            let has_team =
+                                conns.iter().any(|c| c.team_id == team_id && c.connected);
+                            if !has_team {
+                                tracing::warn!(
+                                    team_id = %team_id,
+                                    "Team no longer connected, stopping relay channel"
+                                );
+                                return;
+                            }
+                        }
+                        Err(e) => {
+                            tracing::warn!(
+                                error = %e,
+                                "Could not verify team connection, will retry next iteration"
+                            );
+                        }
+                    }
                }
            }
-
-            tracing::info!("Relay event channel closed");
        });

+        *self.reconnect_handle.write().await = Some(handle);
+
        let stream = tokio_stream::wrappers::ReceiverStream::new(rx);
        Ok(Box::pin(stream))
    }
@@ -265,7 +423,6 @@ impl Channel for RelayChannel {
            tool_name,
            description,
            parameters,
-            allow_always: _,
        } = status
        else {
            return Ok(());
@@ -293,24 +450,28 @@ impl Channel for RelayChannel {
                name: self.name().to_string(),
                reason: "Missing channel_id for approval buttons".into(),
            })?;
+        let sender_id = metadata
+            .get("sender_id")
+            .and_then(|v| v.as_str())
+            .ok_or_else(|| ChannelError::SendFailed {
+                name: self.name().to_string(),
+                reason: "Missing sender_id for approval buttons".into(),
+            })?;
        let thread_id = metadata.get("thread_id").and_then(|v| v.as_str());
        let team_id = metadata
            .get("team_id")
            .and_then(|v| v.as_str())
            .unwrap_or(&self.team_id);

-        // Register server-side approval record and get opaque token.
-        // The button value contains ONLY the token — no routing fields.
-        let approval_token = self
-            .client
-            .create_approval(team_id, channel_id, thread_id, &request_id)
-            .await
-            .map_err(|e| ChannelError::SendFailed {
-                name: self.name().to_string(),
-                reason: format!("Failed to register approval: {e}"),
-            })?;
+        // Button value payload (Slack limits button values to 2000 chars;
+        // safe with typical UUIDs but documented here as a constraint)
        let value_payload = serde_json::json!({
-            "approval_token": approval_token,
+            "instance_id": self.instance_id,
+            "team_id": team_id,
+            "channel_id": channel_id,
+            "thread_ts": thread_id,
+            "request_id": request_id,
+            "sender_id": sender_id,
        });
        let value_str = value_payload.to_string();

@@ -421,8 +582,12 @@ impl Channel for RelayChannel {
    }

    async fn shutdown(&self) -> Result<(), ChannelError> {
-        // Relay cleanup is driven by the extension manager dropping the shared
-        // sender and removing the channel from the channel manager.
+        if let Some(handle) = self.reconnect_handle.write().await.take() {
+            handle.abort();
+        }
+        if let Some(handle) = self.parser_handle.write().await.take() {
+            handle.abort();
+        }
        Ok(())
    }
 }
@@ -440,20 +605,27 @@ mod tests {
        .expect("client")
    }

-    fn make_channel() -> RelayChannel {
-        let (tx, rx) = mpsc::channel(64);
-        RelayChannel::new(test_client(), "T123".into(), "inst1".into(), tx, rx)
-    }
-
    #[test]
    fn relay_channel_name() {
-        let channel = make_channel();
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
        assert_eq!(channel.name(), DEFAULT_RELAY_NAME);
    }

    #[test]
    fn conversation_context_extracts_metadata() {
-        let channel = make_channel();
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );

        let metadata = serde_json::json!({
            "sender_name": "bob",
@@ -468,6 +640,8 @@ mod tests {

    #[test]
    fn metadata_shape_includes_event_type_and_sender_name() {
+        // Regression: metadata JSON must include event_type and sender_name
+        // for downstream routing (DM vs channel) and conversation_context().
        let metadata = serde_json::json!({
            "team_id": "T123",
            "channel_id": "C456",
@@ -477,19 +651,43 @@ mod tests {
            "thread_id": null,
            "provider": "slack",
        });
+        // event_type must be present for DM-vs-channel routing
        assert_eq!(
            metadata.get("event_type").and_then(|v| v.as_str()),
            Some("direct_message")
        );
+        // sender_name must be present for conversation_context
        assert_eq!(
            metadata.get("sender_name").and_then(|v| v.as_str()),
            Some("alice")
        );
    }

+    #[test]
+    fn with_timeouts_sets_values() {
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        )
+        .with_timeouts(43200, 2000, 120000);
+
+        assert_eq!(channel.stream_timeout_secs, 43200);
+        assert_eq!(channel.backoff_initial_ms, 2000);
+        assert_eq!(channel.backoff_max_ms, 120000);
+    }
+
    #[test]
    fn build_send_body_slack() {
-        let channel = make_channel();
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
        let (method, body) = channel.build_send_body("C456", "hello", Some("1234567.890"));
        assert_eq!(method, "chat.postMessage");
        assert_eq!(body["channel"], "C456");
@@ -497,95 +695,72 @@ mod tests {
        assert_eq!(body["thread_ts"], "1234567.890");
    }

-    #[tokio::test]
-    async fn start_processes_events() {
-        let (tx, rx) = mpsc::channel(64);
-        let channel =
-            RelayChannel::new(test_client(), "T123".into(), "inst1".into(), tx.clone(), rx);
-
-        let mut stream = channel.start().await.unwrap();
-
-        // Send an event
-        tx.send(ChannelEvent {
-            id: "1".into(),
-            event_type: "message".into(),
-            provider: "slack".into(),
-            provider_scope: "T123".into(),
-            channel_id: "C456".into(),
-            sender_id: "U789".into(),
-            sender_name: Some("alice".into()),
-            content: Some("hello".into()),
-            thread_id: None,
-            raw: serde_json::Value::Null,
-            timestamp: None,
-        })
-        .await
-        .unwrap();
-
-        use futures::StreamExt;
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(1), stream.next())
-            .await
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(msg.content, "hello");
-        assert_eq!(msg.user_id, "U789");
+    #[test]
+    fn parser_handle_is_shared_arc() {
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
+        // parser_handle should be an Arc — cloning should give a second reference
+        let handle_clone = Arc::clone(&channel.parser_handle);
+        // Both point to the same allocation
+        assert!(Arc::ptr_eq(&channel.parser_handle, &handle_clone));
    }

-    #[tokio::test]
-    async fn start_skips_non_message_events() {
-        let (tx, rx) = mpsc::channel(64);
-        let channel =
-            RelayChannel::new(test_client(), "T123".into(), "inst1".into(), tx.clone(), rx);
+    #[test]
+    fn with_max_failures_sets_value() {
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        )
+        .with_max_failures(10);

-        let mut stream = channel.start().await.unwrap();
+        assert_eq!(channel.max_consecutive_failures, 10);
+    }

-        // Send a non-message event (should be skipped)
-        tx.send(ChannelEvent {
-            id: "1".into(),
-            event_type: "reaction".into(),
-            provider: "slack".into(),
-            provider_scope: "T123".into(),
-            channel_id: "C456".into(),
-            sender_id: "U789".into(),
-            sender_name: None,
-            content: None,
-            thread_id: None,
-            raw: serde_json::Value::Null,
-            timestamp: None,
-        })
-        .await
-        .unwrap();
+    #[test]
+    fn default_max_failures_is_50() {
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
+        assert_eq!(channel.max_consecutive_failures, 50);
+    }

-        // Send a real message
-        tx.send(ChannelEvent {
-            id: "2".into(),
-            event_type: "message".into(),
-            provider: "slack".into(),
-            provider_scope: "T123".into(),
-            channel_id: "C456".into(),
-            sender_id: "U789".into(),
-            sender_name: None,
-            content: Some("real message".into()),
-            thread_id: None,
-            raw: serde_json::Value::Null,
-            timestamp: None,
-        })
-        .await
-        .unwrap();
-
-        use futures::StreamExt;
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(1), stream.next())
-            .await
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(msg.content, "real message");
+    #[test]
+    fn empty_team_id_accepted_at_construction() {
+        // Regression: empty team_id (when no DB store is available) must not
+        // prevent channel construction or cause immediate shutdown.
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            String::new(), // empty team_id
+            "inst1".into(),
+            "user1".into(),
+        );
+        assert_eq!(channel.team_id, "");
+        // The reconnect loop now skips team validation when team_id is empty,
+        // so the channel remains alive.
    }

    #[tokio::test]
    async fn test_send_status_non_approval_is_noop() {
-        let channel = make_channel();
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
        let metadata = serde_json::json!({});
        let result = channel
            .send_status(
@@ -600,7 +775,13 @@ mod tests {

    #[tokio::test]
    async fn test_send_status_approval_non_dm_skips() {
-        let channel = make_channel();
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
        let metadata = serde_json::json!({
            "event_type": "message",
            "channel_id": "C456",
@@ -613,7 +794,6 @@ mod tests {
                    tool_name: "shell".into(),
                    description: "run command".into(),
                    parameters: serde_json::json!({}),
-                    allow_always: true,
                },
                &metadata,
            )
@@ -624,7 +804,13 @@ mod tests {

    #[tokio::test]
    async fn test_send_status_approval_dm_missing_channel_id_errors() {
-        let channel = make_channel();
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
        let metadata = serde_json::json!({
            "event_type": "direct_message",
            "sender_id": "U789",
@@ -636,7 +822,6 @@ mod tests {
                    tool_name: "shell".into(),
                    description: "run command".into(),
                    parameters: serde_json::json!({}),
-                    allow_always: true,
                },
                &metadata,
            )
@@ -650,8 +835,14 @@ mod tests {
    }

    #[tokio::test]
-    async fn test_send_status_approval_dm_without_sender_id_is_ok() {
-        let channel = make_channel();
+    async fn test_send_status_approval_dm_missing_sender_id_errors() {
+        let channel = RelayChannel::new(
+            test_client(),
+            "token".into(),
+            "T123".into(),
+            "inst1".into(),
+            "user1".into(),
+        );
        let metadata = serde_json::json!({
            "event_type": "direct_message",
            "channel_id": "C456",
@@ -663,7 +854,6 @@ mod tests {
                    tool_name: "shell".into(),
                    description: "run command".into(),
                    parameters: serde_json::json!({}),
-                    allow_always: true,
                },
                &metadata,
            )
@@ -671,8 +861,8 @@ mod tests {
        assert!(result.is_err());
        let err = result.unwrap_err().to_string();
        assert!(
-            !err.contains("sender_id"),
-            "sender_id should not be required anymore, got: {err}"
+            err.contains("sender_id"),
+            "expected sender_id error, got: {err}"
        );
    }
 }
@@ -1,10 +1,15 @@
 //! HTTP client for the channel-relay service.
 //!
 //! Wraps reqwest for all channel-relay API calls: OAuth initiation,
-//! approvals, signing-secret fetch, and Slack API proxy.
+//! SSE streaming, token renewal, and Slack API proxy.

+use std::pin::Pin;
+use std::task::{Context, Poll};
+
+use futures::Stream;
 use secrecy::{ExposeSecret, SecretString};
 use serde::{Deserialize, Serialize};
+use tokio::sync::mpsc;

 /// Known relay event types.
 pub mod event_types {
@@ -13,7 +18,7 @@ pub mod event_types {
    pub const MENTION: &str = "mention";
 }

-/// A parsed event from the channel-relay webhook callback.
+/// A parsed SSE event from the channel-relay stream.
 ///
 /// Field names match the channel-relay `ChannelEvent` struct exactly.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -118,19 +123,21 @@ impl RelayClient {
    ///
    /// Calls `GET /oauth/slack/auth` with `redirect(Policy::none())` and
    /// returns the `Location` header (Slack OAuth URL) without following it.
-    /// Initiate Slack OAuth. Channel-relay derives all URLs from the trusted
-    /// instance_url in chat-api. IronClaw only passes an optional CSRF nonce
-    /// for validating the callback — no URLs.
-    pub async fn initiate_oauth(&self, state_nonce: Option<&str>) -> Result<String, RelayError> {
-        let mut query: Vec<(&str, &str)> = vec![];
-        if let Some(nonce) = state_nonce {
-            query.push(("state_nonce", nonce));
-        }
+    pub async fn initiate_oauth(
+        &self,
+        instance_id: &str,
+        user_id: &str,
+        callback_url: &str,
+    ) -> Result<String, RelayError> {
        let resp = self
            .http
            .get(format!("{}/oauth/slack/auth", self.base_url))
-            .bearer_auth(self.api_key.expose_secret())
-            .query(&query)
+            .header("X-API-Key", self.api_key.expose_secret())
+            .query(&[
+                ("instance_id", instance_id),
+                ("user_id", user_id),
+                ("callback", callback_url),
+            ])
            .send()
            .await
            .map_err(|e| RelayError::Network(e.to_string()))?;
@@ -166,69 +173,104 @@ impl RelayClient {
        }
    }

-    /// Register a pending approval and return the opaque approval token.
+    /// Connect to the SSE event stream.
    ///
-    /// Calls `POST /approvals` with the target team/channel/request identifiers.
-    /// The returned token is embedded in Slack button values instead of routing fields.
-    /// The relay derives the authorized approver from the connection's authed_user_id.
-    pub async fn create_approval(
+    /// Returns a stream of parsed `ChannelEvent`s and the `JoinHandle` of the
+    /// background SSE parser task. The caller is responsible for reconnection
+    /// logic on stream end/error and for aborting the handle on shutdown.
+    pub async fn connect_stream(
        &self,
-        team_id: &str,
-        channel_id: &str,
-        thread_ts: Option<&str>,
-        request_id: &str,
-    ) -> Result<String, RelayError> {
-        let mut body = serde_json::json!({
-            "team_id": team_id,
-            "channel_id": channel_id,
-            "request_id": request_id,
-        });
-        if let Some(ts) = thread_ts {
-            body["thread_ts"] = serde_json::Value::String(ts.to_string());
-        }
-
+        stream_token: &str,
+        stream_timeout_secs: u64,
+    ) -> Result<(ChannelEventStream, tokio::task::JoinHandle<()>), RelayError> {
        let resp = self
            .http
-            .post(format!("{}/approvals", self.base_url))
-            .bearer_auth(self.api_key.expose_secret())
-            .json(&body)
+            .get(format!("{}/stream", self.base_url))
+            .query(&[("token", stream_token)])
+            .timeout(std::time::Duration::from_secs(stream_timeout_secs))
            .send()
            .await
            .map_err(|e| RelayError::Network(e.to_string()))?;

-        if !resp.status().is_success() {
-            let status = resp.status().as_u16();
+        let status = resp.status();
+        if status == reqwest::StatusCode::UNAUTHORIZED {
+            return Err(RelayError::TokenExpired);
+        }
+        if !status.is_success() {
            let body = resp.text().await.unwrap_or_default();
            return Err(RelayError::Api {
-                status,
+                status: status.as_u16(),
                message: body,
            });
        }

-        let result: serde_json::Value = resp
+        // Spawn a background task that reads the SSE stream and sends parsed events
+        let (tx, rx) = mpsc::channel(64);
+        let byte_stream = resp.bytes_stream();
+        let handle = tokio::spawn(parse_sse_stream(byte_stream, tx));
+
+        Ok((ChannelEventStream { rx }, handle))
+    }
+
+    /// Renew an expired stream token.
+    ///
+    /// Calls `POST /stream/renew` with API key auth, returns a new stream token.
+    pub async fn renew_token(
+        &self,
+        instance_id: &str,
+        user_id: &str,
+    ) -> Result<String, RelayError> {
+        let resp = self
+            .http
+            .post(format!("{}/stream/renew", self.base_url))
+            .header("X-API-Key", self.api_key.expose_secret())
+            .json(&serde_json::json!({
+                "instance_id": instance_id,
+                "user_id": user_id,
+            }))
+            .send()
+            .await
+            .map_err(|e| RelayError::Network(e.to_string()))?;
+
+        let status = resp.status();
+        if !status.is_success() {
+            let body = resp.text().await.unwrap_or_default();
+            return Err(RelayError::Api {
+                status: status.as_u16(),
+                message: body,
+            });
+        }
+
+        let body: serde_json::Value = resp
            .json()
            .await
            .map_err(|e| RelayError::Protocol(e.to_string()))?;
-
-        result
-            .get("approval_token")
+        body.get("stream_token")
+            .or_else(|| body.get("token"))
            .and_then(|v| v.as_str())
            .map(|s| s.to_string())
-            .ok_or_else(|| RelayError::Protocol("missing approval_token in response".to_string()))
+            .ok_or_else(|| RelayError::Protocol("Response missing stream_token field".to_string()))
    }

+    /// Proxy an API call through channel-relay for any provider.
+    ///
+    /// Calls `POST /proxy/{provider}/{method}?team_id=X&instance_id=Y` with the given JSON body.
    pub async fn proxy_provider(
        &self,
        provider: &str,
        team_id: &str,
        method: &str,
        body: serde_json::Value,
+        instance_id: Option<&str>,
    ) -> Result<serde_json::Value, RelayError> {
-        let query: Vec<(&str, &str)> = vec![("team_id", team_id)];
+        let mut query: Vec<(&str, &str)> = vec![("team_id", team_id)];
+        if let Some(iid) = instance_id {
+            query.push(("instance_id", iid));
+        }
        let resp = self
            .http
            .post(format!("{}/proxy/{}/{}", self.base_url, provider, method))
-            .bearer_auth(self.api_key.expose_secret())
+            .header("X-API-Key", self.api_key.expose_secret())
            .query(&query)
            .json(&body)
            .send()
@@ -249,58 +291,12 @@ impl RelayClient {
            .map_err(|e| RelayError::Protocol(e.to_string()))
    }

-    /// Fetch the per-instance callback signing secret from channel-relay.
-    ///
-    /// Calls `GET /relay/signing-secret` (authenticated) and returns the decoded
-    /// 32-byte secret. Called once at activation time; the result is cached in the
-    /// extension manager so subsequent calls to `relay_signing_secret()` use it.
-    pub async fn get_signing_secret(&self, team_id: &str) -> Result<Vec<u8>, RelayError> {
-        let resp = self
-            .http
-            .get(format!("{}/relay/signing-secret", self.base_url))
-            .bearer_auth(self.api_key.expose_secret())
-            .query(&[("team_id", team_id)])
-            .send()
-            .await
-            .map_err(|e| RelayError::Network(e.to_string()))?;
-
-        if !resp.status().is_success() {
-            let status = resp.status().as_u16();
-            let body = resp.text().await.unwrap_or_default();
-            return Err(RelayError::Api {
-                status,
-                message: body,
-            });
-        }
-
-        let body: serde_json::Value = resp
-            .json()
-            .await
-            .map_err(|e| RelayError::Protocol(e.to_string()))?;
-
-        body.get("signing_secret")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| RelayError::Protocol("missing signing_secret in response".to_string()))
-            .and_then(|raw| {
-                let decoded = hex::decode(raw).map_err(|e| {
-                    RelayError::Protocol(format!("invalid signing_secret hex: {e}"))
-                })?;
-                if decoded.len() != 32 {
-                    return Err(RelayError::Protocol(format!(
-                        "invalid signing_secret length: expected 32 bytes, got {}",
-                        decoded.len()
-                    )));
-                }
-                Ok(decoded)
-            })
-    }
-
    /// List active connections for an instance.
    pub async fn list_connections(&self, instance_id: &str) -> Result<Vec<Connection>, RelayError> {
        let resp = self
            .http
            .get(format!("{}/connections", self.base_url))
-            .bearer_auth(self.api_key.expose_secret())
+            .header("X-API-Key", self.api_key.expose_secret())
            .query(&[("instance_id", instance_id)])
            .send()
            .await
@@ -321,6 +317,91 @@ impl RelayClient {
    }
 }

+/// Async stream of parsed channel events from SSE.
+pub struct ChannelEventStream {
+    rx: mpsc::Receiver<ChannelEvent>,
+}
+
+impl Stream for ChannelEventStream {
+    type Item = ChannelEvent;
+
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        self.rx.poll_recv(cx)
+    }
+}
+
+/// Parse SSE format from a reqwest bytes stream.
+///
+/// SSE format:
+/// ```text
+/// event: message
+/// data: {"key": "value"}
+///
+/// ```
+/// Blank line terminates an event.
+async fn parse_sse_stream(
+    byte_stream: impl futures::Stream<Item = Result<bytes::Bytes, reqwest::Error>> + Send + 'static,
+    tx: mpsc::Sender<ChannelEvent>,
+) {
+    use futures::StreamExt;
+
+    let mut buffer = Vec::<u8>::new();
+    let mut event_type = String::new();
+    let mut data_lines = Vec::new();
+
+    let mut byte_stream = std::pin::pin!(byte_stream);
+    while let Some(chunk_result) = byte_stream.next().await {
+        let chunk = match chunk_result {
+            Ok(c) => c,
+            Err(e) => {
+                tracing::debug!(error = %e, "SSE stream chunk error");
+                break;
+            }
+        };
+
+        buffer.extend_from_slice(&chunk);
+
+        // Process complete lines (decode UTF-8 only on full lines to avoid
+        // corruption when multi-byte characters span chunk boundaries)
+        while let Some(newline_pos) = buffer.iter().position(|&b| b == b'\n') {
+            let line = String::from_utf8_lossy(&buffer[..newline_pos])
+                .trim_end_matches('\r')
+                .to_string();
+            buffer.drain(..=newline_pos);
+
+            if line.is_empty() {
+                // Blank line = end of event
+                if !data_lines.is_empty() {
+                    let data = data_lines.join("\n");
+                    if let Ok(mut event) = serde_json::from_str::<ChannelEvent>(&data) {
+                        if event.event_type.is_empty() && !event_type.is_empty() {
+                            event.event_type = event_type.clone();
+                        }
+                        if tx.send(event).await.is_err() {
+                            return; // receiver dropped
+                        }
+                    } else {
+                        tracing::debug!(
+                            event_type = %event_type,
+                            data_len = data.len(),
+                            "Failed to parse SSE event data as ChannelEvent"
+                        );
+                    }
+                }
+                event_type.clear();
+                data_lines.clear();
+            } else if let Some(value) = line.strip_prefix("event:") {
+                event_type = value.trim().to_string();
+            } else if let Some(value) = line.strip_prefix("data:") {
+                data_lines.push(value.trim().to_string());
+            }
+            // Ignore other fields (id:, retry:, comments)
+        }
+    }
+
+    tracing::debug!("SSE stream ended");
+}
+
 /// Errors from relay client operations.
 #[derive(Debug, thiserror::Error)]
 pub enum RelayError {
@@ -332,6 +413,9 @@ pub enum RelayError {

    #[error("Protocol error: {0}")]
    Protocol(String),
+
+    #[error("Stream token expired")]
+    TokenExpired,
 }

 #[cfg(test)]
@@ -410,6 +494,9 @@ mod tests {
            message: "unauthorized".into(),
        };
        assert_eq!(err.to_string(), "API error (HTTP 401): unauthorized");
+
+        let err = RelayError::TokenExpired;
+        assert_eq!(err.to_string(), "Stream token expired");
    }

    #[test]
@@ -431,4 +518,32 @@ mod tests {
        assert!(make(event_types::DIRECT_MESSAGE).is_message());
        assert!(make(event_types::MENTION).is_message());
    }
+
+    #[tokio::test]
+    async fn parse_sse_handles_multibyte_utf8_across_chunks() {
+        // The crab emoji (🦀) is 4 bytes: [0xF0, 0x9F, 0xA6, 0x80].
+        // Split it across two chunks to verify no U+FFFD corruption.
+        let event_json = r#"{"event_type":"message","content":"hello 🦀 world","provider_scope":"T1","channel_id":"C1","sender_id":"U1"}"#;
+        let full = format!("event: message\ndata: {}\n\n", event_json);
+        let bytes = full.as_bytes();
+
+        // Find the crab emoji and split mid-character
+        let crab_pos = bytes
+            .windows(4)
+            .position(|w| w == [0xF0, 0x9F, 0xA6, 0x80])
+            .expect("crab emoji not found");
+        let split_at = crab_pos + 2; // split in the middle of the 4-byte emoji
+
+        let chunk1 = bytes::Bytes::copy_from_slice(&bytes[..split_at]);
+        let chunk2 = bytes::Bytes::copy_from_slice(&bytes[split_at..]);
+
+        let chunks: Vec<Result<bytes::Bytes, reqwest::Error>> = vec![Ok(chunk1), Ok(chunk2)];
+        let stream = futures::stream::iter(chunks);
+
+        let (tx, mut rx) = mpsc::channel(8);
+        parse_sse_stream(stream, tx).await;
+
+        let event = rx.recv().await.expect("should receive event");
+        assert_eq!(event.text(), "hello 🦀 world");
+    }
 }
@@ -1,13 +1,12 @@
 //! Channel-relay integration for connecting to external messaging platforms
 //! (Slack) via the channel-relay service.
 //!
-//! The relay service handles OAuth, credential storage, and webhook ingestion.
-//! IronClaw receives events via webhook callbacks and sends messages via the
-//! relay's proxy API.
+//! The relay service handles OAuth, credential storage, webhook ingestion,
+//! and SSE event streaming. IronClaw consumes the SSE stream and sends
+//! messages via the relay's proxy API.

 pub mod channel;
 pub mod client;
-pub mod webhook;

 pub use channel::{DEFAULT_RELAY_NAME, RelayChannel};
 pub use client::RelayClient;
@@ -1,66 +0,0 @@
-//! Shared relay webhook signature verification helpers.
-
-use hmac::{Hmac, Mac};
-use sha2::Sha256;
-
-type HmacSha256 = Hmac<Sha256>;
-
-/// Verify a relay callback HMAC signature.
-pub fn verify_relay_signature(
-    secret: &[u8],
-    timestamp: &str,
-    body: &[u8],
-    signature: &str,
-) -> bool {
-    verify_signature(secret, timestamp, body, signature)
-}
-
-fn verify_signature(secret: &[u8], timestamp: &str, body: &[u8], signature: &str) -> bool {
-    let mut mac = match HmacSha256::new_from_slice(secret) {
-        Ok(m) => m,
-        Err(_) => return false,
-    };
-    mac.update(timestamp.as_bytes());
-    mac.update(b".");
-    mac.update(body);
-    let expected = format!("sha256={}", hex::encode(mac.finalize().into_bytes()));
-    subtle::ConstantTimeEq::ct_eq(expected.as_bytes(), signature.as_bytes()).into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn make_signature(secret: &[u8], timestamp: &str, body: &[u8]) -> String {
-        let mut mac = HmacSha256::new_from_slice(secret).unwrap();
-        mac.update(timestamp.as_bytes());
-        mac.update(b".");
-        mac.update(body);
-        format!("sha256={}", hex::encode(mac.finalize().into_bytes()))
-    }
-
-    #[test]
-    fn verify_valid_signature() {
-        let secret = b"test-secret";
-        let body = b"hello";
-        let ts = "1234567890";
-        let sig = make_signature(secret, ts, body);
-        assert!(verify_signature(secret, ts, body, &sig));
-    }
-
-    #[test]
-    fn verify_wrong_secret_fails() {
-        let body = b"hello";
-        let ts = "1234567890";
-        let sig = make_signature(b"correct", ts, body);
-        assert!(!verify_signature(b"wrong", ts, body, &sig));
-    }
-
-    #[test]
-    fn verify_tampered_body_fails() {
-        let secret = b"secret";
-        let ts = "1234567890";
-        let sig = make_signature(secret, ts, b"original");
-        assert!(!verify_signature(secret, ts, b"tampered", &sig));
-    }
-}
@@ -200,8 +200,6 @@ fn format_json_params(params: &serde_json::Value, indent: &str) -> String {

 /// REPL channel with line editing and markdown rendering.
 pub struct ReplChannel {
-    /// Stable owner scope for this REPL instance.
-    user_id: String,
    /// Optional single message to send (for -m flag).
    single_message: Option<String>,
    /// Debug mode flag (shared with input thread).
@@ -215,13 +213,7 @@ pub struct ReplChannel {
 impl ReplChannel {
    /// Create a new REPL channel.
    pub fn new() -> Self {
-        Self::with_user_id("default")
-    }
-
-    /// Create a new REPL channel for a specific owner scope.
-    pub fn with_user_id(user_id: impl Into<String>) -> Self {
        Self {
-            user_id: user_id.into(),
            single_message: None,
            debug_mode: Arc::new(AtomicBool::new(false)),
            is_streaming: Arc::new(AtomicBool::new(false)),
@@ -231,13 +223,7 @@ impl ReplChannel {

    /// Create a REPL channel that sends a single message and exits.
    pub fn with_message(message: String) -> Self {
-        Self::with_message_for_user("default", message)
-    }
-
-    /// Create a REPL channel that sends a single message for a specific owner scope and exits.
-    pub fn with_message_for_user(user_id: impl Into<String>, message: String) -> Self {
        Self {
-            user_id: user_id.into(),
            single_message: Some(message),
            debug_mode: Arc::new(AtomicBool::new(false)),
            is_streaming: Arc::new(AtomicBool::new(false)),
@@ -306,7 +292,6 @@ impl Channel for ReplChannel {
    async fn start(&self) -> Result<MessageStream, ChannelError> {
        let (tx, rx) = mpsc::channel(32);
        let single_message = self.single_message.clone();
-        let user_id = self.user_id.clone();
        let debug_mode = Arc::clone(&self.debug_mode);
        let suppress_banner = Arc::clone(&self.suppress_banner);
        let esc_interrupt_triggered_for_thread = Arc::new(AtomicBool::new(false));
@@ -316,11 +301,11 @@ impl Channel for ReplChannel {

            // Single message mode: send it and return
            if let Some(msg) = single_message {
-                let incoming = IncomingMessage::new("repl", &user_id, &msg).with_timezone(&sys_tz);
+                let incoming = IncomingMessage::new("repl", "default", &msg).with_timezone(&sys_tz);
                let _ = tx.blocking_send(incoming);
                // Ensure the agent exits after handling exactly one turn in -m mode,
                // even when other channels (gateway/http) are enabled.
-                let _ = tx.blocking_send(IncomingMessage::new("repl", &user_id, "/quit"));
+                let _ = tx.blocking_send(IncomingMessage::new("repl", "default", "/quit"));
                return;
            }

@@ -381,7 +366,7 @@ impl Channel for ReplChannel {
                            "/quit" | "/exit" => {
                                // Forward shutdown command so the agent loop exits even
                                // when other channels (e.g. web gateway) are still active.
-                                let msg = IncomingMessage::new("repl", &user_id, "/quit")
+                                let msg = IncomingMessage::new("repl", "default", "/quit")
                                    .with_timezone(&sys_tz);
                                let _ = tx.blocking_send(msg);
                                break;
@@ -404,7 +389,7 @@ impl Channel for ReplChannel {
                        }

                        let msg =
-                            IncomingMessage::new("repl", &user_id, line).with_timezone(&sys_tz);
+                            IncomingMessage::new("repl", "default", line).with_timezone(&sys_tz);
                        if tx.blocking_send(msg).is_err() {
                            break;
                        }
@@ -412,14 +397,14 @@ impl Channel for ReplChannel {
                    Err(ReadlineError::Interrupted) => {
                        if esc_interrupt_triggered_for_thread.swap(false, Ordering::Relaxed) {
                            // Esc: interrupt current operation and keep REPL open.
-                            let msg = IncomingMessage::new("repl", &user_id, "/interrupt")
+                            let msg = IncomingMessage::new("repl", "default", "/interrupt")
                                .with_timezone(&sys_tz);
                            if tx.blocking_send(msg).is_err() {
                                break;
                            }
                        } else {
                            // Ctrl+C (VINTR): request graceful shutdown.
-                            let msg = IncomingMessage::new("repl", &user_id, "/quit")
+                            let msg = IncomingMessage::new("repl", "default", "/quit")
                                .with_timezone(&sys_tz);
                            let _ = tx.blocking_send(msg);
                            break;
@@ -431,7 +416,7 @@ impl Channel for ReplChannel {
                        // immediately — just drop the REPL thread silently so other
                        // channels (gateway, telegram, …) keep running.
                        if std::io::stdin().is_terminal() {
-                            let msg = IncomingMessage::new("repl", &user_id, "/quit")
+                            let msg = IncomingMessage::new("repl", "default", "/quit")
                                .with_timezone(&sys_tz);
                            let _ = tx.blocking_send(msg);
                        }
@@ -539,7 +524,6 @@ impl Channel for ReplChannel {
                tool_name,
                description,
                parameters,
-                allow_always,
            } => {
                let term_width = crossterm::terminal::size()
                    .map(|(w, _)| w as usize)
@@ -583,13 +567,9 @@ impl Channel for ReplChannel {
                }

                eprintln!("  \u{2502}");
-                if allow_always {
-                    eprintln!(
-                        "  \u{2502} \x1b[32myes\x1b[0m (y) / \x1b[34malways\x1b[0m (a) / \x1b[31mno\x1b[0m (n)"
-                    );
-                } else {
-                    eprintln!("  \u{2502} \x1b[32myes\x1b[0m (y) / \x1b[31mno\x1b[0m (n)");
-                }
+                eprintln!(
+                    "  \u{2502} \x1b[32myes\x1b[0m (y) / \x1b[34malways\x1b[0m (a) / \x1b[31mno\x1b[0m (n)"
+                );
                eprintln!("  {bot_border}");
                eprintln!();
            }
@@ -915,28 +915,20 @@ impl Channel for SignalChannel {
            tool_name,
            description: _,
            parameters,
-            allow_always,
        } = &status
            && let Some(target_str) = metadata.get("signal_target").and_then(|v| v.as_str())
        {
            let params_json = serde_json::to_string_pretty(parameters).unwrap_or_default();
-            let always_line = if *allow_always {
-                format!(
-                    "\n• `always` or `a` - Approve and auto-approve future {} requests",
-                    tool_name
-                )
-            } else {
-                String::new()
-            };
            let message = format!(
                "⚠️ *Approval Required*\n\n\
                 *Request ID:* `{}`\n\
                 *Tool:* {}\n\
                 *Parameters:*\n```\n{}\n```\n\n\
                 Reply with:\n\
-                 • `yes` or `y` - Approve this request{}\n\
+                 • `yes` or `y` - Approve this request\n\
+                 • `always` or `a` - Approve and auto-approve future {} requests\n\
                 • `no` or `n` - Deny",
-                request_id, tool_name, params_json, always_line
+                request_id, tool_name, params_json, tool_name
            );
            self.send_status_message(target_str, &message).await;
        }
@@ -27,7 +27,6 @@ pub struct WasmChannelLoader {
    pairing_store: Arc<PairingStore>,
    settings_store: Option<Arc<dyn SettingsStore>>,
    secrets_store: Option<Arc<dyn SecretsStore + Send + Sync>>,
-    owner_scope_id: String,
 }

 impl WasmChannelLoader {
@@ -36,14 +35,12 @@ impl WasmChannelLoader {
        runtime: Arc<WasmChannelRuntime>,
        pairing_store: Arc<PairingStore>,
        settings_store: Option<Arc<dyn SettingsStore>>,
-        owner_scope_id: impl Into<String>,
    ) -> Self {
        Self {
            runtime,
            pairing_store,
            settings_store,
            secrets_store: None,
-            owner_scope_id: owner_scope_id.into(),
        }
    }

@@ -152,7 +149,6 @@ impl WasmChannelLoader {
            self.runtime.clone(),
            prepared,
            capabilities,
-            self.owner_scope_id.clone(),
            config_json,
            self.pairing_store.clone(),
            self.settings_store.clone(),
@@ -491,8 +487,7 @@ mod tests {
    async fn test_loader_invalid_name() {
        let config = WasmChannelRuntimeConfig::for_testing();
        let runtime = Arc::new(WasmChannelRuntime::new(config).unwrap());
-        let loader =
-            WasmChannelLoader::new(runtime, Arc::new(PairingStore::new()), None, "default");
+        let loader = WasmChannelLoader::new(runtime, Arc::new(PairingStore::new()), None);

        let dir = TempDir::new().unwrap();
        let wasm_path = dir.path().join("test.wasm");
@@ -510,8 +505,7 @@ mod tests {
    async fn load_from_dir_returns_empty_when_dir_missing() {
        let config = WasmChannelRuntimeConfig::for_testing();
        let runtime = Arc::new(WasmChannelRuntime::new(config).unwrap());
-        let loader =
-            WasmChannelLoader::new(runtime, Arc::new(PairingStore::new()), None, "default");
+        let loader = WasmChannelLoader::new(runtime, Arc::new(PairingStore::new()), None);

        let dir = TempDir::new().unwrap();
        let missing = dir.path().join("nonexistent_channels_dir");
@@ -69,7 +69,7 @@
 //! let runtime = WasmChannelRuntime::new(config)?;
 //!
 //! // Load channels from directory
-//! let loader = WasmChannelLoader::new(runtime, pairing_store, settings_store, owner_scope_id);
+//! let loader = WasmChannelLoader::new(runtime);
 //! let channels = loader.load_from_dir(Path::new("~/.ironclaw/channels/")).await?;
 //!
 //! // Add to channel manager
@@ -90,7 +90,6 @@ pub mod setup;
 pub(crate) mod signature;
 #[allow(dead_code)]
 pub(crate) mod storage;
-mod telegram_host_config;
 mod wrapper;

 // Core types
@@ -108,5 +107,4 @@ pub use schema::{
    ChannelCapabilitiesFile, ChannelConfig, SecretSetupSchema, SetupSchema, WebhookSchema,
 };
 pub use setup::{WasmChannelSetup, inject_channel_credentials, setup_wasm_channels};
-pub(crate) use telegram_host_config::{TELEGRAM_CHANNEL_NAME, bot_username_setting_key};
 pub use wrapper::{HttpResponse, SharedWasmChannel, WasmChannel};
@@ -672,7 +672,6 @@ mod tests {
            runtime,
            prepared,
            capabilities,
-            "default",
            "{}".to_string(),
            Arc::new(PairingStore::new()),
            None,
@@ -7,9 +7,8 @@ use std::collections::HashSet;
 use std::sync::Arc;

 use crate::channels::wasm::{
-    LoadedChannel, RegisteredEndpoint, SharedWasmChannel, TELEGRAM_CHANNEL_NAME, WasmChannel,
-    WasmChannelLoader, WasmChannelRouter, WasmChannelRuntime, WasmChannelRuntimeConfig,
-    bot_username_setting_key, create_wasm_channel_router,
+    LoadedChannel, RegisteredEndpoint, SharedWasmChannel, WasmChannel, WasmChannelLoader,
+    WasmChannelRouter, WasmChannelRuntime, WasmChannelRuntimeConfig, create_wasm_channel_router,
 };
 use crate::config::Config;
 use crate::db::Database;
@@ -49,8 +48,7 @@ pub async fn setup_wasm_channels(
    let mut loader = WasmChannelLoader::new(
        Arc::clone(&runtime),
        Arc::clone(&pairing_store),
-        settings_store.clone(),
-        config.owner_id.clone(),
+        settings_store,
    );
    if let Some(secrets) = secrets_store {
        loader = loader.with_secrets_store(Arc::clone(secrets));
@@ -72,14 +70,7 @@ pub async fn setup_wasm_channels(
    let mut channel_names: Vec<String> = Vec::new();

    for loaded in results.loaded {
-        let (name, channel) = register_channel(
-            loaded,
-            config,
-            secrets_store,
-            settings_store.as_ref(),
-            &wasm_router,
-        )
-        .await;
+        let (name, channel) = register_channel(loaded, config, secrets_store, &wasm_router).await;
        channel_names.push(name.clone());
        channels.push((name, channel));
    }
@@ -113,16 +104,10 @@ async fn register_channel(
    loaded: LoadedChannel,
    config: &Config,
    secrets_store: &Option<Arc<dyn SecretsStore + Send + Sync>>,
-    settings_store: Option<&Arc<dyn crate::db::SettingsStore>>,
    wasm_router: &Arc<WasmChannelRouter>,
 ) -> (String, Box<dyn crate::channels::Channel>) {
    let channel_name = loaded.name().to_string();
    tracing::info!("Loaded WASM channel: {}", channel_name);
-    let owner_actor_id = config
-        .channels
-        .wasm_channel_owner_ids
-        .get(channel_name.as_str())
-        .map(ToString::to_string);

    let secret_name = loaded.webhook_secret_name();
    let sig_key_secret_name = loaded.signature_key_secret_name();
@@ -130,7 +115,7 @@ async fn register_channel(

    let webhook_secret = if let Some(secrets) = secrets_store {
        secrets
-            .get_decrypted(&config.owner_id, &secret_name)
+            .get_decrypted("default", &secret_name)
            .await
            .ok()
            .map(|s| s.expose().to_string())
@@ -148,7 +133,7 @@ async fn register_channel(
        require_secret: webhook_secret.is_some(),
    }];

-    let channel_arc = Arc::new(loaded.channel.with_owner_actor_id(owner_actor_id.clone()));
+    let channel_arc = Arc::new(loaded.channel);

    // Inject runtime config (tunnel URL, webhook secret, owner_id).
    {
@@ -176,15 +161,6 @@ async fn register_channel(
            config_updates.insert("owner_id".to_string(), serde_json::json!(owner_id));
        }

-        if channel_name == TELEGRAM_CHANNEL_NAME
-            && let Some(store) = settings_store
-            && let Ok(Some(serde_json::Value::String(username))) = store
-                .get_setting("default", &bot_username_setting_key(&channel_name))
-                .await
-            && !username.trim().is_empty()
-        {
-            config_updates.insert("bot_username".to_string(), serde_json::json!(username));
-        }
        // Inject channel-specific secrets into config for channels that need
        // credentials in API request bodies (e.g., Feishu token exchange).
        // The credential injection system only replaces placeholders in URLs
@@ -222,7 +198,7 @@ async fn register_channel(
    // Register Ed25519 signature key if declared in capabilities.
    if let Some(ref sig_key_name) = sig_key_secret_name
        && let Some(secrets) = secrets_store
-        && let Ok(key_secret) = secrets.get_decrypted(&config.owner_id, sig_key_name).await
+        && let Ok(key_secret) = secrets.get_decrypted("default", sig_key_name).await
    {
        match wasm_router
            .register_signature_key(&channel_name, key_secret.expose())
@@ -240,9 +216,7 @@ async fn register_channel(
    // Register HMAC signing secret if declared in capabilities.
    if let Some(ref hmac_secret_name) = hmac_secret_name
        && let Some(secrets) = secrets_store
-        && let Ok(secret) = secrets
-            .get_decrypted(&config.owner_id, hmac_secret_name)
-            .await
+        && let Ok(secret) = secrets.get_decrypted("default", hmac_secret_name).await
    {
        wasm_router
            .register_hmac_secret(&channel_name, secret.expose())
@@ -257,7 +231,6 @@ async fn register_channel(
            .as_ref()
            .map(|s| s.as_ref() as &dyn SecretsStore),
        &channel_name,
-        &config.owner_id,
    )
    .await
    {
@@ -295,7 +268,6 @@ pub async fn inject_channel_credentials(
    channel: &Arc<WasmChannel>,
    secrets: Option<&dyn SecretsStore>,
    channel_name: &str,
-    owner_id: &str,
 ) -> anyhow::Result<usize> {
    if channel_name.trim().is_empty() {
        return Ok(0);
@@ -307,7 +279,7 @@ pub async fn inject_channel_credentials(
    // 1. Try injecting from persistent secrets store if available
    if let Some(secrets) = secrets {
        let all_secrets = secrets
-            .list(owner_id)
+            .list("default")
            .await
            .map_err(|e| anyhow::anyhow!("Failed to list secrets: {}", e))?;

@@ -318,7 +290,7 @@ pub async fn inject_channel_credentials(
                continue;
            }

-            let decrypted = match secrets.get_decrypted(owner_id, &secret_meta.name).await {
+            let decrypted = match secrets.get_decrypted("default", &secret_meta.name).await {
                Ok(d) => d,
                Err(e) => {
                    tracing::warn!(
@@ -1,6 +0,0 @@
-pub const TELEGRAM_CHANNEL_NAME: &str = "telegram";
-const TELEGRAM_BOT_USERNAME_SETTING_PREFIX: &str = "channels.wasm_channel_bot_usernames";
-
-pub fn bot_username_setting_key(channel_name: &str) -> String {
-    format!("{TELEGRAM_BOT_USERNAME_SETTING_PREFIX}.{channel_name}")
-}
@@ -162,30 +162,15 @@ pub async fn chat_auth_token_handler(
        .await
    {
        Ok(result) => {
-            let mut resp = ActionResponse::ok(result.message.clone());
-            resp.activated = Some(result.activated);
-            resp.auth_url = result.auth_url.clone();
-            resp.verification = result.verification.clone();
-            resp.instructions = result.verification.as_ref().map(|v| v.instructions.clone());
+            clear_auth_mode(&state).await;

-            if result.verification.is_some() {
-                state.sse.broadcast(SseEvent::AuthRequired {
-                    extension_name: req.extension_name.clone(),
-                    instructions: Some(result.message),
-                    auth_url: None,
-                    setup_url: None,
-                });
-            } else {
-                clear_auth_mode(&state).await;
+            state.sse.broadcast(SseEvent::AuthCompleted {
+                extension_name: req.extension_name.clone(),
+                success: true,
+                message: result.message.clone(),
+            });

-                state.sse.broadcast(SseEvent::AuthCompleted {
-                    extension_name: req.extension_name.clone(),
-                    success: true,
-                    message: result.message,
-                });
-            }
-
-            Ok(Json(resp))
+            Ok(Json(ActionResponse::ok(result.message)))
        }
        Err(e) => {
            let msg = e.to_string();
@@ -359,7 +344,7 @@ pub async fn chat_history_handler(
                    turn_number: t.turn_number,
                    user_input: t.user_input.clone(),
                    response: t.response.clone(),
-                    state: format!("{:?}", t.state),
+                    state: format!("{:?}", t.state()),
                    started_at: t.started_at.to_rfc3339(),
                    completed_at: t.completed_at.map(|dt| dt.to_rfc3339()),
                    tool_calls: t
@@ -512,7 +497,7 @@ pub async fn chat_threads_handler(
        .into_iter()
        .map(|t| ThreadInfo {
            id: t.id,
-            state: format!("{:?}", t.state),
+            state: format!("{:?}", t.state()),
            turn_count: t.turns.len(),
            created_at: t.created_at.to_rfc3339(),
            updated_at: t.updated_at.to_rfc3339(),
@@ -547,7 +532,7 @@ pub async fn chat_new_thread_handler(
        let id = thread.id;
        let info = ThreadInfo {
            id: thread.id,
-            state: format!("{:?}", thread.state),
+            state: format!("{:?}", thread.state()),
            turn_count: thread.turns.len(),
            created_at: thread.created_at.to_rfc3339(),
            updated_at: thread.updated_at.to_rfc3339(),
@@ -25,34 +25,34 @@ pub async fn extensions_list_handler(
        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;

    let pairing_store = crate::pairing::PairingStore::new();
-    let mut owner_bound_channels = std::collections::HashSet::new();
-    for ext in &installed {
-        if ext.kind == crate::extensions::ExtensionKind::WasmChannel
-            && ext_mgr.has_wasm_channel_owner_binding(&ext.name).await
-        {
-            owner_bound_channels.insert(ext.name.clone());
-        }
-    }
    let extensions = installed
        .into_iter()
        .map(|ext| {
            let activation_status = if ext.kind == crate::extensions::ExtensionKind::WasmChannel {
-                let has_paired = pairing_store
-                    .read_allow_from(&ext.name)
-                    .map(|list| !list.is_empty())
-                    .unwrap_or(false);
-                crate::channels::web::types::classify_wasm_channel_activation(
-                    &ext,
-                    has_paired,
-                    owner_bound_channels.contains(&ext.name),
-                )
+                Some(if ext.activation_error.is_some() {
+                    "failed".to_string()
+                } else if !ext.authenticated {
+                    "installed".to_string()
+                } else if ext.active {
+                    let has_paired = pairing_store
+                        .read_allow_from(&ext.name)
+                        .map(|list| !list.is_empty())
+                        .unwrap_or(false);
+                    if has_paired {
+                        "active".to_string()
+                    } else {
+                        "pairing".to_string()
+                    }
+                } else {
+                    "configured".to_string()
+                })
            } else if ext.kind == crate::extensions::ExtensionKind::ChannelRelay {
                Some(if ext.active {
-                    crate::channels::web::types::ExtensionActivationStatus::Active
+                    "active".to_string()
                } else if ext.authenticated {
-                    crate::channels::web::types::ExtensionActivationStatus::Configured
+                    "configured".to_string()
                } else {
-                    crate::channels::web::types::ExtensionActivationStatus::Installed
+                    "installed".to_string()
                })
            } else {
                None
@@ -123,8 +123,25 @@ pub async fn memory_read_handler(
    }))
 }

-// memory_write_handler lives in server.rs (layer-aware version with append,
-// privacy redirect, and proper error status codes).
+pub async fn memory_write_handler(
+    State(state): State<Arc<GatewayState>>,
+    Json(req): Json<MemoryWriteRequest>,
+) -> Result<Json<MemoryWriteResponse>, (StatusCode, String)> {
+    let workspace = state.workspace.as_ref().ok_or((
+        StatusCode::SERVICE_UNAVAILABLE,
+        "Workspace not available".to_string(),
+    ))?;
+
+    workspace
+        .write(&req.path, &req.content)
+        .await
+        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+
+    Ok(Json(MemoryWriteResponse {
+        path: req.path,
+        status: "written",
+    }))
+}

 pub async fn memory_search_handler(
    State(state): State<Arc<GatewayState>>,
@@ -26,4 +26,3 @@ pub mod routines;
 pub mod settings;
 #[allow(dead_code)]
 pub mod static_files;
-pub mod webhooks;
@@ -303,9 +303,7 @@ fn routine_error_status(err: &RoutineError) -> StatusCode {
    match err {
        RoutineError::NotFound { .. } => StatusCode::NOT_FOUND,
        RoutineError::NotAuthorized { .. } => StatusCode::FORBIDDEN,
-        RoutineError::Disabled { .. }
-        | RoutineError::Cooldown { .. }
-        | RoutineError::MaxConcurrent { .. } => StatusCode::CONFLICT,
+        RoutineError::Disabled { .. } | RoutineError::MaxConcurrent { .. } => StatusCode::CONFLICT,
        _ => StatusCode::INTERNAL_SERVER_ERROR,
    }
 }
@@ -1,197 +0,0 @@
-//! Public webhook trigger endpoint for routine webhook triggers.
-//!
-//! `POST /api/webhooks/{path}` — matches the path against routines with
-//! `Trigger::Webhook { path, secret }`, validates the secret via constant-time
-//! comparison, and fires the matching routine through the `RoutineEngine`.
-
-use std::sync::Arc;
-
-use axum::{
-    Json,
-    extract::{Path, State},
-    http::{HeaderMap, StatusCode},
-};
-use subtle::ConstantTimeEq;
-
-use crate::agent::routine::Trigger;
-use crate::channels::web::server::GatewayState;
-
-/// Validate the webhook secret for a routine.
-///
-/// Returns `Ok(())` if the routine has a configured secret and the provided
-/// secret matches via constant-time comparison. Returns an appropriate HTTP
-/// error if the secret is missing (403) or invalid (401).
-fn validate_webhook_secret(
-    trigger: &Trigger,
-    provided_secret: &str,
-) -> Result<(), (StatusCode, String)> {
-    // Require webhook secret — routines without a secret cannot be triggered via webhook
-    let expected_secret = match trigger {
-        Trigger::Webhook {
-            secret: Some(s), ..
-        } => s,
-        _ => {
-            return Err((
-                StatusCode::FORBIDDEN,
-                "Webhook secret not configured for this routine. \
-                 Set a secret with: ironclaw routine update <id> --webhook-secret <secret>"
-                    .to_string(),
-            ));
-        }
-    };
-
-    if !bool::from(provided_secret.as_bytes().ct_eq(expected_secret.as_bytes())) {
-        return Err((
-            StatusCode::UNAUTHORIZED,
-            "Invalid webhook secret".to_string(),
-        ));
-    }
-
-    Ok(())
-}
-
-/// Handle incoming webhook POST to `/api/webhooks/{path}`.
-///
-/// This endpoint is **public** (no gateway auth token required) but protected
-/// by the per-routine webhook secret sent via the `X-Webhook-Secret` header.
-pub async fn webhook_trigger_handler(
-    State(state): State<Arc<GatewayState>>,
-    Path(path): Path<String>,
-    headers: HeaderMap,
-) -> Result<Json<serde_json::Value>, (StatusCode, String)> {
-    // Rate limit check
-    if !state.webhook_rate_limiter.check() {
-        return Err((
-            StatusCode::TOO_MANY_REQUESTS,
-            "Rate limit exceeded. Try again shortly.".to_string(),
-        ));
-    }
-
-    let store = state.store.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Database not available".to_string(),
-    ))?;
-
-    // Targeted query instead of loading all routines
-    let routine = store
-        .get_webhook_routine_by_path(&path)
-        .await
-        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?
-        .ok_or((
-            StatusCode::NOT_FOUND,
-            "No routine matches this webhook path".to_string(),
-        ))?;
-
-    let provided_secret = headers
-        .get("x-webhook-secret")
-        .and_then(|v| v.to_str().ok())
-        .unwrap_or("");
-
-    validate_webhook_secret(&routine.trigger, provided_secret)?;
-
-    // Fire through the RoutineEngine so guardrails, run tracking,
-    // notifications, and FullJob dispatch all work correctly.
-    let engine = {
-        let guard = state.routine_engine.read().await;
-        guard.as_ref().cloned().ok_or((
-            StatusCode::SERVICE_UNAVAILABLE,
-            "Routine engine not available".to_string(),
-        ))?
-    };
-
-    let run_id = engine.fire_webhook(routine.id, &path).await.map_err(|e| {
-        let status = match &e {
-            crate::error::RoutineError::NotFound { .. } => StatusCode::NOT_FOUND,
-            crate::error::RoutineError::Disabled { .. }
-            | crate::error::RoutineError::Cooldown { .. }
-            | crate::error::RoutineError::MaxConcurrent { .. } => StatusCode::CONFLICT,
-            _ => StatusCode::INTERNAL_SERVER_ERROR,
-        };
-        (status, e.to_string())
-    })?;
-
-    Ok(Json(serde_json::json!({
-        "status": "triggered",
-        "routine_id": routine.id,
-        "routine_name": routine.name,
-        "run_id": run_id,
-    })))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Routines with `secret: None` must be rejected with 403.
-    #[test]
-    fn test_validate_rejects_missing_secret() {
-        let trigger = Trigger::Webhook {
-            path: Some("my-hook".to_string()),
-            secret: None,
-        };
-        let result = validate_webhook_secret(&trigger, "any-secret");
-        let (status, msg) = result.unwrap_err();
-        assert_eq!(status, StatusCode::FORBIDDEN);
-        assert!(
-            msg.contains("not configured"),
-            "Error should tell user to configure a secret, got: {msg}"
-        );
-    }
-
-    /// Non-webhook triggers must be rejected with 403.
-    #[test]
-    fn test_validate_rejects_non_webhook_trigger() {
-        let trigger = Trigger::Manual;
-        let result = validate_webhook_secret(&trigger, "any-secret");
-        let (status, _) = result.unwrap_err();
-        assert_eq!(status, StatusCode::FORBIDDEN);
-    }
-
-    /// Correct secret passes validation.
-    #[test]
-    fn test_validate_accepts_correct_secret() {
-        let trigger = Trigger::Webhook {
-            path: Some("my-hook".to_string()),
-            secret: Some("s3cret-token".to_string()),
-        };
-        assert!(validate_webhook_secret(&trigger, "s3cret-token").is_ok());
-    }
-
-    /// Wrong secret returns 401.
-    #[test]
-    fn test_validate_rejects_wrong_secret() {
-        let trigger = Trigger::Webhook {
-            path: Some("my-hook".to_string()),
-            secret: Some("correct-secret".to_string()),
-        };
-        let result = validate_webhook_secret(&trigger, "wrong-secret");
-        let (status, msg) = result.unwrap_err();
-        assert_eq!(status, StatusCode::UNAUTHORIZED);
-        assert!(msg.contains("Invalid"), "Expected 'Invalid' in: {msg}");
-    }
-
-    /// Empty provided secret returns 401 (not a false positive).
-    #[test]
-    fn test_validate_rejects_empty_provided_secret() {
-        let trigger = Trigger::Webhook {
-            path: Some("my-hook".to_string()),
-            secret: Some("real-secret".to_string()),
-        };
-        let result = validate_webhook_secret(&trigger, "");
-        let (status, _) = result.unwrap_err();
-        assert_eq!(status, StatusCode::UNAUTHORIZED);
-    }
-
-    /// Constant-time comparison: secrets of different lengths are still rejected
-    /// (not short-circuited in a way that leaks length info).
-    #[test]
-    fn test_validate_rejects_different_length_secret() {
-        let trigger = Trigger::Webhook {
-            path: None,
-            secret: Some("short".to_string()),
-        };
-        let result = validate_webhook_secret(&trigger, "a-much-longer-secret-value");
-        let (status, _) = result.unwrap_err();
-        assert_eq!(status, StatusCode::UNAUTHORIZED);
-    }
-}
@@ -98,12 +98,10 @@ impl GatewayChannel {
            skill_catalog: None,
            chat_rate_limiter: server::RateLimiter::new(30, 60),
            oauth_rate_limiter: server::RateLimiter::new(10, 60),
-            webhook_rate_limiter: server::RateLimiter::new(10, 60),
            registry_entries: Vec::new(),
            cost_guard: None,
            routine_engine: Arc::new(tokio::sync::RwLock::new(None)),
            startup_time: std::time::Instant::now(),
-            active_config: server::ActiveConfigSnapshot::default(),
        });

        Self {
@@ -137,12 +135,10 @@ impl GatewayChannel {
            skill_catalog: self.state.skill_catalog.clone(),
            chat_rate_limiter: server::RateLimiter::new(30, 60),
            oauth_rate_limiter: server::RateLimiter::new(10, 60),
-            webhook_rate_limiter: server::RateLimiter::new(10, 60),
            registry_entries: self.state.registry_entries.clone(),
            cost_guard: self.state.cost_guard.clone(),
            routine_engine: Arc::clone(&self.state.routine_engine),
            startup_time: self.state.startup_time,
-            active_config: self.state.active_config.clone(),
        };
        mutate(&mut new_state);
        self.state = Arc::new(new_state);
@@ -254,12 +250,6 @@ impl GatewayChannel {
        self
    }

-    /// Inject the active (resolved) configuration snapshot for the status endpoint.
-    pub fn with_active_config(mut self, config: server::ActiveConfigSnapshot) -> Self {
-        self.rebuild_state(|s| s.active_config = config);
-        self
-    }
-
    /// Get the auth token (for printing to console on startup).
    pub fn auth_token(&self) -> &str {
        &self.auth_token
@@ -376,7 +366,6 @@ impl Channel for GatewayChannel {
                tool_name,
                description,
                parameters,
-                allow_always,
            } => SseEvent::ApprovalNeeded {
                request_id,
                tool_name,
@@ -384,7 +373,6 @@ impl Channel for GatewayChannel {
                parameters: serde_json::to_string_pretty(&parameters)
                    .unwrap_or_else(|_| parameters.to_string()),
                thread_id,
-                allow_always,
            },
            StatusUpdate::AuthRequired {
                extension_name,
@@ -24,26 +24,14 @@ I18n.register('en', {
  'restart.progressSubtitle': 'Please wait for the process to restart...',
  'restart.checkLogs': 'Check the Logs tab for details after restart completes.',
  
-  // Theme
-  'theme.tooltipDark': 'Theme: Dark (click for Light)',
-  'theme.tooltipLight': 'Theme: Light (click for System)',
-  'theme.tooltipSystem': 'Theme: System (click for Dark)',
-  'theme.announce': 'Theme: {mode}',
-
  // Tabs
  'tab.chat': 'Chat',
  'tab.memory': 'Memory',
  'tab.jobs': 'Jobs',
  'tab.routines': 'Routines',
-  'tab.settings': 'Settings',
  'tab.extensions': 'Extensions',
  'tab.skills': 'Skills',
  'tab.logs': 'Logs',
-  'settings.inference': 'Inference',
-  'settings.agent': 'Agent',
-  'settings.channels': 'Channels',
-  'settings.networking': 'Networking',
-  'settings.mcp': 'MCP',
  
  // Status
  'status.connected': 'Connected',
@@ -143,10 +131,10 @@ I18n.register('en', {
  
  // Extensions Tab
  'extensions.installed': 'Installed Extensions',
-  'extensions.available': 'Available Extensions',
-  'extensions.installWasm': 'Install Extension',
+  'extensions.available': 'Available WASM Extensions',
+  'extensions.installWasm': 'Install WASM Extension',
  'extensions.noInstalled': 'No extensions installed',
-  'extensions.noAvailable': 'No additional extensions available',
+  'extensions.noAvailable': 'No additional WASM extensions available',
  'extensions.loading': 'Loading...',
  'extensions.install': 'Install',
  'extensions.installing': 'Installing...',
@@ -168,8 +156,13 @@ I18n.register('en', {
  'mcp.addCustom': 'Add Custom MCP Server',
  'mcp.add': 'Add',
  'mcp.addedSuccess': 'Added MCP server {name}',
-
-
+  
+  // Registered Tools
+  'tools.registered': 'Registered Tools',
+  'tools.name': 'Name',
+  'tools.description': 'Description',
+  'tools.empty': 'No tools registered',
+  
  // Skills Tab
  'skills.installed': 'Installed Skills',
  'skills.noInstalled': 'No skills installed',
@@ -309,7 +302,6 @@ I18n.register('en', {
  
  // Common
  'common.loading': 'Loading...',
-  'common.loadFailed': 'Failed to load',
  'common.noData': 'No data',
  'common.search': 'Search',
  'common.add': 'Add',
@@ -336,8 +328,6 @@ I18n.register('en', {
  
  // Extensions
  'ext.active': 'Active',
-  'ext.inactive': 'Inactive',
-  'ext.builtin': 'Built-in',
  'ext.remove': 'Remove',
  'ext.install': 'Install',
  'ext.installing': 'Installing...',
@@ -352,173 +342,10 @@ I18n.register('en', {
  
  // Configure
  'config.title': 'Configure {name}',
-  'config.telegramOwnerHint': 'After saving, IronClaw will show a one-time code. Send `/start CODE` to your bot in Telegram and IronClaw will finish setup automatically.',
-  'config.telegramChallengeTitle': 'Telegram owner verification',
-  'config.telegramOwnerWaiting': 'Waiting for Telegram owner verification...',
-  'config.telegramCommandLabel': 'Send this in Telegram:',
-  'config.telegramStartOver': 'Start over',
-  'config.telegramStartOverHint': 'Telegram verification did not complete. Click Start over to generate a new code and try again.',
-  'config.telegramOpenBot': 'Open bot in Telegram',
  'config.optional': ' (optional)',
  'config.alreadySet': '(already set — leave empty to keep)',
  'config.alreadyConfigured': 'Already configured',
  'config.autoGenerate': 'Auto-generated if empty',
  'config.save': 'Save',
  'config.cancel': 'Cancel',
-
-  // Settings toolbar
-  'settings.export': 'Export',
-  'settings.import': 'Import',
-  'settings.searchPlaceholder': 'Search settings...',
-  'settings.exportSuccess': 'Settings exported',
-  'settings.exportFailed': 'Export failed: {message}',
-  'settings.importSuccess': 'Settings imported successfully',
-  'settings.importFailed': 'Import failed: {message}',
-  'settings.restartRequired': 'Restart required for changes to take effect.',
-  'settings.restartNow': 'Restart Now',
-  'settings.noMatchingSettings': 'No settings matching "{query}"',
-  'settings.noSettings': 'No settings found',
-  'settings.saved': 'Saved',
-  'settings.on': 'On',
-  'settings.off': 'Off',
-  'settings.envValue': 'env: {value}',
-  'settings.envDefault': 'env default',
-  'settings.useEnvDefault': 'use env default',
-
-  // Settings groups
-  'cfg.group.llm': 'LLM Provider',
-  'cfg.group.embeddings': 'Embeddings',
-  'cfg.group.agent': 'Agent',
-  'cfg.group.heartbeat': 'Heartbeat',
-  'cfg.group.sandbox': 'Sandbox',
-  'cfg.group.routines': 'Routines',
-  'cfg.group.safety': 'Safety',
-  'cfg.group.skills': 'Skills',
-  'cfg.group.search': 'Search',
-  'cfg.group.tunnel': 'Tunnel',
-  'cfg.group.gateway': 'Gateway',
-
-  // Inference settings
-  'cfg.llm_backend.label': 'Backend',
-  'cfg.llm_backend.desc': 'LLM inference provider',
-  'cfg.selected_model.label': 'Model',
-  'cfg.selected_model.desc': 'Model name or ID for the selected backend',
-  'cfg.ollama_base_url.label': 'Ollama URL',
-  'cfg.ollama_base_url.desc': 'Base URL for Ollama API',
-  'cfg.openai_compatible_base_url.label': 'OpenAI-compatible URL',
-  'cfg.openai_compatible_base_url.desc': 'Base URL for OpenAI-compatible API',
-  'cfg.bedrock_region.label': 'Bedrock Region',
-  'cfg.bedrock_region.desc': 'AWS region for Bedrock',
-  'cfg.bedrock_cross_region.label': 'Cross-Region',
-  'cfg.bedrock_cross_region.desc': 'Enable cross-region inference',
-  'cfg.bedrock_profile.label': 'AWS Profile',
-  'cfg.bedrock_profile.desc': 'AWS profile for Bedrock auth',
-  'cfg.embeddings_enabled.label': 'Enabled',
-  'cfg.embeddings_enabled.desc': 'Enable vector embeddings for memory search',
-  'cfg.embeddings_provider.label': 'Provider',
-  'cfg.embeddings_provider.desc': 'Embeddings API provider',
-  'cfg.embeddings_model.label': 'Model',
-  'cfg.embeddings_model.desc': 'Embedding model name',
-
-  // Agent settings
-  'cfg.agent_name.label': 'Name',
-  'cfg.agent_name.desc': 'Agent display name',
-  'cfg.agent_max_parallel_jobs.label': 'Max Parallel Jobs',
-  'cfg.agent_max_parallel_jobs.desc': 'Maximum concurrent background jobs',
-  'cfg.agent_job_timeout.label': 'Job Timeout',
-  'cfg.agent_job_timeout.desc': 'Max duration per job in seconds',
-  'cfg.agent_max_tool_iterations.label': 'Max Tool Iterations',
-  'cfg.agent_max_tool_iterations.desc': 'Max tool calls per turn',
-  'cfg.agent_use_planning.label': 'Planning',
-  'cfg.agent_use_planning.desc': 'Enable multi-step planning before execution',
-  'cfg.agent_auto_approve.label': 'Auto-approve Tools',
-  'cfg.agent_auto_approve.desc': 'Skip manual approval for tool calls',
-  'cfg.agent_timezone.label': 'Timezone',
-  'cfg.agent_timezone.desc': 'Default timezone (IANA)',
-  'cfg.agent_session_idle.label': 'Session Idle Timeout',
-  'cfg.agent_session_idle.desc': 'Seconds before idle session expires',
-  'cfg.agent_stuck_threshold.label': 'Stuck Threshold',
-  'cfg.agent_stuck_threshold.desc': 'Seconds before a job is considered stuck',
-  'cfg.agent_max_repair.label': 'Max Repair Attempts',
-  'cfg.agent_max_repair.desc': 'Auto-recovery attempts for stuck jobs',
-  'cfg.agent_max_cost.label': 'Max Daily Cost',
-  'cfg.agent_max_cost.desc': 'Daily LLM spend cap in cents (0 = unlimited)',
-  'cfg.agent_max_actions.label': 'Max Actions/Hour',
-  'cfg.agent_max_actions.desc': 'Hourly tool call rate limit (0 = unlimited)',
-  'cfg.agent_allow_local.label': 'Allow Local Tools',
-  'cfg.agent_allow_local.desc': 'Enable local filesystem tool execution',
-
-  // Heartbeat settings
-  'cfg.heartbeat_enabled.label': 'Enabled',
-  'cfg.heartbeat_enabled.desc': 'Run periodic background checks',
-  'cfg.heartbeat_interval.label': 'Interval',
-  'cfg.heartbeat_interval.desc': 'Seconds between heartbeats (default: 1800)',
-  'cfg.heartbeat_notify_channel.label': 'Notify Channel',
-  'cfg.heartbeat_notify_channel.desc': 'Channel to send heartbeat findings to',
-  'cfg.heartbeat_notify_user.label': 'Notify User',
-  'cfg.heartbeat_notify_user.desc': 'User ID to notify',
-  'cfg.heartbeat_quiet_start.label': 'Quiet Hours Start',
-  'cfg.heartbeat_quiet_start.desc': 'Hour (0-23) to stop heartbeats',
-  'cfg.heartbeat_quiet_end.label': 'Quiet Hours End',
-  'cfg.heartbeat_quiet_end.desc': 'Hour (0-23) to resume heartbeats',
-  'cfg.heartbeat_timezone.label': 'Timezone',
-  'cfg.heartbeat_timezone.desc': 'Timezone for quiet hours (IANA)',
-
-  // Sandbox settings
-  'cfg.sandbox_enabled.label': 'Enabled',
-  'cfg.sandbox_enabled.desc': 'Enable Docker sandbox for background jobs',
-  'cfg.sandbox_policy.label': 'Policy',
-  'cfg.sandbox_policy.desc': 'Sandbox security policy',
-  'cfg.sandbox_timeout.label': 'Timeout',
-  'cfg.sandbox_timeout.desc': 'Max job duration in seconds',
-  'cfg.sandbox_memory.label': 'Memory Limit',
-  'cfg.sandbox_memory.desc': 'Container memory limit (MB)',
-  'cfg.sandbox_image.label': 'Docker Image',
-  'cfg.sandbox_image.desc': 'Container image for sandbox jobs',
-
-  // Routines settings
-  'cfg.routines_max_concurrent.label': 'Max Concurrent',
-  'cfg.routines_max_concurrent.desc': 'Maximum routines running simultaneously',
-  'cfg.routines_cooldown.label': 'Default Cooldown',
-  'cfg.routines_cooldown.desc': 'Minimum seconds between routine fires',
-
-  // Safety settings
-  'cfg.safety_max_output.label': 'Max Output Length',
-  'cfg.safety_max_output.desc': 'Maximum output tokens per response',
-  'cfg.safety_injection_check.label': 'Injection Check',
-  'cfg.safety_injection_check.desc': 'Enable prompt injection detection',
-
-  // Skills settings
-  'cfg.skills_max_active.label': 'Max Active Skills',
-  'cfg.skills_max_active.desc': 'Maximum skills active simultaneously',
-  'cfg.skills_max_tokens.label': 'Max Context Tokens',
-  'cfg.skills_max_tokens.desc': 'Token budget for skill prompts',
-
-  // Search settings
-  'cfg.search_fusion.label': 'Fusion Strategy',
-  'cfg.search_fusion.desc': 'Hybrid search ranking method',
-
-  // Networking settings
-  'cfg.tunnel_provider.label': 'Provider',
-  'cfg.tunnel_provider.desc': 'Public URL tunnel provider',
-  'cfg.tunnel_public_url.label': 'Public URL',
-  'cfg.tunnel_public_url.desc': 'Static public URL (if not using tunnel provider)',
-  'cfg.gateway_rate_limit.label': 'Rate Limit',
-  'cfg.gateway_rate_limit.desc': 'Max chat messages per minute',
-  'cfg.gateway_max_connections.label': 'Max Connections',
-  'cfg.gateway_max_connections.desc': 'Max simultaneous SSE/WS connections',
-
-  // Channels subtab
-  'channels.builtin': 'Built-in Channels',
-  'channels.messaging': 'Messaging Channels',
-  'channels.webGateway': 'Web Gateway',
-  'channels.webGatewayDesc': 'Browser-based chat interface',
-  'channels.httpWebhook': 'HTTP Webhook',
-  'channels.httpWebhookDesc': 'Incoming webhook endpoint for external integrations',
-  'channels.cli': 'CLI',
-  'channels.cliDesc': 'Terminal UI with Ratatui',
-  'channels.repl': 'REPL',
-  'channels.replDesc': 'Simple read-eval-print loop for testing',
-  'channels.configureVia': 'Configure via {env}',
-  'channels.runWith': 'Run with: {cmd}',
 });
@@ -24,26 +24,14 @@ I18n.register('zh-CN', {
  'restart.progressSubtitle': '请等待进程重启...',
  'restart.checkLogs': '重启完成后，请查看日志标签页了解详情。',
  
-  // 主题
-  'theme.tooltipDark': '主题：深色（点击切换浅色）',
-  'theme.tooltipLight': '主题：浅色（点击切换跟随系统）',
-  'theme.tooltipSystem': '主题：跟随系统（点击切换深色）',
-  'theme.announce': '主题：{mode}',
-
  // 标签页
  'tab.chat': '聊天',
  'tab.memory': '记忆',
  'tab.jobs': '任务',
  'tab.routines': '定时任务',
-  'tab.settings': '设置',
  'tab.extensions': '扩展',
  'tab.skills': '技能',
  'tab.logs': '日志',
-  'settings.inference': '推理',
-  'settings.agent': '代理',
-  'settings.channels': '频道',
-  'settings.networking': '网络',
-  'settings.mcp': 'MCP',
  
  // 状态
  'status.connected': '已连接',
@@ -143,10 +131,10 @@ I18n.register('zh-CN', {
  
  // 扩展标签页
  'extensions.installed': '已安装扩展',
-  'extensions.available': '可用扩展',
-  'extensions.installWasm': '安装扩展',
+  'extensions.available': '可用 WASM 扩展',
+  'extensions.installWasm': '安装 WASM 扩展',
  'extensions.noInstalled': '没有安装扩展',
-  'extensions.noAvailable': '没有其他可用扩展',
+  'extensions.noAvailable': '没有其他可用的 WASM 扩展',
  'extensions.loading': '加载中...',
  'extensions.install': '安装',
  'extensions.installing': '安装中...',
@@ -168,8 +156,13 @@ I18n.register('zh-CN', {
  'mcp.addCustom': '添加自定义 MCP 服务器',
  'mcp.add': '添加',
  'mcp.addedSuccess': '已添加 MCP 服务器 {name}',
-
-
+  
+  // 注册工具
+  'tools.registered': '注册工具',
+  'tools.name': '名称',
+  'tools.description': '描述',
+  'tools.empty': '没有注册工具',
+  
  // 技能标签页
  'skills.installed': '已安装技能',
  'skills.noInstalled': '没有安装技能',
@@ -309,7 +302,6 @@ I18n.register('zh-CN', {
  
  // 通用
  'common.loading': '加载中...',
-  'common.loadFailed': '加载失败',
  'common.noData': '暂无数据',
  'common.search': '搜索',
  'common.add': '添加',
@@ -336,8 +328,6 @@ I18n.register('zh-CN', {
  
  // 扩展
  'ext.active': '已激活',
-  'ext.inactive': '未激活',
-  'ext.builtin': '内置',
  'ext.remove': '移除',
  'ext.install': '安装',
  'ext.installing': '安装中...',
@@ -352,172 +342,10 @@ I18n.register('zh-CN', {
  
  // 配置
  'config.title': '配置 {name}',
-  'config.telegramOwnerHint': '保存后，IronClaw 会显示一次性验证码。将 `/start CODE` 发送给你的 Telegram 机器人，IronClaw 会自动完成设置。',
-  'config.telegramChallengeTitle': 'Telegram 所有者验证',
-  'config.telegramOwnerWaiting': '正在等待 Telegram 所有者验证...',
-  'config.telegramCommandLabel': '请在 Telegram 中发送：',
-  'config.telegramStartOver': '重新开始',
-  'config.telegramStartOverHint': 'Telegram 验证未完成。点击“重新开始”以生成新的验证码并重试。',
  'config.optional': '（可选）',
  'config.alreadySet': '（已设置 — 留空以保持不变）',
  'config.alreadyConfigured': '已配置',
  'config.autoGenerate': '如果为空则自动生成',
  'config.save': '保存',
  'config.cancel': '取消',
-
-  // 设置工具栏
-  'settings.export': '导出',
-  'settings.import': '导入',
-  'settings.searchPlaceholder': '搜索设置...',
-  'settings.exportSuccess': '设置已导出',
-  'settings.exportFailed': '导出失败: {message}',
-  'settings.importSuccess': '设置导入成功',
-  'settings.importFailed': '导入失败: {message}',
-  'settings.restartRequired': '需要重启才能使更改生效。',
-  'settings.restartNow': '立即重启',
-  'settings.noMatchingSettings': '没有匹配 "{query}" 的设置',
-  'settings.noSettings': '未找到设置',
-  'settings.saved': '已保存',
-  'settings.on': '开启',
-  'settings.off': '关闭',
-  'settings.envValue': '环境变量: {value}',
-  'settings.envDefault': '使用环境变量默认值',
-  'settings.useEnvDefault': '使用环境变量默认值',
-
-  // 设置分组
-  'cfg.group.llm': 'LLM 提供商',
-  'cfg.group.embeddings': '嵌入向量',
-  'cfg.group.agent': '代理',
-  'cfg.group.heartbeat': '心跳',
-  'cfg.group.sandbox': '沙箱',
-  'cfg.group.routines': '定时任务',
-  'cfg.group.safety': '安全',
-  'cfg.group.skills': '技能',
-  'cfg.group.search': '搜索',
-  'cfg.group.tunnel': '隧道',
-  'cfg.group.gateway': '网关',
-
-  // 推理设置
-  'cfg.llm_backend.label': '后端',
-  'cfg.llm_backend.desc': 'LLM 推理提供商',
-  'cfg.selected_model.label': '模型',
-  'cfg.selected_model.desc': '所选后端的模型名称或 ID',
-  'cfg.ollama_base_url.label': 'Ollama URL',
-  'cfg.ollama_base_url.desc': 'Ollama API 基础 URL',
-  'cfg.openai_compatible_base_url.label': 'OpenAI 兼容 URL',
-  'cfg.openai_compatible_base_url.desc': 'OpenAI 兼容 API 基础 URL',
-  'cfg.bedrock_region.label': 'Bedrock 区域',
-  'cfg.bedrock_region.desc': 'Bedrock 的 AWS 区域',
-  'cfg.bedrock_cross_region.label': '跨区域',
-  'cfg.bedrock_cross_region.desc': '启用跨区域推理',
-  'cfg.bedrock_profile.label': 'AWS 配置文件',
-  'cfg.bedrock_profile.desc': 'Bedrock 认证的 AWS 配置文件',
-  'cfg.embeddings_enabled.label': '启用',
-  'cfg.embeddings_enabled.desc': '启用向量嵌入以支持记忆搜索',
-  'cfg.embeddings_provider.label': '提供商',
-  'cfg.embeddings_provider.desc': '嵌入向量 API 提供商',
-  'cfg.embeddings_model.label': '模型',
-  'cfg.embeddings_model.desc': '嵌入向量模型名称',
-
-  // 代理设置
-  'cfg.agent_name.label': '名称',
-  'cfg.agent_name.desc': '代理显示名称',
-  'cfg.agent_max_parallel_jobs.label': '最大并行任务数',
-  'cfg.agent_max_parallel_jobs.desc': '最大并发后台任务数',
-  'cfg.agent_job_timeout.label': '任务超时',
-  'cfg.agent_job_timeout.desc': '每个任务的最大持续时间（秒）',
-  'cfg.agent_max_tool_iterations.label': '最大工具迭代次数',
-  'cfg.agent_max_tool_iterations.desc': '每轮最大工具调用次数',
-  'cfg.agent_use_planning.label': '规划',
-  'cfg.agent_use_planning.desc': '执行前启用多步规划',
-  'cfg.agent_auto_approve.label': '自动批准工具',
-  'cfg.agent_auto_approve.desc': '跳过工具调用的手动审批',
-  'cfg.agent_timezone.label': '时区',
-  'cfg.agent_timezone.desc': '默认时区（IANA）',
-  'cfg.agent_session_idle.label': '会话空闲超时',
-  'cfg.agent_session_idle.desc': '空闲会话过期前的秒数',
-  'cfg.agent_stuck_threshold.label': '卡住阈值',
-  'cfg.agent_stuck_threshold.desc': '任务被认为卡住前的秒数',
-  'cfg.agent_max_repair.label': '最大修复尝试次数',
-  'cfg.agent_max_repair.desc': '卡住任务的自动恢复尝试次数',
-  'cfg.agent_max_cost.label': '每日最大费用',
-  'cfg.agent_max_cost.desc': '每日 LLM 支出上限（美分，0 = 无限制）',
-  'cfg.agent_max_actions.label': '每小时最大操作数',
-  'cfg.agent_max_actions.desc': '每小时工具调用速率限制（0 = 无限制）',
-  'cfg.agent_allow_local.label': '允许本地工具',
-  'cfg.agent_allow_local.desc': '启用本地文件系统工具执行',
-
-  // 心跳设置
-  'cfg.heartbeat_enabled.label': '启用',
-  'cfg.heartbeat_enabled.desc': '运行定期后台检查',
-  'cfg.heartbeat_interval.label': '间隔',
-  'cfg.heartbeat_interval.desc': '心跳间隔秒数（默认：1800）',
-  'cfg.heartbeat_notify_channel.label': '通知频道',
-  'cfg.heartbeat_notify_channel.desc': '发送心跳发现的频道',
-  'cfg.heartbeat_notify_user.label': '通知用户',
-  'cfg.heartbeat_notify_user.desc': '要通知的用户 ID',
-  'cfg.heartbeat_quiet_start.label': '静默时段开始',
-  'cfg.heartbeat_quiet_start.desc': '停止心跳的小时（0-23）',
-  'cfg.heartbeat_quiet_end.label': '静默时段结束',
-  'cfg.heartbeat_quiet_end.desc': '恢复心跳的小时（0-23）',
-  'cfg.heartbeat_timezone.label': '时区',
-  'cfg.heartbeat_timezone.desc': '静默时段的时区（IANA）',
-
-  // 沙箱设置
-  'cfg.sandbox_enabled.label': '启用',
-  'cfg.sandbox_enabled.desc': '启用 Docker 沙箱以运行后台任务',
-  'cfg.sandbox_policy.label': '策略',
-  'cfg.sandbox_policy.desc': '沙箱安全策略',
-  'cfg.sandbox_timeout.label': '超时',
-  'cfg.sandbox_timeout.desc': '最大任务持续时间（秒）',
-  'cfg.sandbox_memory.label': '内存限制',
-  'cfg.sandbox_memory.desc': '容器内存限制（MB）',
-  'cfg.sandbox_image.label': 'Docker 镜像',
-  'cfg.sandbox_image.desc': '沙箱任务的容器镜像',
-
-  // 定时任务设置
-  'cfg.routines_max_concurrent.label': '最大并发数',
-  'cfg.routines_max_concurrent.desc': '同时运行的最大定时任务数',
-  'cfg.routines_cooldown.label': '默认冷却时间',
-  'cfg.routines_cooldown.desc': '定时任务触发间的最小秒数',
-
-  // 安全设置
-  'cfg.safety_max_output.label': '最大输出长度',
-  'cfg.safety_max_output.desc': '每次响应的最大输出令牌数',
-  'cfg.safety_injection_check.label': '注入检查',
-  'cfg.safety_injection_check.desc': '启用提示注入检测',
-
-  // 技能设置
-  'cfg.skills_max_active.label': '最大活跃技能数',
-  'cfg.skills_max_active.desc': '同时活跃的最大技能数',
-  'cfg.skills_max_tokens.label': '最大上下文令牌数',
-  'cfg.skills_max_tokens.desc': '技能提示的令牌预算',
-
-  // 搜索设置
-  'cfg.search_fusion.label': '融合策略',
-  'cfg.search_fusion.desc': '混合搜索排名方法',
-
-  // 网络设置
-  'cfg.tunnel_provider.label': '提供商',
-  'cfg.tunnel_provider.desc': '公网 URL 隧道提供商',
-  'cfg.tunnel_public_url.label': '公网 URL',
-  'cfg.tunnel_public_url.desc': '静态公网 URL（不使用隧道提供商时）',
-  'cfg.gateway_rate_limit.label': '速率限制',
-  'cfg.gateway_rate_limit.desc': '每分钟最大聊天消息数',
-  'cfg.gateway_max_connections.label': '最大连接数',
-  'cfg.gateway_max_connections.desc': '最大同时 SSE/WS 连接数',
-
-  // 频道子标签
-  'channels.builtin': '内置频道',
-  'channels.messaging': '消息频道',
-  'channels.webGateway': 'Web 网关',
-  'channels.webGatewayDesc': '基于浏览器的聊天界面',
-  'channels.httpWebhook': 'HTTP Webhook',
-  'channels.httpWebhookDesc': '用于外部集成的传入 webhook 端点',
-  'channels.cli': 'CLI',
-  'channels.cliDesc': '使用 Ratatui 的终端 UI',
-  'channels.repl': 'REPL',
-  'channels.replDesc': '用于测试的简单读取-求值-打印循环',
-  'channels.configureVia': '通过 {env} 配置',
-  'channels.runWith': '运行命令: {cmd}',
 });
@@ -25,7 +25,6 @@
    integrity="sha384-pN9zSKOnTZwXRtYZAu0PBPEgR2B7DOC1aeLxQ33oJ0oy5iN1we6gm57xldM2irDG"
    crossorigin="anonymous"
  ></script>
-  <script src="/theme-init.js"></script>
 </head>
 <body>
  <!-- Auth Screen -->
@@ -96,7 +95,8 @@
      <button data-tab="memory" data-i18n="tab.memory">Memory</button>
      <button data-tab="jobs" data-i18n="tab.jobs">Jobs</button>
      <button data-tab="routines" data-i18n="tab.routines">Routines</button>
-      <button data-tab="settings" data-i18n="tab.settings">Settings</button>
+      <button data-tab="extensions" data-i18n="tab.extensions">Extensions</button>
+      <button data-tab="skills" data-i18n="tab.skills">Skills</button>
      <div class="spacer"></div>

      <!-- Language Switcher -->
@@ -110,18 +110,6 @@
      </div>

      <button class="status-logs-btn" data-tab="logs" data-i18n="tab.logs" title="Logs">Logs</button>
-      <button class="theme-toggle-btn" id="theme-toggle" title="Toggle theme" aria-label="Toggle theme">
-        <svg class="theme-icon icon-dark" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-          <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/>
-        </svg>
-        <svg class="theme-icon icon-light" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-          <circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/><line x1="1" y1="12" x2="3" y2="12"/><line x1="21" y1="12" x2="23" y2="12"/><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/>
-        </svg>
-        <svg class="theme-icon icon-system" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-          <rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><line x1="8" y1="21" x2="16" y2="21"/><line x1="12" y1="17" x2="12" y2="21"/>
-        </svg>
-      </button>
-      <span id="theme-announce" class="sr-only" aria-live="polite"></span>
      <div class="tee-shield" id="tee-shield" style="display:none" title="Running in a Trusted Execution Environment">
        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
          <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/>
@@ -148,17 +136,19 @@
    <!-- Chat Tab -->
    <div class="tab-panel active" id="tab-chat">
      <div class="thread-sidebar" id="thread-sidebar">
+        <div class="thread-sidebar-header">
+          <button class="thread-new-btn" id="thread-new-btn" data-i18n="chat.newThread" data-i18n-attr="title"
+            title="New thread (Ctrl/Cmd+N)">+</button>
+          <div class="spacer"></div>
+          <button class="thread-toggle-btn" id="thread-toggle-btn" data-i18n="chat.toggleSidebar"
+            data-i18n-attr="title" title="Toggle sidebar">&laquo;</button>
+        </div>
        <div class="assistant-item" id="assistant-thread">
          <span class="assistant-label" id="assistant-label" data-i18n="chat.assistant">Assistant</span>
          <span class="assistant-meta" id="assistant-meta"></span>
        </div>
        <div class="threads-section-header">
          <span data-i18n="chat.conversations">Conversations</span>
-          <div class="spacer"></div>
-          <button class="thread-new-btn" id="thread-new-btn" data-i18n="chat.newThread" data-i18n-attr="title"
-            title="New thread (Ctrl/Cmd+N)">+</button>
-          <button class="thread-toggle-btn" id="thread-toggle-btn" data-i18n="chat.toggleSidebar"
-            data-i18n-attr="title" title="Toggle sidebar">&laquo;</button>
        </div>
        <div class="thread-list" id="thread-list"></div>
      </div>
@@ -281,125 +271,77 @@
      </div>
    </div>

-    <!-- Settings Tab -->
-    <div class="tab-panel" id="tab-settings">
-      <div class="settings-layout">
-        <div class="settings-sidebar">
-          <button class="settings-subtab active" data-settings-subtab="inference" data-i18n="settings.inference">Inference</button>
-          <button class="settings-subtab" data-settings-subtab="agent" data-i18n="settings.agent">Agent</button>
-          <button class="settings-subtab" data-settings-subtab="channels" data-i18n="settings.channels">Channels</button>
-          <button class="settings-subtab" data-settings-subtab="networking" data-i18n="settings.networking">Networking</button>
-          <button class="settings-subtab" data-settings-subtab="extensions" data-i18n="tab.extensions">Extensions</button>
-          <button class="settings-subtab" data-settings-subtab="mcp" data-i18n="settings.mcp">MCP</button>
-          <button class="settings-subtab" data-settings-subtab="skills" data-i18n="tab.skills">Skills</button>
+    <!-- Extensions Tab -->
+    <div class="tab-panel" id="tab-extensions">
+      <div class="extensions-container">
+        <div class="extensions-section">
+          <h3 data-i18n="extensions.installed">Installed Extensions</h3>
+          <div class="extensions-list" id="extensions-list">
+            <div class="empty-state" data-i18n="common.loading">Loading...</div>
+          </div>
        </div>
-        <div class="settings-content">
-          <div class="settings-toolbar">
-            <div class="settings-search">
-              <input type="text" id="settings-search-input" data-i18n-placeholder="settings.searchPlaceholder" placeholder="Search settings..." data-i18n-attr="aria-label" data-i18n="settings.searchPlaceholder" aria-label="Search settings...">
-            </div>
-            <button id="settings-export-btn" class="settings-toolbar-btn" data-i18n="settings.export">Export</button>
-            <button id="settings-import-btn" class="settings-toolbar-btn" data-i18n="settings.import">Import</button>
+        <div class="extensions-section" id="available-wasm-section">
+          <h3 data-i18n="extensions.available">Available WASM Extensions</h3>
+          <div class="extensions-list" id="available-wasm-list">
+            <div class="empty-state" data-i18n="common.loading">Loading...</div>
          </div>
-          <div class="settings-subpanel active" id="settings-inference">
-            <div class="extensions-container" id="settings-inference-content">
-              <div class="empty-state" data-i18n="common.loading">Loading settings...</div>
-            </div>
+        </div>
+        <div class="extensions-section">
+          <h3 data-i18n="extensions.installWasm">Install WASM Extension</h3>
+          <div class="ext-install-form">
+            <input type="text" id="wasm-install-name" data-i18n-placeholder="common.name" placeholder="Extension name">
+            <input type="text" id="wasm-install-url" placeholder="URL to .tar.gz bundle">
+            <button id="wasm-install-btn" data-i18n="extensions.install">Install</button>
          </div>
-          <div class="settings-subpanel" id="settings-agent">
-            <div class="extensions-container" id="settings-agent-content">
-              <div class="empty-state" data-i18n="common.loading">Loading settings...</div>
-            </div>
+        </div>
+        <div class="extensions-section">
+          <h3 data-i18n="mcp.servers">MCP Servers</h3>
+          <div class="extensions-list" id="mcp-servers-list">
+            <div class="empty-state" data-i18n="common.loading">Loading...</div>
          </div>
-          <div class="settings-subpanel" id="settings-channels">
-            <div class="extensions-container" id="settings-channels-content">
-              <div class="empty-state" data-i18n="common.loading">Loading channels...</div>
-            </div>
-          </div>
-          <div class="settings-subpanel" id="settings-networking">
-            <div class="extensions-container" id="settings-networking-content">
-              <div class="empty-state" data-i18n="common.loading">Loading...</div>
-            </div>
-          </div>
-          <div class="settings-subpanel" id="settings-extensions">
-            <div class="extensions-container">
-              <div class="extensions-section">
-                <h3 data-i18n="extensions.installed">Installed Extensions</h3>
-                <div class="extensions-list" id="extensions-list">
-                  <div class="empty-state" data-i18n="common.loading">Loading...</div>
-                </div>
-              </div>
-              <div class="extensions-section" id="available-wasm-section">
-                <h3 data-i18n="extensions.available">Available Extensions</h3>
-                <div class="extensions-list" id="available-wasm-list">
-                  <div class="empty-state" data-i18n="common.loading">Loading...</div>
-                </div>
-              </div>
-              <div class="extensions-section">
-                <h3 data-i18n="extensions.installWasm">Install Extension</h3>
-                <div class="ext-install-form">
-                  <input type="text" id="wasm-install-name" data-i18n-placeholder="common.name" placeholder="Extension name">
-                  <input type="text" id="wasm-install-url" placeholder="URL to .tar.gz bundle">
-                  <button id="wasm-install-btn" data-i18n="extensions.install">Install</button>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="settings-subpanel" id="settings-mcp">
-            <div class="extensions-container">
-              <div class="extensions-section">
-                <h3 data-i18n="mcp.servers">MCP Servers</h3>
-                <div class="extensions-list" id="mcp-servers-list">
-                  <div class="empty-state" data-i18n="common.loading">Loading...</div>
-                </div>
-                <h4 data-i18n="mcp.addCustom">Add Custom MCP Server</h4>
-                <div class="ext-install-form">
-                  <input type="text" id="mcp-install-name" data-i18n-placeholder="common.name" placeholder="Server name">
-                  <input type="text" id="mcp-install-url" placeholder="MCP server URL (https://...)">
-                  <button id="mcp-add-btn" data-i18n="mcp.add">Add</button>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="settings-subpanel" id="settings-skills">
-            <div class="extensions-container">
-              <div class="extensions-section">
-                <h3 data-i18n="skills.searchClawHub">Search ClawHub</h3>
-                <div class="skill-search-box">
-                  <input type="text" id="skill-search-input" data-i18n-placeholder="skills.searchPlaceholder" placeholder="Search for skills...">
-                  <button id="skill-search-btn" data-i18n="skills.search">Search</button>
-                </div>
-                <div class="extensions-list" id="skill-search-results"></div>
-              </div>
-              <div class="extensions-section">
-                <h3 data-i18n="skills.installed">Installed Skills</h3>
-                <div class="extensions-list" id="skills-list">
-                  <div class="empty-state" data-i18n="skills.loading">Loading skills...</div>
-                </div>
-              </div>
-              <div class="extensions-section">
-                <h3 data-i18n="skills.installByUrl">Install Skill by URL</h3>
-                <div class="ext-install-form">
-                  <input type="text" id="skill-install-name" data-i18n-placeholder="skills.namePlaceholder" placeholder="Skill name or slug">
-                  <input type="text" id="skill-install-url" data-i18n-placeholder="skills.urlPlaceholder" placeholder="HTTPS URL to SKILL.md (optional)">
-                  <button id="skill-install-btn" data-i18n="extensions.install">Install</button>
-                </div>
-              </div>
-            </div>
+          <h4 data-i18n="mcp.addCustom">Add Custom MCP Server</h4>
+          <div class="ext-install-form">
+            <input type="text" id="mcp-install-name" data-i18n-placeholder="common.name" placeholder="Server name">
+            <input type="text" id="mcp-install-url" placeholder="MCP server URL (https://...)">
+            <button id="mcp-add-btn" data-i18n="mcp.add">Add</button>
          </div>
        </div>
+        <div class="extensions-section">
+          <h3 data-i18n="tools.registered">Registered Tools</h3>
+          <table class="tools-table" id="tools-table">
+            <thead><tr><th data-i18n="tools.name">Name</th><th data-i18n="tools.description">Description</th></tr></thead>
+            <tbody id="tools-tbody"></tbody>
+          </table>
+          <div class="empty-state" id="tools-empty" style="display:none" data-i18n="tools.empty">No tools registered</div>
+        </div>
      </div>
    </div>
-  </div>

-  <!-- Confirmation Modal -->
-  <div id="confirm-modal" class="modal-overlay" style="display:none" role="dialog" aria-modal="true" aria-labelledby="confirm-modal-title">
-    <div class="modal">
-      <h3 id="confirm-modal-title"></h3>
-      <p id="confirm-modal-message"></p>
-      <div class="modal-actions">
-        <button id="confirm-modal-cancel-btn" class="btn-secondary" data-i18n="btn.cancel">Cancel</button>
-        <button id="confirm-modal-btn" class="btn-danger">Confirm</button>
+    <!-- Skills Tab -->
+    <div class="tab-panel" id="tab-skills">
+      <div class="extensions-container">
+        <div class="extensions-section">
+          <h3 data-i18n="skills.searchClawHub">Search ClawHub</h3>
+          <div class="skill-search-box">
+            <input type="text" id="skill-search-input" data-i18n-placeholder="skills.searchPlaceholder" placeholder="Search...">
+            <button id="skill-search-btn" data-i18n="skills.search">Search</button>
+          </div>
+          <div class="extensions-list" id="skill-search-results"></div>
+        </div>
+        <div class="extensions-section">
+          <h3 data-i18n="skills.installed">Installed Skills</h3>
+          <div class="extensions-list" id="skills-list">
+            <div class="empty-state" data-i18n="skills.loading">Loading skills...</div>
+          </div>
+        </div>
+        <div class="extensions-section">
+          <h3 data-i18n="skills.installByUrl">Install Skill by URL</h3>
+          <div class="ext-install-form">
+            <input type="text" id="skill-install-name" data-i18n-placeholder="skills.namePlaceholder" placeholder="Skill name or slug">
+            <input type="text" id="skill-install-url" data-i18n-placeholder="skills.urlPlaceholder" placeholder="HTTPS URL to SKILL.md (optional)">
+            <button id="skill-install-btn" data-i18n="extensions.install">Install</button>
+          </div>
+        </div>
      </div>
    </div>
  </div>
@@ -1,12 +0,0 @@
-// Prevent FOUC: apply saved theme before first paint.
-// This script must be loaded synchronously in <head> (no defer/async).
-(function() {
-  const stored = localStorage.getItem('ironclaw-theme');
-  const mode = (stored === 'dark' || stored === 'light' || stored === 'system') ? stored : 'system';
-  let resolved = mode;
-  if (mode === 'system') {
-    resolved = window.matchMedia('(prefers-color-scheme: light)').matches ? 'light' : 'dark';
-  }
-  document.documentElement.setAttribute('data-theme', resolved);
-  document.documentElement.setAttribute('data-theme-mode', mode);
-})();
@@ -83,12 +83,10 @@ impl TestGatewayBuilder {
            scheduler: None,
            chat_rate_limiter: RateLimiter::new(30, 60),
            oauth_rate_limiter: RateLimiter::new(10, 60),
-            webhook_rate_limiter: RateLimiter::new(10, 60),
            registry_entries: Vec::new(),
            cost_guard: None,
            routine_engine: Arc::new(tokio::sync::RwLock::new(None)),
            startup_time: std::time::Instant::now(),
-            active_config: crate::channels::web::server::ActiveConfigSnapshot::default(),
        })
    }

@@ -116,153 +116,9 @@ pub struct ApprovalRequest {

 // --- SSE Event Types ---

-#[derive(Debug, Clone, Serialize)]
-#[serde(tag = "type")]
-pub enum SseEvent {
-    #[serde(rename = "response")]
-    Response { content: String, thread_id: String },
-    #[serde(rename = "thinking")]
-    Thinking {
-        message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "tool_started")]
-    ToolStarted {
-        name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "tool_completed")]
-    ToolCompleted {
-        name: String,
-        success: bool,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        error: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        parameters: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "tool_result")]
-    ToolResult {
-        name: String,
-        preview: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "stream_chunk")]
-    StreamChunk {
-        content: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "status")]
-    Status {
-        message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "job_started")]
-    JobStarted {
-        job_id: String,
-        title: String,
-        browse_url: String,
-    },
-    #[serde(rename = "approval_needed")]
-    ApprovalNeeded {
-        request_id: String,
-        tool_name: String,
-        description: String,
-        parameters: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-        /// Whether the "always" auto-approve option should be shown.
-        allow_always: bool,
-    },
-    #[serde(rename = "auth_required")]
-    AuthRequired {
-        extension_name: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        instructions: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        auth_url: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        setup_url: Option<String>,
-    },
-    #[serde(rename = "auth_completed")]
-    AuthCompleted {
-        extension_name: String,
-        success: bool,
-        message: String,
-    },
-    #[serde(rename = "error")]
-    Error {
-        message: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-    #[serde(rename = "heartbeat")]
-    Heartbeat,
-
-    // Sandbox job streaming events (worker + Claude Code bridge)
-    #[serde(rename = "job_message")]
-    JobMessage {
-        job_id: String,
-        role: String,
-        content: String,
-    },
-    #[serde(rename = "job_tool_use")]
-    JobToolUse {
-        job_id: String,
-        tool_name: String,
-        input: serde_json::Value,
-    },
-    #[serde(rename = "job_tool_result")]
-    JobToolResult {
-        job_id: String,
-        tool_name: String,
-        output: String,
-    },
-    #[serde(rename = "job_status")]
-    JobStatus { job_id: String, message: String },
-    #[serde(rename = "job_result")]
-    JobResult {
-        job_id: String,
-        status: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        session_id: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        fallback_deliverable: Option<serde_json::Value>,
-    },
-
-    /// An image was generated by a tool.
-    #[serde(rename = "image_generated")]
-    ImageGenerated {
-        data_url: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        path: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-
-    /// Suggested follow-up messages for the user.
-    #[serde(rename = "suggestions")]
-    Suggestions {
-        suggestions: Vec<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        thread_id: Option<String>,
-    },
-
-    /// Extension activation status change (WASM channels).
-    #[serde(rename = "extension_status")]
-    ExtensionStatus {
-        extension_name: String,
-        status: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        message: Option<String>,
-    },
-}
+/// Re-export from `crate::events::DomainEvent` — the canonical event enum now
+/// lives in a channel-neutral location so agent code doesn't depend on `channels::web`.
+pub use crate::events::DomainEvent as SseEvent;

 // --- Memory ---

@@ -302,30 +158,12 @@ pub struct MemoryReadResponse {
 pub struct MemoryWriteRequest {
    pub path: String,
    pub content: String,
-    /// Optional layer to write to. When present, uses `write_to_layer()`
-    /// which enables privacy classification and redirect.
-    pub layer: Option<String>,
-    /// When true and a layer is specified, appends to existing content
-    /// instead of replacing it.
-    #[serde(default)]
-    pub append: bool,
-    /// Skip privacy classification and write directly to the specified layer.
-    #[serde(default)]
-    pub force: bool,
 }

 #[derive(Debug, Serialize)]
 pub struct MemoryWriteResponse {
    pub path: String,
    pub status: &'static str,
-    /// Whether the write was redirected to a different layer (e.g., sensitive
-    /// content redirected from shared to private).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub redirected: Option<bool>,
-    /// The layer the content was actually written to (may differ from requested
-    /// layer if privacy redirect occurred).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub actual_layer: Option<String>,
 }

 #[derive(Debug, Deserialize)]
@@ -432,40 +270,6 @@ pub struct TransitionInfo {

 // --- Extensions ---

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ExtensionActivationStatus {
-    Installed,
-    Configured,
-    Pairing,
-    Active,
-    Failed,
-}
-
-pub fn classify_wasm_channel_activation(
-    ext: &crate::extensions::InstalledExtension,
-    has_paired: bool,
-    has_owner_binding: bool,
-) -> Option<ExtensionActivationStatus> {
-    if ext.kind != crate::extensions::ExtensionKind::WasmChannel {
-        return None;
-    }
-
-    Some(if ext.activation_error.is_some() {
-        ExtensionActivationStatus::Failed
-    } else if !ext.authenticated {
-        ExtensionActivationStatus::Installed
-    } else if ext.active {
-        if has_paired || has_owner_binding {
-            ExtensionActivationStatus::Active
-        } else {
-            ExtensionActivationStatus::Pairing
-        }
-    } else {
-        ExtensionActivationStatus::Configured
-    })
-}
-
 #[derive(Debug, Serialize)]
 pub struct ExtensionInfo {
    pub name: String,
@@ -484,9 +288,9 @@ pub struct ExtensionInfo {
    /// Whether this extension has an auth configuration (OAuth or manual token).
    #[serde(default)]
    pub has_auth: bool,
-    /// WASM channel activation status.
+    /// WASM channel activation status: "installed", "configured", "active", "failed".
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub activation_status: Option<ExtensionActivationStatus>,
+    pub activation_status: Option<String>,
    /// Human-readable error when activation_status is "failed".
    #[serde(skip_serializing_if = "Option::is_none")]
    pub activation_error: Option<String>,
@@ -559,9 +363,6 @@ pub struct ActionResponse {
    /// Whether the channel was successfully activated after setup.
    #[serde(skip_serializing_if = "Option::is_none")]
    pub activated: Option<bool>,
-    /// Pending manual verification challenge (for Telegram owner binding, etc.).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub verification: Option<crate::extensions::VerificationChallenge>,
 }

 impl ActionResponse {
@@ -573,7 +374,6 @@ impl ActionResponse {
            awaiting_token: None,
            instructions: None,
            activated: None,
-            verification: None,
        }
    }

@@ -585,7 +385,6 @@ impl ActionResponse {
            awaiting_token: None,
            instructions: None,
            activated: None,
-            verification: None,
        }
    }
 }
@@ -832,14 +631,6 @@ impl RoutineInfo {
                String::new(),
                format!("event: {}.{}", source, event_type),
            ),
-            crate::agent::routine::Trigger::Webhook { path, .. } => {
-                let p = path.as_deref().unwrap_or("default");
-                (
-                    "webhook".to_string(),
-                    String::new(),
-                    format!("webhook: /api/webhooks/{}", p),
-                )
-            }
            crate::agent::routine::Trigger::Manual => (
                "manual".to_string(),
                String::new(),
@@ -1110,7 +901,6 @@ mod tests {
            description: "Run ls".to_string(),
            parameters: "{}".to_string(),
            thread_id: Some("t1".to_string()),
-            allow_always: true,
        };
        let ws = WsServerMessage::from_sse_event(&sse);
        match ws {
@@ -2,28 +2,10 @@

 use crate::channels::web::types::{ToolCallInfo, TurnInfo};

-/// Truncate a string to at most `max_bytes` bytes at a char boundary, appending "...".
-///
-/// If the input is wrapped in `<tool_output …>…</tool_output>` and truncation
-/// removes the closing tag, the tag is re-appended so downstream XML parsers
-/// never see an unclosed element.
+/// Delegates to [`crate::util::truncate_preview`] — the canonical implementation
+/// now lives in the shared utility module so non-web code can use it too.
 pub fn truncate_preview(s: &str, max_bytes: usize) -> String {
-    if s.len() <= max_bytes {
-        return s.to_string();
-    }
-    // Walk backwards from max_bytes to find a valid char boundary
-    let mut end = max_bytes;
-    while end > 0 && !s.is_char_boundary(end) {
-        end -= 1;
-    }
-    let mut result = format!("{}...", &s[..end]);
-
-    // Re-close <tool_output> if truncation cut through the closing tag.
-    if s.starts_with("<tool_output") && !result.ends_with("</tool_output>") {
-        result.push_str("\n</tool_output>");
-    }
-
-    result
+    crate::util::truncate_preview(s, max_bytes)
 }

 /// Build TurnInfo pairs from flat DB messages (user/tool_calls/assistant triples).
@@ -265,25 +265,14 @@ async fn handle_client_message(
            if let Some(ref ext_mgr) = state.extension_manager {
                match ext_mgr.configure_token(&extension_name, &token).await {
                    Ok(result) => {
-                        if result.verification.is_some() {
-                            state.sse.broadcast(
-                                crate::channels::web::types::SseEvent::AuthRequired {
-                                    extension_name: extension_name.clone(),
-                                    instructions: Some(result.message),
-                                    auth_url: None,
-                                    setup_url: None,
-                                },
-                            );
-                        } else {
-                            crate::channels::web::server::clear_auth_mode(state).await;
-                            state.sse.broadcast(
-                                crate::channels::web::types::SseEvent::AuthCompleted {
-                                    extension_name,
-                                    success: true,
-                                    message: result.message,
-                                },
-                            );
-                        }
+                        crate::channels::web::server::clear_auth_mode(state).await;
+                        state
+                            .sse
+                            .broadcast(crate::channels::web::types::SseEvent::AuthCompleted {
+                                extension_name,
+                                success: true,
+                                message: result.message,
+                            });
                    }
                    Err(e) => {
                        let msg = format!("Auth failed: {}", e);
@@ -517,12 +506,10 @@ mod tests {
            skill_catalog: None,
            chat_rate_limiter: crate::channels::web::server::RateLimiter::new(30, 60),
            oauth_rate_limiter: crate::channels::web::server::RateLimiter::new(10, 60),
-            webhook_rate_limiter: crate::channels::web::server::RateLimiter::new(10, 60),
            registry_entries: Vec::new(),
            cost_guard: None,
            routine_engine: Arc::new(tokio::sync::RwLock::new(None)),
            startup_time: std::time::Instant::now(),
-            active_config: crate::channels::web::server::ActiveConfigSnapshot::default(),
        }
    }
 }
@@ -33,7 +33,7 @@ pub async fn run_doctor_command() -> anyhow::Result<()> {

    check(
        "NEAR AI session",
-        check_nearai_session(&settings).await,
+        check_nearai_session().await,
        &mut passed,
        &mut failed,
        &mut skipped,
@@ -215,22 +215,7 @@ fn check_settings_file() -> CheckResult {

 // ── NEAR AI session ─────────────────────────────────────────

-async fn check_nearai_session(settings: &Settings) -> CheckResult {
-    // Skip entirely when the configured backend is not NEAR AI.
-    let llm_config = match crate::config::LlmConfig::resolve(settings) {
-        Ok(config) => config,
-        Err(e) => {
-            // check_llm_config will report the full error; just skip here.
-            return CheckResult::Skip(format!("LLM config error: {e}"));
-        }
-    };
-    if llm_config.backend != "nearai" {
-        return CheckResult::Skip(format!(
-            "not using NEAR AI backend (backend={})",
-            llm_config.backend
-        ));
-    }
-
+async fn check_nearai_session() -> CheckResult {
    // Check if session file exists
    let session_path = crate::config::llm::default_session_path();
    if !session_path.exists() {
@@ -420,11 +405,10 @@ fn check_routines_config() -> CheckResult {
 fn check_gateway_config(settings: &Settings) -> CheckResult {
    // Use the same resolve() path as runtime so invalid env values
    // (e.g. GATEWAY_PORT=abc) are caught here too.
-    let owner_id = match crate::config::resolve_owner_id(settings) {
-        Ok(owner_id) => owner_id,
-        Err(e) => return CheckResult::Fail(format!("config error: {e}")),
-    };
-    match crate::config::ChannelsConfig::resolve(settings, &owner_id) {
+    let tunnel_enabled = crate::config::TunnelConfig::resolve(settings)
+        .map(|t| t.is_enabled())
+        .unwrap_or(false);
+    match crate::config::ChannelsConfig::resolve(settings, tunnel_enabled) {
        Ok(channels) => match channels.gateway {
            Some(gw) => {
                if gw.auth_token.is_some() {
@@ -635,53 +619,12 @@ mod tests {

    #[tokio::test]
    async fn check_nearai_session_does_not_panic() {
-        let settings = Settings::default();
-        let result = check_nearai_session(&settings).await;
+        let result = check_nearai_session().await;
        match result {
            CheckResult::Pass(_) | CheckResult::Fail(_) | CheckResult::Skip(_) => {}
        }
    }

-    #[test]
-    fn check_nearai_session_skips_for_non_nearai_backend() {
-        struct EnvGuard(&'static str, Option<String>);
-        impl Drop for EnvGuard {
-            fn drop(&mut self) {
-                // SAFETY: Under ENV_MUTEX.
-                unsafe {
-                    match &self.1 {
-                        Some(val) => std::env::set_var(self.0, val),
-                        None => std::env::remove_var(self.0),
-                    }
-                }
-            }
-        }
-
-        let _mutex = crate::config::helpers::ENV_MUTEX.lock().expect("env mutex");
-        let prev = std::env::var("LLM_BACKEND").ok();
-        // SAFETY: Under ENV_MUTEX, no concurrent env access.
-        unsafe {
-            std::env::set_var("LLM_BACKEND", "anthropic");
-        }
-        let _env_guard = EnvGuard("LLM_BACKEND", prev);
-
-        let settings = Settings::default();
-        let rt = tokio::runtime::Runtime::new().expect("tokio runtime");
-        let result = rt.block_on(check_nearai_session(&settings));
-        match result {
-            CheckResult::Skip(msg) => {
-                assert!(
-                    msg.contains("backend=anthropic"),
-                    "expected backend name in skip message, got: {msg}"
-                );
-            }
-            other => panic!(
-                "expected Skip for non-nearai backend, got: {}",
-                format_result(&other)
-            ),
-        }
-    }
-
    #[test]
    fn check_settings_file_handles_missing() {
        // Settings::default_path() might or might not exist, but must not panic
@@ -223,8 +223,8 @@ async fn cmd_follow(cmd: &LogsCommand, params: &GatewayParams) -> anyhow::Result

        // Process complete lines from the buffer.
        while let Some(newline_pos) = buffer.find('\n') {
-            let line = buffer[..newline_pos].to_string();
-            buffer = buffer[newline_pos + 1..].to_string();
+            let line = buffer[..newline_pos].to_string(); // safety: find('\n') returns char boundary
+            buffer = buffer[newline_pos + 1..].to_string(); // safety: '\n' is single byte

            // SSE format: "data: {...}" lines carry the payload.
            if let Some(data) = line.strip_prefix("data: ")
@@ -487,25 +487,25 @@ mod tests {

    #[test]
    fn test_colorize_level() {
-        assert!(colorize_level("ERROR").contains("\x1b[31m"));
-        assert!(colorize_level("WARN").contains("\x1b[33m"));
-        assert!(colorize_level("INFO").contains("\x1b[32m"));
-        assert!(colorize_level("DEBUG").contains("\x1b[36m"));
-        assert!(colorize_level("TRACE").contains("\x1b[90m"));
-        assert_eq!(colorize_level("UNKNOWN"), "UNKNOWN");
+        assert!(colorize_level("ERROR").contains("\x1b[31m")); // safety: test-only
+        assert!(colorize_level("WARN").contains("\x1b[33m")); // safety: test-only
+        assert!(colorize_level("INFO").contains("\x1b[32m")); // safety: test-only
+        assert!(colorize_level("DEBUG").contains("\x1b[36m")); // safety: test-only
+        assert!(colorize_level("TRACE").contains("\x1b[90m")); // safety: test-only
+        assert_eq!(colorize_level("UNKNOWN"), "UNKNOWN"); // safety: test-only
    }

    #[test]
    fn test_convert_to_local_time_valid() {
        let ts = "2024-01-15T10:30:00.000Z";
        let result = convert_to_local_time(ts);
-        assert!(result.contains("2024-01-15"));
+        assert!(result.contains("2024-01-15")); // safety: test-only
    }

    #[test]
    fn test_convert_to_local_time_invalid() {
        let ts = "not-a-timestamp";
-        assert_eq!(convert_to_local_time(ts), "not-a-timestamp");
+        assert_eq!(convert_to_local_time(ts), "not-a-timestamp"); // safety: test-only
    }

    #[test]
@@ -533,55 +533,55 @@ mod tests {

    #[test]
    fn test_tail_file_small() {
-        let dir = tempfile::tempdir().unwrap();
+        let dir = tempfile::tempdir().unwrap(); // safety: test-only
        let path = dir.path().join("test.log");
-        std::fs::write(&path, "line1\nline2\nline3\nline4\nline5\n").unwrap();
+        std::fs::write(&path, "line1\nline2\nline3\nline4\nline5\n").unwrap(); // safety: test-only

-        let result = tail_file(&path, 3).unwrap();
-        assert_eq!(result, vec!["line3", "line4", "line5"]);
+        let result = tail_file(&path, 3).unwrap(); // safety: test-only
+        assert_eq!(result, vec!["line3", "line4", "line5"]); // safety: test-only
    }

    #[test]
    fn test_tail_file_fewer_lines_than_limit() {
-        let dir = tempfile::tempdir().unwrap();
+        let dir = tempfile::tempdir().unwrap(); // safety: test-only
        let path = dir.path().join("test.log");
-        std::fs::write(&path, "a\nb\n").unwrap();
+        std::fs::write(&path, "a\nb\n").unwrap(); // safety: test-only

-        let result = tail_file(&path, 200).unwrap();
-        assert_eq!(result, vec!["a", "b"]);
+        let result = tail_file(&path, 200).unwrap(); // safety: test-only
+        assert_eq!(result, vec!["a", "b"]); // safety: test-only
    }

    #[test]
    fn test_tail_file_empty() {
-        let dir = tempfile::tempdir().unwrap();
+        let dir = tempfile::tempdir().unwrap(); // safety: test-only
        let path = dir.path().join("test.log");
-        std::fs::write(&path, "").unwrap();
+        std::fs::write(&path, "").unwrap(); // safety: test-only

-        let result = tail_file(&path, 10).unwrap();
-        assert!(result.is_empty());
+        let result = tail_file(&path, 10).unwrap(); // safety: test-only
+        assert!(result.is_empty()); // safety: test-only
    }

    #[test]
    fn test_tail_file_large() {
-        let dir = tempfile::tempdir().unwrap();
+        let dir = tempfile::tempdir().unwrap(); // safety: test-only
        let path = dir.path().join("big.log");
        // Write 10000 lines to test chunked reading.
        let content: String = (0..10000).map(|i| format!("line {}\n", i)).collect();
-        std::fs::write(&path, &content).unwrap();
+        std::fs::write(&path, &content).unwrap(); // safety: test-only

-        let result = tail_file(&path, 5).unwrap();
-        assert_eq!(result.len(), 5);
-        assert_eq!(result[0], "line 9995");
-        assert_eq!(result[4], "line 9999");
+        let result = tail_file(&path, 5).unwrap(); // safety: test-only
+        assert_eq!(result.len(), 5); // safety: test-only
+        assert_eq!(result[0], "line 9995"); // safety: test-only
+        assert_eq!(result[4], "line 9999"); // safety: test-only
    }

    #[test]
    fn test_tail_file_no_trailing_newline() {
-        let dir = tempfile::tempdir().unwrap();
+        let dir = tempfile::tempdir().unwrap(); // safety: test-only
        let path = dir.path().join("test.log");
-        std::fs::write(&path, "line1\nline2\nline3").unwrap();
+        std::fs::write(&path, "line1\nline2\nline3").unwrap(); // safety: test-only

-        let result = tail_file(&path, 2).unwrap();
-        assert_eq!(result, vec!["line2", "line3"]);
+        let result = tail_file(&path, 2).unwrap(); // safety: test-only
+        assert_eq!(result, vec!["line2", "line3"]); // safety: test-only
    }
 }
@@ -7,18 +7,17 @@ use std::sync::Arc;

 use clap::Subcommand;

-use crate::workspace::{EmbeddingCacheConfig, EmbeddingProvider, SearchConfig, Workspace};
+use crate::workspace::{EmbeddingProvider, SearchConfig, Workspace};

 /// Run a memory command using the Database trait (works with any backend).
 pub async fn run_memory_command_with_db(
    cmd: MemoryCommand,
    db: std::sync::Arc<dyn crate::db::Database>,
    embeddings: Option<Arc<dyn EmbeddingProvider>>,
-    cache_config: EmbeddingCacheConfig,
 ) -> anyhow::Result<()> {
    let mut workspace = Workspace::new_with_db("default", db);
    if let Some(emb) = embeddings {
-        workspace = workspace.with_embeddings_cached(emb, cache_config);
+        workspace = workspace.with_embeddings(emb);
    }

    match cmd {
@@ -86,11 +85,10 @@ pub async fn run_memory_command(
    cmd: MemoryCommand,
    pool: deadpool_postgres::Pool,
    embeddings: Option<Arc<dyn EmbeddingProvider>>,
-    cache_config: EmbeddingCacheConfig,
 ) -> anyhow::Result<()> {
    let mut workspace = Workspace::new("default", pool);
    if let Some(emb) = embeddings {
-        workspace = workspace.with_embeddings_cached(emb, cache_config);
+        workspace = workspace.with_embeddings(emb);
    }

    match cmd {
@@ -239,17 +239,6 @@ pub enum Command {
    )]
    Import(ImportCommand),

-    /// Authenticate with a provider (re-login)
-    #[command(
-        about = "Authenticate with a provider",
-        long_about = "Re-authenticate with an LLM provider.\nExample: ironclaw login --openai-codex"
-    )]
-    Login {
-        /// Authenticate with OpenAI Codex (ChatGPT subscription)
-        #[arg(long)]
-        openai_codex: bool,
-    },
-
    /// Run as a sandboxed worker inside a Docker container (internal use).
    /// This is invoked automatically by the orchestrator, not by users directly.
    #[command(hide = true)]
@@ -347,10 +336,7 @@ pub async fn run_memory_command(mem_cmd: &MemoryCommand) -> anyhow::Result<()> {
        .await
        .map_err(|e| anyhow::anyhow!("{}", e))?;

-    let cache_config = crate::workspace::EmbeddingCacheConfig {
-        max_entries: config.embeddings.cache_size,
-    };
-    run_memory_command_with_db(mem_cmd.clone(), db, embeddings, cache_config).await
+    run_memory_command_with_db(mem_cmd.clone(), db, embeddings).await
 }

 #[cfg(test)]
@@ -5,10 +5,17 @@
 //!
 //! # Built-in Credentials
 //!
-//! Some providers ship with built-in OAuth credentials so users don't need to
-//! register their own OAuth app just to get started. Today this module only
-//! includes built-in defaults for Google-family tools, and those defaults can
-//! be overridden by provider-specific environment variables when needed.
+//! Many CLI tools (gcloud, rclone, gdrive) ship with default OAuth credentials
+//! so users don't need to register their own OAuth app. Google explicitly
+//! documents that client_secret for "Desktop App" / "Installed App" types
+//! is NOT actually secret.
+//!
+//! Default credentials are hardcoded below. They can be overridden at:
+//!
+//! - **Compile time**: Set IRONCLAW_GOOGLE_CLIENT_ID / IRONCLAW_GOOGLE_CLIENT_SECRET
+//!   env vars before building to replace the hardcoded defaults.
+//! - **Runtime**: Users can set GOOGLE_OAUTH_CLIENT_ID / GOOGLE_OAUTH_CLIENT_SECRET
+//!   env vars, which take priority over built-in defaults.

 use std::collections::HashMap;
 use std::sync::Arc;
@@ -16,7 +23,6 @@ use std::time::Duration;

 use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
 use rand::RngCore;
-use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use tokio::sync::RwLock;

@@ -54,14 +60,6 @@ pub fn builtin_credentials(secret_name: &str) -> Option<OAuthCredentials> {
    }
 }

-/// Returns the compile-time override env var name, if this provider supports one.
-pub fn builtin_client_id_override_env(secret_name: &str) -> Option<&'static str> {
-    match secret_name {
-        "google_oauth_token" => Some("IRONCLAW_GOOGLE_CLIENT_ID"),
-        _ => None,
-    }
-}
-
 // ── Shared callback server ──────────────────────────────────────────────

 // Core OAuth callback infrastructure is defined in `crate::llm::oauth_helpers`
@@ -175,8 +173,9 @@ pub async fn exchange_oauth_code(
    code_verifier: Option<&str>,
    access_token_field: &str,
 ) -> Result<OAuthTokenResponse, OAuthCallbackError> {
-    let extra_token_params = HashMap::new();
-    exchange_oauth_code_with_params(
+    // Delegates to exchange_oauth_code_with_resource with resource=None.
+    // Non-MCP OAuth flows don't need the RFC 8707 resource parameter.
+    exchange_oauth_code_with_resource(
        token_url,
        client_id,
        client_secret,
@@ -184,14 +183,16 @@ pub async fn exchange_oauth_code(
        redirect_uri,
        code_verifier,
        access_token_field,
-        &extra_token_params,
+        None,
    )
    .await
 }

-/// Exchange an OAuth authorization code for tokens with generic extra form parameters.
+/// Exchange an OAuth authorization code for tokens, with optional RFC 8707 `resource` parameter.
+///
+/// The `resource` parameter scopes the issued token to a specific server (used by MCP OAuth).
 #[allow(clippy::too_many_arguments)]
-pub async fn exchange_oauth_code_with_params(
+pub async fn exchange_oauth_code_with_resource(
    token_url: &str,
    client_id: &str,
    client_secret: Option<&str>,
@@ -199,7 +200,7 @@ pub async fn exchange_oauth_code_with_params(
    redirect_uri: &str,
    code_verifier: Option<&str>,
    access_token_field: &str,
-    extra_token_params: &HashMap<String, String>,
+    resource: Option<&str>,
 ) -> Result<OAuthTokenResponse, OAuthCallbackError> {
    let client = reqwest::Client::new();
    let mut token_params = vec![
@@ -212,8 +213,10 @@ pub async fn exchange_oauth_code_with_params(
        token_params.push(("code_verifier", verifier.to_string()));
    }

-    for (key, value) in extra_token_params {
-        token_params.push((key.as_str(), value.clone()));
+    // RFC 8707: include the `resource` parameter so the authorization server
+    // scopes the issued token to the specific MCP server (protected resource).
+    if let Some(resource) = resource {
+        token_params.push(("resource", resource.to_string()));
    }

    let mut request = client.post(token_url);
@@ -273,37 +276,6 @@ pub async fn exchange_oauth_code_with_params(
    })
 }

-/// Exchange an OAuth authorization code for tokens, with optional RFC 8707 `resource` parameter.
-///
-/// The `resource` parameter scopes the issued token to a specific server (used by MCP OAuth).
-#[allow(clippy::too_many_arguments)]
-pub async fn exchange_oauth_code_with_resource(
-    token_url: &str,
-    client_id: &str,
-    client_secret: Option<&str>,
-    code: &str,
-    redirect_uri: &str,
-    code_verifier: Option<&str>,
-    access_token_field: &str,
-    resource: Option<&str>,
-) -> Result<OAuthTokenResponse, OAuthCallbackError> {
-    let mut extra_token_params = HashMap::new();
-    if let Some(resource) = resource {
-        extra_token_params.insert("resource".to_string(), resource.to_string());
-    }
-    exchange_oauth_code_with_params(
-        token_url,
-        client_id,
-        client_secret,
-        code,
-        redirect_uri,
-        code_verifier,
-        access_token_field,
-        &extra_token_params,
-    )
-    .await
-}
-
 /// Store OAuth tokens (access + refresh) in the secrets store.
 ///
 /// Also stores the granted scopes as `{secret_name}_scopes` so that scope
@@ -451,9 +423,9 @@ pub struct PendingOAuthFlow {
    pub sse_sender: Option<tokio::sync::broadcast::Sender<crate::channels::web::types::SseEvent>>,
    /// Gateway auth token for authenticating with the platform token exchange proxy.
    pub gateway_token: Option<String>,
-    /// Additional form params for the token exchange request.
-    /// Used for provider-specific requirements such as RFC 8707 `resource`.
-    pub token_exchange_extra_params: HashMap<String, String>,
+    /// RFC 8707 resource parameter (MCP OAuth only).
+    /// Sent during token exchange to scope the token to a specific MCP server.
+    pub resource: Option<String>,
    /// Secret name for persisting the client ID (MCP OAuth only).
    /// Needed so token refresh can find the client_id after the session ends.
    pub client_id_secret_name: Option<String>,
@@ -487,7 +459,9 @@ pub fn new_pending_oauth_registry() -> PendingOAuthRegistry {
 /// URL, meaning the user's browser will redirect to a hosted gateway rather than
 /// localhost.
 pub fn use_gateway_callback() -> bool {
-    crate::config::helpers::env_or_override("IRONCLAW_OAUTH_CALLBACK_URL")
+    std::env::var("IRONCLAW_OAUTH_CALLBACK_URL")
+        .ok()
+        .filter(|v| !v.is_empty())
        .map(|raw| {
            url::Url::parse(&raw)
                .ok()
@@ -498,13 +472,6 @@ pub fn use_gateway_callback() -> bool {
        .unwrap_or(false)
 }

-/// Returns the configured OAuth token-exchange proxy URL, if any.
-pub fn exchange_proxy_url() -> Option<String> {
-    crate::config::helpers::env_or_override("IRONCLAW_OAUTH_EXCHANGE_URL")
-        .map(|url| url.trim().to_string())
-        .filter(|url| !url.is_empty())
-}
-
 /// Maximum age for pending OAuth flows (5 minutes, matching TCP listener timeout).
 pub const OAUTH_FLOW_EXPIRY: Duration = Duration::from_secs(300);

@@ -519,117 +486,23 @@ pub async fn sweep_expired_flows(registry: &PendingOAuthRegistry) {

 // ── Platform routing helpers ────────────────────────────────────────

-const HOSTED_STATE_PREFIX: &str = "ic2";
-const HOSTED_STATE_CHECKSUM_BYTES: usize = 12;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct DecodedHostedOAuthState {
-    pub flow_id: String,
-    pub instance_name: Option<String>,
-    pub is_legacy: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct HostedOAuthStatePayload {
-    flow_id: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    instance_name: Option<String>,
-    issued_at: u64,
-}
-
-fn current_instance_name() -> Option<String> {
-    crate::config::helpers::env_or_override("IRONCLAW_INSTANCE_NAME")
-        .or_else(|| crate::config::helpers::env_or_override("OPENCLAW_INSTANCE_NAME"))
-        .filter(|v| !v.is_empty())
-}
-
-fn hosted_state_checksum(payload_bytes: &[u8]) -> String {
-    let digest = Sha256::digest(payload_bytes);
-    URL_SAFE_NO_PAD.encode(&digest[..HOSTED_STATE_CHECKSUM_BYTES])
-}
-
-/// Build a versioned hosted OAuth state envelope.
+/// Prepend instance name to CSRF state for platform routing.
 ///
-/// The encoded value is opaque to providers and can be decoded by both
-/// IronClaw and the external auth proxy for routing and callback lookup.
-pub fn encode_hosted_oauth_state(flow_id: &str, instance_name: Option<&str>) -> String {
-    let payload = HostedOAuthStatePayload {
-        flow_id: flow_id.to_string(),
-        instance_name: instance_name
-            .map(str::trim)
-            .filter(|v| !v.is_empty())
-            .map(str::to_string),
-        issued_at: std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap_or_default()
-            .as_secs(),
-    };
-    let payload_json = match serde_json::to_vec(&payload) {
-        Ok(payload_json) => payload_json,
-        Err(error) => {
-            tracing::warn!(%error, flow_id, "Failed to serialize hosted OAuth state payload");
-            return payload.flow_id;
-        }
-    };
-    let payload = URL_SAFE_NO_PAD.encode(&payload_json);
-    let checksum = hosted_state_checksum(&payload_json);
-    format!("{HOSTED_STATE_PREFIX}.{payload}.{checksum}")
-}
-
-/// Decode hosted OAuth state in either the new versioned format or the
-/// legacy `instance:nonce`/`nonce` forms.
-pub fn decode_hosted_oauth_state(state: &str) -> Result<DecodedHostedOAuthState, String> {
-    if let Some(rest) = state.strip_prefix(&format!("{HOSTED_STATE_PREFIX}."))
-        && let Some((payload_b64, checksum)) = rest.rsplit_once('.')
-        && let Ok(payload_json) = URL_SAFE_NO_PAD.decode(payload_b64)
-    {
-        let expected_checksum = hosted_state_checksum(&payload_json);
-        if checksum != expected_checksum {
-            return Err("Hosted OAuth state checksum mismatch".to_string());
-        }
-        if let Ok(payload) = serde_json::from_slice::<HostedOAuthStatePayload>(&payload_json)
-            && !payload.flow_id.trim().is_empty()
-        {
-            return Ok(DecodedHostedOAuthState {
-                flow_id: payload.flow_id,
-                instance_name: payload.instance_name.filter(|v| !v.is_empty()),
-                is_legacy: false,
-            });
-        }
-    }
-
-    if let Some((instance_name, flow_id)) = state.split_once(':') {
-        if flow_id.is_empty() {
-            return Err("Hosted OAuth legacy state is missing flow_id".to_string());
-        }
-        return Ok(DecodedHostedOAuthState {
-            flow_id: flow_id.to_string(),
-            instance_name: if instance_name.is_empty() {
-                None
-            } else {
-                Some(instance_name.to_string())
-            },
-            is_legacy: true,
-        });
-    }
-
-    if state.is_empty() {
-        return Err("Hosted OAuth state is empty".to_string());
-    }
-
-    Ok(DecodedHostedOAuthState {
-        flow_id: state.to_string(),
-        instance_name: None,
-        is_legacy: true,
-    })
-}
-
-/// Build the hosted callback state used by the public OAuth callback endpoint.
+/// The NEAR AI platform nginx proxy at `auth.DOMAIN` parses the instance name
+/// from the `state` query parameter (format: `instance:nonce`) to route the
+/// OAuth callback to the correct container.
 ///
-/// New flows emit a versioned opaque envelope, while callback decoding accepts
-/// both the envelope and the legacy `instance:nonce` contract.
+/// Returns the nonce unchanged when `IRONCLAW_INSTANCE_NAME` is not set
+/// (local/non-platform mode).
 pub fn build_platform_state(nonce: &str) -> String {
-    encode_hosted_oauth_state(nonce, current_instance_name().as_deref())
+    let instance = std::env::var("IRONCLAW_INSTANCE_NAME")
+        .or_else(|_| std::env::var("OPENCLAW_INSTANCE_NAME"))
+        .ok()
+        .filter(|v| !v.is_empty());
+    match instance {
+        Some(name) => format!("{}:{}", name, nonce),
+        None => nonce.to_string(),
+    }
 }

 /// Strip the instance prefix from a state parameter to recover the lookup nonce.
@@ -644,62 +517,43 @@ pub fn strip_instance_prefix(state: &str) -> &str {
        .unwrap_or(state)
 }

-pub struct ProxyTokenExchangeRequest<'a> {
-    pub proxy_url: &'a str,
-    pub gateway_token: &'a str,
-    pub token_url: &'a str,
-    pub client_id: &'a str,
-    pub client_secret: Option<&'a str>,
-    pub code: &'a str,
-    pub redirect_uri: &'a str,
-    pub code_verifier: Option<&'a str>,
-    pub access_token_field: &'a str,
-    pub extra_token_params: &'a HashMap<String, String>,
-}
-
 /// Exchange an OAuth authorization code via the platform's token exchange proxy.
 ///
-/// Authenticated via the gateway auth token (Bearer header). The caller may
-/// either rely on proxy-side secret lookup or forward a `client_secret` when
-/// the provider requires it.
+/// The proxy holds `client_secret` server-side so the container never sees it.
+/// Authenticated via the gateway auth token (Bearer header).
 ///
-/// The proxy expects standard OAuth form params plus optional provider-specific
-/// token params and returns a standard token response such as
-/// `{access_token, refresh_token, expires_in}`.
+/// The proxy expects form params `{code, redirect_uri, code_verifier}` and
+/// returns a standard Google token response `{access_token, refresh_token, expires_in}`.
 pub async fn exchange_via_proxy(
-    request: ProxyTokenExchangeRequest<'_>,
+    proxy_url: &str,
+    gateway_token: &str,
+    code: &str,
+    redirect_uri: &str,
+    code_verifier: Option<&str>,
+    access_token_field: &str,
 ) -> Result<OAuthTokenResponse, OAuthCallbackError> {
-    if request.gateway_token.is_empty() {
+    if gateway_token.is_empty() {
        return Err(OAuthCallbackError::Io(
            "Gateway auth token is required for proxy token exchange".to_string(),
        ));
    }
-    let exchange_url = format!("{}/oauth/exchange", request.proxy_url.trim_end_matches('/'));
+    let exchange_url = format!("{}/oauth/exchange", proxy_url.trim_end_matches('/'));

    let client = reqwest::Client::builder()
        .timeout(Duration::from_secs(60))
        .build()
        .map_err(|e| OAuthCallbackError::Io(format!("Failed to build HTTP client: {}", e)))?;
    let mut params = vec![
-        ("code", request.code.to_string()),
-        ("redirect_uri", request.redirect_uri.to_string()),
-        ("token_url", request.token_url.to_string()),
-        ("client_id", request.client_id.to_string()),
-        ("access_token_field", request.access_token_field.to_string()),
+        ("code", code.to_string()),
+        ("redirect_uri", redirect_uri.to_string()),
    ];
-    if let Some(verifier) = request.code_verifier {
+    if let Some(verifier) = code_verifier {
        params.push(("code_verifier", verifier.to_string()));
    }
-    if let Some(secret) = request.client_secret {
-        params.push(("client_secret", secret.to_string()));
-    }
-    for (key, value) in request.extra_token_params {
-        params.push((key.as_str(), value.clone()));
-    }

    let response = client
        .post(&exchange_url)
-        .bearer_auth(request.gateway_token)
+        .bearer_auth(gateway_token)
        .form(&params)
        .send()
        .await
@@ -722,7 +576,7 @@ pub async fn exchange_via_proxy(
        .map_err(|e| OAuthCallbackError::Io(format!("Failed to parse proxy response: {}", e)))?;

    let access_token = token_data
-        .get(request.access_token_field)
+        .get(access_token_field)
        .and_then(|v| v.as_str())
        .ok_or_else(|| {
            let fields: Vec<&str> = token_data
@@ -731,7 +585,7 @@ pub async fn exchange_via_proxy(
                .unwrap_or_default();
            OAuthCallbackError::Io(format!(
                "No '{}' field in proxy response (fields present: {:?})",
-                request.access_token_field, fields
+                access_token_field, fields
            ))
        })?
        .to_string();
@@ -751,10 +605,14 @@ pub async fn exchange_via_proxy(

 #[cfg(test)]
 mod tests {
+    use std::sync::Mutex;
+
    use crate::cli::oauth_defaults::{
        builtin_credentials, callback_host, callback_url, is_loopback_host, landing_html,
    };
-    use crate::config::helpers::ENV_MUTEX;
+
+    /// Serializes env-mutating tests to prevent parallel races.
+    static ENV_MUTEX: Mutex<()> = Mutex::new(());

    #[test]
    fn test_is_loopback_host() {
@@ -1077,7 +935,7 @@ mod tests {

    #[test]
    fn test_build_platform_state_with_instance() {
-        use crate::cli::oauth_defaults::{build_platform_state, decode_hosted_oauth_state};
+        use crate::cli::oauth_defaults::build_platform_state;

        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
        let original = std::env::var("IRONCLAW_INSTANCE_NAME").ok();
@@ -1085,11 +943,7 @@ mod tests {
        unsafe {
            std::env::set_var("IRONCLAW_INSTANCE_NAME", "kind-deer");
        }
-        let encoded = build_platform_state("abc123");
-        let decoded = decode_hosted_oauth_state(&encoded).expect("decode hosted state");
-        assert_eq!(decoded.flow_id, "abc123");
-        assert_eq!(decoded.instance_name.as_deref(), Some("kind-deer"));
-        assert!(!decoded.is_legacy);
+        assert_eq!(build_platform_state("abc123"), "kind-deer:abc123");
        unsafe {
            if let Some(val) = original {
                std::env::set_var("IRONCLAW_INSTANCE_NAME", val);
@@ -1101,7 +955,7 @@ mod tests {

    #[test]
    fn test_build_platform_state_without_instance() {
-        use crate::cli::oauth_defaults::{build_platform_state, decode_hosted_oauth_state};
+        use crate::cli::oauth_defaults::build_platform_state;

        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
        let original = std::env::var("IRONCLAW_INSTANCE_NAME").ok();
@@ -1111,11 +965,7 @@ mod tests {
            std::env::remove_var("IRONCLAW_INSTANCE_NAME");
            std::env::remove_var("OPENCLAW_INSTANCE_NAME");
        }
-        let encoded = build_platform_state("abc123");
-        let decoded = decode_hosted_oauth_state(&encoded).expect("decode hosted state");
-        assert_eq!(decoded.flow_id, "abc123");
-        assert_eq!(decoded.instance_name, None);
-        assert!(!decoded.is_legacy);
+        assert_eq!(build_platform_state("abc123"), "abc123");
        unsafe {
            if let Some(val) = original {
                std::env::set_var("IRONCLAW_INSTANCE_NAME", val);
@@ -1128,7 +978,7 @@ mod tests {

    #[test]
    fn test_build_platform_state_with_openclaw_instance() {
-        use crate::cli::oauth_defaults::{build_platform_state, decode_hosted_oauth_state};
+        use crate::cli::oauth_defaults::build_platform_state;

        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
        let original_ic = std::env::var("IRONCLAW_INSTANCE_NAME").ok();
@@ -1138,11 +988,7 @@ mod tests {
            std::env::remove_var("IRONCLAW_INSTANCE_NAME");
            std::env::set_var("OPENCLAW_INSTANCE_NAME", "quiet-lion");
        }
-        let encoded = build_platform_state("xyz789");
-        let decoded = decode_hosted_oauth_state(&encoded).expect("decode hosted state");
-        assert_eq!(decoded.flow_id, "xyz789");
-        assert_eq!(decoded.instance_name.as_deref(), Some("quiet-lion"));
-        assert!(!decoded.is_legacy);
+        assert_eq!(build_platform_state("xyz789"), "quiet-lion:xyz789");
        unsafe {
            if let Some(val) = original_ic {
                std::env::set_var("IRONCLAW_INSTANCE_NAME", val);
@@ -1171,42 +1017,6 @@ mod tests {
        assert_eq!(strip_instance_prefix(""), "");
    }

-    #[test]
-    fn test_decode_hosted_oauth_state_accepts_legacy_formats() {
-        use crate::cli::oauth_defaults::decode_hosted_oauth_state;
-
-        let decoded = decode_hosted_oauth_state("kind-deer:abc123").expect("legacy prefixed");
-        assert_eq!(decoded.flow_id, "abc123");
-        assert_eq!(decoded.instance_name.as_deref(), Some("kind-deer"));
-        assert!(decoded.is_legacy);
-
-        let decoded = decode_hosted_oauth_state("abc123").expect("legacy raw");
-        assert_eq!(decoded.flow_id, "abc123");
-        assert_eq!(decoded.instance_name, None);
-        assert!(decoded.is_legacy);
-    }
-
-    #[test]
-    fn test_decode_hosted_oauth_state_falls_back_for_non_envelope_ic2_prefix() {
-        use crate::cli::oauth_defaults::decode_hosted_oauth_state;
-
-        let decoded =
-            decode_hosted_oauth_state("ic2.provider-owned-state").expect("prefixed fallback");
-        assert_eq!(decoded.flow_id, "ic2.provider-owned-state");
-        assert_eq!(decoded.instance_name, None);
-        assert!(decoded.is_legacy);
-    }
-
-    #[test]
-    fn test_decode_hosted_oauth_state_rejects_tampered_checksum() {
-        use crate::cli::oauth_defaults::{decode_hosted_oauth_state, encode_hosted_oauth_state};
-
-        let encoded = encode_hosted_oauth_state("abc123", Some("kind-deer"));
-        let tampered = format!("{encoded}broken");
-        let err = decode_hosted_oauth_state(&tampered).expect_err("tampered state should fail");
-        assert!(err.contains("checksum"), "unexpected error: {err}");
-    }
-
    /// Verify that `build_oauth_url` includes the RFC 8707 `resource` parameter
    /// when passed through `extra_params`, which is how MCP OAuth gateway mode
    /// scopes tokens to a specific MCP server.
@@ -292,16 +292,6 @@ async fn list(

 // ── Create ──────────────────────────────────────────────────

-fn cli_notify_config(notify_channel: Option<String>) -> NotifyConfig {
-    NotifyConfig {
-        channel: notify_channel,
-        user: None,
-        on_attention: true,
-        on_failure: true,
-        on_success: false,
-    }
-}
-
 #[allow(clippy::too_many_arguments)]
 async fn create(
    db: &Arc<dyn Database>,
@@ -348,7 +338,13 @@ async fn create(
            max_concurrent: 1,
            dedup_window: None,
        },
-        notify: cli_notify_config(notify_channel),
+        notify: NotifyConfig {
+            channel: notify_channel,
+            user: user_id.to_string(),
+            on_attention: true,
+            on_failure: true,
+            on_success: false,
+        },
        last_run_at: None,
        next_fire_at: next_fire,
        run_count: 0,
@@ -733,14 +729,4 @@ mod tests {
        // Must be valid UTF-8 (would have panicked otherwise).
        assert!(result.is_char_boundary(result.len()));
    }
-
-    #[test]
-    fn cli_notify_config_defaults_to_runtime_target_resolution() {
-        let notify = cli_notify_config(Some("telegram".to_string()));
-        assert_eq!(notify.channel.as_deref(), Some("telegram")); // safety: test-only assertion
-        assert_eq!(notify.user, None); // safety: test-only assertion
-        assert!(notify.on_attention); // safety: test-only assertion
-        assert!(notify.on_failure); // safety: test-only assertion
-        assert!(!notify.on_success); // safety: test-only assertion
-    }
 }
@@ -24,7 +24,6 @@ Commands:
  status      Show system status
  completion  Generate completions
  import      Import from other AI systems
-  login       Authenticate with a provider
  help        Print this message or the help of the given subcommand(s)

 Options:
@@ -23,7 +23,6 @@ Commands:
  logs        View and manage gateway logs
  status      Show system status
  completion  Generate completions
-  login       Authenticate with a provider
  help        Print this message or the help of the given subcommand(s)

 Options:
--- a/Show More
+++ b/Show More