fix(handlers): add missing log import to container_files.go

log.Printf was called at line 35 but "log" was not imported, causing a build failure. Closes QA review comment on PR #1117. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
fix(handlers): log DB Scan errors previously silently ignored (3 files)
2026-05-15 07:35:38 +00:00 · 2026-05-15 03:16:07 +00:00
71 changed files with 1182 additions and 5225 deletions
@@ -118,19 +118,17 @@ _DIRECTIVE_RE = re.compile(
 def parse_directives(
    comment_body: str,
    numeric_aliases: dict[int, str],
-) -> tuple[list[tuple[str, str, str]], list]:
+) -> list[tuple[str, str, str]]:
    """Extract /sop-ack and /sop-revoke directives from a comment body.

-    Returns (directives, na_directives) where:
-      directives is a list of (kind, canonical_slug, note) tuples
-        kind is "sop-ack" or "sop-revoke"
-        canonical_slug is the normalized form (or "" if unparseable)
-        note is the trailing free-text (may be "")
-      na_directives is reserved for future N/A handling (always [] for now)
+    Returns a list of (kind, canonical_slug, note) tuples where:
+      kind is "sop-ack" or "sop-revoke"
+      canonical_slug is the normalized form (or "" if unparseable)
+      note is the trailing free-text (may be "")
    """
    out: list[tuple[str, str, str]] = []
    if not comment_body:
-        return out, []
+        return out
    for m in _DIRECTIVE_RE.finditer(comment_body):
        kind = m.group(1)
        raw_slug = (m.group(2) or "").strip()
