style: fix import ordering for routines module

Co-Authored-By: Claude Opus 4.6 <[email protected]>
refactor(cli): rename cron subcommand to routines
2026-08-28 16:39:31 +00:00 · 2026-03-12 12:50:53 -07:00 · 2026-03-12 12:06:30 -07:00 · 2026-03-12 11:00:16 -07:00 · 2026-03-12 11:00:16 -07:00
169 changed files with 1911 additions and 13307 deletions
@@ -70,12 +70,6 @@ NEARAI_AUTH_URL=https://private.near.ai
 # LLM_BASE_URL=https://api.fireworks.ai/inference/v1
 # LLM_API_KEY=fw_...

-# === MiniMax ===
-# LLM_BACKEND=minimax
-# MINIMAX_API_KEY=...
-# 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 ===
 # LLM_BACKEND=anthropic
 # ANTHROPIC_MODEL=claude-sonnet-4-6
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Pre-push hook: run clippy and tests before pushing.
-# Install: git config core.hooksPath .githooks
-
-echo "pre-push: running clippy..."
-if ! cargo clippy --all --benches --tests --examples --all-features -- -D warnings; then
-    echo ""
-    echo "Push blocked: clippy warnings found."
-    echo "To bypass: git push --no-verify"
-    exit 1
-fi
-
-echo "pre-push: running tests..."
-if ! cargo test; then
-    echo ""
-    echo "Push blocked: tests failed."
-    echo "To bypass: git push --no-verify"
-    exit 1
-fi
-
-echo "pre-push: all checks passed."
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-load_commit_summary() {
-  local range="$1"
-  local max_commits="${2:-50}"
-  local commit_list overflow
-
-  commit_list="$(git log --oneline --no-merges --reverse "${range}" 2>/dev/null || echo "")"
-  if [ -n "${commit_list}" ]; then
-    COMMIT_COUNT="$(printf '%s\n' "${commit_list}" | wc -l | tr -d ' ')"
-    if [ "${COMMIT_COUNT}" -gt "${max_commits}" ]; then
-      COMMIT_MD="$(printf '%s\n' "${commit_list}" | head -n "${max_commits}" | sed 's/^/- /')"
-      overflow=$((COMMIT_COUNT - max_commits))
-      COMMIT_MD+=$'\n'"- ... and ${overflow} more (see compare view)"
-    else
-      COMMIT_MD="$(printf '%s\n' "${commit_list}" | sed 's/^/- /')"
-    fi
-  else
-    COMMIT_COUNT=0
-    COMMIT_MD="- (no non-merge commits in range)"
-  fi
-}
-
-replace_marked_section() {
-  local body_file="$1"
-  local section_file="$2"
-  local section_start="$3"
-  local section_end="$4"
-  local output_file="$5"
-
-  if grep -qF "${section_start}" "${body_file}" && grep -qF "${section_end}" "${body_file}"; then
-    awk -v start="${section_start}" -v end="${section_end}" -v replacement_file="${section_file}" '
-      BEGIN {
-        while ((getline line < replacement_file) > 0) {
-          replacement = replacement line ORS
-        }
-        in_block = 0
-      }
-      $0 == start {
-        printf "%s", replacement
-        in_block = 1
-        next
-      }
-      $0 == end {
-        in_block = 0
-        next
-      }
-      !in_block {
-        print
-      }
-    ' "${body_file}" > "${output_file}"
-  else
-    cp "${body_file}" "${output_file}"
-    if [ -s "${output_file}" ]; then
-      printf '\n\n' >> "${output_file}"
-    fi
-    cat "${section_file}" >> "${output_file}"
-  fi
-}
@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-: "${PR_NUMBER:?PR_NUMBER is required}"
-: "${REPO:?REPO is required}"
-
-MAIN_BRANCH="${MAIN_BRANCH:-main}"
-DRY_RUN="${DRY_RUN:-false}"
-SECTION_START="<!-- staging-promotion-release-summary:start -->"
-SECTION_END="<!-- staging-promotion-release-summary:end -->"
-TMP_DIR="$(mktemp -d)"
-trap 'rm -rf "${TMP_DIR}"' EXIT
-
-# shellcheck source=.github/scripts/pr-body-utils.sh
-source "$(dirname "$0")/pr-body-utils.sh"
-
-gh pr view "${PR_NUMBER}" --repo "${REPO}" --json body > "${TMP_DIR}/pr.json"
-jq -r '.body // ""' < "${TMP_DIR}/pr.json" > "${TMP_DIR}/body.md"
-
-git fetch origin "${MAIN_BRANCH}"
-git fetch origin "+refs/tags/v*:refs/tags/v*"
-
-LAST_TAG="$(git describe --tags --match 'v*' --abbrev=0 "origin/${MAIN_BRANCH}" 2>/dev/null || true)"
-if [ -n "${LAST_TAG}" ]; then
-  RANGE="${LAST_TAG}..origin/${MAIN_BRANCH}"
-  HEADER="## Staging promotion batches since ${LAST_TAG}"
-  EMPTY_MESSAGE="_No structured staging promotion merges found since ${LAST_TAG}._"
-else
-  RANGE="origin/${MAIN_BRANCH}"
-  HEADER="## Staging promotion batches on ${MAIN_BRANCH}"
-  EMPTY_MESSAGE="_No structured staging promotion merges found on ${MAIN_BRANCH}._"
-fi
-
-{
-  echo "${SECTION_START}"
-  echo "${HEADER}"
-  echo
-} > "${TMP_DIR}/section.md"
-
-FOUND_SUMMARY=false
-while IFS= read -r sha; do
-  [ -n "${sha}" ] || continue
-  BODY="$(git show -s --format=%b "${sha}")"
-  if ! printf '%s\n' "${BODY}" | grep -q '^staging-promotion-summary-v1$'; then
-    continue
-  fi
-
-  FOUND_SUMMARY=true
-  SUBJECT="$(git show -s --format=%s "${sha}")"
-  PR_REF="$(printf '%s\n' "${BODY}" | sed -n 's/^promotion-pr: //p' | head -n 1)"
-  COMMIT_COUNT="$(printf '%s\n' "${BODY}" | sed -n 's/^current-commit-count: //p' | head -n 1)"
-  CURRENT_RANGE="$(printf '%s\n' "${BODY}" | sed -n 's/^current-range: //p' | head -n 1)"
-  COMMIT_BLOCK="$(printf '%s\n' "${BODY}" | awk 'capture { print } /^Current commits in this promotion \([0-9]+\):$/ { capture = 1 }')"
-
-  {
-    echo "### ${SUBJECT}"
-    echo
-    if [ -n "${PR_REF}" ]; then
-      echo "**Promotion PR:** ${PR_REF}"
-    fi
-    if [ -n "${COMMIT_COUNT}" ]; then
-      echo "**Commit count:** ${COMMIT_COUNT}"
-    fi
-    if [ -n "${CURRENT_RANGE}" ]; then
-      echo "**Range:** \`${CURRENT_RANGE}\`"
-    fi
-    echo
-    if [ -n "${COMMIT_BLOCK}" ]; then
-      echo "${COMMIT_BLOCK}"
-    else
-      echo "- (no commit summary found)"
-    fi
-    echo
-  } >> "${TMP_DIR}/section.md"
-done < <(git log --merges --reverse --format='%H' "${RANGE}")
-
-if [ "${FOUND_SUMMARY}" = false ]; then
-  {
-    echo "${EMPTY_MESSAGE}"
-    echo
-  } >> "${TMP_DIR}/section.md"
-fi
-
-{
-  echo "*Auto-updated from structured staging promotion merge bodies on ${MAIN_BRANCH}.*"
-  echo "${SECTION_END}"
-} >> "${TMP_DIR}/section.md"
-
-replace_marked_section \
-  "${TMP_DIR}/body.md" \
-  "${TMP_DIR}/section.md" \
-  "${SECTION_START}" \
-  "${SECTION_END}" \
-  "${TMP_DIR}/new-body.md"
-
-if [ "${DRY_RUN}" = "true" ]; then
-  echo "Dry run enabled. Computed PR body for #${PR_NUMBER}:"
-  cat "${TMP_DIR}/new-body.md"
-else
-  gh pr edit "${PR_NUMBER}" --repo "${REPO}" --body-file "${TMP_DIR}/new-body.md"
-fi
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-: "${PR_NUMBER:?PR_NUMBER is required}"
-: "${REPO:?REPO is required}"
-
-MAX_COMMITS="${MAX_COMMITS:-50}"
-DRY_RUN="${DRY_RUN:-false}"
-SECTION_START="<!-- staging-ci-current:start -->"
-SECTION_END="<!-- staging-ci-current:end -->"
-TMP_DIR="$(mktemp -d)"
-trap 'rm -rf "${TMP_DIR}"' EXIT
-
-# shellcheck source=.github/scripts/pr-body-utils.sh
-source "$(dirname "$0")/pr-body-utils.sh"
-
-gh pr view "${PR_NUMBER}" --repo "${REPO}" --json body,baseRefName,headRefName > "${TMP_DIR}/pr.json"
-jq -r '.body // ""' < "${TMP_DIR}/pr.json" > "${TMP_DIR}/body.md"
-BASE="$(jq -r '.baseRefName' < "${TMP_DIR}/pr.json")"
-HEAD="$(jq -r '.headRefName' < "${TMP_DIR}/pr.json")"
-RANGE="origin/${BASE}..origin/${HEAD}"
-
-git fetch origin "${BASE}" "${HEAD}"
-
-load_commit_summary "${RANGE}" "${MAX_COMMITS}"
-
-{
-  echo "${SECTION_START}"
-  echo "### Current commits in this promotion (${COMMIT_COUNT})"
-  echo
-  echo "**Current base:** \`${BASE}\`"
-  echo "**Current head:** \`${HEAD}\`"
-  echo "**Current range:** \`${RANGE}\`"
-  echo
-  echo "${COMMIT_MD}"
-  echo
-  echo "*Auto-updated by staging promotion metadata workflow*"
-  echo "${SECTION_END}"
-} > "${TMP_DIR}/section.md"
-
-replace_marked_section \
-  "${TMP_DIR}/body.md" \
-  "${TMP_DIR}/section.md" \
-  "${SECTION_START}" \
-  "${SECTION_END}" \
-  "${TMP_DIR}/new-body.md"
-
-if [ "${DRY_RUN}" = "true" ]; then
-  echo "Dry run enabled. Computed PR body for #${PR_NUMBER}:"
-  cat "${TMP_DIR}/new-body.md"
-else
-  gh pr edit "${PR_NUMBER}" --repo "${REPO}" --body-file "${TMP_DIR}/new-body.md"
-fi
@@ -78,70 +78,15 @@ jobs:
    - name: Check lints
      run: cargo clippy --all --benches --tests --examples ${{ matrix.flags }} -- -D warnings

-  no-panics:
-    name: No panics in production code
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-    - name: Check for .unwrap(), .expect(), assert!() in production code
-      run: |
-        BASE="${{ github.event.pull_request.base.sha }}"
-        # Get the full diff for .rs files (production only, exclude tests/ directory)
-        DIFF=$(git diff "$BASE"...HEAD -- 'src/**/*.rs' 'crates/**/*.rs' || true)
-
-        if [ -z "$DIFF" ]; then
-          echo "No production Rust changes detected."
-          exit 0
-        fi
-
-        # Extract added lines, skipping those inside test modules.
-        # Track whether we're inside a test module by watching hunk headers
-        # (lines starting with @@) whose context contains "mod tests" or "#[cfg(test)]".
-        ADDED=$(echo "$DIFF" | awk '
-          /^@@/ {
-            # Hunk context (after the second @@) tells us the function/module scope
-            in_test = (tolower($0) ~ /mod tests/ || $0 ~ /#\[cfg\(test\)\]/ || $0 ~ /#\[test\]/)
-          }
-          /^\+[^+]/ && !in_test { print }
-        ' || true)
-
-        if [ -z "$ADDED" ]; then
-          echo "No production Rust changes detected (test-only changes excluded)."
-          exit 0
-        fi
-
-        # Match panic-inducing patterns, excluding safety suppressions
-        VIOLATIONS=$(echo "$ADDED" \
-          | grep -E '\.(unwrap|expect)\(|[^_]assert(_eq|_ne)?!' \
-          | grep -Ev 'debug_assert|// safety:' \
-          || true)
-
-        if [ -n "$VIOLATIONS" ]; then
-          echo "::error::Found .unwrap(), .expect(), or assert!() in production code."
-          echo "Production code must use proper error handling instead of panicking."
-          echo "Suppress false positives with an inline '// safety: <reason>' comment."
-          echo ""
-          echo "$VIOLATIONS" | head -20
-          echo ""
-          COUNT=$(echo "$VIOLATIONS" | wc -l | tr -d ' ')
-          echo "Total: $COUNT violation(s)"
-          exit 1
-        fi
-
-        echo "OK: No panic-inducing calls in changed production code."
-
  # Roll-up job for branch protection
  code-style:
    name: Code Style (fmt + clippy + deny)
    runs-on: ubuntu-latest
    if: always()
-    needs: [format, clippy, clippy-windows, deny-check, no-panics]
+    needs: [format, clippy, clippy-windows, deny-check]
    steps:
      - run: |
-          if [[ "${{ needs.format.result }}" != "success" || "${{ needs.clippy.result }}" != "success" || "${{ needs.deny-check.result }}" != "success" || "${{ needs.no-panics.result }}" != "success" ]]; then
+          if [[ "${{ needs.format.result }}" != "success" || "${{ needs.clippy.result }}" != "success" || "${{ needs.deny-check.result }}" != "success" ]]; then
            echo "One or more jobs failed"
            exit 1
          fi
@@ -48,11 +48,11 @@ jobs:
      matrix:
        include:
          - 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"
+            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"
          - group: features
            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_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"
+            files: "tests/e2e/scenarios/test_extensions.py"
    steps:
      - uses: actions/checkout@v6

@@ -13,11 +13,6 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Fetch PR head and base
-        run: |
-          git fetch origin ${{ github.event.pull_request.base.ref }}
-          git fetch origin pull/${{ github.event.pull_request.number }}/head:pr-head
-
      - name: Check for regression tests
        env:
          PR_TITLE: ${{ github.event.pull_request.title }}
@@ -26,8 +21,6 @@ jobs:
          set -euo pipefail

          BASE_REF="origin/${{ github.event.pull_request.base.ref }}"
-          # Use the actual PR head, not the merge commit that actions/checkout checks out
-          HEAD_REF="pr-head"

          # --- 1. Is this a fix PR? Check title first, then commit messages ---
          IS_FIX=false
@@ -37,7 +30,7 @@ jobs:
          fi

          if [ "$IS_FIX" = false ]; then
-            COMMITS=$(git log --format='%s' "${BASE_REF}..${HEAD_REF}")
+            COMMITS=$(git log --format='%s' "${BASE_REF}..HEAD")
            if grep -qiE '^(fix(\(.*\))?|hotfix|bugfix):' <<< "$COMMITS"; then
              IS_FIX=true
            fi
@@ -56,14 +49,14 @@ jobs:
            exit 0
          fi

-          COMMIT_BODIES=$(git log --format='%B' "${BASE_REF}..${HEAD_REF}")
+          COMMIT_BODIES=$(git log --format='%B' "${BASE_REF}..HEAD")
          if grep -qF '[skip-regression-check]' <<< "$COMMIT_BODIES"; then
            echo "[skip-regression-check] found in commit message — skipping."
            exit 0
          fi

          # --- 3. Exempt static-only / docs-only changes ---
-          CHANGED_FILES=$(git diff --name-only "${BASE_REF}...${HEAD_REF}")
+          CHANGED_FILES=$(git diff --name-only "${BASE_REF}...HEAD")

          if [ -z "$CHANGED_FILES" ]; then
            echo "No changed files — skipping."
@@ -87,13 +80,13 @@ jobs:
          # --- 4. Look for test changes ---

          # Fast path: new test attributes or test modules in added lines.
-          if git diff "${BASE_REF}...${HEAD_REF}" -U0 -- '*.rs' | grep -qE '^\+.*(#\[test\]|#\[tokio::test\]|#\[cfg\(test\)\]|mod tests)'; then
+          if git diff "${BASE_REF}...HEAD" -U0 -- '*.rs' | grep -qE '^\+.*(#\[test\]|#\[tokio::test\]|#\[cfg\(test\)\]|mod tests)'; then
            echo "Test changes found in .rs files."
            exit 0
          fi

          # Whole-function context: detect edits inside existing test functions.
-          if git diff "${BASE_REF}...${HEAD_REF}" -W -- '*.rs' | awk '
+          if git diff "${BASE_REF}...HEAD" -W -- '*.rs' | awk '
            /^@@/           { if (has_test && has_add) { found=1; exit } has_test=0; has_add=0 }
            /^ .*#\[test\]/ || /^ .*#\[tokio::test\]/ || /^ .*#\[cfg\(test\)\]/ || /^ .*mod tests/ { has_test=1 }
            /^\+.*#\[test\]/ || /^\+.*#\[tokio::test\]/ || /^\+.*#\[cfg\(test\)\]/ || /^\+.*mod tests/ { has_test=1 }
@@ -1,44 +0,0 @@
-name: Release-plz Batch Summary
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "release-plz PR number to refresh"
-        required: true
-        type: string
-      dry_run:
-        description: "Compute the body update without editing the PR"
-        required: false
-        type: boolean
-        default: true
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  update-release-pr:
-    if: >
-      (github.event_name == 'pull_request_target' &&
-       github.event.pull_request.head.repo.full_name == github.repository &&
-       startsWith(github.event.pull_request.head.ref, 'release-plz-')) ||
-      github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base branch
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event_name == 'workflow_dispatch' && 'main' || github.event.pull_request.base.ref }}
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Update release-plz PR body with staging batch summary
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event_name == 'workflow_dispatch' && inputs.pr_number || github.event.pull_request.number }}
-          REPO: ${{ github.repository }}
-          DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && inputs.dry_run || 'false' }}
-        run: bash .github/scripts/update-release-plz-body.sh
@@ -58,16 +58,10 @@ jobs:
      - *checkout
      - *install-rust
      - uses: Swatinem/rust-cache@v2
-      - name: Generate GitHub token
-        uses: actions/create-github-app-token@v2
-        id: generate-token
-        with:
-          app-id: ${{ secrets.GH_RELEASES_MANAGER_APP_ID }}
-          private-key: ${{ secrets.GH_RELEASES_MANAGER_APP_PRIVATE_KEY }}
      - name: Run release-plz
        uses: release-plz/[email protected]
        with:
          command: release-pr
        env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
@@ -25,35 +25,9 @@ concurrency:
  cancel-in-progress: false        # Let running suites finish

 jobs:
-  # ── Resolve promotion base branch ───────────────────────────────
-  resolve-promotion-base:
-    name: Resolve promotion base
-    runs-on: ubuntu-latest
-    outputs:
-      promotion_base: ${{ steps.resolve.outputs.promotion_base }}
-    steps:
-      - name: Resolve promotion base
-        id: resolve
-        env:
-          GH_TOKEN: ${{ github.token }}
-          FALLBACK_BRANCH: main
-          REPO: ${{ github.repository }}
-        run: |
-          LATEST=$(gh pr list --repo "${REPO}" --label staging-promotion --state open \
-            --json headRefName,createdAt \
-            --jq '[.[] | select(.headRefName | startswith("staging-promote/"))] | sort_by(.createdAt) | last | .headRefName // empty')
-          if [ -n "$LATEST" ]; then
-            echo "promotion_base=${LATEST}" >> "$GITHUB_OUTPUT"
-            echo "Using open promotion branch as base: ${LATEST}"
-          else
-            echo "promotion_base=${FALLBACK_BRANCH}" >> "$GITHUB_OUTPUT"
-            echo "No open promotion branch found. Using ${FALLBACK_BRANCH}."
-          fi
-
  # ── Check for new commits ──────────────────────────────────────
  check-changes:
    name: Check for new commits
-    needs: resolve-promotion-base
    runs-on: ubuntu-latest
    outputs:
      has_changes: ${{ steps.check.outputs.has_changes }}
@@ -70,7 +44,6 @@ jobs:
        id: check
        env:
          FORCE_RUN: ${{ inputs.force }}
-          PROMOTION_BASE: ${{ needs.resolve-promotion-base.outputs.promotion_base }}
        run: |
          CURRENT_HEAD=$(git rev-parse HEAD)
          echo "current_head=${CURRENT_HEAD}" >> "$GITHUB_OUTPUT"
@@ -92,9 +65,9 @@ jobs:
              echo "Found ${COMMIT_COUNT} new commit(s) since last tested"
              DIFF_RANGE="${LAST_TESTED}..${CURRENT_HEAD}"
            else
-              git fetch origin "${PROMOTION_BASE}"
-              MERGE_BASE=$(git merge-base "origin/${PROMOTION_BASE}" HEAD)
-              echo "First run -- reviewing from merge-base ${MERGE_BASE} against ${PROMOTION_BASE}"
+              git fetch origin main
+              MERGE_BASE=$(git merge-base origin/main HEAD)
+              echo "First run -- reviewing from merge-base ${MERGE_BASE}"
              DIFF_RANGE="${MERGE_BASE}..${CURRENT_HEAD}"
            fi
          fi
@@ -128,7 +101,7 @@ jobs:
  # ── Create promotion PR (triggers claude-review.yml on the PR) ──
  create-promotion-pr:
    name: Create Promotion PR
-    needs: [resolve-promotion-base, check-changes]
+    needs: check-changes
    if: needs.check-changes.outputs.has_changes == 'true'
    runs-on: ubuntu-latest
    outputs:
@@ -156,19 +129,18 @@ jobs:
            echo "token=${{ github.token }}" >> "$GITHUB_OUTPUT"
          fi

-      - name: Check if staging is ahead of target branch
+      - name: Check if staging is ahead of main
        id: ahead-check
        env:
          GH_TOKEN: ${{ steps.token.outputs.token }}
-          PROMOTION_BASE: ${{ needs.resolve-promotion-base.outputs.promotion_base }}
        run: |
-          git fetch origin "${PROMOTION_BASE}"
-          AHEAD=$(git rev-list --count "origin/${PROMOTION_BASE}..origin/staging")
+          git fetch origin main
+          AHEAD=$(git rev-list --count origin/main..origin/staging)
          echo "commits_ahead=${AHEAD}" >> "$GITHUB_OUTPUT"
          if [ "$AHEAD" -eq 0 ]; then
-            echo "Staging is not ahead of ${PROMOTION_BASE}. Nothing to promote."
+            echo "Staging is not ahead of main. Nothing to promote."
          else
-            echo "Staging is ${AHEAD} commits ahead of ${PROMOTION_BASE}."
+            echo "Staging is ${AHEAD} commits ahead of main."
          fi

      - name: Create promotion branch
@@ -182,53 +154,53 @@ jobs:
          echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
          echo "Created promotion branch: ${BRANCH}"

+      - name: Find base branch
+        id: find-base
+        if: steps.ahead-check.outputs.commits_ahead != '0'
+        env:
+          GH_TOKEN: ${{ steps.token.outputs.token }}
+        run: |
+          # Find the newest open promotion PR with a staging-promote/* head branch
+          LATEST=$(gh pr list --label staging-promotion --state open \
+            --json headRefName,createdAt \
+            --jq '[.[] | select(.headRefName | startswith("staging-promote/"))] | sort_by(.createdAt) | last | .headRefName // empty')
+          if [ -n "$LATEST" ]; then
+            echo "base=${LATEST}" >> "$GITHUB_OUTPUT"
+            echo "Chaining onto existing promotion branch: ${LATEST}"
+          else
+            echo "base=main" >> "$GITHUB_OUTPUT"
+            echo "No existing promotion PR — targeting main"
+          fi
+
      - name: Create promotion PR
        id: create-pr
        if: steps.ahead-check.outputs.commits_ahead != '0'
        env:
          GH_TOKEN: ${{ steps.token.outputs.token }}
        run: |
-          source .github/scripts/pr-body-utils.sh
          RANGE="${{ needs.check-changes.outputs.diff_range }}"
          TIMESTAMP=$(date -u +"%Y-%m-%d %H:%M UTC")
          BRANCH="${{ steps.branch.outputs.branch }}"
-          BASE="${{ needs.resolve-promotion-base.outputs.promotion_base }}"
-
-          MAX_COMMITS=50
-          load_commit_summary "${RANGE}" "${MAX_COMMITS}"
-
-          # Build PR body via concatenation to avoid heredoc shell expansion
-          # (commit messages in COMMIT_MD may contain $, backticks, or backslashes)
-          PR_BODY="## Auto-promotion from staging CI"
-          PR_BODY+=$'\n\n'"**Batch range:** \`${RANGE}\`"
-          PR_BODY+=$'\n'"**Promotion branch:** \`${BRANCH}\`"
-          PR_BODY+=$'\n'"**Base:** \`${BASE}\`"
-          PR_BODY+=$'\n'"**Triggered by:** Staging CI batch at ${TIMESTAMP}"
-          PR_BODY+=$'\n\n'"### Commits in this batch (${COMMIT_COUNT}):"
-          PR_BODY+=$'\n'"${COMMIT_MD}"
-          PR_BODY+=$'\n\n'"<!-- staging-ci-current:start -->"
-          PR_BODY+=$'\n'"### Current commits in this promotion (${COMMIT_COUNT})"
-          PR_BODY+=$'\n'
-          PR_BODY+=$'\n'"**Current base:** \`${BASE}\`"
-          PR_BODY+=$'\n'"**Current head:** \`${BRANCH}\`"
-          PR_BODY+=$'\n'"**Current range:** \`origin/${BASE}..origin/${BRANCH}\`"
-          PR_BODY+=$'\n'
-          PR_BODY+=$'\n'"${COMMIT_MD}"
-          PR_BODY+=$'\n'
-          PR_BODY+=$'\n'"*Auto-updated by staging promotion metadata workflow*"
-          PR_BODY+=$'\n'"<!-- staging-ci-current:end -->"
-          PR_BODY+=$'\n\n'"Waiting for gates:"
-          PR_BODY+=$'\n'"- Tests: pending"
-          PR_BODY+=$'\n'"- E2E: pending"
-          PR_BODY+=$'\n'"- Claude Code review: pending (will post comments on this PR)"
-          PR_BODY+=$'\n\n'"---"
-          PR_BODY+=$'\n'"*Auto-created by staging-ci workflow*"
+          BASE="${{ steps.find-base.outputs.base }}"

          PR_URL=$(gh pr create \
            --base "$BASE" \
            --head "$BRANCH" \
-            --title "chore: promote staging to ${BASE} (${TIMESTAMP})" \
-            --body "$PR_BODY" \
+            --title "chore: promote staging to main (${TIMESTAMP})" \
+            --body "## Auto-promotion from staging CI
+
+          **Batch range:** \`${RANGE}\`
+          **Promotion branch:** \`${BRANCH}\`
+          **Base:** \`${BASE}\`
+          **Triggered by:** Staging CI batch at ${TIMESTAMP}
+
+          Waiting for gates:
+          - Tests: pending
+          - E2E: pending
+          - Claude Code review: pending (will post comments on this PR)
+
+          ---
+          *Auto-created by staging-ci workflow*" \
            --label "staging-promotion")

          PR_NUM=$(echo "$PR_URL" | grep -oE '[0-9]+$')
@@ -253,8 +225,7 @@ jobs:
      - uses: actions/checkout@v6
        with:
          ref: staging
-          # Need full history to recompute the final promoted range before merge.
-          fetch-depth: 0
+          fetch-depth: 1

      - name: Generate GitHub App token
        id: app-token
@@ -353,10 +324,8 @@ jobs:
          # Use process substitution so variables propagate to parent shell
          while read -r line; do
            TAG=$(echo "$line" | grep -oE '^\[(CRITICAL|HIGH|MEDIUM|LOW):[0-9]+\]')
-            SEVERITY="${TAG#\[}"
-            SEVERITY="${SEVERITY%%:*}"
-            CONFIDENCE="${TAG##*:}"
-            CONFIDENCE="${CONFIDENCE%\]}"
+            SEVERITY=$(echo "$TAG" | sed 's/\[\(.*\):\(.*\)\]/\1/')
+            CONFIDENCE=$(echo "$TAG" | sed 's/\[\(.*\):\(.*\)\]/\2/')
            DESC=$(echo "$line" | sed "s/\[${SEVERITY}:${CONFIDENCE}\] *//" | head -1)

            echo "Found: [${SEVERITY}:${CONFIDENCE}] ${DESC}"
@@ -448,29 +417,11 @@ jobs:
          GH_TOKEN: ${{ steps.token.outputs.token }}
          PR_NUMBER: ${{ needs.create-promotion-pr.outputs.pr_number }}
        run: |
-          source .github/scripts/pr-body-utils.sh
          if [ -n "$PR_NUMBER" ]; then
            BASE=$(gh pr view "$PR_NUMBER" --json baseRefName --jq '.baseRefName')
            if [ "$BASE" = "main" ]; then
              echo "Merging promotion PR #${PR_NUMBER} (targets main)"
-              TITLE=$(gh pr view "$PR_NUMBER" --json title --jq '.title')
-              HEAD_BRANCH=$(gh pr view "$PR_NUMBER" --json headRefName --jq '.headRefName')
-              git fetch origin "${BASE}" "${HEAD_BRANCH}"
-              CURRENT_RANGE="origin/${BASE}..origin/${HEAD_BRANCH}"
-              MAX_COMMITS=50
-              load_commit_summary "${CURRENT_RANGE}" "${MAX_COMMITS}"
-              {
-                echo "staging-promotion-summary-v1"
-                echo "promotion-pr: #${PR_NUMBER}"
-                echo "base: ${BASE}"
-                echo "head: ${HEAD_BRANCH}"
-                echo "current-range: ${CURRENT_RANGE}"
-                echo "current-commit-count: ${COMMIT_COUNT}"
-                echo ""
-                echo "Current commits in this promotion (${COMMIT_COUNT}):"
-                echo "${COMMIT_MD}"
-              } > /tmp/staging-promotion-merge-body.md
-              gh pr merge "$PR_NUMBER" --merge --subject "#${PR_NUMBER} $TITLE" --body-file /tmp/staging-promotion-merge-body.md
+              gh pr merge "$PR_NUMBER" --merge
              echo "merged=true" >> "$GITHUB_OUTPUT"
            else
              echo "PR #${PR_NUMBER} targets '${BASE}' (not main) — leaving open for chain resolution"
@@ -510,20 +461,18 @@ jobs:
    steps:
      - name: Summary
        run: |
-          {
-            echo "## Staging CI Batch Results"
-            echo ""
-            echo "| Check | Result |"
-            echo "|-------|--------|"
-            echo "| Tests | ${{ needs.tests.result }} |"
-            echo "| E2E | ${{ needs.e2e.result }} |"
-            echo "| Promotion PR | ${{ needs.create-promotion-pr.result }} |"
-            echo "| Gate | ${{ needs.gate.result }} |"
-            echo "| Tag Updated | ${{ needs.update-tag.result }} |"
-            echo ""
-            echo "Range: ${{ needs.check-changes.outputs.diff_range }}"
-            PR_NUM="${{ needs.create-promotion-pr.outputs.pr_number }}"
-            if [ -n "$PR_NUM" ]; then
-              echo "Promotion PR: #${PR_NUM}"
-            fi
-          } >> "$GITHUB_STEP_SUMMARY"
+          echo "## Staging CI Batch Results" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "| Check | Result |" >> "$GITHUB_STEP_SUMMARY"
+          echo "|-------|--------|" >> "$GITHUB_STEP_SUMMARY"
+          echo "| Tests | ${{ needs.tests.result }} |" >> "$GITHUB_STEP_SUMMARY"
+          echo "| E2E | ${{ needs.e2e.result }} |" >> "$GITHUB_STEP_SUMMARY"
+          echo "| Promotion PR | ${{ needs.create-promotion-pr.result }} |" >> "$GITHUB_STEP_SUMMARY"
+          echo "| Gate | ${{ needs.gate.result }} |" >> "$GITHUB_STEP_SUMMARY"
+          echo "| Tag Updated | ${{ needs.update-tag.result }} |" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "Range: ${{ needs.check-changes.outputs.diff_range }}" >> "$GITHUB_STEP_SUMMARY"
+          PR_NUM="${{ needs.create-promotion-pr.outputs.pr_number }}"
+          if [ -n "$PR_NUM" ]; then
+            echo "Promotion PR: #${PR_NUM}" >> "$GITHUB_STEP_SUMMARY"
+          fi
@@ -1,78 +0,0 @@
-name: Staging Promotion Metadata
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "Staging promotion PR number to refresh"
-        required: true
-        type: string
-      dry_run:
-        description: "Compute the body update without editing the PR"
-        required: false
-        type: boolean
-        default: true
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  refresh-single-pr:
-    if: >
-      (github.event_name == 'pull_request_target' &&
-       github.event.pull_request.head.repo.full_name == github.repository &&
-       startsWith(github.event.pull_request.head.ref, 'staging-promote/')) ||
-      github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout workflow source
-        uses: actions/checkout@v6
-        with:
-          # For chained promotion PRs, the script lives on the trusted PR head,
-          # not necessarily on the older promotion branch used as the PR base.
-          ref: ${{ github.event_name == 'workflow_dispatch' && 'main' || github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Refresh staging promotion PR body
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event_name == 'workflow_dispatch' && inputs.pr_number || github.event.pull_request.number }}
-          REPO: ${{ github.repository }}
-          DRY_RUN: ${{ github.event_name == 'workflow_dispatch' && inputs.dry_run || 'false' }}
-        run: bash .github/scripts/update-staging-promotion-body.sh
-
-  refresh-open-prs-after-main-push:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout main
-        uses: actions/checkout@v6
-        with:
-          ref: main
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Refresh all open staging promotion PR bodies
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-        run: |
-          # ubuntu-latest uses bash 5.x, so mapfile is available here.
-          mapfile -t prs < <(gh pr list --repo "${REPO}" --label staging-promotion --state open \
-            --json number,headRefName \
-            --jq '.[] | select(.headRefName | startswith("staging-promote/")) | .number')
-          if [ "${#prs[@]}" -eq 0 ]; then
-            echo "No open staging promotion PRs to refresh."
-            exit 0
-          fi
-          for pr in "${prs[@]}"; do
-            echo "Refreshing staging promotion PR #${pr}"
-            PR_NUMBER="${pr}" bash .github/scripts/update-staging-promotion-body.sh
-          done
@@ -14,10 +14,6 @@

 target/

-# Python
-__pycache__/
-*.pyc
-
 # Benchmark results (local runs, not committed)
 bench-results/

@@ -7,15 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

-## [0.18.0](https://github.com/nearai/ironclaw/compare/v0.17.0...v0.18.0) - 2026-03-11
-
-### Other
-
- Merge pull request #907 from nearai/staging-promote/b0214fef-22930316561
- promote staging to main (2026-03-10 15:19 UTC) ([#865](https://github.com/nearai/ironclaw/pull/865))
- Merge pull request #830 from nearai/staging-promote/3a2989d0-22888378864
- update WASM artifact SHA256 checksums [skip ci] ([#876](https://github.com/nearai/ironclaw/pull/876))
-
 ## [0.17.0](https://github.com/nearai/ironclaw/compare/v0.16.1...v0.17.0) - 2026-03-10

 ### Added
@@ -3350,7 +3350,7 @@ dependencies = [

 [[package]]
 name = "ironclaw"
-version = "0.18.0"
+version = "0.17.0"
 dependencies = [
 "aes-gcm",
 "aho-corasick",
@@ -20,7 +20,7 @@ exclude = [

 [package]
 name = "ironclaw"
-version = "0.18.0"
+version = "0.17.0"
 edition = "2024"
 rust-version = "1.92"
 description = "Secure personal AI assistant that protects your data and expands its capabilities on the fly"
@@ -19,7 +19,6 @@ WORKDIR /app

 # Copy manifests first for layer caching
 COPY Cargo.toml Cargo.lock ./
-COPY crates/ crates/

 # Copy source, build script, tests, and supporting directories
 COPY build.rs build.rs
@@ -20,7 +20,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /app

 COPY Cargo.toml Cargo.lock ./
-COPY crates/ crates/
 COPY build.rs build.rs
 COPY src/ src/
 COPY tests/ tests/
@@ -132,7 +132,7 @@ fn embed_registry_catalog(root: &Path) {
        // No registry dir: write empty catalog
        fs::write(
            &out_path,
-            r#"{"tools":[],"channels":[],"mcp_servers":[],"bundles":{"bundles":{}}}"#,
+            r#"{"tools":[],"channels":[],"bundles":{"bundles":{}}}"#,
        )
        .unwrap();
        return;
@@ -140,7 +140,6 @@ fn embed_registry_catalog(root: &Path) {

    let mut tools = Vec::new();
    let mut channels = Vec::new();
-    let mut mcp_servers = Vec::new();

    // Collect tool manifests
    let tools_dir = registry_dir.join("tools");
@@ -154,12 +153,6 @@ fn embed_registry_catalog(root: &Path) {
        collect_json_files(&channels_dir, &mut channels);
    }

-    // Collect MCP server manifests
-    let mcp_servers_dir = registry_dir.join("mcp-servers");
-    if mcp_servers_dir.is_dir() {
-        collect_json_files(&mcp_servers_dir, &mut mcp_servers);
-    }
-
    // Read bundles
    let bundles_path = registry_dir.join("_bundles.json");
    let bundles_raw = if bundles_path.is_file() {
@@ -170,10 +163,9 @@ fn embed_registry_catalog(root: &Path) {

    // Build the combined JSON
    let catalog = format!(
-        r#"{{"tools":[{}],"channels":[{}],"mcp_servers":[{}],"bundles":{}}}"#,
+        r#"{{"tools":[{}],"channels":[{}],"bundles":{}}}"#,
        tools.join(","),
        channels.join(","),
-        mcp_servers.join(","),
        bundles_raw,
    );

@@ -20,162 +20,33 @@ version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"

-[[package]]
-name = "base64ct"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
-
 [[package]]
 name = "bitflags"
 version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"

-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "rustc_version",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "der"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "discord-channel"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
- "ed25519-dalek",
- "hex",
 "serde",
 "serde_json",
 "wit-bindgen",
 ]

-[[package]]
-name = "ed25519"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
-dependencies = [
- "pkcs8",
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "serde",
- "sha2",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

-[[package]]
-name = "fiat-crypto"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -197,12 +68,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "id-arena"
 version = "2.3.0"
@@ -233,12 +98,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"

-[[package]]
-name = "libc"
-version = "0.2.182"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
-
 [[package]]
 name = "log"
 version = "0.4.29"
@@ -257,16 +116,6 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der",
- "spki",
-]
-
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -295,15 +144,6 @@ dependencies = [
 "proc-macro2",
 ]

-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.27"
@@ -353,23 +193,6 @@ dependencies = [
 "zmij",
 ]

-[[package]]
-name = "sha2"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-
 [[package]]
 name = "smallvec"
 version = "1.15.1"
@@ -385,22 +208,6 @@ dependencies = [
 "smallvec",
 ]

-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
 [[package]]
 name = "syn"
 version = "2.0.117"
@@ -412,12 +219,6 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "typenum"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
@@ -593,12 +394,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "zeroize"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
-
 [[package]]
 name = "zmij"
 version = "1.0.21"
@@ -10,8 +10,6 @@ publish = false
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 wit-bindgen = "0.36"
-ed25519-dalek = { version = "2", default-features = false, features = ["alloc", "fast", "zeroize"] }
-hex = "0.4"

 [lib]
 crate-type = ["cdylib"]
@@ -21,10 +21,11 @@ WASM channel for Discord integration - handle slash commands and button interact
   ironclaw secret set discord_bot_token YOUR_BOT_TOKEN
   ```

-   **Note:** The `discord_bot_token` secret is used for Discord REST API calls.
-   Interaction signature verification is performed inside the Discord channel
-   module and uses the channel config field `webhook_secret` (set this to your
-   Discord app public key hex).
+   **Note:** The `discord_bot_token` secret is the only value read directly by this
+   Discord channel WASM component. The `discord_app_id` and `discord_public_key`
+   secrets are used by the IronClaw host (for example, to verify Discord
+   interaction signatures and manage slash command registration) and are not
+   accessed from the WASM module itself.

 ## Discord Configuration

@@ -86,30 +87,6 @@ If an internal error occurs (e.g., metadata serialization failure), the tool att
 Check the host logs for detailed error information.

 ## Advanced Usage
-### Mention Polling
-
-The Discord channel can also poll configured channels for `@bot` mentions.
-
-Example channel config:
-
-```json
-{
-  "require_signature_verification": true,
-  "webhook_secret": "YOUR_DISCORD_PUBLIC_KEY_HEX",
-  "polling_enabled": true,
-  "poll_interval_ms": 30000,
-  "mention_channel_ids": ["123456789012345678"],
-  "owner_id": null,
-  "dm_policy": "pairing",
-  "allow_from": []
-}
-```
-
-### Access Control
-
- `owner_id`: when set, only that Discord user can interact with the bot.
- `dm_policy`: `open` allows all DMs; `pairing` requires approval.
- `allow_from`: allowlist entries for DM pairing checks (`*`, user id, or username).

 ### Embeds

@@ -119,11 +96,8 @@ To send embeds, include an `embeds` array in the `metadata_json` field of the ag

 ### "Invalid Signature"

- Check that `webhook_secret` is set to your Discord app public key hex in the
-  Discord channel config.
- Validation happens inside the Discord WASM channel.
- If `require_signature_verification` is `true` and `webhook_secret` is empty,
-  the channel returns HTTP `500` with a configuration error.
+- Check that `discord_public_key` is set correctly in IronClaw secrets.
+- This validation happens on the host before reaching the WASM.

 ### "401 Unauthorized"

@@ -3,7 +3,7 @@
  "wit_version": "0.3.0",
  "type": "channel",
  "name": "discord",
-  "description": "Discord webhook channel for slash commands, components, and optional mention polling",
+  "description": "Discord Gateway/Webhook channel for handling slash commands, buttons, and messages",
  "setup": {
    "required_secrets": [
      {
@@ -41,7 +41,7 @@
    },
    "channel": {
      "allowed_paths": ["/webhook/discord"],
-      "allow_polling": true,
+      "allow_polling": false,
      "callback_timeout_secs": 45,
      "workspace_prefix": "channels/discord/",
      "emit_rate_limit": {
@@ -55,12 +55,8 @@
  },
  "config": {
    "require_signature_verification": true,
-    "webhook_secret": null,
-    "polling_enabled": false,
-    "poll_interval_ms": 30000,
-    "mention_channel_ids": [],
    "owner_id": null,
    "dm_policy": "pairing",
    "allow_from": []
  }
-}
+}
@@ -6,12 +6,6 @@ rust-version = "1.92"
 description = "Prompt injection defense, input validation, secret leak detection, and safety policy enforcement"
 authors = ["NEAR AI <[email protected]>"]
 license = "MIT OR Apache-2.0"
-homepage = "https://github.com/nearai/ironclaw"
-repository = "https://github.com/nearai/ironclaw"
-publish = false
-
-[package.metadata.dist]
-dist = false

 [dependencies]
 aho-corasick = "1"
@@ -1,10 +1,5 @@
 # WARNING: Replace all CHANGE_ME values before deploying.
 # Do not use placeholder passwords in production.
-
-# Pin the Docker image version for deterministic deployments.
-# Update this value when deploying a new release.
-# IRONCLAW_VERSION=v1.0.0
-
 DATABASE_URL=postgres://ironclaw:CHANGE_ME@localhost:5432/ironclaw

 # NEAR AI Cloud (API key auth, Chat Completions API)
@@ -5,17 +5,13 @@ Requires=cloud-sql-proxy.service

 [Service]
 Type=simple
-EnvironmentFile=/opt/ironclaw/.env
-# Pin to a specific version tag or digest instead of :latest to prevent
-# uncontrolled deployments. Update IRONCLAW_VERSION in /opt/ironclaw/.env
-# or replace the tag below when deploying a new release.
-ExecStartPre=/bin/bash -c 'docker pull us-central1-docker.pkg.dev/ironclaw-prod/ironclaw/agent:${IRONCLAW_VERSION:-latest}'
-ExecStart=/bin/bash -c 'docker run --rm \
+ExecStartPre=/usr/bin/docker pull us-central1-docker.pkg.dev/ironclaw-prod/ironclaw/agent:latest
+ExecStart=/usr/bin/docker run --rm \
  --name ironclaw \
  --env-file /opt/ironclaw/.env \
-  -p 3000:3000 \
-  us-central1-docker.pkg.dev/ironclaw-prod/ironclaw/agent:${IRONCLAW_VERSION:-latest} \
-  --no-onboard'
+  --network=host \
+  us-central1-docker.pkg.dev/ironclaw-prod/ironclaw/agent:latest \
+  --no-onboard
 ExecStop=/usr/bin/docker stop ironclaw
 Restart=always
 RestartSec=10
@@ -24,15 +24,8 @@ systemctl enable docker
 systemctl start docker

 echo "==> Installing Cloud SQL Auth Proxy"
-CLOUD_SQL_PROXY_VERSION="v2.14.3"
-CLOUD_SQL_PROXY_SHA256="75e7cc1f158ab6f97b7810e9d8419c55735cff40bc56d4f19673adfdf2406a59"
 curl -fsSL -o /usr/local/bin/cloud-sql-proxy \
-  "https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/${CLOUD_SQL_PROXY_VERSION}/cloud-sql-proxy.linux.amd64"
-echo "${CLOUD_SQL_PROXY_SHA256}  /usr/local/bin/cloud-sql-proxy" | sha256sum -c - || {
-  echo "ERROR: Cloud SQL Auth Proxy checksum verification failed -- aborting"
-  rm -f /usr/local/bin/cloud-sql-proxy
-  exit 1
-}
+  https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.14.3/cloud-sql-proxy.linux.amd64
 chmod +x /usr/local/bin/cloud-sql-proxy

 echo "==> Installing systemd services"
@@ -15,7 +15,6 @@ 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.5 models |
 | Cloudflare Workers AI | `cloudflare` | `CLOUDFLARE_API_KEY` | Access to Workers AI |
 | Ollama | `ollama` | No | Local inference |
 | AWS Bedrock | `bedrock` | AWS credentials | Native Converse API |
@@ -75,25 +74,6 @@ Pull a model first: `ollama pull llama3.2`

 ---

-## MiniMax
-
-[MiniMax](https://platform.minimax.io) provides high-performance language models with 204,800 token context windows.
-
-```env
-LLM_BACKEND=minimax
-MINIMAX_API_KEY=...
-```
-
-Available models: `MiniMax-M2.5` (default), `MiniMax-M2.5-highspeed`
-
-To use the China mainland endpoint, set:
-
-```env
-MINIMAX_BASE_URL=https://api.minimaxi.com/v1
-```
-
---
-
 ## AWS Bedrock (requires `--features bedrock`)

 Uses the native AWS Converse API via `aws-sdk-bedrockruntime`. Supports standard AWS
@@ -382,27 +382,6 @@
      "can_list_models": true
    }
  },
-  {
-    "id": "minimax",
-    "aliases": [
-      "mini_max"
-    ],
-    "protocol": "open_ai_completions",
-    "default_base_url": "https://api.minimax.io/v1",
-    "api_key_env": "MINIMAX_API_KEY",
-    "api_key_required": true,
-    "base_url_env": "MINIMAX_BASE_URL",
-    "model_env": "MINIMAX_MODEL",
-    "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",
-      "key_url": "https://platform.minimax.io",
-      "display_name": "MiniMax",
-      "can_list_models": false
-    }
-  },
  {
    "id": "cloudflare",
    "aliases": [
@@ -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.18.0/discord-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "efa1b9019fa33e243f8db1e1fcc732731d45836336bdd26ca19b6fe227ca8b69"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/discord-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/slack-0.2.1-wasm32-wasip2.tar.gz",
-      "sha256": "d4667e35126986509d862bc3a0088777305d8f41c75de83c1e223b42312ede48"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/slack-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -2,7 +2,7 @@
  "name": "telegram",
  "display_name": "Telegram Channel",
  "kind": "channel",
-  "version": "0.2.3",
+  "version": "0.2.2",
  "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.18.0/telegram-0.2.3-wasm32-wasip2.tar.gz",
-      "sha256": "b9a83d5a2d1285ce0ec116b354336a1f245f893291ccb01dffbcaccf89d72aed"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/telegram-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/whatsapp-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "feb9194719d9bed796b070ab4dc30348dbfb5d3dec56f9f21e02d14137abab01"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/whatsapp-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -1,9 +0,0 @@
-{
-  "name": "asana",
-  "display_name": "Asana",
-  "kind": "mcp_server",
-  "description": "Connect to Asana for task management, projects, and team coordination",
-  "keywords": ["tasks", "projects", "management", "team"],
-  "url": "https://mcp.asana.com/v2/mcp",
-  "auth": "dcr"
-}
@@ -1,9 +0,0 @@
-{
-  "name": "cloudflare",
-  "display_name": "Cloudflare",
-  "kind": "mcp_server",
-  "description": "Connect to Cloudflare for DNS, Workers, KV, and infrastructure management",
-  "keywords": ["cdn", "dns", "workers", "hosting", "infrastructure"],
-  "url": "https://mcp.cloudflare.com/mcp",
-  "auth": "dcr"
-}
@@ -1,9 +0,0 @@
-{
-  "name": "intercom",
-  "display_name": "Intercom",
-  "kind": "mcp_server",
-  "description": "Connect to Intercom for customer messaging, support, and engagement",
-  "keywords": ["support", "customers", "messaging", "chat", "helpdesk"],
-  "url": "https://mcp.intercom.com/mcp",
-  "auth": "dcr"
-}
@@ -1,9 +0,0 @@
-{
-  "name": "linear",
-  "display_name": "Linear",
-  "kind": "mcp_server",
-  "description": "Connect to Linear for issue tracking, project management, and team workflows",
-  "keywords": ["issues", "tickets", "project", "tracking", "bugs"],
-  "url": "https://mcp.linear.app/sse",
-  "auth": "dcr"
-}
@@ -1,9 +0,0 @@
-{
-  "name": "notion",
-  "display_name": "Notion",
-  "kind": "mcp_server",
-  "description": "Connect to Notion for reading and writing pages, databases, and comments",
-  "keywords": ["notes", "wiki", "docs", "pages", "database"],
-  "url": "https://mcp.notion.com/mcp",
-  "auth": "dcr"
-}
@@ -1,9 +0,0 @@
-{
-  "name": "sentry",
-  "display_name": "Sentry",
-  "kind": "mcp_server",
-  "description": "Connect to Sentry for error tracking, performance monitoring, and debugging",
-  "keywords": ["errors", "monitoring", "debugging", "crashes", "performance"],
-  "url": "https://mcp.sentry.dev/mcp",
-  "auth": "dcr"
-}
@@ -1,9 +0,0 @@
-{
-  "name": "stripe",
-  "display_name": "Stripe",
-  "kind": "mcp_server",
-  "description": "Connect to Stripe for payment processing, subscriptions, and financial data",
-  "keywords": ["payments", "billing", "subscriptions", "invoices", "finance"],
-  "url": "https://mcp.stripe.com",
-  "auth": "dcr"
-}
@@ -19,8 +19,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/github-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "da9fac56b6f20197a415489bbaec9fefb085a5cf6324cab79ea48a47eb19c13b"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/github-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/gmail-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "ee9574e02e92bc1d481f1310eb88afd99ee52bf6971074ab33bd76bf99b34b1d"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/gmail-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/google-calendar-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "2fa47150ea222e787c122182ad6f4dfa2ffaf5fe490d05e8de887a76445f8d2d"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/google-calendar-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/google-docs-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "40e134a1c1564f832ca861c3396895d4e33ec67b99313fc1f97baf8d971423a9"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/google-docs-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/google-drive-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "002a341a1d58125563a7c69561b26fbc2629b04ea723cade744102bdc0fbb71f"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/google-drive-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/google-sheets-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "8aa2c9d52f033edea3a6c2311b0ec694ccb6d0a54ef07e94d72bf8be1ce8009a"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/google-sheets-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -17,8 +17,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/google-slides-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "e931a97d4fd0b0b938e464dc7c7f2be6ea6b4d1508f5ea3cd931d44db23f05f5"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/google-slides-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -1,41 +0,0 @@
-{
-  "name": "llm-context",
-  "display_name": "LLM Context",
-  "kind": "tool",
-  "version": "0.1.0",
-  "wit_version": "0.3.0",
-  "description": "Fetch pre-extracted web content from Brave Search for grounding LLM answers (RAG, fact-checking)",
-  "keywords": [
-    "search",
-    "web",
-    "brave",
-    "rag",
-    "grounding",
-    "llm",
-    "context"
-  ],
-  "source": {
-    "dir": "tools-src/llm-context",
-    "capabilities": "llm-context-tool.capabilities.json",
-    "crate_name": "llm-context-tool"
-  },
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/latest/download/llm-context-wasm32-wasip2.tar.gz",
-      "sha256": "581cc5867ef3b75116b7ddc8161e63dd92befe2b53e6ad8213c007639aa243c3"
-    }
-  },
-  "auth_summary": {
-    "method": "manual",
-    "provider": "Brave",
-    "secrets": [
-      "brave_api_key"
-    ],
-    "shared_auth": "Same API key as Web Search tool (brave_api_key)",
-    "setup_url": "https://brave.com/search/api/"
-  },
-  "tags": [
-    "default",
-    "search"
-  ]
-}
@@ -17,8 +17,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/slack-0.2.1-wasm32-wasip2.tar.gz",
-      "sha256": "d4667e35126986509d862bc3a0088777305d8f41c75de83c1e223b42312ede48"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/slack-tool-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -18,8 +18,8 @@
  },
  "artifacts": {
    "wasm32-wasip2": {
-      "url": "https://github.com/nearai/ironclaw/releases/download/v0.18.0/telegram-0.2.2-wasm32-wasip2.tar.gz",
-      "sha256": "b9a83d5a2d1285ce0ec116b354336a1f245f893291ccb01dffbcaccf89d72aed"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/telegram-mtproto-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "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.18.0/web-search-0.2.0-wasm32-wasip2.tar.gz",
-      "sha256": "56834573c54ea2a33cea1eb0f04bbdf59f1ef8d8702995cf431b0921302eeccc"
+      "url": "https://github.com/nearai/ironclaw/releases/latest/download/web-search-wasm32-wasip2.tar.gz",
+      "sha256": null
    }
  },
  "auth_summary": {
@@ -1,6 +1,2 @@
 [workspace]
 git_release_enable = false
-
-[[package]]
-name = "ironclaw_safety"
-release = false
@@ -70,21 +70,19 @@ echo
 # This is a WARNING, not a hard violation.
 # --------------------------------------------------------------------------

-echo "--- Check 2: .unwrap() / .expect() / assert!() in production code ---"
+echo "--- Check 2: .unwrap() / .expect() in production code ---"

-# Collect raw matches excluding obvious test-only files and lines.
-# Also catches assert!(), assert_eq!(), assert_ne!() but NOT debug_assert variants.
-raw_results=$(grep -rnE '\.(unwrap|expect)\(|[^_]assert(_eq|_ne)?!' src/ \
+# Collect raw matches excluding obvious test-only files and lines
+raw_results=$(grep -rn '\.unwrap()\|\.expect(' src/ \
    --include='*.rs' \
    | grep -v 'src/main.rs' \
    | grep -v 'src/testing.rs' \
    | grep -v 'src/setup/' \
-    | grep -Ev 'debug_assert|// safety:' \
    || true)

 if [ -n "$raw_results" ]; then
    total=$(echo "$raw_results" | wc -l | tr -d ' ')
-    echo "WARNING: ~$total .unwrap()/.expect()/assert!() calls found in src/ (excluding main/testing/setup)."
+    echo "WARNING: ~$total .unwrap()/.expect() calls found in src/ (excluding main/testing/setup)."
    echo "Many are in test modules; a per-file breakdown helps triage:"
    echo
    # Show per-file counts, sorted by count descending, top 15
@@ -10,7 +10,6 @@
 #   3. Hardcoded /tmp paths in tests (flaky in parallel runs)
 #   4. Tool parameters logged without redaction (secret leaks)
 #   5. Multi-step DB operations without transaction wrapping
-#   6. .unwrap(), .expect(), assert!() in production code (panics)
 #
 # Suppress individual lines with an inline "// safety: <reason>" comment.

@@ -129,24 +128,6 @@ if [ -n "$DIFF_W_OUTPUT" ]; then
    fi
 fi

-# 6. .unwrap(), .expect(), assert!() in production code
-#    Matches added lines containing panic-inducing calls.
-#    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)
-if echo "$PROD_DIFF" | grep -nE '^\+' \
-    | grep -E '\.(unwrap|expect)\(|[^_]assert(_eq|_ne)?!' \
-    | grep -vE 'debug_assert|// safety:|#\[cfg\(test\)\]|#\[test\]|mod tests' \
-    | head -5 | grep -q .; then
-    warn "PANIC" "Production code must not use .unwrap(), .expect(), or assert!(). Use proper error handling."
-    echo "$PROD_DIFF" | grep -nE '^\+' \
-        | grep -E '\.(unwrap|expect)\(|[^_]assert(_eq|_ne)?!' \
-        | grep -vE 'debug_assert|// safety:|#\[cfg\(test\)\]|#\[test\]|mod tests' \
-        | head -5 | sed 's/^/    /'
-fi
-
 if [ "$WARNINGS" -gt 0 ]; then
    echo ""
    echo "Found $WARNINGS potential issue(s). Fix them or add '// safety: <reason>' to suppress."
@@ -18,7 +18,7 @@ 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};
-use crate::channels::{ChannelManager, IncomingMessage, OutgoingResponse};
+use crate::channels::{ChannelManager, IncomingMessage, OutgoingResponse, StatusUpdate};
 use crate::config::{AgentConfig, HeartbeatConfig, RoutineConfig, SkillsConfig};
 use crate::context::ContextManager;
 use crate::db::Database;
@@ -936,10 +936,29 @@ impl Agent {
            SubmissionResult::Ok { message } => Ok(message),
            SubmissionResult::Error { message } => Ok(Some(format!("Error: {}", message))),
            SubmissionResult::Interrupted => Ok(Some("Interrupted.".into())),
-            SubmissionResult::NeedApproval { .. } => {
-                // ApprovalNeeded status was already sent by thread_ops.rs before
-                // returning this result. Empty string signals the caller to skip
-                // respond() (no duplicate text).
+            SubmissionResult::NeedApproval {
+                request_id,
+                tool_name,
+                description,
+                parameters,
+            } => {
+                // Each channel renders the approval prompt via send_status.
+                // Web gateway shows an inline card, REPL prints a formatted prompt, etc.
+                let _ = self
+                    .channels
+                    .send_status(
+                        &message.channel,
+                        StatusUpdate::ApprovalNeeded {
+                            request_id: request_id.to_string(),
+                            tool_name,
+                            description,
+                            parameters,
+                        },
+                        &message.metadata,
+                    )
+                    .await;
+
+                // Empty string signals the caller to skip respond() (no duplicate text)
                Ok(Some(String::new()))
            }
        }
@@ -152,30 +152,6 @@ pub async fn run_agentic_loop(
        // Call LLM
        let output = delegate.call_llm(reasoning, reason_ctx, iteration).await?;

-        match &output.result {
-            RespondResult::Text(text) => {
-                tracing::debug!(
-                    iteration,
-                    len = text.len(),
-                    has_suggestions = text.contains("<suggestions>"),
-                    response = %text,
-                    "LLM text response"
-                );
-            }
-            RespondResult::ToolCalls {
-                tool_calls,
-                content,
-            } => {
-                let names: Vec<&str> = tool_calls.iter().map(|tc| tc.name.as_str()).collect();
-                tracing::debug!(
-                    iteration,
-                    tools = ?names,
-                    has_content = content.is_some(),
-                    "LLM tool_calls response"
-                );
-            }
-        }
-
        match output.result {
            RespondResult::Text(text) => {
                // Tool intent nudge: if the LLM says "let me search..." without
@@ -554,31 +554,6 @@ impl<'a> LoopDelegate for ChatDelegate<'a> {
                };

                if needs_approval {
-                    // In non-DM relay channels, auto-deny approval-
-                    // requiring tools to prevent stuck AwaitingApproval
-                    // state and prompt injection from other users.
-                    let is_relay = self.message.channel.ends_with("-relay");
-                    let is_dm = self
-                        .message
-                        .metadata
-                        .get("event_type")
-                        .and_then(|v| v.as_str())
-                        == Some("direct_message");
-                    if is_relay && !is_dm {
-                        tracing::info!(
-                            tool = %tc.name,
-                            channel = %self.message.channel,
-                            "Auto-denying approval-requiring tool in non-DM relay channel"
-                        );
-                        let reject_msg = format!(
-                            "Tool '{}' requires approval and cannot run in shared channels. \
-                             Ask the user to message me directly (DM) to use this tool.",
-                            tc.name
-                        );
-                        preflight.push((tc, PreflightOutcome::Rejected(reject_msg)));
-                        continue;
-                    }
-
                    approval_needed = Some((idx, tc, tool));
                    break;
                }
@@ -1051,54 +1026,6 @@ fn strip_internal_tool_call_text(text: &str) -> String {
    }
 }

-/// Extract `<suggestions>["...","..."]</suggestions>` from a response string.
-///
-/// Returns `(cleaned_text, suggestions)`. The `<suggestions>` block is stripped
-/// from the text regardless of whether the JSON inside parses successfully.
-/// Only the **last** `<suggestions>` block is used (closest to end of response).
-/// Blocks inside markdown code fences are ignored.
-pub(crate) fn extract_suggestions(text: &str) -> (String, Vec<String>) {
-    use regex::Regex;
-    use std::sync::LazyLock;
-
-    static RE: LazyLock<Regex> = LazyLock::new(|| {
-        Regex::new(r"(?s)<suggestions>\s*(.*?)\s*</suggestions>").expect("valid regex") // safety: constant pattern
-    });
-
-    // Find the position of the last closing code fence to avoid matching inside code blocks
-    let last_code_fence = text.rfind("```").unwrap_or(0);
-
-    // Find all matches, take the last one that's after the last code fence
-    let mut best_match: Option<regex::Match<'_>> = None;
-    let mut best_capture: Option<String> = None;
-    for caps in RE.captures_iter(text) {
-        if let (Some(full), Some(inner)) = (caps.get(0), caps.get(1))
-            && full.start() >= last_code_fence
-        {
-            best_match = Some(full);
-            best_capture = Some(inner.as_str().to_string());
-        }
-    }
-
-    let Some(full) = best_match else {
-        return (text.to_string(), Vec::new());
-    };
-
-    let cleaned = format!("{}{}", &text[..full.start()], &text[full.end()..]); // safety: regex match boundaries are valid UTF-8
-    let cleaned = cleaned.trim().to_string();
-
-    // Parse the JSON array
-    let suggestions = best_capture
-        .and_then(|json| serde_json::from_str::<Vec<String>>(&json).ok())
-        .unwrap_or_default()
-        .into_iter()
-        .filter(|s| !s.trim().is_empty() && s.len() <= 80)
-        .take(3)
-        .collect();
-
-    (cleaned, suggestions)
-}
-
 #[cfg(test)]
 mod tests {
    use std::sync::Arc;
@@ -2245,55 +2172,6 @@ mod tests {
        assert_eq!(result, input);
    }

-    #[test]
-    fn test_extract_suggestions_basic() {
-        let input = "Here is my answer.\n<suggestions>[\"Check logs\", \"Deploy\"]</suggestions>";
-        let (text, suggestions) = super::extract_suggestions(input);
-        assert_eq!(text, "Here is my answer."); // safety: test
-        assert_eq!(suggestions, vec!["Check logs", "Deploy"]); // safety: test
-    }
-
-    #[test]
-    fn test_extract_suggestions_no_tag() {
-        let input = "Just a plain response.";
-        let (text, suggestions) = super::extract_suggestions(input);
-        assert_eq!(text, "Just a plain response."); // safety: test
-        assert!(suggestions.is_empty()); // safety: test
-    }
-
-    #[test]
-    fn test_extract_suggestions_malformed_json() {
-        let input = "Answer.\n<suggestions>not json</suggestions>";
-        let (text, suggestions) = super::extract_suggestions(input);
-        assert_eq!(text, "Answer."); // safety: test
-        assert!(suggestions.is_empty()); // safety: test
-    }
-
-    #[test]
-    fn test_extract_suggestions_inside_code_fence() {
-        let input = "```\n<suggestions>[\"foo\"]</suggestions>\n```";
-        let (text, suggestions) = super::extract_suggestions(input);
-        // The tag is inside a code fence, so it should not be extracted
-        assert_eq!(text, input); // safety: test
-        assert!(suggestions.is_empty()); // safety: test
-    }
-
-    #[test]
-    fn test_extract_suggestions_after_code_fence() {
-        let input = "```\ncode\n```\nAnswer.\n<suggestions>[\"foo\"]</suggestions>";
-        let (text, suggestions) = super::extract_suggestions(input);
-        assert_eq!(text, "```\ncode\n```\nAnswer."); // safety: test
-        assert_eq!(suggestions, vec!["foo"]); // safety: test
-    }
-
-    #[test]
-    fn test_extract_suggestions_filters_long() {
-        let long = "x".repeat(81);
-        let input = format!("Answer.\n<suggestions>[\"{}\", \"ok\"]</suggestions>", long);
-        let (_, suggestions) = super::extract_suggestions(&input);
-        assert_eq!(suggestions, vec!["ok"]); // safety: test
-    }
-
    #[test]
    fn test_tool_error_format_includes_tool_name() {
        // Regression test for issue #487: tool errors sent to the LLM should
@@ -2357,51 +2235,4 @@ mod tests {
            "Present 'data' field should produce non-empty string"
        );
    }
-
-    /// Test the relay channel auto-deny decision logic:
-    /// approval-requiring tools in non-DM relay channels must be rejected.
-    #[test]
-    fn test_relay_non_dm_auto_deny_decision() {
-        use crate::channels::IncomingMessage;
-
-        // Case 1: relay channel + non-DM → should auto-deny
-        let msg = IncomingMessage::new("slack-relay", "u1", "hello")
-            .with_metadata(serde_json::json!({ "event_type": "message" }));
-        let is_relay = msg.channel.ends_with("-relay");
-        let is_dm =
-            msg.metadata.get("event_type").and_then(|v| v.as_str()) == Some("direct_message");
-        assert!(is_relay && !is_dm, "Should auto-deny in relay non-DM");
-
-        // Case 2: relay channel + DM → should NOT auto-deny
-        let msg_dm = IncomingMessage::new("slack-relay", "u1", "hello")
-            .with_metadata(serde_json::json!({ "event_type": "direct_message" }));
-        let is_dm_2 =
-            msg_dm.metadata.get("event_type").and_then(|v| v.as_str()) == Some("direct_message");
-        assert!(
-            !msg_dm.channel.ends_with("-relay") || is_dm_2,
-            "Should NOT auto-deny in relay DM"
-        );
-
-        // Case 3: non-relay channel → should NOT auto-deny
-        let msg_web = IncomingMessage::new("web", "u1", "hello")
-            .with_metadata(serde_json::json!({ "event_type": "message" }));
-        assert!(
-            !msg_web.channel.ends_with("-relay"),
-            "Non-relay channel should not trigger auto-deny"
-        );
-    }
-
-    /// Test that the auto-deny produces a PreflightOutcome::Rejected-style message.
-    #[test]
-    fn test_relay_auto_deny_message_format() {
-        let tool_name = "shell";
-        let result_msg = format!(
-            "Tool '{}' requires approval and cannot run in shared channels. \
-             Ask the user to message me directly (DM) to use this tool.",
-            tool_name
-        );
-        assert!(result_msg.contains("shell"));
-        assert!(result_msg.contains("approval"));
-        assert!(result_msg.contains("DM"));
-    }
 }
@@ -32,6 +32,7 @@ pub mod task;
 mod thread_ops;
 pub mod undo;

+pub use crate::worker::{Worker, WorkerDeps};
 pub(crate) use agent_loop::truncate_for_preview;
 pub use agent_loop::{Agent, AgentDeps};
 pub use compaction::{CompactionResult, ContextCompactor};
@@ -207,7 +207,7 @@ impl Trigger {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum RoutineAction {
-    /// Single LLM call (optionally with tools). Cheap and fast.
+    /// Single LLM call, no tools. Cheap and fast.
    Lightweight {
        /// The prompt sent to the LLM.
        prompt: String,
@@ -217,14 +217,6 @@ pub enum RoutineAction {
        /// Max output tokens (default: 4096).
        #[serde(default = "default_max_tokens")]
        max_tokens: u32,
-        /// Enable tool access (default: false for backward compatibility).
-        /// When true, the LLM can call tools during execution.
-        /// Tools requiring approval are automatically filtered out.
-        #[serde(default)]
-        use_tools: bool,
-        /// Max tool call rounds (default: 3). Only used when use_tools is true.
-        #[serde(default = "default_max_tool_rounds")]
-        max_tool_rounds: u32,
    },
    /// Full multi-turn worker job with tool access.
    FullJob {
@@ -251,19 +243,6 @@ fn default_max_iterations() -> u32 {
    10
 }

-fn default_max_tool_rounds() -> u32 {
-    3
-}
-
-/// Hard upper bound for max_tool_rounds to prevent runaway loops and cost explosion.
-pub(crate) const MAX_TOOL_ROUNDS_LIMIT: u32 = 20;
-
-/// Clamp max_tool_rounds to [1, MAX_TOOL_ROUNDS_LIMIT].
-/// Accepts u64 to avoid truncation before clamping.
-fn clamp_max_tool_rounds(value: u64) -> u32 {
-    value.clamp(1, MAX_TOOL_ROUNDS_LIMIT as u64) as u32
-}
-
 /// Parse a `tool_permissions` JSON array into a `Vec<String>`.
 pub fn parse_tool_permissions(value: &serde_json::Value) -> Vec<String> {
    value
@@ -311,22 +290,10 @@ impl RoutineAction {
                    .get("max_tokens")
                    .and_then(|v| v.as_u64())
                    .unwrap_or(default_max_tokens() as u64) as u32;
-                let use_tools = config
-                    .get("use_tools")
-                    .and_then(|v| v.as_bool())
-                    .unwrap_or(false);
-                let max_tool_rounds = clamp_max_tool_rounds(
-                    config
-                        .get("max_tool_rounds")
-                        .and_then(|v| v.as_u64())
-                        .unwrap_or(default_max_tool_rounds() as u64),
-                );
                Ok(RoutineAction::Lightweight {
                    prompt,
                    context_paths,
                    max_tokens,
-                    use_tools,
-                    max_tool_rounds,
                })
            }
            "full_job" => {
@@ -372,14 +339,10 @@ impl RoutineAction {
                prompt,
                context_paths,
                max_tokens,
-                use_tools,
-                max_tool_rounds,
            } => serde_json::json!({
                "prompt": prompt,
                "context_paths": context_paths,
                "max_tokens": max_tokens,
-                "use_tools": use_tools,
-                "max_tool_rounds": max_tool_rounds,
            }),
            RoutineAction::FullJob {
                title,
@@ -541,8 +504,7 @@ pub fn next_cron_fire(
 #[cfg(test)]
 mod tests {
    use crate::agent::routine::{
-        MAX_TOOL_ROUNDS_LIMIT, RoutineAction, RoutineGuardrails, RunStatus, Trigger, content_hash,
-        next_cron_fire,
+        RoutineAction, RoutineGuardrails, RunStatus, Trigger, content_hash, next_cron_fire,
    };

    #[test]
@@ -592,13 +554,11 @@ mod tests {
            prompt: "Check PRs".to_string(),
            context_paths: vec!["context/priorities.md".to_string()],
            max_tokens: 2048,
-            use_tools: false,
-            max_tool_rounds: 3,
        };
        let json = action.to_config_json();
        let parsed = RoutineAction::from_db("lightweight", json).expect("parse lightweight");
        assert!(
-            matches!(parsed, RoutineAction::Lightweight { prompt, context_paths, max_tokens, .. }
+            matches!(parsed, RoutineAction::Lightweight { prompt, context_paths, max_tokens }
            if prompt == "Check PRs" && context_paths.len() == 1 && max_tokens == 2048)
        );
    }
@@ -735,77 +695,4 @@ mod tests {
        );
        assert_eq!(Trigger::Manual.type_tag(), "manual");
    }
-
-    #[test]
-    fn test_action_lightweight_backward_compat_no_use_tools() {
-        // Simulate old DB record without use_tools field
-        let json = serde_json::json!({
-            "prompt": "old routine",
-            "context_paths": [],
-            "max_tokens": 4096
-        });
-        let parsed = RoutineAction::from_db("lightweight", json).expect("parse lightweight");
-        assert!(
-            matches!(parsed, RoutineAction::Lightweight { use_tools, max_tool_rounds, .. }
-            if !use_tools && max_tool_rounds == 3),
-            "missing use_tools should default to false, max_tool_rounds to 3"
-        );
-    }
-
-    #[test]
-    fn test_max_tool_rounds_clamped_to_upper_bound() {
-        let json = serde_json::json!({
-            "prompt": "test",
-            "use_tools": true,
-            "max_tool_rounds": 9999
-        });
-        let parsed = RoutineAction::from_db("lightweight", json).expect("parse");
-        match parsed {
-            RoutineAction::Lightweight {
-                max_tool_rounds, ..
-            } => {
-                assert_eq!(
-                    max_tool_rounds, MAX_TOOL_ROUNDS_LIMIT,
-                    "should clamp to MAX_TOOL_ROUNDS_LIMIT"
-                );
-            }
-            _ => panic!("expected Lightweight"),
-        }
-    }
-
-    #[test]
-    fn test_max_tool_rounds_clamped_to_lower_bound() {
-        let json = serde_json::json!({
-            "prompt": "test",
-            "use_tools": true,
-            "max_tool_rounds": 0
-        });
-        let parsed = RoutineAction::from_db("lightweight", json).expect("parse");
-        match parsed {
-            RoutineAction::Lightweight {
-                max_tool_rounds, ..
-            } => {
-                assert_eq!(max_tool_rounds, 1, "should clamp 0 to 1");
-            }
-            _ => panic!("expected Lightweight"),
-        }
-    }
-
-    #[test]
-    fn test_max_tool_rounds_normal_value_passes_through() {
-        let json = serde_json::json!({
-            "prompt": "test",
-            "use_tools": true,
-            "max_tool_rounds": 10
-        });
-        let parsed = RoutineAction::from_db("lightweight", json).expect("parse");
-        match parsed {
-            RoutineAction::Lightweight {
-                max_tool_rounds, ..
-            } => {
-                assert_eq!(max_tool_rounds, 10, "normal value should pass through");
-            }
-            _ => panic!("expected Lightweight"),
-        }
-    }
 }
@@ -93,26 +93,19 @@ impl RoutineEngine {
                let mut cache = Vec::new();
                for routine in routines {
                    match &routine.trigger {
-                        Trigger::Event { pattern, .. } => {
-                            // Use RegexBuilder with size limit to prevent ReDoS
-                            // from user-supplied patterns (issue #825).
-                            match regex::RegexBuilder::new(pattern)
-                                .size_limit(64 * 1024) // 64KB compiled size limit
-                                .build()
-                            {
-                                Ok(re) => cache.push(EventMatcher::Message {
-                                    routine: routine.clone(),
-                                    regex: re,
-                                }),
-                                Err(e) => {
-                                    tracing::warn!(
-                                        routine = %routine.name,
-                                        "Invalid or too complex event regex '{}': {}",
-                                        pattern, e
-                                    );
-                                }
+                        Trigger::Event { pattern, .. } => match Regex::new(pattern) {
+                            Ok(re) => cache.push(EventMatcher::Message {
+                                routine: routine.clone(),
+                                regex: re,
+                            }),
+                            Err(e) => {
+                                tracing::warn!(
+                                    routine = %routine.name,
+                                    "Invalid event regex '{}': {}",
+                                    pattern, e
+                                );
                            }
-                        }
+                        },
                        Trigger::SystemEvent { .. } => {
                            cache.push(EventMatcher::System {
                                routine: routine.clone(),
@@ -466,20 +459,7 @@ async fn execute_routine(ctx: EngineContext, routine: Routine, run: RoutineRun)
            prompt,
            context_paths,
            max_tokens,
-            use_tools,
-            max_tool_rounds,
-        } => {
-            execute_lightweight(
-                &ctx,
-                &routine,
-                prompt,
-                context_paths,
-                *max_tokens,
-                *use_tools,
-                *max_tool_rounds,
-            )
-            .await
-        }
+        } => execute_lightweight(&ctx, &routine, prompt, context_paths, *max_tokens).await,
        RoutineAction::FullJob {
            title,
            description,
@@ -690,8 +670,6 @@ async fn execute_lightweight(
    prompt: &str,
    context_paths: &[String],
    max_tokens: u32,
-    use_tools: bool,
-    max_tool_rounds: u32,
 ) -> Result<(RunStatus, Option<String>, Option<i32>), RoutineError> {
    // Load context from workspace
    let mut context_parts = Vec::new();
@@ -754,15 +732,14 @@ async fn execute_lightweight(
        Err(_) => max_tokens,
    };

-    // If tools are enabled (both globally and per-routine), use the tool execution loop
-    if use_tools && ctx.config.lightweight_tools_enabled {
+    // If tools are enabled, use the tool execution loop; otherwise, single LLM call
+    if ctx.config.lightweight_tools_enabled {
        execute_lightweight_with_tools(
            ctx,
            routine,
            &system_prompt,
            &full_prompt,
            effective_max_tokens,
-            max_tool_rounds,
        )
        .await
    } else {
@@ -806,12 +783,24 @@ async fn execute_lightweight_no_tools(
            reason: e.to_string(),
        })?;

-    handle_text_response(
-        &response.content,
-        response.finish_reason,
-        response.input_tokens,
-        response.output_tokens,
-    )
+    let content = response.content.trim();
+    let tokens_used = Some((response.input_tokens + response.output_tokens) as i32);
+
+    // Empty content guard
+    if content.is_empty() {
+        return if response.finish_reason == FinishReason::Length {
+            Err(RoutineError::TruncatedResponse)
+        } else {
+            Err(RoutineError::EmptyResponse)
+        };
+    }
+
+    // Check for the "nothing to do" sentinel
+    if content == "ROUTINE_OK" || content.contains("ROUTINE_OK") {
+        return Ok((RunStatus::Ok, None, tokens_used));
+    }
+
+    Ok((RunStatus::Attention, Some(content.to_string()), tokens_used))
 }

 /// Handle a text-only LLM response in lightweight routine execution.
@@ -861,7 +850,6 @@ async fn execute_lightweight_with_tools(
    system_prompt: &str,
    full_prompt: &str,
    effective_max_tokens: u32,
-    max_tool_rounds: u32,
 ) -> Result<(RunStatus, Option<String>, Option<i32>), RoutineError> {
    let mut messages = if system_prompt.is_empty() {
        vec![ChatMessage::user(full_prompt)]
@@ -872,9 +860,7 @@ async fn execute_lightweight_with_tools(
        ]
    };

-    let max_iterations = max_tool_rounds
-        .min(ctx.config.lightweight_max_iterations)
-        .min(5);
+    let max_iterations = ctx.config.lightweight_max_iterations.min(5);
    let mut iteration = 0;
    let mut total_input_tokens = 0;
    let mut total_output_tokens = 0;
@@ -920,10 +906,7 @@ async fn execute_lightweight_with_tools(
            );
        } else {
            // Tool-enabled iteration
-            let tool_defs = ctx
-                .tools
-                .tool_definitions_excluding(ROUTINE_TOOL_DENYLIST)
-                .await;
+            let tool_defs = ctx.tools.tool_definitions().await;

            let request = ToolCompletionRequest::new(messages.clone(), tool_defs)
                .with_max_tokens(effective_max_tokens)
@@ -980,18 +963,6 @@ async fn execute_lightweight_with_tools(
                    }
                };

-                // Truncate oversized tool output to prevent unbounded context growth.
-                // Routine tool loops are lightweight and should not accumulate
-                // large payloads across iterations.
-                const MAX_TOOL_OUTPUT_CHARS: usize = 8192;
-                let result_content = if result_content.len() > MAX_TOOL_OUTPUT_CHARS {
-                    let truncated = &result_content
-                        [..result_content.floor_char_boundary(MAX_TOOL_OUTPUT_CHARS)];
-                    format!("{truncated}\n... [output truncated to {MAX_TOOL_OUTPUT_CHARS} chars]")
-                } else {
-                    result_content
-                };
-
                // Add tool result to context
                messages.push(ChatMessage::tool_result(&tc.id, &tc.name, &result_content));
            }
@@ -1001,33 +972,12 @@ async fn execute_lightweight_with_tools(
    }
 }

-/// Tools that must never be callable from lightweight routines.
-///
-/// These tools pose autonomy-escalation risks: a routine could self-replicate,
-/// modify its own triggers/prompts, delete other routines, or restart the agent.
-const ROUTINE_TOOL_DENYLIST: &[&str] = &[
-    "routine_create",
-    "routine_update",
-    "routine_delete",
-    "routine_fire",
-    "restart",
-];
-
 /// Execute a single tool for a lightweight routine.
 async fn execute_routine_tool(
    ctx: &EngineContext,
    job_ctx: &JobContext,
    tc: &ToolCall,
 ) -> Result<String, Box<dyn std::error::Error + Send + Sync>> {
-    // Block tools that pose autonomy-escalation risks
-    if ROUTINE_TOOL_DENYLIST.contains(&tc.name.as_str()) {
-        return Err(format!(
-            "Tool '{}' is not available in lightweight routines",
-            tc.name
-        )
-        .into());
-    }
-
    // Check if tool exists
    let tool = ctx
        .tools
@@ -1169,11 +1119,9 @@ pub fn spawn_cron_ticker(
    interval: Duration,
 ) -> tokio::task::JoinHandle<()> {
    tokio::spawn(async move {
-        // Run one check immediately so routines due at startup don't wait
-        // an extra full polling interval.
-        engine.check_cron_triggers().await;
-
        let mut ticker = tokio::time::interval(interval);
+        // Skip immediate first tick
+        ticker.tick().await;

        loop {
            ticker.tick().await;
@@ -1335,36 +1283,6 @@ mod tests {
        }
    }

-    #[test]
-    fn test_routine_tool_denylist_blocks_self_management_tools() {
-        let denylisted = vec![
-            "routine_create",
-            "routine_update",
-            "routine_delete",
-            "routine_fire",
-            "restart",
-        ];
-        for tool in &denylisted {
-            assert!(
-                super::ROUTINE_TOOL_DENYLIST.contains(tool),
-                "Tool '{}' should be in ROUTINE_TOOL_DENYLIST",
-                tool
-            );
-        }
-    }
-
-    #[test]
-    fn test_routine_tool_denylist_allows_safe_tools() {
-        let allowed = vec!["echo", "time", "json", "http", "memory_search", "shell"];
-        for tool in &allowed {
-            assert!(
-                !super::ROUTINE_TOOL_DENYLIST.contains(tool),
-                "Tool '{}' should NOT be in ROUTINE_TOOL_DENYLIST",
-                tool
-            );
-        }
-    }
-
    #[test]
    fn test_empty_response_handling() {
        // Simulate the empty content guard logic
@@ -1379,11 +1297,4 @@ mod tests {
        assert_eq!(finish_reason_length, crate::llm::FinishReason::Length);
        assert_eq!(finish_reason_stop, crate::llm::FinishReason::Stop);
    }
-
-    #[test]
-    fn test_truncate_adds_ellipsis_when_over_limit() {
-        let input = "abcdefghijk";
-        let out = super::truncate(input, 5);
-        assert_eq!(out, "abcde...");
-    }
 }
@@ -420,10 +420,6 @@ impl Agent {
        // Complete, fail, or request approval
        match result {
            Ok(AgenticLoopResult::Response(response)) => {
-                // Extract <suggestions> from response text before user sees it
-                let (response, suggestions) =
-                    crate::agent::dispatcher::extract_suggestions(&response);
-
                // Hook: TransformResponse — allow hooks to modify or reject the final response
                let response = {
                    let event = crate::hooks::HookEvent::ResponseTransform {
@@ -477,18 +473,6 @@ impl Agent {
                )
                .await;

-                // Send suggestions after response (best-effort, rendered by web gateway)
-                if !suggestions.is_empty() {
-                    let _ = self
-                        .channels
-                        .send_status(
-                            &message.channel,
-                            StatusUpdate::Suggestions { suggestions },
-                            &message.metadata,
-                        )
-                        .await;
-                }
-
                Ok(SubmissionResult::response(response))
            }
            Ok(AgenticLoopResult::NeedApproval { pending }) => {
@@ -502,12 +486,7 @@ impl Agent {
                    .channels
                    .send_status(
                        &message.channel,
-                        StatusUpdate::ApprovalNeeded {
-                            request_id: request_id.to_string(),
-                            tool_name: tool_name.clone(),
-                            description: description.clone(),
-                            parameters: parameters.clone(),
-                        },
+                        StatusUpdate::Status("Awaiting approval".into()),
                        &message.metadata,
                    )
                    .await;
@@ -1318,12 +1297,7 @@ impl Agent {
                    .channels
                    .send_status(
                        &message.channel,
-                        StatusUpdate::ApprovalNeeded {
-                            request_id: request_id.to_string(),
-                            tool_name: tool_name.clone(),
-                            description: description.clone(),
-                            parameters: parameters.clone(),
-                        },
+                        StatusUpdate::Status("Awaiting approval".into()),
                        &message.metadata,
                    )
                    .await;
@@ -1350,8 +1324,6 @@ impl Agent {

            match result {
                Ok(AgenticLoopResult::Response(response)) => {
-                    let (response, suggestions) =
-                        crate::agent::dispatcher::extract_suggestions(&response);
                    thread.complete_turn(&response);
                    let (turn_number, tool_calls) = thread
                        .turns
@@ -1382,16 +1354,6 @@ impl Agent {
                            &message.metadata,
                        )
                        .await;
-                    if !suggestions.is_empty() {
-                        let _ = self
-                            .channels
-                            .send_status(
-                                &message.channel,
-                                StatusUpdate::Suggestions { suggestions },
-                                &message.metadata,
-                            )
-                            .await;
-                    }
                    Ok(SubmissionResult::response(response))
                }
                Ok(AgenticLoopResult::NeedApproval {
@@ -1406,12 +1368,7 @@ impl Agent {
                        .channels
                        .send_status(
                            &message.channel,
-                            StatusUpdate::ApprovalNeeded {
-                                request_id: request_id.to_string(),
-                                tool_name: tool_name.clone(),
-                                description: description.clone(),
-                                parameters: parameters.clone(),
-                            },
+                            StatusUpdate::Status("Awaiting approval".into()),
                            &message.metadata,
                        )
                        .await;
@@ -9,7 +9,6 @@

 use std::sync::Arc;

-use crate::agent::SessionManager as AgentSessionManager;
 use crate::channels::web::log_layer::LogBroadcaster;
 use crate::config::Config;
 use crate::context::ContextManager;
@@ -47,8 +46,6 @@ pub struct AppComponents {
    pub log_broadcaster: Arc<LogBroadcaster>,
    pub context_manager: Arc<ContextManager>,
    pub hooks: Arc<HookRegistry>,
-    /// Shared thread/session manager used by the standard agent runtime.
-    pub agent_session_manager: Arc<AgentSessionManager>,
    pub skill_registry: Option<Arc<std::sync::RwLock<SkillRegistry>>>,
    pub skill_catalog: Option<Arc<SkillCatalog>>,
    pub cost_guard: Arc<crate::agent::cost_guard::CostGuard>,
@@ -290,7 +287,6 @@ impl AppBuilder {
            Arc::new(ToolRegistry::new())
        };
        tools.register_builtin_tools();
-        tools.register_tool_info();

        if let Some(ref ss) = self.secrets_store {
            tools.register_secrets_tools(Arc::clone(ss));
@@ -304,8 +300,7 @@ impl AppBuilder {

        // Register memory tools if database is available
        let workspace = if let Some(ref db) = self.db {
-            let mut ws = Workspace::new_with_db("default", db.clone())
-                .with_search_config(&self.config.search);
+            let mut ws = Workspace::new_with_db("default", db.clone());
            if let Some(ref emb) = embeddings {
                ws = ws.with_embeddings(emb.clone());
            }
@@ -594,7 +589,7 @@ impl AppBuilder {
                let entries: Vec<_> = catalog
                    .all()
                    .iter()
-                    .filter_map(|m| m.to_registry_entry())
+                    .map(|m| m.to_registry_entry())
                    .collect();
                tracing::debug!(
                    count = entries.len(),
@@ -694,8 +689,6 @@ impl AppBuilder {

        // Create hook registry early so runtime extension activation can register hooks.
        let hooks = Arc::new(HookRegistry::new());
-        let agent_session_manager =
-            Arc::new(AgentSessionManager::new().with_hooks(Arc::clone(&hooks)));

        let (
            mcp_session_manager,
@@ -802,7 +795,6 @@ impl AppBuilder {
            log_broadcaster: self.log_broadcaster,
            context_manager,
            hooks,
-            agent_session_manager,
            skill_registry,
            skill_catalog,
            cost_guard,
@@ -813,69 +805,3 @@ impl AppBuilder {
        })
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use async_trait::async_trait;
-    use tokio::sync::mpsc;
-
-    use crate::agent::SessionManager as AgentSessionManager;
-    use crate::hooks::{
-        Hook, HookContext, HookError, HookEvent, HookOutcome, HookPoint, HookRegistry,
-    };
-
-    struct SessionStartHook {
-        tx: mpsc::UnboundedSender<(String, String)>,
-    }
-
-    #[async_trait]
-    impl Hook for SessionStartHook {
-        fn name(&self) -> &str {
-            "session-start-test"
-        }
-
-        fn hook_points(&self) -> &[HookPoint] {
-            &[HookPoint::OnSessionStart]
-        }
-
-        async fn execute(
-            &self,
-            event: &HookEvent,
-            _ctx: &HookContext,
-        ) -> Result<HookOutcome, HookError> {
-            if let HookEvent::SessionStart {
-                user_id,
-                session_id,
-            } = event
-            {
-                self.tx
-                    .send((user_id.clone(), session_id.clone()))
-                    .expect("test channel receiver should be alive");
-            } else {
-                panic!("SessionStartHook received an unexpected event: {event:?}");
-            }
-            Ok(HookOutcome::ok())
-        }
-    }
-
-    #[tokio::test]
-    async fn agent_session_manager_runs_session_start_hooks() {
-        let hooks = Arc::new(HookRegistry::new());
-        let (tx, mut rx) = mpsc::unbounded_channel();
-        hooks.register(Arc::new(SessionStartHook { tx })).await;
-
-        let manager = AgentSessionManager::new().with_hooks(Arc::clone(&hooks));
-        manager.get_or_create_session("user-123").await;
-
-        let (user_id, session_id) =
-            tokio::time::timeout(std::time::Duration::from_secs(1), rx.recv())
-                .await
-                .expect("session start hook should fire")
-                .expect("session start payload should be present");
-
-        assert_eq!(user_id, "user-123");
-        assert!(!session_id.is_empty());
-    }
-}
@@ -238,8 +238,6 @@ pub enum StatusUpdate {
        /// Optional workspace path where the image was saved.
        path: Option<String>,
    },
-    /// Suggested follow-up messages for the user.
-    Suggestions { suggestions: Vec<String> },
 }

 impl StatusUpdate {
@@ -140,7 +140,7 @@ struct WebhookRequest {
    content: String,
    /// Optional thread ID for conversation tracking.
    thread_id: Option<String>,
-    /// Deprecated: webhook secret in request body. Use X-Hub-Signature-256 header instead.
+    /// Deprecated: webhook secret in request body. Use X-IronClaw-Signature header instead.
    /// This field is accepted for backward compatibility but will be removed in a future release.
    secret: Option<String>,
    /// Whether to wait for a synchronous response.
@@ -269,108 +269,95 @@ async fn webhook_handler(
    let mut fallback_req = None;
    {
        let webhook_secret = state.webhook_secret.read().await;
-        let expected_secret = match webhook_secret.as_ref() {
-            Some(secret) => secret.expose_secret(),
-            None => {
-                // No secret configured — reject all requests. This guards against
-                // the secret being cleared at runtime via update_secret(None).
-                // The start() method also prevents startup without a secret, but
-                // this is defense-in-depth for the SIGHUP hot-swap path.
-                return (
-                    StatusCode::SERVICE_UNAVAILABLE,
-                    Json(WebhookResponse {
-                        message_id: Uuid::nil(),
-                        status: "error".to_string(),
-                        response: Some("Webhook authentication not configured".to_string()),
-                    }),
-                )
-                    .into_response();
-            }
-        };
+        if let Some(expected_secret) = webhook_secret.as_ref() {
+            let expected_secret = expected_secret.expose_secret();

-        match headers.get("x-hub-signature-256") {
-            Some(raw_signature) => match raw_signature.to_str() {
-                Ok(signature) => {
-                    if !verify_hmac_signature(expected_secret, &body, signature) {
-                        return (
-                            StatusCode::UNAUTHORIZED,
-                            Json(WebhookResponse {
-                                message_id: Uuid::nil(),
-                                status: "error".to_string(),
-                                response: Some("Invalid webhook signature".to_string()),
-                            }),
-                        )
-                            .into_response();
+            match headers.get("x-ironclaw-signature") {
+                Some(raw_signature) => match raw_signature.to_str() {
+                    Ok(signature) => {
+                        if !verify_hmac_signature(expected_secret, &body, signature) {
+                            return (
+                                StatusCode::UNAUTHORIZED,
+                                Json(WebhookResponse {
+                                    message_id: Uuid::nil(),
+                                    status: "error".to_string(),
+                                    response: Some("Invalid webhook signature".to_string()),
+                                }),
+                            )
+                                .into_response();
+                        }
                    }
-                }
-                Err(_) => {
-                    return (
-                        StatusCode::UNAUTHORIZED,
-                        Json(WebhookResponse {
-                            message_id: Uuid::nil(),
-                            status: "error".to_string(),
-                            response: Some("Invalid signature header encoding".to_string()),
-                        }),
-                    )
-                        .into_response();
-                }
-            },
-            None => {
-                let req: WebhookRequest = match serde_json::from_slice(&body) {
-                    Ok(req) => req,
                    Err(_) => {
                        return (
                            StatusCode::UNAUTHORIZED,
                            Json(WebhookResponse {
                                message_id: Uuid::nil(),
                                status: "error".to_string(),
-                                response: Some(
-                                    "Webhook authentication required. Provide X-Hub-Signature-256 header \
-                                     (preferred) or 'secret' field in body (deprecated)."
-                                        .to_string(),
-                                ),
+                                response: Some("Invalid signature header encoding".to_string()),
                            }),
                        )
                            .into_response();
                    }
-                };
+                },
+                None => {
+                    let req: WebhookRequest = match serde_json::from_slice(&body) {
+                        Ok(req) => req,
+                        Err(_) => {
+                            return (
+                                StatusCode::UNAUTHORIZED,
+                                Json(WebhookResponse {
+                                    message_id: Uuid::nil(),
+                                    status: "error".to_string(),
+                                    response: Some(
+                                        "Webhook authentication required. Provide X-IronClaw-Signature header \
+                                         (preferred) or 'secret' field in body (deprecated)."
+                                            .to_string(),
+                                    ),
+                                }),
+                            )
+                                .into_response();
+                        }
+                    };

-                match &req.secret {
-                    Some(provided)
-                        if bool::from(provided.as_bytes().ct_eq(expected_secret.as_bytes())) =>
-                    {
-                        tracing::warn!(
-                            "Webhook authenticated via deprecated 'secret' field in request body. \
-                             Migrate to X-Hub-Signature-256 header (HMAC-SHA256). \
-                             Body secret support will be removed in a future release."
-                        );
-                        fallback_req = Some(req);
-                    }
-                    Some(_) => {
-                        return (
-                            StatusCode::UNAUTHORIZED,
-                            Json(WebhookResponse {
-                                message_id: Uuid::nil(),
-                                status: "error".to_string(),
-                                response: Some("Invalid webhook secret".to_string()),
-                            }),
-                        )
-                            .into_response();
-                    }
-                    None => {
-                        return (
-                            StatusCode::UNAUTHORIZED,
-                            Json(WebhookResponse {
-                                message_id: Uuid::nil(),
-                                status: "error".to_string(),
-                                response: Some(
-                                    "Webhook authentication required. Provide X-Hub-Signature-256 header \
-                                     (preferred) or 'secret' field in body (deprecated)."
-                                        .to_string(),
-                                ),
-                            }),
-                        )
-                            .into_response();
+                    match &req.secret {
+                        Some(provided)
+                            if bool::from(
+                                provided.as_bytes().ct_eq(expected_secret.as_bytes()),
+                            ) =>
+                        {
+                            tracing::warn!(
+                                "Webhook authenticated via deprecated 'secret' field in request body. \
+                                 Migrate to X-IronClaw-Signature header (HMAC-SHA256). \
+                                 Body secret support will be removed in a future release."
+                            );
+                            fallback_req = Some(req);
+                        }
+                        Some(_) => {
+                            return (
+                                StatusCode::UNAUTHORIZED,
+                                Json(WebhookResponse {
+                                    message_id: Uuid::nil(),
+                                    status: "error".to_string(),
+                                    response: Some("Invalid webhook secret".to_string()),
+                                }),
+                            )
+                                .into_response();
+                        }
+                        None => {
+                            return (
+                                StatusCode::UNAUTHORIZED,
+                                Json(WebhookResponse {
+                                    message_id: Uuid::nil(),
+                                    status: "error".to_string(),
+                                    response: Some(
+                                        "Webhook authentication required. Provide X-IronClaw-Signature header \
+                                         (preferred) or 'secret' field in body (deprecated)."
+                                            .to_string(),
+                                    ),
+                                }),
+                            )
+                                .into_response();
+                        }
                    }
                }
            }
@@ -726,7 +713,7 @@ mod tests {
            .method("POST")
            .uri("/webhook")
            .header("content-type", "application/json")
-            .header("x-hub-signature-256", signature)
+            .header("x-ironclaw-signature", signature)
            .body(Body::from(body_bytes))
            .unwrap();

@@ -749,7 +736,7 @@ mod tests {
            .method("POST")
            .uri("/webhook")
            .header("content-type", "application/json")
-            .header("x-hub-signature-256", signature)
+            .header("x-ironclaw-signature", signature)
            .body(Body::from(body_bytes))
            .unwrap();

@@ -770,7 +757,7 @@ mod tests {
            .method("POST")
            .uri("/webhook")
            .header("content-type", "application/json")
-            .header("x-hub-signature-256", "not-a-valid-signature")
+            .header("x-ironclaw-signature", "not-a-valid-signature")
            .body(Body::from(serde_json::to_vec(&body).unwrap()))
            .unwrap();

@@ -820,67 +807,6 @@ mod tests {
        assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
    }

-    /// 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.
-    ///
-    /// This test exercises the actual production code path (`process_message`)
-    /// with a full channel buffer, then verifies shutdown() can still complete.
-    #[tokio::test]
-    async fn shutdown_completes_while_process_message_blocked() {
-        let channel = Arc::new(test_channel(Some("secret")));
-        let stream = channel.start().await.unwrap();
-
-        // Fill all 256 slots in the channel buffer
-        {
-            let tx = {
-                let guard = channel.state.tx.read().await;
-                guard.as_ref().unwrap().clone()
-            };
-            for i in 0..256 {
-                let msg = IncomingMessage::new("http", "user", format!("fill-{}", i));
-                tx.send(msg).await.unwrap();
-            }
-        }
-
-        // Signal so we know the spawned task has started and is about to
-        // call process_message (which will block on the full channel).
-        let started = Arc::new(tokio::sync::Notify::new());
-        let started_clone = started.clone();
-
-        // Spawn a task that calls the actual production code path.
-        // process_message() internally acquires the RwLock read guard and
-        // sends on the channel. With the fix, the guard is released before
-        // send().await; without the fix, shutdown() would deadlock.
-        let state = channel.state.clone();
-        let blocked_send = tokio::spawn(async move {
-            started_clone.notify_one();
-            let msg = IncomingMessage::new("http", "user", "blocked-257th");
-            let _ = process_message(state, msg, false).await;
-        });
-
-        // Wait for the spawned task to start, then give it time to reach
-        // the send().await and verify that it is still pending (i.e., blocked).
-        started.notified().await;
-        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
-        assert!(
-            !blocked_send.is_finished(),
-            "process_message task should still be pending before shutdown()"
-        );
-
-        // shutdown() must complete even though process_message is blocked on
-        // send(). Before the fix, the read guard held across send().await
-        // would prevent shutdown() from acquiring the write lock.
-        let result =
-            tokio::time::timeout(std::time::Duration::from_secs(2), channel.shutdown()).await;
-        assert!(result.is_ok(), "shutdown() must not deadlock");
-        assert!(result.unwrap().is_ok());
-
-        // Drop the stream (receiver) so the blocked send task can complete
-        drop(stream);
-        let _ = blocked_send.await;
-    }
-
    #[tokio::test]
    async fn webhook_missing_all_auth_returns_unauthorized() {
        let channel = test_channel(Some("correct-secret"));
@@ -919,7 +845,7 @@ mod tests {
            .method("POST")
            .uri("/webhook")
            .header("content-type", "application/json")
-            .header("x-hub-signature-256", signature)
+            .header("x-ironclaw-signature", signature)
            .body(Body::from(body_bytes))
            .unwrap();

@@ -941,7 +867,7 @@ mod tests {
            .method("POST")
            .uri("/webhook")
            .header("content-type", "application/json")
-            .header("x-hub-signature-256", signature)
+            .header("x-ironclaw-signature", signature)
            .body(Body::from(body))
            .unwrap();

@@ -966,7 +892,7 @@ mod tests {
            .method("POST")
            .uri("/webhook")
            .header("content-type", "text/plain")
-            .header("x-hub-signature-256", signature)
+            .header("x-ironclaw-signature", signature)
            .body(Body::from(body_bytes))
            .unwrap();

@@ -991,7 +917,7 @@ mod tests {
            .body(Body::from(serde_json::to_vec(&body).unwrap()))
            .unwrap();
        req.headers_mut().insert(
-            "x-hub-signature-256",
+            "x-ironclaw-signature",
            HeaderValue::from_bytes(b"\xFF").unwrap(),
        );

@@ -1065,32 +991,6 @@ mod tests {
        );
    }

-    #[tokio::test]
-    async fn webhook_rejects_requests_after_secret_is_cleared() {
-        let secret = "test-secret-123";
-        let channel = test_channel(Some(secret));
-        let _stream = channel.start().await.unwrap();
-        let app = channel.routes();
-
-        channel.update_secret(None).await;
-
-        let body = serde_json::json!({
-            "content": "hello"
-        });
-        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::SERVICE_UNAVAILABLE); // safety: test assertion
-    }
-
    #[tokio::test]
    async fn test_concurrent_requests_during_secret_update() {
        use std::sync::Arc as StdArc;
@@ -1209,34 +1109,4 @@ mod tests {
        let body = b"test body content";
        assert!(!verify_hmac_signature(secret, body, "sha256=not-hex!"));
    }
-
-    /// Regression test for issue #1033: when the webhook secret is cleared at
-    /// runtime via update_secret(None), subsequent requests must be rejected
-    /// instead of being processed without authentication.
-    #[tokio::test]
-    async fn webhook_rejects_when_secret_cleared_at_runtime() {
-        let channel = test_channel(Some("initial-secret"));
-        let _stream = channel.start().await.unwrap();
-
-        // Clear the secret at runtime (simulates a bad SIGHUP config reload)
-        channel.update_secret(None).await;
-
-        let app = channel.routes();
-        let body = serde_json::json!({
-            "content": "hello"
-        });
-        let req = Request::builder()
-            .method("POST")
-            .uri("/webhook")
-            .header("content-type", "application/json")
-            .body(Body::from(serde_json::to_vec(&body).unwrap()))
-            .unwrap();
-
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(
-            resp.status(),
-            StatusCode::SERVICE_UNAVAILABLE,
-            "requests must be rejected when webhook secret is cleared at runtime"
-        );
-    }
 }
@@ -294,8 +294,6 @@ impl Channel for RelayChannel {
                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() {
@@ -314,8 +312,6 @@ impl Channel for RelayChannel {
                                        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();
@@ -412,120 +408,12 @@ impl Channel for RelayChannel {
        Ok(())
    }

+    /// Status updates are not forwarded to messaging providers to avoid noise.
    async fn send_status(
        &self,
-        status: StatusUpdate,
-        metadata: &serde_json::Value,
+        _status: StatusUpdate,
+        _metadata: &serde_json::Value,
    ) -> Result<(), ChannelError> {
-        // Only handle ApprovalNeeded — all other variants are no-ops
-        let StatusUpdate::ApprovalNeeded {
-            request_id,
-            tool_name,
-            description,
-            parameters,
-        } = status
-        else {
-            return Ok(());
-        };
-
-        // Only send buttons in DMs (dispatcher gates upstream, but guard here too)
-        let event_type = metadata
-            .get("event_type")
-            .and_then(|v| v.as_str())
-            .unwrap_or("");
-        if event_type != "direct_message" {
-            tracing::warn!(
-                tool = %tool_name,
-                event_type,
-                "Approval requested in non-DM, skipping buttons"
-            );
-            return Ok(());
-        }
-
-        // Extract required metadata — error if missing
-        let channel_id = metadata
-            .get("channel_id")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| ChannelError::SendFailed {
-                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);
-
-        // 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!({
-            "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();
-
-        // Parameters are already redacted via redact_params() in dispatcher.rs
-        let params_display =
-            serde_json::to_string_pretty(&parameters).unwrap_or_else(|_| parameters.to_string());
-
-        let blocks = serde_json::json!([
-            {
-                "type": "section",
-                "text": {
-                    "type": "mrkdwn",
-                    "text": format!(
-                        "*Tool approval required*\n`{tool_name}`: {description}\n```{params_display}```"
-                    )
-                }
-            },
-            {
-                "type": "actions",
-                "elements": [
-                    {
-                        "type": "button",
-                        "text": { "type": "plain_text", "text": "Approve" },
-                        "style": "primary",
-                        "action_id": "approve_tool",
-                        "value": value_str,
-                    },
-                    {
-                        "type": "button",
-                        "text": { "type": "plain_text", "text": "Deny" },
-                        "style": "danger",
-                        "action_id": "deny_tool",
-                        "value": value_str,
-                    }
-                ]
-            }
-        ]);
-
-        let mut body = serde_json::json!({
-            "channel": channel_id,
-            "text": format!("Tool approval required: {tool_name} - {description}"),
-            "blocks": blocks,
-        });
-        if let Some(tid) = thread_id {
-            body["thread_ts"] = serde_json::Value::String(tid.to_string());
-        }
-
-        self.proxy_send(team_id, "chat.postMessage", body)
-            .await
-            .map_err(|e| ChannelError::SendFailed {
-                name: self.name().to_string(),
-                reason: e.to_string(),
-            })?;
-
        Ok(())
    }

@@ -751,118 +639,4 @@ mod tests {
        // 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 = RelayChannel::new(
-            test_client(),
-            "token".into(),
-            "T123".into(),
-            "inst1".into(),
-            "user1".into(),
-        );
-        let metadata = serde_json::json!({});
-        let result = channel
-            .send_status(
-                StatusUpdate::ToolStarted {
-                    name: "echo".into(),
-                },
-                &metadata,
-            )
-            .await;
-        assert!(result.is_ok());
-    }
-
-    #[tokio::test]
-    async fn test_send_status_approval_non_dm_skips() {
-        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",
-            "sender_id": "U789",
-        });
-        let result = channel
-            .send_status(
-                StatusUpdate::ApprovalNeeded {
-                    request_id: "req1".into(),
-                    tool_name: "shell".into(),
-                    description: "run command".into(),
-                    parameters: serde_json::json!({}),
-                },
-                &metadata,
-            )
-            .await;
-        // Non-DM approval requests are silently skipped (no HTTP call)
-        assert!(result.is_ok());
-    }
-
-    #[tokio::test]
-    async fn test_send_status_approval_dm_missing_channel_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",
-            "sender_id": "U789",
-        });
-        let result = channel
-            .send_status(
-                StatusUpdate::ApprovalNeeded {
-                    request_id: "req1".into(),
-                    tool_name: "shell".into(),
-                    description: "run command".into(),
-                    parameters: serde_json::json!({}),
-                },
-                &metadata,
-            )
-            .await;
-        assert!(result.is_err());
-        let err = result.unwrap_err().to_string();
-        assert!(
-            err.contains("channel_id"),
-            "expected channel_id error, got: {err}"
-        );
-    }
-
-    #[tokio::test]
-    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",
-        });
-        let result = channel
-            .send_status(
-                StatusUpdate::ApprovalNeeded {
-                    request_id: "req1".into(),
-                    tool_name: "shell".into(),
-                    description: "run command".into(),
-                    parameters: serde_json::json!({}),
-                },
-                &metadata,
-            )
-            .await;
-        assert!(result.is_err());
-        let err = result.unwrap_err().to_string();
-        assert!(
-            err.contains("sender_id"),
-            "expected sender_id error, got: {err}"
-        );
-    }
 }
@@ -607,9 +607,6 @@ impl Channel for ReplChannel {
                    eprintln!("\x1b[36m  [image generated]\x1b[0m");
                }
            }
-            StatusUpdate::Suggestions { .. } => {
-                // Suggestions are only rendered by the web gateway
-            }
        }
        Ok(())
    }
@@ -63,11 +63,7 @@ const ALLOWED_MIME_PREFIXES: &[&str] = &[
    "application/x-tar",
    "application/octet-stream",
 ];
-/// Truncate a string to at most `max_bytes` without splitting UTF-8 code points.
-fn truncate_utf8(s: &str, max_bytes: usize) -> &str {
-    let end = crate::util::floor_char_boundary(s, max_bytes);
-    &s[..end]
-}
+
 /// A message emitted by a WASM channel to be sent to the agent.
 #[derive(Debug, Clone)]
 pub struct EmittedMessage {
@@ -268,7 +264,7 @@ impl ChannelHostState {
                max = MAX_MESSAGE_CONTENT_SIZE,
                "Message content too large, truncating"
            );
-            let mut truncated = truncate_utf8(&msg.content, MAX_MESSAGE_CONTENT_SIZE).to_string();
+            let mut truncated = msg.content[..MAX_MESSAGE_CONTENT_SIZE].to_string();
            truncated.push_str("... (truncated)");
            let msg = EmittedMessage {
                content: truncated,
@@ -635,7 +631,6 @@ mod tests {
    use crate::channels::wasm::host::{
        Attachment, ChannelEmitRateLimiter, ChannelHostState, EmittedMessage,
        MAX_ATTACHMENT_TOTAL_SIZE, MAX_ATTACHMENTS_PER_MESSAGE, MAX_EMITS_PER_EXECUTION,
-        MAX_MESSAGE_CONTENT_SIZE,
    };

    #[test]
@@ -694,25 +689,6 @@ mod tests {
        assert_eq!(state.emits_dropped(), 1);
    }

-    #[test]
-    fn test_emit_message_truncates_utf8_safely() {
-        let caps = ChannelCapabilities::for_channel("test");
-        let mut state = ChannelHostState::new("test", caps);
-
-        let prefix = "a".repeat(MAX_MESSAGE_CONTENT_SIZE - 1);
-        let content = format!("{}🙂suffix", prefix);
-        let msg = EmittedMessage::new("user123", content);
-
-        state.emit_message(msg).unwrap();
-        let messages = state.take_emitted_messages();
-        assert_eq!(messages.len(), 1);
-
-        let emitted = &messages[0].content;
-        assert!(emitted.starts_with(&prefix));
-        assert!(emitted.ends_with("... (truncated)"));
-        assert!(!emitted.contains("🙂"));
-    }
-
    #[test]
    fn test_workspace_write_prefixing() {
        let caps = ChannelCapabilities::for_channel("slack");
@@ -1664,9 +1664,7 @@ impl WasmChannel {
                .await;
        let pairing_store = self.pairing_store.clone();

-        let Some(wit_update) = status_to_wit(status, metadata) else {
-            return Ok(());
-        };
+        let wit_update = status_to_wit(status, metadata);

        let result = tokio::time::timeout(timeout, async move {
            tokio::task::spawn_blocking(move || {
@@ -1835,9 +1833,7 @@ impl WasmChannel {
                .await;
                let pairing_store = self.pairing_store.clone();
                let callback_timeout = self.runtime.config().callback_timeout;
-                let Some(wit_update) = status_to_wit(&status, metadata) else {
-                    return Ok(());
-                };
+                let wit_update = status_to_wit(&status, metadata);

                let handle = tokio::spawn(async move {
                    let mut interval = tokio::time::interval(Duration::from_secs(4));
@@ -1998,33 +1994,28 @@ impl WasmChannel {
            return Ok(());
        }

-        // Clone sender to avoid holding RwLock read guard across send().await in the loop
-        let tx = {
-            let tx_guard = self.message_tx.read().await;
-            let Some(tx) = tx_guard.as_ref() else {
-                tracing::error!(
-                    channel = %self.name,
-                    count = messages.len(),
-                    "Messages emitted but no sender available - channel may not be started!"
-                );
-                return Ok(());
-            };
-            tx.clone()
+        let tx_guard = self.message_tx.read().await;
+        let Some(tx) = tx_guard.as_ref() else {
+            tracing::error!(
+                channel = %self.name,
+                count = messages.len(),
+                "Messages emitted but no sender available - channel may not be started!"
+            );
+            return Ok(());
        };

+        let mut rate_limiter = self.rate_limiter.write().await;
+
        for emitted in messages {
-            // Check rate limit — acquire and release the write lock before send().await
-            {
-                let mut rate_limiter = self.rate_limiter.write().await;
-                if !rate_limiter.check_and_record() {
-                    tracing::warn!(
-                        channel = %self.name,
-                        "Message emission rate limited"
-                    );
-                    return Err(WasmChannelError::EmitRateLimited {
-                        name: self.name.clone(),
-                    });
-                }
+            // Check rate limit
+            if !rate_limiter.check_and_record() {
+                tracing::warn!(
+                    channel = %self.name,
+                    "Message emission rate limited"
+                );
+                return Err(WasmChannelError::EmitRateLimited {
+                    name: self.name.clone(),
+                });
            }

            // Convert to IncomingMessage
@@ -2066,7 +2057,7 @@ impl WasmChannel {
                self.update_broadcast_metadata(&emitted.metadata_json).await;
            }

-            // Send to stream — no locks held across this await
+            // Send to stream
            tracing::info!(
                channel = %self.name,
                user_id = %emitted.user_id,
@@ -2290,33 +2281,28 @@ impl WasmChannel {
            "Processing emitted messages from polling callback"
        );

-        // Clone sender to avoid holding RwLock read guard across send().await in the loop
-        let tx = {
-            let tx_guard = message_tx.read().await;
-            let Some(tx) = tx_guard.as_ref() else {
-                tracing::error!(
-                    channel = %channel_name,
-                    count = messages.len(),
-                    "Messages emitted but no sender available - channel may not be started!"
-                );
-                return Ok(());
-            };
-            tx.clone()
+        let tx_guard = message_tx.read().await;
+        let Some(tx) = tx_guard.as_ref() else {
+            tracing::error!(
+                channel = %channel_name,
+                count = messages.len(),
+                "Messages emitted but no sender available - channel may not be started!"
+            );
+            return Ok(());
        };

+        let mut limiter = rate_limiter.write().await;
+
        for emitted in messages {
-            // Check rate limit — acquire and release the write lock before send().await
-            {
-                let mut limiter = rate_limiter.write().await;
-                if !limiter.check_and_record() {
-                    tracing::warn!(
-                        channel = %channel_name,
-                        "Message emission rate limited"
-                    );
-                    return Err(WasmChannelError::EmitRateLimited {
-                        name: channel_name.to_string(),
-                    });
-                }
+            // Check rate limit
+            if !limiter.check_and_record() {
+                tracing::warn!(
+                    channel = %channel_name,
+                    "Message emission rate limited"
+                );
+                return Err(WasmChannelError::EmitRateLimited {
+                    name: channel_name.to_string(),
+                });
            }

            // Convert to IncomingMessage
@@ -2364,7 +2350,7 @@ impl WasmChannel {
                .await;
            }

-            // Send to stream — no locks held across this await
+            // Send to stream
            tracing::info!(
                channel = %channel_name,
                user_id = %emitted.user_id,
@@ -2708,13 +2694,10 @@ fn truncate_status_text(input: &str, max_chars: usize) -> String {
    }
 }

-fn status_to_wit(
-    status: &StatusUpdate,
-    metadata: &serde_json::Value,
-) -> Option<wit_channel::StatusUpdate> {
+fn status_to_wit(status: &StatusUpdate, metadata: &serde_json::Value) -> wit_channel::StatusUpdate {
    let metadata_json = serde_json::to_string(metadata).unwrap_or_default();

-    Some(match status {
+    match status {
        StatusUpdate::Thinking(msg) => wit_channel::StatusUpdate {
            status: wit_channel::StatusType::Thinking,
            message: msg.clone(),
@@ -2834,9 +2817,7 @@ fn status_to_wit(
            },
            metadata_json,
        },
-        // Suggestions are web-gateway-only; skip for WASM channels
-        StatusUpdate::Suggestions { .. } => return None,
-    })
+    }
 }

 /// Clone a WIT StatusUpdate (the generated type doesn't derive Clone).
@@ -3565,8 +3546,7 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Thinking("Processing...".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3584,8 +3564,7 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status("Done".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(wit.status, super::wit_channel::StatusType::Done));
    }
@@ -3600,16 +3579,14 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status("done".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );
        assert!(matches!(wit.status, super::wit_channel::StatusType::Done));

        // with whitespace
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status(" Done ".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );
        assert!(matches!(wit.status, super::wit_channel::StatusType::Done));
    }

@@ -3621,8 +3598,7 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status("Interrupted".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3640,8 +3616,7 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status("interrupted".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );
        assert!(matches!(
            wit.status,
            super::wit_channel::StatusType::Interrupted
@@ -3651,8 +3626,7 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status(" Interrupted ".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );
        assert!(matches!(
            wit.status,
            super::wit_channel::StatusType::Interrupted
@@ -3667,8 +3641,7 @@ mod tests {
        let wit = status_to_wit(
            &crate::channels::StatusUpdate::Status("Awaiting approval".into()),
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(wit.status, super::wit_channel::StatusType::Status));
        assert_eq!(wit.message, "Awaiting approval");
@@ -3687,8 +3660,7 @@ mod tests {
                setup_url: None,
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3708,8 +3680,7 @@ mod tests {
                name: "http_request".to_string(),
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3731,8 +3702,7 @@ mod tests {
                parameters: None,
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3754,8 +3724,7 @@ mod tests {
                parameters: None,
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3775,8 +3744,7 @@ mod tests {
                preview: "{".to_string() + "\"temperature\": 22}",
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3797,8 +3765,7 @@ mod tests {
                preview: long_preview,
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3819,8 +3786,7 @@ mod tests {
                browse_url: "https://example.com/jobs/job-1".to_string(),
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3842,8 +3808,7 @@ mod tests {
                message: "Token saved".to_string(),
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3865,8 +3830,7 @@ mod tests {
                message: "Invalid token".to_string(),
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3889,8 +3853,7 @@ mod tests {
                parameters: serde_json::json!({"url": "https://api.weather.test"}),
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -3914,8 +3877,7 @@ mod tests {
                parameters: serde_json::json!({"url": "https://api.weather.test"}),
            },
            &metadata,
-        )
-        .unwrap(); // safety: test
+        );

        assert!(matches!(
            wit.status,
@@ -37,17 +37,11 @@ pub async fn chat_send_handler(
    let msg_id = msg.id;
    let thread_id = msg.thread_id.clone();

-    // Clone sender to avoid holding RwLock read guard across send().await
-    let tx = {
-        let tx_guard = state.msg_tx.read().await;
-        tx_guard
-            .as_ref()
-            .ok_or((
-                StatusCode::SERVICE_UNAVAILABLE,
-                "Channel not started".to_string(),
-            ))?
-            .clone()
-    };
+    let tx_guard = state.msg_tx.read().await;
+    let tx = tx_guard.as_ref().ok_or((
+        StatusCode::SERVICE_UNAVAILABLE,
+        "Channel not started".to_string(),
+    ))?;

    tx.send(msg).await.map_err(|_| {
        (
@@ -117,17 +111,11 @@ pub async fn chat_approval_handler(

    let msg_id = msg.id;

-    // Clone sender to avoid holding RwLock read guard across send().await
-    let tx = {
-        let tx_guard = state.msg_tx.read().await;
-        tx_guard
-            .as_ref()
-            .ok_or((
-                StatusCode::SERVICE_UNAVAILABLE,
-                "Channel not started".to_string(),
-            ))?
-            .clone()
-    };
+    let tx_guard = state.msg_tx.read().await;
+    let tx = tx_guard.as_ref().ok_or((
+        StatusCode::SERVICE_UNAVAILABLE,
+        "Channel not started".to_string(),
+    ))?;

    tx.send(msg).await.map_err(|_| {
        (
@@ -10,7 +10,6 @@ use axum::{
 use serde::Deserialize;
 use uuid::Uuid;

-use crate::agent::routine::{Trigger, next_cron_fire};
 use crate::channels::web::server::GatewayState;
 use crate::channels::web::types::*;
 use crate::error::RoutineError;
@@ -183,41 +182,17 @@ pub async fn routines_toggle_handler(
        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?
        .ok_or((StatusCode::NOT_FOUND, "Routine not found".to_string()))?;

-    let was_enabled = routine.enabled;
    // If a specific value was provided, use it; otherwise toggle.
    routine.enabled = match body {
        Some(Json(req)) => req.enabled.unwrap_or(!routine.enabled),
        None => !routine.enabled,
    };

-    // When re-enabling a cron routine, recompute next_fire_at so the cron
-    // ticker can pick it up. Mirrors the CLI behavior (issue #1077).
-    if routine.enabled
-        && !was_enabled
-        && let Trigger::Cron {
-            ref schedule,
-            ref timezone,
-        } = routine.trigger
-    {
-        routine.next_fire_at = next_cron_fire(schedule, timezone.as_deref()).map_err(|e| {
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Failed to compute next fire: {e}"),
-            )
-        })?;
-    }
-
    store
        .update_routine(&routine)
        .await
        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;

-    // Refresh the in-memory event trigger cache so event/system_event
-    // routines reflect the new enabled state immediately (issue #1076).
-    if let Some(engine) = state.routine_engine.read().await.as_ref() {
-        engine.refresh_event_cache().await;
-    }
-
    Ok(Json(serde_json::json!({
        "status": if routine.enabled { "enabled" } else { "disabled" },
        "routine_id": routine_id,
@@ -242,12 +217,6 @@ pub async fn routines_delete_handler(
        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;

    if deleted {
-        // Refresh the in-memory event trigger cache so deleted event/system_event
-        // routines stop firing immediately (issue #1076).
-        if let Some(engine) = state.routine_engine.read().await.as_ref() {
-            engine.refresh_event_cache().await;
-        }
-
        Ok(Json(serde_json::json!({
            "status": "deleted",
            "routine_id": routine_id,
@@ -397,10 +397,6 @@ impl Channel for GatewayChannel {
            StatusUpdate::ImageGenerated { data_url, path } => SseEvent::ImageGenerated {
                data_url,
                path,
-                thread_id: thread_id.clone(),
-            },
-            StatusUpdate::Suggestions { suggestions } => SseEvent::Suggestions {
-                suggestions,
                thread_id,
            },
        };
@@ -26,7 +26,6 @@ use tower_http::set_header::SetResponseHeaderLayer;
 use uuid::Uuid;

 use crate::agent::SessionManager;
-use crate::agent::routine::{Trigger, next_cron_fire};
 use crate::bootstrap::ironclaw_base_dir;
 use crate::channels::IncomingMessage;
 use crate::channels::relay::DEFAULT_RELAY_NAME;
@@ -573,14 +572,6 @@ async fn oauth_callback_handler(
            extension = %flow.extension_name,
            "OAuth flow expired"
        );
-        // Notify UI so auth card can show error instead of staying stuck
-        if let Some(ref sender) = flow.sse_sender {
-            let _ = sender.send(SseEvent::AuthCompleted {
-                extension_name: flow.extension_name.clone(),
-                success: false,
-                message: "OAuth flow expired. Please try again.".to_string(),
-            });
-        }
        return oauth_error_page(&flow.display_name);
    }

@@ -590,12 +581,7 @@ async fn oauth_callback_handler(
    let exchange_proxy_url = std::env::var("IRONCLAW_OAUTH_EXCHANGE_URL").ok();

    let result: Result<(), String> = async {
-        let token_response = if let (Some(proxy_url), None) = (&exchange_proxy_url, &flow.resource)
-        {
-            // Use the platform exchange proxy when configured and no resource
-            // parameter is needed. The proxy holds client_secret server-side so
-            // the container never sees it. MCP flows (resource.is_some()) bypass
-            // the proxy because it doesn't forward the RFC 8707 resource param.
+        let token_response = if let Some(ref proxy_url) = exchange_proxy_url {
            let gateway_token = flow.gateway_token.as_deref().unwrap_or_default();
            oauth_defaults::exchange_via_proxy(
                proxy_url,
@@ -608,10 +594,7 @@ async fn oauth_callback_handler(
            .await
            .map_err(|e| e.to_string())?
        } else {
-            // Direct token exchange: uses exchange_oauth_code_with_resource so MCP
-            // flows can include the RFC 8707 `resource` parameter to scope the
-            // issued token to the specific MCP server.
-            oauth_defaults::exchange_oauth_code_with_resource(
+            oauth_defaults::exchange_oauth_code(
                &flow.token_url,
                &flow.client_id,
                flow.client_secret.as_deref(),
@@ -619,7 +602,6 @@ async fn oauth_callback_handler(
                &flow.redirect_uri,
                flow.code_verifier.as_deref(),
                &flow.access_token_field,
-                flow.resource.as_deref(),
            )
            .await
            .map_err(|e| e.to_string())?
@@ -646,19 +628,6 @@ async fn oauth_callback_handler(
        .await
        .map_err(|e| e.to_string())?;

-        // For MCP OAuth flows (identified by resource field), persist the
-        // client_id so token refresh works without re-authentication.
-        // The CLI flow stores this in authorize_mcp_server(); the gateway
-        // callback must do the same.
-        if let Some(ref client_id_secret) = flow.client_id_secret_name {
-            let params = crate::secrets::CreateSecretParams::new(client_id_secret, &flow.client_id)
-                .with_provider(flow.provider.as_ref().cloned().unwrap_or_default());
-            flow.secrets
-                .create(&flow.user_id, params)
-                .await
-                .map_err(|e| e.to_string())?;
-        }
-
        Ok(())
    }
    .await;
@@ -690,35 +659,12 @@ async fn oauth_callback_handler(
        }
    }

-    // After successful OAuth, auto-activate the extension so it moves
-    // from "Installed (Authenticate)" → "Active" without a second click.
-    // OAuth success is independent of activation — tokens are already stored.
-    // Report auth as successful and attempt activation as a bonus step.
-    let final_message = if success {
-        match ext_mgr.activate(&flow.extension_name).await {
-            Ok(result) => result.message,
-            Err(e) => {
-                tracing::warn!(
-                    extension = %flow.extension_name,
-                    error = %e,
-                    "Auto-activation after OAuth failed"
-                );
-                format!(
-                    "{} authenticated successfully. Activation failed: {}. Try activating manually.",
-                    flow.display_name, e
-                )
-            }
-        }
-    } else {
-        message
-    };
-
    // Broadcast SSE event to notify the web UI
    if let Some(ref sender) = flow.sse_sender {
        let _ = sender.send(SseEvent::AuthCompleted {
            extension_name: flow.extension_name,
            success,
-            message: final_message.clone(),
+            message,
        });
    }

@@ -1027,17 +973,11 @@ async fn chat_send_handler(
        req.images.len()
    );

-    // Clone sender to avoid holding RwLock read guard across send().await
-    let tx = {
-        let tx_guard = state.msg_tx.read().await;
-        tx_guard
-            .as_ref()
-            .ok_or((
-                StatusCode::SERVICE_UNAVAILABLE,
-                "Channel not started".to_string(),
-            ))?
-            .clone()
-    };
+    let tx_guard = state.msg_tx.read().await;
+    let tx = tx_guard.as_ref().ok_or((
+        StatusCode::SERVICE_UNAVAILABLE,
+        "Channel not started".to_string(),
+    ))?;

    tracing::debug!("[chat_send_handler] Sending message through channel");
    tx.send(msg).await.map_err(|_| {
@@ -1103,17 +1043,11 @@ async fn chat_approval_handler(

    let msg_id = msg.id;

-    // Clone sender to avoid holding RwLock read guard across send().await
-    let tx = {
-        let tx_guard = state.msg_tx.read().await;
-        tx_guard
-            .as_ref()
-            .ok_or((
-                StatusCode::SERVICE_UNAVAILABLE,
-                "Channel not started".to_string(),
-            ))?
-            .clone()
-    };
+    let tx_guard = state.msg_tx.read().await;
+    let tx = tx_guard.as_ref().ok_or((
+        StatusCode::SERVICE_UNAVAILABLE,
+        "Channel not started".to_string(),
+    ))?;

    tx.send(msg).await.map_err(|_| {
        (
@@ -2425,21 +2359,12 @@ async fn routines_toggle_handler(
        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?
        .ok_or((StatusCode::NOT_FOUND, "Routine not found".to_string()))?;

-    let was_enabled = routine.enabled;
    // If a specific value was provided, use it; otherwise toggle.
    routine.enabled = match body {
        Some(Json(req)) => req.enabled.unwrap_or(!routine.enabled),
        None => !routine.enabled,
    };

-    if routine.enabled
-        && !was_enabled
-        && let Trigger::Cron { schedule, timezone } = &routine.trigger
-    {
-        routine.next_fire_at = next_cron_fire(schedule, timezone.as_deref())
-            .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-    }
-
    store
        .update_routine(&routine)
        .await
@@ -2714,7 +2639,6 @@ struct GatewayStatusResponse {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::cli::oauth_defaults;
    use crate::testing::credentials::TEST_GATEWAY_CRYPTO_KEY;

    #[test]
@@ -2832,11 +2756,6 @@ mod tests {
            .with_state(state)
    }

-    fn expired_flow_created_at() -> Option<std::time::Instant> {
-        std::time::Instant::now()
-            .checked_sub(oauth_defaults::OAUTH_FLOW_EXPIRY + std::time::Duration::from_secs(1))
-    }
-
    #[tokio::test]
    async fn test_csp_header_present_on_responses() {
        use std::net::SocketAddr;
@@ -2943,14 +2862,29 @@ mod tests {
        use tower::ServiceExt;

        // Build an ExtensionManager so the handler can look up flows
-        let secrets: Arc<dyn crate::secrets::SecretsStore + Send + Sync> =
-            Arc::new(crate::secrets::InMemorySecretsStore::new(Arc::new(
-                crate::secrets::SecretsCrypto::new(secrecy::SecretString::from(
-                    TEST_GATEWAY_CRYPTO_KEY.to_string(),
-                ))
-                .expect("crypto"),
-            )));
-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets);
+        let secrets = Arc::new(crate::secrets::InMemorySecretsStore::new(Arc::new(
+            crate::secrets::SecretsCrypto::new(secrecy::SecretString::from(
+                TEST_GATEWAY_CRYPTO_KEY.to_string(),
+            ))
+            .expect("crypto"),
+        )));
+        let tool_registry = Arc::new(ToolRegistry::new());
+        let mcp_sm = Arc::new(crate::tools::mcp::session::McpSessionManager::new());
+
+        let ext_mgr = Arc::new(ExtensionManager::new(
+            mcp_sm,
+            Arc::new(crate::tools::mcp::process::McpProcessManager::new()),
+            secrets,
+            tool_registry,
+            None,
+            None,
+            std::path::PathBuf::from("/tmp/wasm_tools"),
+            std::path::PathBuf::from("/tmp/wasm_channels"),
+            None,
+            "test".to_string(),
+            None,
+            vec![],
+        ));

        let state = test_gateway_state(Some(ext_mgr));
        let app = test_oauth_router(state);
@@ -2984,13 +2918,25 @@ mod tests {
                ))
                .expect("crypto"),
            )));
-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets.clone());
-        let Some(created_at) = expired_flow_created_at() else {
-            eprintln!("Skipping expired OAuth flow test: monotonic uptime below expiry window");
-            return;
-        };
+        let tool_registry = Arc::new(ToolRegistry::new());
+        let mcp_sm = Arc::new(crate::tools::mcp::session::McpSessionManager::new());

-        // Insert an expired flow.
+        let ext_mgr = Arc::new(ExtensionManager::new(
+            mcp_sm,
+            Arc::new(crate::tools::mcp::process::McpProcessManager::new()),
+            secrets.clone(),
+            tool_registry,
+            None,
+            None,
+            std::path::PathBuf::from("/tmp/wasm_tools"),
+            std::path::PathBuf::from("/tmp/wasm_channels"),
+            None,
+            "test".to_string(),
+            None,
+            vec![],
+        ));
+
+        // Insert an expired flow (created 10 minutes ago)
        let flow = crate::cli::oauth_defaults::PendingOAuthFlow {
            extension_name: "test_tool".to_string(),
            display_name: "Test Tool".to_string(),
@@ -3008,9 +2954,9 @@ mod tests {
            secrets,
            sse_sender: None,
            gateway_token: None,
-            resource: None,
-            client_id_secret_name: None,
-            created_at,
+            created_at: std::time::Instant::now()
+                .checked_sub(std::time::Duration::from_secs(600))
+                .expect("System uptime is too low to run expired flow test"),
        };

        ext_mgr
@@ -3040,80 +2986,6 @@ mod tests {
        assert!(html.contains("Authorization Failed"));
    }

-    #[tokio::test]
-    async fn test_oauth_callback_expired_flow_broadcasts_auth_completed_failure() {
-        use axum::body::Body;
-        use tower::ServiceExt;
-
-        let secrets: Arc<dyn crate::secrets::SecretsStore + Send + Sync> =
-            Arc::new(crate::secrets::InMemorySecretsStore::new(Arc::new(
-                crate::secrets::SecretsCrypto::new(secrecy::SecretString::from(
-                    TEST_GATEWAY_CRYPTO_KEY.to_string(),
-                ))
-                .expect("crypto"),
-            )));
-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets.clone());
-
-        let (sender, mut receiver) = tokio::sync::broadcast::channel(4);
-        let Some(created_at) = expired_flow_created_at() else {
-            eprintln!("Skipping expired OAuth flow SSE test: monotonic uptime below expiry window");
-            return;
-        };
-        let flow = crate::cli::oauth_defaults::PendingOAuthFlow {
-            extension_name: "test_tool".to_string(),
-            display_name: "Test Tool".to_string(),
-            token_url: "https://example.com/token".to_string(),
-            client_id: "client123".to_string(),
-            client_secret: None,
-            redirect_uri: "https://example.com/oauth/callback".to_string(),
-            code_verifier: None,
-            access_token_field: "access_token".to_string(),
-            secret_name: "test_token".to_string(),
-            provider: None,
-            validation_endpoint: None,
-            scopes: vec![],
-            user_id: "test".to_string(),
-            secrets,
-            sse_sender: Some(sender),
-            gateway_token: None,
-            resource: None,
-            client_id_secret_name: None,
-            created_at,
-        };
-
-        ext_mgr
-            .pending_oauth_flows()
-            .write()
-            .await
-            .insert("expired_state".to_string(), flow);
-
-        let state = test_gateway_state(Some(ext_mgr));
-        let app = test_oauth_router(state);
-
-        let req = axum::http::Request::builder()
-            .uri("/oauth/callback?code=test_code&state=expired_state")
-            .body(Body::empty())
-            .expect("request");
-
-        let resp = ServiceExt::<axum::http::Request<Body>>::oneshot(app, req)
-            .await
-            .expect("response");
-        assert_eq!(resp.status(), StatusCode::OK);
-
-        match receiver.recv().await.expect("auth_completed event") {
-            crate::channels::web::types::SseEvent::AuthCompleted {
-                extension_name,
-                success,
-                message,
-            } => {
-                assert_eq!(extension_name, "test_tool");
-                assert!(!success, "expired OAuth flow should broadcast failure");
-                assert_eq!(message, "OAuth flow expired. Please try again.");
-            }
-            event => panic!("expected AuthCompleted event, got {event:?}"),
-        }
-    }
-
    #[tokio::test]
    async fn test_oauth_callback_no_extension_manager() {
        use axum::body::Body;
@@ -3152,16 +3024,28 @@ mod tests {
                ))
                .expect("crypto"),
            )));
-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets.clone());
+        let tool_registry = Arc::new(ToolRegistry::new());
+        let mcp_sm = Arc::new(crate::tools::mcp::session::McpSessionManager::new());
+
+        let ext_mgr = Arc::new(ExtensionManager::new(
+            mcp_sm,
+            Arc::new(crate::tools::mcp::process::McpProcessManager::new()),
+            secrets.clone(),
+            tool_registry,
+            None,
+            None,
+            std::path::PathBuf::from("/tmp/wasm_tools"),
+            std::path::PathBuf::from("/tmp/wasm_channels"),
+            None,
+            "test".to_string(),
+            None,
+            vec![],
+        ));

        // Insert a flow keyed by raw nonce "test_nonce" (without instance prefix).
        // Use an expired flow so the handler exits before attempting a real HTTP
        // token exchange — we only need to verify that the instance prefix was
        // stripped and the flow was found by the raw nonce.
-        let Some(created_at) = expired_flow_created_at() else {
-            eprintln!("Skipping OAuth state-prefix test: monotonic uptime below expiry window");
-            return;
-        };
        let flow = crate::cli::oauth_defaults::PendingOAuthFlow {
            extension_name: "test_tool".to_string(),
            display_name: "Test Tool".to_string(),
@@ -3179,10 +3063,10 @@ mod tests {
            secrets,
            sse_sender: None,
            gateway_token: None,
-            resource: None,
-            client_id_secret_name: None,
            // Expired — handler will reject after lookup (no network I/O)
-            created_at,
+            created_at: std::time::Instant::now()
+                .checked_sub(std::time::Duration::from_secs(600))
+                .expect("System uptime is too low to run expired flow test"),
        };

        ext_mgr
@@ -3253,27 +3137,24 @@ mod tests {

    fn test_ext_mgr(
        secrets: Arc<dyn crate::secrets::SecretsStore + Send + Sync>,
-    ) -> (Arc<ExtensionManager>, tempfile::TempDir, tempfile::TempDir) {
+    ) -> Arc<ExtensionManager> {
        let tool_registry = Arc::new(ToolRegistry::new());
        let mcp_sm = Arc::new(crate::tools::mcp::session::McpSessionManager::new());
        let mcp_pm = Arc::new(crate::tools::mcp::process::McpProcessManager::new());
-        let wasm_tools_dir = tempfile::tempdir().expect("temp wasm tools dir");
-        let wasm_channels_dir = tempfile::tempdir().expect("temp wasm channels dir");
-        let ext_mgr = Arc::new(ExtensionManager::new(
+        Arc::new(ExtensionManager::new(
            mcp_sm,
            mcp_pm,
            secrets,
            tool_registry,
            None,
            None,
-            wasm_tools_dir.path().to_path_buf(),
-            wasm_channels_dir.path().to_path_buf(),
+            std::path::PathBuf::from("/tmp/wasm_tools"),
+            std::path::PathBuf::from("/tmp/wasm_channels"),
            None,
            "test".to_string(),
            None,
            vec![],
-        ));
-        (ext_mgr, wasm_tools_dir, wasm_channels_dir)
+        ))
    }

    #[tokio::test]
@@ -3282,7 +3163,7 @@ mod tests {
        use tower::ServiceExt;

        let secrets = test_secrets_store();
-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets);
+        let ext_mgr = test_ext_mgr(secrets);
        let state = test_gateway_state(Some(ext_mgr));
        let app = test_relay_oauth_router(state);

@@ -3326,7 +3207,7 @@ mod tests {
            .await
            .expect("store nonce");

-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets);
+        let ext_mgr = test_ext_mgr(secrets);
        let state = test_gateway_state(Some(ext_mgr));
        let app = test_relay_oauth_router(state);

@@ -3371,7 +3252,7 @@ mod tests {
            .await
            .expect("store nonce");

-        let (ext_mgr, _wasm_tools_dir, _wasm_channels_dir) = test_ext_mgr(secrets.clone());
+        let ext_mgr = test_ext_mgr(secrets.clone());
        let state = test_gateway_state(Some(ext_mgr));
        let app = test_relay_oauth_router(state);

@@ -143,7 +143,6 @@ impl SseManager {
                    SseEvent::JobResult { .. } => "job_result",
                    SseEvent::Heartbeat => "heartbeat",
                    SseEvent::ImageGenerated { .. } => "image_generated",
-                    SseEvent::Suggestions { .. } => "suggestions",
                    SseEvent::ExtensionStatus { .. } => "extension_status",
                };
                Ok(Event::default().event(event_type).data(data))
@@ -19,7 +19,6 @@ let _loadThreadsTimer = null;
 const JOB_EVENTS_CAP = 500;
 const MEMORY_SEARCH_QUERY_MAX_LENGTH = 100;
 let stagedImages = [];
-let _ghostSuggestion = '';

 // --- Slash Commands ---

@@ -287,18 +286,9 @@ function connectSSE() {
      if (data.thread_id) debouncedLoadThreads();
      return;
    }
-    clearSuggestionChips();
    showActivityThinking(data.message);
  });

-  eventSource.addEventListener('suggestions', (e) => {
-    const data = JSON.parse(e.data);
-    if (!isCurrentThread(data.thread_id)) return;
-    if (data.suggestions && data.suggestions.length > 0) {
-      showSuggestionChips(data.suggestions);
-    }
-  });
-
  eventSource.addEventListener('tool_started', (e) => {
    const data = JSON.parse(e.data);
    if (!isCurrentThread(data.thread_id)) return;
@@ -352,27 +342,31 @@ function connectSSE() {

  eventSource.addEventListener('approval_needed', (e) => {
    const data = JSON.parse(e.data);
-    const hasThread = !!data.thread_id;
-    const forCurrentThread = !hasThread || isCurrentThread(data.thread_id);
-
-    if (forCurrentThread) {
-      showApproval(data);
-    } else {
-      // Keep thread list fresh when approval is requested in a background thread.
-      unreadThreads.set(data.thread_id, (unreadThreads.get(data.thread_id) || 0) + 1);
-      debouncedLoadThreads();
-    }
-
-    // Extension setup flows can surface approvals while user is on Extensions tab.
-    if (currentTab === 'extensions') loadExtensions();
+    if (!isCurrentThread(data.thread_id)) return;
+    showApproval(data);
  });

  eventSource.addEventListener('auth_required', (e) => {
-    handleAuthRequired(JSON.parse(e.data));
+    const data = JSON.parse(e.data);
+    if (data.auth_url) {
+      // OAuth flow: show the auth card with an OAuth button + optional token paste field.
+      showAuthCard(data);
+    } else {
+      // Setup flow: fetch the extension's credential schema and show the multi-field
+      // configure modal (the same UI used by the Extensions tab "Setup" button).
+      showConfigureModal(data.extension_name);
+    }
  });

  eventSource.addEventListener('auth_completed', (e) => {
-    handleAuthCompleted(JSON.parse(e.data));
+    const data = JSON.parse(e.data);
+    // Dismiss whichever UI path was active: auth card (OAuth) or configure modal (setup).
+    removeAuthCard(data.extension_name);
+    closeConfigureModal();
+    showToast(data.message, data.success ? 'success' : 'error');
+    // Refresh extensions list so status indicators update
+    if (currentTab === 'extensions') loadExtensions();
+    enableChatInput();
  });

  eventSource.addEventListener('extension_status', (e) => {
@@ -433,59 +427,9 @@ function isCurrentThread(threadId) {
  return threadId === currentThreadId;
 }

-// --- Suggestion Chips ---
-
-function showSuggestionChips(suggestions) {
-  // Clear previous chips/ghost without restoring placeholder (we'll set it below)
-  _ghostSuggestion = '';
-  const container = document.getElementById('suggestion-chips');
-  container.innerHTML = '';
-  const ghost = document.getElementById('ghost-text');
-  ghost.style.display = 'none';
-  const wrapper = document.querySelector('.chat-input-wrapper');
-  if (wrapper) wrapper.classList.remove('has-ghost');
-
-  _ghostSuggestion = suggestions[0] || '';
-  const input = document.getElementById('chat-input');
-  suggestions.forEach(text => {
-    const chip = document.createElement('button');
-    chip.className = 'suggestion-chip';
-    chip.textContent = text;
-    chip.addEventListener('click', () => {
-      input.value = text;
-      clearSuggestionChips();
-      autoResizeTextarea(input);
-      input.focus();
-      sendMessage();
-    });
-    container.appendChild(chip);
-  });
-  container.style.display = 'flex';
-  // Show first suggestion as ghost text in the input so user knows Tab works
-  if (_ghostSuggestion && input.value === '') {
-    ghost.textContent = _ghostSuggestion;
-    ghost.style.display = 'block';
-    input.closest('.chat-input-wrapper').classList.add('has-ghost');
-  }
-}
-
-function clearSuggestionChips() {
-  _ghostSuggestion = '';
-  const container = document.getElementById('suggestion-chips');
-  if (container) {
-    container.innerHTML = '';
-    container.style.display = 'none';
-  }
-  const ghost = document.getElementById('ghost-text');
-  if (ghost) ghost.style.display = 'none';
-  const wrapper = document.querySelector('.chat-input-wrapper');
-  if (wrapper) wrapper.classList.remove('has-ghost');
-}
-
 // --- Chat ---

 function sendMessage() {
-  clearSuggestionChips();
  const input = document.getElementById('chat-input');
  if (!currentThreadId) {
    console.warn('sendMessage: no thread selected, ignoring');
@@ -726,7 +670,7 @@ function renderMarkdown(text) {
    // Sanitize HTML output to prevent XSS from tool output or LLM responses.
    html = sanitizeRenderedHtml(html);
    // Inject copy buttons into <pre> blocks
-    html = html.replace(/<pre>/g, '<pre class="code-block-wrapper"><button class="copy-btn" data-action="copy-code">Copy</button>');
+    html = html.replace(/<pre>/g, '<pre class="code-block-wrapper"><button class="copy-btn" onclick="copyCodeBlock(this)">Copy</button>');
    return html;
  }
  return escapeHtml(text);
@@ -758,25 +702,16 @@ function copyCodeBlock(btn) {
  });
 }

-function copyMessage(btn) {
-  const message = btn.closest('.message');
-  if (!message) return;
-  const text = message.getAttribute('data-copy-text')
-    || message.getAttribute('data-raw')
-    || message.textContent
-    || '';
-  navigator.clipboard.writeText(text).then(() => {
-    btn.textContent = 'Copied';
-    setTimeout(() => { btn.textContent = 'Copy'; }, 1200);
-  }).catch(() => {
-    btn.textContent = 'Failed';
-    setTimeout(() => { btn.textContent = 'Copy'; }, 1200);
-  });
-}
-
 function addMessage(role, content) {
  const container = document.getElementById('chat-messages');
-  const div = createMessageElement(role, content);
+  const div = document.createElement('div');
+  div.className = 'message ' + role;
+  if (role === 'user') {
+    div.textContent = content;
+  } else {
+    div.setAttribute('data-raw', content);
+    div.innerHTML = renderMarkdown(content);
+  }
  container.appendChild(div);
  container.scrollTop = container.scrollHeight;
 }
@@ -788,11 +723,7 @@ function appendToLastAssistant(chunk) {
    const last = messages[messages.length - 1];
    const raw = (last.getAttribute('data-raw') || '') + chunk;
    last.setAttribute('data-raw', raw);
-    last.setAttribute('data-copy-text', raw);
-    const content = last.querySelector('.message-content');
-    if (content) {
-      content.innerHTML = renderMarkdown(raw);
-    }
+    last.innerHTML = renderMarkdown(raw);
    container.scrollTop = container.scrollHeight;
  } else {
    addMessage('assistant', chunk);
@@ -1046,26 +977,7 @@ function finalizeActivityGroup() {
  _activeToolCards = {};
 }

-function humanizeToolName(rawName) {
-  if (!rawName) return '';
-  return String(rawName)
-    .replace(/[_-]+/g, ' ')
-    .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
-    .replace(/^tool([a-zA-Z])/, 'tool $1')
-    .replace(/\s+/g, ' ')
-    .trim();
-}
-
-function shouldShowChannelConnectedMessage(extensionName, success) {
-  if (!success || !extensionName) return false;
-  return String(extensionName).toLowerCase().includes('telegram');
-}
-
 function showApproval(data) {
-  // Avoid duplicate cards on reconnect/history refresh.
-  const existing = document.querySelector('.approval-card[data-request-id="' + CSS.escape(data.request_id) + '"]');
-  if (existing) return;
-
  const container = document.getElementById('chat-messages');
  const card = document.createElement('div');
  card.className = 'approval-card';
@@ -1078,7 +990,7 @@ function showApproval(data) {

  const toolName = document.createElement('div');
  toolName.className = 'approval-tool-name';
-  toolName.textContent = humanizeToolName(data.tool_name);
+  toolName.textContent = data.tool_name;
  card.appendChild(toolName);

  if (data.description) {
@@ -1181,71 +1093,13 @@ function showJobCard(data) {

 // --- Auth card ---

-function handleAuthRequired(data) {
-  if (data.auth_url) {
-    // OAuth flow: show the global auth prompt with an OAuth button + optional token paste field.
-    showAuthCard(data);
-  } else {
-    // Setup flow: fetch the extension's credential schema and show the multi-field
-    // configure modal (the same UI used by the Extensions tab "Setup" button).
-    showConfigureModal(data.extension_name);
-  }
-}
-
-function handleAuthCompleted(data) {
-  // Dismiss only the matching extension's UI so unrelated setup work is not interrupted.
-  removeAuthCard(data.extension_name);
-  closeConfigureModal(data.extension_name);
-  showToast(data.message, data.success ? 'success' : 'error');
-  if (shouldShowChannelConnectedMessage(data.extension_name, data.success)) {
-    addMessage('system', 'Telegram is now connected. You can message me there and I can send you notifications.');
-  }
-  if (currentTab === 'extensions') loadExtensions();
-  enableChatInput();
-}
-
-function queryByDataAttribute(selector, attributeName, attributeValue) {
-  if (typeof attributeValue !== 'string') return document.querySelector(selector);
-
-  if (window.CSS && typeof window.CSS.escape === 'function') {
-    return document.querySelector(
-      selector + '[' + attributeName + '="' + window.CSS.escape(attributeValue) + '"]'
-    );
-  }
-
-  const candidates = document.querySelectorAll(selector);
-  for (const candidate of candidates) {
-    if (candidate.getAttribute(attributeName) === attributeValue) return candidate;
-  }
-  return null;
-}
-
-function getAuthOverlay(extensionName) {
-  return queryByDataAttribute('.auth-overlay', 'data-extension-name', extensionName);
-}
-
-function getAuthCard(extensionName) {
-  return queryByDataAttribute('.auth-card', 'data-extension-name', extensionName);
-}
-
-function getConfigureOverlay(extensionName) {
-  return queryByDataAttribute('.configure-overlay', 'data-extension-name', extensionName);
-}
-
 function showAuthCard(data) {
-  // Keep a single global auth prompt so the experience is consistent across tabs.
-  const existing = getAuthOverlay();
-  if (existing) existing.remove();
-
-  const overlay = document.createElement('div');
-  overlay.className = 'auth-overlay';
-  overlay.setAttribute('data-extension-name', data.extension_name);
-  overlay.addEventListener('click', (e) => {
-    if (e.target === overlay) cancelAuth(data.extension_name);
-  });
+  // Remove any existing card for this extension first
+  removeAuthCard(data.extension_name);

+  const container = document.getElementById('chat-messages');
  const card = document.createElement('div');
-  card.className = 'auth-card auth-modal';
+  card.className = 'auth-card';
  card.setAttribute('data-extension-name', data.extension_name);

  const header = document.createElement('div');
@@ -1324,30 +1178,21 @@ function showAuthCard(data) {
  actions.appendChild(cancelBtn);
  card.appendChild(actions);

-  overlay.appendChild(card);
-  document.body.appendChild(overlay);
+  container.appendChild(card);
+  container.scrollTop = container.scrollHeight;
  tokenInput.focus();
 }

 function removeAuthCard(extensionName) {
-  const overlay = getAuthOverlay(extensionName);
-  if (overlay) {
-    overlay.remove();
-    return;
-  }
-  const card = getAuthCard(extensionName);
-  if (card) {
-    const parentOverlay = card.closest('.auth-overlay');
-    if (parentOverlay) parentOverlay.remove();
-    else card.remove();
-  }
+  const card = document.querySelector('.auth-card[data-extension-name="' + extensionName + '"]');
+  if (card) card.remove();
 }

 function submitAuthToken(extensionName, tokenValue) {
  if (!tokenValue || !tokenValue.trim()) return;

  // Disable submit button while in flight
-  const card = getAuthCard(extensionName);
+  const card = document.querySelector('.auth-card[data-extension-name="' + extensionName + '"]');
  if (card) {
    const btns = card.querySelectorAll('button');
    btns.forEach((b) => { b.disabled = true; });
@@ -1358,10 +1203,8 @@ function submitAuthToken(extensionName, tokenValue) {
    body: { extension_name: extensionName, token: tokenValue.trim() },
  }).then((result) => {
    if (result.success) {
-      // Close immediately for responsiveness; the authoritative success UX
-      // (toast + extensions refresh) still comes from auth_completed SSE.
      removeAuthCard(extensionName);
-      enableChatInput();
+      addMessage('system', result.message);
    } else {
      showAuthCardError(extensionName, result.message);
    }
@@ -1380,7 +1223,7 @@ function cancelAuth(extensionName) {
 }

 function showAuthCardError(extensionName, message) {
-  const card = getAuthCard(extensionName);
+  const card = document.querySelector('.auth-card[data-extension-name="' + extensionName + '"]');
  if (!card) return;
  // Re-enable buttons
  const btns = card.querySelectorAll('button');
@@ -1394,7 +1237,6 @@ function showAuthCardError(extensionName, message) {
 }

 function loadHistory(before) {
-  clearSuggestionChips();
  let historyUrl = '/api/chat/history?limit=50';
  if (currentThreadId) {
    historyUrl += '&thread_id=' + encodeURIComponent(currentThreadId);
@@ -1468,31 +1310,12 @@ function loadHistory(before) {
 function createMessageElement(role, content) {
  const div = document.createElement('div');
  div.className = 'message ' + role;
-
-  if (role === 'assistant' || role === 'user') {
-    div.classList.add('has-copy');
-    div.setAttribute('data-copy-text', content);
-    const copyBtn = document.createElement('button');
-    copyBtn.className = 'message-copy-btn';
-    copyBtn.type = 'button';
-    copyBtn.setAttribute('aria-label', 'Copy message');
-    copyBtn.textContent = 'Copy';
-    copyBtn.addEventListener('click', (e) => {
-      e.stopPropagation();
-      copyMessage(copyBtn);
-    });
-    div.appendChild(copyBtn);
-  }
-
-  const body = document.createElement('div');
-  body.className = 'message-content';
-  if (role === 'user' || role === 'system') {
-    body.textContent = content;
+  if (role === 'user') {
+    div.textContent = content;
  } else {
    div.setAttribute('data-raw', content);
-    body.innerHTML = renderMarkdown(content);
+    div.innerHTML = renderMarkdown(content);
  }
-  div.appendChild(body);
  return div;
 }

@@ -1690,7 +1513,6 @@ function switchToAssistant() {
 }

 function switchThread(threadId) {
-  clearSuggestionChips();
  finalizeActivityGroup();
  currentThreadId = threadId;
  unreadThreads.delete(threadId);
@@ -1723,15 +1545,6 @@ chatInput.addEventListener('keydown', (e) => {
  const acEl = document.getElementById('slash-autocomplete');
  const acVisible = acEl && acEl.style.display !== 'none';

-  // Accept first suggestion with Tab (plain Tab only, not Shift+Tab)
-  if (e.key === 'Tab' && !e.shiftKey && !acVisible && _ghostSuggestion && chatInput.value === '') {
-    e.preventDefault();
-    chatInput.value = _ghostSuggestion;
-    clearSuggestionChips();
-    autoResizeTextarea(chatInput);
-    return;
-  }
-
  if (acVisible) {
    const items = acEl.querySelectorAll('.slash-ac-item');
    if (e.key === 'ArrowDown') {
@@ -1768,16 +1581,6 @@ chatInput.addEventListener('keydown', (e) => {
 chatInput.addEventListener('input', () => {
  autoResizeTextarea(chatInput);
  filterSlashCommands(chatInput.value);
-  const ghost = document.getElementById('ghost-text');
-  const wrapper = chatInput.closest('.chat-input-wrapper');
-  if (chatInput.value !== '') {
-    ghost.style.display = 'none';
-    wrapper.classList.remove('has-ghost');
-  } else if (_ghostSuggestion) {
-    ghost.textContent = _ghostSuggestion;
-    ghost.style.display = 'block';
-    wrapper.classList.add('has-ghost');
-  }
 });
 chatInput.addEventListener('blur', () => {
  // Small delay so mousedown on autocomplete item fires first
@@ -2016,11 +1819,13 @@ function saveMemoryEdit() {

 function buildBreadcrumb(path) {
  const parts = path.split('/');
-  let html = '<a data-action="breadcrumb-root" href="#">workspace</a>';
+  let html = '<a onclick="loadMemoryTree()">workspace</a>';
  let current = '';
  for (const part of parts) {
    current += (current ? '/' : '') + part;
-    html += ' / <a data-action="breadcrumb-file" data-path="' + escapeHtml(current) + '" href="#">' + escapeHtml(part) + '</a>';
+    // Store the path in data-path (HTML-escaped) and read it back via this.dataset.path
+    // to avoid single-quote injection in inline JS string literals.
+    html += ' / <a onclick="readMemoryFile(this.dataset.path)" data-path="' + escapeHtml(current) + '">' + escapeHtml(part) + '</a>';
  }
  return html;
 }
@@ -2331,10 +2136,6 @@ function renderAvailableExtensionCard(entry) {
        showToast(I18n.t('extensions.installedSuccess', {name: entry.display_name}), 'success');
        // OAuth popup if auth started during install (builtin creds)
        if (res.auth_url) {
-          showAuthCard({
-            extension_name: entry.name,
-            auth_url: res.auth_url,
-          });
          showToast('Opening authentication for ' + entry.display_name, 'info');
          openOAuthUrl(res.auth_url);
        }
@@ -2600,10 +2401,6 @@ function activateExtension(name) {
      if (res.success) {
        // Even on success, the tool may need OAuth (e.g., WASM loaded but no token yet)
        if (res.auth_url) {
-          showAuthCard({
-            extension_name: name,
-            auth_url: res.auth_url,
-          });
          showToast('Opening authentication for ' + name, 'info');
          openOAuthUrl(res.auth_url);
        }
@@ -2612,10 +2409,6 @@ function activateExtension(name) {
      }

      if (res.auth_url) {
-        showAuthCard({
-          extension_name: name,
-          auth_url: res.auth_url,
-        });
        showToast('Opening authentication for ' + name, 'info');
        openOAuthUrl(res.auth_url);
      } else if (res.awaiting_token) {
@@ -2658,7 +2451,6 @@ function renderConfigureModal(name, secrets) {
  closeConfigureModal();
  const overlay = document.createElement('div');
  overlay.className = 'configure-overlay';
-  overlay.setAttribute('data-extension-name', name);
  overlay.addEventListener('click', (e) => {
    if (e.target === overlay) closeConfigureModal();
  });
@@ -2752,8 +2544,7 @@ function submitConfigureModal(name, fields) {
  }

  // Disable buttons to prevent double-submit
-  const overlay = getConfigureOverlay(name) || document.querySelector('.configure-overlay');
-  var btns = overlay ? overlay.querySelectorAll('.configure-actions button') : [];
+  var btns = document.querySelectorAll('.configure-actions button');
  btns.forEach(function(b) { b.disabled = true; });

  apiFetch('/api/extensions/' + encodeURIComponent(name) + '/setup', {
@@ -2764,10 +2555,8 @@ function submitConfigureModal(name, fields) {
      if (res.success) {
        closeConfigureModal();
        if (res.auth_url) {
-          showAuthCard({
-            extension_name: name,
-            auth_url: res.auth_url,
-          });
+          // OAuth flow started — open consent popup. The auth_completed SSE will
+          // not arrive immediately (it fires after OAuth callback), so show a toast now.
          showToast('Opening OAuth authorization for ' + name, 'info');
          openOAuthUrl(res.auth_url);
          loadExtensions();
@@ -2786,9 +2575,8 @@ function submitConfigureModal(name, fields) {
    });
 }

-function closeConfigureModal(extensionName) {
-  if (typeof extensionName !== 'string') extensionName = null;
-  const existing = getConfigureOverlay(extensionName);
+function closeConfigureModal() {
+  const existing = document.querySelector('.configure-overlay');
  if (existing) existing.remove();
 }

@@ -3007,11 +2795,11 @@ function renderJobsList(jobs) {

    let actionBtns = '';
    if (job.state === 'pending' || job.state === 'in_progress') {
-      actionBtns = '<button class="btn-cancel" data-action="cancel-job" data-id="' + escapeHtml(job.id) + '">Cancel</button>';
+      actionBtns = '<button class="btn-cancel" onclick="event.stopPropagation(); cancelJob(\'' + job.id + '\')">Cancel</button>';
    }
    // Retry is only shown in the detail view where can_restart is available.

-    return '<tr class="job-row" data-action="open-job" data-id="' + escapeHtml(job.id) + '">'
+    return '<tr class="job-row" onclick="openJobDetail(\'' + job.id + '\')">'
      + '<td title="' + escapeHtml(job.id) + '">' + shortId + '</td>'
      + '<td>' + escapeHtml(job.title) + '</td>'
      + '<td><span class="badge ' + stateClass + '">' + escapeHtml(job.state) + '</span></td>'
@@ -3074,12 +2862,12 @@ function renderJobDetail(job) {
  const header = document.createElement('div');
  header.className = 'job-detail-header';

-  let headerHtml = '<button class="btn-back" data-action="close-job-detail">&larr; Back</button>'
+  let headerHtml = '<button class="btn-back" onclick="closeJobDetail()">&larr; Back</button>'
    + '<h2>' + escapeHtml(job.title) + '</h2>'
    + '<span class="badge ' + stateClass + '">' + escapeHtml(job.state) + '</span>';

  if ((job.state === 'failed' || job.state === 'interrupted') && job.can_restart === true) {
-    headerHtml += '<button class="btn-restart" data-action="restart-job" data-id="' + escapeHtml(job.id) + '">Retry</button>';
+    headerHtml += '<button class="btn-restart" onclick="restartJob(\'' + job.id + '\')">Retry</button>';
  }
  if (job.browse_url) {
    headerHtml += '<a class="btn-browse" href="' + escapeHtml(job.browse_url) + '" target="_blank">Browse Files</a>';
@@ -3536,7 +3324,7 @@ function renderRoutinesList(routines) {
    const toggleLabel = r.enabled ? 'Disable' : 'Enable';
    const toggleClass = r.enabled ? 'btn-cancel' : 'btn-restart';

-    return '<tr class="routine-row" data-action="open-routine" data-id="' + escapeHtml(r.id) + '">'
+    return '<tr class="routine-row" onclick="openRoutineDetail(\'' + r.id + '\')">'
      + '<td>' + escapeHtml(r.name) + '</td>'
      + '<td>' + escapeHtml(r.trigger_summary) + '</td>'
      + '<td>' + escapeHtml(r.action_type) + '</td>'
@@ -3545,9 +3333,9 @@ function renderRoutinesList(routines) {
      + '<td>' + r.run_count + '</td>'
      + '<td><span class="badge ' + statusClass + '">' + escapeHtml(r.status) + '</span></td>'
      + '<td>'
-      + '<button class="' + toggleClass + '" data-action="toggle-routine" data-id="' + escapeHtml(r.id) + '">' + toggleLabel + '</button> '
-      + '<button class="btn-restart" data-action="trigger-routine" data-id="' + escapeHtml(r.id) + '">Run</button> '
-      + '<button class="btn-cancel" data-action="delete-routine" data-id="' + escapeHtml(r.id) + '" data-name="' + escapeHtml(r.name) + '">Delete</button>'
+      + '<button class="' + toggleClass + '" onclick="event.stopPropagation(); toggleRoutine(\'' + r.id + '\')">' + toggleLabel + '</button> '
+      + '<button class="btn-restart" onclick="event.stopPropagation(); triggerRoutine(\'' + r.id + '\')">Run</button> '
+      + '<button class="btn-cancel" onclick="event.stopPropagation(); deleteRoutine(\'' + r.id + '\', \'' + escapeHtml(r.name) + '\')">Delete</button>'
      + '</td>'
      + '</tr>';
  }).join('');
@@ -3583,7 +3371,7 @@ function renderRoutineDetail(routine) {
    : 'active';

  let html = '<div class="job-detail-header">'
-    + '<button class="btn-back" data-action="close-routine-detail">&larr; Back</button>'
+    + '<button class="btn-back" onclick="closeRoutineDetail()">&larr; Back</button>'
    + '<h2>' + escapeHtml(routine.name) + '</h2>'
    + '<span class="badge ' + statusClass + '">' + escapeHtml(statusLabel) + '</span>'
    + '</div>';
@@ -3630,7 +3418,7 @@ function renderRoutineDetail(routine) {
        + '<td>' + formatDate(run.completed_at) + '</td>'
        + '<td><span class="badge ' + runStatusClass + '">' + escapeHtml(run.status) + '</span></td>'
        + '<td>' + escapeHtml(run.result_summary || '-')
-          + (run.job_id ? ' <a href="#" data-action="view-run-job" data-id="' + escapeHtml(run.job_id) + '">[view job]</a>' : '')
+          + (run.job_id ? ' <a href="#" onclick="event.preventDefault(); switchTab(\'jobs\'); openJobDetail(\'' + run.job_id + '\')">[view job]</a>' : '')
          + '</td>'
        + '<td>' + (run.tokens_used != null ? run.tokens_used : '-') + '</td>'
        + '</tr>';
@@ -3873,7 +3661,7 @@ function renderTeePopover(report) {
    + '<div class="tee-field"><div class="tee-field-label">VM Config</div>'
    + '<div class="tee-field-value">' + escapeHtml(vmConfig) + '</div></div>'
    + '<div class="tee-popover-actions">'
-    + '<button class="tee-btn-copy" data-action="copy-tee-report">Copy Full Report</button></div>';
+    + '<button class="tee-btn-copy" onclick="copyTeeReport()">Copy Full Report</button></div>';
 }

 function copyTeeReport() {
@@ -4355,94 +4143,3 @@ function formatDate(isoString) {
  const d = new Date(isoString);
  return d.toLocaleString();
 }
-
-// --- Event Listener Registration (CSP-safe, no inline handlers) ---
-
-document.getElementById('auth-connect-btn').addEventListener('click', () => authenticate());
-document.getElementById('restart-overlay').addEventListener('click', () => cancelRestart());
-document.getElementById('restart-close-btn').addEventListener('click', () => cancelRestart());
-document.getElementById('restart-cancel-btn').addEventListener('click', () => cancelRestart());
-document.getElementById('restart-confirm-btn').addEventListener('click', () => confirmRestart());
-document.getElementById('restart-btn').addEventListener('click', () => triggerRestart());
-document.getElementById('thread-new-btn').addEventListener('click', () => createNewThread());
-document.getElementById('thread-toggle-btn').addEventListener('click', () => toggleThreadSidebar());
-document.getElementById('assistant-thread').addEventListener('click', () => switchToAssistant());
-document.getElementById('send-btn').addEventListener('click', () => sendMessage());
-document.getElementById('memory-edit-btn').addEventListener('click', () => startMemoryEdit());
-document.getElementById('memory-save-btn').addEventListener('click', () => saveMemoryEdit());
-document.getElementById('memory-cancel-btn').addEventListener('click', () => cancelMemoryEdit());
-document.getElementById('logs-server-level').addEventListener('change', (e) => setServerLogLevel(e.target.value));
-document.getElementById('logs-pause-btn').addEventListener('click', () => toggleLogsPause());
-document.getElementById('logs-clear-btn').addEventListener('click', () => clearLogs());
-document.getElementById('wasm-install-btn').addEventListener('click', () => installWasmExtension());
-document.getElementById('mcp-add-btn').addEventListener('click', () => addMcpServer());
-document.getElementById('skill-search-btn').addEventListener('click', () => searchClawHub());
-document.getElementById('skill-install-btn').addEventListener('click', () => installSkillFromForm());
-
-// --- Delegated Event Handlers (for dynamically generated HTML) ---
-
-document.addEventListener('click', function(e) {
-  const el = e.target.closest('[data-action]');
-  if (!el) return;
-  const action = el.dataset.action;
-
-  switch (action) {
-    case 'copy-code':
-      copyCodeBlock(el);
-      break;
-    case 'breadcrumb-root':
-      e.preventDefault();
-      loadMemoryTree();
-      break;
-    case 'breadcrumb-file':
-      e.preventDefault();
-      readMemoryFile(el.dataset.path);
-      break;
-    case 'cancel-job':
-      e.stopPropagation();
-      cancelJob(el.dataset.id);
-      break;
-    case 'open-job':
-      openJobDetail(el.dataset.id);
-      break;
-    case 'close-job-detail':
-      closeJobDetail();
-      break;
-    case 'restart-job':
-      restartJob(el.dataset.id);
-      break;
-    case 'open-routine':
-      openRoutineDetail(el.dataset.id);
-      break;
-    case 'toggle-routine':
-      e.stopPropagation();
-      toggleRoutine(el.dataset.id);
-      break;
-    case 'trigger-routine':
-      e.stopPropagation();
-      triggerRoutine(el.dataset.id);
-      break;
-    case 'delete-routine':
-      e.stopPropagation();
-      deleteRoutine(el.dataset.id, el.dataset.name);
-      break;
-    case 'close-routine-detail':
-      closeRoutineDetail();
-      break;
-    case 'view-run-job':
-      e.preventDefault();
-      switchTab('jobs');
-      openJobDetail(el.dataset.id);
-      break;
-    case 'copy-tee-report':
-      copyTeeReport();
-      break;
-    case 'switch-language':
-      if (typeof switchLanguage === 'function') switchLanguage(el.dataset.lang);
-      break;
-  }
-});
-
-document.getElementById('language-btn').addEventListener('click', function() {
-  if (typeof toggleLanguageMenu === 'function') toggleLanguageMenu();
-});
@@ -9,12 +9,12 @@
  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
  <link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;600;700&family=IBM+Plex+Mono:wght@400;500;600&display=swap" rel="stylesheet">
  <link rel="stylesheet" href="/style.css">
-
+  
  <!-- i18n Modules -->
  <script src="/i18n/index.js"></script>
  <script src="/i18n/en.js"></script>
  <script src="/i18n/zh-CN.js"></script>
-
+  
  <script
    src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/3.2.3/purify.min.js"
    integrity="sha384-osZDKVu4ipZP703HmPOhWdyBajcFyjX2Psjk//TG1Rc0AdwEtuToaylrmcK3LdAl"
@@ -37,7 +37,7 @@
      <div class="auth-form">
        <label for="token-input" data-i18n="auth.tokenLabel">Gateway Token</label>
        <input type="password" id="token-input" data-i18n="auth.tokenPlaceholder" data-i18n-attr="placeholder" placeholder="Paste your auth token" autofocus>
-        <button id="auth-connect-btn" data-i18n="auth.connect">Connect</button>
+        <button onclick="authenticate()" data-i18n="auth.connect">Connect</button>
      </div>
      <div id="auth-error"></div>
      <p class="auth-hint" data-i18n="auth.hint">Enter the GATEWAY_AUTH_TOKEN from your .env configuration.</p>
@@ -46,11 +46,11 @@

  <!-- Restart Confirmation Modal -->
  <div id="restart-confirm-modal" class="restart-modal" style="display: none;">
-    <div class="restart-modal-overlay" id="restart-overlay"></div>
+    <div class="restart-modal-overlay" onclick="cancelRestart()"></div>
    <div class="restart-modal-content">
      <div class="restart-modal-header">
        <h2 data-i18n="restart.title">Restart IronClaw Instance</h2>
-        <button class="restart-modal-close" id="restart-close-btn" data-i18n="restart.closeTooltip" data-i18n-attr="title"
+        <button class="restart-modal-close" onclick="cancelRestart()" data-i18n="restart.closeTooltip" data-i18n-attr="title"
          title="Close">×</button>
      </div>
      <div class="restart-modal-body">
@@ -63,8 +63,8 @@
        </div>
      </div>
      <div class="restart-modal-footer">
-        <button class="restart-modal-btn cancel" id="restart-cancel-btn" data-i18n="restart.cancel">Cancel</button>
-        <button class="restart-modal-btn confirm" id="restart-confirm-btn" data-i18n="restart.confirm">Confirm Restart</button>
+        <button class="restart-modal-btn cancel" onclick="cancelRestart()" data-i18n="restart.cancel">Cancel</button>
+        <button class="restart-modal-btn confirm" onclick="confirmRestart()" data-i18n="restart.confirm">Confirm Restart</button>
      </div>
    </div>
  </div>
@@ -98,17 +98,17 @@
      <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 -->
      <div class="language-switcher">
-        <button class="language-btn" id="language-btn" type="button" title="Switch Language"
+        <button class="language-btn" id="language-btn" type="button" onclick="toggleLanguageMenu()" title="Switch Language"
          aria-label="Switch language" aria-haspopup="true" aria-expanded="false" aria-controls="language-menu">🌐</button>
        <div class="language-menu" id="language-menu" style="display: none;">
-          <button type="button" class="language-option" data-action="switch-language" data-lang="en">English</button>
-          <button type="button" class="language-option" data-action="switch-language" data-lang="zh-CN">简体中文</button>
+          <button type="button" class="language-option" onclick="switchLanguage('en')" data-lang="en">English</button>
+          <button type="button" class="language-option" onclick="switchLanguage('zh-CN')" data-lang="zh-CN">简体中文</button>
        </div>
      </div>
-
+      
      <button class="status-logs-btn" data-tab="logs" data-i18n="tab.logs" title="Logs">Logs</button>
      <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">
@@ -122,7 +122,7 @@
        <span id="sse-status" data-i18n="status.connected">Connected</span>
        <div class="gateway-popover" id="gateway-popover"></div>
      </div>
-      <button class="restart-btn" id="restart-btn" data-i18n="status.restartTooltip"
+      <button class="restart-btn" id="restart-btn" onclick="triggerRestart()" data-i18n="status.restartTooltip"
        data-i18n-attr="title" title="Gracefully restart the process" style="display: none;">
        <svg id="restart-icon" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
          <path d="M23 4v6h-6"></path>
@@ -137,13 +137,13 @@
    <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"
+          <button class="thread-new-btn" onclick="createNewThread()" 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"
+          <button class="thread-toggle-btn" id="thread-toggle-btn" onclick="toggleThreadSidebar()" data-i18n="chat.toggleSidebar"
            data-i18n-attr="title" title="Toggle sidebar">&laquo;</button>
        </div>
-        <div class="assistant-item" id="assistant-thread">
+        <div class="assistant-item" id="assistant-thread" onclick="switchToAssistant()">
          <span class="assistant-label" id="assistant-label" data-i18n="chat.assistant">Assistant</span>
          <span class="assistant-meta" id="assistant-meta"></span>
        </div>
@@ -155,17 +155,13 @@
      <div class="chat-container">
        <div class="chat-messages" id="chat-messages"></div>
        <div id="slash-autocomplete" class="slash-autocomplete" style="display:none"></div>
-        <div id="suggestion-chips" class="suggestion-chips" style="display:none"></div>
        <div class="chat-input">
          <div id="image-preview-strip" class="image-preview-strip"></div>
-          <div class="chat-input-wrapper">
-            <textarea id="chat-input" data-i18n="chat.inputPlaceholder" data-i18n-attr="placeholder" placeholder="Message or / for commands..." rows="1"></textarea>
-            <div id="ghost-text" class="ghost-text"></div>
-          </div>
+          <textarea id="chat-input" data-i18n="chat.inputPlaceholder" data-i18n-attr="placeholder" placeholder="Message or / for commands..." rows="1"></textarea>
          <input type="file" id="image-file-input" accept="image/*" multiple style="display:none">
          <button id="attach-btn" class="attach-btn" data-i18n="chat.attachImages" data-i18n-attr="title" title="Attach images"
            aria-label="Attach images">&#x1F4CE;</button>
-          <button id="send-btn" data-i18n="chat.send">Send</button>
+          <button id="send-btn" onclick="sendMessage()" data-i18n="chat.send">Send</button>
        </div>
      </div>
    </div>
@@ -182,7 +178,7 @@
        <div class="memory-content">
          <div class="memory-breadcrumb" id="memory-breadcrumb">
            <span id="memory-breadcrumb-path">workspace /</span>
-            <button class="memory-edit-btn" id="memory-edit-btn" style="display:none" data-i18n="memory.edit">Edit</button>
+            <button class="memory-edit-btn" id="memory-edit-btn" style="display:none" onclick="startMemoryEdit()" data-i18n="memory.edit">Edit</button>
          </div>
          <div class="memory-viewer" id="memory-viewer">
            <div class="empty" data-i18n="memory.selectFile">Select a file to view its contents</div>
@@ -190,8 +186,8 @@
          <div class="memory-editor" id="memory-editor" style="display:none">
            <textarea id="memory-edit-textarea"></textarea>
            <div class="memory-editor-actions">
-              <button class="btn-save" id="memory-save-btn" data-i18n="memory.save">Save</button>
-              <button class="btn-cancel-edit" id="memory-cancel-btn" data-i18n="memory.cancel">Cancel</button>
+              <button class="btn-save" onclick="saveMemoryEdit()" data-i18n="memory.save">Save</button>
+              <button class="btn-cancel-edit" onclick="cancelMemoryEdit()" data-i18n="memory.cancel">Cancel</button>
            </div>
          </div>
        </div>
@@ -223,7 +219,7 @@
    <div class="tab-panel" id="tab-logs">
      <div class="logs-container">
        <div class="logs-toolbar">
-          <select id="logs-server-level" title="Server-side log level (changes what the server emits)">
+          <select id="logs-server-level" onchange="setServerLogLevel(this.value)" title="Server-side log level (changes what the server emits)">
            <option value="error">Server: ERROR</option>
            <option value="warn">Server: WARN</option>
            <option value="info" selected>Server: INFO</option>
@@ -238,8 +234,8 @@
          </select>
          <input type="text" id="logs-target-filter" placeholder="Filter by target...">
          <label class="logs-checkbox"><input type="checkbox" id="logs-autoscroll" checked> <span data-i18n="logs.autoScroll">Auto-scroll</span></label>
-          <button id="logs-pause-btn" data-i18n="logs.pause">Pause</button>
-          <button id="logs-clear-btn" data-i18n="logs.clear">Clear</button>
+          <button id="logs-pause-btn" onclick="toggleLogsPause()" data-i18n="logs.pause">Pause</button>
+          <button onclick="clearLogs()" data-i18n="logs.clear">Clear</button>
        </div>
        <div class="logs-output" id="logs-output"></div>
      </div>
@@ -291,7 +287,7 @@
          <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>
+            <button onclick="installWasmExtension()" data-i18n="extensions.install">Install</button>
          </div>
        </div>
        <div class="extensions-section">
@@ -303,7 +299,7 @@
          <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>
+            <button onclick="addMcpServer()" data-i18n="mcp.add">Add</button>
          </div>
        </div>
        <div class="extensions-section">
@@ -324,7 +320,7 @@
          <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>
+            <button onclick="searchClawHub()" data-i18n="skills.search">Search</button>
          </div>
          <div class="extensions-list" id="skill-search-results"></div>
        </div>
@@ -339,7 +335,7 @@
          <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>
+            <button onclick="installSkillFromForm()" data-i18n="extensions.install">Install</button>
          </div>
        </div>
      </div>
@@ -666,7 +666,6 @@ body {
  font-size: 14px;
  line-height: 1.5;
  word-wrap: break-word;
-  position: relative;
 }

 .message.user {
@@ -687,58 +686,6 @@ body {
  line-height: 1.6;
 }

-.message.has-copy {
-  padding-right: 52px;
-}
-
-.message-content {
-  min-width: 0;
-}
-
-.message-copy-btn {
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  z-index: 2;
-  border: 1px solid var(--border);
-  background: var(--bg-primary);
-  color: var(--text-secondary);
-  border-radius: 8px;
-  font-size: 11px;
-  padding: 2px 8px;
-  opacity: 0;
-  pointer-events: none;
-  transition: opacity 0.15s ease;
-}
-
-.message.user:hover .message-copy-btn,
-.message.assistant:hover .message-copy-btn,
-.message.user:focus-within .message-copy-btn,
-.message.assistant:focus-within .message-copy-btn {
-  opacity: 1;
-  pointer-events: auto;
-}
-
-.message-copy-btn:focus-visible {
-  opacity: 1;
-  pointer-events: auto;
-  outline: 2px solid var(--accent);
-  outline-offset: 1px;
-}
-
-.message-copy-btn:hover {
-  background: var(--bg-secondary);
-  color: var(--text-primary);
-}
-
-@media (hover: none) {
-  .message.user .message-copy-btn,
-  .message.assistant .message-copy-btn {
-    opacity: 1;
-    pointer-events: auto;
-  }
-}
-
 .message.system {
  align-self: center;
  background: var(--bg-tertiary);
@@ -1219,21 +1166,7 @@ body {
  color: var(--danger);
 }

-/* Auth prompt */
-.auth-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 1001;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 16px;
-}
-
+/* Auth card (inline in chat) */
 .auth-card {
  align-self: flex-start;
  max-width: 80%;
@@ -1248,16 +1181,6 @@ body {
  transition: border-color 0.2s;
 }

-.auth-overlay .auth-card {
-  width: 460px;
-  max-width: min(460px, 90vw);
-  margin: 0;
-  align-self: auto;
-  background: var(--bg);
-  border-color: rgba(52, 211, 153, 0.35);
-  box-shadow: 0 24px 48px rgba(0, 0, 0, 0.35);
-}
-
 .auth-card .auth-header {
  font-weight: 600;
  color: var(--accent);
@@ -1362,14 +1285,8 @@ body {
  min-height: 56px;
 }

-.chat-input-wrapper {
-  position: relative;
+.chat-input textarea {
  flex: 1;
-  display: flex;
-}
-
-.chat-input-wrapper textarea {
-  width: 100%;
  padding: 8px 12px;
  background: var(--bg);
  border: 1px solid var(--border);
@@ -1382,66 +1299,17 @@ body {
  max-height: 120px;
 }

-.ghost-text {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  padding: 8px 12px;
-  font-size: 14px;
-  font-family: inherit;
-  color: var(--text-secondary);
-  opacity: 0.5;
-  pointer-events: none;
-  white-space: pre-wrap;
-  overflow: hidden;
-  display: none;
-  z-index: 1;
-}
-
-/* Hide native placeholder when ghost text is visible */
-.chat-input-wrapper.has-ghost textarea::placeholder {
-  color: transparent;
-}
-
-.chat-input-wrapper textarea:focus {
+.chat-input textarea:focus {
  outline: none;
  border-color: var(--accent);
  box-shadow: 0 0 0 3px rgba(52, 211, 153, 0.1);
 }

-.chat-input-wrapper textarea:disabled {
+.chat-input textarea:disabled {
  opacity: 0.5;
  cursor: not-allowed;
 }

-.suggestion-chips {
-  display: none;
-  flex-wrap: wrap;
-  gap: 8px;
-  padding: 8px 16px;
-  border-top: 1px solid var(--border);
-}
-
-.suggestion-chip {
-  padding: 6px 14px;
-  background: var(--bg-secondary);
-  border: 1px solid var(--border);
-  border-radius: 16px;
-  color: var(--text-secondary);
-  font-size: 13px;
-  font-family: inherit;
-  cursor: pointer;
-  transition: all 0.15s ease;
-  white-space: nowrap;
-}
-
-.suggestion-chip:hover {
-  background: var(--accent);
-  color: #09090b;
-  border-color: var(--accent);
-}
-
 .chat-input button {
  padding: 8px 20px;
  background: var(--accent);
@@ -1471,7 +1339,7 @@ body {
 }

 /* Keyboard accessibility focus rings */
-.chat-input-wrapper textarea:focus-visible,
+.chat-input textarea:focus-visible,
 .chat-input button:focus-visible,
 .tab-bar button:focus-visible,
 .tree-row:focus-visible {
@@ -3879,7 +3747,7 @@ mark {
    min-height: 52px;
  }

-  .chat-input-wrapper textarea {
+  .chat-input textarea {
    min-height: 36px;
    max-height: 100px;
  }
@@ -242,14 +242,6 @@ pub enum SseEvent {
        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 {
@@ -715,7 +707,6 @@ impl WsServerMessage {
            SseEvent::JobStatus { .. } => "job_status",
            SseEvent::JobResult { .. } => "job_result",
            SseEvent::ImageGenerated { .. } => "image_generated",
-            SseEvent::Suggestions { .. } => "suggestions",
            SseEvent::ExtensionStatus { .. } => "extension_status",
        };
        let data = serde_json::to_value(event).unwrap_or(serde_json::Value::Null);
@@ -176,12 +176,8 @@ async fn handle_client_message(
                incoming = incoming.with_attachments(attachments);
            }

-            // Clone sender to avoid holding RwLock read guard across send().await
-            let tx = {
-                let tx_guard = state.msg_tx.read().await;
-                tx_guard.as_ref().cloned()
-            };
-            if let Some(tx) = tx {
+            let tx_guard = state.msg_tx.read().await;
+            if let Some(ref tx) = *tx_guard {
                if tx.send(incoming).await.is_err() {
                    let _ = direct_tx
                        .send(WsServerMessage::Error {
@@ -249,12 +245,8 @@ async fn handle_client_message(
            if let Some(ref tid) = thread_id {
                msg = msg.with_thread(tid);
            }
-            // Clone sender to avoid holding RwLock read guard across send().await
-            let tx = {
-                let tx_guard = state.msg_tx.read().await;
-                tx_guard.as_ref().cloned()
-            };
-            if let Some(tx) = tx {
+            let tx_guard = state.msg_tx.read().await;
+            if let Some(ref tx) = *tx_guard {
                let _ = tx.send(msg).await;
            }
        }
@@ -172,35 +172,6 @@ pub async fn exchange_oauth_code(
    redirect_uri: &str,
    code_verifier: Option<&str>,
    access_token_field: &str,
-) -> Result<OAuthTokenResponse, OAuthCallbackError> {
-    // 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,
-        code,
-        redirect_uri,
-        code_verifier,
-        access_token_field,
-        None,
-    )
-    .await
-}
-
-/// 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 client = reqwest::Client::new();
    let mut token_params = vec![
@@ -213,12 +184,6 @@ pub async fn exchange_oauth_code_with_resource(
        token_params.push(("code_verifier", verifier.to_string()));
    }

-    // 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);

    if let Some(secret) = client_secret {
@@ -423,12 +388,6 @@ 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>,
-    /// 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>,
    /// When this flow was created (for expiry).
    pub created_at: std::time::Instant,
 }
@@ -1016,42 +975,4 @@ mod tests {
        assert_eq!(strip_instance_prefix("abc123"), "abc123");
        assert_eq!(strip_instance_prefix(""), "");
    }
-
-    /// 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.
-    #[test]
-    fn test_build_oauth_url_includes_resource_via_extra_params() {
-        use std::collections::HashMap;
-
-        use crate::cli::oauth_defaults::build_oauth_url;
-
-        let mut extra = HashMap::new();
-        extra.insert(
-            "resource".to_string(),
-            "https://mcp.example.com".to_string(),
-        );
-
-        let result = build_oauth_url(
-            "https://auth.example.com/authorize",
-            "client-123",
-            "https://gateway.example.com/oauth/callback",
-            &["read".to_string()],
-            true,
-            &extra,
-        );
-
-        // The resource parameter should be URL-encoded in the auth URL
-        assert!(
-            result
-                .url
-                .contains("resource=https%3A%2F%2Fmcp.example.com"),
-            "Expected resource param in URL: {}",
-            result.url
-        );
-        // State and PKCE should be present
-        assert!(result.url.contains("state="));
-        assert!(result.url.contains("code_challenge="));
-        assert!(result.code_verifier.is_some());
-    }
 }
@@ -127,11 +127,7 @@ fn cmd_list(
                .unwrap_or("none");
            println!(
                "{:<20} {:<8} {:<8} {:<10} {}",
-                m.name,
-                m.kind,
-                m.version.as_deref().unwrap_or("-"),
-                auth,
-                m.description
+                m.name, m.kind, m.version, auth, m.description
            );
        } else {
            println!("{:<20} {:<8} {}", m.name, m.kind, m.description);
@@ -177,25 +173,17 @@ fn cmd_info(catalog: &RegistryCatalog, name: &str) -> anyhow::Result<()> {
        .map_err(|e| anyhow::anyhow!("{}", e))?;

    println!("{} ({})", manifest.display_name, manifest.kind);
-    if let Some(ref version) = manifest.version {
-        println!("  Version: {}", version);
-    }
+    println!("  Version: {}", manifest.version);
    println!("  {}", manifest.description);

    if !manifest.keywords.is_empty() {
        println!("  Keywords: {}", manifest.keywords.join(", "));
    }

-    if let Some(ref source) = manifest.source {
-        println!("\nSource:");
-        println!("  Directory: {}", source.dir);
-        println!("  Crate: {}", source.crate_name);
-        println!("  Capabilities: {}", source.capabilities);
-    }
-
-    if let Some(ref url) = manifest.url {
-        println!("\nMCP Server URL: {}", url);
-    }
+    println!("\nSource:");
+    println!("  Directory: {}", manifest.source.dir);
+    println!("  Crate: {}", manifest.source.crate_name);
+    println!("  Capabilities: {}", manifest.source.capabilities);

    if let Some(artifact) = manifest.artifacts.get("wasm32-wasip2") {
        println!("\nArtifact (wasm32-wasip2):");
@@ -330,8 +330,6 @@ async fn create(
            prompt: prompt.to_string(),
            context_paths: Vec::new(),
            max_tokens: 4096,
-            use_tools: false,
-            max_tool_rounds: 0,
        },
        guardrails: RoutineGuardrails {
            cooldown: std::time::Duration::from_secs(cooldown_secs),
@@ -23,9 +23,6 @@ pub struct EmbeddingsConfig {
    pub ollama_base_url: String,
    /// Embedding vector dimension. Inferred from the model name when not set explicitly.
    pub dimension: usize,
-    /// Custom base URL for OpenAI-compatible embedding providers.
-    /// When set, overrides the default `https://api.openai.com`.
-    pub openai_base_url: Option<String>,
 }

 impl Default for EmbeddingsConfig {
@@ -39,7 +36,6 @@ impl Default for EmbeddingsConfig {
            model,
            ollama_base_url: "http://localhost:11434".to_string(),
            dimension,
-            openai_base_url: None,
        }
    }
 }
@@ -78,8 +74,6 @@ impl EmbeddingsConfig {

        let enabled = parse_bool_env("EMBEDDING_ENABLED", settings.embeddings.enabled)?;

-        let openai_base_url = optional_env("EMBEDDING_BASE_URL")?;
-
        Ok(Self {
            enabled,
            provider,
@@ -87,7 +81,6 @@ impl EmbeddingsConfig {
            model,
            ollama_base_url,
            dimension,
-            openai_base_url,
        })
    }

@@ -137,27 +130,16 @@ impl EmbeddingsConfig {
            }
            _ => {
                if let Some(api_key) = self.openai_api_key() {
-                    let mut provider = crate::workspace::OpenAiEmbeddings::with_model(
+                    tracing::debug!(
+                        "Embeddings enabled via OpenAI (model: {}, dim: {})",
+                        self.model,
+                        self.dimension,
+                    );
+                    Some(Arc::new(crate::workspace::OpenAiEmbeddings::with_model(
                        api_key,
                        &self.model,
                        self.dimension,
-                    );
-                    if let Some(ref base_url) = self.openai_base_url {
-                        tracing::debug!(
-                            "Embeddings enabled via OpenAI (model: {}, base_url: {}, dim: {})",
-                            self.model,
-                            base_url,
-                            self.dimension,
-                        );
-                        provider = provider.with_base_url(base_url);
-                    } else {
-                        tracing::debug!(
-                            "Embeddings enabled via OpenAI (model: {}, dim: {})",
-                            self.model,
-                            self.dimension,
-                        );
-                    }
-                    Some(Arc::new(provider))
+                    )))
                } else {
                    tracing::warn!("Embeddings configured but OPENAI_API_KEY not set");
                    None
@@ -182,7 +164,6 @@ mod tests {
            std::env::remove_var("EMBEDDING_PROVIDER");
            std::env::remove_var("EMBEDDING_MODEL");
            std::env::remove_var("OPENAI_API_KEY");
-            std::env::remove_var("EMBEDDING_BASE_URL");
        }
    }

@@ -266,41 +247,4 @@ mod tests {
            std::env::remove_var("EMBEDDING_ENABLED");
        }
    }
-
-    #[test]
-    fn embedding_base_url_parsed_from_env() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_embedding_env();
-
-        // SAFETY: Under ENV_MUTEX, no concurrent env access.
-        unsafe {
-            std::env::set_var("EMBEDDING_BASE_URL", "https://custom.example.com");
-        }
-
-        let settings = Settings::default();
-        let config = EmbeddingsConfig::resolve(&settings).expect("resolve should succeed");
-        assert_eq!(
-            config.openai_base_url.as_deref(),
-            Some("https://custom.example.com"),
-            "EMBEDDING_BASE_URL env var should be parsed into openai_base_url"
-        );
-
-        // SAFETY: Under ENV_MUTEX.
-        unsafe {
-            std::env::remove_var("EMBEDDING_BASE_URL");
-        }
-    }
-
-    #[test]
-    fn embedding_base_url_defaults_to_none() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_embedding_env();
-
-        let settings = Settings::default();
-        let config = EmbeddingsConfig::resolve(&settings).expect("resolve should succeed");
-        assert!(
-            config.openai_base_url.is_none(),
-            "openai_base_url should be None when EMBEDDING_BASE_URL is not set"
-        );
-    }
 }
@@ -18,7 +18,6 @@ pub mod relay;
 mod routines;
 mod safety;
 mod sandbox;
-mod search;
 mod secrets;
 mod skills;
 mod transcription;
@@ -45,7 +44,6 @@ pub use self::routines::RoutineConfig;
 pub use self::safety::SafetyConfig;
 use self::safety::resolve_safety_config;
 pub use self::sandbox::{ClaudeCodeConfig, SandboxModeConfig};
-pub use self::search::WorkspaceSearchConfig;
 pub use self::secrets::SecretsConfig;
 pub use self::skills::SkillsConfig;
 pub use self::transcription::TranscriptionConfig;
@@ -93,7 +91,6 @@ pub struct Config {
    pub claude_code: ClaudeCodeConfig,
    pub skills: SkillsConfig,
    pub transcription: TranscriptionConfig,
-    pub search: WorkspaceSearchConfig,
    pub observability: crate::observability::ObservabilityConfig,
    /// Channel-relay integration (Slack via external relay service).
    /// Present only when both `CHANNEL_RELAY_URL` and `CHANNEL_RELAY_API_KEY` are set.
@@ -169,7 +166,6 @@ impl Config {
                ..SkillsConfig::default()
            },
            transcription: TranscriptionConfig::default(),
-            search: WorkspaceSearchConfig::default(),
            observability: crate::observability::ObservabilityConfig::default(),
            relay: None,
        }
@@ -322,7 +318,6 @@ impl Config {
            claude_code: ClaudeCodeConfig::resolve()?,
            skills: SkillsConfig::resolve()?,
            transcription: TranscriptionConfig::resolve(settings)?,
-            search: WorkspaceSearchConfig::resolve()?,
            observability: crate::observability::ObservabilityConfig {
                backend: std::env::var("OBSERVABILITY_BACKEND").unwrap_or_else(|_| "none".into()),
            },
@@ -1,211 +0,0 @@
-use crate::config::helpers::{optional_env, parse_optional_env};
-use crate::error::ConfigError;
-use crate::workspace::FusionStrategy;
-
-/// Workspace search configuration resolved from environment variables.
-#[derive(Debug, Clone)]
-pub struct WorkspaceSearchConfig {
-    /// Fusion strategy: "rrf" or "weighted".
-    pub fusion_strategy: FusionStrategy,
-    /// RRF constant k (default 60).
-    pub rrf_k: u32,
-    /// FTS weight for fusion.
-    ///
-    /// [`Default`] uses 0.5. When the configuration is resolved, per-strategy
-    /// defaults are applied: 0.5 (RRF) or 0.3 (weighted).
-    pub fts_weight: f32,
-    /// Vector weight for fusion.
-    ///
-    /// [`Default`] uses 0.5. When the configuration is resolved, per-strategy
-    /// defaults are applied: 0.5 (RRF) or 0.7 (weighted).
-    pub vector_weight: f32,
-}
-
-impl Default for WorkspaceSearchConfig {
-    fn default() -> Self {
-        Self {
-            fusion_strategy: FusionStrategy::default(),
-            rrf_k: 60,
-            fts_weight: 0.5,
-            vector_weight: 0.5,
-        }
-    }
-}
-
-impl WorkspaceSearchConfig {
-    pub(crate) fn resolve() -> Result<Self, ConfigError> {
-        let fusion_strategy = match optional_env("SEARCH_FUSION_STRATEGY")? {
-            Some(s) => match s.to_lowercase().as_str() {
-                "rrf" => FusionStrategy::Rrf,
-                "weighted" => FusionStrategy::WeightedScore,
-                other => {
-                    return Err(ConfigError::InvalidValue {
-                        key: "SEARCH_FUSION_STRATEGY".to_string(),
-                        message: format!("must be 'rrf' or 'weighted', got '{other}'"),
-                    });
-                }
-            },
-            None => FusionStrategy::default(),
-        };
-
-        let rrf_k = parse_optional_env("SEARCH_RRF_K", 60u32)?;
-
-        // Per-strategy weight defaults: RRF uses 0.5/0.5, weighted uses 0.3/0.7 (vector-biased).
-        let (default_fts, default_vec) = match fusion_strategy {
-            FusionStrategy::Rrf => (0.5f32, 0.5f32),
-            FusionStrategy::WeightedScore => (0.3f32, 0.7f32),
-        };
-        let fts_weight = parse_optional_env("SEARCH_FTS_WEIGHT", default_fts)?;
-        let vector_weight = parse_optional_env("SEARCH_VECTOR_WEIGHT", default_vec)?;
-
-        if !fts_weight.is_finite() || fts_weight < 0.0 {
-            return Err(ConfigError::InvalidValue {
-                key: "SEARCH_FTS_WEIGHT".to_string(),
-                message: "must be a finite, non-negative float".to_string(),
-            });
-        }
-        if !vector_weight.is_finite() || vector_weight < 0.0 {
-            return Err(ConfigError::InvalidValue {
-                key: "SEARCH_VECTOR_WEIGHT".to_string(),
-                message: "must be a finite, non-negative float".to_string(),
-            });
-        }
-        if matches!(fusion_strategy, FusionStrategy::WeightedScore)
-            && fts_weight == 0.0
-            && vector_weight == 0.0
-        {
-            return Err(ConfigError::InvalidValue {
-                key: "SEARCH_FTS_WEIGHT/SEARCH_VECTOR_WEIGHT".to_string(),
-                message: "weighted fusion requires at least one non-zero weight".to_string(),
-            });
-        }
-
-        Ok(Self {
-            fusion_strategy,
-            rrf_k,
-            fts_weight,
-            vector_weight,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::config::helpers::ENV_MUTEX;
-
-    fn clear_search_env() {
-        // SAFETY: Only called under ENV_MUTEX in tests.
-        unsafe {
-            std::env::remove_var("SEARCH_FUSION_STRATEGY");
-            std::env::remove_var("SEARCH_RRF_K");
-            std::env::remove_var("SEARCH_FTS_WEIGHT");
-            std::env::remove_var("SEARCH_VECTOR_WEIGHT");
-        }
-    }
-
-    #[test]
-    fn defaults_when_no_env() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_search_env();
-
-        let config = WorkspaceSearchConfig::resolve().expect("should resolve");
-        assert_eq!(config.fusion_strategy, FusionStrategy::Rrf);
-        assert_eq!(config.rrf_k, 60);
-        assert!((config.fts_weight - 0.5).abs() < 0.001);
-        assert!((config.vector_weight - 0.5).abs() < 0.001);
-    }
-
-    #[test]
-    fn env_overrides() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_search_env();
-
-        // SAFETY: Under ENV_MUTEX.
-        unsafe {
-            std::env::set_var("SEARCH_FUSION_STRATEGY", "weighted");
-            std::env::set_var("SEARCH_RRF_K", "30");
-            std::env::set_var("SEARCH_FTS_WEIGHT", "0.9");
-            std::env::set_var("SEARCH_VECTOR_WEIGHT", "0.1");
-        }
-
-        let config = WorkspaceSearchConfig::resolve().expect("should resolve");
-        assert_eq!(config.fusion_strategy, FusionStrategy::WeightedScore);
-        assert_eq!(config.rrf_k, 30);
-        assert!((config.fts_weight - 0.9).abs() < 0.001);
-        assert!((config.vector_weight - 0.1).abs() < 0.001);
-
-        clear_search_env();
-    }
-
-    #[test]
-    fn invalid_strategy_rejected() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_search_env();
-
-        // SAFETY: Under ENV_MUTEX.
-        unsafe {
-            std::env::set_var("SEARCH_FUSION_STRATEGY", "bm25");
-        }
-
-        let result = WorkspaceSearchConfig::resolve();
-        assert!(result.is_err());
-
-        clear_search_env();
-    }
-
-    #[test]
-    fn weighted_strategy_defaults() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_search_env();
-
-        // SAFETY: Under ENV_MUTEX.
-        unsafe {
-            std::env::set_var("SEARCH_FUSION_STRATEGY", "weighted");
-        }
-
-        let config = WorkspaceSearchConfig::resolve().expect("should resolve");
-        assert_eq!(config.fusion_strategy, FusionStrategy::WeightedScore);
-        // Weighted mode should default to 0.3 FTS / 0.7 vector
-        assert!((config.fts_weight - 0.3).abs() < 0.001);
-        assert!((config.vector_weight - 0.7).abs() < 0.001);
-
-        clear_search_env();
-    }
-
-    #[test]
-    fn weighted_both_zero_rejected() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_search_env();
-
-        // SAFETY: Under ENV_MUTEX.
-        unsafe {
-            std::env::set_var("SEARCH_FUSION_STRATEGY", "weighted");
-            std::env::set_var("SEARCH_FTS_WEIGHT", "0.0");
-            std::env::set_var("SEARCH_VECTOR_WEIGHT", "0.0");
-        }
-
-        let result = WorkspaceSearchConfig::resolve();
-        assert!(result.is_err());
-
-        clear_search_env();
-    }
-
-    #[test]
-    fn rrf_both_zero_allowed() {
-        let _guard = ENV_MUTEX.lock().expect("env mutex poisoned");
-        clear_search_env();
-
-        // SAFETY: Under ENV_MUTEX.
-        unsafe {
-            std::env::set_var("SEARCH_FTS_WEIGHT", "0.0");
-            std::env::set_var("SEARCH_VECTOR_WEIGHT", "0.0");
-        }
-
-        // RRF ignores weights, so both=0 is fine
-        let config = WorkspaceSearchConfig::resolve().expect("should resolve");
-        assert_eq!(config.fusion_strategy, FusionStrategy::Rrf);
-
-        clear_search_env();
-    }
-}
@@ -16,7 +16,6 @@ mod workspace;

 use std::path::Path;
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};

 use async_trait::async_trait;
 use chrono::{DateTime, NaiveDateTime, Utc};
@@ -33,8 +32,6 @@ use crate::workspace::MemoryDocument;

 use crate::db::libsql_migrations;

-static NAIVE_TIMESTAMP_LOGGED: AtomicBool = AtomicBool::new(false);
-
 /// Explicit column list for routines table (matches positional access in `row_to_routine_libsql`).
 pub(crate) const ROUTINE_COLUMNS: &str = "\
    id, name, description, user_id, enabled, \
@@ -166,27 +163,24 @@ impl LibSqlBackend {
 ///
 /// Returns an error if none of the formats match.
 pub(crate) fn parse_timestamp(s: &str) -> Result<DateTime<Utc>, String> {
-    let log_naive_timestamp_once = || {
-        if !NAIVE_TIMESTAMP_LOGGED.swap(true, Ordering::Relaxed) {
-            tracing::debug!(
-                timestamp = %s,
-                "parsed naive timestamp without timezone; assuming UTC for backward compatibility"
-            );
-        }
-    };
-
    // RFC 3339 (our canonical write format)
    if let Ok(dt) = DateTime::parse_from_rfc3339(s) {
        return Ok(dt.with_timezone(&Utc));
    }
    // Naive with fractional seconds (legacy or SQLite datetime() output)
    if let Ok(ndt) = NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S%.f") {
-        log_naive_timestamp_once();
+        tracing::warn!(
+            timestamp = %s,
+            "parsed naive timestamp without timezone; assuming UTC for backward compatibility"
+        );
        return Ok(ndt.and_utc());
    }
    // Naive without fractional seconds (legacy format)
    if let Ok(ndt) = NaiveDateTime::parse_from_str(s, "%Y-%m-%d %H:%M:%S") {
-        log_naive_timestamp_once();
+        tracing::warn!(
+            timestamp = %s,
+            "parsed naive timestamp without timezone; assuming UTC for backward compatibility"
+        );
        return Ok(ndt.and_utc());
    }
    Err(format!("unparseable timestamp: {:?}", s))
@@ -14,7 +14,7 @@ use crate::db::WorkspaceStore;
 use crate::error::WorkspaceError;
 use crate::workspace::{
    MemoryChunk, MemoryDocument, RankedResult, SearchConfig, SearchResult, WorkspaceEntry,
-    fuse_results,
+    reciprocal_rank_fusion,
 };

 use chrono::Utc;
@@ -614,6 +614,6 @@ impl WorkspaceStore for LibSqlBackend {
            );
        }

-        Ok(fuse_results(fts_results, vector_results, config))
+        Ok(reciprocal_rank_fusion(fts_results, vector_results, config))
    }
 }
@@ -27,7 +27,7 @@ use crate::secrets::{CreateSecretParams, SecretsStore};
 use crate::tools::ToolRegistry;
 use crate::tools::mcp::McpClient;
 use crate::tools::mcp::auth::{
-    authorize_mcp_server, canonical_resource_uri, discover_full_oauth_metadata,
+    PkceChallenge, authorize_mcp_server, build_authorization_url, discover_full_oauth_metadata,
    find_available_port, is_authenticated, register_client,
 };
 use crate::tools::mcp::config::McpServerConfig;
@@ -108,13 +108,6 @@ pub struct ExtensionManager {
    /// Relay config captured at startup. Used by `auth_channel_relay` and
    /// `activate_channel_relay` instead of re-reading env vars.
    relay_config: Option<crate::config::RelayConfig>,
-    /// When `true`, OAuth flows always return an auth URL to the caller
-    /// instead of opening a browser on the server via `open::that()`.
-    /// Set by the web gateway at startup via `enable_gateway_mode()`.
-    gateway_mode: std::sync::atomic::AtomicBool,
-    /// The gateway's own base URL for building OAuth redirect URIs.
-    /// Set by the web gateway at startup via `enable_gateway_mode()`.
-    gateway_base_url: RwLock<Option<String>>,
 }

 /// Sanitize a URL for logging by removing query parameters and credentials.
@@ -188,75 +181,9 @@ impl ExtensionManager {
            pending_oauth_flows: crate::cli::oauth_defaults::new_pending_oauth_registry(),
            gateway_token: std::env::var("GATEWAY_AUTH_TOKEN").ok(),
            relay_config: crate::config::RelayConfig::from_env(),
-            gateway_mode: std::sync::atomic::AtomicBool::new(false),
-            gateway_base_url: RwLock::new(None),
        }
    }

-    /// Enable gateway mode so OAuth flows return auth URLs to the frontend
-    /// instead of calling `open::that()` on the server.
-    ///
-    /// `base_url` is the gateway's own public URL (e.g. `https://my-gateway.example.com`),
-    /// used to build OAuth redirect URIs when `IRONCLAW_OAUTH_CALLBACK_URL` is not set.
-    pub async fn enable_gateway_mode(&self, base_url: String) {
-        self.gateway_mode
-            .store(true, std::sync::atomic::Ordering::Release);
-        *self.gateway_base_url.write().await = Some(base_url);
-    }
-
-    /// Returns `true` if OAuth should use gateway mode (return auth URL to
-    /// frontend) rather than CLI mode (open browser on server via `open::that`).
-    ///
-    /// Gateway mode is active when any of:
-    /// - `enable_gateway_mode()` was called (web gateway is running), OR
-    /// - `IRONCLAW_OAUTH_CALLBACK_URL` is set to a non-loopback URL, OR
-    /// - `self.tunnel_url` is set to a non-loopback URL
-    pub fn should_use_gateway_mode(&self) -> bool {
-        if self.gateway_mode.load(std::sync::atomic::Ordering::Acquire) {
-            return true;
-        }
-        if crate::cli::oauth_defaults::use_gateway_callback() {
-            return true;
-        }
-        self.tunnel_url
-            .as_ref()
-            .filter(|u| !u.is_empty())
-            .and_then(|raw| url::Url::parse(raw).ok())
-            .and_then(|u| u.host_str().map(String::from))
-            .map(|host| !crate::cli::oauth_defaults::is_loopback_host(&host))
-            .unwrap_or(false)
-    }
-
-    /// Returns the OAuth redirect URI for gateway mode, or `None` for local mode.
-    ///
-    /// Priority:
-    /// 1. `IRONCLAW_OAUTH_CALLBACK_URL` env var (via `callback_url()`)
-    /// 2. `gateway_base_url` (set by `enable_gateway_mode()`)
-    /// 3. `tunnel_url` (from config)
-    /// 4. `None` (local/CLI mode)
-    async fn gateway_callback_redirect_uri(&self) -> Option<String> {
-        use crate::cli::oauth_defaults;
-        if oauth_defaults::use_gateway_callback() {
-            return Some(format!("{}/oauth/callback", oauth_defaults::callback_url()));
-        }
-        // Use gateway_base_url from enable_gateway_mode()
-        if let Some(ref base) = *self.gateway_base_url.read().await {
-            let base = base.trim_end_matches('/');
-            return Some(format!("{}/oauth/callback", base));
-        }
-        // Fall back to tunnel_url
-        self.tunnel_url
-            .as_ref()
-            .filter(|u| !u.is_empty())
-            .and_then(|raw| url::Url::parse(raw).ok())
-            .and_then(|u| u.host_str().map(String::from))
-            .filter(|host| !oauth_defaults::is_loopback_host(host))
-            .map(|_| {
-                let base = self.tunnel_url.as_ref().unwrap().trim_end_matches('/');
-                format!("{}/oauth/callback", base)
-            })
-    }
-
    /// Get the relay config stored at startup.
    fn relay_config(&self) -> Result<&crate::config::RelayConfig, ExtensionError> {
        self.relay_config.as_ref().ok_or_else(|| {
@@ -266,12 +193,6 @@ impl ExtensionManager {
        })
    }

-    /// Inject a registry entry for testing. The entry is added to the discovery
-    /// cache so it appears in search results alongside built-in entries.
-    pub async fn inject_registry_entry(&self, entry: crate::extensions::RegistryEntry) {
-        self.registry.cache_discovered(vec![entry]).await;
-    }
-
    /// Configure the channel runtime infrastructure for hot-activating WASM channels.
    ///
    /// Call after construction (and after wrapping in `Arc`) once the channel
@@ -786,19 +707,6 @@ impl ExtensionManager {
        Self::validate_extension_name(name)?;
        let kind = self.determine_installed_kind(name).await?;

-        // Clean up any in-progress OAuth flows for this extension.
-        // TCP mode: abort the listener task so port 9876 is freed immediately.
-        // Gateway mode: remove stale pending flow entries.
-        if let Some(pending) = self.pending_auth.write().await.remove(name)
-            && let Some(handle) = pending.task_handle
-        {
-            handle.abort();
-        }
-        self.pending_oauth_flows
-            .write()
-            .await
-            .retain(|_, flow| flow.extension_name != name);
-
        match kind {
            ExtensionKind::McpServer => {
                // Unregister tools with this server's prefix
@@ -832,14 +740,6 @@ impl ExtensionManager {
                // Unregister from tool registry
                self.tool_registry.unregister(name).await;

-                // Evict compiled module from runtime cache so reinstall uses fresh binary
-                if let Some(ref rt) = self.wasm_tool_runtime {
-                    rt.remove(name).await;
-                }
-
-                // Clear stale activation errors so reinstall starts clean
-                self.activation_errors.write().await.remove(name);
-
                // Revoke credential mappings from the shared registry
                let cap_path = self
                    .wasm_tools_dir
@@ -880,9 +780,6 @@ impl ExtensionManager {
                self.active_channel_names.write().await.remove(name);
                self.persist_active_channels().await;

-                // Clear stale activation errors so reinstall starts clean
-                self.activation_errors.write().await.remove(name);
-
                // Delete channel files
                let wasm_path = self.wasm_channels_dir.join(format!("{}.wasm", name));
                let cap_path = self
@@ -1787,46 +1684,29 @@ impl ExtensionManager {
            return Ok(AuthResult::authenticated(name, ExtensionKind::McpServer));
        }

-        // In gateway mode, build an auth URL and return it for the frontend to
-        // open in the same browser. The gateway's /oauth/callback handler will
-        // complete the token exchange.
-        if self.should_use_gateway_mode() {
-            return match self.auth_mcp_build_url(name, &server).await {
-                Ok(result) => Ok(result),
-                Err(ExtensionError::AuthNotSupported(_)) => Ok(AuthResult::awaiting_token(
-                    name,
-                    ExtensionKind::McpServer,
-                    format!(
-                        "Server '{}' does not support OAuth. \
-                         Please provide an API token/key for this server.",
-                        name
-                    ),
-                    None,
-                )),
-                Err(e) => Err(e),
-            };
-        }
-
-        // CLI/local mode: run the full blocking OAuth flow (opens browser, waits for callback)
+        // Run the full OAuth flow (opens browser, waits for callback)
        match authorize_mcp_server(&server, &self.secrets, &self.user_id).await {
            Ok(_token) => {
                tracing::info!("MCP server '{}' authenticated via OAuth", name);
                Ok(AuthResult::authenticated(name, ExtensionKind::McpServer))
            }
            Err(crate::tools::mcp::auth::AuthError::NotSupported) => {
-                // Server doesn't support OAuth, try building a URL
+                // Server doesn't support OAuth, try building a URL first
                match self.auth_mcp_build_url(name, &server).await {
                    Ok(result) => Ok(result),
-                    Err(_) => Ok(AuthResult::awaiting_token(
-                        name,
-                        ExtensionKind::McpServer,
-                        format!(
-                            "Server '{}' does not support OAuth. \
-                             Please provide an API token/key for this server.",
-                            name
-                        ),
-                        None,
-                    )),
+                    Err(_) => {
+                        // No OAuth, no DCR: fall back to manual token entry
+                        Ok(AuthResult::awaiting_token(
+                            name,
+                            ExtensionKind::McpServer,
+                            format!(
+                                "Server '{}' does not support OAuth. \
+                                 Please provide an API token/key for this server.",
+                                name
+                            ),
+                            None,
+                        ))
+                    }
                }
            }
            Err(e) => {
@@ -1845,12 +1725,8 @@ impl ExtensionManager {
        }
    }

-    /// Build an auth URL for MCP OAuth.
-    ///
-    /// In gateway mode, stores a `PendingOAuthFlow` so the web gateway's
-    /// `/oauth/callback` handler can complete the token exchange — the auth
-    /// URL is sent to the frontend which opens it in the same browser.
-    /// In local/CLI mode, builds the URL for the user to open manually.
+    /// Build an auth URL for cases where non-interactive auth is needed
+    /// (e.g., running via Telegram where we can't open a browser).
    async fn auth_mcp_build_url(
        &self,
        name: &str,
@@ -1859,153 +1735,60 @@ impl ExtensionManager {
        // Try to discover OAuth metadata and build a URL the user can open manually
        let metadata = discover_full_oauth_metadata(&server.url)
            .await
-            .map_err(|e| match e {
-                crate::tools::mcp::auth::AuthError::NotSupported => {
-                    ExtensionError::AuthNotSupported(e.to_string())
-                }
-                _ => ExtensionError::AuthFailed(e.to_string()),
-            })?;
+            .map_err(|e| ExtensionError::AuthFailed(e.to_string()))?;

-        use crate::cli::oauth_defaults;
-
-        let is_gateway = self.should_use_gateway_mode();
-
-        // Build redirect URI: gateway uses the public callback URL,
-        // local mode binds a random port.
-        let redirect_uri = if let Some(uri) = self.gateway_callback_redirect_uri().await {
-            uri
-        } else {
+        // Try DCR if no client_id configured
+        let (client_id, redirect_uri) = if let Some(ref oauth) = server.oauth {
            let port = find_available_port()
                .await
                .map_err(|e| ExtensionError::AuthFailed(e.to_string()))?;
-            format!("http://localhost:{}/callback", port.1)
-        };
-
-        // Try DCR if no client_id configured
-        let (client_id, client_secret) = if let Some(ref oauth) = server.oauth {
-            (oauth.client_id.clone(), None)
+            let redirect = format!("http://localhost:{}/callback", port.1);
+            (oauth.client_id.clone(), redirect)
        } else if let Some(ref reg_endpoint) = metadata.registration_endpoint {
-            let registration = register_client(reg_endpoint, &redirect_uri)
+            let port = find_available_port()
+                .await
+                .map_err(|e| ExtensionError::AuthFailed(e.to_string()))?;
+            let redirect = format!("http://localhost:{}/callback", port.1);
+
+            let registration = register_client(reg_endpoint, &redirect)
                .await
                .map_err(|e| ExtensionError::AuthFailed(e.to_string()))?;

-            (registration.client_id, None)
+            (registration.client_id, redirect)
        } else {
-            return Err(ExtensionError::AuthNotSupported(
+            return Err(ExtensionError::AuthFailed(
                "Server doesn't support OAuth or Dynamic Client Registration".to_string(),
            ));
        };

-        // RFC 8707: resource parameter to scope the token to this MCP server
-        let resource = canonical_resource_uri(&server.url);
-
-        // Build authorization URL with CSRF state using the shared oauth_defaults
-        // builder, which generates PKCE + state for us.
-        let mut extra_params = server
-            .oauth
-            .as_ref()
-            .map(|o| o.extra_params.clone())
-            .unwrap_or_default();
-        extra_params.insert("resource".to_string(), resource.clone());
-
-        let scopes = server
-            .oauth
-            .as_ref()
-            .map(|o| o.scopes.clone())
-            .unwrap_or_else(|| metadata.scopes_supported.clone());
-
-        let oauth_result = oauth_defaults::build_oauth_url(
+        let pkce = PkceChallenge::generate();
+        let auth_url = build_authorization_url(
            &metadata.authorization_endpoint,
            &client_id,
            &redirect_uri,
-            &scopes,
-            true, // Always use PKCE for MCP
-            &extra_params,
+            &metadata.scopes_supported,
+            Some(&pkce),
+            &std::collections::HashMap::new(),
+            None,
        );
-        let expected_state = oauth_result.state;
-        let code_verifier = oauth_result.code_verifier;

-        if is_gateway {
-            // Gateway mode: store pending flow for the /oauth/callback handler.
-            oauth_defaults::sweep_expired_flows(&self.pending_oauth_flows).await;
-
-            // Platform routing: prepend instance name to state
-            let platform_state = oauth_defaults::build_platform_state(&expected_state);
-            let auth_url = if platform_state != expected_state {
-                oauth_result.url.replace(
-                    &format!("state={}", urlencoding::encode(&expected_state)),
-                    &format!("state={}", urlencoding::encode(&platform_state)),
-                )
-            } else {
-                oauth_result.url
-            };
-
-            let flow = oauth_defaults::PendingOAuthFlow {
-                extension_name: name.to_string(),
-                display_name: server.name.clone(),
-                token_url: metadata.token_endpoint,
-                client_id,
-                client_secret,
-                redirect_uri,
-                code_verifier,
-                access_token_field: "access_token".to_string(),
-                secret_name: server.token_secret_name(),
-                provider: Some(format!("mcp:{}", name)),
-                validation_endpoint: None,
-                scopes,
-                user_id: self.user_id.clone(),
-                secrets: Arc::clone(&self.secrets),
-                sse_sender: self.sse_sender.read().await.clone(),
-                gateway_token: self.gateway_token.clone(),
-                resource: Some(resource),
-                client_id_secret_name: if server.oauth.is_none() {
-                    Some(server.client_id_secret_name())
-                } else {
-                    None
-                },
+        // Store pending auth for later callback handling
+        self.pending_auth.write().await.insert(
+            name.to_string(),
+            PendingAuth {
+                _name: name.to_string(),
+                _kind: ExtensionKind::McpServer,
                created_at: std::time::Instant::now(),
-            };
+                task_handle: None,
+            },
+        );

-            self.pending_oauth_flows
-                .write()
-                .await
-                .insert(expected_state, flow);
-
-            self.pending_auth.write().await.insert(
-                name.to_string(),
-                PendingAuth {
-                    _name: name.to_string(),
-                    _kind: ExtensionKind::McpServer,
-                    created_at: std::time::Instant::now(),
-                    task_handle: None,
-                },
-            );
-
-            Ok(AuthResult::awaiting_authorization(
-                name,
-                ExtensionKind::McpServer,
-                auth_url,
-                "gateway".to_string(),
-            ))
-        } else {
-            // Local mode: return URL for manual opening
-            self.pending_auth.write().await.insert(
-                name.to_string(),
-                PendingAuth {
-                    _name: name.to_string(),
-                    _kind: ExtensionKind::McpServer,
-                    created_at: std::time::Instant::now(),
-                    task_handle: None,
-                },
-            );
-
-            Ok(AuthResult::awaiting_authorization(
-                name,
-                ExtensionKind::McpServer,
-                oauth_result.url,
-                "local".to_string(),
-            ))
-        }
+        Ok(AuthResult::awaiting_authorization(
+            name,
+            ExtensionKind::McpServer,
+            auth_url,
+            "local".to_string(),
+        ))
    }

    async fn auth_wasm_tool(&self, name: &str) -> Result<AuthResult, ExtensionError> {
@@ -2420,10 +2203,7 @@ impl ExtensionManager {
            flows.retain(|_, flow| flow.extension_name != name);
        }

-        let redirect_uri = self
-            .gateway_callback_redirect_uri()
-            .await
-            .unwrap_or_else(|| format!("{}/callback", oauth_defaults::callback_url()));
+        let redirect_uri = format!("{}/callback", oauth_defaults::callback_url());

        // Merge scopes from all tools sharing this provider
        let merged_scopes = self
@@ -2448,7 +2228,7 @@ impl ExtensionManager {
            .clone()
            .unwrap_or_else(|| name.to_string());

-        if self.should_use_gateway_mode() {
+        if oauth_defaults::use_gateway_callback() {
            // Gateway mode: store pending flow state for the web gateway's
            // `/oauth/callback` handler to complete the exchange. No TCP listener
            // needed — the OAuth provider redirects to the gateway URL.
@@ -2484,8 +2264,6 @@ impl ExtensionManager {
                secrets: Arc::clone(&self.secrets),
                sse_sender: self.sse_sender.read().await.clone(),
                gateway_token: self.gateway_token.clone(),
-                resource: None,
-                client_id_secret_name: None,
                created_at: std::time::Instant::now(),
            };

@@ -2827,17 +2605,11 @@ impl ExtensionManager {
        .await
        .map_err(|e| ExtensionError::ActivationFailed(e.to_string()))?;

-        // Try to list and create tools.
-        // A 401/auth error means the server requires OAuth — surface as
-        // AuthRequired so the activate handler triggers the OAuth flow.
-        let mcp_tools = client.list_tools().await.map_err(|e| {
-            let msg = e.to_string();
-            if msg.contains("requires authentication") || msg.contains("401") {
-                ExtensionError::AuthRequired
-            } else {
-                ExtensionError::ActivationFailed(msg)
-            }
-        })?;
+        // Try to list and create tools
+        let mcp_tools = client
+            .list_tools()
+            .await
+            .map_err(|e| ExtensionError::ActivationFailed(e.to_string()))?;

        let tool_impls = client
            .create_tools()
@@ -2884,17 +2656,6 @@ impl ExtensionManager {
            });
        }

-        // Check auth status — block activation if required secrets are missing.
-        // NeedsAuth (OAuth not yet completed) is allowed because configure() loads
-        // the tool first, then starts the OAuth flow to obtain the token.
-        let auth_state = self.check_tool_auth_status(name).await;
-        if auth_state == ToolAuthState::NeedsSetup {
-            return Err(ExtensionError::ActivationFailed(format!(
-                "Tool '{}' requires configuration. Use the setup form to provide credentials.",
-                name
-            )));
-        }
-
        let runtime = self.wasm_tool_runtime.as_ref().ok_or_else(|| {
            ExtensionError::ActivationFailed("WASM runtime not available".to_string())
        })?;
@@ -4530,18 +4291,14 @@ mod tests {
    // available" because the ExtensionManager had `wasm_tool_runtime: None`.

    /// Build a minimal ExtensionManager suitable for unit tests.
-    fn make_test_manager_with_dirs(
+    fn make_test_manager(
        wasm_runtime: Option<Arc<crate::tools::wasm::WasmToolRuntime>>,
        tools_dir: std::path::PathBuf,
-        channels_dir: std::path::PathBuf,
    ) -> crate::extensions::manager::ExtensionManager {
        use crate::secrets::{InMemorySecretsStore, SecretsCrypto};
        use crate::tools::mcp::process::McpProcessManager;
        use crate::tools::mcp::session::McpSessionManager;

-        std::fs::create_dir_all(&tools_dir).ok();
-        std::fs::create_dir_all(&channels_dir).ok();
-
        let key = secrecy::SecretString::from(crate::secrets::keychain::generate_master_key_hex());
        let crypto = Arc::new(SecretsCrypto::new(key).expect("crypto"));
        let secrets: Arc<dyn crate::secrets::SecretsStore + Send + Sync> =
@@ -4556,22 +4313,15 @@ mod tests {
            tools,
            None, // hooks
            wasm_runtime,
-            tools_dir,
-            channels_dir,
-            None, // tunnel_url
+            tools_dir.clone(),
+            tools_dir, // channels dir (unused here)
+            None,      // tunnel_url
            "test".to_string(),
            None, // db
            vec![],
        )
    }

-    fn make_test_manager(
-        wasm_runtime: Option<Arc<crate::tools::wasm::WasmToolRuntime>>,
-        tools_dir: std::path::PathBuf,
-    ) -> crate::extensions::manager::ExtensionManager {
-        make_test_manager_with_dirs(wasm_runtime, tools_dir.clone(), tools_dir)
-    }
-
    #[tokio::test]
    async fn test_activate_wasm_tool_with_runtime_passes_runtime_check() {
        // When the ExtensionManager has a WASM runtime, activation should get
@@ -4924,145 +4674,6 @@ mod tests {
        );
    }

-    #[tokio::test]
-    async fn test_remove_wasm_tool_clears_pending_oauth_state_and_activation_error() {
-        let dir = tempfile::tempdir().expect("temp dir");
-        let mgr = make_test_manager(None, dir.path().to_path_buf());
-
-        std::fs::write(dir.path().join("gmail.wasm"), b"fake-tool").expect("write tool");
-
-        let listener = tokio::spawn(async {
-            std::future::pending::<()>().await;
-        });
-        let abort_handle = listener.abort_handle();
-        mgr.pending_auth.write().await.insert(
-            "gmail".to_string(),
-            super::PendingAuth {
-                _name: "gmail".to_string(),
-                _kind: ExtensionKind::WasmTool,
-                created_at: std::time::Instant::now(),
-                task_handle: Some(listener),
-            },
-        );
-
-        mgr.activation_errors
-            .write()
-            .await
-            .insert("gmail".to_string(), "cached failure".to_string());
-
-        let secrets = Arc::clone(&mgr.secrets);
-        mgr.pending_oauth_flows().write().await.insert(
-            "gmail-state".to_string(),
-            crate::cli::oauth_defaults::PendingOAuthFlow {
-                extension_name: "gmail".to_string(),
-                display_name: "Gmail".to_string(),
-                token_url: "https://example.com/token".to_string(),
-                client_id: "client123".to_string(),
-                client_secret: None,
-                redirect_uri: "https://example.com/oauth/callback".to_string(),
-                code_verifier: None,
-                access_token_field: "access_token".to_string(),
-                secret_name: "google_oauth_token".to_string(),
-                provider: None,
-                validation_endpoint: None,
-                scopes: vec![],
-                user_id: "test".to_string(),
-                secrets: Arc::clone(&secrets),
-                sse_sender: None,
-                gateway_token: None,
-                resource: None,
-                client_id_secret_name: None,
-                created_at: std::time::Instant::now(),
-            },
-        );
-        mgr.pending_oauth_flows().write().await.insert(
-            "other-state".to_string(),
-            crate::cli::oauth_defaults::PendingOAuthFlow {
-                extension_name: "web-search".to_string(),
-                display_name: "Web Search".to_string(),
-                token_url: "https://example.com/token".to_string(),
-                client_id: "client456".to_string(),
-                client_secret: None,
-                redirect_uri: "https://example.com/oauth/callback".to_string(),
-                code_verifier: None,
-                access_token_field: "access_token".to_string(),
-                secret_name: "other_token".to_string(),
-                provider: None,
-                validation_endpoint: None,
-                scopes: vec![],
-                user_id: "test".to_string(),
-                secrets,
-                sse_sender: None,
-                gateway_token: None,
-                resource: None,
-                client_id_secret_name: None,
-                created_at: std::time::Instant::now(),
-            },
-        );
-
-        let result = mgr.remove("gmail").await;
-        assert!(result.is_ok(), "remove should succeed: {:?}", result.err());
-
-        tokio::task::yield_now().await;
-
-        assert!(
-            mgr.pending_auth.read().await.get("gmail").is_none(),
-            "pending auth entry should be removed"
-        );
-        assert!(
-            abort_handle.is_finished(),
-            "pending auth listener should be aborted"
-        );
-        assert!(
-            !mgr.activation_errors.read().await.contains_key("gmail"),
-            "stale activation error should be cleared"
-        );
-
-        let flows = mgr.pending_oauth_flows().read().await;
-        assert!(
-            !flows.contains_key("gmail-state"),
-            "gateway OAuth flow for removed extension should be cleared"
-        );
-        assert!(
-            flows.contains_key("other-state"),
-            "unrelated pending OAuth flows should be retained"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_remove_wasm_channel_clears_activation_error_and_deletes_files() {
-        let dir = tempfile::tempdir().expect("temp dir");
-        let tools_dir = dir.path().join("tools");
-        let channels_dir = dir.path().join("channels");
-        let mgr = make_test_manager_with_dirs(None, tools_dir, channels_dir.clone());
-
-        let wasm_path = channels_dir.join("telegram.wasm");
-        let cap_path = channels_dir.join("telegram.capabilities.json");
-        std::fs::write(&wasm_path, b"fake-channel").expect("write channel");
-        std::fs::write(&cap_path, b"{}").expect("write capabilities");
-
-        mgr.activation_errors
-            .write()
-            .await
-            .insert("telegram".to_string(), "channel failed".to_string());
-
-        let result = mgr.remove("telegram").await;
-        assert!(result.is_ok(), "remove should succeed: {:?}", result.err());
-
-        assert!(
-            !mgr.activation_errors.read().await.contains_key("telegram"),
-            "channel activation error should be cleared on remove"
-        );
-        assert!(
-            !wasm_path.exists(),
-            "channel wasm file should be deleted on remove"
-        );
-        assert!(
-            !cap_path.exists(),
-            "channel capabilities file should be deleted on remove"
-        );
-    }
-
    #[test]
    fn test_sanitize_url_with_query_params() {
        let url = "https://api.example.com/path?api_key=secret123&token=abc";
@@ -5155,189 +4766,6 @@ mod tests {
        assert!(result.contains("/v1/users/123/profile"));
    }

-    // ---- gateway mode detection tests ----
-    // Regression tests for a bug where MCP OAuth called `open::that()` on the
-    // server machine instead of returning an auth URL to the gateway frontend.
-    // The root cause was that `should_use_gateway_mode()` only checked the
-    // `IRONCLAW_OAUTH_CALLBACK_URL` env var, ignoring `self.tunnel_url`.
-
-    /// Serializes env-mutating tests to prevent parallel races.
-    static GATEWAY_ENV_MUTEX: std::sync::Mutex<()> = std::sync::Mutex::new(());
-
-    /// Build a minimal ExtensionManager with a custom tunnel_url.
-    fn make_manager_with_tunnel(tunnel_url: Option<String>) -> ExtensionManager {
-        use crate::secrets::{InMemorySecretsStore, SecretsCrypto};
-        use crate::tools::mcp::process::McpProcessManager;
-        use crate::tools::mcp::session::McpSessionManager;
-
-        let key = secrecy::SecretString::from(crate::secrets::keychain::generate_master_key_hex());
-        let crypto = Arc::new(SecretsCrypto::new(key).expect("crypto"));
-        let secrets: Arc<dyn crate::secrets::SecretsStore + Send + Sync> =
-            Arc::new(InMemorySecretsStore::new(crypto));
-        let tools = Arc::new(crate::tools::ToolRegistry::new());
-        let mcp = Arc::new(McpSessionManager::new());
-        let dir = std::env::temp_dir().join("ironclaw-test-gateway-mode");
-
-        ExtensionManager::new(
-            mcp,
-            Arc::new(McpProcessManager::new()),
-            secrets,
-            tools,
-            None,
-            None,
-            dir.clone(),
-            dir,
-            tunnel_url,
-            "test".to_string(),
-            None,
-            vec![],
-        )
-    }
-
-    #[test]
-    fn should_use_gateway_mode_true_for_tunnel_url() {
-        let _guard = GATEWAY_ENV_MUTEX.lock().expect("env mutex poisoned");
-        let original = std::env::var("IRONCLAW_OAUTH_CALLBACK_URL").ok();
-        // SAFETY: Under GATEWAY_ENV_MUTEX, no concurrent env access.
-        unsafe {
-            std::env::remove_var("IRONCLAW_OAUTH_CALLBACK_URL");
-        }
-
-        let mgr = make_manager_with_tunnel(Some("https://my-gateway.example.com".into()));
-        assert!(
-            mgr.should_use_gateway_mode(),
-            "should detect gateway mode from tunnel_url"
-        );
-
-        unsafe {
-            if let Some(val) = original {
-                std::env::set_var("IRONCLAW_OAUTH_CALLBACK_URL", val);
-            }
-        }
-    }
-
-    #[test]
-    fn should_use_gateway_mode_false_without_tunnel() {
-        let _guard = GATEWAY_ENV_MUTEX.lock().expect("env mutex poisoned");
-        let original = std::env::var("IRONCLAW_OAUTH_CALLBACK_URL").ok();
-        unsafe {
-            std::env::remove_var("IRONCLAW_OAUTH_CALLBACK_URL");
-        }
-
-        let mgr = make_manager_with_tunnel(None);
-        assert!(
-            !mgr.should_use_gateway_mode(),
-            "should not detect gateway mode without tunnel_url or env var"
-        );
-
-        unsafe {
-            if let Some(val) = original {
-                std::env::set_var("IRONCLAW_OAUTH_CALLBACK_URL", val);
-            }
-        }
-    }
-
-    #[test]
-    fn should_use_gateway_mode_false_for_loopback_tunnel() {
-        let _guard = GATEWAY_ENV_MUTEX.lock().expect("env mutex poisoned");
-        let original = std::env::var("IRONCLAW_OAUTH_CALLBACK_URL").ok();
-        unsafe {
-            std::env::remove_var("IRONCLAW_OAUTH_CALLBACK_URL");
-        }
-
-        let mgr = make_manager_with_tunnel(Some("http://127.0.0.1:3001".into()));
-        assert!(
-            !mgr.should_use_gateway_mode(),
-            "should not detect gateway mode for loopback tunnel_url"
-        );
-
-        unsafe {
-            if let Some(val) = original {
-                std::env::set_var("IRONCLAW_OAUTH_CALLBACK_URL", val);
-            }
-        }
-    }
-
-    /// Helper to run an async test body while holding the env mutex.
-    /// Clears `IRONCLAW_OAUTH_CALLBACK_URL` for the duration, restoring on drop.
-    struct EnvGuard {
-        original: Option<String>,
-        _mutex: std::sync::MutexGuard<'static, ()>,
-    }
-
-    impl EnvGuard {
-        fn new() -> Self {
-            let guard = GATEWAY_ENV_MUTEX.lock().expect("env mutex poisoned");
-            let original = std::env::var("IRONCLAW_OAUTH_CALLBACK_URL").ok();
-            // SAFETY: Under GATEWAY_ENV_MUTEX, no concurrent env access.
-            unsafe {
-                std::env::remove_var("IRONCLAW_OAUTH_CALLBACK_URL");
-            }
-            Self {
-                original,
-                _mutex: guard,
-            }
-        }
-    }
-
-    impl Drop for EnvGuard {
-        fn drop(&mut self) {
-            // SAFETY: Under GATEWAY_ENV_MUTEX (still held by _mutex), no concurrent env access.
-            unsafe {
-                if let Some(ref val) = self.original {
-                    std::env::set_var("IRONCLAW_OAUTH_CALLBACK_URL", val);
-                } else {
-                    std::env::remove_var("IRONCLAW_OAUTH_CALLBACK_URL");
-                }
-            }
-        }
-    }
-
-    #[tokio::test]
-    async fn gateway_callback_redirect_uri_from_tunnel_url() {
-        let _env = EnvGuard::new();
-
-        let mgr = make_manager_with_tunnel(Some("https://my-gateway.example.com".into()));
-        assert_eq!(
-            mgr.gateway_callback_redirect_uri().await,
-            Some("https://my-gateway.example.com/oauth/callback".to_string()),
-        );
-    }
-
-    #[tokio::test]
-    async fn gateway_callback_redirect_uri_none_without_tunnel() {
-        let _env = EnvGuard::new();
-
-        let mgr = make_manager_with_tunnel(None);
-        assert_eq!(mgr.gateway_callback_redirect_uri().await, None);
-    }
-
-    #[tokio::test]
-    async fn gateway_callback_redirect_uri_trims_trailing_slash() {
-        let _env = EnvGuard::new();
-
-        let mgr = make_manager_with_tunnel(Some("https://my-gateway.example.com/".into()));
-        assert_eq!(
-            mgr.gateway_callback_redirect_uri().await,
-            Some("https://my-gateway.example.com/oauth/callback".to_string()),
-        );
-    }
-
-    #[tokio::test]
-    async fn gateway_mode_enabled_explicitly() {
-        let _env = EnvGuard::new();
-
-        let mgr = make_manager_with_tunnel(None);
-        assert!(!mgr.should_use_gateway_mode());
-
-        mgr.enable_gateway_mode("https://my-gateway.example.com".into())
-            .await;
-        assert!(mgr.should_use_gateway_mode());
-        assert_eq!(
-            mgr.gateway_callback_redirect_uri().await,
-            Some("https://my-gateway.example.com/oauth/callback".to_string()),
-        );
-    }
    // ── Regression tests for PR #677 (unify-extension-lifecycle) ─────────

    #[tokio::test]
@@ -5487,6 +4915,7 @@ mod tests {
            "configure should have stored the relay stream token"
        );
    }
+
    #[test]
    fn test_validation_failed_is_distinct_error_variant() {
        // Regression: ValidationFailed must be a distinct error variant so
@@ -517,9 +517,6 @@ pub enum ExtensionError {
    #[error("Authentication failed: {0}")]
    AuthFailed(String),

-    #[error("Server does not support OAuth: {0}")]
-    AuthNotSupported(String),
-
    #[error("Activation failed: {0}")]
    ActivationFailed(String),

@@ -232,11 +232,198 @@ pub fn builtin_entries() -> Vec<RegistryEntry> {
 }

 /// Well-known extensions, with an optional relay URL for the channel-relay entry.
-///
-/// MCP server entries are loaded from `registry/mcp-servers/*.json` via the catalog
-/// system. Only runtime-dependent entries (like channel-relay) remain here.
 pub fn builtin_entries_with_relay(relay_url: Option<String>) -> Vec<RegistryEntry> {
-    let mut entries = vec![];
+    let mut entries = vec![
+        // -- MCP Servers --
+        RegistryEntry {
+            name: "notion".to_string(),
+            display_name: "Notion".to_string(),
+            kind: ExtensionKind::McpServer,
+            description: "Connect to Notion for reading and writing pages, databases, and comments"
+                .to_string(),
+            keywords: vec![
+                "notes".into(),
+                "wiki".into(),
+                "docs".into(),
+                "pages".into(),
+                "database".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.notion.com/mcp".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "linear".to_string(),
+            display_name: "Linear".to_string(),
+            kind: ExtensionKind::McpServer,
+            description:
+                "Connect to Linear for issue tracking, project management, and team workflows"
+                    .to_string(),
+            keywords: vec![
+                "issues".into(),
+                "tickets".into(),
+                "project".into(),
+                "tracking".into(),
+                "bugs".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.linear.app/sse".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "github".to_string(),
+            display_name: "GitHub".to_string(),
+            kind: ExtensionKind::McpServer,
+            description:
+                "Connect to GitHub for repository management, issues, PRs, and code search"
+                    .to_string(),
+            keywords: vec![
+                "git".into(),
+                "repos".into(),
+                "code".into(),
+                "pull-request".into(),
+                "issues".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://api.githubcopilot.com/mcp/".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "slack-mcp".to_string(),
+            display_name: "Slack MCP".to_string(),
+            kind: ExtensionKind::McpServer,
+            description:
+                "Connect to Slack via MCP for messaging, channel management, and team communication"
+                    .to_string(),
+            keywords: vec![
+                "messaging".into(),
+                "chat".into(),
+                "channels".into(),
+                "team".into(),
+                "communication".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.slack.com".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "sentry".to_string(),
+            display_name: "Sentry".to_string(),
+            kind: ExtensionKind::McpServer,
+            description:
+                "Connect to Sentry for error tracking, performance monitoring, and debugging"
+                    .to_string(),
+            keywords: vec![
+                "errors".into(),
+                "monitoring".into(),
+                "debugging".into(),
+                "crashes".into(),
+                "performance".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.sentry.dev/mcp".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "stripe".to_string(),
+            display_name: "Stripe".to_string(),
+            kind: ExtensionKind::McpServer,
+            description:
+                "Connect to Stripe for payment processing, subscriptions, and financial data"
+                    .to_string(),
+            keywords: vec![
+                "payments".into(),
+                "billing".into(),
+                "subscriptions".into(),
+                "invoices".into(),
+                "finance".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.stripe.com".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "cloudflare".to_string(),
+            display_name: "Cloudflare".to_string(),
+            kind: ExtensionKind::McpServer,
+            description:
+                "Connect to Cloudflare for DNS, Workers, KV, and infrastructure management"
+                    .to_string(),
+            keywords: vec![
+                "cdn".into(),
+                "dns".into(),
+                "workers".into(),
+                "hosting".into(),
+                "infrastructure".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.cloudflare.com/mcp".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "asana".to_string(),
+            display_name: "Asana".to_string(),
+            kind: ExtensionKind::McpServer,
+            description: "Connect to Asana for task management, projects, and team coordination"
+                .to_string(),
+            keywords: vec![
+                "tasks".into(),
+                "projects".into(),
+                "management".into(),
+                "team".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.asana.com/v2/mcp".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        RegistryEntry {
+            name: "intercom".to_string(),
+            display_name: "Intercom".to_string(),
+            kind: ExtensionKind::McpServer,
+            description: "Connect to Intercom for customer messaging, support, and engagement"
+                .to_string(),
+            keywords: vec![
+                "support".into(),
+                "customers".into(),
+                "messaging".into(),
+                "chat".into(),
+                "helpdesk".into(),
+            ],
+            source: ExtensionSource::McpUrl {
+                url: "https://mcp.intercom.com/mcp".to_string(),
+            },
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        },
+        // WASM channels (telegram, slack, discord, whatsapp) come from the embedded
+        // registry catalog (registry/channels/*.json) with WasmDownload URLs pointing
+        // to GitHub release artifacts. See new_with_catalog() for merging.
+    ];

    // Conditionally add channel-relay entries when relay URL is configured
    if let Some(relay_url) = relay_url {
@@ -358,21 +545,9 @@ mod tests {
        assert_eq!(score, 0, "No match should score 0");
    }

-    /// Helper to create a registry with catalog entries (MCP servers come from catalog now).
-    fn registry_with_catalog() -> ExtensionRegistry {
-        let catalog = crate::registry::catalog::RegistryCatalog::load_or_embedded()
-            .expect("catalog should load");
-        let catalog_entries: Vec<RegistryEntry> = catalog
-            .all()
-            .iter()
-            .filter_map(|m| m.to_registry_entry())
-            .collect();
-        ExtensionRegistry::new_with_catalog(catalog_entries)
-    }
-
    #[tokio::test]
    async fn test_search_returns_sorted() {
-        let registry = registry_with_catalog();
+        let registry = ExtensionRegistry::new();
        let results = registry.search("notion").await;

        assert!(!results.is_empty(), "Should find notion in registry");
@@ -381,7 +556,7 @@ mod tests {

    #[tokio::test]
    async fn test_search_empty_query_returns_all() {
-        let registry = registry_with_catalog();
+        let registry = ExtensionRegistry::new();
        let results = registry.search("").await;

        assert!(results.len() > 5, "Empty query should return all entries");
@@ -389,7 +564,7 @@ mod tests {

    #[tokio::test]
    async fn test_search_by_keyword() {
-        let registry = registry_with_catalog();
+        let registry = ExtensionRegistry::new();
        let results = registry.search("issues tickets").await;

        assert!(
@@ -403,7 +578,7 @@ mod tests {

    #[tokio::test]
    async fn test_get_exact_name() {
-        let registry = registry_with_catalog();
+        let registry = ExtensionRegistry::new();

        let entry = registry.get("notion").await;
        assert!(entry.is_some());
@@ -483,30 +658,17 @@ mod tests {
                auth_hint: AuthHint::CapabilitiesAuth,
                version: None,
            },
-            // Two entries with same name but different kinds should coexist
+            // This shares a name with the builtin slack-mcp but has a different kind, so both should appear
            RegistryEntry {
-                name: "dual-ext".to_string(),
-                display_name: "Dual MCP".to_string(),
-                kind: ExtensionKind::McpServer,
-                description: "Dual extension MCP server".to_string(),
-                keywords: vec!["messaging".into()],
-                source: ExtensionSource::McpUrl {
-                    url: "https://mcp.example.com".to_string(),
-                },
-                fallback_source: None,
-                auth_hint: AuthHint::Dcr,
-                version: None,
-            },
-            RegistryEntry {
-                name: "dual-ext".to_string(),
-                display_name: "Dual WASM".to_string(),
+                name: "slack-mcp".to_string(),
+                display_name: "Slack MCP WASM".to_string(),
                kind: ExtensionKind::WasmTool,
-                description: "Dual extension WASM tool".to_string(),
+                description: "Slack WASM tool".to_string(),
                keywords: vec!["messaging".into()],
                source: ExtensionSource::WasmBuildable {
-                    source_dir: "tools-src/dual".to_string(),
-                    build_dir: Some("tools-src/dual".to_string()),
-                    crate_name: Some("dual-tool".to_string()),
+                    source_dir: "tools-src/slack".to_string(),
+                    build_dir: Some("tools-src/slack".to_string()),
+                    crate_name: Some("slack-tool".to_string()),
                },
                fallback_source: None,
                auth_hint: AuthHint::CapabilitiesAuth,
@@ -521,56 +683,41 @@ mod tests {
        assert!(!results.is_empty(), "Should find telegram from catalog");
        assert_eq!(results[0].entry.name, "telegram");

-        // Should have both MCP and WASM entries with the same name
-        let results = registry.search("dual-ext").await;
-        let has_mcp = results
+        // Should have both builtin MCP slack-mcp and catalog WASM slack-mcp
+        let results = registry.search("slack").await;
+        let slack_mcp = results
            .iter()
-            .any(|r| r.entry.name == "dual-ext" && r.entry.kind == ExtensionKind::McpServer);
-        let has_wasm = results
+            .any(|r| r.entry.name == "slack-mcp" && r.entry.kind == ExtensionKind::McpServer);
+        let slack_wasm = results
            .iter()
-            .any(|r| r.entry.name == "dual-ext" && r.entry.kind == ExtensionKind::WasmTool);
-        assert!(has_mcp, "Should have MCP dual-ext");
-        assert!(has_wasm, "Should have WASM dual-ext");
+            .any(|r| r.entry.name == "slack-mcp" && r.entry.kind == ExtensionKind::WasmTool);
+        assert!(slack_mcp, "Should have builtin MCP slack-mcp");
+        assert!(slack_wasm, "Should have catalog WASM slack-mcp");
    }

    #[tokio::test]
    async fn test_new_with_catalog_dedup_same_kind() {
-        // When two catalog entries share name AND kind, only the first should be kept
-        let catalog_entries = vec![
-            RegistryEntry {
-                name: "test-ext".to_string(),
-                display_name: "Test First".to_string(),
-                kind: ExtensionKind::McpServer,
-                description: "First entry".to_string(),
-                keywords: vec![],
-                source: ExtensionSource::McpUrl {
-                    url: "https://first.example.com".to_string(),
-                },
-                fallback_source: None,
-                auth_hint: AuthHint::Dcr,
-                version: None,
+        // A catalog entry with same name AND kind as a builtin should be skipped
+        let catalog_entries = vec![RegistryEntry {
+            name: "slack-mcp".to_string(),
+            display_name: "Slack MCP Override".to_string(),
+            kind: ExtensionKind::McpServer, // same kind as builtin slack-mcp
+            description: "Should be skipped".to_string(),
+            keywords: vec![],
+            source: ExtensionSource::McpUrl {
+                url: "https://other.slack.com".to_string(),
            },
-            RegistryEntry {
-                name: "test-ext".to_string(),
-                display_name: "Test Duplicate".to_string(),
-                kind: ExtensionKind::McpServer, // same kind
-                description: "Should be skipped".to_string(),
-                keywords: vec![],
-                source: ExtensionSource::McpUrl {
-                    url: "https://second.example.com".to_string(),
-                },
-                fallback_source: None,
-                auth_hint: AuthHint::Dcr,
-                version: None,
-            },
-        ];
+            fallback_source: None,
+            auth_hint: AuthHint::Dcr,
+            version: None,
+        }];

        let registry = ExtensionRegistry::new_with_catalog(catalog_entries);

-        let entry = registry.get("test-ext").await;
+        let entry = registry.get("slack-mcp").await;
        assert!(entry.is_some());
-        // Should be the first entry, not the duplicate
-        assert_eq!(entry.unwrap().display_name, "Test First");
+        // Should still be the builtin, not the override
+        assert_eq!(entry.unwrap().display_name, "Slack MCP");
    }

    #[tokio::test]
@@ -270,6 +270,10 @@ impl NearAiChatProvider {
            reason: format!("Failed to read response body: {}", e),
        })?;

+        if tracing::enabled!(tracing::Level::DEBUG) {
+            tracing::debug!("NEAR AI Chat response status: {}", status);
+        }
+
        // Log response body only at TRACE level to avoid exposing sensitive content
        // (user-generated data, tool outputs, leaked secrets) in DEBUG logs
        if tracing::enabled!(tracing::Level::TRACE) {
@@ -902,8 +902,7 @@ Example:
 ## Guidelines
 - Be concise and direct
 - Use markdown formatting where helpful
- For code, use appropriate code blocks with language tags
- ALWAYS end your response with a <suggestions> tag containing a JSON array of 1-3 short follow-up commands. Each suggestion must read as something the USER would type to instruct YOU. Write them in the user's voice as direct commands, not as requests FROM you TO the user. Do NOT repeat or rephrase content already in your response. Example: <suggestions>["Suggest dinner spots in my area", "Find a quick recipe for pasta"]</suggestions> Keep each under 80 characters.{}
+- For code, use appropriate code blocks with language tags{}

 ## Safety
 - You have no independent goals. Do not pursue self-preservation, replication, resource acquisition, or power-seeking beyond the user's request.
@@ -9,8 +9,8 @@ use ironclaw::{
    agent::{Agent, AgentDeps},
    app::{AppBuilder, AppBuilderFlags},
    channels::{
-        ChannelManager, GatewayChannel, HttpChannel, ReplChannel, SignalChannel, WebhookServer,
-        WebhookServerConfig,
+        ChannelManager, ChannelSecretUpdater, GatewayChannel, HttpChannel, ReplChannel,
+        SignalChannel, WebhookServer, WebhookServerConfig,
        wasm::{WasmChannelRouter, WasmChannelRuntime},
        web::log_layer::LogBroadcaster,
    },
@@ -433,8 +433,9 @@ async fn async_main() -> anyhow::Result<()> {
        "Lifecycle hooks initialized"
    );

-    // Reuse the shared agent session manager prepared by AppBuilder.
-    let session_manager = Arc::clone(&components.agent_session_manager);
+    // Create session manager (shared between agent and web gateway)
+    let session_manager =
+        Arc::new(ironclaw::agent::SessionManager::new().with_hooks(components.hooks.clone()));

    // Lazy scheduler slot — filled after Agent::new creates the Scheduler.
    // Allows CreateJobTool to dispatch local jobs via the Scheduler even though
@@ -475,14 +476,6 @@ async fn async_main() -> anyhow::Result<()> {
        gw = gw.with_log_level_handle(Arc::clone(&log_level_handle));
        gw = gw.with_tool_registry(Arc::clone(&components.tools));
        if let Some(ref ext_mgr) = components.extension_manager {
-            // Enable gateway mode so MCP OAuth returns auth URLs to the frontend
-            // instead of calling open::that() on the server.
-            let gw_base = config
-                .tunnel
-                .public_url
-                .clone()
-                .unwrap_or_else(|| format!("http://{}:{}", gw_config.host, gw_config.port));
-            ext_mgr.enable_gateway_mode(gw_base).await;
            gw = gw.with_extension_manager(Arc::clone(ext_mgr));
        }
        if !components.catalog_entries.is_empty() {
@@ -736,7 +729,6 @@ async fn async_main() -> anyhow::Result<()> {

    #[cfg(unix)]
    {
-        use ironclaw::channels::ChannelSecretUpdater;
        // Collect all channels that support secret updates
        let mut secret_updaters: Vec<Arc<dyn ChannelSecretUpdater>> = Vec::new();
        if let Some(ref state) = http_channel_state {
@@ -192,12 +192,6 @@ impl RegistryCatalog {
            Self::load_manifests_from_dir(&channels_dir, "channels", &mut manifests)?;
        }

-        // Load MCP servers
-        let mcp_servers_dir = registry_dir.join("mcp-servers");
-        if mcp_servers_dir.is_dir() {
-            Self::load_manifests_from_dir(&mcp_servers_dir, "mcp-servers", &mut manifests)?;
-        }
-
        // Load bundles
        let bundles_path = registry_dir.join("_bundles.json");
        let bundles = if bundles_path.is_file() {
@@ -286,9 +280,8 @@ impl RegistryCatalog {
    /// Get a manifest by name. Tries exact key match first ("tools/github"),
    /// then searches by bare name ("github").
    ///
-    /// If a bare name matches more than one prefix, returns `None`.
-    /// Use a qualified key ("tools/github", "channels/telegram", or
-    /// "mcp-servers/notion") to disambiguate.
+    /// If a bare name matches both a tool and a channel, returns `None`.
+    /// Use a qualified key ("tools/github" or "channels/telegram") to disambiguate.
    pub fn get(&self, name: &str) -> Option<&ExtensionManifest> {
        // Try exact key first
        if let Some(m) = self.manifests.get(name) {
@@ -296,15 +289,14 @@ impl RegistryCatalog {
        }

        // Try with kind prefix, detecting collisions
-        let candidates: Vec<_> = ["tools", "channels", "mcp-servers"]
-            .iter()
-            .filter_map(|prefix| self.manifests.get(&format!("{}/{}", prefix, name)))
-            .collect();
+        let tool = self.manifests.get(&format!("tools/{}", name));
+        let channel = self.manifests.get(&format!("channels/{}", name));

-        if candidates.len() == 1 {
-            Some(candidates[0])
-        } else {
-            None // ambiguous or not found
+        match (tool, channel) {
+            (Some(_), Some(_)) => None, // ambiguous
+            (Some(m), None) => Some(m),
+            (None, Some(m)) => Some(m),
+            (None, None) => None,
        }
    }

@@ -316,63 +308,37 @@ impl RegistryCatalog {
            return Ok(m);
        }

-        let prefixes: &[(&str, &str)] = &[
-            ("tools", "tool"),
-            ("channels", "channel"),
-            ("mcp-servers", "mcp_server"),
-        ];
+        let has_tool = self.manifests.contains_key(&format!("tools/{}", name));
+        let has_channel = self.manifests.contains_key(&format!("channels/{}", name));

-        let matches: Vec<_> = prefixes
-            .iter()
-            .filter(|(prefix, _)| self.manifests.contains_key(&format!("{}/{}", prefix, name)))
-            .collect();
-
-        match matches.len() {
-            0 => Err(RegistryError::ExtensionNotFound(name.to_string())),
-            1 => {
-                let (prefix, _) = matches[0];
-                let key = format!("{}/{}", prefix, name);
-                self.manifests
-                    .get(&key)
-                    .ok_or_else(|| RegistryError::ExtensionNotFound(name.to_string()))
-            }
-            _ => {
-                let (prefix_a, kind_a) = matches[0];
-                let (prefix_b, kind_b) = matches[1];
-                Err(RegistryError::AmbiguousName {
-                    name: name.to_string(),
-                    kind_a,
-                    prefix_a,
-                    kind_b,
-                    prefix_b,
-                })
-            }
+        match (has_tool, has_channel) {
+            (true, true) => Err(RegistryError::AmbiguousName {
+                name: name.to_string(),
+                kind_a: "tool",
+                prefix_a: "tools",
+                kind_b: "channel",
+                prefix_b: "channels",
+            }),
+            (true, false) => Ok(self.manifests.get(&format!("tools/{}", name)).unwrap()),
+            (false, true) => Ok(self.manifests.get(&format!("channels/{}", name)).unwrap()),
+            (false, false) => Err(RegistryError::ExtensionNotFound(name.to_string())),
        }
    }

-    /// Get the full key ("tools/github", "channels/telegram", or
-    /// "mcp-servers/notion") for a manifest.
+    /// Get the full key ("tools/github" or "channels/telegram") for a manifest.
    pub fn key_for(&self, name: &str) -> Option<String> {
        if self.manifests.contains_key(name) {
            return Some(name.to_string());
        }

-        let matches: Vec<String> = ["tools", "channels", "mcp-servers"]
-            .iter()
-            .filter_map(|prefix| {
-                let key = format!("{}/{}", prefix, name);
-                if self.manifests.contains_key(&key) {
-                    Some(key)
-                } else {
-                    None
-                }
-            })
-            .collect();
+        let has_tool = self.manifests.contains_key(&format!("tools/{}", name));
+        let has_channel = self.manifests.contains_key(&format!("channels/{}", name));

-        if matches.len() == 1 {
-            matches.into_iter().next()
-        } else {
-            None // ambiguous or not found
+        match (has_tool, has_channel) {
+            (true, true) => None, // ambiguous
+            (true, false) => Some(format!("tools/{}", name)),
+            (false, true) => Some(format!("channels/{}", name)),
+            (false, false) => None,
        }
    }

@@ -510,10 +476,8 @@ mod tests {
    fn create_test_registry(dir: &Path) {
        let tools_dir = dir.join("tools");
        let channels_dir = dir.join("channels");
-        let mcp_dir = dir.join("mcp-servers");
        fs::create_dir_all(&tools_dir).unwrap();
        fs::create_dir_all(&channels_dir).unwrap();
-        fs::create_dir_all(&mcp_dir).unwrap();

        fs::write(
            tools_dir.join("slack.json"),
@@ -576,20 +540,6 @@ mod tests {
        )
        .unwrap();

-        fs::write(
-            mcp_dir.join("notion.json"),
-            r#"{
-                "name": "notion",
-                "display_name": "Notion",
-                "kind": "mcp_server",
-                "description": "Connect to Notion for pages and databases",
-                "keywords": ["notes", "wiki"],
-                "url": "https://mcp.notion.com/mcp",
-                "auth": "dcr"
-            }"#,
-        )
-        .unwrap();
-
        fs::write(
            dir.join("_bundles.json"),
            r#"{
@@ -615,7 +565,7 @@ mod tests {
        create_test_registry(tmp.path());

        let catalog = RegistryCatalog::load(tmp.path()).unwrap();
-        assert_eq!(catalog.all().len(), 4);
+        assert_eq!(catalog.all().len(), 3);
    }

    #[test]
@@ -629,9 +579,6 @@ mod tests {

        let channels = catalog.list(Some(ManifestKind::Channel), None);
        assert_eq!(channels.len(), 1);
-
-        let mcp_servers = catalog.list(Some(ManifestKind::McpServer), None);
-        assert_eq!(mcp_servers.len(), 1);
    }

    #[test]
@@ -656,12 +603,10 @@ mod tests {

        // Full key
        assert!(catalog.get("tools/slack").is_some());
-        assert!(catalog.get("mcp-servers/notion").is_some());

        // Bare name
        assert!(catalog.get("slack").is_some());
        assert!(catalog.get("telegram").is_some());
-        assert!(catalog.get("notion").is_some());

        // Missing
        assert!(catalog.get("nonexistent").is_none());
@@ -20,8 +20,6 @@ struct EmbeddedCatalogRaw {
    #[serde(default)]
    channels: Vec<ExtensionManifest>,
    #[serde(default)]
-    mcp_servers: Vec<ExtensionManifest>,
-    #[serde(default)]
    bundles: BundlesFile,
 }

@@ -54,10 +52,6 @@ fn parsed_catalog() -> &'static ParsedCatalog {
            let key = format!("channels/{}", m.name);
            manifests.insert(key, m);
        }
-        for m in raw.mcp_servers {
-            let key = format!("mcp-servers/{}", m.name);
-            manifests.insert(key, m);
-        }

        ParsedCatalog {
            manifests,
@@ -7,7 +7,7 @@ use tokio::fs;

 use crate::bootstrap::ironclaw_base_dir;
 use crate::registry::catalog::RegistryError;
-use crate::registry::manifest::{BundleDefinition, ExtensionManifest, ManifestKind, SourceSpec};
+use crate::registry::manifest::{BundleDefinition, ExtensionManifest, ManifestKind};

 // GitHub-only by design. New trusted hosts (e.g. a NEAR AI CDN) must be
 // explicitly added here; unknown hosts fall back to source build with a
@@ -98,29 +98,12 @@ fn validate_manifest_install_inputs(manifest: &ExtensionManifest) -> Result<(),
        });
    }

-    // MCP servers are not installed via this path
-    if manifest.kind == ManifestKind::McpServer {
-        return Ok(());
-    }
-
-    let source = match &manifest.source {
-        Some(s) => s,
-        None => {
-            return Err(RegistryError::InvalidManifest {
-                name: manifest.name.clone(),
-                field: "source",
-                reason: "WASM extensions must have a source spec".to_string(),
-            });
-        }
-    };
-
    let expected_prefix = match manifest.kind {
        ManifestKind::Tool => "tools-src/",
        ManifestKind::Channel => "channels-src/",
-        ManifestKind::McpServer => unreachable!(),
    };

-    if !source.dir.starts_with(expected_prefix) {
+    if !manifest.source.dir.starts_with(expected_prefix) {
        return Err(RegistryError::InvalidManifest {
            name: manifest.name.clone(),
            field: "source.dir",
@@ -128,7 +111,7 @@ fn validate_manifest_install_inputs(manifest: &ExtensionManifest) -> Result<(),
        });
    }

-    let source_path = Path::new(&source.dir);
+    let source_path = Path::new(&manifest.source.dir);
    let has_unsafe_component = source_path.components().any(|component| {
        matches!(
            component,
@@ -144,9 +127,9 @@ fn validate_manifest_install_inputs(manifest: &ExtensionManifest) -> Result<(),
        });
    }

-    let has_path_separator = source.capabilities.contains('/')
-        || source.capabilities.contains('\\')
-        || source.capabilities.contains("..");
+    let has_path_separator = manifest.source.capabilities.contains('/')
+        || manifest.source.capabilities.contains('\\')
+        || manifest.source.capabilities.contains("..");

    if has_path_separator {
        return Err(RegistryError::InvalidManifest {
@@ -159,18 +142,6 @@ fn validate_manifest_install_inputs(manifest: &ExtensionManifest) -> Result<(),
    Ok(())
 }

-/// Extract the source spec from a manifest, returning an error if absent.
-fn require_source(manifest: &ExtensionManifest) -> Result<&SourceSpec, RegistryError> {
-    manifest
-        .source
-        .as_ref()
-        .ok_or_else(|| RegistryError::InvalidManifest {
-            name: manifest.name.clone(),
-            field: "source",
-            reason: "WASM extensions must have a source spec".to_string(),
-        })
-}
-
 fn download_failure_reason(error: &reqwest::Error) -> String {
    if error.is_timeout() {
        "request timed out".to_string()
@@ -235,17 +206,7 @@ impl RegistryInstaller {
    ) -> Result<InstallOutcome, RegistryError> {
        validate_manifest_install_inputs(manifest)?;

-        if manifest.kind == ManifestKind::McpServer {
-            return Err(RegistryError::InvalidManifest {
-                name: manifest.name.clone(),
-                field: "kind",
-                reason: "MCP servers cannot be installed from source".to_string(),
-            });
-        }
-
-        let source = require_source(manifest)?;
-
-        let source_dir = self.repo_root.join(&source.dir);
+        let source_dir = self.repo_root.join(&manifest.source.dir);
        if !source_dir.exists() {
            return Err(RegistryError::ManifestRead {
                path: source_dir.clone(),
@@ -256,7 +217,6 @@ impl RegistryInstaller {
        let target_dir = match manifest.kind {
            ManifestKind::Tool => &self.tools_dir,
            ManifestKind::Channel => &self.channels_dir,
-            ManifestKind::McpServer => unreachable!(),
        };

        fs::create_dir_all(target_dir)
@@ -282,7 +242,7 @@ impl RegistryInstaller {
            manifest.display_name,
            source_dir.display()
        );
-        let crate_name = &source.crate_name;
+        let crate_name = &manifest.source.crate_name;
        let wasm_path =
            crate::registry::artifacts::build_wasm_component(&source_dir, crate_name, true)
                .await
@@ -298,7 +258,7 @@ impl RegistryInstaller {
            .map_err(RegistryError::Io)?;

        // Copy capabilities file
-        let caps_source = source_dir.join(&source.capabilities);
+        let caps_source = source_dir.join(&manifest.source.capabilities);
        let target_caps = target_dir.join(format!("{}.capabilities.json", manifest.name));
        let has_capabilities = if caps_source.exists() {
            fs::copy(&caps_source, &target_caps)
@@ -336,16 +296,6 @@ impl RegistryInstaller {
        // catch it first.
        validate_manifest_install_inputs(manifest)?;

-        if manifest.kind == ManifestKind::McpServer {
-            return Err(RegistryError::InvalidManifest {
-                name: manifest.name.clone(),
-                field: "kind",
-                reason: "MCP servers cannot be installed via the WASM installer".to_string(),
-            });
-        }
-
-        let source = require_source(manifest)?;
-
        let has_artifact = manifest
            .artifacts
            .get("wasm32-wasip2")
@@ -356,7 +306,7 @@ impl RegistryInstaller {
            return self.install_from_source(manifest, force).await;
        }

-        let source_dir = self.repo_root.join(&source.dir);
+        let source_dir = self.repo_root.join(&manifest.source.dir);

        match self.install_from_artifact(manifest, force).await {
            Ok(outcome) => Ok(outcome),
@@ -441,13 +391,6 @@ impl RegistryInstaller {
        let target_dir = match manifest.kind {
            ManifestKind::Tool => &self.tools_dir,
            ManifestKind::Channel => &self.channels_dir,
-            ManifestKind::McpServer => {
-                return Err(RegistryError::InvalidManifest {
-                    name: manifest.name.clone(),
-                    field: "kind",
-                    reason: "MCP servers cannot be installed as artifacts".to_string(),
-                });
-            }
        };

        fs::create_dir_all(target_dir)
@@ -515,9 +458,12 @@ impl RegistryInstaller {
                        false
                    }
                }
-            } else if let Some(ref source) = manifest.source {
+            } else {
                // Legacy fallback: try source tree
-                let caps_source = self.repo_root.join(&source.dir).join(&source.capabilities);
+                let caps_source = self
+                    .repo_root
+                    .join(&manifest.source.dir)
+                    .join(&manifest.source.capabilities);
                if caps_source.exists() {
                    fs::copy(&caps_source, &target_caps)
                        .await
@@ -526,8 +472,6 @@ impl RegistryInstaller {
                } else {
                    false
                }
-            } else {
-                false
            }
        };

@@ -831,19 +775,17 @@ mod tests {
            name: name.to_string(),
            display_name: name.to_string(),
            kind,
-            version: Some("0.1.0".to_string()),
+            version: "0.1.0".to_string(),
            description: "test manifest".to_string(),
            keywords: Vec::new(),
-            source: Some(SourceSpec {
+            source: SourceSpec {
                dir: source_dir.to_string(),
                capabilities: format!("{}.capabilities.json", name),
                crate_name: name.to_string(),
-            }),
+            },
            artifacts,
            auth_summary: None,
            tags: Vec::new(),
-            url: None,
-            auth: None,
        }
    }

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};

 use crate::extensions::{AuthHint, ExtensionKind, ExtensionSource, RegistryEntry};

-/// A single extension manifest loaded from `registry/{tools,channels,mcp-servers}/<name>.json`.
+/// A single extension manifest loaded from `registry/{tools,channels}/<name>.json`.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ExtensionManifest {
    /// Unique identifier (matches crate name stem, e.g. "slack").
@@ -16,12 +16,11 @@ pub struct ExtensionManifest {
    /// Human-readable name (e.g. "Slack").
    pub display_name: String,

-    /// Whether this is a tool, channel, or MCP server.
+    /// Whether this is a tool or channel.
    pub kind: ManifestKind,

-    /// Semver version from Cargo.toml. Optional for MCP server manifests.
-    #[serde(default)]
-    pub version: Option<String>,
+    /// Semver version from Cargo.toml.
+    pub version: String,

    /// One-line description.
    pub description: String,
@@ -30,9 +29,8 @@ pub struct ExtensionManifest {
    #[serde(default)]
    pub keywords: Vec<String>,

-    /// Source code location and build info. Absent for MCP server manifests.
-    #[serde(default)]
-    pub source: Option<SourceSpec>,
+    /// Source code location and build info.
+    pub source: SourceSpec,

    /// Pre-built binary artifacts keyed by target triple.
    #[serde(default)]
@@ -45,15 +43,6 @@ pub struct ExtensionManifest {
    /// Tags for filtering (e.g. "default", "messaging", "google").
    #[serde(default)]
    pub tags: Vec<String>,
-
-    /// MCP server URL. Only present for `McpServer` manifests.
-    #[serde(default)]
-    pub url: Option<String>,
-
-    /// MCP auth method: "dcr", "oauth_pre_configured:<setup_url>", or "none".
-    /// Only present for `McpServer` manifests.
-    #[serde(default)]
-    pub auth: Option<String>,
 }

 /// Extension kind as declared in manifests.
@@ -62,7 +51,6 @@ pub struct ExtensionManifest {
 pub enum ManifestKind {
    Tool,
    Channel,
-    McpServer,
 }

 impl From<ManifestKind> for ExtensionKind {
@@ -70,7 +58,6 @@ impl From<ManifestKind> for ExtensionKind {
        match kind {
            ManifestKind::Tool => ExtensionKind::WasmTool,
            ManifestKind::Channel => ExtensionKind::WasmChannel,
-            ManifestKind::McpServer => ExtensionKind::McpServer,
        }
    }
 }
@@ -80,7 +67,6 @@ impl std::fmt::Display for ManifestKind {
        match self {
            ManifestKind::Tool => write!(f, "tool"),
            ManifestKind::Channel => write!(f, "channel"),
-            ManifestKind::McpServer => write!(f, "mcp_server"),
        }
    }
 }
@@ -167,64 +153,12 @@ pub struct BundlesFile {
 impl ExtensionManifest {
    /// Convert this manifest into a [`RegistryEntry`] for use with the in-chat
    /// extension discovery system.
-    ///
-    /// Returns `None` for MCP server manifests missing a `url` field.
-    pub fn to_registry_entry(&self) -> Option<RegistryEntry> {
-        if self.kind == ManifestKind::McpServer {
-            return self.to_mcp_registry_entry();
-        }
-
-        Some(self.to_wasm_registry_entry())
-    }
-
-    /// Build a [`RegistryEntry`] for an MCP server manifest.
-    fn to_mcp_registry_entry(&self) -> Option<RegistryEntry> {
-        let url = match &self.url {
-            Some(u) => u.clone(),
-            None => {
-                tracing::warn!(
-                    "MCP server manifest '{}' is missing 'url' field, skipping",
-                    self.name
-                );
-                return None;
-            }
+    pub fn to_registry_entry(&self) -> RegistryEntry {
+        let buildable = ExtensionSource::WasmBuildable {
+            source_dir: self.source.dir.clone(),
+            build_dir: Some(self.source.dir.clone()),
+            crate_name: Some(self.source.crate_name.clone()),
        };
-        let auth_hint = match self.auth.as_deref() {
-            Some("dcr") | None => AuthHint::Dcr,
-            Some("none") => AuthHint::None,
-            Some(other) if other.starts_with("oauth_pre_configured:") => {
-                AuthHint::OAuthPreConfigured {
-                    setup_url: other
-                        .strip_prefix("oauth_pre_configured:")
-                        .unwrap_or("")
-                        .to_string(),
-                }
-            }
-            _ => AuthHint::Dcr,
-        };
-
-        Some(RegistryEntry {
-            name: self.name.clone(),
-            display_name: self.display_name.clone(),
-            kind: ExtensionKind::McpServer,
-            description: self.description.clone(),
-            keywords: self.keywords.clone(),
-            source: ExtensionSource::McpUrl { url },
-            fallback_source: None,
-            auth_hint,
-            version: self.version.clone(),
-        })
-    }
-
-    /// Build a [`RegistryEntry`] for a WASM tool or channel manifest.
-    fn to_wasm_registry_entry(&self) -> RegistryEntry {
-        let source_spec = self.source.as_ref();
-
-        let buildable = source_spec.map(|s| ExtensionSource::WasmBuildable {
-            source_dir: s.dir.clone(),
-            build_dir: Some(s.dir.clone()),
-            crate_name: Some(s.crate_name.clone()),
-        });

        // Prefer pre-built artifact download when a URL is available,
        // with build-from-source as fallback in case the download fails (e.g., 404).
@@ -236,32 +170,13 @@ impl ExtensionManifest {
                        wasm_url: url.clone(),
                        capabilities_url: artifact.capabilities_url.clone(),
                    },
-                    buildable.map(Box::new),
+                    Some(Box::new(buildable)),
                )
-            } else if let Some(b) = buildable {
-                (b, None)
            } else {
-                // No source spec and no download URL — use a placeholder
-                (
-                    ExtensionSource::WasmBuildable {
-                        source_dir: String::new(),
-                        build_dir: None,
-                        crate_name: None,
-                    },
-                    None,
-                )
+                (buildable, None)
            }
-        } else if let Some(b) = buildable {
-            (b, None)
        } else {
-            (
-                ExtensionSource::WasmBuildable {
-                    source_dir: String::new(),
-                    build_dir: None,
-                    crate_name: None,
-                },
-                None,
-            )
+            (buildable, None)
        };

        let auth_hint = match self.auth_summary.as_ref().and_then(|a| a.method.as_deref()) {
@@ -280,7 +195,7 @@ impl ExtensionManifest {
            source,
            fallback_source,
            auth_hint,
-            version: self.version.clone(),
+            version: Some(self.version.clone()),
        }
    }
 }
@@ -319,10 +234,10 @@ mod tests {
        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
        assert_eq!(manifest.name, "slack");
        assert_eq!(manifest.kind, ManifestKind::Tool);
-        assert_eq!(manifest.version.as_deref(), Some("0.1.0"));
+        assert_eq!(manifest.version, "0.1.0");
        assert!(manifest.tags.contains(&"default".to_string()));

-        let entry = manifest.to_registry_entry().unwrap();
+        let entry = manifest.to_registry_entry();
        assert_eq!(entry.kind, ExtensionKind::WasmTool);
    }

@@ -347,7 +262,7 @@ mod tests {
        assert!(manifest.auth_summary.is_none());
        assert!(manifest.artifacts.is_empty());

-        let entry = manifest.to_registry_entry().unwrap();
+        let entry = manifest.to_registry_entry();
        assert_eq!(entry.kind, ExtensionKind::WasmChannel);
    }

@@ -381,7 +296,6 @@ mod tests {
    fn test_manifest_kind_display() {
        assert_eq!(ManifestKind::Tool.to_string(), "tool");
        assert_eq!(ManifestKind::Channel.to_string(), "channel");
-        assert_eq!(ManifestKind::McpServer.to_string(), "mcp_server");
    }

    /// When a manifest has a download URL in artifacts, to_registry_entry()
@@ -410,7 +324,7 @@ mod tests {
        }"#;

        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        let entry = manifest.to_registry_entry().unwrap();
+        let entry = manifest.to_registry_entry();

        // Primary source should be WasmDownload
        assert!(
@@ -460,7 +374,7 @@ mod tests {
        }"#;

        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        let entry = manifest.to_registry_entry().unwrap();
+        let entry = manifest.to_registry_entry();

        assert!(
            matches!(&entry.source, ExtensionSource::WasmBuildable { .. }),
@@ -491,7 +405,7 @@ mod tests {
        }"#;

        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        let entry = manifest.to_registry_entry().unwrap();
+        let entry = manifest.to_registry_entry();

        assert!(
            matches!(&entry.source, ExtensionSource::WasmBuildable { .. }),
@@ -502,89 +416,4 @@ mod tests {
            "Should have no fallback when already using WasmBuildable"
        );
    }
-
-    #[test]
-    fn test_parse_mcp_server_manifest() {
-        let json = r#"{
-            "name": "notion",
-            "display_name": "Notion",
-            "kind": "mcp_server",
-            "description": "Connect to Notion for reading and writing pages, databases, and comments",
-            "keywords": ["notes", "wiki", "docs", "pages", "database"],
-            "url": "https://mcp.notion.com/mcp",
-            "auth": "dcr"
-        }"#;
-
-        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        assert_eq!(manifest.name, "notion");
-        assert_eq!(manifest.kind, ManifestKind::McpServer);
-        assert!(manifest.version.is_none());
-        assert!(manifest.source.is_none());
-        assert_eq!(manifest.url.as_deref(), Some("https://mcp.notion.com/mcp"));
-        assert_eq!(manifest.auth.as_deref(), Some("dcr"));
-
-        let entry = manifest.to_registry_entry().unwrap();
-        assert_eq!(entry.kind, ExtensionKind::McpServer);
-        assert!(
-            matches!(&entry.source, ExtensionSource::McpUrl { url } if url == "https://mcp.notion.com/mcp")
-        );
-        assert!(matches!(&entry.auth_hint, AuthHint::Dcr));
-        assert!(entry.fallback_source.is_none());
-    }
-
-    #[test]
-    fn test_mcp_server_oauth_pre_configured() {
-        let json = r#"{
-            "name": "custom-mcp",
-            "display_name": "Custom MCP",
-            "kind": "mcp_server",
-            "description": "Custom MCP server",
-            "keywords": [],
-            "url": "https://mcp.example.com",
-            "auth": "oauth_pre_configured:https://example.com/setup"
-        }"#;
-
-        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        let entry = manifest.to_registry_entry().unwrap();
-
-        assert!(matches!(
-            &entry.auth_hint,
-            AuthHint::OAuthPreConfigured { setup_url } if setup_url == "https://example.com/setup"
-        ));
-    }
-
-    #[test]
-    fn test_mcp_server_auth_none() {
-        let json = r#"{
-            "name": "local-mcp",
-            "display_name": "Local MCP",
-            "kind": "mcp_server",
-            "description": "Local MCP server",
-            "keywords": [],
-            "url": "http://localhost:8080/mcp",
-            "auth": "none"
-        }"#;
-
-        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        let entry = manifest.to_registry_entry().unwrap();
-
-        assert!(matches!(&entry.auth_hint, AuthHint::None));
-    }
-
-    #[test]
-    fn test_mcp_server_missing_url_returns_none() {
-        let json = r#"{
-            "name": "broken-mcp",
-            "display_name": "Broken MCP",
-            "kind": "mcp_server",
-            "description": "MCP server with no URL",
-            "keywords": []
-        }"#;
-
-        let manifest: ExtensionManifest = serde_json::from_str(json).expect("parse manifest");
-        assert!(
-            manifest.to_registry_entry().is_none(),
-            "MCP manifest without url should return None"
-        );
-    }
 }
@@ -65,20 +65,7 @@ fn install_macos() -> Result<()> {
    let stdout = logs_dir.join("daemon.stdout.log");
    let stderr = logs_dir.join("daemon.stderr.log");

-    let plist = macos_plist_content(
-        &exe.display().to_string(),
-        &stdout.display().to_string(),
-        &stderr.display().to_string(),
-    );
-
-    std::fs::write(&file, plist)?;
-    println!("Installed launchd service: {}", file.display());
-    println!("  Start with: ironclaw service start");
-    Ok(())
-}
-
-fn macos_plist_content(exe: &str, stdout: &str, stderr: &str) -> String {
-    format!(
+    let plist = format!(
        r#"<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -94,11 +81,6 @@ fn macos_plist_content(exe: &str, stdout: &str, stderr: &str) -> String {
  <true/>
  <key>KeepAlive</key>
  <true/>
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>CLI_ENABLED</key>
-    <string>false</string>
-  </dict>
  <key>StandardOutPath</key>
  <string>{stdout}</string>
  <key>StandardErrorPath</key>
@@ -107,10 +89,15 @@ fn macos_plist_content(exe: &str, stdout: &str, stderr: &str) -> String {
 </plist>
 "#,
        label = SERVICE_LABEL,
-        exe = xml_escape(exe),
-        stdout = xml_escape(stdout),
-        stderr = xml_escape(stderr),
-    )
+        exe = xml_escape(&exe.display().to_string()),
+        stdout = xml_escape(&stdout.display().to_string()),
+        stderr = xml_escape(&stderr.display().to_string()),
+    );
+
+    std::fs::write(&file, plist)?;
+    println!("Installed launchd service: {}", file.display());
+    println!("  Start with: ironclaw service start");
+    Ok(())
 }

 fn install_linux() -> Result<()> {
@@ -369,11 +356,4 @@ mod tests {
        let s = path.to_string_lossy();
        assert!(s.ends_with(".ironclaw/logs"), "unexpected path: {s}");
    }
-
-    #[test]
-    fn macos_plist_sets_cli_enabled_false() {
-        let plist = macos_plist_content("/tmp/ironclaw", "/tmp/stdout.log", "/tmp/stderr.log");
-        assert!(plist.contains("<key>EnvironmentVariables</key>"));
-        assert!(plist.contains("    <key>CLI_ENABLED</key>\n    <string>false</string>"));
-    }
 }
@@ -1067,8 +1067,6 @@ mod tests {
                prompt: "Check status".to_string(),
                context_paths: vec![],
                max_tokens: 500,
-                use_tools: false,
-                max_tool_rounds: 3,
            },
            guardrails: RoutineGuardrails {
                cooldown: std::time::Duration::from_secs(60),
@@ -1200,8 +1198,6 @@ mod tests {
                prompt: "test".to_string(),
                context_paths: vec![],
                max_tokens: 100,
-                use_tools: false,
-                max_tool_rounds: 3,
            },
            guardrails: RoutineGuardrails {
                cooldown: std::time::Duration::from_secs(0),
@@ -256,13 +256,7 @@ impl Tool for ToolAuthTool {
    }

    fn requires_approval(&self, _params: &serde_json::Value) -> ApprovalRequirement {
-        // In gateway mode, tool_auth only returns an auth URL for the frontend
-        // to open — no browser is launched server-side, so no approval needed.
-        if self.manager.should_use_gateway_mode() {
-            ApprovalRequirement::Never
-        } else {
-            ApprovalRequirement::UnlessAutoApproved
-        }
+        ApprovalRequirement::UnlessAutoApproved
    }
 }

@@ -739,22 +733,6 @@ mod tests {
        }
    }

-    #[tokio::test]
-    async fn tool_auth_no_approval_in_gateway_mode() {
-        let manager = test_manager_stub();
-        manager
-            .enable_gateway_mode("http://localhost:3000".to_string())
-            .await;
-        let tool = ToolAuthTool {
-            manager: manager.clone(),
-        };
-        assert_eq!(
-            tool.requires_approval(&serde_json::json!({})),
-            ApprovalRequirement::Never,
-            "tool_auth should not require approval in gateway mode"
-        );
-    }
-
    #[test]
    fn test_tool_upgrade_schema() {
        use crate::tools::tool::ApprovalRequirement;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ZakiandClaude Opus 4.6	aa289997e3	style: fix import ordering for routines module Co-Authored-By: Claude Opus 4.6 <[email protected]>	2026-03-12 12:50:53 -07:00
ZakiandClaude Opus 4.6	4aad0cfbaa	refactor(cli): rename cron subcommand to routines The system manages all routine types (cron, webhook, event, manual), not just cron schedules. Rename the CLI subcommand to reflect this: - `ironclaw cron` -> `ironclaw routines` (with `cron` as hidden alias) - List shows all routines by default, add --trigger filter - Remove cron-trigger-only validation - Simplify require_routine helper (no trigger type check) Co-Authored-By: Claude Opus 4.6 <[email protected]>	2026-03-12 12:06:30 -07:00
Zaki	112a4087e7	fix(cli): reject invalid cron timezones	2026-03-12 11:00:16 -07:00
reidliu41andZaki	403f6f504f	feat(cli): add cron subcommand for managing scheduled routines Rebase onto staging branch and address collaborator review: - Fix .unwrap_or(None) → proper error propagation in set_enabled() - Add --yes/-y flag for non-interactive deletion with confirmation prompt - Add --json flag for machine-readable output in list and history - Preserve error context chain with {e:#} in run_cron_cli() Note: GATEWAY_USER_ID is trusted from the environment; future work may add authentication for multi-tenant deployments.	2026-03-12 11:00:16 -07:00