@@ -161,7 +159,7 @@ def parse_directives(
        # If we collapsed multi-word slug into kebab and there's a
        # trailing-text group too, append it.
        out.append((kind, canonical, note_from_group))
-    return out, []
+    return out


 # ---------------------------------------------------------------------------
@@ -251,8 +249,7 @@ def compute_ack_state(
        user = (c.get("user") or {}).get("login", "")
        if not user:
            continue
-        directives, _na = parse_directives(body, numeric_aliases)
-        for kind, slug, _note in directives:
+        for kind, slug, _note in parse_directives(body, numeric_aliases):
            if not slug:
                unparseable_per_user[user] = unparseable_per_user.get(user, 0) + 1
                continue
@@ -133,6 +133,7 @@ jobs:
  # the name match works on PRs that don't touch workspace-server/).
  platform-build:
    name: Platform (Go)
+    needs: changes
    runs-on: ubuntu-latest
    # mc#774 (closed 2026-05-14): Phase 4 flip of the platform-build job.
    # Phase 4 (#656) originally flipped this to continue-on-error: false based on
@@ -153,29 +154,29 @@ jobs:
      run:
        working-directory: workspace-server
    steps:
-      - if: false
+      - if: needs.changes.outputs.platform != 'true'
        working-directory: .
        run: echo "No platform/** changes — skipping real build steps; this job always runs to satisfy the required-check name on branch protection."
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
        with:
          go-version: 'stable'
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        run: go mod download
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        run: go build ./cmd/server
      # CLI (molecli) moved to standalone repo: git.moleculesai.app/molecule-ai/molecule-cli
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        run: go vet ./...
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        name: Install golangci-lint
        run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        name: Run golangci-lint
        run: $(go env GOPATH)/bin/golangci-lint run --timeout 3m ./...
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        name: Diagnostic — per-package verbose 60s
        run: |
          set +e
@@ -191,7 +192,7 @@ jobs:
          echo "::endgroup::"
        # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
        continue-on-error: true
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        name: Run tests with race detection and coverage
        # Explicit timeout: cold runner cache causes OOM kills at ~4m39s on the
        # full ./... suite with race detection + coverage. A 10m per-step timeout
@@ -199,7 +200,7 @@ jobs:
        # instead of OOM-killing. The job-level timeout (15m) is a backstop.
        run: go test -race -timeout 10m -coverprofile=coverage.out ./...

-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        name: Per-file coverage report
        # Advisory — lists every source file with its coverage so reviewers
        # can see at-a-glance where gaps are. Sorted ascending so the worst
@@ -213,7 +214,7 @@ jobs:
                   END {for (f in s) printf "%6.1f%%  %s\n", s[f]/c[f], f}' \
            | sort -n

-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
        name: Check coverage thresholds
        # Enforces two gates from #1823 Layer 1:
        #   1. Total floor (25% — ratchet plan in COVERAGE_FLOOR.md).
@@ -301,28 +302,28 @@ jobs:
  # siblings — verified empirically on PR #2314).
  canvas-build:
    name: Canvas (Next.js)
+    needs: changes
    runs-on: ubuntu-latest
-    timeout-minutes: 20
    # Phase 4 (RFC #219 §1): confirmed green on main 2026-05-12.
    continue-on-error: false
    defaults:
      run:
        working-directory: canvas
    steps:
-      - if: false
+      - if: needs.changes.outputs.canvas != 'true'
        working-directory: .
        run: echo "No canvas/** changes — skipping real build steps; this job always runs to satisfy the required-check name on branch protection."
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version: '22'
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
        run: rm -f package-lock.json && npm install
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
        run: npm run build
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
        name: Run tests with coverage
        # Coverage instrumentation is configured in canvas/vitest.config.ts
        # (provider: v8, reporters: text + html + json-summary). Step 2 of
@@ -331,7 +332,7 @@ jobs:
        # tracked in #1815) after the team sees what current coverage is.
        run: npx vitest run --coverage
      - name: Upload coverage summary as artifact
-        if: always()
+        if: needs.changes.outputs.canvas == 'true' && always()
        # Pinned to v3 for Gitea act_runner v0.6 compatibility — v4+ uses
        # the GHES 3.10+ artifact protocol that Gitea 1.22.x does NOT
        # implement, surfacing as `GHESNotSupportedError: @actions/artifact
@@ -1,273 +0,0 @@
-name: E2E Chat
-
-# Comprehensive Playwright E2E for the unified chat stack (desktop
-# ChatTab + mobile MobileChat). Runs on every PR that touches canvas,
-# workspace-server, or this workflow file.
-#
-# Architecture:
-#   1. Ephemeral Postgres + Redis (docker, unique container names)
-#   2. workspace-server built from source, started with
-#      MOLECULE_ENV=development (fail-open auth)
-#   3. canvas dev server (npm run dev) on :3000
-#   4. Playwright tests create workspaces via API, point them at an
-#      in-process echo runtime, and exercise the full send/receive
-#      round-trip through the browser.
-#
-# Parallel-safety: same pattern as e2e-api.yml — per-run container names
-# and ephemeral host ports so concurrent jobs on the host-network runner
-# don't collide.
-
-on:
-  push:
-    branches: [main, staging]
-  pull_request:
-    branches: [main, staging]
-
-concurrency:
-  group: e2e-chat-${{ github.event.pull_request.head.sha || github.sha }}
-  cancel-in-progress: false
-
-env:
-  GITHUB_SERVER_URL: https://git.moleculesai.app
-
-jobs:
-  # bp-exempt: helper job; real gate is E2E Chat / E2E Chat (pull_request)
-  detect-changes:
-    runs-on: ubuntu-latest
-    # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
-    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
-    continue-on-error: true
-    outputs:
-      chat: ${{ steps.decide.outputs.chat }}
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-      - id: decide
-        run: |
-          BASE="${GITHUB_BASE_REF:-${{ github.event.before }}}"
-          if [ "${{ github.event_name }}" = "pull_request" ] && [ -n "${{ github.event.pull_request.base.sha }}" ]; then
-            BASE="${{ github.event.pull_request.base.sha }}"
-          fi
-          if [ -z "$BASE" ] || echo "$BASE" | grep -qE '^0+$'; then
-            echo "chat=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          if ! git cat-file -e "$BASE" 2>/dev/null; then
-            git fetch --depth=1 origin "$BASE" 2>/dev/null || true
-          fi
-          if ! git cat-file -e "$BASE" 2>/dev/null; then
-            echo "chat=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          CHANGED=$(git diff --name-only "$BASE" HEAD)
-          if echo "$CHANGED" | grep -qE '^(canvas/|workspace-server/|\.gitea/workflows/e2e-chat\.yml$)'; then
-            echo "chat=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "chat=false" >> "$GITHUB_OUTPUT"
-          fi
-
-  # bp-required: pending #1142 — new E2E check; add to branch protection after 3 green runs.
-  e2e-chat:
-    needs: detect-changes
-    name: E2E Chat
-    runs-on: ubuntu-latest
-    # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
-    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
-    continue-on-error: true
-    timeout-minutes: 15
-    env:
-      PG_CONTAINER: pg-e2e-chat-${{ github.run_id }}-${{ github.run_attempt }}
-      REDIS_CONTAINER: redis-e2e-chat-${{ github.run_id }}-${{ github.run_attempt }}
-    steps:
-      - name: No-op pass (paths filter excluded this commit)
-        if: needs.detect-changes.outputs.chat != 'true'
-        run: |
-          echo "No canvas / workspace-server / workflow changes — E2E Chat gate satisfied without running tests."
-          echo "::notice::E2E Chat no-op pass (paths filter excluded this commit)."
-
-      - if: needs.detect-changes.outputs.chat == 'true'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - if: needs.detect-changes.outputs.chat == 'true'
-        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
-        with:
-          go-version: 'stable'
-          cache: true
-          cache-dependency-path: workspace-server/go.sum
-
-      - if: needs.detect-changes.outputs.chat == 'true'
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d6f5 # v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: canvas/package-lock.json
-
-      - name: Start Postgres (docker)
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-          docker run -d --name "$PG_CONTAINER" \
-            -e POSTGRES_USER=dev -e POSTGRES_PASSWORD=dev -e POSTGRES_DB=molecule \
-            -p 0:5432 postgres:16 >/dev/null
-          PG_PORT=$(docker port "$PG_CONTAINER" 5432/tcp | awk -F: '/^0\.0\.0\.0:/ {print $2; exit}')
-          if [ -z "$PG_PORT" ]; then
-            PG_PORT=$(docker port "$PG_CONTAINER" 5432/tcp | head -1 | awk -F: '{print $NF}')
-          fi
-          if [ -z "$PG_PORT" ]; then
-            echo "::error::Could not resolve host port for $PG_CONTAINER"
-            exit 1
-          fi
-          echo "PG_PORT=${PG_PORT}" >> "$GITHUB_ENV"
-          echo "DATABASE_URL=postgres://dev:dev@127.0.0.1:${PG_PORT}/molecule?sslmode=disable" >> "$GITHUB_ENV"
-          echo "E2E_DATABASE_URL=postgres://dev:dev@127.0.0.1:${PG_PORT}/molecule?sslmode=disable" >> "$GITHUB_ENV"
-          for i in $(seq 1 30); do
-            if docker exec "$PG_CONTAINER" pg_isready -U dev >/dev/null 2>&1; then
-              echo "Postgres ready after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Postgres did not become ready in 30s"
-          exit 1
-
-      - name: Start Redis (docker)
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true
-          docker run -d --name "$REDIS_CONTAINER" -p 0:6379 redis:7 >/dev/null
-          REDIS_PORT=$(docker port "$REDIS_CONTAINER" 6379/tcp | awk -F: '/^0\.0\.0\.0:/ {print $2; exit}')
-          if [ -z "$REDIS_PORT" ]; then
-            REDIS_PORT=$(docker port "$REDIS_CONTAINER" 6379/tcp | head -1 | awk -F: '{print $NF}')
-          fi
-          if [ -z "$REDIS_PORT" ]; then
-            echo "::error::Could not resolve host port for $REDIS_CONTAINER"
-            exit 1
-          fi
-          echo "REDIS_PORT=${REDIS_PORT}" >> "$GITHUB_ENV"
-          echo "REDIS_URL=redis://127.0.0.1:${REDIS_PORT}" >> "$GITHUB_ENV"
-          for i in $(seq 1 15); do
-            if docker exec "$REDIS_CONTAINER" redis-cli ping 2>/dev/null | grep -q PONG; then
-              echo "Redis ready after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Redis did not become ready in 15s"
-          exit 1
-
-      - name: Build platform
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: workspace-server
-        run: go build -o platform-server ./cmd/server
-
-      - name: Pick platform port
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          PLATFORM_PORT=$(python3 - <<'PY'
-          import socket
-          with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-              s.bind(("127.0.0.1", 0))
-              print(s.getsockname()[1])
-          PY
-          )
-          echo "PLATFORM_PORT=${PLATFORM_PORT}" >> "$GITHUB_ENV"
-          echo "E2E_PLATFORM_URL=http://127.0.0.1:${PLATFORM_PORT}" >> "$GITHUB_ENV"
-          echo "Platform host port: ${PLATFORM_PORT}"
-
-      - name: Start platform (background)
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: workspace-server
-        run: |
-          export MOLECULE_ENV=development
-          export DATABASE_URL="${DATABASE_URL}"
-          export REDIS_URL="${REDIS_URL}"
-          export PORT="${PLATFORM_PORT}"
-          ./platform-server > platform.log 2>&1 &
-          echo $! > platform.pid
-
-      - name: Wait for /health
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          for i in $(seq 1 30); do
-            if curl -sf "http://127.0.0.1:${PLATFORM_PORT}/health" > /dev/null; then
-              echo "Platform up after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Platform did not become healthy in 30s"
-          cat workspace-server/platform.log || true
-          exit 1
-
-      - name: Install canvas dependencies
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: npm ci
-
-      - name: Install Playwright browsers
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: npx playwright install --with-deps chromium
-
-      - name: Start canvas dev server (background)
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: |
-          export NEXT_PUBLIC_PLATFORM_URL="http://127.0.0.1:${PLATFORM_PORT}"
-          export NEXT_PUBLIC_WS_URL="ws://127.0.0.1:${PLATFORM_PORT}/ws"
-          npm run dev > canvas.log 2>&1 &
-          echo $! > canvas.pid
-          for i in $(seq 1 30); do
-            if curl -sf http://localhost:3000 > /dev/null 2>&1; then
-              echo "Canvas up after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Canvas did not start in 30s"
-          cat canvas.log || true
-          exit 1
-
-      - name: Run Playwright E2E tests
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: |
-          export E2E_PLATFORM_URL="http://127.0.0.1:${PLATFORM_PORT}"
-          export E2E_DATABASE_URL="${DATABASE_URL}"
-          npx playwright test e2e/chat-desktop.spec.ts e2e/chat-mobile.spec.ts
-
-      - name: Dump platform log on failure
-        if: failure() && needs.detect-changes.outputs.chat == 'true'
-        run: cat workspace-server/platform.log || true
-
-      - name: Dump canvas log on failure
-        if: failure() && needs.detect-changes.outputs.chat == 'true'
-        run: cat canvas/canvas.log || true
-
-      - name: Upload Playwright report
-        if: failure() && needs.detect-changes.outputs.chat == 'true'
-        uses: actions/upload-artifact@v3.2.2
-        with:
-          name: playwright-report-chat
-          path: canvas/playwright-report/
-
-      - name: Stop canvas
-        if: always() && needs.detect-changes.outputs.chat == 'true'
-        run: |
-          if [ -f canvas/canvas.pid ]; then
-            kill "$(cat canvas/canvas.pid)" 2>/dev/null || true
-          fi
-
-      - name: Stop platform
-        if: always() && needs.detect-changes.outputs.chat == 'true'
-        run: |
-          if [ -f workspace-server/platform.pid ]; then
-            kill "$(cat workspace-server/platform.pid)" 2>/dev/null || true
-          fi
-
-      - name: Stop service containers
-        if: always() && needs.detect-changes.outputs.chat == 'true'
-        run: |
-          docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-          docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true
@@ -1,173 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { startEchoRuntime } from "./fixtures/echo-runtime";
-import { seedWorkspace, startHeartbeat, cleanupWorkspace } from "./fixtures/chat-seed";
-
-
-test.describe("Desktop ChatTab", () => {
-  let cleanup: () => Promise<void> = async () => {};
-  let workspaceId = "";
-  let workspaceName = "";
-
-  test.beforeAll(async () => {
-    const echo = await startEchoRuntime();
-    const ws = await seedWorkspace(echo.baseURL);
-    workspaceId = ws.id;
-    workspaceName = ws.name;
-    const stopHeartbeat = startHeartbeat(ws.id, ws.authToken);
-
-    cleanup = async () => {
-      stopHeartbeat();
-      await echo.stop();
-    };
-  });
-
-  test.afterAll(async () => {
-    await cleanupWorkspace(workspaceId);
-    await cleanup();
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 1280, height: 800 });
-    await page.goto("/");
-    await page.waitForSelector(".react-flow__node", { timeout: 10_000 });
-    // Dismiss onboarding guide if present.
-    const skipGuide = page.getByText("Skip guide");
-    if (await skipGuide.isVisible().catch(() => false)) {
-      await skipGuide.click();
-    }
-    // Click the workspace node by its exact name label.
-    await page.getByText(workspaceName, { exact: true }).first().click();
-    // Wait for the side panel chat tab to be clickable, then click it.
-    await page.locator('#tab-chat').click();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 5_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-  });
-
-  test("chat panel loads without error", async ({ page }) => {
-    const hasEmptyState = await page.getByText("Send a message to start chatting.").isVisible().catch(() => false);
-    const hasHistory = await page.locator("[data-testid='chat-panel']").locator("div").count() > 3;
-    expect(hasEmptyState || hasHistory).toBeTruthy();
-  });
-
-  test("send text message and receive echo response", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("What is the weather?");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("What is the weather?")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: What is the weather?")).toBeVisible({ timeout: 15_000 });
-  });
-
-  test("history persists across reload", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Persistence test");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: Persistence test")).toBeVisible({ timeout: 15_000 });
-
-    await page.reload();
-    await page.waitForSelector(".react-flow__node", { timeout: 10_000 });
-    await page.getByText(workspaceName, { exact: true }).first().click();
-    await page.locator('#tab-chat').click();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 5_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-
-    await expect(page.getByText("Persistence test", { exact: true })).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: Persistence test")).toBeVisible({ timeout: 5_000 });
-  });
-
-  test("file attachment round-trip", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Please read this file");
-
-    const fileInput = page.locator("[data-testid='chat-panel'] input[type='file']").first();
-    await fileInput.setInputFiles({
-      name: "test.txt",
-      mimeType: "text/plain",
-      buffer: Buffer.from("secret content abc123"),
-    });
-
-    await expect(page.getByText("test.txt")).toBeVisible({ timeout: 3_000 });
-
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: Please read this file")).toBeVisible({ timeout: 15_000 });
-  });
-
-  test("activity log appears during send", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Trigger activity");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    // Activity log container should appear during the send flow.
-    await expect(page.locator("[data-testid='activity-log']").first()).toBeVisible({ timeout: 10_000 }).catch(() => {
-      // Activity log may not be present in all layouts.
-    });
-  });
-});
-
-test.describe("Desktop ChatTab — Markdown rendering", () => {
-  let cleanup: () => Promise<void> = async () => {};
-  let workspaceId = "";
-  let workspaceName = "";
-
-  test.beforeAll(async () => {
-    const echo = await startEchoRuntime();
-    const ws = await seedWorkspace(echo.baseURL);
-    workspaceId = ws.id;
-    workspaceName = ws.name;
-    const stopHeartbeat = startHeartbeat(ws.id, ws.authToken);
-
-    cleanup = async () => {
-      stopHeartbeat();
-      await echo.stop();
-    };
-  });
-
-  test.afterAll(async () => {
-    await cleanupWorkspace(workspaceId);
-    await cleanup();
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 1280, height: 800 });
-    await page.goto("/");
-    await page.waitForSelector(".react-flow__node", { timeout: 10_000 });
-    const skipGuide2 = page.getByText("Skip guide");
-    if (await skipGuide2.isVisible().catch(() => false)) {
-      await skipGuide2.click();
-    }
-    await page.getByText(workspaceName, { exact: true }).first().click();
-    await page.locator('#tab-chat').click();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 5_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-  });
-
-  test("code block renders <pre>", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("```js\nconst x = 1;\n```");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: ```js")).toBeVisible({ timeout: 15_000 });
-
-    const pre = page.locator("pre").first();
-    await expect(pre).toBeVisible({ timeout: 5_000 });
-    await expect(pre).toContainText("const x = 1;");
-  });
-
-  test("table renders <table>", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("| A | B |\n|---|---|\n| 1 | 2 |");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: | A | B |")).toBeVisible({ timeout: 15_000 });
-
-    const table = page.locator("table").first();
-    await expect(table).toBeVisible({ timeout: 5_000 });
-    await expect(table).toContainText("A");
-    await expect(table).toContainText("1");
-  });
-});
@@ -1,97 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { startEchoRuntime } from "./fixtures/echo-runtime";
-import { seedWorkspace, startHeartbeat, cleanupWorkspace } from "./fixtures/chat-seed";
-
-
-test.describe("MobileChat", () => {
-  let cleanup: () => Promise<void> = async () => {};
-  let workspaceId = "";
-
-  test.beforeAll(async () => {
-    const echo = await startEchoRuntime();
-    const ws = await seedWorkspace(echo.baseURL);
-    workspaceId = ws.id;
-    const stopHeartbeat = startHeartbeat(ws.id, ws.authToken);
-
-    cleanup = async () => {
-      stopHeartbeat();
-      await echo.stop();
-    };
-  });
-
-  test.afterAll(async () => {
-    await cleanupWorkspace(workspaceId);
-    await cleanup();
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 375, height: 812 });
-    // Navigate directly to the mobile chat view.
-    await page.goto(`/?m=chat&a=${workspaceId}`);
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 10_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-    // Dismiss onboarding guide if present.
-    const skipGuide = page.getByText("Skip guide");
-    if (await skipGuide.isVisible().catch(() => false)) {
-      await skipGuide.click();
-    }
-  });
-
-  test("chat panel loads without error", async ({ page }) => {
-    const hasEmptyState = await page.getByText("Send a message to start chatting.").isVisible().catch(() => false);
-    const hasHistory = await page.locator("[data-testid='chat-panel']").locator("div").count() > 3;
-    expect(hasEmptyState || hasHistory).toBeTruthy();
-  });
-
-  test("send text message and receive echo response", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Mobile test message");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Mobile test message")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: Mobile test message")).toBeVisible({ timeout: 15_000 });
-  });
-
-  test("history persists across reload", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Mobile persistence");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: Mobile persistence")).toBeVisible({ timeout: 15_000 });
-
-    await page.reload();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 10_000 });
-
-    await expect(page.getByText("Mobile persistence", { exact: true })).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: Mobile persistence")).toBeVisible({ timeout: 5_000 });
-  });
-
-  test("composer auto-grows with multi-line text", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    const initialHeight = await textarea.evaluate((el: HTMLElement) => el.offsetHeight);
-
-    await textarea.fill("Line 1\nLine 2\nLine 3\nLine 4\nLine 5");
-    await page.waitForTimeout(300);
-
-    const grownHeight = await textarea.evaluate((el: HTMLElement) => el.offsetHeight);
-    expect(grownHeight).toBeGreaterThan(initialHeight);
-  });
-
-  test("file attachment in mobile chat", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Mobile file test");
-
-    const fileInput = page.locator("[data-testid='chat-panel'] input[type='file']").first();
-    await fileInput.setInputFiles({
-      name: "mobile.txt",
-      mimeType: "text/plain",
-      buffer: Buffer.from("mobile secret"),
-    });
-
-    await expect(page.getByText("mobile.txt")).toBeVisible({ timeout: 3_000 });
-
-    await page.getByRole("button", { name: /Send/ }).first().click();
-    await expect(page.getByText("Echo: Mobile file test")).toBeVisible({ timeout: 15_000 });
-  });
-});
@@ -1,187 +0,0 @@
-/**
- * E2E seed fixture for chat tests.
- *
- * Creates an external workspace via the workspace-server API, extracts the
- * auto-minted auth token, then overrides the DB row so it appears "online"
- * with an echo-runtime URL.  External runtime is used because the health
- * sweep skips Docker checks for external workspaces; we keep the workspace
- * alive with periodic heartbeats.
- */
-
-import { randomUUID } from "node:crypto";
-
-const PLATFORM_URL = process.env.E2E_PLATFORM_URL ?? "http://localhost:8080";
-
-export interface SeededWorkspace {
-  id: string;
-  name: string;
-  agentURL: string;
-  authToken: string;
-}
-
-/**
- * Create an external workspace and wire it to the echo runtime.
- */
-export async function seedWorkspace(echoURL: string): Promise<SeededWorkspace> {
-  // 1. Create external workspace (no URL — platform will mint an auth token).
-  const runId = Math.random().toString(36).slice(2, 8);
-  const wsName = `Chat E2E Agent ${runId}`;
-  const createRes = await fetch(`${PLATFORM_URL}/workspaces`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ name: wsName, tier: 1, external: true, runtime: "external" }),
-  });
-  if (!createRes.ok) {
-    const text = await createRes.text();
-    throw new Error(`Failed to create workspace: ${createRes.status} ${text}`);
-  }
-  const ws = (await createRes.json()) as {
-    id: string;
-    name: string;
-    connection?: { auth_token?: string };
-  };
-  const authToken = ws.connection?.auth_token;
-  if (!authToken) {
-    throw new Error("Workspace created but no auth_token returned");
-  }
-
-  // 2. Direct DB update: mark online + point url at echo runtime.
-  //    The platform blocks loopback URLs at the API layer (SSRF guard),
-  //    so we bypass via psql for local E2E.
-  const dbUrl = process.env.E2E_DATABASE_URL;
-  if (!dbUrl) {
-    throw new Error("E2E_DATABASE_URL must be set for DB seeding");
-  }
-  const pgRegex = /postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)/;
-  const m = dbUrl.match(pgRegex);
-  if (!m) {
-    throw new Error(`Cannot parse E2E_DATABASE_URL: ${dbUrl}`);
-  }
-  const [, user, pass, host, port, db] = m;
-
-  // Pre-seed a platform_inbound_secret so chat file uploads don't trigger
-  // the lazy-heal 503 "retry in 30 s" path on first use.
-  const inboundSecret = Array.from({ length: 43 }, () =>
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"[
-      Math.floor(Math.random() * 64)
-    ],
-  ).join("");
-
-  const psql = [
-    `PGPASSWORD=${pass} psql`,
-    `-h ${host} -p ${port} -U ${user} -d ${db}`,
-    `-c "UPDATE workspaces SET status = 'online', url = '${echoURL}', platform_inbound_secret = '${inboundSecret}' WHERE id = '${ws.id}'"`,
-  ].join(" ");
-
-  const { execSync } = await import("node:child_process");
-  try {
-    execSync(psql, { stdio: "pipe", timeout: 30_000 });
-  } catch (err) {
-    throw new Error(`DB update failed: ${err}`);
-  }
-
-  return { id: ws.id, name: wsName, agentURL: echoURL, authToken };
-}
-
-/**
- * Start a heartbeat interval that keeps an external workspace alive.
- * Returns a stop function.
- */
-export function startHeartbeat(
-  workspaceId: string,
-  authToken: string,
-  intervalMs = 30_000,
-): () => void {
-  const send = () => {
-    fetch(`${PLATFORM_URL}/registry/heartbeat`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${authToken}`,
-      },
-      body: JSON.stringify({
-        workspace_id: workspaceId,
-        error_rate: 0,
-        sample_error: "",
-        active_tasks: 0,
-        current_task: "",
-        uptime_seconds: 0,
-      }),
-    }).catch(() => {});
-  };
-
-  // Send immediately so the first heartbeat lands before the stale sweep.
-  send();
-  const timer = setInterval(send, intervalMs);
-
-  return () => clearInterval(timer);
-}
-
-/**
- * Seed chat-history rows for a workspace.
- */
-export async function seedChatHistory(
-  workspaceId: string,
-  messages: Array<{ role: "user" | "agent"; content: string }>,
-): Promise<void> {
-  const dbUrl = process.env.E2E_DATABASE_URL;
-  if (!dbUrl) return;
-
-  const pgRegex = /postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)/;
-  const m = dbUrl.match(pgRegex);
-  if (!m) return;
-  const [, user, pass, host, port, db] = m;
-
-  const values = messages
-    .map(
-      (msg, i) =>
-        `('${randomUUID()}', '${workspaceId}', '${msg.role}', '${msg.content.replace(/'/g, "''")}', NOW() - INTERVAL '${messages.length - i} seconds')`,
-    )
-    .join(",");
-
-  const sql = `INSERT INTO chat_messages (id, workspace_id, role, content, created_at) VALUES ${values};`;
-
-  const { execSync } = await import("node:child_process");
-  const psql = `PGPASSWORD=${pass} psql -h ${host} -p ${port} -U ${user} -d ${db} -c "${sql}"`;
-  execSync(psql, { stdio: "pipe", timeout: 10_000 });
-}
-
-/**
- * Delete a seeded workspace row directly from the DB.
- * Uses psql (same credentials as seedWorkspace) so we bypass any
- * workspace-server side-effects (container stop, cascade cleanup, etc.)
- * that can race or 500 on external workspaces.
- */
-export async function cleanupWorkspace(workspaceId: string): Promise<void> {
-  const dbUrl = process.env.E2E_DATABASE_URL;
-  if (!dbUrl) return;
-
-  const pgRegex = /postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)/;
-  const m = dbUrl.match(pgRegex);
-  if (!m) return;
-  const [, user, pass, host, port, db] = m;
-
-  const psql = `PGPASSWORD=${pass} psql -h ${host} -p ${port} -U ${user} -d ${db} -c "DELETE FROM workspaces WHERE id = '${workspaceId}'"`;
-
-  const { execSync } = await import("node:child_process");
-  try {
-    execSync(psql, { stdio: "pipe", timeout: 30_000 });
-  } catch {
-    // Best-effort cleanup; don't fail the test suite if the row is already gone.
-  }
-}
-
-/**
- * Mint a workspace auth token so the canvas can make authenticated API
- * calls (WorkspaceAuth middleware).
- */
-export async function mintTestToken(workspaceId: string): Promise<string> {
-  const res = await fetch(
-    `${PLATFORM_URL}/admin/workspaces/${workspaceId}/test-token`,
-  );
-  if (!res.ok) {
-    throw new Error(`Failed to mint test token: ${res.status}`);
-  }
-  const data = (await res.json()) as { auth_token: string };
-  return data.auth_token;
-}
@@ -1,180 +0,0 @@
-/**
- * Minimal A2A echo runtime for E2E tests.
- *
- * Listens on an ephemeral port, receives A2A JSON-RPC `message/send`
- * requests, and returns a response with the original text echoed back.
- * Also implements the workspace-side chat upload ingest endpoint so
- * file-attachment E2E can exercise the full upload → send → echo
- * round-trip.
- *
- * Usage (inside test fixture):
- *   const echo = await startEchoRuntime();
- *   // ... seed workspace with agent_url pointing to echo.baseURL ...
- *   echo.stop();
- */
-
-import { createServer, type Server } from "node:http";
-
-export interface EchoRuntime {
-  baseURL: string;
-  stop: () => Promise<void>;
-  lastRequest: { method: string; text: string; files: unknown[] } | null;
-}
-
-/** Parse a minimal multipart body and extract the first file's name + content. */
-function parseMultipart(body: Buffer): { name: string; mimeType: string; content: Buffer } | null {
-  // Find the boundary line (first line starting with "--").
-  const str = body.toString("binary");
-  const firstDash = str.indexOf("--");
-  if (firstDash === -1) return null;
-  const eol = str.indexOf("\r\n", firstDash);
-  if (eol === -1) return null;
-  const boundary = str.slice(firstDash + 2, eol);
-  const boundaryMarker = "\r\n--" + boundary;
-
-  // Find the first part that has a filename in Content-Disposition.
-  let pos = eol + 2;
-  while (pos < str.length) {
-    const nextBoundary = str.indexOf(boundaryMarker, pos);
-    if (nextBoundary === -1) break;
-    const part = str.slice(pos, nextBoundary);
-
-    const cdMatch = part.match(/Content-Disposition:[^\r\n]*filename="([^"]+)"/i);
-    if (cdMatch) {
-      const name = cdMatch[1];
-      const ctMatch = part.match(/Content-Type:\s*([^\r\n]+)/i);
-      const mimeType = ctMatch ? ctMatch[1].trim() : "application/octet-stream";
-      // Body starts after the first double-CRLF in the part.
-      const bodyStart = part.indexOf("\r\n\r\n");
-      if (bodyStart !== -1) {
-        // Extract the raw bytes (not the string) so binary is safe.
-        const headerBytes = Buffer.byteLength(part.slice(0, bodyStart + 4), "binary");
-        const partStartInBody = Buffer.byteLength(str.slice(0, pos + bodyStart + 4), "binary");
-        const partEndInBody = Buffer.byteLength(str.slice(0, nextBoundary), "binary");
-        const content = body.subarray(partStartInBody, partEndInBody);
-        return { name, mimeType, content };
-      }
-    }
-    pos = nextBoundary + boundaryMarker.length;
-    // Skip trailing "--" (end marker) or CRLF.
-    if (str.slice(pos, pos + 2) === "--") break;
-    if (str.slice(pos, pos + 2) === "\r\n") pos += 2;
-  }
-  return null;
-}
-
-export async function startEchoRuntime(): Promise<EchoRuntime> {
-  let lastRequest: EchoRuntime["lastRequest"] = null;
-
-  const server = createServer((req, res) => {
-    // CORS: allow the canvas origin (localhost:3000) to call us.
-    res.setHeader("Access-Control-Allow-Origin", "*");
-    res.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-    res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-
-    if (req.method === "OPTIONS") {
-      res.writeHead(204);
-      res.end();
-      return;
-    }
-
-    const url = req.url ?? "/";
-
-    // Workspace-side chat upload ingest (RFC #2312).
-    if (url === "/internal/chat/uploads/ingest" && req.method === "POST") {
-      const chunks: Buffer[] = [];
-      req.on("data", (chunk: Buffer) => chunks.push(chunk));
-      req.on("end", () => {
-        const body = Buffer.concat(chunks);
-        const file = parseMultipart(body);
-        if (!file) {
-          res.writeHead(400);
-          res.end(JSON.stringify({ error: "no files field" }));
-          return;
-        }
-        const sanitized = file.name.replace(/[^a-zA-Z0-9._\-]/g, "_").replace(/ /g, "_");
-        const prefix = Array.from({ length: 32 }, () =>
-          Math.floor(Math.random() * 16).toString(16),
-        ).join("");
-        const response = {
-          files: [
-            {
-              uri: `workspace:/workspace/.molecule/chat-uploads/${prefix}-${sanitized}`,
-              name: sanitized,
-              mimeType: file.mimeType,
-              size: file.content.length,
-            },
-          ],
-        };
-        res.setHeader("Content-Type", "application/json");
-        res.writeHead(200);
-        res.end(JSON.stringify(response));
-      });
-      return;
-    }
-
-    // Default: A2A JSON-RPC handler.
-    let body = "";
-    req.setEncoding("utf8");
-    req.on("data", (chunk: string) => {
-      body += chunk;
-    });
-    req.on("end", () => {
-      res.setHeader("Content-Type", "application/json");
-      try {
-        const rpc = JSON.parse(body);
-        const msg = rpc.params?.message;
-        const textParts =
-          msg?.parts
-            ?.filter((p: { kind?: string; text?: string }) => p.kind === "text")
-            .map((p: { text?: string }) => p.text)
-            .filter(Boolean) ?? [];
-        const fileParts =
-          msg?.parts?.filter((p: { kind?: string }) => p.kind === "file") ?? [];
-        const text = textParts.join("\n");
-
-        lastRequest = {
-          method: rpc.method ?? "unknown",
-          text,
-          files: fileParts,
-        };
-
-        const replyText = text
-          ? `Echo: ${text}`
-          : fileParts.length > 0
-            ? "Echo: received your file(s)."
-            : "Echo: hello";
-
-        const response = {
-          jsonrpc: "2.0",
-          id: rpc.id ?? null,
-          result: {
-            parts: [{ kind: "text", text: replyText }],
-          },
-        };
-
-        res.writeHead(200);
-        res.end(JSON.stringify(response));
-      } catch {
-        res.writeHead(400);
-        res.end(JSON.stringify({ error: "invalid json" }));
-      }
-    });
-  });
-
-  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
-  const address = server.address();
-  const port = typeof address === "object" && address ? address.port : 0;
-  const baseURL = `http://127.0.0.1:${port}`;
-
-  return {
-    baseURL,
-    stop: () =>
-      new Promise((resolve) => {
-        server.close(() => resolve(undefined));
-      }),
-    get lastRequest() {
-      return lastRequest;
-    },
-  };
-}
@@ -5,7 +5,6 @@ export default defineConfig({
  timeout: 30_000,
  expect: { timeout: 10_000 },
  fullyParallel: false,
-  workers: 1,
  retries: 0,
  use: {
    baseURL: "http://localhost:3000",
@@ -6,21 +6,21 @@
 // attachments, no A2A topology overlay, no conversation tracing.

 import { useEffect, useMemo, useRef, useState } from "react";
-import ReactMarkdown from "react-markdown";
-import remarkGfm from "remark-gfm";

+import { api } from "@/lib/api";
 import { useCanvasStore } from "@/store/canvas";
-import { type ChatAttachment, type ChatMessage, createMessage } from "@/components/tabs/chat/types";
-import {
-  useChatHistory,
-  useChatSend,
-  useChatSocket,
-} from "@/components/tabs/chat/hooks";

 import { toMobileAgent } from "./components";
 import { MOBILE_FONT_MONO, MOBILE_FONT_SANS, usePalette } from "./palette";
 import { Icons, StatusDot, TierChip } from "./primitives";

+interface ChatMessage {
+  id: string;
+  role: "user" | "agent" | "system";
+  text: string;
+  ts: string;
+}
+
 const formatStoredTimestamp = (iso: string): string => {
  const d = new Date(iso);
  if (isNaN(d.getTime())) return "";
@@ -29,171 +29,30 @@ const formatStoredTimestamp = (iso: string): string => {

 type SubTab = "my" | "a2a";

-function MarkdownBubble({
-  children,
-  dark,
-  accent,
-}: {
-  children: string;
-  dark: boolean;
-  accent: string;
-}) {
-  const codeBg = dark ? "rgba(255,255,255,0.08)" : "rgba(0,0,0,0.06)";
-  const codeBlockBg = dark ? "#1a1a1a" : "#f5f5f0";
-  const linkColor = accent;
-  const quoteBorder = dark ? "rgba(255,250,240,0.15)" : "rgba(40,30,20,0.15)";
-
-  return (
-    <ReactMarkdown
-      remarkPlugins={[remarkGfm]}
-      components={{
-        p: ({ children }) => (
-          <div style={{ margin: "2px 0", lineHeight: "inherit" }}>{children}</div>
-        ),
-        a: ({ href, children }) => (
-          <a
-            href={href}
-            target="_blank"
-            rel="noopener noreferrer"
-            style={{ color: linkColor, textDecoration: "underline" }}
-          >
-            {children}
-          </a>
-        ),
-        pre: ({ children }) => (
-          <pre
-            style={{
-              background: codeBlockBg,
-              padding: "8px 10px",
-              borderRadius: 8,
-              overflow: "auto",
-              fontSize: 12,
-              lineHeight: 1.5,
-              fontFamily: MOBILE_FONT_MONO,
-              margin: "4px 0",
-            }}
-          >
-            {children}
-          </pre>
-        ),
-        code: ({ children, className }) => {
-          const isBlock = className != null && String(className).length > 0;
-          if (isBlock) {
-            return (
-              <code style={{ fontFamily: MOBILE_FONT_MONO, fontSize: 12 }}>
-                {children}
-              </code>
-            );
-          }
-          return (
-            <code
-              style={{
-                background: codeBg,
-                padding: "1px 4px",
-                borderRadius: 4,
-                fontSize: 13,
-                fontFamily: MOBILE_FONT_MONO,
-              }}
-            >
-              {children}
-            </code>
-          );
-        },
-        ul: ({ children }) => (
-          <ul style={{ margin: "4px 0", paddingLeft: 18, listStyle: "disc" }}>
-            {children}
-          </ul>
-        ),
-        ol: ({ children }) => (
-          <ol style={{ margin: "4px 0", paddingLeft: 18, listStyle: "decimal" }}>
-            {children}
-          </ol>
-        ),
-        li: ({ children }) => <li style={{ margin: "2px 0" }}>{children}</li>,
-        strong: ({ children }) => (
-          <strong style={{ fontWeight: 600 }}>{children}</strong>
-        ),
-        em: ({ children }) => <em style={{ fontStyle: "italic" }}>{children}</em>,
-        h1: ({ children }) => (
-          <div style={{ fontSize: 16, fontWeight: 700, margin: "4px 0" }}>{children}</div>
-        ),
-        h2: ({ children }) => (
-          <div style={{ fontSize: 15, fontWeight: 700, margin: "4px 0" }}>{children}</div>
-        ),
-        h3: ({ children }) => (
-          <div style={{ fontSize: 14, fontWeight: 700, margin: "4px 0" }}>{children}</div>
-        ),
-        h4: ({ children }) => (
-          <div style={{ fontSize: 14, fontWeight: 600, margin: "4px 0" }}>{children}</div>
-        ),
-        h5: ({ children }) => (
-          <div style={{ fontSize: 13, fontWeight: 600, margin: "4px 0" }}>{children}</div>
-        ),
-        h6: ({ children }) => (
-          <div style={{ fontSize: 13, fontWeight: 600, margin: "4px 0" }}>{children}</div>
-        ),
-        blockquote: ({ children }) => (
-          <blockquote
-            style={{
-              borderLeft: `2px solid ${quoteBorder}`,
-              margin: "4px 0",
-              paddingLeft: 8,
-              opacity: 0.85,
-            }}
-          >
-            {children}
-          </blockquote>
-        ),
-        hr: () => (
-          <hr
-            style={{
-              border: "none",
-              borderTop: `0.5px solid ${quoteBorder}`,
-              margin: "6px 0",
-            }}
-          />
-        ),
-        table: ({ children }) => (
-          <table
-            style={{
-              borderCollapse: "collapse",
-              fontSize: 13,
-              margin: "4px 0",
-              width: "100%",
-            }}
-          >
-            {children}
-          </table>
-        ),
-        thead: ({ children }) => <thead style={{ fontWeight: 600 }}>{children}</thead>,
-        th: ({ children }) => (
-          <th
-            style={{
-              border: `0.5px solid ${quoteBorder}`,
-              padding: "4px 6px",
-              textAlign: "left",
-            }}
-          >
-            {children}
-          </th>
-        ),
-        td: ({ children }) => (
-          <td
-            style={{
-              border: `0.5px solid ${quoteBorder}`,
-              padding: "4px 6px",
-            }}
-          >
-            {children}
-          </td>
-        ),
-      }}
-    >
-      {children}
-    </ReactMarkdown>
-  );
+interface A2AResponseShape {
+  result?: {
+    parts?: Array<{ kind?: string; text?: string }>;
+  };
+  error?: { message?: string };
 }

+// Wire shape for GET /workspaces/:id/chat-history (chat_history.go → ChatHistoryResponse).
+interface ApiChatMessage {
+  id: string;
+  role: string; // "user" | "agent" | "system"
+  content: string;
+  timestamp: string;
+  attachments?: Array<{ name: string; uri: string; mimeType?: string; size?: number }>;
+}
+
+interface ChatHistoryResponse {
+  messages: ApiChatMessage[];
+  reached_end: boolean;
+}
+
+const formatTime = (date: Date) =>
+  date.toLocaleTimeString([], { hour: "numeric", minute: "2-digit" });
+
 export function MobileChat({
  agentId,
  dark,
@@ -204,40 +63,36 @@ export function MobileChat({
  onBack: () => void;
 }) {
  const p = usePalette(dark);
+  // Selecting `nodes` stably avoids the `.find()` anti-pattern that
+  // creates a new return value on every store update (React error #185).
  const nodes = useCanvasStore((s) => s.nodes);
  const node = useMemo(() => nodes.find((n) => n.id === agentId), [nodes, agentId]);
+  // Bootstrap from the canvas store's per-workspace message buffer so the
+  // user sees their prior thread on entry. The store is updated by the
+  // socket → ChatTab flows the desktop runs; on mobile we read from the
+  // same buffer to keep state coherent across viewports.
+  // NOTE: selector returns undefined (stable) — do NOT use ?? [] here,
+  // that creates a new [] reference on every store update when the key is
+  // absent, causing infinite re-render (React error #185).
+  const storedMessages = useCanvasStore((s) => s.agentMessages[agentId]);
+  // Start empty — history is loaded via useEffect below.
+  const [messages, setMessages] = useState<ChatMessage[]>([]);
  const [draft, setDraft] = useState("");
  const [tab, setTab] = useState<SubTab>("my");
+  const [sending, setSending] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [loading, setLoading] = useState(true); // history is loading on mount
+  const [historyError, setHistoryError] = useState<string | null>(null);
  const scrollRef = useRef<HTMLDivElement>(null);
+  // Synchronous re-entry guard. `setSending(true)` schedules a state
+  // update but doesn't flush before a second tap can fire send() — a ref
+  // mirrors the desktop ChatTab pattern (sendInFlightRef) and closes the
+  // double-send race a stale `sending` lets through.
+  const sendInFlightRef = useRef(false);
  const composerRef = useRef<HTMLTextAreaElement>(null);
-  const fileInputRef = useRef<HTMLInputElement>(null);
-  const [pendingFiles, setPendingFiles] = useState<File[]>([]);
-
-  const {
-    messages,
-    loading: historyLoading,
-    loadError: historyError,
-    loadInitial,
-    appendMessageDeduped,
-  } = useChatHistory(agentId);
-
-  const {
-    sending,
-    uploading,
-    sendMessage,
-    error: sendError,
-    clearError,
-    releaseSendGuards,
-  } = useChatSend(agentId, {
-    getHistoryMessages: () => messages,
-    onUserMessage: appendMessageDeduped,
-    onAgentMessage: appendMessageDeduped,
-  });
-
-  useChatSocket(agentId, {
-    onAgentMessage: appendMessageDeduped,
-    onSendComplete: releaseSendGuards,
-  });
+  // Guard: don't treat the initial store population as a live push.
+  // Set to false after the first render completes.
+  const initDoneRef = useRef(false);

  // Auto-grow the textarea: reset height to 'auto' so the scrollHeight
  // shrinks when the user deletes text, then size to scrollHeight up to
@@ -250,26 +105,81 @@ export function MobileChat({
    el.style.height = `${next}px`;
  }, [draft]);

+  // Fetch chat history on mount; keep merging live agentMessages while the
+  // panel is open. InitDoneRef prevents the initial store snapshot from
+  // triggering the live-merge path (the store buffer is populated by
+  // ChatTab on desktop, not on mobile — this effect loads history as the
+  // mobile-native path).
+  useEffect(() => {
+    let cancelled = false;
+
+    const mapApiMessage = (m: ApiChatMessage): ChatMessage => ({
+      id: m.id,
+      role: m.role === "user" ? "user" : "agent",
+      text: m.content,
+      ts: formatStoredTimestamp(m.timestamp),
+    });
+
+    const syncLive = () => {
+      const live = useCanvasStore.getState().agentMessages[agentId] ?? [];
+      if (live.length > 0) {
+        setMessages((prev) => {
+          const existingIds = new Set(prev.map((m) => m.id));
+          const newOnes = live
+            .filter((m) => !existingIds.has(m.id))
+            .map((m) => ({
+              id: m.id,
+              role: "agent" as const,
+              text: m.content,
+              ts: formatStoredTimestamp(m.timestamp),
+            }));
+          return newOnes.length > 0 ? [...prev, ...newOnes] : prev;
+        });
+      }
+    };
+
+    const bootstrap = async (): Promise<(() => void) | undefined> => {
+      setLoading(true);
+      setHistoryError(null);
+      try {
+        const res = await api.get<ChatHistoryResponse>(
+          `/workspaces/${agentId}/chat-history?limit=50`,
+        );
+        if (cancelled) return;
+        const initial = (res.messages ?? []).map(mapApiMessage);
+        setMessages(initial);
+        // Mark init done BEFORE marking loading=false so any store push
+        // that arrives in the same tick is treated as live, not init.
+        initDoneRef.current = true;
+        setLoading(false);
+        // Subscribe to live pushes after init is complete.
+        syncLive();
+        const unsubscribe = useCanvasStore.subscribe(syncLive);
+        return unsubscribe; // returned for cleanup
+      } catch (e) {
+        if (cancelled) return;
+        setHistoryError(e instanceof Error ? e.message : "Failed to load chat history");
+        setLoading(false);
+        initDoneRef.current = true;
+        return undefined;
+      }
+    };
+
+    let maybeUnsubscribe: (() => void) | undefined;
+    bootstrap().then((fn) => { maybeUnsubscribe = fn; });
+
+    return () => {
+      cancelled = true;
+      if (maybeUnsubscribe) maybeUnsubscribe();
+    };
+  }, [agentId]);
+
  useEffect(() => {
    if (scrollRef.current) {
      scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
    }
  }, [messages]);

-  // Consume any agent messages that arrived while history was loading.
-  const initialConsumeDoneRef = useRef(false);
-  useEffect(() => {
-    if (historyLoading || initialConsumeDoneRef.current) return;
-    initialConsumeDoneRef.current = true;
-    const consume = useCanvasStore.getState().consumeAgentMessages;
-    const msgs = consume(agentId);
-    for (const m of msgs) {
-      appendMessageDeduped(
-        createMessage("agent", m.content, m.attachments),
-      );
-    }
-  }, [historyLoading, agentId, appendMessageDeduped]);
-
  if (!node) {
    return (
      <div
@@ -291,32 +201,58 @@ export function MobileChat({
  const a = toMobileAgent(node);
  const reachable = a.status === "online" || a.status === "degraded";

-  const onFilesPicked = (fileList: FileList | null) => {
-    if (!fileList) return;
-    const picked = Array.from(fileList);
-    setPendingFiles((prev) => {
-      const keyed = new Set(prev.map((f) => `${f.name}:${f.size}`));
-      return [...prev, ...picked.filter((f) => !keyed.has(`${f.name}:${f.size}`))];
-    });
-    if (fileInputRef.current) fileInputRef.current.value = "";
-  };
-
-  const removePendingFile = (index: number) =>
-    setPendingFiles((prev) => prev.filter((_, i) => i !== index));
-
  const send = async () => {
    const text = draft.trim();
-    if ((!text && pendingFiles.length === 0) || sending || !reachable) return;
-    clearError();
+    if (!text || sending || !reachable) return;
+    if (sendInFlightRef.current) return;
+    sendInFlightRef.current = true;
    setDraft("");
-    const files = pendingFiles;
-    setPendingFiles([]);
-    await sendMessage(text, files);
+    setError(null);
+    setSending(true);
+    const myMsg: ChatMessage = {
+      id: crypto.randomUUID(),
+      role: "user",
+      text,
+      ts: formatTime(new Date()),
+    };
+    setMessages((m) => [...m, myMsg]);
+
+    try {
+      const res = await api.post<A2AResponseShape>(`/workspaces/${agentId}/a2a`, {
+        method: "message/send",
+        params: {
+          message: {
+            role: "user",
+            messageId: crypto.randomUUID(),
+            parts: [{ kind: "text", text }],
+          },
+        },
+      });
+      const reply =
+        res.result?.parts?.find((part) => part.kind === "text")?.text ?? "";
+      if (reply) {
+        setMessages((m) => [
+          ...m,
+          {
+            id: crypto.randomUUID(),
+            role: "agent",
+            text: reply,
+            ts: formatTime(new Date()),
+          },
+        ]);
+      } else if (res.error?.message) {
+        setError(res.error.message);
+      }
+    } catch (e) {
+      setError(e instanceof Error ? e.message : "Failed to send");
+    } finally {
+      setSending(false);
+      sendInFlightRef.current = false;
+    }
  };

  return (
    <div
-      data-testid="chat-panel"
      style={{
        height: "100%",
        display: "flex",
@@ -457,12 +393,13 @@ export function MobileChat({
            Agent Comms — peer-to-peer A2A traffic surfaces in the Comms tab.
          </div>
        )}
-        {tab === "my" && historyLoading && (
+        {tab === "my" && loading && (
          <div style={{ padding: "20px 4px", textAlign: "center", color: p.text3, fontSize: 13 }}>
-            Loading chat history…
+            <div style={{ marginBottom: 6, opacity: 0.6, animation: "spin 1s linear infinite", display: "inline-block", fontSize: 16 }}>⟳</div>
+            <div>Loading chat history…</div>
          </div>
        )}
-        {tab === "my" && !historyLoading && historyError && messages.length === 0 && (
+        {tab === "my" && !loading && historyError && (
          <div
            role="alert"
            style={{
@@ -476,7 +413,25 @@ export function MobileChat({
            <button
              type="button"
              onClick={() => {
-                loadInitial();
+                setLoading(true);
+                setHistoryError(null);
+                api.get(`/workspaces/${agentId}/chat-history?limit=50`).then(
+                  (res: unknown) => {
+                    const r = res as ChatHistoryResponse;
+                    setMessages((r.messages ?? []).map((m) => ({
+                      id: m.id,
+                      role: m.role === "user" ? "user" : "agent",
+                      text: m.content,
+                      ts: formatStoredTimestamp(m.timestamp),
+                    })));
+                    setLoading(false);
+                    initDoneRef.current = true;
+                  },
+                ).catch((e: unknown) => {
+                  setHistoryError(e instanceof Error ? e.message : "Failed to load");
+                  setLoading(false);
+                  initDoneRef.current = true;
+                });
              }}
              style={{
                padding: "6px 14px",
@@ -492,7 +447,7 @@ export function MobileChat({
            </button>
          </div>
        )}
-        {tab === "my" && !historyLoading && !historyError && messages.length === 0 && (
+        {tab === "my" && !loading && !historyError && messages.length === 0 && (
          <div style={{ padding: "20px 4px", textAlign: "center", color: p.text3, fontSize: 13 }}>
            Send a message to start chatting.
          </div>
@@ -521,9 +476,7 @@ export function MobileChat({
                    overflowWrap: "anywhere",
                  }}
                >
-                  <MarkdownBubble dark={dark} accent={p.accent}>
-                    {m.content}
-                  </MarkdownBubble>
+                  {m.text}
                  <div
                    style={{
                      fontSize: 10,
@@ -532,13 +485,13 @@ export function MobileChat({
                      fontFamily: MOBILE_FONT_MONO,
                    }}
                  >
-                    {formatStoredTimestamp(m.timestamp)}
+                    {m.ts}
                  </div>
                </div>
              </div>
            );
          })}
-        {sendError && (
+        {error && (
          <div
            role="alert"
            style={{
@@ -550,7 +503,7 @@ export function MobileChat({
              fontSize: 12,
            }}
          >
-            {sendError}
+            {error}
          </div>
        )}
      </div>
@@ -581,60 +534,6 @@ export function MobileChat({
          backdropFilter: "blur(14px)",
        }}
      >
-        {pendingFiles.length > 0 && (
-          <div
-            style={{
-              display: "flex",
-              flexWrap: "wrap",
-              gap: 6,
-              marginBottom: 8,
-              paddingLeft: 2,
-            }}
-          >
-            {pendingFiles.map((f, i) => (
-              <div
-                key={`${f.name}:${f.size}`}
-                style={{
-                  display: "flex",
-                  alignItems: "center",
-                  gap: 4,
-                  padding: "3px 8px",
-                  borderRadius: 10,
-                  background: dark ? "#2a2823" : "#ece9e0",
-                  fontSize: 12,
-                  color: p.text2,
-                  maxWidth: "100%",
-                }}
-              >
-                <span
-                  style={{
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
-                >
-                  {f.name}
-                </span>
-                <button
-                  type="button"
-                  onClick={() => removePendingFile(i)}
-                  aria-label={`Remove ${f.name}`}
-                  style={{
-                    border: "none",
-                    background: "transparent",
-                    color: p.text3,
-                    cursor: "pointer",
-                    fontSize: 12,
-                    padding: 0,
-                    lineHeight: 1,
-                  }}
-                >
-                  ✕
-                </button>
-              </div>
-            ))}
-          </div>
-        )}
        <div
          style={{
            display: "flex",
@@ -646,32 +545,21 @@ export function MobileChat({
            padding: "6px 6px 6px 12px",
          }}
        >
-          <input
-            ref={fileInputRef}
-            type="file"
-            multiple
-            style={{ display: "none" }}
-            onChange={(e) => onFilesPicked(e.target.files)}
-            aria-hidden="true"
-          />
          <button
            type="button"
-            onClick={() => fileInputRef.current?.click()}
-            disabled={!reachable || sending || uploading}
            aria-label="Attach"
            style={{
              width: 32,
              height: 32,
              borderRadius: 999,
              border: "none",
-              cursor: reachable && !sending && !uploading ? "pointer" : "not-allowed",
+              cursor: "pointer",
              background: "transparent",
              color: p.text3,
              flexShrink: 0,
              display: "flex",
              alignItems: "center",
              justifyContent: "center",
-              opacity: !reachable || sending || uploading ? 0.4 : 1,
            }}
          >
            {Icons.attach({ size: 16 })}
@@ -717,32 +605,28 @@ export function MobileChat({
          <button
            type="button"
            onClick={send}
-            disabled={(!draft.trim() && pendingFiles.length === 0) || !reachable || sending || uploading}
+            disabled={!draft.trim() || !reachable || sending}
            aria-label="Send"
            style={{
              width: 36,
              height: 36,
              borderRadius: 999,
              border: "none",
-              cursor: (draft.trim() || pendingFiles.length > 0) && !sending && !uploading ? "pointer" : "not-allowed",
+              cursor: draft.trim() && !sending ? "pointer" : "not-allowed",
              flexShrink: 0,
              background:
-                (draft.trim() || pendingFiles.length > 0) && reachable && !sending && !uploading
+                draft.trim() && reachable && !sending
                  ? p.accent
                  : dark
                    ? "#2a2823"
                    : "#ece9e0",
-              color: (draft.trim() || pendingFiles.length > 0) && reachable && !sending && !uploading ? "#fff" : p.text3,
+              color: draft.trim() && reachable && !sending ? "#fff" : p.text3,
              display: "flex",
              alignItems: "center",
              justifyContent: "center",
            }}
          >
-            {uploading ? (
-              <span style={{ fontSize: 10, fontWeight: 600 }}>↑</span>
-            ) : (
-              Icons.send({ size: 16 })
-            )}
+            {Icons.send({ size: 16 })}
          </button>
        </div>
      </div>
@@ -214,7 +214,6 @@ export function MobileDetail({
        <button
          type="button"
          onClick={onChat}
-          data-testid="mobile-chat-cta"
          style={{
            width: "100%",
            height: 52,
@@ -36,7 +36,6 @@ const mockStoreState = {
    height?: number;
  }>,
  agentMessages: {} as Record<string, Array<{ id: string; content: string; timestamp: string }>>,
-  consumeAgentMessages: () => [],
 };

 vi.mock("@/store/canvas", () => ({
@@ -358,7 +357,7 @@ describe("MobileChat — chat history", () => {
      renderChat(mockAgentId);
    });
    expect(api.get).toHaveBeenCalledWith(
-      expect.stringContaining(`/workspaces/${mockAgentId}/chat-history`),
+      `/workspaces/${mockAgentId}/chat-history?limit=50`,
    );
  });

@@ -288,7 +288,6 @@ export function AgentCard({
  return (
    <button
      type="button"
-      data-testid="workspace-card"
      aria-label={`${agent.name}, status: ${agent.status}, tier ${agent.tier}${agent.remote ? ", remote" : ""}`}
      onClick={onClick}
      style={{
@@ -5,19 +5,16 @@ import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import { api } from "@/lib/api";
 import { useCanvasStore, type WorkspaceNodeData } from "@/store/canvas";
+import { useSocketEvent } from "@/hooks/useSocketEvent";
 import { type ChatMessage, type ChatAttachment, createMessage, appendMessageDeduped } from "./chat/types";
-import { downloadChatFile, isPlatformAttachment } from "./chat/uploads";
+import { uploadChatFiles, downloadChatFile, isPlatformAttachment } from "./chat/uploads";
 import { PendingAttachmentPill } from "./chat/AttachmentViews";
 import { AttachmentPreview } from "./chat/AttachmentPreview";
+import { extractFilesFromTask } from "./chat/message-parser";
 import { AgentCommsPanel } from "./chat/AgentCommsPanel";
 import { appendActivityLine } from "./chat/activityLog";
 import { runtimeDisplayName } from "@/lib/runtime-names";
 import { ConfirmDialog } from "@/components/ConfirmDialog";
-import { useChatHistory } from "./chat/hooks/useChatHistory";
-import { useChatSend } from "./chat/hooks/useChatSend";
-import { useChatSocket } from "./chat/hooks/useChatSocket";
-
-export { extractReplyText } from "./chat/hooks/useChatSend";

 interface Props {
  workspaceId: string;
@@ -26,6 +23,147 @@ interface Props {

 type ChatSubTab = "my-chat" | "agent-comms";

+// A2A response shape (subset). The full schema is in @a2a-js/sdk but we only
+// need parts/artifacts text + file extraction for the synchronous fallback.
+interface A2AFileRef {
+  name?: string;
+  mimeType?: string;
+  uri?: string;
+  bytes?: string;
+  size?: number;
+}
+// Outbound shape matches a2a-sdk's JSON-RPC `SendMessageRequest`
+// Pydantic union (TextPart | FilePart | DataPart). The flat
+// protobuf shape `{url, filename, mediaType}` is rejected at the
+// request boundary with `Field required` errors — keep this
+// outbound shape unless a2a-sdk migrates the JSON-RPC schema.
+interface A2APart {
+  kind: string;
+  text?: string;
+  file?: A2AFileRef;
+}
+interface A2AResponse {
+  result?: {
+    parts?: A2APart[];
+    artifacts?: Array<{ parts: A2APart[] }>;
+  };
+}
+
+// Internal-self-message filtering moved server-side in RFC #2945
+// PR-C/D — the platform's /chat-history endpoint applies the
+// IsInternalSelfMessage predicate before returning rows, so the
+// client no longer needs the local backstop on the history path.
+// The proper fix is still X-Workspace-ID header (source_id=workspace_id);
+// the platform-side prefix filter handles the residual cases.
+
+// extractReplyText pulls the agent's text reply out of an A2A response.
+// Concatenates ALL text parts (joined with "\n") rather than returning
+// just the first. Claude Code and other runtimes commonly emit multi-
+// part text replies for long content (markdown tables, code blocks),
+// and the prior "first part wins" implementation silently truncated
+// the rest — observed on a 15k-char Wave 1 brief that rendered only
+// the table header. Mirrors extractTextsFromParts in message-parser.ts.
+//
+// Server-side counterpart in workspace-server/internal/channels/
+// manager.go has the same single-part bug; fix that too if/when a
+// channel-delivered reply (Slack, Lark, etc.) gets truncated.
+export function extractReplyText(resp: A2AResponse): string {
+  const collect = (parts: A2APart[] | undefined): string => {
+    if (!parts) return "";
+    return parts
+      .filter((p) => p.kind === "text")
+      .map((p) => p.text ?? "")
+      .filter(Boolean)
+      .join("\n");
+  };
+  const result = resp?.result;
+  const collected: string[] = [];
+  const fromParts = collect(result?.parts);
+  if (fromParts) collected.push(fromParts);
+  // Walk artifacts even if parts had text — some producers (Hermes
+  // tool calls) emit a summary in parts AND details in artifacts.
+  // Returning early on parts dropped the artifact body silently.
+  if (result?.artifacts) {
+    for (const a of result.artifacts) {
+      const t = collect(a.parts);
+      if (t) collected.push(t);
+    }
+  }
+  return collected.join("\n");
+}
+
+// Agent-returned files live on the same response shape as text —
+// delegated to extractFilesFromTask in message-parser.ts, which also
+// walks status.message.parts (that ChatTab's legacy text extractor
+// doesn't). Single source of truth for file-part parsing across
+// live chat, activity log replay, and any future consumers.
+
+/** Initial chat history page size. The newest N messages are rendered
+ *  on first paint; older history is fetched on demand via loadOlder()
+ *  when the user scrolls the top sentinel into view. */
+const INITIAL_HISTORY_LIMIT = 10;
+/** Subsequent older-history batch size. Larger than INITIAL so a long
+ *  scroll-back doesn't fan out into many round-trips. */
+const OLDER_HISTORY_BATCH = 20;
+
+/**
+ * Load chat history from the platform's typed /chat-history endpoint.
+ *
+ * Server-side rendering of activity_logs rows into ChatMessage shape
+ * lives in workspace-server/internal/messagestore/postgres_store.go
+ * (RFC #2945 PR-C/D). The server already applies the canvas-source
+ * filter, the internal-self-message predicate, the role decision
+ * (status=error vs agent-error prefix → system), and the v0/v1
+ * file-shape extraction. Canvas just renders what it receives.
+ *
+ * Wire shape (mirrors ChatMessage exactly, no per-row mapping needed):
+ *
+ *   GET /workspaces/:id/chat-history?limit=N&before_ts=T
+ *   200 → {"messages": ChatMessage[], "reached_end": boolean}
+ *
+ * Pagination:
+ *  - Pass `limit` to bound the page size (newest-first from server).
+ *  - Pass `beforeTs` (RFC3339) to fetch rows STRICTLY OLDER than that
+ *    timestamp. Combined with limit, this yields the next-older page
+ *    when scrolling backward through history.
+ *
+ * `reachedEnd` is propagated from the server. The server computes it
+ * by comparing rowCount vs limit so a partial last page is correctly
+ * detected even when the row→bubble fan-out is non-1:1 (each row
+ * produces 1-2 bubbles).
+ */
+async function loadMessagesFromDB(
+  workspaceId: string,
+  limit: number,
+  beforeTs?: string,
+): Promise<{ messages: ChatMessage[]; error: string | null; reachedEnd: boolean }> {
+  try {
+    const params = new URLSearchParams({ limit: String(limit) });
+    if (beforeTs) params.set("before_ts", beforeTs);
+    const resp = await api.get<{ messages: ChatMessage[]; reached_end: boolean }>(
+      `/workspaces/${workspaceId}/chat-history?${params.toString()}`,
+    );
+
+    // Server emits oldest-first within the page (RFC #2945 PR-C-2
+    // post-fix: server reverses row-aware before returning so the
+    // wire is display-ready). Canvas appends/prepends without
+    // reordering — this avoids the pair-flip bug a naive flat
+    // reverse causes when each row produces a (user, agent) pair
+    // with the same timestamp.
+    return {
+      messages: resp.messages ?? [],
+      error: null,
+      reachedEnd: resp.reached_end,
+    };
+  } catch (err) {
+    return {
+      messages: [],
+      error: err instanceof Error ? err.message : "Failed to load chat history",
+      reachedEnd: true,
+    };
+  }
+}
+
 /**
 * ChatTab container — renders sub-tab bar + My Chat or Agent Comms panel.
 */
@@ -33,7 +171,7 @@ export function ChatTab({ workspaceId, data }: Props) {
  const [subTab, setSubTab] = useState<ChatSubTab>("my-chat");

  return (
-    <div data-testid="chat-panel" className="flex flex-col h-full">
+    <div className="flex flex-col h-full">
      {/* Sub-tab bar — role="tablist" so screen readers expose tab context */}
      <div
        role="tablist"
@@ -109,68 +247,268 @@ export function ChatTab({ workspaceId, data }: Props) {
 * MyChatPanel — user↔agent conversation (extracted from original ChatTab).
 */
 function MyChatPanel({ workspaceId, data }: Props) {
+  const [messages, setMessages] = useState<ChatMessage[]>([]);
  const [input, setInput] = useState("");
-  const [pendingFiles, setPendingFiles] = useState<File[]>([]);
-  const [activityLog, setActivityLog] = useState<string[]>([]);
+  // `sending` is strictly the "this tab kicked off a send and hasn't
+  // seen the reply yet" signal. Previously this was initialized from
+  // data.currentTask to pick up in-flight agent work on mount, but
+  // that conflated agent-busy (workspace heartbeat) with user-
+  // in-flight (local send): when the WS dropped a TASK_COMPLETE event,
+  // currentTask lingered, the component re-mounted with sending=true,
+  // and the Send button stayed disabled forever even though nothing
+  // local was in flight. For the "agent is busy, show spinner" UX,
+  // use data.currentTask directly in the render path.
+  const [sending, setSending] = useState(false);
  const [thinkingElapsed, setThinkingElapsed] = useState(0);
+  const [activityLog, setActivityLog] = useState<string[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [loadError, setLoadError] = useState<string | null>(null);
+  const currentTaskRef = useRef(data.currentTask);
+  const sendingFromAPIRef = useRef(false);
  const [agentReachable, setAgentReachable] = useState(false);
  const [error, setError] = useState<string | null>(null);
  const [confirmRestart, setConfirmRestart] = useState(false);
-  const [dragOver, setDragOver] = useState(false);
-
+  const bottomRef = useRef<HTMLDivElement>(null);
+  // First-mount scroll-to-bottom needs `behavior: "instant"` — long
+  // conversations smooth-animate for ~300ms which any concurrent
+  // re-render can interrupt, leaving the user stuck mid-conversation
+  // when the chat tab opens. Subsequent appends (new agent messages)
+  // keep `smooth` for the visual "landing" feel. Flipped the first
+  // time messages.length goes positive, so a workspace switch (which
+  // remounts ChatTab) gets a fresh instant jump too.
+  const hasInitialScrollRef = useRef(false);
+  // Lazy-load older history on scroll-up.
+  // - containerRef = the scrollable messages viewport
+  // - topRef       = sentinel above the messages list; IO observes it
+  //                  and triggers loadOlder() when it enters view
+  // - hasMore      = false once a fetch returns < limit rows; stops IO
+  // - loadingOlder = drives the "Loading older messages…" UI label
+  // - inflightRef  = synchronous guard against double-entry of loadOlder
+  //                  when the IO callback fires twice in the same
+  //                  microtask (state-based guard would be stale until
+  //                  the next React commit)
+  // - scrollAnchorRef = saves distance-from-bottom before a prepend
+  //                  so the useLayoutEffect below can restore the
+  //                  user's exact viewport position. Without this,
+  //                  prepending older messages would jump the scroll
+  //                  position by the height of the new content.
+  // - oldestMessageRef / hasMoreRef = let the loadOlder closure read
+  //                  the latest values without taking them as deps —
+  //                  every live agent push mutates `messages`, and
+  //                  having loadOlder depend on `messages` would tear
+  //                  down + re-arm the IntersectionObserver on every
+  //                  push. Refs decouple the observer lifecycle from
+  //                  message-list updates.
  const containerRef = useRef<HTMLDivElement>(null);
  const topRef = useRef<HTMLDivElement>(null);
-  const bottomRef = useRef<HTMLDivElement>(null);
-  const hasInitialScrollRef = useRef(false);
+  const [hasMore, setHasMore] = useState(true);
+  const [loadingOlder, setLoadingOlder] = useState(false);
+  const inflightRef = useRef(false);
+  // The scroll anchor includes the first-message id as it was BEFORE
+  // the prepend — see useLayoutEffect below for why. Without this tag,
+  // a live agent push that appends WHILE loadOlder is in flight would
+  // run useLayoutEffect against the append (anchor still set), the
+  // "restore" math would scroll the user to a stale offset, AND the
+  // append's normal scroll-to-bottom would be swallowed.
+  const scrollAnchorRef = useRef<
+    { savedDistanceFromBottom: number; expectFirstIdNotEqual: string | null } | null
+  >(null);
+  const oldestMessageRef = useRef<ChatMessage | null>(null);
+  const hasMoreRef = useRef(true);
+  // Monotonic token bumped on workspace switch + on every loadOlder
+  // entry. Each fetch's .then() captures its own token; if the token
+  // has moved, the resolved messages belong to a stale workspace or a
+  // superseded fetch and we silently drop them. Without this guard, a
+  // workspace switch mid-fetch would have the in-flight promise
+  // resolve into the new workspace's setMessages — the user sees
+  // someone else's history briefly.
+  const fetchTokenRef = useRef(0);
+  // Files the user has picked but not yet sent. Cleared on send
+  // (upload success) or by the × on each pill.
+  const [pendingFiles, setPendingFiles] = useState<File[]>([]);
+  const [uploading, setUploading] = useState(false);
  const fileInputRef = useRef<HTMLInputElement>(null);
-  const dragDepthRef = useRef(0);
-  const pasteCounterRef = useRef(0);
+  // Guard against a double-click during the upload phase: React
+  // state updates from the click that started the upload haven't
+  // flushed yet, so the disabled-button logic sees `uploading=false`
+  // from the closure and lets a second `sendMessage` enter. A ref
+  // observes the latest value synchronously.
+  const sendInFlightRef = useRef(false);
+  // Monotonic token bumped on every sendMessage entry. Each .then()/
+  // .catch() captures its own token in closure and bails if a newer
+  // send has superseded it — prevents a late HTTP response for an
+  // earlier message from clobbering the flags / appending text that
+  // belong to a newer in-flight send. Race scenario the token closes:
+  // (1) send msg #1 (2) WS push for msg #1 arrives, releases guards
+  // (3) user sends msg #2 (4) HTTP for msg #1 finally lands — without
+  // the token check, .then() sees sendingFromAPIRef=true (set by
+  // msg #2's send), enters the main body, and processes msg #1's body
+  // as if it were msg #2's reply.
+  const sendTokenRef = useRef(0);

-  const history = useChatHistory(workspaceId, containerRef);
-  const chatSend = useChatSend(workspaceId, {
-    getHistoryMessages: () => history.messages,
-    onUserMessage: (msg) => history.setMessages((prev) => [...prev, msg]),
-    onAgentMessage: (msg) => history.setMessages((prev) => appendMessageDeduped(prev, msg)),
-  });
-  const { sending, uploading, sendMessage, error: sendError, clearError: clearSendError, releaseSendGuards, sendingFromAPIRef } = chatSend;
+  // Release every in-flight send guard at once. Used by every site
+  // that ends a send: pendingAgentMsgs WS push, ACTIVITY_LOGGED
+  // a2a_receive ok/error WS event, HTTP .then() success, and HTTP
+  // .catch() success. Keep these in lockstep — a future contributor
+  // adding a new "I saw the reply" path that only clears `sending` +
+  // `sendingFromAPIRef` (the natural pair) silently re-introduces
+  // the post-WS Send-button freeze, because the disabled-button
+  // logic can't see `sendInFlightRef` and so the visible state diverges
+  // from the synchronous re-entry guard at line 464.
+  const releaseSendGuards = useCallback(() => {
+    setSending(false);
+    sendingFromAPIRef.current = false;
+    sendInFlightRef.current = false;
+  }, []);

-  const displayError = error || sendError;
+  // Initial-load fetch — used by the mount effect and the "Retry"
+  // button below. Single source of truth so the two paths can't drift
+  // (e.g. INITIAL_HISTORY_LIMIT bumped in the effect but not the
+  // retry, leading to inconsistent first-paint sizes).
+  const loadInitial = useCallback(() => {
+    setLoading(true);
+    setLoadError(null);
+    setHasMore(true);
+    // Bump the token; any in-flight fetch from the previous workspace
+    // (or a previous retry) will see token != myToken in its .then()
+    // and silently bail — the late response can't clobber the new
+    // workspace's state.
+    fetchTokenRef.current += 1;
+    const myToken = fetchTokenRef.current;
+    loadMessagesFromDB(workspaceId, INITIAL_HISTORY_LIMIT).then(
+      ({ messages: msgs, error: fetchErr, reachedEnd }) => {
+        if (fetchTokenRef.current !== myToken) return;
+        setMessages(msgs);
+        setLoadError(fetchErr);
+        setHasMore(!reachedEnd);
+        setLoading(false);
+      },
+    );
+  }, [workspaceId]);

-  useChatSocket(workspaceId, {
-    onAgentMessage: (msg) => {
-      history.setMessages((prev) => appendMessageDeduped(prev, msg));
-      if (sendingFromAPIRef.current) {
-        releaseSendGuards();
+  // Load chat history on mount / workspace switch.
+  // Initial load is bounded to INITIAL_HISTORY_LIMIT (newest 10) — the
+  // rest streams in as the user scrolls up via loadOlder() below. Pre-
+  // 2026-05-05 this fetched the newest 50 in one shot; on a long-running
+  // workspace that meant 50× message-bubble paint + DOM cost on every
+  // tab-open even when the user only wanted to read the last few.
+  useEffect(() => {
+    loadInitial();
+  }, [loadInitial]);
+
+  // Mirror the latest oldest-message + hasMore into refs so loadOlder
+  // can read them without taking `messages` as a dep. Every live push
+  // through agentMessages would otherwise recreate loadOlder and tear
+  // down the IO observer.
+  useEffect(() => {
+    oldestMessageRef.current = messages[0] ?? null;
+  }, [messages]);
+  useEffect(() => {
+    hasMoreRef.current = hasMore;
+  }, [hasMore]);
+
+  // Fetch the next-older batch and prepend. Stable identity (deps =
+  // [workspaceId]) so the IntersectionObserver effect below doesn't
+  // re-arm on every messages update.
+  const loadOlder = useCallback(async () => {
+    // inflightRef is the load-bearing guard — synchronous, set BEFORE
+    // any await, so two IO callbacks dispatched in the same microtask
+    // can't both pass. The state checks are defensive secondary
+    // gates for the slow-scroll case.
+    if (inflightRef.current || !hasMoreRef.current) return;
+    const oldest = oldestMessageRef.current;
+    if (!oldest) return;
+    const container = containerRef.current;
+    if (!container) return;
+    inflightRef.current = true;
+    // Capture the user's distance-from-bottom BEFORE we prepend so the
+    // useLayoutEffect can restore it after the new DOM lands. The
+    // expectFirstIdNotEqual tag is what the layout effect checks
+    // against `messages[0].id` to disambiguate prepend (id changed) vs
+    // append (id unchanged → live message landed mid-fetch). Without
+    // it, an agent push during loadOlder runs the "restore" against a
+    // stale anchor — user gets yanked + the append's bottom-pin is
+    // swallowed.
+    scrollAnchorRef.current = {
+      savedDistanceFromBottom: container.scrollHeight - container.scrollTop,
+      expectFirstIdNotEqual: oldest.id,
+    };
+    fetchTokenRef.current += 1;
+    const myToken = fetchTokenRef.current;
+    setLoadingOlder(true);
+    try {
+      const { messages: older, reachedEnd } = await loadMessagesFromDB(
+        workspaceId,
+        OLDER_HISTORY_BATCH,
+        oldest.timestamp,
+      );
+      // Workspace switched (or another loadOlder bumped the token)
+      // mid-fetch — drop these results, they belong to a stale tab.
+      if (fetchTokenRef.current !== myToken) {
+        scrollAnchorRef.current = null;
+        return;
      }
-    },
-    onActivityLog: (entry) => {
-      if (!sending) return;
-      setActivityLog((prev) => appendActivityLine(prev, entry));
-    },
-    onSendComplete: () => {
-      if (sendingFromAPIRef.current) {
-        releaseSendGuards();
+      if (older.length > 0) {
+        setMessages((prev) => [...older, ...prev]);
+      } else {
+        // Nothing came back — clear the anchor so the next paint doesn't
+        // try to "restore" against a no-op prepend.
+        scrollAnchorRef.current = null;
      }
-    },
-    onSendError: (err) => {
-      if (sendingFromAPIRef.current) {
-        releaseSendGuards();
-        setError(err);
-      }
-    },
-  });
+      setHasMore(!reachedEnd);
+    } finally {
+      setLoadingOlder(false);
+      inflightRef.current = false;
+    }
+  }, [workspaceId]);
+
+  // IntersectionObserver on the top sentinel. Fires loadOlder() the
+  // moment the user scrolls within 200px of the top. AbortController
+  // unwires cleanly on workspace switch / unmount; root is the
+  // scrollable container so we observe only what's visible inside it.
+  //
+  // Dependencies:
+  //  - loadOlder    — stable per workspaceId (refs decouple it from
+  //                   message updates), so this dep is here for the
+  //                   workspace-switch case only
+  //  - hasMore      — re-run when older history runs out so we
+  //                   disconnect cleanly
+  //  - hasMessages  — load-bearing: the sentinel JSX is gated on
+  //                   `messages.length > 0`, so topRef.current is null
+  //                   on the empty-messages render. We re-arm exactly
+  //                   once when messages first land. NOT depending on
+  //                   `messages.length` (or `messages`) directly so
+  //                   each subsequent message append doesn't tear down
+  //                   + re-arm the observer.
+  const hasMessages = messages.length > 0;
+  useEffect(() => {
+    const top = topRef.current;
+    const container = containerRef.current;
+    if (!top || !container) return;
+    if (!hasMore) return; // stop observing when no older history exists
+    const ac = new AbortController();
+    const io = new IntersectionObserver(
+      (entries) => {
+        if (ac.signal.aborted) return;
+        if (entries[0]?.isIntersecting) loadOlder();
+      },
+      { root: container, rootMargin: "200px 0px 0px 0px", threshold: 0 },
+    );
+    io.observe(top);
+    ac.signal.addEventListener("abort", () => io.disconnect());
+    return () => ac.abort();
+  }, [loadOlder, hasMore, hasMessages]);

  // Agent reachability
  useEffect(() => {
    const reachable = data.status === "online" || data.status === "degraded";
    setAgentReachable(reachable);
-    if (reachable) {
-      setError(null);
-      clearSendError();
-    } else {
-      setError(`Agent is ${data.status}`);
-    }
-  }, [data.status, clearSendError]);
+    setError(reachable ? null : `Agent is ${data.status}`);
+  }, [data.status]);
+
+  useEffect(() => {
+    currentTaskRef.current = data.currentTask;
+  }, [data.currentTask]);

  // Scroll behavior across messages updates:
  //  - Prepend (loadOlder landed)  → restore the user's saved
@@ -180,24 +518,71 @@ function MyChatPanel({ workspaceId, data }: Props) {
  // paint — otherwise the user sees the page jump for one frame.
  useLayoutEffect(() => {
    const container = containerRef.current;
-    const anchor = history.scrollAnchorRef.current;
+    const anchor = scrollAnchorRef.current;
+    // Only honor the anchor when this messages-update is the prepend
+    // we expected. messages[0].id is the test:
+    //   - prepend  → messages[0] is one of the older rows → id !== expectFirstIdNotEqual
+    //   - append   → messages[0] unchanged → id === expectFirstIdNotEqual → fall through
+    // Without this check, an agent push that lands mid-loadOlder would
+    // run the restore against the append's update, yank the user's
+    // scroll, AND swallow the append's bottom-pin.
    if (
      anchor &&
      container &&
-      history.messages.length > 0 &&
-      history.messages[0].id !== anchor.expectFirstIdNotEqual
+      messages.length > 0 &&
+      messages[0].id !== anchor.expectFirstIdNotEqual
    ) {
      container.scrollTop = container.scrollHeight - anchor.savedDistanceFromBottom;
-      history.scrollAnchorRef.current = null;
+      scrollAnchorRef.current = null;
      return;
    }
-    if (!hasInitialScrollRef.current && history.messages.length > 0) {
+    // Instant on first arrival of messages — smooth-scroll on a long
+    // conversation gets interrupted by concurrent renders and leaves
+    // the user stuck in the middle. After the first jump, subsequent
+    // appends animate as before.
+    if (!hasInitialScrollRef.current && messages.length > 0) {
      hasInitialScrollRef.current = true;
      bottomRef.current?.scrollIntoView({ behavior: "instant" as ScrollBehavior });
      return;
    }
    bottomRef.current?.scrollIntoView({ behavior: "smooth" });
-  }, [history.messages, history.scrollAnchorRef]);
+  }, [messages]);
+
+  // Consume agent push messages (send_message_to_user) from global store.
+  // Runtimes like Claude Code SDK deliver their reply via a WS push rather
+  // than the /a2a HTTP response — when that happens, the push is the
+  // authoritative "reply arrived" signal for the UI, so clear `sending`
+  // here too. The HTTP .then() coordinates through sendingFromAPIRef so
+  // whichever path clears first wins.
+  const pendingAgentMsgs = useCanvasStore((s) => s.agentMessages[workspaceId]);
+  useEffect(() => {
+    if (!pendingAgentMsgs || pendingAgentMsgs.length === 0) return;
+    const consume = useCanvasStore.getState().consumeAgentMessages;
+    const msgs = consume(workspaceId);
+    for (const m of msgs) {
+      // Dedupe in case the agent proactively pushed the same text the
+      // HTTP /a2a response already delivered (observed with the Hermes
+      // runtime, which emits both a reply body and a send_message_to_user
+      // push for the same content). Attachments ride along with the
+      // message so files returned by the A2A_RESPONSE WS path render
+      // their download chips.
+      setMessages((prev) => appendMessageDeduped(prev, createMessage("agent", m.content, m.attachments)));
+    }
+    if (sendingFromAPIRef.current && msgs.length > 0) {
+      // Reply arrived via WS push (e.g. claude-code SDK). Release all
+      // three guards together — without sendInFlightRef the next
+      // sendMessage() silently no-ops at the synchronous re-entry
+      // check.
+      releaseSendGuards();
+    }
+  }, [pendingAgentMsgs, workspaceId]);
+
+  // Resolve workspace ID → name for activity display
+  const resolveWorkspaceName = useCallback((id: string) => {
+    const nodes = useCanvasStore.getState().nodes;
+    const node = nodes.find((n) => n.id === id);
+    return (node?.data as WorkspaceNodeData)?.name || id.slice(0, 8);
+  }, []);

  // Elapsed timer while sending
  useEffect(() => {
@@ -224,43 +609,211 @@ function MyChatPanel({ workspaceId, data }: Props) {
    setActivityLog([`Processing with ${runtimeDisplayName(data.runtime)}...`]);
  }, [sending, data.runtime]);

-  // IntersectionObserver on the top sentinel. Fires loadOlder() the
-  // moment the user scrolls within 200px of the top. AbortController
-  // unwires cleanly on workspace switch / unmount; root is the
-  // scrollable container so we observe only what's visible inside it.
-  const hasMessages = history.messages.length > 0;
-  useEffect(() => {
-    const top = topRef.current;
-    const container = containerRef.current;
-    if (!top || !container) return;
-    if (!history.hasMore) return;
-    const ac = new AbortController();
-    const io = new IntersectionObserver(
-      (entries) => {
-        if (ac.signal.aborted) return;
-        if (entries[0]?.isIntersecting) history.loadOlder();
-      },
-      { root: container, rootMargin: "200px 0px 0px 0px", threshold: 0 },
-    );
-    io.observe(top);
-    ac.signal.addEventListener("abort", () => io.disconnect());
-    return () => ac.abort();
-  }, [history.loadOlder, history.hasMore, hasMessages]);
+  // Subscribe to global WS via the singleton ReconnectingSocket (no
+  // per-component WebSocket — the previous pattern dropped events
+  // silently on any reconnect because each panel's raw socket had no
+  // onclose handler).
+  useSocketEvent((msg) => {
+    if (!sending) return;
+    try {
+        if (msg.event === "ACTIVITY_LOGGED") {
+          // Filter to events for THIS workspace. The platform's
+          // BroadcastOnly fires to every connected client, and
+          // without this guard a sibling workspace's a2a_send would
+          // surface as "→ Delegating to X..." inside the wrong
+          // chat panel. (workspace_id on the WS envelope is the
+          // workspace whose activity_log row we just wrote.)
+          if (msg.workspace_id !== workspaceId) return;

-  const handleSend = async () => {
+          const p = msg.payload || {};
+          const type = p.activity_type as string;
+          const method = (p.method as string) || "";
+          const status = (p.status as string) || "";
+          const targetId = (p.target_id as string) || "";
+          const durationMs = p.duration_ms as number | undefined;
+          const summary = (p.summary as string) || "";
+
+          let line = "";
+          if (type === "a2a_receive" && method === "message/send") {
+            const targetName = resolveWorkspaceName(targetId || msg.workspace_id);
+            if (status === "ok" && durationMs) {
+              const sec = Math.round(durationMs / 1000);
+              line = `← ${targetName} responded (${sec}s)`;
+              // The platform logs a successful a2a_receive once the workspace
+              // has fully produced its reply. That's the authoritative "done"
+              // signal for the spinner — clear it even if the reply hasn't
+              // surfaced through the store yet (it may be delivered shortly
+              // via pendingAgentMsgs or the HTTP .then()).
+              const own = (targetId || msg.workspace_id) === workspaceId;
+              if (own && sendingFromAPIRef.current) {
+                releaseSendGuards();
+              }
+            } else if (status === "error") {
+              line = `⚠ ${targetName} error`;
+              const own = (targetId || msg.workspace_id) === workspaceId;
+              if (own && sendingFromAPIRef.current) {
+                releaseSendGuards();
+                setError("Agent error (Exception) — see workspace logs for details.");
+              }
+            }
+          } else if (type === "a2a_send") {
+            const targetName = resolveWorkspaceName(targetId);
+            line = `→ Delegating to ${targetName}...`;
+          } else if (type === "task_update") {
+            if (summary) line = `⟳ ${summary}`;
+          } else if (type === "agent_log") {
+            // Per-tool-use telemetry from claude_sdk_executor's
+            // _report_tool_use. The summary already carries an icon
+            // + human-readable args (📄 Read /path, ⚡ Bash: …)
+            // so we render it verbatim. No icon prefix here — the
+            // emoji at the start of summary is the visual marker.
+            if (summary) line = summary;
+          }
+
+          if (line) {
+            setActivityLog((prev) => appendActivityLine(prev, line));
+          }
+        } else if (msg.event === "TASK_UPDATED" && msg.workspace_id === workspaceId) {
+          const task = (msg.payload?.current_task as string) || "";
+          if (task) {
+            setActivityLog((prev) => appendActivityLine(prev, `⟳ ${task}`));
+          }
+        }
+        // A2A_RESPONSE is already consumed by the store and its text is
+        // appended to messages via the pendingAgentMsgs effect above; we
+        // don't need to duplicate it here.
+    } catch { /* ignore */ }
+  });
+
+  const sendMessage = async () => {
    const text = input.trim();
-    const files = pendingFiles;
-    if ((!text && files.length === 0) || !agentReachable || sending || uploading) return;
+    const filesToSend = pendingFiles;
+    // Allow sending if EITHER text OR attachments are present — a user
+    // can drop a file with no text and the agent still receives it.
+    if ((!text && filesToSend.length === 0) || !agentReachable || sending || uploading) return;
+    // Synchronous re-entry guard — see sendInFlightRef comment.
+    if (sendInFlightRef.current) return;
+    sendInFlightRef.current = true;
+
+    // Upload attachments first so we can include URIs in the A2A
+    // message parts. Sequential-before-send: a message with references
+    // to files not yet staged would fail agent-side; staging happens
+    // synchronously via /chat/uploads before message/send dispatch.
+    let uploaded: ChatAttachment[] = [];
+    if (filesToSend.length > 0) {
+      setUploading(true);
+      try {
+        uploaded = await uploadChatFiles(workspaceId, filesToSend);
+      } catch (e) {
+        setUploading(false);
+        sendInFlightRef.current = false;
+        setError(e instanceof Error ? `Upload failed: ${e.message}` : "Upload failed");
+        return;
+      }
+      setUploading(false);
+    }
+
    setInput("");
    setPendingFiles([]);
-    clearSendError();
+    setMessages((prev) => [...prev, createMessage("user", text, uploaded)]);
+    setSending(true);
+    sendingFromAPIRef.current = true;
    setError(null);
-    await sendMessage(text, files);
+    // Capture this send's token so the .then()/.catch() callbacks can
+    // detect a newer send that may have superseded them. See the
+    // sendTokenRef declaration for the race scenario this closes.
+    const myToken = ++sendTokenRef.current;
+
+    // Build conversation history from prior messages (last 20)
+    const history = messages
+      .filter((m) => m.role === "user" || m.role === "agent")
+      .slice(-20)
+      .map((m) => ({
+        role: m.role === "user" ? "user" : "agent",
+        parts: [{ kind: "text", text: m.content }],
+      }));
+
+    // A2A parts: text part (if any) + file parts (per attachment). The
+    // agent sees both in a single turn, matching the A2A spec shape.
+    // Wire shape is v0 — see A2APart definition above.
+    const parts: A2APart[] = [];
+    if (text) parts.push({ kind: "text", text });
+    for (const att of uploaded) {
+      parts.push({
+        kind: "file",
+        file: {
+          name: att.name,
+          mimeType: att.mimeType,
+          uri: att.uri,
+          size: att.size,
+        },
+      });
+    }
+
+    // A2A calls can legitimately take minutes — LLM latency +
+    // multi-turn tool use is common on slower providers (Hermes+minimax,
+    // Claude Code invoking bash/file tools, etc.). The 15s default
+    // would silently abort the fetch here, leaving the server to
+    // complete the reply and the user staring at
+    // "agent may be unreachable". Match the upload timeout (60s × 2)
+    // for the happy-path ceiling; anything longer is genuinely stuck.
+    api.post<A2AResponse>(`/workspaces/${workspaceId}/a2a`, {
+      method: "message/send",
+      params: {
+        message: {
+          role: "user",
+          messageId: crypto.randomUUID(),
+          parts,
+        },
+        metadata: { history },
+      },
+    }, { timeoutMs: 120_000 })
+      .then((resp) => {
+        // Bail without touching any flags if a newer sendMessage has
+        // already run — its myToken bumped sendTokenRef, so this is
+        // a stale callback for an earlier message. The newer send
+        // owns the in-flight guards now.
+        if (sendTokenRef.current !== myToken) return;
+        // Skip if the WS A2A_RESPONSE event already handled this response.
+        // Both paths (WS + HTTP) check sendingFromAPIRef — whichever clears
+        // it first wins, the other becomes a no-op (no duplicate messages).
+        if (!sendingFromAPIRef.current) {
+          sendInFlightRef.current = false;
+          return;
+        }
+        const replyText = extractReplyText(resp);
+        const replyFiles = extractFilesFromTask((resp?.result ?? {}) as Record<string, unknown>);
+        if (replyText || replyFiles.length > 0) {
+          setMessages((prev) =>
+            appendMessageDeduped(prev, createMessage("agent", replyText, replyFiles)),
+          );
+        }
+        releaseSendGuards();
+      })
+      .catch(() => {
+        // Stale-callback guard — same rationale as .then().
+        if (sendTokenRef.current !== myToken) return;
+        // Same dedup guard as .then(): if a WS path (pendingAgentMsgs
+        // or ACTIVITY_LOGGED a2a_receive ok) already delivered the
+        // reply, sendingFromAPIRef is already false and there's
+        // nothing to roll back. Surfacing "Failed to send" here would
+        // contradict the agent reply the user is currently reading —
+        // exactly the false-positive observed when the HTTP request
+        // hung up (proxy idle / 502) after WS already won.
+        if (!sendingFromAPIRef.current) {
+          sendInFlightRef.current = false;
+          return;
+        }
+        releaseSendGuards();
+        setError("Failed to send message — agent may be unreachable");
+      });
  };

  const onFilesPicked = (fileList: FileList | null) => {
    if (!fileList) return;
    const picked = Array.from(fileList);
+    // Deduplicate against current pending set by name+size — user
+    // picking the same file twice shouldn't append it.
    setPendingFiles((prev) => {
      const keyed = new Set(prev.map((f) => `${f.name}:${f.size}`));
      return [...prev, ...picked.filter((f) => !keyed.has(`${f.name}:${f.size}`))];
@@ -271,7 +824,35 @@ function MyChatPanel({ workspaceId, data }: Props) {
  const removePendingFile = (index: number) =>
    setPendingFiles((prev) => prev.filter((_, i) => i !== index));

+  // Monotonic counter so two paste events within the same wall-clock
+  // second still produce distinct filenames. Without this, on
+  // Firefox (where pasted images have an empty `file.name`), two
+  // pastes ~100ms apart could yield identical synthetic names AND
+  // identical sizes, collapsing into one attachment via the
+  // `name:size` dedup in onFilesPicked.
+  const pasteCounterRef = useRef(0);
+
+  /** Paste-from-clipboard image attachment.
+   *
+   *  Browser clipboard image items arrive as `File`s whose `name` is
+   *  often a generic "image.png" (Chrome) or empty (Firefox/Safari),
+   *  so two consecutive screenshot pastes collide on the name+size
+   *  dedup the file-picker uses. Re-tag each pasted image with a
+   *  per-paste unique name so dedup keeps them apart and the upload
+   *  pipeline (which expects a non-empty filename) is happy.
+   *
+   *  Falls through to onFilesPicked via direct File[] (NOT through
+   *  the DataTransfer constructor — that throws on Safari < 14.1
+   *  and old Edge, silently aborting the paste).
+   *
+   *  Only intercepts the paste when the clipboard has at least one
+   *  image; text-only pastes fall through to the textarea's default
+   *  behaviour. */
  const mimeToExt = (mime: string): string => {
+    // Avoid raw `mime.split("/")[1]` — that yields `"svg+xml"`,
+    // `"jpeg"`, `"webp"` etc. which produce ugly filenames and may
+    // trip server-side extension allowlists. Map known types
+    // explicitly; unknown falls back to a safe default.
    if (mime === "image/svg+xml") return "svg";
    if (mime === "image/jpeg") return "jpg";
    if (mime === "image/png") return "png";
@@ -292,16 +873,26 @@ function MyChatPanel({ workspaceId, data }: Props) {
      const file = item.getAsFile();
      if (!file) continue;
      const ext = mimeToExt(file.type);
-      const stamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+      const stamp = new Date()
+        .toISOString()
+        .replace(/[:.]/g, "-")
+        .slice(0, 19);
      const seq = pasteCounterRef.current++;
      const fname = `pasted-${stamp}-${seq}-${i}.${ext}`;
      imageFiles.push(new File([file], fname, { type: file.type }));
    }
    if (imageFiles.length === 0) return;
    e.preventDefault();
+    // Reuse the picker path so file-size guards, dedup, and pending-
+    // list state all run through the same code. Build a synthetic
+    // FileList-like object to avoid the DataTransfer constructor —
+    // that's missing on Safari < 14.1 / old Edge and would silently
+    // throw, leaving the paste a no-op.
    addPastedFiles(imageFiles);
  };

+  // Variant of onFilesPicked that accepts a File[] directly, sidestepping
+  // the DataTransfer-FileList round-trip. Same dedup + state shape.
  const addPastedFiles = (files: File[]) => {
    setPendingFiles((prev) => {
      const keyed = new Set(prev.map((f) => `${f.name}:${f.size}`));
@@ -309,6 +900,11 @@ function MyChatPanel({ workspaceId, data }: Props) {
    });
  };

+  // Drag-and-drop staging. dragDepthRef counts enter vs leave events so
+  // the overlay doesn't flicker when the cursor crosses nested children
+  // (textarea, buttons) — dragenter/dragleave fire for every boundary.
+  const [dragOver, setDragOver] = useState(false);
+  const dragDepthRef = useRef(0);
  const dropEnabled = agentReachable && !sending && !uploading;
  const isFileDrag = (e: React.DragEvent) =>
    Array.from(e.dataTransfer.types || []).includes("Files");
@@ -338,6 +934,9 @@ function MyChatPanel({ workspaceId, data }: Props) {
  };

  const downloadAttachment = (att: ChatAttachment) => {
+    // Errors here are rare but user-visible (401 on a revoked token,
+    // 404 if the agent deleted the file). Surface via the inline
+    // error banner — the message list itself stays untouched.
    downloadChatFile(workspaceId, att).catch((e) => {
      setError(e instanceof Error ? `Download failed: ${e.message}` : "Download failed");
    });
@@ -363,54 +962,28 @@ function MyChatPanel({ workspaceId, data }: Props) {
          </div>
        </div>
      )}
-      {/* talk_to_user disabled banner — shown when the workspace has
-           talk_to_user_enabled=false. The agent cannot send canvas messages;
-           the user can re-enable the ability from here without opening settings. */}
-      {data.talkToUserEnabled === false && (
-        <div className="flex items-center gap-2 px-3 py-2 bg-surface-sunken border-b border-line/40 shrink-0">
-          <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true" className="shrink-0 text-ink-mid">
-            <path d="M8 1a7 7 0 1 0 0 14A7 7 0 0 0 8 1Zm0 10.5a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM8 4a.75.75 0 0 1 .75.75v4a.75.75 0 0 1-1.5 0v-4A.75.75 0 0 1 8 4Z" fill="currentColor"/>
-          </svg>
-          <span className="text-[10px] text-ink-mid flex-1">
-            Agent is not enabled to chat with you.
-          </span>
-          <button
-            onClick={async () => {
-              try {
-                await api.patch(`/workspaces/${workspaceId}/abilities`, { talk_to_user_enabled: true });
-                useCanvasStore.getState().updateNodeData(workspaceId, { talkToUserEnabled: true });
-              } catch {
-                // ignore — user will see no change and can retry
-              }
-            }}
-            className="px-2 py-0.5 text-[10px] font-medium bg-accent/10 hover:bg-accent/20 text-accent rounded border border-accent/30 transition-colors shrink-0"
-          >
-            Enable
-          </button>
-        </div>
-      )}
      {/* Messages */}
      <div ref={containerRef} className="flex-1 overflow-y-auto p-3 space-y-3">
-        {history.loading && (
+        {loading && (
          <div className="text-xs text-ink-mid text-center py-4">Loading chat history...</div>
        )}
-        {!history.loading && history.loadError !== null && history.messages.length === 0 && (
+        {!loading && loadError !== null && messages.length === 0 && (
          <div
            role="alert"
            className="mx-2 mt-2 rounded-lg border border-red-800/50 bg-red-950/30 px-3 py-2.5"
          >
            <p className="text-[11px] text-bad mb-1.5">
-              Failed to load chat history: {history.loadError}
+              Failed to load chat history: {loadError}
            </p>
            <button
-              onClick={history.loadInitial}
+              onClick={loadInitial}
              className="text-[10px] px-2 py-0.5 rounded bg-red-800 text-red-200 hover:bg-red-700 transition-colors"
            >
              Retry
            </button>
          </div>
        )}
-        {!history.loading && history.loadError === null && history.messages.length === 0 && (
+        {!loading && loadError === null && messages.length === 0 && (
          <div className="text-xs text-ink-mid text-center py-8">
            No messages yet. Send a message to start chatting with this agent.
          </div>
@@ -428,12 +1001,12 @@ function MyChatPanel({ workspaceId, data }: Props) {
            instead of showing a "no more messages" footer — the user's
            scroll resting against the top of the conversation IS the
            signal. */}
-        {history.hasMore && history.messages.length > 0 && (
+        {hasMore && messages.length > 0 && (
          <div ref={topRef} className="text-xs text-ink-mid text-center py-1">
-            {history.loadingOlder ? "Loading older messages…" : " "}
+            {loadingOlder ? "Loading older messages…" : " "}
          </div>
        )}
-        {history.messages.map((msg) => (
+        {messages.map((msg) => (
          <div key={msg.id} className={`flex ${msg.role === "user" ? "justify-end" : "justify-start"}`}>
            <div
              className={`max-w-[85%] rounded-lg px-3 py-2 text-xs ${
@@ -593,10 +1166,10 @@ function MyChatPanel({ workspaceId, data }: Props) {
      </div>

      {/* Error banner */}
-      {displayError && (
+      {error && (
        <div className="px-3 py-2 bg-red-900/20 border-t border-red-800/30">
          <div className="flex items-center justify-between">
-            <span className="text-[10px] text-red-300">{displayError}</span>
+            <span className="text-[10px] text-red-300">{error}</span>
            {!isOnline && (
              <button
                onClick={() => setConfirmRestart(true)}
@@ -664,7 +1237,7 @@ function MyChatPanel({ workspaceId, data }: Props) {
                e.keyCode !== 229
              ) {
                e.preventDefault();
-                handleSend();
+                sendMessage();
              }
            }}
            onPaste={onPasteIntoComposer}
@@ -674,7 +1247,7 @@ function MyChatPanel({ workspaceId, data }: Props) {
            className="flex-1 bg-surface-card border border-line rounded-lg px-3 py-2 text-xs text-ink placeholder-ink-soft dark:bg-zinc-800 dark:border-zinc-600 dark:placeholder-zinc-500 focus:outline-none focus:border-accent focus-visible:ring-2 focus-visible:ring-accent/40 resize-none disabled:opacity-50"
          />
          <button
-            onClick={handleSend}
+            onClick={sendMessage}
            disabled={(!input.trim() && pendingFiles.length === 0) || !agentReachable || sending || uploading}
            className="px-4 py-2 bg-accent-strong hover:bg-accent text-xs font-medium rounded-lg text-white disabled:opacity-30 transition-colors shrink-0"
          >
@@ -176,7 +176,7 @@ export function deriveProvidersFromModels(models: ModelSpec[]): string[] {
 // exactly the point of the platform adaptor. The deep `~/.hermes/
 // config.yaml` on the container is a separate runtime-internal file,
 // not this one.
-const RUNTIMES_WITH_OWN_CONFIG = new Set<string>(["external", "kimi", "kimi-cli", "openclaw"]);
+const RUNTIMES_WITH_OWN_CONFIG = new Set<string>(["external", "kimi", "kimi-cli"]);

 const FALLBACK_RUNTIME_OPTIONS: RuntimeOption[] = [
  { value: "", label: "LangGraph (default)", models: [], providers: [] },
@@ -45,54 +45,11 @@ export function FilesTab({ workspaceId, data }: Props) {
  if (data && isExternalLikeRuntime(data.runtime)) {
    return <NotAvailablePanel runtime={data.runtime} />;
  }
-  return <PlatformOwnedFilesTab workspaceId={workspaceId} runtime={data?.runtime} />;
+  return <PlatformOwnedFilesTab workspaceId={workspaceId} />;
 }

-/** Picks the initial root for the FilesTab dropdown based on the
- *  workspace's runtime. Decision: per-runtime default (Hongming
- *  2026-05-15, internal#425 Decisions §2).
- *
- *  - openclaw → `/agent-home` (the agent's identity/state — the
- *    user-facing interesting files for that runtime live in
- *    `~/.openclaw/` inside the container, which `/agent-home` maps to
- *    via the Phase 2b docker-exec backend).
- *  - everything else (claude-code, hermes, external-like, undefined)
- *    → `/configs` (the legacy default — managed config that flows
- *    through the per-runtime indirection in
- *    workspace-server/internal/handlers/template_files_eic.go).
- *
- *  When the runtime is undefined (legacy callers that don't thread
- *  `data` through, or a workspace whose runtime field hasn't loaded
- *  yet) the default is `/configs` — matches today's behaviour, no
- *  surprise.
- *
- *  Note on `/agent-home` pre-Phase-2b: the backend short-circuits
- *  with HTTP 501 and the canonical "implementation pending" body.
- *  The tab renders empty + the error banner explains. This is by
- *  design — lets us land the canvas UX before the backend ships,
- *  per the RFC's phased rollout. The 501 is graceful: it doesn't
- *  poison error toasts or generate "workspace not found" noise.
- *
- *  Adding a new runtime that should default to `/agent-home`: add it
- *  to the agentHomeDefaultRuntimes set below. Adding a runtime that
- *  should default to a different root: extend this function. */
-const agentHomeDefaultRuntimes = new Set(["openclaw"]);
-
-function defaultRootForRuntime(runtime: string | undefined): string {
-  if (runtime && agentHomeDefaultRuntimes.has(runtime)) {
-    return "/agent-home";
-  }
-  return "/configs";
-}
-
-function PlatformOwnedFilesTab({
-  workspaceId,
-  runtime,
-}: {
-  workspaceId: string;
-  runtime?: string;
-}) {
-  const [root, setRoot] = useState(() => defaultRootForRuntime(runtime));
+function PlatformOwnedFilesTab({ workspaceId }: { workspaceId: string }) {
+  const [root, setRoot] = useState("/configs");
  const [selectedFile, setSelectedFile] = useState<string | null>(null);
  const [fileContent, setFileContent] = useState("");
  const [editContent, setEditContent] = useState("");
@@ -3,22 +3,6 @@
 import { useRef } from "react";
 import { getIcon } from "./tree";

-// secretShapeMarker is the canonical body the workspace-server Files
-// API returns when a file's path OR content matched a credential
-// regex (internal#425 RFC, Phase 2b — backed by
-// workspace-server/internal/secrets.ScanBytes). The marker is a
-// fixed prefix so the canvas can detect it without parsing JSON and
-// without round-tripping the matched bytes through the editor (which
-// would defeat the purpose — clipboard, browser history, log
-// surfaces would all see them).
-//
-// Today (Phase 1 / before 2b ships) the backend returns 501 for the
-// only root that uses this path, so the marker is dead code until
-// 2b lands. Wiring it in now keeps the canvas + backend contracts
-// aligned in one PR rather than a follow-up. The constant is
-// importable so a future test can pin the exact string.
-export const SECRET_SHAPE_DENIED_MARKER = "<denied: secret-shape>";
-
 interface Props {
  selectedFile: string | null;
  fileContent: string;
@@ -47,22 +31,6 @@ export function FileEditor({
  const editorRef = useRef<HTMLTextAreaElement>(null);
  const isDirty = editContent !== fileContent;

-  // internal#425 Phase 3: detect the secret-shape denial marker and
-  // render a placeholder instead of the editor. The marker comes
-  // from workspace-server Phase 2b (secrets.ScanBytes) which refuses
-  // to surface the file's bytes. We deliberately don't expose
-  // the matched pattern's Name here — the canvas just shows the
-  // generic denial. The Files API log surface has the Pattern.Name
-  // for operators who need to debug a false positive.
-  const isSecretShapeDenied = fileContent === SECRET_SHAPE_DENIED_MARKER;
-
-  // /agent-home is read-only from the canvas (Phase 2b ships read +
-  // delete; Phase-2b-followup may add write). Edits to /configs are
-  // unchanged. Until 2b ships, /agent-home returns 501 so this
-  // read-only gate is also dead code, but wiring it in now keeps
-  // the UI honest the moment 2b lands without a follow-up canvas PR.
-  const isReadOnlyRoot = root !== "/configs";
-
  if (!selectedFile) {
    return (
      <div className="flex-1 flex items-center justify-center">
@@ -107,42 +75,11 @@ export function FileEditor({
      {/* Editor area */}
      {loadingFile ? (
        <div className="p-4 text-xs text-ink-mid">Loading...</div>
-      ) : isSecretShapeDenied ? (
-        // Files API refused to surface this file's bytes because its
-        // path or content matched a credential regex
-        // (workspace-server/internal/secrets, internal#425 Phase 2b).
-        // We render a placeholder INSTEAD OF the textarea so the
-        // matched bytes never enter the DOM. Clipboard / view-source
-        // / element-inspector all see the placeholder, not the
-        // credential.
-        <div
-          role="region"
-          aria-label="File content denied"
-          className="flex-1 flex items-center justify-center p-6 bg-surface"
-        >
-          <div className="max-w-md text-center space-y-2">
-            <div className="text-2xl opacity-40">🛡️</div>
-            <p className="text-[11px] font-mono text-warm">
-              {SECRET_SHAPE_DENIED_MARKER}
-            </p>
-            <p className="text-[10px] text-ink-mid leading-relaxed">
-              The platform refused to surface this file because its
-              path or content matched a credential-shape pattern.
-              The bytes never left the workspace container.
-            </p>
-            <p className="text-[10px] text-ink-mid leading-relaxed">
-              If this is a false positive (test fixture, docs example,
-              or content that happens to share a credential's shape),
-              rename the file or adjust the content via the workspace
-              terminal so the regex no longer matches, then refresh.
-            </p>
-          </div>
-        </div>
      ) : (
        <textarea
          ref={editorRef}
          value={editContent}
-          readOnly={isReadOnlyRoot}
+          readOnly={root !== "/configs"}
          onChange={(e) => setEditContent(e.target.value)}
          onKeyDown={(e) => {
            if ((e.metaKey || e.ctrlKey) && e.key === "s") {
@@ -38,15 +38,6 @@ export function FilesToolbar({
          <option value="/home">/home</option>
          <option value="/workspace">/workspace</option>
          <option value="/plugins">/plugins</option>
-          {/* internal#425 Phase 1+3: container-internal $HOME root.
-              Backend lands the docker-exec dispatch in Phase 2b. Until
-              then the stub returns 501 with a canonical
-              "implementation pending" message — the dropdown renders
-              the option so the canvas affordance is design-frozen
-              even before the backend ships.
-              Runtime-default selection logic in FilesTab.tsx picks
-              this as the initial value for openclaw workspaces. */}
-          <option value="/agent-home">/agent-home</option>
        </select>
        <span className="text-[10px] text-ink-mid">{fileCount} files</span>
      </div>
@@ -1,181 +0,0 @@
-// @vitest-environment jsdom
-/**
- * Tests for the /agent-home root selector + per-runtime default-root
- * + secret-shape denial placeholder (internal#425 Phase 3).
- *
- * Separate file so the diff is reviewable as a unit and the existing
- * FilesToolbar / FileEditor / FilesTab tests don't have to grow
- * agent-home-specific cases. Once Phase 2b lands, the read-only +
- * 501-stub assertions here can be tightened (or moved into the main
- * test file as the agent-home root becomes a first-class affordance).
- */
-import React from "react";
-import { render, screen, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-import { FilesToolbar } from "../FilesToolbar";
-import {
-  FileEditor,
-  SECRET_SHAPE_DENIED_MARKER,
-} from "../FileEditor";
-
-afterEach(cleanup);
-
-describe("internal#425 Phase 3 — /agent-home root selector", () => {
-  it("dropdown includes /agent-home as an option", () => {
-    // Pins the affordance is in the DOM even pre-Phase-2b — the
-    // canvas design freezes today, the backend lands the dispatch
-    // later. Without this, a future refactor that drops the option
-    // would silently regress the RFC's Phase 1 contract (canvas
-    // visibility) without breaking any other test.
-    render(
-      <FilesToolbar
-        root="/configs"
-        setRoot={vi.fn()}
-        fileCount={0}
-        onNewFile={vi.fn()}
-        onUpload={vi.fn()}
-        onDownloadAll={vi.fn()}
-        onClearAll={vi.fn()}
-        onRefresh={vi.fn()}
-      />,
-    );
-    const select = screen.getByRole("combobox", {
-      name: /file root directory/i,
-    }) as HTMLSelectElement;
-    const values = Array.from(select.options).map((o) => o.value);
-    expect(values).toContain("/agent-home");
-  });
-
-  it("dropdown shows /agent-home as the SELECTED root when prop is /agent-home", () => {
-    render(
-      <FilesToolbar
-        root="/agent-home"
-        setRoot={vi.fn()}
-        fileCount={0}
-        onNewFile={vi.fn()}
-        onUpload={vi.fn()}
-        onDownloadAll={vi.fn()}
-        onClearAll={vi.fn()}
-        onRefresh={vi.fn()}
-      />,
-    );
-    const select = screen.getByRole("combobox", {
-      name: /file root directory/i,
-    }) as HTMLSelectElement;
-    expect(select.value).toBe("/agent-home");
-  });
-});
-
-describe("internal#425 Phase 3 — secret-shape denial placeholder", () => {
-  // Files API Phase 2b returns SECRET_SHAPE_DENIED_MARKER as the file
-  // body when the file's path or content matched a credential regex.
-  // The editor MUST render the marker as a placeholder, not pump it
-  // through the textarea — that would put the marker (and any future
-  // matched bytes if the backend contract changes) into the DOM
-  // value, clipboard, and inspector.
-
-  it("renders the denial placeholder INSTEAD of the textarea when fileContent is the marker", () => {
-    render(
-      <FileEditor
-        selectedFile="agent/.openclaw/secrets.env"
-        fileContent={SECRET_SHAPE_DENIED_MARKER}
-        editContent={SECRET_SHAPE_DENIED_MARKER}
-        setEditContent={vi.fn()}
-        loadingFile={false}
-        saving={false}
-        success={null}
-        root="/agent-home"
-        onSave={vi.fn()}
-        onDownload={vi.fn()}
-      />,
-    );
-    // Placeholder region present
-    expect(
-      screen.getByRole("region", { name: /file content denied/i }),
-    ).toBeTruthy();
-    // Marker text visible (so a debugging operator sees the canonical
-    // contract string without having to dig into the source).
-    expect(screen.getByText(SECRET_SHAPE_DENIED_MARKER)).toBeTruthy();
-    // Critically: NO textarea — the bytes never reach a controlled
-    // input. A regression that re-introduces the textarea path would
-    // make the matched marker (and any future content) selectable +
-    // copyable.
-    expect(screen.queryByRole("textbox")).toBeNull();
-  });
-
-  it("renders the textarea normally when fileContent is regular content", () => {
-    render(
-      <FileEditor
-        selectedFile="config.yaml"
-        fileContent="name: openclaw\n"
-        editContent="name: openclaw\n"
-        setEditContent={vi.fn()}
-        loadingFile={false}
-        saving={false}
-        success={null}
-        root="/configs"
-        onSave={vi.fn()}
-        onDownload={vi.fn()}
-      />,
-    );
-    expect(screen.getByRole("textbox")).toBeTruthy();
-    expect(screen.queryByRole("region", { name: /file content denied/i }))
-      .toBeNull();
-  });
-
-  it("/agent-home renders textarea READ-ONLY for non-denied content", () => {
-    // Phase 2b ships read + delete on /agent-home; write semantics
-    // are decided later. Until then, the canvas presents the editor
-    // as read-only so a user can't type into a buffer that the
-    // backend will refuse to PUT. Without this gate, the user would
-    // edit, hit Save, get a 501, and lose their context for why.
-    render(
-      <FileEditor
-        selectedFile=".openclaw/agent-card.json"
-        fileContent='{"name":"openclaw"}'
-        editContent='{"name":"openclaw"}'
-        setEditContent={vi.fn()}
-        loadingFile={false}
-        saving={false}
-        success={null}
-        root="/agent-home"
-        onSave={vi.fn()}
-        onDownload={vi.fn()}
-      />,
-    );
-    const textarea = screen.getByRole("textbox") as HTMLTextAreaElement;
-    expect(textarea.readOnly).toBe(true);
-  });
-
-  it("/configs renders textarea WRITABLE (regression guard for the read-only gate)", () => {
-    render(
-      <FileEditor
-        selectedFile="config.yaml"
-        fileContent="name: x\n"
-        editContent="name: x\n"
-        setEditContent={vi.fn()}
-        loadingFile={false}
-        saving={false}
-        success={null}
-        root="/configs"
-        onSave={vi.fn()}
-        onDownload={vi.fn()}
-      />,
-    );
-    const textarea = screen.getByRole("textbox") as HTMLTextAreaElement;
-    expect(textarea.readOnly).toBe(false);
-  });
-});
-
-describe("internal#425 Phase 3 — marker constant is the canonical string", () => {
-  // The marker string is part of the canvas <-> workspace-server
-  // contract. The workspace-server emits this exact body; the canvas
-  // detects it by exact-equality. A typo on either side would
-  // silently break detection — the canvas would render the literal
-  // string in the textarea instead of the placeholder. Pin the
-  // contract value here.
-  it("matches the contract value '<denied: secret-shape>'", () => {
-    expect(SECRET_SHAPE_DENIED_MARKER).toBe("<denied: secret-shape>");
-  });
-});
@@ -1,3 +0,0 @@
-export { useChatHistory } from "./useChatHistory";
-export { useChatSend } from "./useChatSend";
-export { useChatSocket } from "./useChatSocket";
@@ -1,11 +0,0 @@
-"use client";
-
-import { useCanvasStore, type WorkspaceNodeData } from "@/store/canvas";
-
-/** Resolve a workspace ID to its human-readable name.
- *  Falls back to the first 8 chars of the ID. */
-export function resolveWorkspaceName(id: string): string {
-  const nodes = useCanvasStore.getState().nodes;
-  const node = nodes.find((n) => n.id === id);
-  return (node?.data as WorkspaceNodeData)?.name || id.slice(0, 8);
-}
@@ -1,134 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useRef, useState } from "react";
-import { api } from "@/lib/api";
-import { type ChatMessage, appendMessageDeduped as appendMessageDedupedFn } from "../types";
-
-const INITIAL_HISTORY_LIMIT = 10;
-const OLDER_HISTORY_BATCH = 20;
-
-async function loadMessagesFromDB(
-  workspaceId: string,
-  limit: number,
-  beforeTs?: string,
-): Promise<{ messages: ChatMessage[]; error: string | null; reachedEnd: boolean }> {
-  try {
-    const params = new URLSearchParams({ limit: String(limit) });
-    if (beforeTs) params.set("before_ts", beforeTs);
-    const resp = await api.get<{ messages: ChatMessage[]; reached_end: boolean }>(
-      `/workspaces/${workspaceId}/chat-history?${params.toString()}`,
-    );
-    return {
-      messages: resp.messages ?? [],
-      error: null,
-      reachedEnd: resp.reached_end,
-    };
-  } catch (err) {
-    return {
-      messages: [],
-      error: err instanceof Error ? err.message : "Failed to load chat history",
-      reachedEnd: true,
-    };
-  }
-}
-
-export interface ScrollAnchor {
-  savedDistanceFromBottom: number;
-  expectFirstIdNotEqual: string | null;
-}
-
-export function useChatHistory(
-  workspaceId: string,
-  containerRef?: React.RefObject<HTMLDivElement | null>,
-) {
-  const [messages, setMessages] = useState<ChatMessage[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [loadError, setLoadError] = useState<string | null>(null);
-  const [loadingOlder, setLoadingOlder] = useState(false);
-  const [hasMore, setHasMore] = useState(true);
-
-  const fetchTokenRef = useRef(0);
-  const oldestMessageRef = useRef<ChatMessage | null>(null);
-  const hasMoreRef = useRef(true);
-  const inflightRef = useRef(false);
-  const scrollAnchorRef = useRef<ScrollAnchor | null>(null);
-
-  useEffect(() => {
-    oldestMessageRef.current = messages[0] ?? null;
-  }, [messages]);
-
-  useEffect(() => {
-    hasMoreRef.current = hasMore;
-  }, [hasMore]);
-
-  const loadInitial = useCallback(() => {
-    setLoading(true);
-    setLoadError(null);
-    setHasMore(true);
-    fetchTokenRef.current += 1;
-    const myToken = fetchTokenRef.current;
-    return loadMessagesFromDB(workspaceId, INITIAL_HISTORY_LIMIT).then(
-      ({ messages: msgs, error: fetchErr, reachedEnd }) => {
-        if (fetchTokenRef.current !== myToken) return;
-        setMessages(msgs);
-        setLoadError(fetchErr);
-        setHasMore(!reachedEnd);
-        setLoading(false);
-      },
-    );
-  }, [workspaceId]);
-
-  useEffect(() => {
-    loadInitial();
-  }, [loadInitial]);
-
-  const loadOlder = useCallback(async () => {
-    if (inflightRef.current || !hasMoreRef.current) return;
-    const oldest = oldestMessageRef.current;
-    if (!oldest) return;
-    const container = containerRef?.current;
-    if (!container) return;
-    inflightRef.current = true;
-    scrollAnchorRef.current = {
-      savedDistanceFromBottom: container.scrollHeight - container.scrollTop,
-      expectFirstIdNotEqual: oldest.id,
-    };
-    fetchTokenRef.current += 1;
-    const myToken = fetchTokenRef.current;
-    setLoadingOlder(true);
-    try {
-      const { messages: older, reachedEnd } = await loadMessagesFromDB(
-        workspaceId,
-        OLDER_HISTORY_BATCH,
-        oldest.timestamp,
-      );
-      if (fetchTokenRef.current !== myToken) {
-        scrollAnchorRef.current = null;
-        return;
-      }
-      if (older.length > 0) {
-        setMessages((prev) => [...older, ...prev]);
-      } else {
-        scrollAnchorRef.current = null;
-      }
-      setHasMore(!reachedEnd);
-    } finally {
-      setLoadingOlder(false);
-      inflightRef.current = false;
-    }
-  }, [workspaceId, containerRef]);
-
-  return {
-    messages,
-    loading,
-    loadError,
-    loadingOlder,
-    hasMore,
-    loadInitial,
-    loadOlder,
-    appendMessageDeduped: (msg: ChatMessage) =>
-      setMessages((prev) => appendMessageDedupedFn(prev, msg)),
-    setMessages,
-    scrollAnchorRef,
-  };
-}
@@ -1,182 +0,0 @@
-"use client";
-
-import { useCallback, useRef, useState } from "react";
-import { api } from "@/lib/api";
-import { uploadChatFiles } from "../uploads";
-import { createMessage, type ChatMessage, type ChatAttachment } from "../types";
-import { extractFilesFromTask } from "../message-parser";
-
-interface A2APart {
-  kind: string;
-  text?: string;
-  file?: {
-    name?: string;
-    mimeType?: string;
-    uri?: string;
-    size?: number;
-  };
-}
-
-interface A2AResponse {
-  result?: {
-    parts?: A2APart[];
-    artifacts?: Array<{ parts: A2APart[] }>;
-  };
-}
-
-export function extractReplyText(resp: A2AResponse): string {
-  const collect = (parts: A2APart[] | undefined): string => {
-    if (!parts) return "";
-    return parts
-      .filter((p) => p.kind === "text")
-      .map((p) => p.text ?? "")
-      .filter(Boolean)
-      .join("\n");
-  };
-  const result = resp?.result;
-  const collected: string[] = [];
-  const fromParts = collect(result?.parts);
-  if (fromParts) collected.push(fromParts);
-  if (result?.artifacts) {
-    for (const a of result.artifacts) {
-      const t = collect(a.parts);
-      if (t) collected.push(t);
-    }
-  }
-  return collected.join("\n");
-}
-
-export interface UseChatSendOptions {
-  getHistoryMessages: () => ChatMessage[];
-  onUserMessage?: (msg: ChatMessage) => void;
-  onAgentMessage?: (msg: ChatMessage) => void;
-}
-
-export function useChatSend(workspaceId: string, options: UseChatSendOptions) {
-  const [sending, setSending] = useState(false);
-  const [uploading, setUploading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const sendInFlightRef = useRef(false);
-  const sendingFromAPIRef = useRef(false);
-  const sendTokenRef = useRef(0);
-  const optionsRef = useRef(options);
-  optionsRef.current = options;
-
-  const releaseSendGuards = useCallback(() => {
-    setSending(false);
-    sendingFromAPIRef.current = false;
-    sendInFlightRef.current = false;
-  }, []);
-
-  const clearError = useCallback(() => setError(null), []);
-
-  const sendMessage = useCallback(
-    async (text: string, files: File[] = []) => {
-      const trimmed = text.trim();
-      if ((!trimmed && files.length === 0) || sending || uploading) return;
-      if (sendInFlightRef.current) return;
-      sendInFlightRef.current = true;
-
-      let uploaded: ChatAttachment[] = [];
-      if (files.length > 0) {
-        setUploading(true);
-        try {
-          uploaded = await uploadChatFiles(workspaceId, files);
-        } catch (e) {
-          setUploading(false);
-          sendInFlightRef.current = false;
-          setError(
-            e instanceof Error ? `Upload failed: ${e.message}` : "Upload failed",
-          );
-          return;
-        }
-        setUploading(false);
-      }
-
-      const userMsg = createMessage("user", trimmed, uploaded);
-      optionsRef.current.onUserMessage?.(userMsg);
-
-      setSending(true);
-      sendingFromAPIRef.current = true;
-      setError(null);
-      const myToken = ++sendTokenRef.current;
-
-      const history = optionsRef.current
-        .getHistoryMessages()
-        .filter((m) => m.role === "user" || m.role === "agent")
-        .slice(-20)
-        .map((m) => ({
-          role: m.role === "user" ? "user" : "agent",
-          parts: [{ kind: "text", text: m.content }],
-        }));
-
-      const parts: A2APart[] = [];
-      if (trimmed) parts.push({ kind: "text", text: trimmed });
-      for (const att of uploaded) {
-        parts.push({
-          kind: "file",
-          file: {
-            name: att.name,
-            mimeType: att.mimeType,
-            uri: att.uri,
-            size: att.size,
-          },
-        });
-      }
-
-      api
-        .post<A2AResponse>(
-          `/workspaces/${workspaceId}/a2a`,
-          {
-            method: "message/send",
-            params: {
-              message: {
-                role: "user",
-                messageId: crypto.randomUUID(),
-                parts,
-              },
-              metadata: { history },
-            },
-          },
-          { timeoutMs: 120_000 },
-        )
-        .then((resp) => {
-          if (sendTokenRef.current !== myToken) return;
-          if (!sendingFromAPIRef.current) {
-            sendInFlightRef.current = false;
-            return;
-          }
-          const replyText = extractReplyText(resp);
-          const replyFiles = extractFilesFromTask(
-            (resp?.result ?? {}) as Record<string, unknown>,
-          );
-          if (replyText || replyFiles.length > 0) {
-            optionsRef.current.onAgentMessage?.(
-              createMessage("agent", replyText, replyFiles),
-            );
-          }
-          releaseSendGuards();
-        })
-        .catch(() => {
-          if (sendTokenRef.current !== myToken) return;
-          if (!sendingFromAPIRef.current) {
-            sendInFlightRef.current = false;
-            return;
-          }
-          releaseSendGuards();
-          setError("Failed to send message — agent may be unreachable");
-        });
-    },
-    [workspaceId, sending, uploading],
-  );
-
-  return {
-    sending,
-    uploading,
-    sendMessage,
-    error,
-    clearError,
-    releaseSendGuards,
-    sendingFromAPIRef,
-  };
-}
@@ -1,100 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useRef } from "react";
-import { useCanvasStore, type WorkspaceNodeData } from "@/store/canvas";
-import { useSocketEvent } from "@/hooks/useSocketEvent";
-import { createMessage, type ChatMessage } from "../types";
-
-export interface UseChatSocketCallbacks {
-  onAgentMessage?: (msg: ChatMessage) => void;
-  onActivityLog?: (entry: string) => void;
-  onSendComplete?: () => void;
-  onSendError?: (error: string) => void;
-}
-
-export function useChatSocket(
-  workspaceId: string,
-  callbacks: UseChatSocketCallbacks,
-): void {
-  const callbacksRef = useRef(callbacks);
-  callbacksRef.current = callbacks;
-
-  // Agent push messages from global store
-  const pendingAgentMsgs = useCanvasStore((s) => s.agentMessages[workspaceId]);
-  useEffect(() => {
-    if (!pendingAgentMsgs || pendingAgentMsgs.length === 0) return;
-    const consume = useCanvasStore.getState().consumeAgentMessages;
-    const msgs = consume(workspaceId);
-    for (const m of msgs) {
-      callbacksRef.current.onAgentMessage?.(
-        createMessage("agent", m.content, m.attachments),
-      );
-    }
-    if (msgs.length > 0) {
-      callbacksRef.current.onSendComplete?.();
-    }
-  }, [pendingAgentMsgs, workspaceId]);
-
-  const resolveWorkspaceName = useCallback((id: string) => {
-    const nodes = useCanvasStore.getState().nodes;
-    const node = nodes.find((n) => n.id === id);
-    return (node?.data as WorkspaceNodeData)?.name || id.slice(0, 8);
-  }, []);
-
-  useSocketEvent((msg) => {
-    try {
-      if (msg.event === "ACTIVITY_LOGGED") {
-        if (msg.workspace_id !== workspaceId) return;
-
-        const p = msg.payload || {};
-        const type = p.activity_type as string;
-        const method = (p.method as string) || "";
-        const status = (p.status as string) || "";
-        const targetId = (p.target_id as string) || "";
-        const durationMs = p.duration_ms as number | undefined;
-        const summary = (p.summary as string) || "";
-
-        let line = "";
-        if (type === "a2a_receive" && method === "message/send") {
-          const targetName = resolveWorkspaceName(targetId || msg.workspace_id);
-          if (status === "ok" && durationMs) {
-            const sec = Math.round(durationMs / 1000);
-            line = `← ${targetName} responded (${sec}s)`;
-            const own = (targetId || msg.workspace_id) === workspaceId;
-            if (own) callbacksRef.current.onSendComplete?.();
-          } else if (status === "error") {
-            line = `⚠ ${targetName} error`;
-            const own = (targetId || msg.workspace_id) === workspaceId;
-            if (own) {
-              callbacksRef.current.onSendComplete?.();
-              callbacksRef.current.onSendError?.(
-                "Agent error (Exception) — see workspace logs for details.",
-              );
-            }
-          }
-        } else if (type === "a2a_send") {
-          const targetName = resolveWorkspaceName(targetId);
-          line = `→ Delegating to ${targetName}...`;
-        } else if (type === "task_update") {
-          if (summary) line = `⟳ ${summary}`;
-        } else if (type === "agent_log") {
-          if (summary) line = summary;
-        }
-
-        if (line) {
-          callbacksRef.current.onActivityLog?.(line);
-        }
-      } else if (
-        msg.event === "TASK_UPDATED" &&
-        msg.workspace_id === workspaceId
-      ) {
-        const task = (msg.payload?.current_task as string) || "";
-        if (task) {
-          callbacksRef.current.onActivityLog?.(`⟳ ${task}`);
-        }
-      }
-    } catch {
-      /* ignore */
-    }
-  });
-}
@@ -1,5 +1,2 @@
 export { type ChatMessage, createMessage, appendMessageDeduped } from "./types";
 export { extractAgentText, extractTextsFromParts, extractResponseText } from "./message-parser";
-export { useChatHistory } from "./hooks/useChatHistory";
-export { useChatSend } from "./hooks/useChatSend";
-export { useChatSocket } from "./hooks/useChatSocket";
@@ -8,18 +8,14 @@ import { getTenantSlug } from "./tenant";
 export const PLATFORM_URL =
  process.env.NEXT_PUBLIC_PLATFORM_URL ?? "http://localhost:8080";

-// 35s is long enough for the slowest server-side path (EIC SSH
-// tunnel for tenant EC2 file operations, bounded server-side by
-// `eicFileOpTimeout = 30 * time.Second` in
-// workspace-server/internal/handlers/template_files_eic.go) so the
-// canvas surfaces the server's real error instead of aborting first
-// with a generic timeout. Shorter values caused "Save & Restart" to
-// time out at the client before the backend returned its 5xx. The
-// abort still propagates through AbortController so React components
-// can render a retry affordance. Callers that know an endpoint is
-// intentionally slow (org import walks a tree of workspaces with
-// server-side pacing) can pass `timeoutMs` to override.
-const DEFAULT_TIMEOUT_MS = 35_000;
+// 15s is long enough for slow CP queries but short enough that a
+// hung backend doesn't leave the UI spinning forever. The abort
+// propagates through AbortController so React components can observe
+// the error and render a retry affordance. Callers that know the
+// endpoint is intentionally slow (org import walks a tree of
+// workspaces with server-side pacing) can pass `timeoutMs` to
+// override.
+const DEFAULT_TIMEOUT_MS = 15_000;

 export interface RequestOptions {
  timeoutMs?: number;
@@ -519,10 +519,6 @@ export function buildNodesAndEdges(
        // #2054 — server-declared per-workspace provisioning timeout.
        // Falls through to the runtime profile when null/absent.
        provisionTimeoutMs: ws.provision_timeout_ms ?? null,
-        // Workspace abilities — defaults preserved for old platform versions
-        // that don't yet include these columns in the GET response.
-        broadcastEnabled: ws.broadcast_enabled ?? false,
-        talkToUserEnabled: ws.talk_to_user_enabled ?? true,
      },
    };
    if (hasParent) {
@@ -99,13 +99,6 @@ export interface WorkspaceNodeData extends Record<string, unknown> {
   *  @/lib/runtimeProfiles. Lets a slow runtime declare its cold-boot
   *  expectation without a canvas release. */
  provisionTimeoutMs?: number | null;
-  /** When true the workspace may POST /broadcast to send org-wide messages.
-   *  Default false. Toggled by user/admin via PATCH /workspaces/:id/abilities. */
-  broadcastEnabled?: boolean;
-  /** When false the workspace cannot deliver canvas chat messages.
-   *  send_message_to_user / POST /notify return 403 and the canvas
-   *  shows a "not enabled" state with a button to re-enable. Default true. */
-  talkToUserEnabled?: boolean;
 }

 export type PanelTab = "details" | "skills" | "chat" | "terminal" | "config" | "schedule" | "channels" | "files" | "memory" | "traces" | "events" | "activity" | "audit";
@@ -299,9 +299,6 @@ export interface WorkspaceData {
   *  `@/lib/runtimeProfiles` when absent (the default behavior for any
   *  template that hasn't yet declared the field). */
  provision_timeout_ms?: number | null;
-  /** Workspace ability flags (migration 20260514). */
-  broadcast_enabled?: boolean;
-  talk_to_user_enabled?: boolean;
 }

 let socket: ReconnectingSocket | null = null;
@@ -1,296 +0,0 @@
-#!/usr/bin/env bash
-# E2E test: workspace broadcast and talk-to-user platform abilities.
-#
-# What this proves:
-#   1. talk_to_user_enabled (default true) — POST /notify works out-of-the-box.
-#   2. PATCH /workspaces/:id/abilities { talk_to_user_enabled: false } disables
-#      delivery: /notify → 403 with error="talk_to_user_disabled" + delegate hint.
-#   3. Re-enabling talk_to_user_enabled restores delivery.
-#   4. broadcast_enabled (default false) — POST /broadcast → 403 when disabled.
-#   5. PATCH { broadcast_enabled: true } enables fan-out.
-#   6. POST /broadcast delivers to all non-sender, non-removed workspaces:
-#      - Returns {"status":"sent","delivered":N}
-#      - Receiver's activity log has a broadcast_receive entry with the message.
-#      - Sender's activity log has a broadcast_sent entry.
-#   7. The sender itself does NOT receive a broadcast_receive entry.
-#
-# Usage:  tests/e2e/test_workspace_abilities_e2e.sh
-# Prereqs: workspace-server on http://localhost:8080, MOLECULE_ENV != production
-
-set -euo pipefail
-
-source "$(dirname "$0")/_lib.sh"
-
-PASS=0
-FAIL=0
-SENDER_ID=""
-RECEIVER_ID=""
-
-cleanup() {
-  for wid in "$SENDER_ID" "$RECEIVER_ID"; do
-    if [ -n "$wid" ]; then
-      curl -s -X DELETE "$BASE/workspaces/$wid?confirm=true" > /dev/null || true
-    fi
-  done
-}
-trap cleanup EXIT INT TERM
-
-assert() {
-  local label="$1" actual="$2" expected="$3"
-  if [ "$actual" = "$expected" ]; then
-    echo "  PASS — $label"
-    PASS=$((PASS+1))
-  else
-    echo "  FAIL — $label"
-    echo "         expected: $expected"
-    echo "         actual:   $actual"
-    FAIL=$((FAIL+1))
-  fi
-}
-
-assert_contains() {
-  local label="$1" haystack="$2" needle="$3"
-  if echo "$haystack" | grep -qF "$needle"; then
-    echo "  PASS — $label"
-    PASS=$((PASS+1))
-  else
-    echo "  FAIL — $label"
-    echo "         needle:   $needle"
-    echo "         haystack: $haystack"
-    FAIL=$((FAIL+1))
-  fi
-}
-
-assert_not_contains() {
-  local label="$1" haystack="$2" needle="$3"
-  if ! echo "$haystack" | grep -qF "$needle"; then
-    echo "  PASS — $label"
-    PASS=$((PASS+1))
-  else
-    echo "  FAIL — $label (unexpected match)"
-    echo "         needle:   $needle"
-    echo "         haystack: $haystack"
-    FAIL=$((FAIL+1))
-  fi
-}
-
-# ── Pre-sweep: remove any stale leftover workspaces from a prior aborted run ──
-echo "=== Setup ==="
-for NAME in "Abilities Sender" "Abilities Receiver"; do
-  PRIOR=$(curl -s "$BASE/workspaces" | python3 -c "
-import json, sys
-try:
-    print(' '.join(w['id'] for w in json.load(sys.stdin) if w.get('name') == '$NAME'))
-except Exception:
-    pass
-")
-  for _wid in $PRIOR; do
-    echo "Sweeping leftover '$NAME' workspace: $_wid"
-    curl -s -X DELETE "$BASE/workspaces/$_wid?confirm=true" > /dev/null || true
-  done
-done
-
-R=$(curl -s -X POST "$BASE/workspaces" -H "Content-Type: application/json" \
-  -d '{"name":"Abilities Sender","tier":1}')
-SENDER_ID=$(echo "$R" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])' 2>/dev/null || true)
-[ -n "$SENDER_ID" ] || { echo "Failed to create sender workspace: $R"; exit 1; }
-echo "Created sender   workspace: $SENDER_ID"
-
-R=$(curl -s -X POST "$BASE/workspaces" -H "Content-Type: application/json" \
-  -d '{"name":"Abilities Receiver","tier":1}')
-RECEIVER_ID=$(echo "$R" | python3 -c 'import json,sys;print(json.load(sys.stdin)["id"])' 2>/dev/null || true)
-[ -n "$RECEIVER_ID" ] || { echo "Failed to create receiver workspace: $R"; exit 1; }
-echo "Created receiver workspace: $RECEIVER_ID"
-
-# Mint workspace-scoped bearer tokens (test-only endpoint, disabled in prod).
-SENDER_TOKEN=$(e2e_mint_test_token "$SENDER_ID")
-[ -n "$SENDER_TOKEN" ] || { echo "Failed to mint sender token"; exit 1; }
-SENDER_AUTH="Authorization: Bearer $SENDER_TOKEN"
-
-# Admin token — any live workspace bearer satisfies AdminAuth in local dev.
-# In production-like envs, set MOLECULE_ADMIN_TOKEN.
-ADMIN_TOKEN="${MOLECULE_ADMIN_TOKEN:-$SENDER_TOKEN}"
-ADMIN_AUTH="Authorization: Bearer $ADMIN_TOKEN"
-
-# ─────────────────────────────────────────────────────────────────────────────
-echo ""
-echo "=== Part 1: talk_to_user ability ==="
-
-echo ""
-echo "--- 1a: /notify works with default talk_to_user_enabled=true ---"
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST "$BASE/workspaces/$SENDER_ID/notify" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":"Hello from sender"}')
-assert "POST /notify returns 200 when talk_to_user_enabled=true (default)" "$CODE" "200"
-
-echo ""
-echo "--- 1b: Disable talk_to_user ---"
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X PATCH "$BASE/workspaces/$SENDER_ID/abilities" \
-  -H "Content-Type: application/json" -H "$ADMIN_AUTH" \
-  -d '{"talk_to_user_enabled": false}')
-assert "PATCH /abilities talk_to_user_enabled=false returns 200" "$CODE" "200"
-
-# Verify the flag is reflected in the workspace GET response.
-WS=$(curl -s "$BASE/workspaces/$SENDER_ID" -H "$SENDER_AUTH")
-FLAG=$(echo "$WS" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("talk_to_user_enabled","MISSING"))')
-assert "GET /workspaces/:id reflects talk_to_user_enabled=false" "$FLAG" "False"
-
-echo ""
-echo "--- 1c: /notify blocked when talk_to_user disabled ---"
-BODY=$(curl -s -w "" -X POST "$BASE/workspaces/$SENDER_ID/notify" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":"Should be blocked"}')
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST "$BASE/workspaces/$SENDER_ID/notify" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":"Should be blocked"}')
-assert "POST /notify returns 403 when talk_to_user_enabled=false" "$CODE" "403"
-
-ERR=$(echo "$BODY" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("error",""))' 2>/dev/null || echo "")
-assert_contains "403 body contains talk_to_user_disabled error code" "$ERR" "talk_to_user_disabled"
-
-HINT=$(echo "$BODY" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("hint",""))' 2>/dev/null || echo "")
-assert_contains "403 body contains delegate_task hint" "$HINT" "delegate_task"
-
-echo ""
-echo "--- 1d: Re-enable talk_to_user and verify /notify works again ---"
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X PATCH "$BASE/workspaces/$SENDER_ID/abilities" \
-  -H "Content-Type: application/json" -H "$ADMIN_AUTH" \
-  -d '{"talk_to_user_enabled": true}')
-assert "PATCH /abilities talk_to_user_enabled=true returns 200" "$CODE" "200"
-
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST "$BASE/workspaces/$SENDER_ID/notify" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":"Re-enabled, should work"}')
-assert "POST /notify returns 200 after re-enabling talk_to_user" "$CODE" "200"
-
-# ─────────────────────────────────────────────────────────────────────────────
-echo ""
-echo "=== Part 2: broadcast ability ==="
-
-echo ""
-echo "--- 2a: Broadcast blocked by default (broadcast_enabled=false) ---"
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST "$BASE/workspaces/$SENDER_ID/broadcast" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":"Should be blocked"}')
-assert "POST /broadcast returns 403 when broadcast_enabled=false (default)" "$CODE" "403"
-
-echo ""
-echo "--- 2b: Enable broadcast ---"
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X PATCH "$BASE/workspaces/$SENDER_ID/abilities" \
-  -H "Content-Type: application/json" -H "$ADMIN_AUTH" \
-  -d '{"broadcast_enabled": true}')
-assert "PATCH /abilities broadcast_enabled=true returns 200" "$CODE" "200"
-
-WS=$(curl -s "$BASE/workspaces/$SENDER_ID" -H "$SENDER_AUTH")
-FLAG=$(echo "$WS" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("broadcast_enabled","MISSING"))')
-assert "GET /workspaces/:id reflects broadcast_enabled=true" "$FLAG" "True"
-
-echo ""
-echo "--- 2c: Successful broadcast fan-out ---"
-BCAST=$(curl -s -X POST "$BASE/workspaces/$SENDER_ID/broadcast" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":"Org-wide notice: scheduled maintenance in 5 minutes."}')
-BSTATUS=$(echo "$BCAST" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("status",""))' 2>/dev/null || echo "")
-BDELIVERED=$(echo "$BCAST" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("delivered","-1"))' 2>/dev/null || echo "-1")
-assert "POST /broadcast returns status=sent" "$BSTATUS" "sent"
-
-# delivered count must be >= 1 (the receiver workspace).
-echo "  INFO — broadcast delivered=$BDELIVERED"
-if python3 -c "import sys; sys.exit(0 if int('$BDELIVERED') >= 1 else 1)" 2>/dev/null; then
-  echo "  PASS — delivered count >= 1"
-  PASS=$((PASS+1))
-else
-  echo "  FAIL — expected delivered >= 1, got $BDELIVERED"
-  FAIL=$((FAIL+1))
-fi
-
-echo ""
-echo "--- 2d: Receiver activity log has broadcast_receive entry ---"
-RECEIVER_TOKEN=$(e2e_mint_test_token "$RECEIVER_ID")
-[ -n "$RECEIVER_TOKEN" ] || { echo "Failed to mint receiver token"; exit 1; }
-RECEIVER_AUTH="Authorization: Bearer $RECEIVER_TOKEN"
-
-ACT=$(curl -s -H "$RECEIVER_AUTH" "$BASE/workspaces/$RECEIVER_ID/activity?source=agent&limit=20")
-ROW=$(echo "$ACT" | python3 -c '
-import json, sys
-rows = json.load(sys.stdin) or []
-for r in rows:
-    if r.get("activity_type") == "broadcast_receive":
-        print(json.dumps(r))
-        break
-')
-[ -n "$ROW" ] || {
-  echo "  FAIL — could not find broadcast_receive row in receiver activity"
-  FAIL=$((FAIL+1))
-}
-
-if [ -n "$ROW" ]; then
-  # Message is stored in summary field.
-  MSG=$(echo "$ROW" | python3 -c 'import json,sys;r=json.load(sys.stdin);print(r.get("summary",""))')
-  assert_contains "broadcast_receive row summary has original message" "$MSG" "scheduled maintenance"
-  # Sender ID is stored in source_id field.
-  SRC=$(echo "$ROW" | python3 -c 'import json,sys;r=json.load(sys.stdin);print(r.get("source_id",""))')
-  assert "broadcast_receive row source_id is sender workspace" "$SRC" "$SENDER_ID"
-fi
-
-echo ""
-echo "--- 2e: Sender activity log has broadcast_sent entry ---"
-ACT_SENDER=$(curl -s -H "$SENDER_AUTH" "$BASE/workspaces/$SENDER_ID/activity?limit=20")
-SENT_ROW=$(echo "$ACT_SENDER" | python3 -c '
-import json, sys
-rows = json.load(sys.stdin) or []
-for r in rows:
-    if r.get("activity_type") == "broadcast_sent":
-        print(json.dumps(r))
-        break
-')
-[ -n "$SENT_ROW" ] || {
-  echo "  FAIL — could not find broadcast_sent row in sender activity"
-  FAIL=$((FAIL+1))
-}
-
-if [ -n "$SENT_ROW" ]; then
-  # Delivered count is baked into the summary field (no response_body for sender row).
-  SUMMARY=$(echo "$SENT_ROW" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("summary",""))')
-  assert_contains "broadcast_sent summary mentions workspace count" "$SUMMARY" "workspace"
-fi
-
-echo ""
-echo "--- 2f: Sender does NOT receive a broadcast_receive entry ---"
-SELF_RECV=$(echo "$ACT_SENDER" | python3 -c '
-import json, sys
-rows = json.load(sys.stdin) or []
-for r in rows:
-    if r.get("activity_type") == "broadcast_receive":
-        print("found")
-        break
-')
-assert_not_contains "sender has no broadcast_receive in own activity log" "${SELF_RECV:-}" "found"
-
-# ─────────────────────────────────────────────────────────────────────────────
-echo ""
-echo "--- 2g: Empty message is rejected ---"
-CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST "$BASE/workspaces/$SENDER_ID/broadcast" \
-  -H "Content-Type: application/json" -H "$SENDER_AUTH" \
-  -d '{"message":""}')
-assert "POST /broadcast with empty message returns 400" "$CODE" "400"
-
-echo ""
-echo "--- 2h: Partial PATCH does not clobber other flags ---"
-# Set talk_to_user=false, then patch only broadcast — talk_to_user must stay false.
-curl -s -o /dev/null -X PATCH "$BASE/workspaces/$SENDER_ID/abilities" \
-  -H "Content-Type: application/json" -H "$ADMIN_AUTH" \
-  -d '{"talk_to_user_enabled": false}'
-curl -s -o /dev/null -X PATCH "$BASE/workspaces/$SENDER_ID/abilities" \
-  -H "Content-Type: application/json" -H "$ADMIN_AUTH" \
-  -d '{"broadcast_enabled": false}'
-WS=$(curl -s "$BASE/workspaces/$SENDER_ID" -H "$SENDER_AUTH")
-TUF=$(echo "$WS" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("talk_to_user_enabled","MISSING"))')
-BEF=$(echo "$WS" | python3 -c 'import json,sys;print(json.load(sys.stdin).get("broadcast_enabled","MISSING"))')
-assert "partial PATCH preserves talk_to_user_enabled=false" "$TUF" "False"
-assert "partial PATCH sets broadcast_enabled=false" "$BEF" "False"
-
-# ─────────────────────────────────────────────────────────────────────────────
-echo ""
-echo "=== Results: $PASS passed, $FAIL failed ==="
-[ "$FAIL" -eq 0 ]
@@ -194,12 +194,7 @@ func (h *WorkspaceHandler) maybeMarkContainerDead(ctx context.Context, workspace
 	}
 	db.ClearWorkspaceKeys(ctx, workspaceID)
 	h.broadcaster.RecordAndBroadcast(ctx, string(events.EventWorkspaceOffline), workspaceID, map[string]interface{}{})
-	// Tracked via goAsync (not bare `go`) so the asyncWG can be drained
-	// before a test swaps the global db.DB. runRestartCycle reads db.DB
-	// before its provisioner gate, so an untracked detached goroutine
-	// races setupTestDB's t.Cleanup db.DB restore. Matches the already-
-	// correct site at a2a_proxy.go:648.
-	h.goAsync(func() { h.RestartByID(workspaceID) })
+	go h.RestartByID(workspaceID)
 	return true
 }

@@ -246,10 +241,7 @@ func (h *WorkspaceHandler) preflightContainerHealth(ctx context.Context, workspa
 	}
 	db.ClearWorkspaceKeys(ctx, workspaceID)
 	h.broadcaster.RecordAndBroadcast(ctx, string(events.EventWorkspaceOffline), workspaceID, map[string]interface{}{})
-	// Tracked via goAsync (see maybeMarkContainerDead): preflight's
-	// detached restart must be drainable so it doesn't race the global
-	// db.DB swap in test cleanup.
-	h.goAsync(func() { h.RestartByID(workspaceID) })
+	go h.RestartByID(workspaceID)
 	return &proxyA2AError{
 		Status: http.StatusServiceUnavailable,
 		Response: gin.H{
@@ -270,8 +262,7 @@ func (h *WorkspaceHandler) logA2AFailure(ctx context.Context, workspaceID, calle
 		errWsName = workspaceID
 	}
 	summary := "A2A request to " + errWsName + " failed: " + errMsg
-	parent := ctx
-	h.goAsync(func() {
+	go func(parent context.Context) {
 		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
 		defer cancel()
 		LogActivity(logCtx, h.broadcaster, ActivityParams{
@@ -286,7 +277,7 @@ func (h *WorkspaceHandler) logA2AFailure(ctx context.Context, workspaceID, calle
 			Status:       "error",
 			ErrorDetail:  &errMsg,
 		})
-	})
+	}(ctx)
 }

 // logA2ASuccess records a successful A2A round-trip and (for canvas-initiated
@@ -307,19 +298,18 @@ func (h *WorkspaceHandler) logA2ASuccess(ctx context.Context, workspaceID, calle
 	// silent workspaces. Only update when callerID is a real workspace (not
 	// canvas, not a system caller) and the target returned 2xx/3xx.
 	if callerID != "" && !isSystemCaller(callerID) && statusCode < 400 {
-		h.goAsync(func() {
+		go func() {
 			bgCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 			defer cancel()
 			if _, err := db.DB.ExecContext(bgCtx,
 				`UPDATE workspaces SET last_outbound_at = NOW() WHERE id = $1`, callerID); err != nil {
 				log.Printf("last_outbound_at update failed for %s: %v", callerID, err)
 			}
-		})
+		}()
 	}
 	summary := a2aMethod + " → " + wsNameForLog
 	toolTrace := extractToolTrace(respBody)
-	parent := ctx
-	h.goAsync(func() {
+	go func(parent context.Context) {
 		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
 		defer cancel()
 		LogActivity(logCtx, h.broadcaster, ActivityParams{
@@ -335,7 +325,7 @@ func (h *WorkspaceHandler) logA2ASuccess(ctx context.Context, workspaceID, calle
 			DurationMs:   &durationMs,
 			Status:       logStatus,
 		})
-	})
+	}(ctx)

 	if callerID == "" && statusCode < 400 {
 		h.broadcaster.BroadcastOnly(workspaceID, string(events.EventA2AResponse), map[string]interface{}{
@@ -520,8 +510,7 @@ func (h *WorkspaceHandler) logA2AReceiveQueued(ctx context.Context, workspaceID,
 		wsName = workspaceID
 	}
 	summary := a2aMethod + " → " + wsName + " (queued for poll)"
-	parent := ctx
-	h.goAsync(func() {
+	go func(parent context.Context) {
 		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
 		defer cancel()
 		LogActivity(logCtx, h.broadcaster, ActivityParams{
@@ -534,7 +523,7 @@ func (h *WorkspaceHandler) logA2AReceiveQueued(ctx context.Context, workspaceID,
 			RequestBody:  json.RawMessage(body),
 			Status:       "ok",
 		})
-	})
+	}(ctx)
 }

 // readUsageMap extracts input_tokens / output_tokens from the "usage" key of m.
@@ -1,16 +1,7 @@
 package handlers

 import (
-	"context"
-	"database/sql"
-	"encoding/json"
-	"errors"
-	"net/http"
-	"net/http/httptest"
 	"testing"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/gin-gonic/gin"
 )

 // TestExtractExpiresInSeconds covers the JSON parser used at enqueue time
@@ -67,597 +58,3 @@ func TestExtractExpiresInSeconds(t *testing.T) {
 		})
 	}
 }
-
-// ─── QueueDepth ─────────────────────────────────────────────────────────────
-
-// TestQueueDepth_Success verifies QueueDepth returns the COUNT of queued items
-// for a workspace.
-func TestQueueDepth_Success(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT COUNT\(\*\) FROM a2a_queue WHERE workspace_id = \$1 AND status = 'queued'`).
-		WithArgs("ws-queue-depth-1").
-		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(7))
-
-	got := QueueDepth(context.Background(), "ws-queue-depth-1")
-	if got != 7 {
-		t.Errorf("QueueDepth() = %d; want 7", got)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestQueueDepth_EmptyQueue returns 0 when no queued items exist.
-func TestQueueDepth_EmptyQueue(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT COUNT\(\*\) FROM a2a_queue WHERE workspace_id = \$1 AND status = 'queued'`).
-		WithArgs("ws-empty").
-		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(0))
-
-	got := QueueDepth(context.Background(), "ws-empty")
-	if got != 0 {
-		t.Errorf("QueueDepth() = %d; want 0", got)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestQueueDepth_QueryError returns 0 on DB error (non-fatal; caller only uses
-// the count for display purposes).
-func TestQueueDepth_QueryError_ReturnsZero(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT COUNT\(\*\) FROM a2a_queue WHERE workspace_id = \$1 AND status = 'queued'`).
-		WithArgs("ws-err").
-		WillReturnError(errors.New("connection refused"))
-
-	// QueueDepth swallows the error and returns 0.
-	got := QueueDepth(context.Background(), "ws-err")
-	if got != 0 {
-		t.Errorf("QueueDepth() on error = %d; want 0", got)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// ─── QueueStatusByID ────────────────────────────────────────────────────────
-
-// TestQueueStatusByID_Success verifies QueueStatusByID returns a fully-populated
-// QueueStatus from the LEFT JOIN of a2a_queue and activity_logs.
-func TestQueueStatusByID_Success(t *testing.T) {
-	mock := setupTestDB(t)
-
-	// The LEFT JOIN query returns all queue columns + NULL for activity_logs
-	// when no delegation row exists.
-	mock.ExpectQuery(`SELECT\s+q\.id,\s+q\.workspace_id,\s+q\.status,\s+q\.priority,\s+q\.attempts,\s+q\.last_error,\s+q\.enqueued_at::text,\s+q\.dispatched_at::text,\s+q\.completed_at::text,\s+q\.expires_at::text,\s+al\.response_body::text\s+FROM a2a_queue q\s+LEFT JOIN activity_logs al`).
-		WithArgs("queue-ok-1").
-		WillReturnRows(sqlmock.NewRows([]string{
-			"id", "workspace_id", "status", "priority", "attempts",
-			"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
-			"response_body",
-		}).AddRow(
-			"queue-ok-1", "ws-1", "queued", 50, 1,
-			nil, "2026-05-16T10:00:00Z", nil, nil, "2026-05-16T12:00:00Z",
-			nil,
-		))
-
-	qs, err := QueueStatusByID(context.Background(), "queue-ok-1")
-	if err != nil {
-		t.Fatalf("QueueStatusByID() error = %v; want nil", err)
-	}
-	if qs.ID != "queue-ok-1" {
-		t.Errorf("ID = %q; want queue-ok-1", qs.ID)
-	}
-	if qs.WorkspaceID != "ws-1" {
-		t.Errorf("WorkspaceID = %q; want ws-1", qs.WorkspaceID)
-	}
-	if qs.Status != "queued" {
-		t.Errorf("Status = %q; want queued", qs.Status)
-	}
-	if qs.Priority != 50 {
-		t.Errorf("Priority = %d; want 50", qs.Priority)
-	}
-	if qs.Attempts != 1 {
-		t.Errorf("Attempts = %d; want 1", qs.Attempts)
-	}
-	if qs.LastError != nil {
-		t.Errorf("LastError = %v; want nil", qs.LastError)
-	}
-	if qs.EnqueuedAt != "2026-05-16T10:00:00Z" {
-		t.Errorf("EnqueuedAt = %q; want 2026-05-16T10:00:00Z", qs.EnqueuedAt)
-	}
-	if qs.DispatchedAt != nil {
-		t.Errorf("DispatchedAt = %v; want nil", qs.DispatchedAt)
-	}
-	if qs.CompletedAt != nil {
-		t.Errorf("CompletedAt = %v; want nil", qs.CompletedAt)
-	}
-	if *qs.ExpiresAt != "2026-05-16T12:00:00Z" {
-		t.Errorf("ExpiresAt = %v; want 2026-05-16T12:00:00Z", qs.ExpiresAt)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestQueueStatusByID_CompletedWithResponse verifies that a completed queue item
-// populates ResponseBody from the LEFT JOINed activity_logs row.
-func TestQueueStatusByID_CompletedWithResponse(t *testing.T) {
-	mock := setupTestDB(t)
-
-	respBody := `{"result":"done"}`
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("queue-done-1").
-		WillReturnRows(sqlmock.NewRows([]string{
-			"id", "workspace_id", "status", "priority", "attempts",
-			"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
-			"response_body",
-		}).AddRow(
-			"queue-done-1", "ws-1", "completed", 50, 1,
-			nil, "2026-05-16T10:00:00Z", "2026-05-16T10:01:00Z", "2026-05-16T10:02:00Z", nil,
-			respBody,
-		))
-
-	qs, err := QueueStatusByID(context.Background(), "queue-done-1")
-	if err != nil {
-		t.Fatalf("QueueStatusByID() error = %v; want nil", err)
-	}
-	if qs.Status != "completed" {
-		t.Errorf("Status = %q; want completed", qs.Status)
-	}
-	if qs.ResponseBody == nil {
-		t.Fatal("ResponseBody = nil; want non-nil for completed item")
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(qs.ResponseBody, &resp); err != nil {
-		t.Fatalf("ResponseBody not valid JSON: %v", err)
-	}
-	if resp["result"] != "done" {
-		t.Errorf("ResponseBody result = %v; want done", resp["result"])
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestQueueStatusByID_ErrNoRows returns sql.ErrNoRows when the queue ID doesn't exist.
-func TestQueueStatusByID_ErrNoRows(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("queue-missing").
-		WillReturnError(sql.ErrNoRows)
-
-	_, err := QueueStatusByID(context.Background(), "queue-missing")
-	if !errors.Is(err, sql.ErrNoRows) {
-		t.Errorf("QueueStatusByID() error = %v; want sql.ErrNoRows", err)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestQueueStatusByID_QueryError propagates DB errors as-is.
-func TestQueueStatusByID_QueryError(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("queue-err").
-		WillReturnError(errors.New("connection refused"))
-
-	_, err := QueueStatusByID(context.Background(), "queue-err")
-	if err == nil {
-		t.Fatal("QueueStatusByID() error = nil; want non-nil")
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// ─── GetA2AQueueStatus (HTTP handler) ─────────────────────────────────────
-
-func newGetA2AQueueStatusHarness(t *testing.T) (sqlmock.Sqlmock, *httptest.ResponseRecorder, *gin.Context) {
-	mock := setupTestDB(t)
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	return mock, w, c
-}
-
-func TestGetA2AQueueStatus_MissingQueueID_Returns400(t *testing.T) {
-	_, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: ""}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d: %s", w.Code, w.Body.String())
-	}
-}
-
-func TestGetA2AQueueStatus_NoIdentity_Returns404(t *testing.T) {
-	_, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-123"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	// Returns 404 (not 401) per the existence-non-inference policy.
-	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d: %s", w.Code, w.Body.String())
-	}
-}
-
-func TestGetA2AQueueStatus_QueueNotFound_Returns404(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-404"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-1")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-404").
-		WillReturnError(sql.ErrNoRows)
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-func TestGetA2AQueueStatus_UnauthorizedCaller_Returns404(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-unauth"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-wrong")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-unauth").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-caller-a", "ws-target-b"))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	// Returns 404 per the existence-non-inference policy.
-	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-func TestGetA2AQueueStatus_AuthorizedAsTarget_Success(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-ok"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-target")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-ok").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-caller", "ws-target"))
-
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("q-ok").
-		WillReturnRows(sqlmock.NewRows([]string{
-			"id", "workspace_id", "status", "priority", "attempts",
-			"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
-			"response_body",
-		}).AddRow(
-			"q-ok", "ws-target", "queued", 50, 1,
-			nil, "2026-05-16T10:00:00Z", nil, nil, nil,
-			nil,
-		))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var qs QueueStatus
-	if err := json.Unmarshal(w.Body.Bytes(), &qs); err != nil {
-		t.Fatalf("body parse: %v", err)
-	}
-	if qs.ID != "q-ok" {
-		t.Errorf("queue_id = %q; want q-ok", qs.ID)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-func TestGetA2AQueueStatus_QueueRowLookupError_Returns500(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-lookup-err"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-1")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-lookup-err").
-		WillReturnError(errors.New("connection refused"))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusInternalServerError {
-		t.Errorf("expected 500, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-func TestGetA2AQueueStatus_StatusFetchError_Returns500(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-status-err"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-1")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-status-err").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-1", "ws-1"))
-
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("q-status-err").
-		WillReturnError(errors.New("connection refused"))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusInternalServerError {
-		t.Errorf("expected 500, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// ─── queueRowAuthFields (internal helper) ─────────────────────────────────────
-// Covers the auth-only 2-col SELECT used by GetA2AQueueStatus to determine
-// whether the caller has access before projecting the public status fields.
-
-func TestQueueRowAuthFields_Success_BothPresent(t *testing.T) {
-	mock := setupTestDB(t)
-
-	queueID := "qqqqqqqq-0003-0003-0003-000000000003"
-	rows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-		AddRow("ws-caller-3", "ws-target-3")
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs(queueID).
-		WillReturnRows(rows)
-
-	callerID, workspaceID, err := queueRowAuthFields(context.Background(), queueID)
-
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if callerID != "ws-caller-3" {
-		t.Errorf("callerID = %q, want %q", callerID, "ws-caller-3")
-	}
-	if workspaceID != "ws-target-3" {
-		t.Errorf("workspaceID = %q, want %q", workspaceID, "ws-target-3")
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet sqlmock expectations: %v", err)
-	}
-}
-
-func TestQueueRowAuthFields_NoRows_ReturnsErrNoRows(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("qqqqqqqq-missing").
-		WillReturnError(sql.ErrNoRows)
-
-	_, _, err := queueRowAuthFields(context.Background(), "qqqqqqqq-missing")
-
-	if !errors.Is(err, sql.ErrNoRows) {
-		t.Errorf("expected sql.ErrNoRows, got %v", err)
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet sqlmock expectations: %v", err)
-	}
-}
-
-func TestQueueRowAuthFields_QueryError_ReturnsError(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("qqqqqqqq-dberr").
-		WillReturnError(sql.ErrConnDone)
-
-	_, _, err := queueRowAuthFields(context.Background(), "qqqqqqqq-dberr")
-
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	if errors.Is(err, sql.ErrNoRows) {
-		t.Error("expected non-no-rows error, got sql.ErrNoRows")
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet sqlmock expectations: %v", err)
-	}
-}
-
-// ─── Additional GetA2AQueueStatus coverage ─────────────────────────────────────
-
-// TestGetA2AQueueStatus_AuthPass_CallerMatchesCallerID verifies that a caller
-// whose workspace matches queue.caller_id (not just workspace_id) passes auth
-// and receives the status. This path is distinct from the existing "authorized
-// as target" test which covers workspace_id = caller.
-func TestGetA2AQueueStatus_AuthPass_CallerMatchesCallerID(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-caller-match"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-caller-match")
-
-	// Queue row: ws-caller-match is the caller, ws-other-target is the target.
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-caller-match").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-caller-match", "ws-other-target"))
-
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("q-caller-match").
-		WillReturnRows(sqlmock.NewRows([]string{
-			"id", "workspace_id", "status", "priority", "attempts",
-			"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
-			"response_body",
-		}).AddRow(
-			"q-caller-match", "ws-other-target", "queued", 50, 0,
-			nil, "2026-05-16T10:00:00Z", nil, nil, nil,
-			nil,
-		))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var qs QueueStatus
-	json.Unmarshal(w.Body.Bytes(), &qs)
-	if qs.ID != "q-caller-match" {
-		t.Errorf("queue_id = %q; want q-caller-match", qs.ID)
-	}
-	if qs.Status != "queued" {
-		t.Errorf("status = %q; want queued", qs.Status)
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestGetA2AQueueStatus_AuthPass_OrgTokenBypassesAuth verifies that an org-level
-// token (canvas/admin) bypasses the caller_id / workspace_id match entirely.
-// No X-Workspace-ID header is required; org_token_id in context is sufficient.
-func TestGetA2AQueueStatus_AuthPass_OrgTokenBypassesAuth(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-org-bypass"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	// No X-Workspace-ID header — org token is set via context instead.
-	c.Set("org_token_id", "org-admin-1")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-org-bypass").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-anyone", "ws-anyone"))
-
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("q-org-bypass").
-		WillReturnRows(sqlmock.NewRows([]string{
-			"id", "workspace_id", "status", "priority", "attempts",
-			"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
-			"response_body",
-		}).AddRow(
-			"q-org-bypass", "ws-anyone", "queued", 25, 0,
-			nil, "2026-05-16T10:00:00Z", nil, nil, nil,
-			nil,
-		))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestGetA2AQueueStatus_StatusQueryNoRows_NotFound covers the theoretical race:
-// queue row exists (auth check passes), but is deleted before QueueStatusByID runs.
-// Handler returns 404 (not 500) — matching the existence-non-inference policy.
-func TestGetA2AQueueStatus_StatusQueryNoRows_NotFound(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-race-no-rows"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-caller")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-race-no-rows").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-caller", "ws-target"))
-
-	// Status query returns no rows — row was deleted between auth check and status fetch.
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("q-race-no-rows").
-		WillReturnError(sql.ErrNoRows)
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d: %s", w.Code, w.Body.String())
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
-
-// TestGetA2AQueueStatus_ResponseBodyIncludedWhenCompleted confirms that a completed
-// queue item surfaces response_body from activity_logs in the HTTP response body.
-func TestGetA2AQueueStatus_ResponseBodyIncludedWhenCompleted(t *testing.T) {
-	mock, w, c := newGetA2AQueueStatusHarness(t)
-	c.Params = gin.Params{{Key: "id", Value: "ws-1"}, {Key: "queue_id", Value: "q-completed-body"}}
-	c.Request = httptest.NewRequest("GET", "/", nil)
-	c.Request.Header.Set("X-Workspace-ID", "ws-caller")
-
-	mock.ExpectQuery(`SELECT caller_id, workspace_id FROM a2a_queue WHERE id = \$1`).
-		WithArgs("q-completed-body").
-		WillReturnRows(sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
-			AddRow("ws-caller", "ws-target"))
-
-	respBody := `{"result":{"status":"ok","reply":"hello world"}}`
-	mock.ExpectQuery(`SELECT\s+q\.id`).
-		WithArgs("q-completed-body").
-		WillReturnRows(sqlmock.NewRows([]string{
-			"id", "workspace_id", "status", "priority", "attempts",
-			"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
-			"response_body",
-		}).AddRow(
-			"q-completed-body", "ws-target", "completed", 50, 1,
-			nil, "2026-05-16T10:00:00Z", "2026-05-16T10:01:00Z", "2026-05-16T10:02:00Z", nil,
-			respBody,
-		))
-
-	h := newHandlerWithTestDeps(t)
-	h.GetA2AQueueStatus(c)
-
-	if w.Code != http.StatusOK {
-		t.Fatalf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var qs QueueStatus
-	json.Unmarshal(w.Body.Bytes(), &qs)
-	if qs.ResponseBody == nil {
-		t.Fatal("ResponseBody should be set for completed status")
-	}
-	if string(qs.ResponseBody) != respBody {
-		t.Errorf("ResponseBody = %q, want %q", string(qs.ResponseBody), respBody)
-	}
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet: %v", err)
-	}
-}
@@ -482,13 +482,6 @@ func (h *ActivityHandler) Notify(c *gin.Context) {
 			c.JSON(http.StatusNotFound, gin.H{"error": "workspace not found"})
 			return
 		}
-		if errors.Is(err, ErrTalkToUserDisabled) {
-			c.JSON(http.StatusForbidden, gin.H{
-				"error": "talk_to_user_disabled",
-				"hint":  "This workspace is not allowed to send messages directly to the user. Forward your update to a parent workspace using delegate_task — they may be able to reach the user.",
-			})
-			return
-		}
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "internal error"})
 		return
 	}
@@ -464,9 +464,9 @@ func TestNotify_PersistsToActivityLogsForReloadRecovery(t *testing.T) {
 	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })

 	// Workspace existence check
-	mock.ExpectQuery(`SELECT name, talk_to_user_enabled FROM workspaces`).
+	mock.ExpectQuery(`SELECT name FROM workspaces`).
 		WithArgs("ws-notify").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("DD", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("DD"))

 	// Persistence INSERT — verify shape
 	mock.ExpectExec(`INSERT INTO activity_logs`).
@@ -511,9 +511,9 @@ func TestNotify_WithAttachments_PersistsFilePartsForReload(t *testing.T) {
 	db.DB = mockDB
 	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })

-	mock.ExpectQuery(`SELECT name, talk_to_user_enabled FROM workspaces`).
+	mock.ExpectQuery(`SELECT name FROM workspaces`).
 		WithArgs("ws-attach").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("DD", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("DD"))

 	// Capture the JSONB arg so we can assert on the persisted shape
 	// AFTER the call (must include parts[].kind=file so reload
@@ -640,9 +640,9 @@ func TestNotify_DBFailure_StillBroadcastsAnd200(t *testing.T) {
 	db.DB = mockDB
 	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })

-	mock.ExpectQuery(`SELECT name, talk_to_user_enabled FROM workspaces`).
+	mock.ExpectQuery(`SELECT name FROM workspaces`).
 		WithArgs("ws-x").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("DD", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("DD"))
 	mock.ExpectExec(`INSERT INTO activity_logs`).
 		WillReturnError(fmt.Errorf("simulated db hiccup"))

@@ -54,11 +54,6 @@ import (
 // timeout) surface as wrapped errors and should be treated as 503.
 var ErrWorkspaceNotFound = errors.New("agent_message: workspace not found")

-// ErrTalkToUserDisabled is returned when the workspace has
-// talk_to_user_enabled=false. Callers surface HTTP 403 so the Python tool
-// can detect it and suggest forwarding to a parent workspace.
-var ErrTalkToUserDisabled = errors.New("agent_message: talk_to_user disabled")
-
 // AgentMessageAttachment is one file attached to an agent → user
 // message. Identical to handlers.NotifyAttachment in field set; kept
 // distinct so the writer's API doesn't import a handler type with HTTP
@@ -112,20 +107,16 @@ func (w *AgentMessageWriter) Send(
 	// notify call surfaced as "workspace not found" and masked real
 	// incidents in the alert path.
 	var wsName string
-	var talkToUserEnabled bool
 	err := w.db.QueryRowContext(ctx,
-		`SELECT name, talk_to_user_enabled FROM workspaces WHERE id = $1 AND status != 'removed'`,
+		`SELECT name FROM workspaces WHERE id = $1 AND status != 'removed'`,
 		workspaceID,
-	).Scan(&wsName, &talkToUserEnabled)
+	).Scan(&wsName)
 	if errors.Is(err, sql.ErrNoRows) {
 		return ErrWorkspaceNotFound
 	}
 	if err != nil {
 		return fmt.Errorf("agent_message: workspace lookup: %w", err)
 	}
-	if !talkToUserEnabled {
-		return ErrTalkToUserDisabled
-	}

 	// 2. Build broadcast payload + WS-emit. Same shape that ChatTab's
 	//    AGENT_MESSAGE handler in canvas/src/store/canvas-events.ts has
@@ -88,9 +88,9 @@ func TestAgentMessageWriter_Send_Success_NoAttachments(t *testing.T) {
 	mock := setupTestDB(t)
 	w := NewAgentMessageWriter(db.DB, newTestBroadcaster())

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-1").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("CEO Ryan PC", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("CEO Ryan PC"))

 	mock.ExpectExec(`INSERT INTO activity_logs.*'a2a_receive'.*'notify'`).
 		WithArgs(
@@ -116,9 +116,9 @@ func TestAgentMessageWriter_Send_Success_WithAttachments(t *testing.T) {
 	mock := setupTestDB(t)
 	w := NewAgentMessageWriter(db.DB, newTestBroadcaster())

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-att").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("Ryan", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("Ryan"))

 	mock.ExpectExec(`INSERT INTO activity_logs.*'a2a_receive'.*'notify'`).
 		WithArgs(
@@ -173,9 +173,9 @@ func TestAgentMessageWriter_Send_WorkspaceNotFound(t *testing.T) {
 	emitter := &capturingEmitter{}
 	w := NewAgentMessageWriter(db.DB, emitter)

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-missing").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}))

 	err := w.Send(context.Background(), "ws-missing", "lost in the void", nil)
 	if !errors.Is(err, ErrWorkspaceNotFound) {
@@ -202,9 +202,9 @@ func TestAgentMessageWriter_Send_DBInsertFailureStillReturnsNil(t *testing.T) {
 	mock := setupTestDB(t)
 	w := NewAgentMessageWriter(db.DB, newTestBroadcaster())

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-dbfail").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("CEO Ryan PC", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("CEO Ryan PC"))

 	mock.ExpectExec(`INSERT INTO activity_logs`).
 		WillReturnError(errors.New("transient db error"))
@@ -223,9 +223,9 @@ func TestAgentMessageWriter_Send_PreviewTruncation(t *testing.T) {
 	mock := setupTestDB(t)
 	w := NewAgentMessageWriter(db.DB, newTestBroadcaster())

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-trunc").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("Ryan", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("Ryan"))

 	longMsg := strings.Repeat("x", 200)
 	mock.ExpectExec(`INSERT INTO activity_logs`).
@@ -263,9 +263,9 @@ func TestAgentMessageWriter_Send_BroadcastsAgentMessageEvent(t *testing.T) {
 	emitter := &capturingEmitter{}
 	w := NewAgentMessageWriter(db.DB, emitter)

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-bc").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("Workspace Name", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("Workspace Name"))
 	mock.ExpectExec(`INSERT INTO activity_logs`).
 		WillReturnResult(sqlmock.NewResult(1, 1))

@@ -315,7 +315,7 @@ func TestAgentMessageWriter_Send_DBErrorOnLookupReturnsWrapped(t *testing.T) {
 	w := NewAgentMessageWriter(db.DB, newTestBroadcaster())

 	transientErr := errors.New("connection refused")
-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-dbdown").
 		WillReturnError(transientErr)

@@ -350,9 +350,9 @@ func TestAgentMessageWriter_Send_NonASCIIMessagePersists(t *testing.T) {
 	// the byte-slice bug.
 	msg := strings.Repeat("你", 200)

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-cjk").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("CEO Ryan PC", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("CEO Ryan PC"))

 	mock.ExpectExec(`INSERT INTO activity_logs`).
 		WithArgs(
@@ -395,9 +395,9 @@ func TestAgentMessageWriter_Send_OmitsAttachmentsKeyWhenEmpty(t *testing.T) {
 	emitter := &capturingEmitter{}
 	w := NewAgentMessageWriter(db.DB, emitter)

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-noatt").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("X", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("X"))
 	mock.ExpectExec(`INSERT INTO activity_logs`).
 		WillReturnResult(sqlmock.NewResult(1, 1))

@@ -6,6 +6,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log"
 	"path/filepath"
 	"strings"

@@ -31,7 +32,9 @@ func (h *TemplatesHandler) findContainer(ctx context.Context, workspaceID string
 	}
 	// Also check by workspace name from DB
 	var wsName string
-	db.DB.QueryRowContext(ctx, `SELECT LOWER(REPLACE(name, ' ', '-')) FROM workspaces WHERE id = $1`, workspaceID).Scan(&wsName)
+	if err := db.DB.QueryRowContext(ctx, `SELECT LOWER(REPLACE(name, ' ', '-')) FROM workspaces WHERE id = $1`, workspaceID).Scan(&wsName); err != nil {
+		log.Printf("List: workspace name lookup for %s: %v", workspaceID, err)
+	}
 	if wsName != "" {
 		candidates = append(candidates, wsName)
 	}
@@ -230,21 +230,20 @@ func TestWorkspaceList_WithData(t *testing.T) {
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())

-	// 23 cols — broadcast_enabled + talk_to_user_enabled added after monthly_spend
-	// (migration 20260514). Column order must match scanWorkspaceRow exactly.
+	// 21 cols — see scanWorkspaceRow for order (max_concurrent_tasks
+	// lands between active_tasks and last_error_rate).
 	columns := []string{
 		"id", "name", "role", "tier", "status", "agent_card", "url",
 		"parent_id", "active_tasks", "max_concurrent_tasks",
 		"last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	rows := sqlmock.NewRows(columns).
 		AddRow("ws-1", "Agent One", "worker", 1, "online", []byte(`{"name":"agent1"}`), "http://localhost:8001",
-			nil, 3, 1, 0.02, "", 7200, "processing", "langgraph", "", 10.0, 20.0, false, nil, int64(0), false, true).
+			nil, 3, 1, 0.02, "", 7200, "processing", "langgraph", "", 10.0, 20.0, false, nil, int64(0)).
 		AddRow("ws-2", "Agent Two", "", 2, "degraded", []byte("null"), "",
-			nil, 0, 1, 0.6, "timeout", 100, "", "claude-code", "", 50.0, 60.0, true, nil, int64(0), false, true)
+			nil, 0, 1, 0.6, "timeout", 100, "", "claude-code", "", 50.0, 60.0, true, nil, int64(0))

 	mock.ExpectQuery("SELECT w.id, w.name").
 		WillReturnRows(rows)
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"sync"
 	"testing"
 	"time"

@@ -23,39 +22,8 @@ import (
 	"github.com/redis/go-redis/v9"
 )

-// liveTestHandlers tracks every WorkspaceHandler built during the test
-// binary's lifetime so setupTestDB can drain their in-flight goAsync
-// goroutines (notably the detached RestartByID restart cycle, which
-// reads the global db.DB) BEFORE restoring db.DB. Without this drain a
-// fire-and-forget restart goroutine spawned by one test outlives that
-// test and races the db.DB swap in a later test's t.Cleanup — the
-// 0x...d548 data race on platform/internal/db.DB.
-var (
-	liveTestHandlersMu sync.Mutex
-	liveTestHandlers   []*WorkspaceHandler
-)
-
 func init() {
 	gin.SetMode(gin.TestMode)
-	newHandlerHook = func(h *WorkspaceHandler) {
-		liveTestHandlersMu.Lock()
-		liveTestHandlers = append(liveTestHandlers, h)
-		liveTestHandlersMu.Unlock()
-	}
-}
-
-// drainTestAsync waits for every tracked handler's goAsync goroutines to
-// finish. Called from setupTestDB's cleanup before db.DB is restored so
-// no detached restart/provision goroutine is mid-read of db.DB when the
-// pointer is swapped.
-func drainTestAsync() {
-	liveTestHandlersMu.Lock()
-	handlers := make([]*WorkspaceHandler, len(liveTestHandlers))
-	copy(handlers, liveTestHandlers)
-	liveTestHandlersMu.Unlock()
-	for _, h := range handlers {
-		h.waitAsyncForTest()
-	}
 }

 // setupTestDB creates a sqlmock DB and assigns it to the global db.DB.
@@ -69,16 +37,7 @@ func setupTestDB(t *testing.T) sqlmock.Sqlmock {
 	}
 	prevDB := db.DB
 	db.DB = mockDB
-	t.Cleanup(func() {
-		// Drain detached async goroutines (e.g. goAsync(RestartByID),
-		// which reads db.DB in runRestartCycle before its provisioner
-		// gate) BEFORE swapping db.DB back. Doing the restore first
-		// would let an in-flight restart goroutine read db.DB while
-		// this line writes it — the data race this guards against.
-		drainTestAsync()
-		db.DB = prevDB
-		mockDB.Close()
-	})
+	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })

 	// Disable SSRF checks for the duration of this test only. Restore
 	// the previous state via t.Cleanup so that TestIsSafeURL_* tests
@@ -433,21 +392,21 @@ func TestWorkspaceList(t *testing.T) {
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", "/tmp/configs")

-	// 23 cols: broadcast_enabled + talk_to_user_enabled added after monthly_spend
-	// (migration 20260514). Column order must match scanWorkspaceRow exactly.
+	// 21 cols: `max_concurrent_tasks` added between active_tasks and
+	// last_error_rate (see scanWorkspaceRow + COALESCE(w.max_concurrent_tasks, 1)
+	// in workspace.go). Column order must match that scan exactly.
 	columns := []string{
 		"id", "name", "role", "tier", "status", "agent_card", "url",
 		"parent_id", "active_tasks", "max_concurrent_tasks",
 		"last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	rows := sqlmock.NewRows(columns).
 		AddRow("ws-1", "Agent One", "worker", 1, "online", []byte("null"), "http://localhost:8001",
-			nil, 0, 1, 0.0, "", 100, "", "claude-code", "", 10.0, 20.0, false, nil, int64(0), false, true).
+			nil, 0, 1, 0.0, "", 100, "", "claude-code", "", 10.0, 20.0, false, nil, int64(0)).
 		AddRow("ws-2", "Agent Two", "manager", 2, "provisioning", []byte("null"), "",
-			nil, 0, 1, 0.0, "", 0, "", "langgraph", "", 50.0, 60.0, false, nil, int64(0), false, true)
+			nil, 0, 1, 0.0, "", 0, "", "langgraph", "", 50.0, 60.0, false, nil, int64(0))

 	mock.ExpectQuery("SELECT w.id, w.name").
 		WillReturnRows(rows)
@@ -1161,14 +1120,13 @@ func TestWorkspaceGet_CurrentTask(t *testing.T) {
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	mock.ExpectQuery("SELECT w.id, w.name").
 		WithArgs("dddddddd-0004-0000-0000-000000000000").
 		WillReturnRows(sqlmock.NewRows(columns).AddRow(
 			"dddddddd-0004-0000-0000-000000000000", "Task Worker", "worker", 1, "online", []byte("null"), "http://localhost:9000",
 			nil, 2, 1, 0.0, "", 300, "Analyzing document", "langgraph", "", 10.0, 20.0, false,
-			nil, int64(0), false, true,
+			nil, int64(0),
 		))

 	w := httptest.NewRecorder()
@@ -751,9 +751,9 @@ func TestMCPHandler_SendMessageToUser_DBErrorLogsAndStill200s(t *testing.T) {
 	t.Setenv("MOLECULE_MCP_ALLOW_SEND_MESSAGE", "true")
 	h, mock := newMCPHandler(t)

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-err").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("CEO Ryan PC", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("CEO Ryan PC"))

 	// INSERT fails — must NOT abort the tool response.
 	mock.ExpectExec(`INSERT INTO activity_logs.*'a2a_receive'.*'notify'`).
@@ -802,9 +802,9 @@ func TestMCPHandler_SendMessageToUser_ResponseBodyShape(t *testing.T) {

 	const userMessage = "Hi there from the agent"

-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-shape").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("CEO Ryan PC", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("CEO Ryan PC"))

 	// Capture the response_body argument and assert its exact shape.
 	mock.ExpectExec(`INSERT INTO activity_logs.*'a2a_receive'.*'notify'`).
@@ -861,9 +861,9 @@ func TestMCPHandler_SendMessageToUser_PersistsToActivityLog(t *testing.T) {
 	// before it does anything else. Returning a name lets the
 	// broadcast payload populate; the test doesn't assert on the
 	// broadcast (no observable WS in this fake), only on the DB.
-	mock.ExpectQuery("SELECT name, talk_to_user_enabled FROM workspaces").
+	mock.ExpectQuery("SELECT name FROM workspaces").
 		WithArgs("ws-msg").
-		WillReturnRows(sqlmock.NewRows([]string{"name", "talk_to_user_enabled"}).AddRow("CEO Ryan PC", true))
+		WillReturnRows(sqlmock.NewRows([]string{"name"}).AddRow("CEO Ryan PC"))

 	// The persistence INSERT — pin the exact shape so a future
 	// refactor that switches columns or drops `method='notify'`
@@ -166,7 +166,11 @@ func (h *MemoriesHandler) Commit(c *gin.Context) {
 	// GLOBAL scope: only root workspaces (no parent) can write
 	if body.Scope == "GLOBAL" {
 		var parentID *string
-		db.DB.QueryRowContext(ctx, `SELECT parent_id FROM workspaces WHERE id = $1`, workspaceID).Scan(&parentID)
+		if err := db.DB.QueryRowContext(ctx, `SELECT parent_id FROM workspaces WHERE id = $1`, workspaceID).Scan(&parentID); err != nil {
+			log.Printf("Commit: parent lookup for workspace %s: %v", workspaceID, err)
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "workspace lookup failed"})
+			return
+		}
 		if parentID != nil {
 			c.JSON(http.StatusForbidden, gin.H{"error": "only root workspaces can write GLOBAL memories"})
 			return
@@ -278,7 +282,11 @@ func (h *MemoriesHandler) Search(c *gin.Context) {

 	// Get workspace info for access control
 	var parentID *string
-	db.DB.QueryRowContext(ctx, `SELECT parent_id FROM workspaces WHERE id = $1`, workspaceID).Scan(&parentID)
+	if err := db.DB.QueryRowContext(ctx, `SELECT parent_id FROM workspaces WHERE id = $1`, workspaceID).Scan(&parentID); err != nil {
+		// Non-critical: fall back to self-only team filter
+		log.Printf("Search: parent lookup for workspace %s: %v", workspaceID, err)
+		parentID = nil
+	}

 	// Try to generate a query embedding for semantic search.
 	// Falls back to the existing FTS/ILIKE path on failure or when no
@@ -287,7 +287,7 @@ func TestRenderCategoryRoutingYAML_StableOrdering(t *testing.T) {
 	if ai <= 0 || zi <= 0 || mi <= 0 {
 		t.Fatalf("could not locate all keys in output: %s", out)
 	}
-	if ai >= mi || mi >= zi {
+	if !(ai < mi && mi < zi) {
 		t.Errorf("keys not sorted: alpha=%d middle=%d zebra=%d, output:\n%s", ai, mi, zi, out)
 	}
 }
@@ -156,20 +156,3 @@ func equalStrings(a, b []string) bool {
 	}
 	return true
 }
-
-// TestEmitOrgEvent_NilPayload exercises the `if payload == nil` branch that
-// re-initializes payload to an empty map before marshaling.
-func TestEmitOrgEvent_NilPayloadInitializesEmptyMap(t *testing.T) {
-	mock := setupTestDB(t)
-
-	mock.ExpectExec(`INSERT INTO structure_events`).
-		WithArgs("org.import.started", sqlmock.AnyArg()).
-		WillReturnResult(sqlmock.NewResult(1, 1))
-
-	// Passing nil triggers: if payload == nil { payload = map[string]any{} }
-	emitOrgEvent(context.Background(), "org.import.started", nil)
-
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("sqlmock expectations: %v", err)
-	}
-}
@@ -56,11 +56,9 @@ const (
 // (an externally routable address) is used directly.
 func (h *WorkspaceHandler) gracefulPreRestart(ctx context.Context, workspaceID string) {
 	// Non-blocking send — don't stall the restart cycle.
-	// Run in a tracked async goroutine (goAsync, not bare `go`) so the
-	// caller (runRestartCycle) can proceed to stopForRestart without
-	// waiting, while the test harness can still drain it before swapping
-	// the global db.DB (resolveAgentURLForRestartSignal reads db.DB).
-	h.goAsync(func() {
+	// Run in a detached goroutine so the caller (runRestartCycle) can
+	// proceed to stopForRestart without waiting.
+	go func() {
 		signalCtx, cancel := context.WithTimeout(context.Background(), restartSignalTimeout)
 		defer cancel()

@@ -111,7 +109,7 @@ func (h *WorkspaceHandler) gracefulPreRestart(ctx context.Context, workspaceID s
 		} else {
 			log.Printf("A2AGracefulRestart: %s returned status %d — proceeding with stop", workspaceID, resp.StatusCode)
 		}
-	})
+	}()
 }

 // resolveAgentURLForRestartSignal returns the routable URL for the workspace
@@ -1,117 +0,0 @@
-package handlers
-
-// template_files_agent_home_stub_test.go — pins the Phase-1 stub
-// contract for the /agent-home root added by internal#425 RFC.
-//
-// Today (pre-Phase-2b), every Files API verb against `?root=/agent-home`
-// must return HTTP 501 with the canonical pending-message body. The
-// stub MUST NOT:
-//   1. Hit the DB (the workspace might not even exist yet from the
-//      canvas's POV — the root selector is testable without one).
-//   2. Touch the EIC tunnel / Docker / template-dir paths — those
-//      would 500/404/[] depending on the env and confuse the canvas.
-//   3. Accept writes/deletes that the future docker-exec backend
-//      would reject — fail closed.
-//
-// When Phase 2b lands, this file gets replaced by a real
-// docker-exec dispatch test; the stub-message constant in
-// templates.go disappears.
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-)
-
-// TestAgentHomeAllowedRoot pins that /agent-home is in the allowedRoots
-// set. Without this, a future refactor that drops the key would
-// silently degrade the canvas root selector to a 400 instead of the
-// stub 501.
-func TestAgentHomeAllowedRoot(t *testing.T) {
-	if !allowedRoots["/agent-home"] {
-		t.Fatal("/agent-home must be in allowedRoots — RFC #425 contract")
-	}
-}
-
-// TestAgentHomeStub_AllVerbs_Return501 pins the canonical stub
-// response across all four verbs. Each must:
-//
-//   - status 501
-//   - body contains the canonical "/agent-home not implemented" prefix
-//   - NOT contain "workspace not found" (proves we short-circuit before
-//     the DB lookup)
-//
-// Driven as a table to keep symmetry — adding a fifth verb in the
-// future means adding one row here.
-func TestAgentHomeStub_AllVerbs_Return501(t *testing.T) {
-	cases := []struct {
-		name   string
-		method string
-		invoke func(c *gin.Context)
-	}{
-		{
-			name:   "ListFiles",
-			method: "GET",
-			invoke: func(c *gin.Context) { (&TemplatesHandler{}).ListFiles(c) },
-		},
-		{
-			name:   "ReadFile",
-			method: "GET",
-			invoke: func(c *gin.Context) { (&TemplatesHandler{}).ReadFile(c) },
-		},
-		{
-			name:   "WriteFile",
-			method: "PUT",
-			invoke: func(c *gin.Context) { (&TemplatesHandler{}).WriteFile(c) },
-		},
-		{
-			name:   "DeleteFile",
-			method: "DELETE",
-			invoke: func(c *gin.Context) { (&TemplatesHandler{}).DeleteFile(c) },
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			w := httptest.NewRecorder()
-			c, _ := gin.CreateTestContext(w)
-			c.Params = gin.Params{
-				{Key: "id", Value: "ws-stub"},
-				// Path param without leading slash so DeleteFile's
-				// filepath.IsAbs guard doesn't 400 before the root
-				// dispatch runs. The List/Read/Write paths strip the
-				// leading slash themselves and accept either form.
-				{Key: "path", Value: "notes.md"},
-			}
-			// WriteFile binds JSON; provide a minimal valid body so the
-			// short-circuit isn't masked by the bind-error path.
-			var body string
-			if tc.method == "PUT" {
-				body = `{"content":"x"}`
-			}
-			c.Request = httptest.NewRequest(
-				tc.method,
-				"/workspaces/ws-stub/files/notes.md?root=/agent-home",
-				strings.NewReader(body),
-			)
-			if body != "" {
-				c.Request.Header.Set("Content-Type", "application/json")
-			}
-
-			tc.invoke(c)
-
-			if w.Code != http.StatusNotImplemented {
-				t.Fatalf("expected 501, got %d: %s", w.Code, w.Body.String())
-			}
-			if !strings.Contains(w.Body.String(), "/agent-home not implemented") {
-				t.Errorf("body should contain canonical stub message; got %s", w.Body.String())
-			}
-			if strings.Contains(w.Body.String(), "workspace not found") {
-				t.Errorf("stub leaked through to DB lookup; body=%s", w.Body.String())
-			}
-		})
-	}
-}
@@ -18,35 +18,11 @@ import (
 )

 // allowedRoots are the container paths that the Files API can browse.
-//
-// `/agent-home` (added 2026-05-15, internal#425 RFC) is the container's
-// own $HOME — `/root` for openclaw, `/home/agent` for claude-code/hermes
-// — browsed via `docker exec` rather than host-side `find`. The
-// dispatch is stubbed today (returns 501); full implementation lands in
-// Phase 2b of the RFC. The allowedRoots key is added now so the canvas
-// can design its root-selector UI against the final shape and the
-// stub-vs-full transition is server-side only.
 var allowedRoots = map[string]bool{
-	"/configs":    true,
-	"/workspace":  true,
-	"/home":       true,
-	"/plugins":    true,
-	"/agent-home": true,
-}
-
-// agentHomeStubMessage is the body returned by every Files API verb
-// when `?root=/agent-home` is requested before Phase 2b lands. Keep the
-// status code 501 (Not Implemented) — the route exists, the verb is
-// understood, but the handler is unimplemented. Distinguishes from
-// 400/404 so a canvas behind a less-current server can render a clean
-// "feature pending" state instead of a generic error.
-const agentHomeStubMessage = "/agent-home not implemented yet (internal#425 RFC Phase 2b — docker-exec backend pending)"
-
-// isAgentHomeStubRequest returns true when the request targets the
-// stubbed /agent-home root. Centralised so every verb in this file
-// short-circuits with the same response shape.
-func isAgentHomeStubRequest(rootPath string) bool {
-	return rootPath == "/agent-home"
+	"/configs":   true,
+	"/workspace": true,
+	"/home":      true,
+	"/plugins":   true,
 }

 // maxUploadFiles limits the number of files in a single import/replace.
@@ -243,14 +219,7 @@ func (h *TemplatesHandler) ListFiles(c *gin.Context) {
 	//   ?depth= — max depth to recurse (default: 1, max: 5)
 	rootPath := c.DefaultQuery("root", "/configs")
 	if !allowedRoots[rootPath] {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins, /agent-home"})
-		return
-	}
-	// /agent-home dispatch is stubbed pre-Phase-2b. Short-circuit before
-	// the DB lookup + EIC dance so a canvas exercising the new root key
-	// gets a clean 501 instead of a half-effort response.
-	if isAgentHomeStubRequest(rootPath) {
-		c.JSON(http.StatusNotImplemented, gin.H{"error": agentHomeStubMessage})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins"})
 		return
 	}
 	subPath := c.DefaultQuery("path", "")
@@ -414,11 +383,7 @@ func (h *TemplatesHandler) ReadFile(c *gin.Context) {
 	ctx := c.Request.Context()
 	rootPath := c.DefaultQuery("root", "/configs")
 	if !allowedRoots[rootPath] {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins, /agent-home"})
-		return
-	}
-	if isAgentHomeStubRequest(rootPath) {
-		c.JSON(http.StatusNotImplemented, gin.H{"error": agentHomeStubMessage})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins"})
 		return
 	}

@@ -531,11 +496,7 @@ func (h *TemplatesHandler) WriteFile(c *gin.Context) {
 	ctx := c.Request.Context()
 	rootPath := c.DefaultQuery("root", "/configs")
 	if !allowedRoots[rootPath] {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins, /agent-home"})
-		return
-	}
-	if isAgentHomeStubRequest(rootPath) {
-		c.JSON(http.StatusNotImplemented, gin.H{"error": agentHomeStubMessage})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins"})
 		return
 	}
 	var wsName, instanceID, runtime string
@@ -612,11 +573,7 @@ func (h *TemplatesHandler) DeleteFile(c *gin.Context) {
 	ctx := c.Request.Context()
 	rootPath := c.DefaultQuery("root", "/configs")
 	if !allowedRoots[rootPath] {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins, /agent-home"})
-		return
-	}
-	if isAgentHomeStubRequest(rootPath) {
-		c.JSON(http.StatusNotImplemented, gin.H{"error": agentHomeStubMessage})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "root must be one of: /configs, /workspace, /home, /plugins"})
 		return
 	}
 	var wsName, instanceID, runtime string
@@ -88,9 +88,12 @@ func (h *TokenHandler) Create(c *gin.Context) {

 	// Rate limit: max active tokens per workspace
 	var count int
-	db.DB.QueryRowContext(c.Request.Context(),
+	if err := db.DB.QueryRowContext(c.Request.Context(),
 		`SELECT COUNT(*) FROM workspace_auth_tokens WHERE workspace_id = $1 AND revoked_at IS NULL`,
-		workspaceID).Scan(&count)
+		workspaceID).Scan(&count); err != nil {
+		log.Printf("tokens: rate-limit count lookup for %s: %v", workspaceID, err)
+		count = 0 // fail open — a DB error should not block token creation
+	}
 	if count >= maxTokensPerWorkspace {
 		c.JSON(http.StatusTooManyRequests, gin.H{"error": fmt.Sprintf("maximum %d active tokens per workspace", maxTokensPerWorkspace)})
 		return
@@ -80,15 +80,6 @@ type WorkspaceHandler struct {
 	asyncWG sync.WaitGroup
 }

-// newHandlerHook, when non-nil, is invoked for every WorkspaceHandler
-// created via NewWorkspaceHandler. It is nil in production (zero cost);
-// the test harness sets it so setupTestDB can drain every handler's
-// in-flight async goroutines before swapping the global db.DB. Without
-// this, a detached restart goroutine (maybeMarkContainerDead ->
-// goAsync(RestartByID) -> runRestartCycle reads db.DB) races the
-// db.DB restore in another test's t.Cleanup.
-var newHandlerHook func(*WorkspaceHandler)
-
 func (h *WorkspaceHandler) goAsync(fn func()) {
 	h.asyncWG.Add(1)
 	go func() {
@@ -117,9 +108,6 @@ func NewWorkspaceHandler(b events.EventEmitter, p *provisioner.Provisioner, plat
 	if p != nil {
 		h.provisioner = p
 	}
-	if newHandlerHook != nil {
-		newHandlerHook(h)
-	}
 	return h
 }

@@ -607,7 +595,7 @@ func scanWorkspaceRow(rows interface {
 	var id, name, role, status, url, sampleError, currentTask, runtime, workspaceDir string
 	var tier, activeTasks, maxConcurrentTasks, uptimeSeconds int
 	var errorRate, x, y float64
-	var collapsed, broadcastEnabled, talkToUserEnabled bool
+	var collapsed bool
 	var parentID *string
 	var agentCard []byte
 	var budgetLimit sql.NullInt64
@@ -616,7 +604,7 @@ func scanWorkspaceRow(rows interface {
 	err := rows.Scan(&id, &name, &role, &tier, &status, &agentCard, &url,
 		&parentID, &activeTasks, &maxConcurrentTasks, &errorRate, &sampleError, &uptimeSeconds,
 		&currentTask, &runtime, &workspaceDir, &x, &y, &collapsed,
-		&budgetLimit, &monthlySpend, &broadcastEnabled, &talkToUserEnabled)
+		&budgetLimit, &monthlySpend)
 	if err != nil {
 		return nil, err
 	}
@@ -640,8 +628,6 @@ func scanWorkspaceRow(rows interface {
 		"x":                    x,
 		"y":                    y,
 		"collapsed":            collapsed,
-		"broadcast_enabled":    broadcastEnabled,
-		"talk_to_user_enabled": talkToUserEnabled,
 	}

 	// budget_limit: nil when no limit set, int64 otherwise
@@ -677,8 +663,7 @@ const workspaceListQuery = `
 		   COALESCE(w.current_task, ''), COALESCE(w.runtime, 'langgraph'),
 		   COALESCE(w.workspace_dir, ''),
 		   COALESCE(cl.x, 0), COALESCE(cl.y, 0), COALESCE(cl.collapsed, false),
-		   w.budget_limit, COALESCE(w.monthly_spend, 0),
-		   w.broadcast_enabled, w.talk_to_user_enabled
+		   w.budget_limit, COALESCE(w.monthly_spend, 0)
 	FROM workspaces w
 	LEFT JOIN canvas_layouts cl ON cl.workspace_id = w.id
 	WHERE w.status != 'removed'
@@ -738,8 +723,7 @@ func (h *WorkspaceHandler) Get(c *gin.Context) {
 			   COALESCE(w.current_task, ''), COALESCE(w.runtime, 'langgraph'),
 			   COALESCE(w.workspace_dir, ''),
 			   COALESCE(cl.x, 0), COALESCE(cl.y, 0), COALESCE(cl.collapsed, false),
-			   w.budget_limit, COALESCE(w.monthly_spend, 0),
-			   w.broadcast_enabled, w.talk_to_user_enabled
+			   w.budget_limit, COALESCE(w.monthly_spend, 0)
 		FROM workspaces w
 		LEFT JOIN canvas_layouts cl ON cl.workspace_id = w.id
 		WHERE w.id = $1
@@ -1,82 +0,0 @@
-package handlers
-
-// workspace_abilities.go — PATCH /workspaces/:id/abilities
-//
-// Allows users and admin agents to toggle two workspace-level ability flags:
-//
-//   broadcast_enabled   — workspace may POST /broadcast to send org-wide messages
-//   talk_to_user_enabled — workspace may deliver canvas chat messages via
-//                          send_message_to_user / POST /notify
-//
-// Gated behind AdminAuth so workspace agents cannot self-modify their own
-// ability flags (that would let any agent grant itself broadcast rights or
-// suppress its own chat-silence constraint).
-
-import (
-	"log"
-	"net/http"
-
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/gin-gonic/gin"
-)
-
-// AbilitiesPayload carries the subset of ability flags the caller wants to
-// update. Fields are pointers so that the handler can distinguish "caller
-// supplied false" from "caller omitted the field" (omitempty semantics).
-type AbilitiesPayload struct {
-	BroadcastEnabled   *bool `json:"broadcast_enabled"`
-	TalkToUserEnabled  *bool `json:"talk_to_user_enabled"`
-}
-
-// PatchAbilities handles PATCH /workspaces/:id/abilities (AdminAuth).
-func PatchAbilities(c *gin.Context) {
-	id := c.Param("id")
-	if err := validateWorkspaceID(id); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace ID"})
-		return
-	}
-
-	var body AbilitiesPayload
-	if err := c.ShouldBindJSON(&body); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request body"})
-		return
-	}
-	if body.BroadcastEnabled == nil && body.TalkToUserEnabled == nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "at least one ability field required"})
-		return
-	}
-
-	ctx := c.Request.Context()
-
-	var exists bool
-	if err := db.DB.QueryRowContext(ctx,
-		`SELECT EXISTS(SELECT 1 FROM workspaces WHERE id = $1 AND status != 'removed')`, id,
-	).Scan(&exists); err != nil || !exists {
-		c.JSON(http.StatusNotFound, gin.H{"error": "workspace not found"})
-		return
-	}
-
-	if body.BroadcastEnabled != nil {
-		if _, err := db.DB.ExecContext(ctx,
-			`UPDATE workspaces SET broadcast_enabled = $2, updated_at = now() WHERE id = $1`,
-			id, *body.BroadcastEnabled,
-		); err != nil {
-			log.Printf("PatchAbilities broadcast_enabled for %s: %v", id, err)
-			c.JSON(http.StatusInternalServerError, gin.H{"error": "update failed"})
-			return
-		}
-	}
-
-	if body.TalkToUserEnabled != nil {
-		if _, err := db.DB.ExecContext(ctx,
-			`UPDATE workspaces SET talk_to_user_enabled = $2, updated_at = now() WHERE id = $1`,
-			id, *body.TalkToUserEnabled,
-		); err != nil {
-			log.Printf("PatchAbilities talk_to_user_enabled for %s: %v", id, err)
-			c.JSON(http.StatusInternalServerError, gin.H{"error": "update failed"})
-			return
-		}
-	}
-
-	c.JSON(http.StatusOK, gin.H{"status": "updated"})
-}
@@ -1,142 +0,0 @@
-package handlers
-
-// workspace_broadcast.go — POST /workspaces/:id/broadcast
-//
-// Allows a workspace with broadcast_enabled=true to send a message to every
-// non-removed agent workspace in the org.  The message is:
-//
-//   • Persisted in each recipient's activity_logs (type='broadcast_receive')
-//     so poll-mode agents pick it up via GET /activity.
-//   • Broadcast via WebSocket BROADCAST_MESSAGE event so canvas panels can
-//     show a real-time banner for each recipient workspace.
-//
-// The sender's own workspace logs a 'broadcast_sent' activity row for
-// traceability.
-//
-// Auth: WorkspaceAuth (the agent triggers this with its own bearer token).
-// The handler re-validates broadcast_enabled inside the DB lookup to prevent
-// TOCTOU — the middleware only proved the token is valid, not the ability.
-
-import (
-	"log"
-	"net/http"
-	"strconv"
-
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/gin-gonic/gin"
-)
-
-// BroadcastHandler is constructed once and shared across requests.
-type BroadcastHandler struct {
-	broadcaster *events.Broadcaster
-}
-
-// NewBroadcastHandler creates a BroadcastHandler.
-func NewBroadcastHandler(b *events.Broadcaster) *BroadcastHandler {
-	return &BroadcastHandler{broadcaster: b}
-}
-
-// Broadcast handles POST /workspaces/:id/broadcast.
-func (h *BroadcastHandler) Broadcast(c *gin.Context) {
-	senderID := c.Param("id")
-	if err := validateWorkspaceID(senderID); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace ID"})
-		return
-	}
-
-	var body struct {
-		Message string `json:"message" binding:"required"`
-	}
-	if err := c.ShouldBindJSON(&body); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "message is required"})
-		return
-	}
-
-	ctx := c.Request.Context()
-
-	// Verify sender exists and has broadcast_enabled=true.
-	var senderName string
-	var broadcastEnabled bool
-	err := db.DB.QueryRowContext(ctx,
-		`SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'`,
-		senderID,
-	).Scan(&senderName, &broadcastEnabled)
-	if err != nil {
-		c.JSON(http.StatusNotFound, gin.H{"error": "workspace not found"})
-		return
-	}
-	if !broadcastEnabled {
-		c.JSON(http.StatusForbidden, gin.H{
-			"error": "broadcast_disabled",
-			"hint":  "This workspace does not have the broadcast ability. Ask a user or admin to enable it via PATCH /workspaces/:id/abilities.",
-		})
-		return
-	}
-
-	// Collect all non-removed agent workspaces (excludes the sender itself).
-	rows, err := db.DB.QueryContext(ctx,
-		`SELECT id FROM workspaces WHERE status != 'removed' AND id != $1`,
-		senderID,
-	)
-	if err != nil {
-		log.Printf("Broadcast: recipient query failed for %s: %v", senderID, err)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "internal error"})
-		return
-	}
-	defer rows.Close()
-
-	var recipientIDs []string
-	for rows.Next() {
-		var rid string
-		if rows.Scan(&rid) == nil {
-			recipientIDs = append(recipientIDs, rid)
-		}
-	}
-	if err := rows.Err(); err != nil {
-		log.Printf("Broadcast: recipient rows error for %s: %v", senderID, err)
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "internal error"})
-		return
-	}
-
-	broadcastPayload := map[string]interface{}{
-		"message":   body.Message,
-		"sender_id": senderID,
-		"sender":    senderName,
-	}
-
-	// Persist broadcast_receive in each recipient's activity log + emit WS event.
-	delivered := 0
-	for _, rid := range recipientIDs {
-		if _, err := db.DB.ExecContext(ctx, `
-			INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status)
-			VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')
-		`, rid, senderID, "Broadcast from "+senderName+": "+broadcastTruncate(body.Message, 120)); err != nil {
-			log.Printf("Broadcast: activity_logs insert for recipient %s: %v", rid, err)
-			continue
-		}
-		h.broadcaster.BroadcastOnly(rid, "BROADCAST_MESSAGE", broadcastPayload)
-		delivered++
-	}
-
-	// Record the send on the sender's own log.
-	if _, err := db.DB.ExecContext(ctx, `
-		INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status)
-		VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')
-	`, senderID, "Broadcast sent to "+strconv.Itoa(delivered)+" workspace(s)"); err != nil {
-		log.Printf("Broadcast: sender activity_log for %s: %v", senderID, err)
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"status":    "sent",
-		"delivered": delivered,
-	})
-}
-
-func broadcastTruncate(s string, max int) string {
-	runes := []rune(s)
-	if len(runes) <= max {
-		return s
-	}
-	return string(runes[:max]) + "…"
-}
@@ -33,7 +33,6 @@ var wsColumns = []string{
 	"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 	"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 	"budget_limit", "monthly_spend",
-	"broadcast_enabled", "talk_to_user_enabled",
 }

 // ==================== GET — financial fields stripped from open endpoint ====================
@@ -53,10 +52,8 @@ func TestWorkspaceBudget_Get_NilLimit(t *testing.T) {
 				[]byte(`{}`), "http://localhost:9001",
 				nil, 0, 1, 0.0, "", 0, "", "langgraph", "",
 				0.0, 0.0, false,
-				nil,   // budget_limit NULL
-				0,     // monthly_spend 0
-				false, // broadcast_enabled
-				true)) // talk_to_user_enabled
+				nil, // budget_limit NULL
+				0))  // monthly_spend 0

 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -99,8 +96,7 @@ func TestWorkspaceBudget_Get_WithLimit(t *testing.T) {
 				nil, 0, 1, 0.0, "", 0, "", "langgraph", "",
 				0.0, 0.0, false,
 				int64(500),  // budget_limit = $5.00 in DB
-				int64(123),  // monthly_spend = $1.23 in DB
-				false, true)) // broadcast_enabled, talk_to_user_enabled
+				int64(123))) // monthly_spend = $1.23 in DB

 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -237,10 +237,10 @@ func (h *WorkspaceHandler) Restart(c *gin.Context) {
 	// the silent-drop bugs PRs #2811/#2824 closed). RestartWorkspaceAuto
 	// enforces CP-FIRST ordering matching the other dispatchers — see
 	// docs/architecture/backends.md.
-	h.goAsync(func() {
+	go func() {
 		h.RestartWorkspaceAutoOpts(context.Background(), id, templatePath, configFiles, payload, resetClaudeSession)
-	})
-	h.goAsync(func() { h.sendRestartContext(id, restartData) })
+	}()
+	go h.sendRestartContext(id, restartData)

 	c.JSON(http.StatusOK, gin.H{"status": "provisioning", "config_dir": configLabel, "reset_session": resetClaudeSession})
 }
@@ -610,9 +610,7 @@ func (h *WorkspaceHandler) runRestartCycle(workspaceID string) {
 	h.provisionWorkspaceAutoSync(workspaceID, "", nil, payload)
 	// sendRestartContext is a one-way notification to the new container; safe
 	// to fire async — the next restart cycle won't depend on it completing.
-	// Tracked via goAsync so the test harness can drain it before the
-	// global db.DB swap (sendRestartContext reads db.DB).
-	h.goAsync(func() { h.sendRestartContext(workspaceID, restartData) })
+	go h.sendRestartContext(workspaceID, restartData)
 }

 // Pause handles POST /workspaces/:id/pause
@@ -29,7 +29,6 @@ func TestWorkspaceGet_Success(t *testing.T) {
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	mock.ExpectQuery("SELECT w.id, w.name").
 		WithArgs("cccccccc-0001-0000-0000-000000000000").
@@ -37,7 +36,7 @@ func TestWorkspaceGet_Success(t *testing.T) {
 			AddRow("cccccccc-0001-0000-0000-000000000000", "My Agent", "worker", 1, "online", []byte(`{"name":"test"}`),
 				"http://localhost:8001", nil, 2, 1, 0.05, "", 3600, "working", "langgraph",
 				"", 10.0, 20.0, false,
-				nil, 0, false, true))
+				nil, 0))

 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -119,7 +118,6 @@ func TestWorkspaceGet_RemovedReturns410(t *testing.T) {
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	mock.ExpectQuery("SELECT w.id, w.name").
 		WithArgs(id).
@@ -127,7 +125,7 @@ func TestWorkspaceGet_RemovedReturns410(t *testing.T) {
 			AddRow(id, "Old Agent", "worker", 1, string(models.StatusRemoved), []byte(`null`),
 				"", nil, 0, 1, 0.0, "", 0, "", "langgraph",
 				"", 0.0, 0.0, false,
-				nil, 0, false, true))
+				nil, 0))
 	mock.ExpectQuery(`SELECT updated_at FROM workspaces`).
 		WithArgs(id).
 		WillReturnRows(sqlmock.NewRows([]string{"updated_at"}).AddRow(removedAt))
@@ -183,7 +181,6 @@ func TestWorkspaceGet_RemovedReturns410WithNullRemovedAtOnTimestampFetchFailure(
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	mock.ExpectQuery("SELECT w.id, w.name").
 		WithArgs(id).
@@ -191,7 +188,7 @@ func TestWorkspaceGet_RemovedReturns410WithNullRemovedAtOnTimestampFetchFailure(
 			AddRow(id, "Vanished", "worker", 1, string(models.StatusRemoved), []byte(`null`),
 				"", nil, 0, 1, 0.0, "", 0, "", "langgraph",
 				"", 0.0, 0.0, false,
-				nil, 0, false, true))
+				nil, 0))
 	// Simulate the row vanishing between the two queries.
 	mock.ExpectQuery(`SELECT updated_at FROM workspaces`).
 		WithArgs(id).
@@ -246,7 +243,6 @@ func TestWorkspaceGet_RemovedWithIncludeQueryReturns200(t *testing.T) {
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	mock.ExpectQuery("SELECT w.id, w.name").
 		WithArgs(id).
@@ -254,7 +250,7 @@ func TestWorkspaceGet_RemovedWithIncludeQueryReturns200(t *testing.T) {
 			AddRow(id, "Audit Agent", "worker", 1, string(models.StatusRemoved), []byte(`null`),
 				"", nil, 0, 1, 0.0, "", 0, "", "langgraph",
 				"", 0.0, 0.0, false,
-				nil, 0, false, true))
+				nil, 0))
 	// last_outbound_at follow-up query (existing path)
 	mock.ExpectQuery(`SELECT last_outbound_at FROM workspaces`).
 		WithArgs(id).
@@ -680,7 +676,6 @@ func TestWorkspaceList_Empty(t *testing.T) {
 			"parent_id", "active_tasks", "last_error_rate", "last_sample_error",
 			"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 			"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 		}))

 	w := httptest.NewRecorder()
@@ -1384,7 +1379,6 @@ func TestWorkspaceGet_FinancialFieldsStripped(t *testing.T) {
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	// Populate with non-zero financial values to confirm they are stripped.
 	mock.ExpectQuery("SELECT w.id, w.name").
@@ -1393,7 +1387,7 @@ func TestWorkspaceGet_FinancialFieldsStripped(t *testing.T) {
 			AddRow("cccccccc-0010-0000-0000-000000000000", "Finance Test", "worker", 1, "online", []byte(`{}`),
 				"http://localhost:9001", nil, 0, 1, 0.0, "", 0, "", "langgraph",
 				"", 0.0, 0.0, false,
-				int64(50000), int64(12500), false, true)) // budget_limit=500 USD, spend=125 USD
+				int64(50000), int64(12500))) // budget_limit=500 USD, spend=125 USD

 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -1441,7 +1435,6 @@ func TestWorkspaceGet_SensitiveFieldsStripped(t *testing.T) {
 		"parent_id", "active_tasks", "max_concurrent_tasks", "last_error_rate", "last_sample_error",
 		"uptime_seconds", "current_task", "runtime", "workspace_dir", "x", "y", "collapsed",
 		"budget_limit", "monthly_spend",
-		"broadcast_enabled", "talk_to_user_enabled",
 	}
 	mock.ExpectQuery("SELECT w.id, w.name").
 		WithArgs("cccccccc-0955-0000-0000-000000000000").
@@ -1454,7 +1447,7 @@ func TestWorkspaceGet_SensitiveFieldsStripped(t *testing.T) {
 				"langgraph",
 				"/home/user/secret-projects/client-work",
 				0.0, 0.0, false,
-				nil, 0, false, true))
+				nil, 0))

 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -36,15 +36,6 @@ type Workspace struct {
 	// to activity_logs, agent reads via GET /activity?since_id=). See
 	// migration 045 + RFC #2339.
 	DeliveryMode       string          `json:"delivery_mode" db:"delivery_mode"`
-	// BroadcastEnabled: when true the workspace may call POST /broadcast to
-	// deliver a message to all non-removed agent workspaces in the org.
-	// Default false — only privileged orchestrators should hold this ability.
-	BroadcastEnabled   bool            `json:"broadcast_enabled" db:"broadcast_enabled"`
-	// TalkToUserEnabled: when false the workspace's send_message_to_user calls
-	// and POST /notify requests are rejected with HTTP 403 so the agent is
-	// forced to route updates through a parent workspace. Default true
-	// (preserves existing behaviour for all workspaces).
-	TalkToUserEnabled  bool            `json:"talk_to_user_enabled" db:"talk_to_user_enabled"`
 	// Canvas layout fields (from JOIN)
 	X         float64 `json:"x"`
 	Y         float64 `json:"y"`
@@ -178,21 +178,12 @@ func (p *CPProvisioner) Start(ctx context.Context, cfg WorkspaceConfig) (string,
 	// /admin/liveness and other admin-gated platform endpoints (core#831).
 	// p.adminToken is read from os.Getenv("ADMIN_TOKEN") at provisioner creation;
 	// it is also used for CP→platform HTTP auth but those are separate concerns.
-	//
-	// Forensic #145 hardening: tenant workspaces run on EC2 via this path, so
-	// the SCM-write-token denylist (see buildContainerEnv) is enforced here
-	// too. Always build a filtered copy — never pass cfg.EnvVars through
-	// verbatim — so a latent persona-merged GITEA_TOKEN can't reach the
-	// tenant container regardless of whether ADMIN_TOKEN is set.
-	env := make(map[string]string, len(cfg.EnvVars)+1)
-	for k, v := range cfg.EnvVars {
-		if isSCMWriteTokenKey(k) {
-			log.Printf("CPProvisioner.Start: dropped SCM-write credential %q from tenant workspace env (forensic #145 guard)", k)
-			continue
-		}
-		env[k] = v
-	}
+	env := cfg.EnvVars
 	if p.adminToken != "" {
+		env = make(map[string]string, len(cfg.EnvVars)+1)
+		for k, v := range cfg.EnvVars {
+			env[k] = v
+		}
 		env["ADMIN_TOKEN"] = p.adminToken
 	}
 	// Collect template files and generated configs, with OFFSEC-010 guards:
@@ -352,7 +343,6 @@ func collectCPConfigFiles(cfg WorkspaceConfig) (map[string]string, error) {
 	}
 	return files, nil
 }
-
 // Stop terminates the workspace's EC2 instance via the control plane.
 //
 // Looks up the actual EC2 instance_id from the workspaces table before
@@ -507,9 +497,7 @@ func (p *CPProvisioner) IsRunning(ctx context.Context, workspaceID string) (bool
 		// Don't leak the body — upstream errors may echo headers.
 		return true, fmt.Errorf("cp provisioner: status: unexpected %d", resp.StatusCode)
 	}
-	var result struct {
-		State string `json:"state"`
-	}
+	var result struct{ State string `json:"state"` }
 	// Cap body read at 64 KiB for parity with Start — a misconfigured
 	// or compromised CP streaming a huge body could otherwise exhaust
 	// memory in this hot path (called reactively per-request from
@@ -591,28 +591,6 @@ func ValidateWorkspaceAccess(access, workspacePath string) error {
 	}
 }

-// scmWriteTokenKeys is the explicit denylist of environment variable names
-// that carry a Git SCM *write* credential (push / merge / approve). These
-// must never reach a tenant workspace container — see the forensic #145
-// rationale in buildContainerEnv. Kept as an exact-match set rather than a
-// substring/prefix heuristic so the guard is auditable and can't silently
-// over-strip a legitimately-named var.
-var scmWriteTokenKeys = map[string]struct{}{
-	"GITEA_TOKEN":     {},
-	"GITHUB_TOKEN":    {},
-	"GH_TOKEN":        {}, // gh CLI honours GH_TOKEN as a GITHUB_TOKEN alias
-	"GITLAB_TOKEN":    {},
-	"GL_TOKEN":        {}, // glab CLI alias
-	"BITBUCKET_TOKEN": {},
-}
-
-// isSCMWriteTokenKey reports whether an env var name is a known Git SCM
-// write credential that must be stripped from tenant workspace env.
-func isSCMWriteTokenKey(key string) bool {
-	_, ok := scmWriteTokenKeys[key]
-	return ok
-}
-
 // buildContainerEnv assembles the initial environment variables injected
 // into every workspace container.
 //
@@ -649,21 +627,6 @@ func buildContainerEnv(cfg WorkspaceConfig) []string {
 		env = append(env, fmt.Sprintf("AWARENESS_URL=%s", cfg.AwarenessURL))
 	}
 	for k, v := range cfg.EnvVars {
-		// Forensic #145 hardening: tenant workspace containers run
-		// agent-controlled code and must NEVER receive a Git SCM *write*
-		// credential. Without merge/approve creds in-container the
-		// two-eyes review gate is structurally self-bypass-proof — an
-		// agent that forges an approval has no token to act on it. A
-		// latent path exists (loadPersonaEnvFile merges a per-role
-		// persona `GITEA_TOKEN` into cfg.EnvVars when MOLECULE_PERSONA_ROOT
-		// is set on a tenant host); it is inert today (persona dirs are
-		// operator-host-only) but unguarded. Strip SCM-write tokens here
-		// by construction so the invariant holds regardless of whether
-		// that path ever becomes reachable.
-		if isSCMWriteTokenKey(k) {
-			log.Printf("buildContainerEnv: dropped SCM-write credential %q from workspace env (forensic #145 guard)", k)
-			continue
-		}
 		env = append(env, fmt.Sprintf("%s=%s", k, v))
 	}
 	// Inject ADMIN_TOKEN from the platform server's environment so workspace
@@ -636,15 +636,10 @@ func TestBuildContainerEnv_AwarenessOnlyWhenBothSet(t *testing.T) {
 }

 func TestBuildContainerEnv_CustomEnvVarsAppended(t *testing.T) {
-	// NOTE: this test previously asserted GITHUB_TOKEN passed through
-	// verbatim. That assertion encoded the forensic #145 latent leak as
-	// expected behavior. Post-guard, ordinary custom env still flows but
-	// SCM-write credentials are stripped — see
-	// TestBuildContainerEnv_StripsSCMWriteTokens for the negative assertion.
 	cfg := WorkspaceConfig{
 		WorkspaceID: "ws-x",
 		PlatformURL: "http://localhost:8080",
-		EnvVars:     map[string]string{"CUSTOM": "value", "ANTHROPIC_API_KEY": "sk-not-an-scm-token"},
+		EnvVars:     map[string]string{"CUSTOM": "value", "GITHUB_TOKEN": "fake-token-for-test"},
 	}
 	env := buildContainerEnv(cfg)
 	seen := map[string]string{}
@@ -657,8 +652,8 @@ func TestBuildContainerEnv_CustomEnvVarsAppended(t *testing.T) {
 	if seen["CUSTOM"] != "value" {
 		t.Errorf("CUSTOM env missing, got env=%v", env)
 	}
-	if seen["ANTHROPIC_API_KEY"] != "sk-not-an-scm-token" {
-		t.Errorf("non-SCM custom env must still pass through, got env=%v", env)
+	if seen["GITHUB_TOKEN"] != "fake-token-for-test" {
+		t.Errorf("GITHUB_TOKEN env missing, got env=%v", env)
 	}
 	// Built-in defaults still present
 	if seen["MOLECULE_URL"] == "" {
@@ -666,129 +661,6 @@ func TestBuildContainerEnv_CustomEnvVarsAppended(t *testing.T) {
 	}
 }

-// ---------- forensic #145: SCM-write-token denylist guard ----------
-
-// TestBuildContainerEnv_StripsSCMWriteTokens is the core negative
-// assertion: a tenant workspace env constructed via buildContainerEnv MUST
-// NOT contain any Git SCM *write* credential, regardless of how it got into
-// cfg.EnvVars. This proves the two-eyes review gate stays structurally
-// self-bypass-proof — an agent in-container has no merge/approve token to
-// act on a forged approval. See forensic #145.
-//
-// This test FAILS on the pre-guard code (where buildContainerEnv passed
-// cfg.EnvVars through verbatim) and PASSES once the denylist filter is in
-// place — i.e. the guard is proven by construction, not by environment
-// accident.
-func TestBuildContainerEnv_StripsSCMWriteTokens(t *testing.T) {
-	scmTokens := []string{
-		"GITEA_TOKEN", "GITHUB_TOKEN", "GH_TOKEN",
-		"GITLAB_TOKEN", "GL_TOKEN", "BITBUCKET_TOKEN",
-	}
-
-	t.Run("normal path — SCM tokens explicitly set in EnvVars", func(t *testing.T) {
-		envVars := map[string]string{"CUSTOM": "ok", "ANTHROPIC_API_KEY": "sk-keep"}
-		for _, k := range scmTokens {
-			envVars[k] = "leaked-write-credential-" + k
-		}
-		cfg := WorkspaceConfig{
-			WorkspaceID: "ws-tenant",
-			PlatformURL: "http://localhost:8080",
-			Tier:        2,
-			EnvVars:     envVars,
-		}
-		assertNoSCMWriteToken(t, buildContainerEnv(cfg), scmTokens)
-
-		// Sanity: non-SCM custom env is NOT collateral-damaged by the filter.
-		if !envContains(buildContainerEnv(cfg), "CUSTOM=ok") {
-			t.Errorf("filter must not strip non-SCM custom env")
-		}
-		if !envContains(buildContainerEnv(cfg), "ANTHROPIC_API_KEY=sk-keep") {
-			t.Errorf("filter must not strip non-SCM API keys")
-		}
-	})
-
-	t.Run("persona-file path — simulates loadPersonaEnvFile merge", func(t *testing.T) {
-		// The latent path: handlers.loadPersonaEnvFile() merges a per-role
-		// persona env file (carrying GITEA_USER, GITEA_TOKEN, …) into the
-		// workspace env map when MOLECULE_PERSONA_ROOT is set on a tenant
-		// host. We can't invoke that cross-package helper here, but its
-		// observable effect is exactly "a GITEA_TOKEN appears in
-		// cfg.EnvVars". Constructing that condition directly proves the
-		// guard holds even if the latent path becomes reachable.
-		cfg := WorkspaceConfig{
-			WorkspaceID: "ws-tenant",
-			PlatformURL: "http://localhost:8080",
-			Tier:        2,
-			EnvVars: map[string]string{
-				// Persona identity fields that are SAFE to keep (read-only
-				// identity, not a write credential):
-				"GITEA_USER":       "backend-engineer",
-				"GITEA_USER_EMAIL": "backend-engineer@agents.moleculesai.app",
-				// The credential that must be stripped:
-				"GITEA_TOKEN":        "persona-merged-write-pat",
-				"GITEA_TOKEN_SCOPES": "write:repository",
-			},
-		}
-		got := buildContainerEnv(cfg)
-		assertNoSCMWriteToken(t, got, scmTokens)
-		// Non-credential persona identity may still flow through — only the
-		// write token is the denied surface.
-		if !envContains(got, "GITEA_USER=backend-engineer") {
-			t.Errorf("non-credential persona identity (GITEA_USER) should not be stripped")
-		}
-	})
-}
-
-// TestCPProvisionerEnv_StripsSCMWriteTokens covers the tenant-EC2 path:
-// CPProvisioner.Start builds the env map the control plane forwards to the
-// EC2 workspace container. The same forensic #145 denylist must hold there.
-func TestCPProvisionerEnv_StripsSCMWriteTokens(t *testing.T) {
-	// isSCMWriteTokenKey is the single source of truth shared by both
-	// buildContainerEnv (local Docker) and CPProvisioner.Start (tenant EC2).
-	// Assert it classifies every known SCM-write var as denied and leaves
-	// ordinary / read-only-identity vars alone.
-	for _, k := range []string{
-		"GITEA_TOKEN", "GITHUB_TOKEN", "GH_TOKEN",
-		"GITLAB_TOKEN", "GL_TOKEN", "BITBUCKET_TOKEN",
-	} {
-		if !isSCMWriteTokenKey(k) {
-			t.Errorf("isSCMWriteTokenKey(%q) = false, want true (SCM-write credential must be denied)", k)
-		}
-	}
-	for _, k := range []string{
-		"GITEA_USER", "GITEA_USER_EMAIL", "ANTHROPIC_API_KEY",
-		"CUSTOM", "PLATFORM_URL", "ADMIN_TOKEN", "",
-	} {
-		if isSCMWriteTokenKey(k) {
-			t.Errorf("isSCMWriteTokenKey(%q) = true, want false (must not over-strip non-SCM env)", k)
-		}
-	}
-}
-
-func assertNoSCMWriteToken(t *testing.T, env []string, scmTokens []string) {
-	t.Helper()
-	for _, e := range env {
-		key := e
-		if i := strings.IndexByte(e, '='); i >= 0 {
-			key = e[:i]
-		}
-		for _, banned := range scmTokens {
-			if key == banned {
-				t.Errorf("SCM-write credential %q leaked into workspace env (forensic #145 invariant violated): %q", banned, e)
-			}
-		}
-	}
-}
-
-func envContains(env []string, want string) bool {
-	for _, e := range env {
-		if e == want {
-			return true
-		}
-	}
-	return false
-}
-
 // ---------- buildWorkspaceMount — #65 workspace_access ----------

 func TestBuildWorkspaceMount_SelectionMatrix(t *testing.T) {
@@ -146,9 +146,6 @@ func Setup(hub *ws.Hub, broadcaster *events.Broadcaster, prov *provisioner.Provi
 		wsAdmin.GET("/workspaces", wh.List)
 		wsAdmin.POST("/workspaces", wh.Create)
 		wsAdmin.DELETE("/workspaces/:id", wh.Delete)
-		// Ability toggles — admin-only so workspace agents cannot self-modify
-		// broadcast_enabled or talk_to_user_enabled.
-		wsAdmin.PATCH("/workspaces/:id/abilities", handlers.PatchAbilities)
 		// Out-of-band bootstrap signal: CP's watcher POSTs here when it
 		// detects "RUNTIME CRASHED" in a workspace EC2 console output,
 		// so the canvas flips to failed in seconds instead of waiting
@@ -204,12 +201,6 @@ func Setup(hub *ws.Hub, broadcaster *events.Broadcaster, prov *provisioner.Provi
 		// to 'hibernated'. The workspace auto-wakes on the next A2A message.
 		wsAuth.POST("/hibernate", wh.Hibernate)

-		// Broadcast — send a message to all non-removed workspaces in the org.
-		// Requires broadcast_enabled=true on the source workspace (checked
-		// inside the handler). WorkspaceAuth on wsAuth proves token ownership.
-		broadcastH := handlers.NewBroadcastHandler(broadcaster)
-		wsAuth.POST("/broadcast", broadcastH.Broadcast)
-
 		// External-workspace credential lifecycle (issue #319 follow-up to
 		// the Create flow). Both endpoints reject runtime ≠ external with
 		// 400 — see external_rotate.go for the rationale.
@@ -1,226 +0,0 @@
-// Package secrets provides the canonical SSOT for credential-shaped
-// regex patterns used by:
-//
-//   - the CI `Secret scan` workflow (.gitea/workflows/secret-scan.yml)
-//   - the runtime's bundled pre-commit hook
-//     (molecule-ai-workspace-runtime/molecule_runtime/scripts/pre-commit-checks.sh)
-//   - the upcoming Phase 2b docker-exec Files API backend, which has
-//     to refuse to surface files whose path OR content matches a
-//     credential shape (RFC internal#425, Hongming 2026-05-15)
-//
-// Before this package, the same regex set lived as duplicate bash
-// arrays in two unrelated repos; adding a pattern required editing
-// both, and pattern drift was caught only via secret-scan workflow
-// failures on PRs that had unrelated changes (#2090-class incident
-// vector). Centralising in Go makes the Files API the SSOT, with the
-// YAML + bash arrays generated/asserted from this package so drift
-// is detected at CI time, not at exfiltration time.
-//
-// This file is Phase 2a of the internal#425 RFC. Phase 2b will import
-// `Patterns` from `template_files_docker_exec.go` to gate
-// `listFilesViaDockerExec` / `readFileViaDockerExec` against
-// secret-shaped paths AND content. Until 2b lands, the package has
-// one consumer: this package's own unit tests, which pin the regex
-// strings so a refactor that drops or weakens one is caught here.
-package secrets
-
-import (
-	"fmt"
-	"regexp"
-	"sync"
-)
-
-// Pattern is one named credential shape — a human label plus the
-// compiled regex. The label appears in CI error output ("matched:
-// github-pat") so an operator can identify the family without seeing
-// the actual matched bytes (echoing the bytes widens the blast radius
-// per the secret-scan workflow's recovery prose).
-type Pattern struct {
-	// Name is a short kebab-case identifier (e.g. "github-pat",
-	// "anthropic-api-key"). Stable across versions — consumers may
-	// switch on it.
-	Name string
-	// Description is a one-line human-readable explanation of what
-	// the pattern matches. Used in CI error messages and the Files
-	// API "<denied: secret-shape>" placeholder rationale.
-	Description string
-	// regexSource is the regex literal in Go-RE2 syntax. Stored as a
-	// string so the slice declaration below stays readable; compiled
-	// once via sync.Once into a *regexp.Regexp.
-	regexSource string
-}
-
-// Patterns is the canonical credential-shape regex set.
-//
-// Adding a pattern here:
-//
-//  1. Add a new Pattern{} entry below with a kebab-case Name, a
-//     one-line Description, and the regex literal. Anchor on a
-//     low-false-positive prefix.
-//  2. Add a positive + negative test case in patterns_test.go.
-//  3. Mirror the regex string into:
-//     a. .gitea/workflows/secret-scan.yml SECRET_PATTERNS array
-//     b. molecule-ai-workspace-runtime/molecule_runtime/scripts/pre-commit-checks.sh
-//     (or wait for the codegen target that consumes this slice — TBD
-//     follow-up; tracked in the Phase 2a PR description.)
-//
-// The order is: alphabetical within each provider family, families
-// grouped by ecosystem (GitHub family, AI-provider family, chat
-// family, cloud family). Keep this stable so diffs are reviewable.
-var Patterns = []Pattern{
-	// --- GitHub token family ---
-	{
-		Name:        "github-pat-classic",
-		Description: "GitHub personal access token (classic)",
-		regexSource: `ghp_[A-Za-z0-9]{36,}`,
-	},
-	{
-		Name:        "github-app-installation-token",
-		Description: "GitHub App installation token (#2090 vector)",
-		regexSource: `ghs_[A-Za-z0-9]{36,}`,
-	},
-	{
-		Name:        "github-oauth-user-to-server",
-		Description: "GitHub OAuth user-to-server token",
-		regexSource: `gho_[A-Za-z0-9]{36,}`,
-	},
-	{
-		Name:        "github-oauth-user",
-		Description: "GitHub OAuth user token",
-		regexSource: `ghu_[A-Za-z0-9]{36,}`,
-	},
-	{
-		Name:        "github-oauth-refresh",
-		Description: "GitHub OAuth refresh token",
-		regexSource: `ghr_[A-Za-z0-9]{36,}`,
-	},
-	{
-		Name:        "github-pat-fine-grained",
-		Description: "GitHub fine-grained personal access token",
-		regexSource: `github_pat_[A-Za-z0-9_]{82,}`,
-	},
-
-	// --- AI-provider API key family ---
-	{
-		Name:        "anthropic-api-key",
-		Description: "Anthropic API key",
-		regexSource: `sk-ant-[A-Za-z0-9_-]{40,}`,
-	},
-	{
-		Name:        "openai-project-key",
-		Description: "OpenAI project API key",
-		regexSource: `sk-proj-[A-Za-z0-9_-]{40,}`,
-	},
-	{
-		Name:        "openai-service-account-key",
-		Description: "OpenAI service-account API key",
-		regexSource: `sk-svcacct-[A-Za-z0-9_-]{40,}`,
-	},
-	{
-		Name:        "minimax-api-key",
-		Description: "MiniMax API key (F1088 vector)",
-		regexSource: `sk-cp-[A-Za-z0-9_-]{60,}`,
-	},
-
-	// --- Chat-platform token family ---
-	{
-		Name:        "slack-token",
-		Description: "Slack token (xoxb/xoxa/xoxp/xoxr/xoxs)",
-		regexSource: `xox[baprs]-[A-Za-z0-9-]{20,}`,
-	},
-
-	// --- Cloud-provider credential family ---
-	{
-		Name:        "aws-access-key-id",
-		Description: "AWS access key ID",
-		regexSource: `AKIA[0-9A-Z]{16}`,
-	},
-	{
-		Name:        "aws-sts-temp-access-key-id",
-		Description: "AWS STS temporary access key ID",
-		regexSource: `ASIA[0-9A-Z]{16}`,
-	},
-}
-
-// compiledOnce protects the lazy build of compiledPatterns. We compile
-// lazily so package init is cheap; callers pay only on first match
-// (typically once per workspace-server boot).
-var (
-	compiledOnce     sync.Once
-	compiledPatterns []*compiledPattern
-	compileErr       error
-)
-
-type compiledPattern struct {
-	Name        string
-	Description string
-	Re          *regexp.Regexp
-}
-
-// compileAll compiles every Pattern.regexSource into a *regexp.Regexp.
-// Called once via compiledOnce. Any compile failure here is a build
-// bug (the unit tests assert each regex compiles) — surfacing via
-// returned error so callers don't panic in request handling.
-func compileAll() {
-	out := make([]*compiledPattern, 0, len(Patterns))
-	for _, p := range Patterns {
-		re, err := regexp.Compile(p.regexSource)
-		if err != nil {
-			compileErr = fmt.Errorf("secrets: pattern %q failed to compile: %w", p.Name, err)
-			return
-		}
-		out = append(out, &compiledPattern{Name: p.Name, Description: p.Description, Re: re})
-	}
-	compiledPatterns = out
-}
-
-// ScanBytes returns a non-nil Match if any pattern matches anywhere
-// inside b. Returns (nil, nil) on no match. Returns (nil, err) only
-// if a regex in the package fails to compile — that's a build bug,
-// not a runtime data issue.
-//
-// Match contains the pattern Name + Description so the caller can
-// emit a path-or-content-denial rationale WITHOUT round-tripping the
-// matched bytes (which would defeat the purpose). The matched bytes
-// stay inside this function.
-//
-// The Files API Phase 2b backend will call ScanBytes on:
-//
-//   - the absolute path string (catches a file literally named
-//     `ghs_abc.txt`)
-//   - the file content (catches a credential pasted into a workspace
-//     file by an agent or user — the Files API refuses to surface it
-//     and the canvas renders "<denied: secret-shape>")
-//
-// Ordering: patterns are tried in declaration order. First match
-// wins. This means narrower patterns (e.g. `sk-svcacct-…`) should
-// appear in `Patterns` before broader ones (`sk-…`) — today there's
-// no overlap, so order is descriptive only.
-func ScanBytes(b []byte) (*Match, error) {
-	compiledOnce.Do(compileAll)
-	if compileErr != nil {
-		return nil, compileErr
-	}
-	for _, cp := range compiledPatterns {
-		if cp.Re.Match(b) {
-			return &Match{Name: cp.Name, Description: cp.Description}, nil
-		}
-	}
-	return nil, nil
-}
-
-// ScanString is the string-input convenience wrapper around ScanBytes.
-// Identical semantics — the body never copies, []byte(s) is a
-// zero-copy reinterpret for the regex matcher.
-func ScanString(s string) (*Match, error) {
-	return ScanBytes([]byte(s))
-}
-
-// Match describes which pattern caught a value. Deliberately does
-// NOT include the matched substring — callers must not echo it.
-type Match struct {
-	// Name is the pattern's kebab-case identifier (e.g. "github-pat-classic").
-	Name string
-	// Description is the human-readable line for UI / log surfaces.
-	Description string
-}
@@ -1,189 +0,0 @@
-package secrets
-
-import (
-	"strings"
-	"testing"
-)
-
-// TestEveryPatternCompiles pins that every Pattern.regexSource is a
-// valid Go-RE2 expression. Without this, a bad regex would silently
-// disable ScanBytes for everything after it (the lazy compile would
-// set compileErr and ScanBytes would return that error every call).
-func TestEveryPatternCompiles(t *testing.T) {
-	for _, p := range Patterns {
-		if p.Name == "" {
-			t.Errorf("pattern with empty Name: regex=%q", p.regexSource)
-		}
-		if p.Description == "" {
-			t.Errorf("pattern %q has empty Description", p.Name)
-		}
-	}
-	// Force compile + check error.
-	if _, err := ScanBytes([]byte("placeholder")); err != nil {
-		t.Fatalf("ScanBytes init failed: %v", err)
-	}
-}
-
-// TestNoDuplicateNames — a duplicate pattern Name would make the
-// "first match wins" semantics surprising to readers and any caller
-// switching on Match.Name (none today but adding the guard is cheap).
-func TestNoDuplicateNames(t *testing.T) {
-	seen := map[string]bool{}
-	for _, p := range Patterns {
-		if seen[p.Name] {
-			t.Errorf("duplicate pattern Name: %q", p.Name)
-		}
-		seen[p.Name] = true
-	}
-}
-
-// TestKnownPatternsAllPresent — pins which specific Name values are
-// expected. A future refactor that renames or removes one without
-// updating consumers (CI workflow, runtime pre-commit hook, Files
-// API Phase 2b backend) would silently widen the leak surface.
-// Failing here forces the rename to be intentional.
-func TestKnownPatternsAllPresent(t *testing.T) {
-	expected := []string{
-		"github-pat-classic",
-		"github-app-installation-token",
-		"github-oauth-user-to-server",
-		"github-oauth-user",
-		"github-oauth-refresh",
-		"github-pat-fine-grained",
-		"anthropic-api-key",
-		"openai-project-key",
-		"openai-service-account-key",
-		"minimax-api-key",
-		"slack-token",
-		"aws-access-key-id",
-		"aws-sts-temp-access-key-id",
-	}
-	got := map[string]bool{}
-	for _, p := range Patterns {
-		got[p.Name] = true
-	}
-	for _, want := range expected {
-		if !got[want] {
-			t.Errorf("expected pattern %q missing from Patterns slice", want)
-		}
-	}
-}
-
-// TestPositiveMatches — for each pattern, supply a representative
-// shape and assert ScanBytes returns a Match with the right Name.
-// These are TEST FIXTURES, not real credentials — each is the
-// pattern's prefix + a long-enough trailing run of placeholder chars.
-// `EXAMPLE` is sprinkled in to make grep-finds in CI logs obviously
-// fake to a human reader (matches saved memory
-// feedback_assert_exact_not_substring: tighten by Name not body).
-func TestPositiveMatches(t *testing.T) {
-	cases := []struct {
-		fixture      string
-		expectedName string
-	}{
-		{"ghp_EXAMPLE111122223333444455556666777788889999", "github-pat-classic"},
-		{"ghs_EXAMPLE111122223333444455556666777788889999", "github-app-installation-token"},
-		{"gho_EXAMPLE111122223333444455556666777788889999", "github-oauth-user-to-server"},
-		{"ghu_EXAMPLE111122223333444455556666777788889999", "github-oauth-user"},
-		{"ghr_EXAMPLE111122223333444455556666777788889999", "github-oauth-refresh"},
-		{"github_pat_EXAMPLE" + strings.Repeat("1", 80), "github-pat-fine-grained"},
-		{"sk-ant-EXAMPLE" + strings.Repeat("1", 40), "anthropic-api-key"},
-		{"sk-proj-EXAMPLE" + strings.Repeat("1", 40), "openai-project-key"},
-		{"sk-svcacct-EXAMPLE" + strings.Repeat("1", 40), "openai-service-account-key"},
-		{"sk-cp-EXAMPLE" + strings.Repeat("1", 60), "minimax-api-key"},
-		{"xoxb-" + strings.Repeat("a", 25), "slack-token"},
-		{"xoxa-" + strings.Repeat("a", 25), "slack-token"},
-		// AWS regex requires [0-9A-Z]{16} — uppercase + digits only.
-		{"AKIA1234567890ABCDEF", "aws-access-key-id"},
-		{"ASIA1234567890ABCDEF", "aws-sts-temp-access-key-id"},
-	}
-	for _, tc := range cases {
-		t.Run(tc.expectedName, func(t *testing.T) {
-			m, err := ScanBytes([]byte(tc.fixture))
-			if err != nil {
-				t.Fatalf("ScanBytes(%q) errored: %v", tc.fixture, err)
-			}
-			if m == nil {
-				t.Fatalf("ScanBytes(%q) returned no match — expected %q", tc.fixture, tc.expectedName)
-			}
-			if m.Name != tc.expectedName {
-				t.Errorf("ScanBytes(%q) matched %q; expected %q", tc.fixture, m.Name, tc.expectedName)
-			}
-		})
-	}
-}
-
-// TestNegativeShapes — strings that look credential-adjacent but
-// shouldn't match (too short, wrong prefix, missing trailing bytes).
-// Failing here means a pattern is too loose, which would generate
-// false-positive denial in Files API and false-positive workflow
-// failures in CI.
-func TestNegativeShapes(t *testing.T) {
-	cases := []string{
-		// Too-short variants — anchored on the length suffix.
-		"ghp_tooshort",
-		"ghs_alsoshort1234",
-		"github_pat_short",
-		"sk-ant-short",
-		"sk-cp-not-enough-bytes-here",
-		// Looks like one of the prefixes but isn't (different letter).
-		"gha_EXAMPLE_thirty_six_or_more_chars_here_xxx",
-		// Slack family — wrong letter after xox.
-		"xoxz-aaaaaaaaaaaaaaaaaaaaaaaaa",
-		// AWS-shaped but wrong length suffix.
-		"AKIATOOSHORT",
-		// Empty / whitespace.
-		"",
-		"   ",
-		// Plain prose mentioning the prefix as part of a longer word.
-		"see also `ghp_HOWTO.md` in the repo",
-	}
-	for _, c := range cases {
-		t.Run(c, func(t *testing.T) {
-			m, err := ScanBytes([]byte(c))
-			if err != nil {
-				t.Fatalf("ScanBytes(%q) errored: %v", c, err)
-			}
-			if m != nil {
-				t.Errorf("ScanBytes(%q) unexpectedly matched %q", c, m.Name)
-			}
-		})
-	}
-}
-
-// TestScanString_NoOp — sanity-check ScanString is the zero-copy
-// wrapper around ScanBytes. Without this, a future refactor that
-// makes ScanString do its own thing (e.g. accidentally normalise
-// case) would diverge silently.
-func TestScanString_NoOp(t *testing.T) {
-	in := "ghp_EXAMPLE111122223333444455556666777788889999"
-	m1, err1 := ScanBytes([]byte(in))
-	if err1 != nil {
-		t.Fatalf("ScanBytes errored: %v", err1)
-	}
-	m2, err2 := ScanString(in)
-	if err2 != nil {
-		t.Fatalf("ScanString errored: %v", err2)
-	}
-	if m1 == nil || m2 == nil {
-		t.Fatalf("expected matches; got bytes=%+v string=%+v", m1, m2)
-	}
-	if m1.Name != m2.Name {
-		t.Errorf("ScanString and ScanBytes returned different Names: %q vs %q", m1.Name, m2.Name)
-	}
-}
-
-// TestMatch_NoRoundtrip — assert the Match struct does NOT include
-// the matched substring as a field. Adding such a field would
-// regress the "matched bytes never leave ScanBytes" invariant that
-// makes this package safe to call from log/UI surfaces. This is a
-// reflection-light contract test — checks the field names statically.
-func TestMatch_NoRoundtrip(t *testing.T) {
-	var m Match
-	// If someone adds a `Matched string` (or similar) field, this
-	// test reads as the canonical place to update + reconsider.
-	_ = m.Name
-	_ = m.Description
-	// The two-field shape is part of the public contract; new fields
-	// require deliberation about whether they leak the secret value.
-}
@@ -1,3 +0,0 @@
-ALTER TABLE workspaces
-    DROP COLUMN IF EXISTS broadcast_enabled,
-    DROP COLUMN IF EXISTS talk_to_user_enabled;
@@ -1,16 +0,0 @@
-- Workspace abilities: opt-in flags that gate platform-level behaviours.
--
-- broadcast_enabled (default FALSE): when TRUE the workspace may call
--   POST /workspaces/:id/broadcast to send a message to every non-removed
--   agent workspace in the org. Off by default — only privileged
--   orchestrator workspaces should hold this ability.
--
-- talk_to_user_enabled (default TRUE): when FALSE the workspace is not
--   allowed to deliver messages to the canvas user via send_message_to_user /
--   POST /notify. The platform returns HTTP 403 so the agent can forward its
--   update to a parent workspace instead. Default TRUE preserves existing
--   behaviour for all current workspaces.
-
-ALTER TABLE workspaces
-    ADD COLUMN IF NOT EXISTS broadcast_enabled    BOOLEAN NOT NULL DEFAULT FALSE,
-    ADD COLUMN IF NOT EXISTS talk_to_user_enabled BOOLEAN NOT NULL DEFAULT TRUE;
@@ -29,20 +29,17 @@ from typing import Callable
 import inbox

 from a2a_tools import (
-    tool_broadcast_message,
    tool_chat_history,
    tool_check_task_status,
    tool_commit_memory,
    tool_delegate_task,
    tool_delegate_task_async,
-    tool_get_runtime_identity,
    tool_get_workspace_info,
    tool_inbox_peek,
    tool_inbox_pop,
    tool_list_peers,
    tool_recall_memory,
    tool_send_message_to_user,
-    tool_update_agent_card,
    tool_wait_for_message,
 )
 from platform_tools.registry import TOOLS as _PLATFORM_TOOL_SPECS
@@ -132,10 +129,6 @@ async def handle_tool_call(name: str, arguments: dict) -> str:
        return await tool_get_workspace_info(
            source_workspace_id=arguments.get("source_workspace_id") or None,
        )
-    elif name == "get_runtime_identity":
-        return await tool_get_runtime_identity()
-    elif name == "update_agent_card":
-        return await tool_update_agent_card(arguments.get("card"))
    elif name == "commit_memory":
        return await tool_commit_memory(
            arguments.get("content", ""),
@@ -167,11 +160,6 @@ async def handle_tool_call(name: str, arguments: dict) -> str:
            arguments.get("before_ts", ""),
            source_workspace_id=arguments.get("source_workspace_id") or None,
        )
-    elif name == "broadcast_message":
-        return await tool_broadcast_message(
-            arguments.get("message", ""),
-            workspace_id=arguments.get("workspace_id") or None,
-        )
    return f"Unknown tool: {name}"


@@ -137,7 +137,6 @@ from a2a_tools_delegation import (  # noqa: E402  (import after the from-a2a_cli
 # identically.
 from a2a_tools_messaging import (  # noqa: E402  (import after the top-of-module imports)
    _upload_chat_files,
-    tool_broadcast_message,
    tool_chat_history,
    tool_get_workspace_info,
    tool_list_peers,
@@ -167,15 +166,3 @@ from a2a_tools_inbox import (  # noqa: E402  (import after the top-of-module imp
    tool_inbox_pop,
    tool_wait_for_message,
 )
-
-
-# Identity tool handlers — extracted to a2a_tools_identity. Ports the
-# two T4-tier MCP tools (``tool_get_runtime_identity`` +
-# ``tool_update_agent_card``) from molecule-ai-workspace-runtime PR#17.
-# That repo is mirror-only (reference_runtime_repo_is_mirror_only);
-# this is the canonical edit point, and the wheel mirror is
-# regenerated by publish-runtime.yml on merge.
-from a2a_tools_identity import (  # noqa: E402  (import after the top-of-module imports)
-    tool_get_runtime_identity,
-    tool_update_agent_card,
-)
@@ -1,187 +0,0 @@
-"""Identity tool handlers — single-concern slice of the a2a_tools surface.
-
-Owns the two MCP tools that close the T4-tier workspace owner-permission
-gaps reported via the canvas:
-
-  * ``tool_get_runtime_identity`` — env-only; returns model, model_provider,
-    molecule_model, anthropic_base_url, tier, workspace_id, runtime
-    (ADAPTER_MODULE). No HTTP call. Always permitted by RBAC — even
-    read-only agents may know what model they are.
-
-  * ``tool_update_agent_card`` — POSTs the card to ``/registry/update-card``
-    with the workspace's own bearer (same auth path as ``tool_commit_memory``
-    via ``a2a_tools_rbac.auth_headers_for_heartbeat``). The platform
-    replaces the stored card and broadcasts an ``agent_card_updated``
-    event so the canvas reflects the new card live. Gated on
-    ``memory.write`` capability via the existing RBAC permission map so
-    read-only roles can't silently rewrite the platform card.
-
-Both originated as a port of molecule-ai-workspace-runtime PR#17
-(``feat(mcp): add update_agent_card + get_runtime_identity tools``).
-The mirror-only PR#17 was closed without merge per
-``reference_runtime_repo_is_mirror_only``; the canonical edit point is
-this monorepo at ``workspace/`` and the wheel mirror is regenerated
-automatically by the publish-runtime workflow.
-
-Imports the auth-header primitive from ``a2a_tools_rbac`` (iter 4a) —
-NOT from ``a2a_tools`` — to avoid a circular import with the
-kitchen-sink re-export module.
-"""
-from __future__ import annotations
-
-import json
-import os
-from typing import Any
-
-import httpx
-
-from a2a_client import PLATFORM_URL
-from a2a_tools_rbac import (
-    auth_headers_for_heartbeat as _auth_headers_for_heartbeat,
-    check_memory_write_permission as _check_memory_write_permission,
-)
-
-
-def _runtime_identity_payload() -> dict[str, Any]:
-    """Build the identity dict — env-only, no I/O.
-
-    Factored out from ``tool_get_runtime_identity`` so tests can assert
-    against the exact key set without re-parsing JSON. The MCP tool
-    handler ``tool_get_runtime_identity`` is the only public caller in
-    production; tests call this helper directly.
-    """
-    return {
-        "model": os.environ.get("MODEL", ""),
-        "model_provider": os.environ.get("MODEL_PROVIDER", ""),
-        "molecule_model": os.environ.get("MOLECULE_MODEL", ""),
-        "anthropic_base_url": os.environ.get("ANTHROPIC_BASE_URL", ""),
-        "tier": os.environ.get("TIER", ""),
-        "workspace_id": os.environ.get("WORKSPACE_ID", ""),
-        # Adapter module is the closest thing the runtime has to a
-        # "template slug" — e.g. "adapter" for claude-code-default,
-        # "hermes" for hermes-template, etc. Picked from
-        # $ADAPTER_MODULE env baked by each template's Dockerfile.
-        "runtime": os.environ.get("ADAPTER_MODULE", ""),
-    }
-
-
-async def tool_get_runtime_identity() -> str:
-    """Return this runtime's identity — model, provider, tier, IDs.
-
-    Env-only; no HTTP call. Useful so the agent can answer "what model
-    am I?" correctly instead of guessing from a stale system prompt
-    that the operator may have changed between boots.
-
-    Returns the identity as a JSON-encoded string (the dispatch contract
-    every MCP tool in this module follows). Tests that want to assert
-    individual fields can call ``_runtime_identity_payload()`` directly,
-    or ``json.loads`` the return value.
-
-    Always permitted by RBAC — there is no sensitive information here
-    that isn't already available to the process via ``os.environ``.
-    The point of the tool is to surface those env values to the agent
-    layer in a stable, documented shape rather than expecting every
-    agent runtime to know to ``echo $MODEL``.
-    """
-    return json.dumps(_runtime_identity_payload(), indent=2)
-
-
-async def tool_update_agent_card(card: Any) -> str:
-    """Update this workspace's agent_card on the platform.
-
-    POSTs the provided card to ``/registry/update-card`` with the
-    workspace's own bearer token (same auth path as ``tool_commit_memory``
-    and ``tool_get_workspace_info``). The platform validates required
-    fields server-side, replaces the stored card, and broadcasts an
-    ``agent_card_updated`` event so the canvas updates live.
-
-    Args:
-        card: A JSON-serialisable object (typically a dict) holding the
-            new card. The platform validates required fields server-side.
-
-    Returns:
-        JSON-encoded string. Body:
-          - ``{"success": true, "status": "updated"}`` on success;
-          - ``{"success": false, "error": "<msg>", "status_code": <int>}``
-            on platform error;
-          - ``{"success": false, "error": "<reason>"}`` on local validation
-            (non-dict card, missing WORKSPACE_ID, network error).
-
-    Permission gate: this tool requires the ``memory.write`` RBAC
-    capability — same gate as ``tool_commit_memory``. The check runs
-    inline rather than at the dispatcher layer to keep ``a2a_mcp_server``
-    permission-agnostic (the gate sits with the implementation, not the
-    transport). Read-only roles get a clear error string back instead
-    of a 403 from the platform.
-
-    We re-check ``isinstance(card, dict)`` here defensively rather than
-    trust the MCP schema validator alone — the schema only constrains
-    the transport, not the in-process call surface used by tests and
-    sibling modules.
-    """
-    payload = await _update_agent_card_impl(card)
-    return json.dumps(payload, indent=2)
-
-
-async def _update_agent_card_impl(card: Any) -> dict[str, Any]:
-    """Dict-returning core of ``tool_update_agent_card``.
-
-    Split out so tests can assert against the raw dict shape (status
-    codes, error messages) without re-parsing JSON on every assertion.
-    The string-returning ``tool_update_agent_card`` is a thin wrapper
-    invoked by the MCP dispatcher.
-    """
-    # RBAC: require memory.write permission. Same gate as
-    # tool_commit_memory (the agent already needs this capability to
-    # persist anything outbound). Read-only roles can still call
-    # get_runtime_identity / get_workspace_info to introspect — those
-    # are env-only / read-only and have no inline gate.
-    if not _check_memory_write_permission():
-        return {
-            "success": False,
-            "error": (
-                "RBAC — this workspace does not have the 'memory.write' "
-                "permission required to update the agent_card."
-            ),
-        }
-    if not isinstance(card, dict):
-        return {
-            "success": False,
-            "error": "card must be a JSON object (dict)",
-        }
-    ws_id = os.environ.get("WORKSPACE_ID", "")
-    if not ws_id:
-        return {
-            "success": False,
-            "error": "WORKSPACE_ID env not set; cannot identify caller",
-        }
-    try:
-        async with httpx.AsyncClient(timeout=10.0) as client:
-            resp = await client.post(
-                f"{PLATFORM_URL}/registry/update-card",
-                json={"workspace_id": ws_id, "agent_card": card},
-                headers=_auth_headers_for_heartbeat(),
-            )
-            if resp.status_code == 200:
-                body: dict[str, Any] = {}
-                try:
-                    body = resp.json()
-                except Exception:
-                    pass
-                return {
-                    "success": True,
-                    "status": body.get("status", "updated"),
-                }
-            # Non-200 — surface what the platform returned.
-            error_msg = ""
-            try:
-                error_msg = resp.json().get("error", "") or resp.text
-            except Exception:
-                error_msg = resp.text
-            return {
-                "success": False,
-                "status_code": resp.status_code,
-                "error": error_msg,
-            }
-    except Exception as e:
-        return {"success": False, "error": f"network error: {e}"}
@@ -101,50 +101,6 @@ async def _upload_chat_files(
    return uploaded, None


-async def tool_broadcast_message(
-    message: str,
-    workspace_id: str | None = None,
-) -> str:
-    """Send a broadcast message to ALL agent workspaces in the org.
-
-    Requires the workspace to have broadcast_enabled=true (set by a user or
-    admin via PATCH /workspaces/:id/abilities). Use for urgent org-wide
-    signals — status changes, critical alerts, coordination instructions.
-    Every non-removed workspace receives the message in its activity log so
-    poll-mode agents pick it up, and push-mode canvases get a real-time
-    BROADCAST_MESSAGE WebSocket event.
-
-    Args:
-        message: The broadcast text. Keep it concise — all agents receive
-            this, so avoid lengthy prose that floods every context.
-        workspace_id: Optional. Which registered workspace to send the
-            broadcast from. Single-workspace agents omit this.
-    """
-    if not message:
-        return "Error: message is required"
-    target_workspace_id = (workspace_id or "").strip() or WORKSPACE_ID
-    try:
-        async with httpx.AsyncClient(timeout=30.0) as client:
-            resp = await client.post(
-                f"{PLATFORM_URL}/workspaces/{target_workspace_id}/broadcast",
-                json={"message": message},
-                headers=_auth_headers_for_heartbeat(target_workspace_id),
-            )
-            if resp.status_code == 200:
-                data = resp.json()
-                delivered = data.get("delivered", "?")
-                return f"Broadcast sent to {delivered} workspace(s)"
-            if resp.status_code == 403:
-                try:
-                    hint = resp.json().get("hint", "")
-                except Exception:
-                    hint = ""
-                return f"Error: broadcast ability not enabled.{(' ' + hint) if hint else ''}"
-            return f"Error: platform returned {resp.status_code}"
-    except Exception as e:
-        return f"Error sending broadcast: {e}"
-
-
 async def tool_send_message_to_user(
    message: str,
    attachments: list[str] | None = None,
@@ -195,20 +151,6 @@ async def tool_send_message_to_user(
                if uploaded:
                    return f"Message sent to user with {len(uploaded)} attachment(s)"
                return "Message sent to user"
-            if resp.status_code == 403:
-                try:
-                    body = resp.json()
-                    if body.get("error") == "talk_to_user_disabled":
-                        hint = body.get("hint", "")
-                        return (
-                            "Error: this workspace is not allowed to send messages "
-                            "directly to the user (talk_to_user is disabled). "
-                            + (hint + " " if hint else "")
-                            + "Use delegate_task to forward your update to a parent "
-                            "or supervisor workspace that can reach the user."
-                        )
-                except Exception:
-                    pass
            return f"Error: platform returned {resp.status_code}"
    except Exception as e:
        return f"Error sending message: {e}"
@@ -3,57 +3,9 @@
 import logging
 import os
 from abc import ABC, abstractmethod
-from collections.abc import Mapping
 from dataclasses import dataclass, field
 from typing import Any

-# ---------------------------------------------------------------------------
-# Provider routing — type alias + resolver used by individual adapters.
-# Each adapter defines its own ProviderRegistry with the providers it accepts.
-# ---------------------------------------------------------------------------
-
-# Maps prefix → (ordered_auth_env_vars, default_base_url).
-ProviderRegistry = dict[str, tuple[tuple[str, ...], str]]
-
-
-def resolve_provider_routing(
-    model_str: str,
-    env: Mapping[str, str],
-    *,
-    registry: ProviderRegistry,
-    runtime_config: dict[str, Any] | None = None,
-) -> tuple[str, str, str]:
-    """Resolve a ``provider:model`` string to ``(api_key, base_url, bare_model_id)``.
-
-    URL precedence (highest to lowest):
-      1. ``<PREFIX>_BASE_URL`` env var
-      2. ``runtime_config["provider_url"]``
-      3. registry default for the prefix
-
-    Unknown prefixes fall back to OPENAI_API_KEY + api.openai.com.
-    Raises RuntimeError when no API key env var is set for the prefix.
-    """
-    if ":" in model_str:
-        prefix, model_id = model_str.split(":", 1)
-    else:
-        prefix, model_id = "openai", model_str
-
-    env_vars, default_url = registry.get(
-        prefix, (("OPENAI_API_KEY",), "https://api.openai.com/v1")
-    )
-    api_key = next((env[v] for v in env_vars if env.get(v)), "")
-    if not api_key:
-        raise RuntimeError(
-            f"No API key found for provider {prefix!r} "
-            f"(checked: {', '.join(env_vars)}). Set one in workspace secrets."
-        )
-
-    env_url = env.get(f"{prefix.upper()}_BASE_URL", "")
-    config_url = (runtime_config or {}).get("provider_url", "")
-    base_url = env_url or config_url or default_url
-
-    return api_key, base_url, model_id
-
 from a2a.server.agent_execution import AgentExecutor

 from event_log import DisabledEventLog, EventLogBackend
@@ -340,20 +340,6 @@ _CLI_A2A_COMMAND_KEYWORDS: dict[str, str | None] = {
    "delegate_task_async": "delegate --async",
    "check_task_status": "status",
    "get_workspace_info": "info",
-    # `get_runtime_identity` + `update_agent_card` are MCP-first
-    # capabilities — the CLI subprocess interface doesn't expose them
-    # today. `get_runtime_identity` is env-only and an agent on a
-    # CLI-only runtime can already `echo $MODEL` etc, so there's no
-    # functional gap. `update_agent_card` requires a JSON object
-    # argument that wouldn't survive a positional-arg shell invocation
-    # cleanly. Mapped to None — flip to a keyword if a2a_cli grows
-    # `identity` / `card` subcommands in the future.
-    "get_runtime_identity": None,
-    "update_agent_card": None,
-    # `broadcast_message` is not exposed via the CLI subprocess interface
-    # today — it's an MCP-first capability. If a2a_cli grows a `broadcast`
-    # subcommand, map it here and the alignment test will gate the change.
-    "broadcast_message": None,
    # `send_message_to_user` is not exposed via the CLI subprocess
    # interface today — it requires a structured `attachments` field
    # that wouldn't survive a positional-arg shell invocation cleanly.
@@ -51,20 +51,17 @@ from dataclasses import dataclass
 from typing import Any, Literal

 from a2a_tools import (
-    tool_broadcast_message,
    tool_chat_history,
    tool_check_task_status,
    tool_commit_memory,
    tool_delegate_task,
    tool_delegate_task_async,
-    tool_get_runtime_identity,
    tool_get_workspace_info,
    tool_inbox_peek,
    tool_inbox_pop,
    tool_list_peers,
    tool_recall_memory,
    tool_send_message_to_user,
-    tool_update_agent_card,
    tool_wait_for_message,
 )

@@ -291,99 +288,6 @@ _GET_WORKSPACE_INFO = ToolSpec(
    section=A2A_SECTION,
 )

-_GET_RUNTIME_IDENTITY = ToolSpec(
-    name="get_runtime_identity",
-    short=(
-        "Return this runtime's identity — model, model_provider, tier, "
-        "workspace_id, runtime template. Reads from process env; no HTTP call."
-    ),
-    when_to_use=(
-        "Use this to answer 'what model am I?' truthfully instead of "
-        "guessing from a stale system prompt — the operator may have "
-        "routed you to a different model via persona env between boots. "
-        "Always permitted by RBAC: even read-only agents may know what "
-        "model they are. Distinct from get_workspace_info — that one "
-        "calls the platform for ID/role/tier/parent (workspace metadata); "
-        "this one returns the live process env (MODEL, MODEL_PROVIDER, "
-        "MOLECULE_MODEL, ANTHROPIC_BASE_URL, TIER, WORKSPACE_ID, "
-        "ADAPTER_MODULE)."
-    ),
-    input_schema={"type": "object", "properties": {}},
-    impl=tool_get_runtime_identity,
-    section=A2A_SECTION,
-)
-
-_UPDATE_AGENT_CARD = ToolSpec(
-    name="update_agent_card",
-    short=(
-        "Replace this workspace's agent_card on the platform. The "
-        "platform validates required fields and broadcasts an "
-        "agent_card_updated event so the canvas reflects the change live."
-    ),
-    when_to_use=(
-        "Use when the workspace's capabilities, skills, description, or "
-        "name change and the canvas display needs to follow. The "
-        "platform stores the new card and pushes an "
-        "``agent_card_updated`` event to subscribers. Gated behind the "
-        "``memory.write`` RBAC capability — read-only roles cannot "
-        "rewrite the card. Tier-1+ owners always have this capability."
-    ),
-    input_schema={
-        "type": "object",
-        "properties": {
-            "card": {
-                "type": "object",
-                "description": (
-                    "The new agent_card object (name, version, "
-                    "description, skills, etc). Server-side validation "
-                    "rejects payloads missing required fields."
-                ),
-            },
-        },
-        "required": ["card"],
-    },
-    impl=tool_update_agent_card,
-    section=A2A_SECTION,
-)
-
-_BROADCAST_MESSAGE = ToolSpec(
-    name="broadcast_message",
-    short=(
-        "Send a message to ALL agent workspaces in the org simultaneously. "
-        "Requires broadcast_enabled=true on this workspace (set by user/admin)."
-    ),
-    when_to_use=(
-        "Use for urgent, org-wide signals: critical status changes, emergency "
-        "stop instructions, coordinated task announcements. Every non-removed "
-        "workspace receives the message in its activity log (poll-mode agents "
-        "see it on their next poll; push-mode canvases get a real-time banner). "
-        "This tool returns an error if broadcast_enabled is false — a user or "
-        "admin must enable it via the workspace abilities settings first."
-    ),
-    input_schema={
-        "type": "object",
-        "properties": {
-            "message": {
-                "type": "string",
-                "description": (
-                    "The broadcast text. Keep it concise — every agent in the "
-                    "org receives this in their activity feed."
-                ),
-            },
-            "workspace_id": {
-                "type": "string",
-                "description": (
-                    "Optional. Multi-workspace mode: the registered workspace "
-                    "to broadcast from. Single-workspace agents omit this."
-                ),
-            },
-        },
-        "required": ["message"],
-    },
-    impl=tool_broadcast_message,
-    section=A2A_SECTION,
-)
-
 _SEND_MESSAGE_TO_USER = ToolSpec(
    name="send_message_to_user",
    short=(
@@ -699,9 +603,6 @@ TOOLS: list[ToolSpec] = [
    _CHECK_TASK_STATUS,
    _LIST_PEERS,
    _GET_WORKSPACE_INFO,
-    _GET_RUNTIME_IDENTITY,
-    _UPDATE_AGENT_CARD,
-    _BROADCAST_MESSAGE,
    _SEND_MESSAGE_TO_USER,
    # Inbox (standalone-only; in-container returns informational error)
    _WAIT_FOR_MESSAGE,
@@ -5,9 +5,6 @@
 - **check_task_status**: Poll the status of a task started with delegate_task_async; returns result when done.
 - **list_peers**: List the workspaces this agent can communicate with — name, ID, status, role for each.
 - **get_workspace_info**: Get this workspace's own info — ID, name, role, tier, parent, status.
- **get_runtime_identity**: Return this runtime's identity — model, model_provider, tier, workspace_id, runtime template. Reads from process env; no HTTP call.
- **update_agent_card**: Replace this workspace's agent_card on the platform. The platform validates required fields and broadcasts an agent_card_updated event so the canvas reflects the change live.
- **broadcast_message**: Send a message to ALL agent workspaces in the org simultaneously. Requires broadcast_enabled=true on this workspace (set by user/admin).
 - **send_message_to_user**: Send a message directly to the user's canvas chat — pushed instantly via WebSocket. Use this to: (1) acknowledge a task immediately ('Got it, I'll start working on this'), (2) send interim progress updates while doing long work, (3) deliver follow-up results after delegation completes, (4) attach files (zip, pdf, csv, image) for the user to download via the `attachments` field (NEVER paste file URLs in `message`). The message appears in the user's chat as if you're proactively reaching out.
 - **wait_for_message**: Block until the next inbound message (canvas user OR peer agent) arrives, or until ``timeout_secs`` elapses.
 - **inbox_peek**: List pending inbound messages without removing them.
@@ -29,15 +26,6 @@ Call this first when you need to delegate but don't know the target's ID. Access
 ### get_workspace_info
 Use to introspect your own identity (e.g. before reporting back to the user, or to determine whether you're a tier-0 root that can write GLOBAL memory).

-### get_runtime_identity
-Use this to answer 'what model am I?' truthfully instead of guessing from a stale system prompt — the operator may have routed you to a different model via persona env between boots. Always permitted by RBAC: even read-only agents may know what model they are. Distinct from get_workspace_info — that one calls the platform for ID/role/tier/parent (workspace metadata); this one returns the live process env (MODEL, MODEL_PROVIDER, MOLECULE_MODEL, ANTHROPIC_BASE_URL, TIER, WORKSPACE_ID, ADAPTER_MODULE).
-
-### update_agent_card
-Use when the workspace's capabilities, skills, description, or name change and the canvas display needs to follow. The platform stores the new card and pushes an ``agent_card_updated`` event to subscribers. Gated behind the ``memory.write`` RBAC capability — read-only roles cannot rewrite the card. Tier-1+ owners always have this capability.
-
-### broadcast_message
-Use for urgent, org-wide signals: critical status changes, emergency stop instructions, coordinated task announcements. Every non-removed workspace receives the message in its activity log (poll-mode agents see it on their next poll; push-mode canvases get a real-time banner). This tool returns an error if broadcast_enabled is false — a user or admin must enable it via the workspace abilities settings first.
-
 ### send_message_to_user
 Use proactively across the lifecycle of a task — early to acknowledge, mid-flight to update, late to deliver. Never paste file URLs in the message body — always pass absolute paths in `attachments` so the platform serves them as download chips (works on SaaS where external file hosts are unreachable).

@@ -1,390 +0,0 @@
-"""Tests for ``tool_get_runtime_identity`` and ``tool_update_agent_card``.
-
-These two MCP tools close the T4-tier workspace owner-permission gaps
-reported via the canvas:
-
-  - the agent could not update its own ``agent_card`` (no MCP tool
-    wrapped the existing ``POST /registry/update-card`` endpoint);
-  - the agent could not identify which model it was running (the
-    ``MODEL`` env var is injected by ``provisioner.workspace_provision``
-    but nothing surfaced it back to the agent).
-
-Ported from molecule-ai-workspace-runtime PR#17 (mirror-only repo;
-canonical edit point per ``reference_runtime_repo_is_mirror_only``).
-Adapted to core's conventions:
-
-  * tool functions return ``str`` (JSON-encoded), matching every other
-    tool in ``a2a_tools_*`` modules. Tests ``json.loads`` to inspect.
-  * permission check ``memory.write`` runs inline in
-    ``tool_update_agent_card`` (same pattern as
-    ``a2a_tools_memory.tool_commit_memory``).
-  * ``WORKSPACE_ID`` is read directly from ``os.environ`` — core does
-    not have the runtime's validated-cache layer (``molecule_runtime.
-    builtin_tools.validation``).
-"""
-from __future__ import annotations
-
-import json
-
-import pytest
-
-
-# --- Drift gate: re-export aliases on a2a_tools ------------------------------
-
-class TestBackCompatAliases:
-    """Pin that ``a2a_tools.tool_*`` resolves to the same callable as
-    ``a2a_tools_identity.tool_*``. Refactor wrapping (e.g. a doc-string
-    wrapper that loses the function identity) silently breaks call
-    sites that ``patch("a2a_tools.tool_update_agent_card", ...)`` —
-    this gate makes that drift fail fast."""
-
-    def test_tool_get_runtime_identity_alias(self):
-        import a2a_tools
-        import a2a_tools_identity
-        assert a2a_tools.tool_get_runtime_identity is a2a_tools_identity.tool_get_runtime_identity
-
-    def test_tool_update_agent_card_alias(self):
-        import a2a_tools
-        import a2a_tools_identity
-        assert a2a_tools.tool_update_agent_card is a2a_tools_identity.tool_update_agent_card
-
-
-# --- tool_get_runtime_identity ----------------------------------------------
-
-class TestGetRuntimeIdentity:
-    """The tool returns env-derived runtime identity. No HTTP call."""
-
-    @pytest.mark.asyncio
-    async def test_returns_all_known_env_fields(self, monkeypatch):
-        from a2a_tools_identity import tool_get_runtime_identity
-
-        monkeypatch.setenv("MODEL", "claude-opus-4-7")
-        monkeypatch.setenv("MODEL_PROVIDER", "anthropic")
-        monkeypatch.setenv("TIER", "T4")
-        monkeypatch.setenv("WORKSPACE_ID", "ws-abc")
-        monkeypatch.setenv("ADAPTER_MODULE", "adapter")
-        monkeypatch.setenv("MOLECULE_MODEL", "claude-opus-4-7")
-        monkeypatch.setenv("ANTHROPIC_BASE_URL", "https://api.anthropic.com")
-
-        out = await tool_get_runtime_identity()
-        # MCP tools return JSON-encoded strings (matches the contract
-        # every other tool_* in a2a_tools_* uses).
-        assert isinstance(out, str)
-        parsed = json.loads(out)
-
-        assert parsed["model"] == "claude-opus-4-7"
-        assert parsed["model_provider"] == "anthropic"
-        assert parsed["tier"] == "T4"
-        assert parsed["workspace_id"] == "ws-abc"
-        assert parsed["runtime"] == "adapter"
-        assert parsed["molecule_model"] == "claude-opus-4-7"
-        assert parsed["anthropic_base_url"] == "https://api.anthropic.com"
-
-    @pytest.mark.asyncio
-    async def test_missing_env_returns_empty_strings(self, monkeypatch):
-        """Tool MUST NOT raise when env vars are absent — every key is
-        present but the value is the empty string. The agent then knows
-        the slot exists but is unset."""
-        from a2a_tools_identity import tool_get_runtime_identity
-
-        for var in (
-            "MODEL", "MODEL_PROVIDER", "TIER", "WORKSPACE_ID",
-            "ADAPTER_MODULE", "MOLECULE_MODEL", "ANTHROPIC_BASE_URL",
-        ):
-            monkeypatch.delenv(var, raising=False)
-
-        parsed = json.loads(await tool_get_runtime_identity())
-        assert parsed["model"] == ""
-        assert parsed["model_provider"] == ""
-        assert parsed["tier"] == ""
-        assert parsed["workspace_id"] == ""
-        assert parsed["runtime"] == ""
-        assert parsed["molecule_model"] == ""
-        assert parsed["anthropic_base_url"] == ""
-
-    @pytest.mark.asyncio
-    async def test_no_http_call_made(self, monkeypatch):
-        """``get_runtime_identity`` is env-only — must not open
-        httpx.AsyncClient even if the call would otherwise succeed.
-        Tripwire any client construction."""
-        import httpx
-
-        from a2a_tools_identity import tool_get_runtime_identity
-
-        class _Tripwire:
-            def __init__(self, *_a, **_kw):
-                raise AssertionError(
-                    "tool_get_runtime_identity must not open httpx.AsyncClient"
-                )
-
-        monkeypatch.setattr(httpx, "AsyncClient", _Tripwire)
-        # Must not raise.
-        await tool_get_runtime_identity()
-
-    @pytest.mark.asyncio
-    async def test_helper_dict_matches_string_payload(self, monkeypatch):
-        """``_runtime_identity_payload`` is the dict-returning helper
-        used by both the public tool and tests. Verify the public tool
-        json.dumps the same dict — no field is dropped or renamed by
-        the encoding step."""
-        from a2a_tools_identity import (
-            _runtime_identity_payload,
-            tool_get_runtime_identity,
-        )
-
-        monkeypatch.setenv("MODEL", "claude-opus-4-7")
-        monkeypatch.setenv("TIER", "T4")
-        monkeypatch.setenv("WORKSPACE_ID", "ws-helper-check")
-
-        helper = _runtime_identity_payload()
-        tool_str = await tool_get_runtime_identity()
-        assert json.loads(tool_str) == helper
-
-
-# --- tool_update_agent_card -------------------------------------------------
-
-
-class _MockResponse:
-    def __init__(self, status_code: int, payload: dict):
-        self.status_code = status_code
-        self._payload = payload
-        self.text = json.dumps(payload)
-
-    def json(self):
-        return self._payload
-
-
-class _MockClient:
-    """Drop-in for httpx.AsyncClient context manager.
-
-    Records the URL + json body + headers the tool POSTed so the test
-    can assert against them. Returns the canned _MockResponse passed
-    in at construction time.
-    """
-
-    def __init__(self, *, response: _MockResponse, captured: dict):
-        self._response = response
-        self._captured = captured
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, *_args):
-        return False
-
-    async def post(self, url, *, json=None, headers=None, **_kw):  # noqa: A002
-        self._captured["url"] = url
-        self._captured["json"] = json
-        self._captured["headers"] = headers
-        return self._response
-
-
-@pytest.fixture
-def _grant_memory_write(monkeypatch):
-    """Force the inline RBAC gate inside ``tool_update_agent_card`` to
-    succeed. The gate calls
-    ``a2a_tools_rbac.check_memory_write_permission`` which inspects
-    ``$MOLECULE_ROLES`` / the role table; the patch sidesteps that
-    machinery so tests can focus on the platform-call shape.
-    """
-    import a2a_tools_identity
-    monkeypatch.setattr(
-        a2a_tools_identity, "_check_memory_write_permission", lambda: True
-    )
-
-
-class TestUpdateAgentCard:
-    @pytest.mark.asyncio
-    async def test_posts_to_registry_update_card(
-        self, monkeypatch, _grant_memory_write,
-    ):
-        """Hits POST {PLATFORM_URL}/registry/update-card with the
-        workspace bearer and the {workspace_id, agent_card} body shape
-        the platform handler expects (workspace-server
-        ``internal/handlers/registry.go``)."""
-        import a2a_tools_identity
-
-        monkeypatch.setenv("WORKSPACE_ID", "ws-42")
-        # Ensure PLATFORM_URL re-import sees a deterministic value —
-        # a2a_client imports it at module load so we patch the symbol
-        # on a2a_tools_identity directly (the module's own reference).
-        monkeypatch.setattr(a2a_tools_identity, "PLATFORM_URL", "http://test.invalid")
-
-        captured: dict = {}
-        response = _MockResponse(200, {"status": "updated"})
-
-        def _client_factory(*_a, **_kw):
-            return _MockClient(response=response, captured=captured)
-
-        monkeypatch.setattr(a2a_tools_identity.httpx, "AsyncClient", _client_factory)
-        monkeypatch.setattr(
-            a2a_tools_identity, "_auth_headers_for_heartbeat",
-            lambda: {"Authorization": "Bearer ws-token-xyz"},
-        )
-
-        card = {"name": "agent-foo", "version": "0.1.0", "description": "demo"}
-        result_str = await a2a_tools_identity.tool_update_agent_card(card)
-        result = json.loads(result_str)
-
-        # URL: PLATFORM_URL + /registry/update-card
-        assert captured["url"] == "http://test.invalid/registry/update-card"
-
-        # The platform handler expects {workspace_id, agent_card}; the
-        # agent_card is the raw object the agent submitted.
-        body = captured["json"]
-        assert body["workspace_id"] == "ws-42"
-        assert body["agent_card"] == card
-
-        # Auth header from auth_headers_for_heartbeat is forwarded
-        # verbatim — same path commit_memory uses.
-        assert captured["headers"]["Authorization"] == "Bearer ws-token-xyz"
-
-        assert result["success"] is True
-        assert result["status"] == "updated"
-
-    @pytest.mark.asyncio
-    async def test_propagates_server_error(
-        self, monkeypatch, _grant_memory_write,
-    ):
-        """Non-200 from platform surfaces as a structured error to the
-        agent. The agent sees {success:false, status_code, error} and
-        can decide whether to retry, fall back, or escalate."""
-        import a2a_tools_identity
-
-        monkeypatch.setenv("WORKSPACE_ID", "ws-42")
-        monkeypatch.setattr(a2a_tools_identity, "PLATFORM_URL", "http://test.invalid")
-
-        captured: dict = {}
-        response = _MockResponse(400, {"error": "invalid card"})
-
-        monkeypatch.setattr(
-            a2a_tools_identity.httpx, "AsyncClient",
-            lambda *a, **kw: _MockClient(response=response, captured=captured),
-        )
-        monkeypatch.setattr(
-            a2a_tools_identity, "_auth_headers_for_heartbeat", lambda: {},
-        )
-
-        result = json.loads(
-            await a2a_tools_identity.tool_update_agent_card({"name": "x"})
-        )
-        assert result["success"] is False
-        assert result["status_code"] == 400
-        assert "invalid card" in str(result["error"]).lower()
-
-    @pytest.mark.asyncio
-    async def test_rejects_non_dict_card(self, _grant_memory_write):
-        """The MCP schema constrains transport callers to pass a dict;
-        in-process callers (tests, sibling modules) can still pass any
-        type. Reject non-dict defensively so the platform isn't asked
-        to validate JSON-encoded strings or lists."""
-        from a2a_tools_identity import tool_update_agent_card
-
-        result = json.loads(await tool_update_agent_card("not-a-dict"))
-        assert result["success"] is False
-        assert "dict" in str(result["error"]).lower()
-
-    @pytest.mark.asyncio
-    async def test_workspace_id_missing_returns_error(
-        self, monkeypatch, _grant_memory_write,
-    ):
-        """If WORKSPACE_ID is not set the tool refuses to issue the
-        request — it would otherwise POST with an empty workspace_id
-        and let the platform return a confusing 400."""
-        from a2a_tools_identity import tool_update_agent_card
-
-        monkeypatch.delenv("WORKSPACE_ID", raising=False)
-
-        result = json.loads(await tool_update_agent_card({"name": "x"}))
-        assert result["success"] is False
-        assert "workspace_id" in str(result["error"]).lower()
-
-    @pytest.mark.asyncio
-    async def test_denies_when_memory_write_permission_missing(self, monkeypatch):
-        """The agent's RBAC role must grant ``memory.write`` to update
-        the card. Read-only roles get an RBAC error string back
-        immediately, never touching the platform."""
-        import a2a_tools_identity
-
-        monkeypatch.setenv("WORKSPACE_ID", "ws-42")
-        monkeypatch.setattr(
-            a2a_tools_identity, "_check_memory_write_permission", lambda: False,
-        )
-
-        # Tripwire httpx — must not be called when RBAC denies.
-        import httpx
-
-        class _Tripwire:
-            def __init__(self, *_a, **_kw):
-                raise AssertionError("RBAC denial must short-circuit before httpx call")
-
-        monkeypatch.setattr(httpx, "AsyncClient", _Tripwire)
-
-        result = json.loads(
-            await a2a_tools_identity.tool_update_agent_card({"name": "x"}),
-        )
-        assert result["success"] is False
-        assert "memory.write" in str(result["error"]).lower()
-
-    @pytest.mark.asyncio
-    async def test_network_exception_returns_structured_error(
-        self, monkeypatch, _grant_memory_write,
-    ):
-        """A network exception (DNS failure, connect timeout, etc) is
-        wrapped into a structured error dict instead of bubbling up
-        to the MCP transport layer."""
-        import a2a_tools_identity
-
-        monkeypatch.setenv("WORKSPACE_ID", "ws-42")
-        monkeypatch.setattr(a2a_tools_identity, "PLATFORM_URL", "http://test.invalid")
-
-        class _ExplodingClient:
-            async def __aenter__(self):
-                return self
-
-            async def __aexit__(self, *_a):
-                return False
-
-            async def post(self, *_a, **_kw):
-                raise RuntimeError("simulated DNS failure")
-
-        monkeypatch.setattr(
-            a2a_tools_identity.httpx, "AsyncClient",
-            lambda *a, **kw: _ExplodingClient(),
-        )
-
-        result = json.loads(
-            await a2a_tools_identity.tool_update_agent_card({"name": "x"})
-        )
-        assert result["success"] is False
-        assert "network" in str(result["error"]).lower()
-
-
-# --- Registry contract ------------------------------------------------------
-
-
-class TestRegistryContract:
-    """Pin the new tools' registration in platform_tools.registry. The
-    structural tests in ``test_platform_tools.py`` already check
-    registry↔MCP alignment; these are tighter assertions specific to
-    the two new tools so a future contributor deleting one entry sees
-    a focused failure."""
-
-    def test_get_runtime_identity_in_registry(self):
-        from platform_tools.registry import by_name
-        spec = by_name("get_runtime_identity")
-        assert spec.section == "a2a"
-        # No input parameters — env-only call.
-        assert spec.input_schema == {"type": "object", "properties": {}}
-        # impl points at the actual tool function, not a shim.
-        from a2a_tools_identity import tool_get_runtime_identity
-        assert spec.impl is tool_get_runtime_identity
-
-    def test_update_agent_card_in_registry(self):
-        from platform_tools.registry import by_name
-        spec = by_name("update_agent_card")
-        assert spec.section == "a2a"
-        assert "card" in spec.input_schema["properties"]
-        assert spec.input_schema["required"] == ["card"]
-        from a2a_tools_identity import tool_update_agent_card
-        assert spec.impl is tool_update_agent_card
@@ -1,141 +1,153 @@
-"""Unit tests for resolve_provider_routing in adapter_base.
+"""Unit tests for OpenClaw adapter env-var key selection and provider URL routing.

-Covers provider routing, URL-override precedence, and the missing-key error path.
-Each adapter defines its own registry; this test file defines one inline that
-mirrors what the openclaw adapter uses.
+The key-selection and URL-routing logic lives inline in OpenClawAdapter.setup()
+(adapter.py lines 84-92).  Since setup() carries heavy subprocess dependencies,
+these tests isolate the selection logic by reproducing the exact Python expressions
+from the adapter source — if the adapter's logic changes, these tests must be kept
+in sync.
+
+Organisation:
+  TestEnvKeyChain          — priority order of the 3 currently supported keys
+  TestProviderUrlMapping   — model-prefix → provider URL dict correctness
+  TestNegativeAndFallback  — no keys set / unsupported keys
+  xfail stubs              — AISTUDIO + QIANFAN documented as not-yet-implemented
 """
 from __future__ import annotations

+import os
+from unittest.mock import patch
+
 import pytest

-from adapter_base import ProviderRegistry, resolve_provider_routing

-# Mirror of the registry in openclaw's adapter.py — kept in sync manually.
-PROVIDER_REGISTRY: ProviderRegistry = {
-    "openai":     (("OPENAI_API_KEY",),                     "https://api.openai.com/v1"),
-    "groq":       (("GROQ_API_KEY",),                       "https://api.groq.com/openai/v1"),
-    "openrouter": (("OPENROUTER_API_KEY",),                 "https://openrouter.ai/api/v1"),
-    "qianfan":    (("QIANFAN_API_KEY", "AISTUDIO_API_KEY"), "https://qianfan.baidubce.com/v2"),
-    "minimax":    (("MINIMAX_API_KEY",),                    "https://api.minimaxi.com/v1"),
-    "moonshot":   (("KIMI_API_KEY",),                       "https://api.moonshot.ai/v1"),
+# ---------------------------------------------------------------------------
+# Helpers — mirror the exact expressions from adapter.py lines 84-92.
+# Must be kept in sync with the adapter source.
+# ---------------------------------------------------------------------------
+
+def _select_key(env: dict) -> str:
+    """Mirror line 84: nested os.environ.get priority chain."""
+    return env.get("OPENAI_API_KEY",
+                   env.get("GROQ_API_KEY",
+                           env.get("OPENROUTER_API_KEY", "")))
+
+
+_PROVIDER_URLS: dict[str, str] = {
+    "openai":     "https://api.openai.com/v1",
+    "groq":       "https://api.groq.com/openai/v1",
+    "openrouter": "https://openrouter.ai/api/v1",
 }


-class TestProviderRouting:
-
-    def test_openai_key_and_url(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "openai:gpt-4o", {"OPENAI_API_KEY": "sk-openai"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-openai"
-        assert base_url == "https://api.openai.com/v1"
-        assert model_id == "gpt-4o"
-
-    def test_groq_key_and_url(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "groq:llama-3.3-70b", {"GROQ_API_KEY": "sk-groq"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-groq"
-        assert base_url == "https://api.groq.com/openai/v1"
-        assert model_id == "llama-3.3-70b"
-
-    def test_openrouter_key_and_url(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "openrouter:anthropic/claude-sonnet-4-5", {"OPENROUTER_API_KEY": "sk-or"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-or"
-        assert base_url == "https://openrouter.ai/api/v1"
-        assert model_id == "anthropic/claude-sonnet-4-5"
-
-    def test_qianfan_primary_key(self):
-        api_key, _, _ = resolve_provider_routing(
-            "qianfan:ernie-4.5", {"QIANFAN_API_KEY": "sk-qf", "AISTUDIO_API_KEY": "sk-ai"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-qf"
-
-    def test_qianfan_fallback_to_aistudio(self):
-        api_key, base_url, _ = resolve_provider_routing(
-            "qianfan:ernie-4.5", {"AISTUDIO_API_KEY": "sk-ai"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-ai"
-        assert base_url == "https://qianfan.baidubce.com/v2"
-
-    def test_minimax_key_and_url(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "minimax:MiniMax-M2.7", {"MINIMAX_API_KEY": "sk-mm"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-mm"
-        assert base_url == "https://api.minimaxi.com/v1"
-        assert model_id == "MiniMax-M2.7"
-
-    def test_moonshot_key_and_url(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "moonshot:kimi-k2.5", {"KIMI_API_KEY": "sk-kimi"}, registry=PROVIDER_REGISTRY
-        )
-        assert api_key == "sk-kimi"
-        assert base_url == "https://api.moonshot.ai/v1"
-        assert model_id == "kimi-k2.5"
-
-    def test_bare_model_id_defaults_to_openai(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "gpt-4o", {"OPENAI_API_KEY": "sk-openai"}, registry=PROVIDER_REGISTRY
-        )
-        assert base_url == "https://api.openai.com/v1"
-        assert model_id == "gpt-4o"
-
-    def test_unknown_prefix_falls_back_to_openai_url(self):
-        api_key, base_url, model_id = resolve_provider_routing(
-            "custom-shim:my-model", {"OPENAI_API_KEY": "sk-openai"}, registry=PROVIDER_REGISTRY
-        )
-        assert base_url == "https://api.openai.com/v1"
-        assert model_id == "my-model"
+def _select_url(model: str, runtime_config: dict | None = None) -> str:
+    """Mirror lines 86-92: model-prefix → provider URL with optional override."""
+    prefix = model.split(":")[0] if ":" in model else "openai"
+    return (runtime_config or {}).get(
+        "provider_url",
+        _PROVIDER_URLS.get(prefix, "https://api.openai.com/v1"),
+    )


-class TestUrlOverridePrecedence:
+# ---------------------------------------------------------------------------
+# 1. Env-var key priority chain (3 keys currently in adapter.py)
+# ---------------------------------------------------------------------------

-    def test_env_base_url_beats_registry_default(self):
-        _, base_url, _ = resolve_provider_routing(
-            "minimax:MiniMax-M2.7",
-            {"MINIMAX_API_KEY": "sk-mm", "MINIMAX_BASE_URL": "https://api.minimax.chat/v1"},
-            registry=PROVIDER_REGISTRY,
-        )
-        assert base_url == "https://api.minimax.chat/v1"
+class TestEnvKeyChain:

-    def test_runtime_config_provider_url_beats_registry_default(self):
-        _, base_url, _ = resolve_provider_routing(
-            "openai:gpt-4o",
-            {"OPENAI_API_KEY": "sk-openai"},
-            registry=PROVIDER_REGISTRY,
-            runtime_config={"provider_url": "https://proxy.example.com/v1"},
-        )
-        assert base_url == "https://proxy.example.com/v1"
+    def test_openai_key_selected(self):
+        with patch.dict(os.environ, {"OPENAI_API_KEY": "sk-openai-test"}, clear=True):
+            assert _select_key(os.environ) == "sk-openai-test"

-    def test_env_base_url_beats_runtime_config(self):
-        _, base_url, _ = resolve_provider_routing(
-            "openai:gpt-4o",
-            {"OPENAI_API_KEY": "sk-openai", "OPENAI_BASE_URL": "https://env-wins.com/v1"},
-            registry=PROVIDER_REGISTRY,
-            runtime_config={"provider_url": "https://config-loses.com/v1"},
-        )
-        assert base_url == "https://env-wins.com/v1"
+    def test_groq_key_selected_when_openai_absent(self):
+        with patch.dict(os.environ, {"GROQ_API_KEY": "sk-groq-test"}, clear=True):
+            assert _select_key(os.environ) == "sk-groq-test"
+
+    def test_openrouter_key_selected_when_openai_and_groq_absent(self):
+        with patch.dict(os.environ, {"OPENROUTER_API_KEY": "sk-or-test"}, clear=True):
+            assert _select_key(os.environ) == "sk-or-test"
+
+    def test_openai_beats_groq_when_both_set(self):
+        with patch.dict(os.environ, {"OPENAI_API_KEY": "openai", "GROQ_API_KEY": "groq"}, clear=True):
+            assert _select_key(os.environ) == "openai"
+
+    def test_groq_beats_openrouter_when_openai_absent(self):
+        with patch.dict(os.environ, {"GROQ_API_KEY": "groq", "OPENROUTER_API_KEY": "or"}, clear=True):
+            assert _select_key(os.environ) == "groq"


-class TestMissingKey:
+# ---------------------------------------------------------------------------
+# 2. Model-prefix → provider URL routing
+# ---------------------------------------------------------------------------

-    def test_raises_when_no_key_set(self):
-        with pytest.raises(RuntimeError, match="No API key found for provider 'minimax'"):
-            resolve_provider_routing("minimax:MiniMax-M2.7", {}, registry=PROVIDER_REGISTRY)
+class TestProviderUrlMapping:

-    def test_raises_lists_checked_vars_in_message(self):
-        with pytest.raises(RuntimeError, match="MINIMAX_API_KEY"):
-            resolve_provider_routing("minimax:MiniMax-M2.7", {}, registry=PROVIDER_REGISTRY)
+    def test_openai_prefix_routes_to_openai(self):
+        assert _select_url("openai:gpt-4o") == "https://api.openai.com/v1"
+
+    def test_groq_prefix_routes_to_groq(self):
+        assert _select_url("groq:llama3-70b") == "https://api.groq.com/openai/v1"
+
+    def test_openrouter_prefix_routes_to_openrouter(self):
+        assert _select_url("openrouter:meta-llama/llama-3.3-70b") == "https://openrouter.ai/api/v1"
+
+    def test_runtime_config_override_wins_over_prefix(self):
+        url = _select_url("openai:gpt-4o", {"provider_url": "https://custom.example.com/v1"})
+        assert url == "https://custom.example.com/v1"
+
+    def test_unknown_prefix_falls_back_to_openai(self):
+        assert _select_url("some-unknown-model") == "https://api.openai.com/v1"


-class TestRegistryCompleteness:
-    """Smoke-check that every provider in the registry has a non-empty entry."""
+# ---------------------------------------------------------------------------
+# 3. Negative / fallback cases
+# ---------------------------------------------------------------------------

-    @pytest.mark.parametrize("prefix", PROVIDER_REGISTRY)
-    def test_all_providers_have_key_vars_and_url(self, prefix):
-        env_vars, base_url = PROVIDER_REGISTRY[prefix]
-        assert env_vars, f"{prefix}: env_vars is empty"
-        assert base_url.startswith("https://"), f"{prefix}: base_url looks wrong: {base_url}"
+class TestNegativeAndFallback:
+
+    def test_no_keys_returns_empty_string(self):
+        with patch.dict(os.environ, {}, clear=True):
+            assert _select_key(os.environ) == ""
+
+    def test_unsupported_aistudio_key_returns_empty(self):
+        """Documents that AISTUDIO_API_KEY is NOT yet in the adapter's key chain."""
+        with patch.dict(os.environ, {"AISTUDIO_API_KEY": "sk-ai"}, clear=True):
+            assert _select_key(os.environ) == ""
+
+    def test_unsupported_qianfan_key_returns_empty(self):
+        """Documents that QIANFAN_API_KEY is NOT yet in the adapter's key chain."""
+        with patch.dict(os.environ, {"QIANFAN_API_KEY": "sk-qf"}, clear=True):
+            assert _select_key(os.environ) == ""
+
+
+# ---------------------------------------------------------------------------
+# 4. AISTUDIO + QIANFAN — xfail stubs (not yet implemented in adapter.py)
+#    These fail now; they should be promoted to passing tests once the adapter
+#    adds AISTUDIO_API_KEY and QIANFAN_API_KEY to its key chain and provider_urls.
+# ---------------------------------------------------------------------------
+
+@pytest.mark.xfail(
+    strict=True,
+    reason=(
+        "AISTUDIO_API_KEY not yet in openclaw adapter env-var chain — "
+        "add to adapter.py line 84 and provider_urls dict with "
+        "URL https://generativelanguage.googleapis.com/v1beta/openai"
+    ),
+)
+def test_aistudio_key_routes_to_aistudio_url():
+    with patch.dict(os.environ, {"AISTUDIO_API_KEY": "sk-ai-test"}, clear=True):
+        assert _select_key(os.environ) == "sk-ai-test"
+    assert _select_url("gemini-2.5-flash") == "https://generativelanguage.googleapis.com/v1beta/openai"
+
+
+@pytest.mark.xfail(
+    strict=True,
+    reason=(
+        "QIANFAN_API_KEY not yet in openclaw adapter env-var chain — "
+        "add to adapter.py line 84 and provider_urls dict with "
+        "URL https://qianfan.baidubce.com/v2"
+    ),
+)
+def test_qianfan_key_routes_to_qianfan_url():
+    with patch.dict(os.environ, {"QIANFAN_API_KEY": "sk-qf-test"}, clear=True):
+        assert _select_key(os.environ) == "sk-qf-test"
+    assert _select_url("ernie-4.5") == "https://qianfan.baidubce.com/v2"
Author	SHA1	Message	Date
fullstack-engineer	2f9c35f7d0	fix(handlers): add missing log import to container_files.go lint-required-no-paths / lint-required-no-paths (pull_request) Waiting to run Details audit-force-merge / audit (pull_request) Waiting to run Details Harness Replays / detect-changes (pull_request) Waiting to run Details Harness Replays / Harness Replays (pull_request) Blocked by required conditions Details Lint pre-flip continue-on-error / Verify continue-on-error flips have run-log proof (pull_request) Waiting to run Details lint-required-context-exists-in-bp / lint-required-context-exists-in-bp (pull_request) Waiting to run Details Runtime PR-Built Compatibility / detect-changes (pull_request) Waiting to run Details Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Blocked by required conditions Details Secret scan / Scan diff for credential-shaped strings (pull_request) Waiting to run Details Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 24s Details Lint curl status-code capture / Scan workflows for curl status-capture pollution (pull_request) Successful in 32s Details Check migration collisions / Migration version collision check (pull_request) Successful in 1m30s Details MCP Stdio Transport Regression / MCP stdio with regular-file stdout (pull_request) Successful in 2m3s Details CI / Detect changes (pull_request) Successful in 2m13s Details E2E API Smoke Test / detect-changes (pull_request) Successful in 2m10s Details Handlers Postgres Integration / detect-changes (pull_request) Successful in 2m9s Details publish-runtime-autobump / bump-and-tag (pull_request) Has been skipped Details publish-runtime-autobump / pr-validate (pull_request) Successful in 1m26s Details gate-check-v3 / gate-check (pull_request) Successful in 32s Details qa-review / approved (pull_request) Successful in 39s Details security-review / approved (pull_request) Successful in 36s Details sop-tier-check / tier-check (pull_request) Successful in 1m14s Details lint-mask-pr-atomicity / lint-mask-pr-atomicity (pull_request) Successful in 4m23s Details Lint workflow YAML (Gitea-1.22.6-hostile shapes) / Lint workflow YAML for Gitea-1.22.6-hostile shapes (pull_request) Successful in 3m11s Details Ops Scripts Tests / Ops scripts (unittest) (pull_request) Failing after 2m22s Details lint-continue-on-error-tracking / lint-continue-on-error-tracking (pull_request) Successful in 4m38s Details CI / Shellcheck (E2E scripts) (pull_request) Successful in 38s Details E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 6m59s Details Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 8m16s Details CI / Python Lint & Test (pull_request) Successful in 8m53s Details CI / Platform (Go) (pull_request) Failing after 12m51s Details CI / Canvas (Next.js) (pull_request) Successful in 21m28s Details CI / Canvas Deploy Reminder (pull_request) Has been skipped Details CI / all-required (pull_request) Successful in 8s Details sop-checklist / all-items-acked (pull_request) [info tier:low] acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, l Details log.Printf was called at line 35 but "log" was not imported, causing a build failure. Closes QA review comment on PR #1117. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 07:35:38 +00:00
fullstack-engineer	508a5976e8	fix(handlers): log DB Scan errors previously silently ignored (3 files) E2E API Smoke Test / E2E API Smoke Test (pull_request) Blocked by required conditions Details Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 18s Details Harness Replays / detect-changes (pull_request) Successful in 16s Details CI / Detect changes (pull_request) Successful in 45s Details Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 18s Details gate-check-v3 / gate-check (pull_request) Successful in 20s Details qa-review / approved (pull_request) Successful in 21s Details Handlers Postgres Integration / detect-changes (pull_request) Successful in 55s Details security-review / approved (pull_request) Successful in 22s Details Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 1m2s Details sop-tier-check / tier-check (pull_request) Successful in 22s Details lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m26s Details Harness Replays / Harness Replays (pull_request) Successful in 11s Details CI / Canvas (Next.js) (pull_request) Successful in 19s Details CI / Shellcheck (E2E scripts) (pull_request) Successful in 17s Details CI / Python Lint & Test (pull_request) Successful in 9s Details Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 11s Details CI / Platform (Go) (pull_request) Failing after 4m22s Details E2E API Smoke Test / detect-changes (pull_request) Failing after 11m15s Details Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Failing after 5m27s Details CI / Canvas Deploy Reminder (pull_request) Has been skipped Details CI / all-required (pull_request) Successful in 11s Details sop-checklist / all-items-acked (pull_request) [info tier:low] acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, l Details tokens.go Create: COUNT query Scan error ignored — if DB fails, count=0, bypassing the per-workspace token rate limit. Now logs the error and fails open (DB errors should not block token creation). memories.go Commit: GLOBAL scope parent lookup Scan error ignored — if DB fails, workspace is incorrectly treated as root, allowing a forbidden GLOBAL write. Now returns 500 (fail closed, security-sensitive path). memories.go Search: parent lookup Scan error ignored — DB failure causes wrong TEAM-scope search results (self-only filter instead of team filter). Now logs and falls back to self-only (functional degradation, not security). container_files.go List: workspace name lookup Scan error ignored — now logs and continues (non-critical; container name candidates still tried). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 03:16:07 +00:00