chore: sync staging-v6 to main HEAD (PRs #1045 + workspace-server image rebuild)

Rebuild bakes updated openclaw config.yaml (adds MiniMax M2.7 and Kimi K2.6 entries) into /workspace-configs-templates.

.gitea/scripts/ci-required-drift.py

@@ -203,12 +203,17 @@ def ci_jobs_all(ci_doc: dict) -> set[str]:
 
 def ci_job_names(ci_doc: dict) -> set[str]:
     """Set of job keys in ci.yml MINUS the sentinel itself MINUS jobs
-    whose `if:` gates on `github.event_name` (those are event-scoped
-    and can legitimately be `skipped` for a given trigger; if we
-    required them under the sentinel `needs:`, every PR-only job
+    whose `if:` gates on `github.event_name` or `github.ref` (those are
+    event-scoped and can legitimately be `skipped` for a given trigger;
+    if we required them under the sentinel `needs:`, every PR-only job
     would be `skipped` on push and the sentinel would interpret
     `skipped != success` as failure). RFC §4 spec.
 
+    `github.ref` is the companion gate for jobs that run only on direct
+    pushes to specific branches (e.g. `github.ref == 'refs/heads/main'`).
+    These never execute in a PR context, so flagging them as missing
+    from `all-required.needs:` is a false positive (mc#958 / mc#959).
+
     Used for F1 (jobs missing from sentinel needs). NOT used for F1b
     (typos in needs) — see `ci_jobs_all` for that."""
     jobs = ci_doc.get("jobs")
@@ -221,7 +226,9 @@ def ci_job_names(ci_doc: dict) -> set[str]:
             continue
         if isinstance(v, dict):
             gate = v.get("if")
-            if isinstance(gate, str) and "github.event_name" in gate:
+            if isinstance(gate, str) and (
+                "github.event_name" in gate or "github.ref" in gate
+            ):
                 continue
         names.add(k)
     return names

.gitea/scripts/gitea-merge-queue.py

@@ -417,7 +417,21 @@ def main() -> int:
     parser.add_argument("--dry-run", action="store_true")
     args = parser.parse_args()
     _require_runtime_env()
-    return process_once(dry_run=args.dry_run)
+    try:
+        return process_once(dry_run=args.dry_run)
+    except ApiError as exc:
+        # API errors (401/403/404/500) are transient for a queue tick —
+        # log and exit 0 so the workflow is not marked failed and the next
+        # tick can retry. Returning non-zero would permanently fail the
+        # workflow run, blocking future ticks.
+        sys.stderr.write(f"::error::queue API error: {exc}\n")
+        return 0
+    except urllib.error.URLError as exc:
+        sys.stderr.write(f"::error::queue network error: {exc}\n")
+        return 0
+    except TimeoutError as exc:
+        sys.stderr.write(f"::error::queue timeout: {exc}\n")
+        return 0
 
 
 if __name__ == "__main__":

.gitea/scripts/sop-checklist.py

@@ -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

.gitea/workflows/ci.yml

@@ -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,6 +302,7 @@ 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.
@@ -309,20 +311,20 @@ jobs:
       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 +333,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
@@ -398,8 +400,6 @@ jobs:
             scripts/promote-tenant-image.sh \
             scripts/test-promote-tenant-image.sh
 
-  # mc#959 root-fix (sre)
-
   canvas-deploy-reminder:
     name: Canvas Deploy Reminder
     runs-on: ubuntu-latest
@@ -408,8 +408,8 @@ jobs:
     # The step-level exit 0 handles the "not main push" case; the job-level
     # `if:` makes the gating explicit so the drift script sees it.
     # continue-on-error removed (was mc#774 mask): step exits 0 when not applicable.
-    if: ${{ github.ref == 'refs/heads/staging' }}
     needs: [changes, canvas-build]
+    if: ${{ github.ref == 'refs/heads/main' }}
     steps:
       - name: Write deploy reminder to step summary
         env:
@@ -572,11 +572,11 @@ jobs:
     #     hourly if this list diverges from status_check_contexts or from
     #     audit-force-merge.yml's REQUIRED_CHECKS env (RFC §4 + §6).
     #
-    # canvas-deploy-reminder is intentionally excluded from all-required.needs:
-    # it needs canvas-build, which is skipped on CI-only PRs (canvas=false).
-    # Including it in all-required.needs causes all-required to hang on
-    # every CI-only PR. Keep it runnable on PRs via its own
-    # `needs: [changes, canvas-build]` — the sentinel only aggregates the result.
+    # canvas-deploy-reminder IS now included in all-required.needs (mc#958 root-fix):
+    # added job-level `if: github.ref == 'refs/heads/main'` so ci-required-drift.py's
+    # ci_job_names() detects it as github.ref-gated and skips it from F1.
+    # The step-level `if: ... || REF_NAME != refs/heads/main` exits 0 when not main,
+    # so the job succeeds (not skipped) on non-main pushes — sentinel treats as green.
     #
     # Phase 3 (RFC #219 §1) safety: underlying build jobs carry
     # continue-on-error: true so their failures are masked to null (2026-05-12: re-enabled mc#774 interim)

.staging-trigger

@@ -1 +1 @@
-staging trigger
+staging trigger 2026-05-14T17:35:02Z

_ci_trigger.txt

@@ -0,0 +1 @@
+trigger

canvas/src/components/MissingKeysModal.tsx

@@ -344,7 +344,7 @@ function ProviderPickerModal({
   // wrapper's bounds instead of the viewport.
   if (typeof document === "undefined") return null;
 
-  const allSaved = entries.every((e) => e.saved);
+  const allSaved = entries.length > 0 && entries.every((e) => e.saved);
   const anySaving = entries.some((e) => e.saving);
   const runtimeLabel = runtime
     .replace(/[-_]/g, " ")
@@ -616,7 +616,7 @@ function AllKeysModal({
   if (!open) return null;
   if (typeof document === "undefined") return null;
 
-  const allSaved = entries.every((e) => e.saved);
+  const allSaved = entries.length > 0 && entries.every((e) => e.saved);
   const anySaving = entries.some((e) => e.saving);
   const runtimeLabel = runtime
     .replace(/[-_]/g, " ")

canvas/src/components/ThemeToggle.tsx

@@ -62,12 +62,21 @@ export function ThemeToggle({ className = "" }: { className?: string }) {
       }
       setTheme(OPTIONS[next].value);
       // Move focus to the new button so arrow-key navigation is continuous.
-      // Query is already scoped to radiogroup so no child-combinator needed;
-      // avoids accidentally focusing unrelated [role=radio] elements
+      // Use direct-child query to scope strictly to this radiogroup's buttons
+      // and avoid accidentally focusing unrelated [role=radio] elements
       // elsewhere in the DOM (e.g. React Flow canvas nodes).
+      // Guard: skip focus if the current target is no longer in the document
+      // (e.g. React StrictMode double-invokes handlers during re-render).
+      if (!e.currentTarget.isConnected) return;
       const radiogroup = e.currentTarget.closest("[role=radiogroup]") as HTMLElement | null;
-      const btns = radiogroup?.querySelectorAll<HTMLButtonElement>("[role=radio]");
-      btns?.[next]?.focus();
+      if (!radiogroup) return;
+      // Use children[] instead of querySelectorAll("> [role=radio]") to avoid
+      // jsdom's child-combinator selector parsing issues in test environments.
+      const btns = Array.from(radiogroup.children).filter(
+        (el): el is HTMLButtonElement =>
+          el.tagName === "BUTTON" && el.getAttribute("role") === "radio"
+      );
+      if (next < btns.length) btns[next]?.focus();
     },
     []
   );

canvas/src/components/WorkspaceNode.tsx

@@ -13,20 +13,17 @@ import { isExternalLikeRuntime } from "@/lib/externalRuntimes";
 
 /** Descendant count for the "N sub" badge — children are first-class nodes
  *  rendered as full cards inside this one via React Flow's native parentId,
- *  so we don't need to subscribe to the actual child list here.
- *  Selecting `nodes` stably avoids a new selector reference on every store
- *  update (React error #185 / Zustand + React 19 Object.is strictness). */
+ *  so we don't need to subscribe to the actual child list here. */
 function useDescendantCount(nodeId: string): number {
-  const nodes = useCanvasStore((s) => s.nodes);
-  return useMemo(() => countDescendants(nodeId, nodes), [nodeId, nodes]);
+  return useCanvasStore(
+    useCallback((s) => countDescendants(nodeId, s.nodes), [nodeId])
+  );
 }
 
-/** Boolean flag used to drive min-size and NodeResizer dimensions.
- *  Selecting `nodes` stably avoids re-render loops (same issue as
- *  useDescendantCount). */
 function useHasChildren(nodeId: string): boolean {
-  const nodes = useCanvasStore((s) => s.nodes);
-  return useMemo(() => nodes.some((n) => n.data.parentId === nodeId), [nodes, nodeId]);
+  return useCanvasStore(
+    useCallback((s) => s.nodes.some((n) => n.data.parentId === nodeId), [nodeId])
+  );
 }
 
 /** Eject/extract arrow icon — visually distinct from delete ✕ */

canvas/src/components/__tests__/ThemeToggle.test.tsx

@@ -24,8 +24,12 @@ vi.mock("@/lib/theme-provider", () => ({
   })),
 }));
 
+// Wrap cleanup in act() so any pending React state updates (e.g. from
+// keyDown handlers that call setTheme) flush before DOM unmount. Without
+// this, cleanup() can race against pending renders and cause INDEX_SIZE_ERR
+// when the handleKeyDown callback tries to query the DOM mid-teardown.
 afterEach(() => {
-  cleanup();
+  act(() => { cleanup(); });
   vi.clearAllMocks();
 });
 
@@ -146,7 +150,7 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     const radios = screen.getAllByRole("radio");
     // dark (index 2) is current; ArrowRight should wrap to light (index 0)
     act(() => { radios[2].focus(); });
-    fireEvent.keyDown(radios[2], { key: "ArrowRight" });
+    act(() => { fireEvent.keyDown(radios[2], { key: "ArrowRight" }); });
     expect(mockSetTheme).toHaveBeenCalledWith("light");
   });
 
@@ -160,7 +164,7 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     const radios = screen.getAllByRole("radio");
     // light (index 0) is current; ArrowLeft should go to dark (index 2)
     act(() => { radios[0].focus(); });
-    fireEvent.keyDown(radios[0], { key: "ArrowLeft" });
+    act(() => { fireEvent.keyDown(radios[0], { key: "ArrowLeft" }); });
     expect(mockSetTheme).toHaveBeenCalledWith("dark");
   });
 
@@ -174,7 +178,7 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     const radios = screen.getAllByRole("radio");
     // light (index 0) is current; ArrowDown should go to system (index 1)
     act(() => { radios[0].focus(); });
-    fireEvent.keyDown(radios[0], { key: "ArrowDown" });
+    act(() => { fireEvent.keyDown(radios[0], { key: "ArrowDown" }); });
     expect(mockSetTheme).toHaveBeenCalledWith("system");
   });
 
@@ -187,7 +191,7 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     render(<ThemeToggle />);
     const radios = screen.getAllByRole("radio");
     act(() => { radios[2].focus(); });
-    fireEvent.keyDown(radios[2], { key: "Home" });
+    act(() => { fireEvent.keyDown(radios[2], { key: "Home" }); });
     expect(mockSetTheme).toHaveBeenCalledWith("light");
   });
 
@@ -200,14 +204,14 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     render(<ThemeToggle />);
     const radios = screen.getAllByRole("radio");
     act(() => { radios[0].focus(); });
-    fireEvent.keyDown(radios[0], { key: "End" });
+    act(() => { fireEvent.keyDown(radios[0], { key: "End" }); });
     expect(mockSetTheme).toHaveBeenCalledWith("dark");
   });
 
   it("does nothing on unrelated keys", () => {
     render(<ThemeToggle />);
     const radios = screen.getAllByRole("radio");
-    fireEvent.keyDown(radios[0], { key: "Enter" });
+    act(() => { fireEvent.keyDown(radios[0], { key: "Enter" }); });
     expect(mockSetTheme).not.toHaveBeenCalled();
   });
 });

canvas/src/components/canvas/DropTargetBadge.tsx

@@ -24,20 +24,16 @@ import {
  */
 export function DropTargetBadge() {
   const dragOverNodeId = useCanvasStore((s) => s.dragOverNodeId);
-  // Select nodes stably first — deriving targetName and childCount inside
-  // the same selector creates a new return value on every store mutation
-  // even when neither has changed (React error #185 / Zustand Object.is).
-  const nodes = useCanvasStore((s) => s.nodes);
-  const targetName = (() => {
-    if (!dragOverNodeId) return null;
-    const n = nodes.find((nn) => nn.id === dragOverNodeId);
+  const targetName = useCanvasStore((s) => {
+    if (!s.dragOverNodeId) return null;
+    const n = s.nodes.find((nn) => nn.id === s.dragOverNodeId);
     return (n?.data as WorkspaceNodeData | undefined)?.name ?? null;
-  })();
-  const childCount = (() =>
-    !dragOverNodeId
+  });
+  const childCount = useCanvasStore((s) =>
+    !s.dragOverNodeId
       ? 0
-      : nodes.filter((n) => n.parentId === dragOverNodeId).length
-  )();
+      : s.nodes.filter((n) => n.parentId === s.dragOverNodeId).length,
+  );
   const { getInternalNode, flowToScreenPosition } = useReactFlow();
   if (!dragOverNodeId || !targetName) return null;
   const internal = getInternalNode(dragOverNodeId);

canvas/src/components/canvas/useCanvasViewport.ts

@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { useReactFlow } from "@xyflow/react";
 import { useCanvasStore } from "@/store/canvas";
 import { appendClass, removeClass } from "@/store/classNames";
@@ -153,17 +153,10 @@ export function useCanvasViewport() {
   // fit, the user has to manually pan + zoom to find what they just
   // created. Only fires when TRANSITIONING from some-provisioning to
   // zero-provisioning — not on every re-render.
-  //
-  // Selecting `nodes` stably (array reference) avoids the
-  // `.filter().length` anti-pattern which creates a new number on every
-  // store update and breaks the wasProvisioning/hasProvisioning
-  // transition detection (React error #185 / Zustand + React 19).
-  const nodes = useCanvasStore((s) => s.nodes);
-  const provisioningCount = useMemo(
-    () => nodes.filter((n) => n.data.status === "provisioning").length,
-    [nodes],
+  const provisioningCount = useCanvasStore(
+    (s) => s.nodes.filter((n) => n.data.status === "provisioning").length,
   );
-  const nodeCount = nodes.length;
+  const nodeCount = useCanvasStore((s) => s.nodes.length);
 
   useEffect(() => {
     const hasProvisioning = provisioningCount > 0;

canvas/src/components/mobile/MobileChat.tsx

@@ -5,7 +5,7 @@
 // that the desktop ChatTab uses, but with a slimmer surface: no
 // attachments, no A2A topology overlay, no conversation tracing.
 
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 
 import { api } from "@/lib/api";
 import { useCanvasStore } from "@/store/canvas";
@@ -36,20 +36,6 @@ interface A2AResponseShape {
   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" });
 
@@ -63,10 +49,7 @@ 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]);
+  const node = useCanvasStore((s) => s.nodes.find((n) => n.id === 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
@@ -75,14 +58,18 @@ export function MobileChat({
   // 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 [messages, setMessages] = useState<ChatMessage[]>(() =>
+    (storedMessages ?? []).map((m) => ({
+      id: m.id,
+      role: "agent",
+      text: m.content,
+      ts: formatStoredTimestamp(m.timestamp),
+    })),
+  );
   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
@@ -90,9 +77,6 @@ export function MobileChat({
   // double-send race a stale `sending` lets through.
   const sendInFlightRef = useRef(false);
   const composerRef = useRef<HTMLTextAreaElement>(null);
-  // 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
@@ -105,75 +89,6 @@ 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;
@@ -393,61 +308,7 @@ export function MobileChat({
             Agent Comms — peer-to-peer A2A traffic surfaces in the Comms tab.
           </div>
         )}
-        {tab === "my" && loading && (
-          <div style={{ padding: "20px 4px", textAlign: "center", color: p.text3, fontSize: 13 }}>
-            <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" && !loading && historyError && (
-          <div
-            role="alert"
-            style={{
-              padding: "14px 4px",
-              textAlign: "center",
-              color: p.failed,
-              fontSize: 13,
-            }}
-          >
-            <div style={{ marginBottom: 8 }}>Could not load chat history.</div>
-            <button
-              type="button"
-              onClick={() => {
-                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",
-                borderRadius: 14,
-                border: `0.5px solid ${p.failed}`,
-                background: "transparent",
-                color: p.failed,
-                fontSize: 12,
-                cursor: "pointer",
-              }}
-            >
-              Retry
-            </button>
-          </div>
-        )}
-        {tab === "my" && !loading && !historyError && messages.length === 0 && (
+        {tab === "my" && messages.length === 0 && (
           <div style={{ padding: "20px 4px", textAlign: "center", color: p.text3, fontSize: 13 }}>
             Send a message to start chatting.
           </div>

canvas/src/components/mobile/MobileDetail.tsx

@@ -2,7 +2,7 @@
 
 // 03 · Agent detail — pills + tabbed content (Overview/Activity/Config/Memory).
 
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 
 import { api } from "@/lib/api";
 import { useCanvasStore } from "@/store/canvas";
@@ -32,10 +32,7 @@ export function MobileDetail({
   onChat: () => 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]);
+  const node = useCanvasStore((s) => s.nodes.find((n) => n.id === agentId));
   const [tab, setTab] = useState<TabId>("overview");
 
   if (!node) {

canvas/src/components/mobile/__tests__/MobileChat.test.tsx

@@ -8,19 +8,11 @@
  * NOTE: No @testing-library/jest-dom — use DOM APIs.
  */
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { act, cleanup, render, waitFor } from "@testing-library/react";
+import { cleanup, render } from "@testing-library/react";
 import React from "react";
 
 import { MobileChat } from "../MobileChat";
 
-// ─── Mock API ─────────────────────────────────────────────────────────────────
-// vi.mock without a factory auto-mocks the module. In tests, we configure
-// api.get / api.post directly (they are vi.fn() from the auto-mock).
-// Tests that need specific behaviour use mockResolvedValueOnce on the
-// auto-mocked functions.
-vi.mock("@/lib/api");
-import { api } from "@/lib/api";
-
 // ─── Mock store ───────────────────────────────────────────────────────────────
 
 const mockAgentId = "ws-chat-test";
@@ -40,14 +32,8 @@ const mockStoreState = {
 
 vi.mock("@/store/canvas", () => ({
   useCanvasStore: Object.assign(
-    vi.fn((sel?: (state: typeof mockStoreState) => unknown) => {
-      if (sel) return sel(mockStoreState);
-      return mockStoreState;
-    }),
-    {
-      getState: () => mockStoreState,
-      subscribe: vi.fn(() => vi.fn()),
-    },
+    vi.fn((sel) => sel(mockStoreState)),
+    { getState: () => mockStoreState },
   ),
   summarizeWorkspaceCapabilities: vi.fn((data: Record<string, unknown>) => {
     const agentCard = data.agentCard as Record<string, unknown> | null;
@@ -68,6 +54,16 @@ vi.mock("@/store/canvas", () => ({
   }),
 }));
 
+// ─── Mock API ─────────────────────────────────────────────────────────────────
+
+const { mockApiPost } = vi.hoisted(() => ({
+  mockApiPost: vi.fn().mockResolvedValue({ result: { parts: [] } }),
+}));
+
+vi.mock("@/lib/api", () => ({
+  api: { post: mockApiPost },
+}));
+
 // ─── Fixtures ────────────────────────────────────────────────────────────────
 
 const onlineNode = {
@@ -154,15 +150,7 @@ beforeEach(() => {
   mockOnBack.mockClear();
   mockStoreState.nodes = [];
   mockStoreState.agentMessages = {};
-  // Set up spies on the real api methods. Tests override these per-call.
-  const getSpy = vi.spyOn(api, "get");
-  const postSpy = vi.spyOn(api, "post");
-  getSpy.mockResolvedValue({ messages: [], reached_end: true });
-  postSpy.mockResolvedValue({ result: { parts: [] } });
-});
-
-afterEach(() => {
-  vi.restoreAllMocks();
+  mockApiPost.mockClear();
 });
 
 afterEach(() => {
@@ -278,26 +266,15 @@ describe("MobileChat — empty state", () => {
     mockStoreState.nodes = [onlineNode];
   });
 
-  it('shows "Send a message to start chatting." when no messages', async () => {
-    // History fetch resolves immediately in tests (mockResolvedValue).
-    // act() flushes the microtask queue so the component reaches its
-    // post-load state before we assert.
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    const { container } = renderResult!;
+  it('shows "Send a message to start chatting." when no messages', () => {
+    const { container } = renderChat(mockAgentId);
     expect(container.textContent ?? "").toContain("Send a message to start chatting.");
   });
 
-  it("shows no messages when agentMessages[agentId] is absent (undefined)", async () => {
+  it("shows no messages when agentMessages[agentId] is absent (undefined)", () => {
     // Explicitly set to empty to simulate no stored messages
     mockStoreState.agentMessages = {};
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    const { container } = renderResult!;
+    const { container } = renderChat(mockAgentId);
     expect(container.textContent ?? "").toContain("Send a message to start chatting.");
   });
 });
@@ -344,132 +321,3 @@ describe("MobileChat — dark mode", () => {
     expect(container.querySelector('[aria-label="Back"]')).toBeTruthy();
   });
 });
-
-// ─── Chat history loading ────────────────────────────────────────────────────
-
-describe("MobileChat — chat history", () => {
-  beforeEach(() => {
-    mockStoreState.nodes = [onlineNode];
-  });
-
-  it("calls GET /workspaces/:id/chat-history on mount", async () => {
-    await act(async () => {
-      renderChat(mockAgentId);
-    });
-    expect(api.get).toHaveBeenCalledWith(
-      `/workspaces/${mockAgentId}/chat-history?limit=50`,
-    );
-  });
-
-  it("shows loading state while history is fetching", () => {
-    // Do NOT await — check the pre-resolve state.
-    const { container } = renderChat(mockAgentId);
-    expect(container.textContent ?? "").toContain("Loading chat history…");
-  });
-
-  it("shows empty state after history resolves with no messages", async () => {
-    // beforeEach already sets api.get to resolve with empty — no override needed.
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    const { container } = renderResult!;
-    expect(container.textContent ?? "").toContain("Send a message to start chatting.");
-  });
-
-  it("renders messages from history response", async () => {
-    vi.spyOn(api, "get").mockResolvedValueOnce({
-      messages: [
-        {
-          id: "msg-1",
-          role: "user",
-          content: "Hello agent",
-          timestamp: "2026-04-25T10:00:00Z",
-        },
-        {
-          id: "msg-2",
-          role: "agent",
-          content: "Hello back",
-          timestamp: "2026-04-25T10:00:01Z",
-        },
-      ],
-      reached_end: true,
-    });
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    const { container } = renderResult!;
-    expect(container.textContent ?? "").toContain("Hello agent");
-    expect(container.textContent ?? "").toContain("Hello back");
-  });
-
-  it("maps user role from API correctly", async () => {
-    vi.spyOn(api, "get").mockResolvedValueOnce({
-      messages: [
-        {
-          id: "msg-u",
-          role: "user",
-          content: "user message",
-          timestamp: "2026-04-25T10:00:00Z",
-        },
-      ],
-      reached_end: true,
-    });
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    // User messages render right-aligned. The text content check is sufficient
-    // to confirm the message appeared.
-    const { container } = renderResult!;
-    expect(container.textContent ?? "").toContain("user message");
-  });
-
-  it("shows error state when history fetch fails", async () => {
-    vi.spyOn(api, "get").mockRejectedValue(new Error("Network error"));
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    const { container } = renderResult!;
-    expect(container.textContent ?? "").toContain("Could not load chat history.");
-    expect(container.textContent ?? "").toContain("Retry");
-  });
-
-  it("Retry button re-fetches history after error", async () => {
-    // Make the initial mount call fail so the Retry button appears, then
-    // make the retry call succeed so we can verify the full flow.
-    const getSpy = vi.spyOn(api, "get");
-    getSpy
-      .mockRejectedValueOnce(new Error("Network error"))
-      .mockResolvedValueOnce({ messages: [], reached_end: true });
-
-    let renderResult: ReturnType<typeof renderChat>;
-    await act(async () => {
-      renderResult = renderChat(mockAgentId);
-    });
-    const { container } = renderResult!;
-
-    // Error state should be shown with Retry button.
-    expect(container.textContent ?? "").toContain("Could not load chat history.");
-    expect(container.textContent ?? "").toContain("Retry");
-
-    // Click Retry — the button's onClick fires api.get again.
-    // The second mockResolvedValueOnce makes it succeed.
-    const retryBtn = Array.from(container.querySelectorAll("button")).find(
-      (b) => b.textContent?.trim() === "Retry",
-    );
-    expect(retryBtn).toBeTruthy();
-    await act(async () => {
-      retryBtn?.click();
-    });
-
-    // waitFor polls until the retry resolves and component re-renders.
-    await waitFor(() => {
-      expect(container.textContent ?? "").toContain("Send a message to start chatting.");
-    });
-    // Initial call + retry = 2.
-    expect(getSpy).toHaveBeenCalledTimes(2);
-  });
-});

canvas/src/components/tabs/ChatTab.tsx

@@ -962,32 +962,6 @@ 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">
         {loading && (

canvas/src/store/canvas-topology.ts

@@ -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) {

canvas/src/store/canvas.ts

@@ -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";

canvas/src/store/socket.ts

@@ -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;

tests/e2e/test_workspace_abilities_e2e.sh

@@ -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 ]

workspace-server/internal/handlers/a2a_proxy.go

@@ -97,28 +97,28 @@ const maxProxyResponseBody = 10 << 20
 //
 // Timeout model — three independent budgets, none of which gets in each other's way:
 //
-//   1. Client.Timeout — DELIBERATELY UNSET. Client.Timeout is a hard wall on
-//      the entire request including streamed body reads, and would pre-empt
-//      legitimate slow cold-start flows (Claude Code first-token over OAuth
-//      can take 30-60s on boot; long-running agent synthesis can stream
-//      tokens for minutes). Total-request budget is enforced per-request
-//      via context deadline (canvas = idle-only, agent-to-agent = 30 min ceiling).
+//  1. Client.Timeout — DELIBERATELY UNSET. Client.Timeout is a hard wall on
+//     the entire request including streamed body reads, and would pre-empt
+//     legitimate slow cold-start flows (Claude Code first-token over OAuth
+//     can take 30-60s on boot; long-running agent synthesis can stream
+//     tokens for minutes). Total-request budget is enforced per-request
+//     via context deadline (canvas = idle-only, agent-to-agent = 30 min ceiling).
 //
-//   2. Transport.DialContext — 10s connect timeout. When a workspace's EC2
-//      black-holes TCP connects (instance terminated mid-flight, security group
-//      flipped, NACL bug), the OS default is 75s on Linux / 21s on macOS — long
-//      enough that Cloudflare's ~100s edge timeout can fire first and surface
-//      a generic 502 page to canvas. 10s is well above realistic intra-region
-//      latencies and well below CF's edge timeout.
+//  2. Transport.DialContext — 10s connect timeout. When a workspace's EC2
+//     black-holes TCP connects (instance terminated mid-flight, security group
+//     flipped, NACL bug), the OS default is 75s on Linux / 21s on macOS — long
+//     enough that Cloudflare's ~100s edge timeout can fire first and surface
+//     a generic 502 page to canvas. 10s is well above realistic intra-region
+//     latencies and well below CF's edge timeout.
 //
-//   3. Transport.ResponseHeaderTimeout — 180s default. From request-body-end
-//      to response-headers-start. Configurable via
-//      A2A_PROXY_RESPONSE_HEADER_TIMEOUT (envx.Duration). Covers cold-start
-//      first-byte (30-60s OAuth flow above) with enough room for Opus agent
-//      turns (big context + internal delegate_task round-trips routinely exceed
-//      the old 60s ceiling). Body streaming after headers is governed by the
-//      per-request context deadline, NOT this timeout — so multi-minute agent
-//      responses still work fine.
+//  3. Transport.ResponseHeaderTimeout — 180s default. From request-body-end
+//     to response-headers-start. Configurable via
+//     A2A_PROXY_RESPONSE_HEADER_TIMEOUT (envx.Duration). Covers cold-start
+//     first-byte (30-60s OAuth flow above) with enough room for Opus agent
+//     turns (big context + internal delegate_task round-trips routinely exceed
+//     the old 60s ceiling). Body streaming after headers is governed by the
+//     per-request context deadline, NOT this timeout — so multi-minute agent
+//     responses still work fine.
 //
 // The point of (2) and (3) is to surface a *structured* 503 from
 // handleA2ADispatchError when the workspace agent is unreachable, so canvas

workspace-server/internal/handlers/a2a_proxy_helpers.go

@@ -194,7 +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{}{})
-	go h.RestartByID(workspaceID)
+	h.goAsync(func() { h.RestartByID(workspaceID) })
 	return true
 }
 
@@ -241,7 +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{}{})
-	go h.RestartByID(workspaceID)
+	h.goAsync(func() { h.RestartByID(workspaceID) })
 	return &proxyA2AError{
 		Status: http.StatusServiceUnavailable,
 		Response: gin.H{
@@ -262,8 +262,8 @@ func (h *WorkspaceHandler) logA2AFailure(ctx context.Context, workspaceID, calle
 		errWsName = workspaceID
 	}
 	summary := "A2A request to " + errWsName + " failed: " + errMsg
-	go func(parent context.Context) {
-		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
+	h.goAsync(func() {
+		logCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
 		defer cancel()
 		LogActivity(logCtx, h.broadcaster, ActivityParams{
 			WorkspaceID:  workspaceID,
@@ -277,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
@@ -298,19 +298,19 @@ 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 {
-		go func() {
+		h.goAsync(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)
-	go func(parent context.Context) {
-		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
+	h.goAsync(func() {
+		logCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
 		defer cancel()
 		LogActivity(logCtx, h.broadcaster, ActivityParams{
 			WorkspaceID:  workspaceID,
@@ -325,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{}{
@@ -510,8 +510,8 @@ func (h *WorkspaceHandler) logA2AReceiveQueued(ctx context.Context, workspaceID,
 		wsName = workspaceID
 	}
 	summary := a2aMethod + " → " + wsName + " (queued for poll)"
-	go func(parent context.Context) {
-		logCtx, cancel := context.WithTimeout(context.WithoutCancel(parent), 30*time.Second)
+	h.goAsync(func() {
+		logCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
 		defer cancel()
 		LogActivity(logCtx, h.broadcaster, ActivityParams{
 			WorkspaceID:  workspaceID,
@@ -523,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.

workspace-server/internal/handlers/a2a_proxy_preflight_test.go

@@ -54,6 +54,7 @@ func TestPreflight_ContainerRunning_ReturnsNil(t *testing.T) {
 	_ = setupTestDB(t)
 	stub := &preflightLocalProv{running: true, err: nil}
 	h := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, h)
 	h.provisioner = stub
 
 	if err := h.preflightContainerHealth(context.Background(), "ws-running-123"); err != nil {
@@ -186,8 +187,8 @@ func TestProxyA2A_Preflight_RoutesThroughProvisionerSSOT(t *testing.T) {
 	}
 
 	var (
-		callsIsRunning             bool
-		callsContainerInspectRaw   bool
+		callsIsRunning                  bool
+		callsContainerInspectRaw        bool
 		callsRunningContainerNameDirect bool
 	)
 	ast.Inspect(fn.Body, func(n ast.Node) bool {

workspace-server/internal/handlers/a2a_proxy_test.go

@@ -262,6 +262,7 @@ func TestProxyA2A_Upstream502_TriggersContainerDeadCheck(t *testing.T) {
 	allowLoopbackForTest(t)
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 	cp := &fakeCPProv{running: false}
 	handler.SetCPProvisioner(cp)
 
@@ -324,6 +325,7 @@ func TestProxyA2A_Upstream502_AliveAgent_PropagatesAsIs(t *testing.T) {
 	allowLoopbackForTest(t)
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 	cp := &fakeCPProv{running: true}
 	handler.SetCPProvisioner(cp)
 
@@ -513,6 +515,7 @@ func TestProxyA2A_AllowedSelf_SkipsAccessCheck(t *testing.T) {
 	allowLoopbackForTest(t)
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 
 	agentServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
@@ -661,18 +664,18 @@ func TestProxyA2A_CallerIDDerivedFromBearer(t *testing.T) {
 	//    (column order: workspace_id, activity_type, source_id, target_id, ...)
 	mock.ExpectExec("INSERT INTO activity_logs").
 		WithArgs(
-			"ws-target",                       // $1 workspace_id
-			"a2a_receive",                     // $2 activity_type
-			sqlmock.AnyArg(),                  // $3 source_id — *string("ws-caller"), checked below
-			sqlmock.AnyArg(),                  // $4 target_id
-			sqlmock.AnyArg(),                  // $5 method
-			sqlmock.AnyArg(),                  // $6 summary
-			sqlmock.AnyArg(),                  // $7 request_body
-			sqlmock.AnyArg(),                  // $8 response_body
-			sqlmock.AnyArg(),                  // $9 tool_trace
-			sqlmock.AnyArg(),                  // $10 duration_ms
-			sqlmock.AnyArg(),                  // $11 status
-			sqlmock.AnyArg(),                  // $12 error_detail
+			"ws-target",      // $1 workspace_id
+			"a2a_receive",    // $2 activity_type
+			sqlmock.AnyArg(), // $3 source_id — *string("ws-caller"), checked below
+			sqlmock.AnyArg(), // $4 target_id
+			sqlmock.AnyArg(), // $5 method
+			sqlmock.AnyArg(), // $6 summary
+			sqlmock.AnyArg(), // $7 request_body
+			sqlmock.AnyArg(), // $8 response_body
+			sqlmock.AnyArg(), // $9 tool_trace
+			sqlmock.AnyArg(), // $10 duration_ms
+			sqlmock.AnyArg(), // $11 status
+			sqlmock.AnyArg(), // $12 error_detail
 		).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
@@ -1716,7 +1719,6 @@ func TestDispatchA2A_RejectsUnsafeURL(t *testing.T) {
 	}
 }
 
-
 // --- handleA2ADispatchError ---
 
 func TestHandleA2ADispatchError_ContextDeadline(t *testing.T) {
@@ -1803,6 +1805,7 @@ func TestMaybeMarkContainerDead_CPOnly_NotRunning(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 	cp := &fakeCPProv{running: false}
 	handler.SetCPProvisioner(cp)
 
@@ -1955,6 +1958,7 @@ func TestLogA2AFailure_Smoke(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 
 	// Sync workspace-name lookup (called in the caller goroutine).
 	mock.ExpectQuery(`SELECT name FROM workspaces WHERE id =`).
@@ -1973,6 +1977,7 @@ func TestLogA2AFailure_EmptyNameFallback(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 
 	// Empty name from DB → summary uses the workspaceID as the name.
 	mock.ExpectQuery(`SELECT name FROM workspaces WHERE id =`).
@@ -1989,6 +1994,7 @@ func TestLogA2ASuccess_Smoke(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 
 	mock.ExpectQuery(`SELECT name FROM workspaces WHERE id =`).
 		WithArgs("ws-ok").
@@ -2005,6 +2011,7 @@ func TestLogA2ASuccess_ErrorStatus(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	handler := NewWorkspaceHandler(newTestBroadcaster(), nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, handler)
 
 	mock.ExpectQuery(`SELECT name FROM workspaces WHERE id =`).
 		WithArgs("ws-err").

workspace-server/internal/handlers/a2a_queue_test.go

@@ -26,6 +26,10 @@ import (
 // setupTestDBForQueueTests creates a sqlmock DB using QueryMatcherEqual (exact
 // string matching) so that ExpectQuery/ExpectExec patterns are compared verbatim.
 // Uses the same global db.DB as setupTestDB so the handler can use it.
+//
+// IMPORTANT: db.DB is saved before assignment and restored via t.Cleanup so
+// that tests running after this one are not polluted by a closed mock.
+// Same fix as setupTestDB (handlers_test.go); same root cause as mc#975.
 func setupTestDBForQueueTests(t *testing.T) sqlmock.Sqlmock {
 	t.Helper()
 	mockDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
@@ -81,54 +85,6 @@ func TestExtractIdempotencyKey_emptyOnMissing(t *testing.T) {
 	}
 }
 
-// ──────────────────────────────────────────────────────────────────────────────
-// extractExpiresInSeconds
-// ──────────────────────────────────────────────────────────────────────────────
-
-func TestExtractExpiresInSeconds_valid(t *testing.T) {
-	cases := []struct {
-		name string
-		body string
-		want int
-	}{
-		{"positive int", `{"params":{"expires_in_seconds":30}}`, 30},
-		{"zero", `{"params":{"expires_in_seconds":0}}`, 0},
-		{"large TTL", `{"params":{"expires_in_seconds":3600}}`, 3600},
-		{"nested message — not affected", `{"params":{"message":{"role":"user"},"expires_in_seconds":60}}`, 60},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			if got := extractExpiresInSeconds([]byte(tc.body)); got != tc.want {
-				t.Errorf("extractExpiresInSeconds = %d, want %d", got, tc.want)
-			}
-		})
-	}
-}
-
-func TestExtractExpiresInSeconds_invalidOrMissing(t *testing.T) {
-	cases := []struct {
-		name string
-		body string
-		want int
-	}{
-		{"negative → 0", `{"params":{"expires_in_seconds":-5}}`, 0},
-		{"missing expires_in_seconds", `{"params":{"message":{"role":"user"}}}`, 0},
-		{"no params at all", `{"method":"message/send"}`, 0},
-		{"malformed JSON", `not json`, 0},
-		{"empty body", ``, 0},
-		{"null value", `{"params":{"expires_in_seconds":null}}`, 0},
-		{"string value", `{"params":{"expires_in_seconds":"30"}}`, 0},
-		{"float value", `{"params":{"expires_in_seconds":30.5}}`, 30},
-	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			if got := extractExpiresInSeconds([]byte(tc.body)); got != tc.want {
-				t.Errorf("extractExpiresInSeconds(%q) = %d, want %d", tc.body, got, tc.want)
-			}
-		})
-	}
-}
-
 func TestExtractDelegationIDFromBody(t *testing.T) {
 	cases := []struct {
 		name string

workspace-server/internal/handlers/activity.go

@@ -14,18 +14,16 @@ import (
 
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/push"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 )
 
 type ActivityHandler struct {
 	broadcaster *events.Broadcaster
-	notifier    *push.Notifier
 }
 
-func NewActivityHandler(b *events.Broadcaster, notifier *push.Notifier) *ActivityHandler {
-	return &ActivityHandler{broadcaster: b, notifier: notifier}
+func NewActivityHandler(b *events.Broadcaster) *ActivityHandler {
+	return &ActivityHandler{broadcaster: b}
 }
 
 // List handles GET /workspaces/:id/activity?type=&source=&limit=&since_secs=&since_id=
@@ -478,19 +476,12 @@ func (h *ActivityHandler) Notify(c *gin.Context) {
 	for _, a := range body.Attachments {
 		attachments = append(attachments, AgentMessageAttachment(a))
 	}
-	writer := NewAgentMessageWriter(db.DB, h.broadcaster, h.notifier)
+	writer := NewAgentMessageWriter(db.DB, h.broadcaster)
 	if err := writer.Send(c.Request.Context(), workspaceID, body.Message, attachments); err != nil {
 		if errors.Is(err, ErrWorkspaceNotFound) {
 			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
 	}

workspace-server/internal/handlers/activity_since_id_test.go

@@ -40,7 +40,7 @@ func TestActivityHandler_SinceID_ReturnsNewerASC(t *testing.T) {
 		WillReturnRows(newActivityRows())
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -69,7 +69,7 @@ func TestActivityHandler_SinceID_CursorNotFound_410(t *testing.T) {
 		WillReturnError(sql.ErrNoRows)
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -101,7 +101,7 @@ func TestActivityHandler_SinceID_CrossWorkspaceCursor_410(t *testing.T) {
 		WillReturnError(sql.ErrNoRows)
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -137,7 +137,7 @@ func TestActivityHandler_SinceID_CombinedWithSinceSecs(t *testing.T) {
 		WillReturnRows(newActivityRows())
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)

workspace-server/internal/handlers/activity_since_secs_test.go

@@ -41,7 +41,7 @@ func TestActivityHandler_SinceSecs_Accepted(t *testing.T) {
 		WillReturnRows(newActivityRows())
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -70,7 +70,7 @@ func TestActivityHandler_SinceSecs_ClampedAt30Days(t *testing.T) {
 		WillReturnRows(newActivityRows())
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -106,7 +106,7 @@ func TestActivityHandler_SinceSecs_InvalidRejected(t *testing.T) {
 			// No DB call expected; bad input must be caught before the query.
 			setupTestDB(t)
 			broadcaster := newTestBroadcaster()
-			handler := NewActivityHandler(broadcaster, nil)
+			handler := NewActivityHandler(broadcaster)
 
 			w := httptest.NewRecorder()
 			c, _ := gin.CreateTestContext(w)
@@ -142,7 +142,7 @@ func TestActivityHandler_SinceSecs_Omitted(t *testing.T) {
 		WillReturnRows(newActivityRows())
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)

workspace-server/internal/handlers/activity_test.go

@@ -22,7 +22,7 @@ func TestSessionSearchReturnsActivityAndMemory(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	rows := sqlmock.NewRows([]string{
 		"kind", "id", "workspace_id", "label", "content", "method", "status", "request_body", "response_body", "created_at",
@@ -68,7 +68,7 @@ func TestSessionSearchReturnsActivityAndMemory(t *testing.T) {
 func TestActivityList_SourceCanvas(t *testing.T) {
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	// Expect query with "source_id IS NULL"
 	mock.ExpectQuery(`SELECT .+ FROM activity_logs WHERE workspace_id = .+ AND source_id IS NULL`).
@@ -97,7 +97,7 @@ func TestActivityList_SourceCanvas(t *testing.T) {
 func TestActivityList_SourceAgent(t *testing.T) {
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	// Expect query with "source_id IS NOT NULL"
 	mock.ExpectQuery(`SELECT .+ FROM activity_logs WHERE workspace_id = .+ AND source_id IS NOT NULL`).
@@ -126,7 +126,7 @@ func TestActivityList_SourceAgent(t *testing.T) {
 func TestActivityList_SourceInvalid(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -142,7 +142,7 @@ func TestActivityList_SourceInvalid(t *testing.T) {
 func TestActivityList_SourceWithType(t *testing.T) {
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	// Both type and source filters
 	mock.ExpectQuery(`SELECT .+ FROM activity_logs WHERE workspace_id = .+ AND activity_type = .+ AND source_id IS NULL`).
@@ -181,7 +181,7 @@ const testPeerUUID = "11111111-2222-3333-4444-555555555555"
 func TestActivityList_PeerIDFilter(t *testing.T) {
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	// peer_id binds twice in the query (source_id OR target_id) but is
 	// added to args once — sqlmock matches positional args, so the
@@ -220,7 +220,7 @@ func TestActivityList_PeerIDComposesWithType(t *testing.T) {
 	// of the builder can't silently rearrange placeholders.
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	mock.ExpectQuery(
 		`SELECT .+ FROM activity_logs WHERE workspace_id = .+ AND activity_type = .+ AND source_id IS NOT NULL AND \(source_id = .+ OR target_id = .+\)`,
@@ -258,7 +258,7 @@ func TestActivityList_PeerIDRejectsNonUUID(t *testing.T) {
 	// otherwise interpolate the value into the URL or another query.
 	gin.SetMode(gin.TestMode)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	for _, bad := range []string{
 		"not-a-uuid",
@@ -292,7 +292,7 @@ func TestActivityList_PeerIDRejectsNonUUID(t *testing.T) {
 func TestActivityList_BeforeTSFilter(t *testing.T) {
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	cutoff, _ := time.Parse(time.RFC3339, "2026-05-01T00:00:00Z")
 	mock.ExpectQuery(
@@ -328,7 +328,7 @@ func TestActivityList_BeforeTSComposesWithPeerID(t *testing.T) {
 	// can't silently drop one filter or reorder placeholders.
 	mock := setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	cutoff, _ := time.Parse(time.RFC3339, "2026-05-01T00:00:00Z")
 	mock.ExpectQuery(
@@ -363,7 +363,7 @@ func TestActivityList_BeforeTSComposesWithPeerID(t *testing.T) {
 func TestActivityList_BeforeTSRejectsInvalidFormat(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	for _, bad := range []string{
 		"yesterday",
@@ -400,7 +400,7 @@ func TestActivityReport_AcceptsMemoryWriteType(t *testing.T) {
 		WillReturnResult(sqlmock.NewResult(1, 1))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	gin.SetMode(gin.TestMode)
 	w := httptest.NewRecorder()
@@ -426,7 +426,7 @@ func TestActivityReport_RejectsUnknownType(t *testing.T) {
 	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	gin.SetMode(gin.TestMode)
 	w := httptest.NewRecorder()
@@ -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`).
@@ -478,7 +478,7 @@ func TestNotify_PersistsToActivityLogsForReloadRecovery(t *testing.T) {
 		WillReturnResult(sqlmock.NewResult(1, 1))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	gin.SetMode(gin.TestMode)
 	w := httptest.NewRecorder()
@@ -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
@@ -527,7 +527,7 @@ func TestNotify_WithAttachments_PersistsFilePartsForReload(t *testing.T) {
 		WillReturnResult(sqlmock.NewResult(1, 1))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	gin.SetMode(gin.TestMode)
 	w := httptest.NewRecorder()
@@ -593,7 +593,7 @@ func TestNotify_RejectsAttachmentWithEmptyURIOrName(t *testing.T) {
 			// only if the handler unexpectedly queries.
 
 			broadcaster := newTestBroadcaster()
-			handler := NewActivityHandler(broadcaster, nil)
+			handler := NewActivityHandler(broadcaster)
 			gin.SetMode(gin.TestMode)
 			w := httptest.NewRecorder()
 			c, _ := gin.CreateTestContext(w)
@@ -640,14 +640,14 @@ 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"))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	gin.SetMode(gin.TestMode)
 	w := httptest.NewRecorder()

workspace-server/internal/handlers/agent_message_writer.go

@@ -44,7 +44,6 @@ import (
 	"log"
 
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/push"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/textutil"
 )
 
@@ -55,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
@@ -82,14 +76,12 @@ type AgentMessageAttachment struct {
 type AgentMessageWriter struct {
 	db          *sql.DB
 	broadcaster events.EventEmitter
-	notifier    *push.Notifier
 }
 
 // NewAgentMessageWriter binds the writer to the platform's DB pool +
-// WebSocket broadcaster. notifier may be nil if push notifications are
-// not configured.
-func NewAgentMessageWriter(db *sql.DB, broadcaster events.EventEmitter, notifier *push.Notifier) *AgentMessageWriter {
-	return &AgentMessageWriter{db: db, broadcaster: broadcaster, notifier: notifier}
+// WebSocket broadcaster.
+func NewAgentMessageWriter(db *sql.DB, broadcaster events.EventEmitter) *AgentMessageWriter {
+	return &AgentMessageWriter{db: db, broadcaster: broadcaster}
 }
 
 // Send delivers a single agent → user message. Look up + broadcast +
@@ -115,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
@@ -144,12 +132,7 @@ func (w *AgentMessageWriter) Send(
 	}
 	w.broadcaster.BroadcastOnly(workspaceID, string(events.EventAgentMessage), broadcastPayload)
 
-	// 3. Send push notifications to mobile devices.
-	if w.notifier != nil {
-		w.notifier.NotifyAgentMessage(ctx, workspaceID, wsName, message)
-	}
-
-	// 4. Persist for chat-history hydration. response_body shape MUST stay
+	// 3. Persist for chat-history hydration. response_body shape MUST stay
 	//    in sync with extractResponseText + extractFilesFromTask in
 	//    canvas/src/components/tabs/chat/historyHydration.ts:
 	//      - extractResponseText reads body.result (string) → renders text

workspace-server/internal/handlers/agent_message_writer_test.go

@@ -86,11 +86,11 @@ func (c *capturingEmitter) RecordAndBroadcast(_ context.Context, eventType strin
 // path: workspace lookup, broadcast, INSERT, return nil.
 func TestAgentMessageWriter_Send_Success_NoAttachments(t *testing.T) {
 	mock := setupTestDB(t)
-	w := NewAgentMessageWriter(db.DB, newTestBroadcaster(), nil)
+	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(
@@ -114,11 +114,11 @@ func TestAgentMessageWriter_Send_Success_NoAttachments(t *testing.T) {
 // Drift here = chips disappear on chat reload.
 func TestAgentMessageWriter_Send_Success_WithAttachments(t *testing.T) {
 	mock := setupTestDB(t)
-	w := NewAgentMessageWriter(db.DB, newTestBroadcaster(), nil)
+	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(
@@ -171,11 +171,11 @@ func TestAgentMessageWriter_Send_Success_WithAttachments(t *testing.T) {
 func TestAgentMessageWriter_Send_WorkspaceNotFound(t *testing.T) {
 	mock := setupTestDB(t)
 	emitter := &capturingEmitter{}
-	w := NewAgentMessageWriter(db.DB, emitter, nil)
+	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) {
@@ -200,11 +200,11 @@ func TestAgentMessageWriter_Send_WorkspaceNotFound(t *testing.T) {
 // broadcast.
 func TestAgentMessageWriter_Send_DBInsertFailureStillReturnsNil(t *testing.T) {
 	mock := setupTestDB(t)
-	w := NewAgentMessageWriter(db.DB, newTestBroadcaster(), nil)
+	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"))
@@ -221,11 +221,11 @@ func TestAgentMessageWriter_Send_DBInsertFailureStillReturnsNil(t *testing.T) {
 // table doesn't carry multi-KB summaries that bloat list queries.
 func TestAgentMessageWriter_Send_PreviewTruncation(t *testing.T) {
 	mock := setupTestDB(t)
-	w := NewAgentMessageWriter(db.DB, newTestBroadcaster(), nil)
+	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`).
@@ -261,11 +261,11 @@ func TestAgentMessageWriter_Send_PreviewTruncation(t *testing.T) {
 func TestAgentMessageWriter_Send_BroadcastsAgentMessageEvent(t *testing.T) {
 	mock := setupTestDB(t)
 	emitter := &capturingEmitter{}
-	w := NewAgentMessageWriter(db.DB, emitter, nil)
+	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))
 
@@ -312,10 +312,10 @@ func TestAgentMessageWriter_Send_BroadcastsAgentMessageEvent(t *testing.T) {
 // real incidents in alerting.
 func TestAgentMessageWriter_Send_DBErrorOnLookupReturnsWrapped(t *testing.T) {
 	mock := setupTestDB(t)
-	w := NewAgentMessageWriter(db.DB, newTestBroadcaster(), nil)
+	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)
 
@@ -344,15 +344,15 @@ func TestAgentMessageWriter_Send_DBErrorOnLookupReturnsWrapped(t *testing.T) {
 // coverage. Now it does.
 func TestAgentMessageWriter_Send_NonASCIIMessagePersists(t *testing.T) {
 	mock := setupTestDB(t)
-	w := NewAgentMessageWriter(db.DB, newTestBroadcaster(), nil)
+	w := NewAgentMessageWriter(db.DB, newTestBroadcaster())
 
 	// 200-rune CJK message — exceeds the 80-rune cap, would have hit
 	// 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(
@@ -393,11 +393,11 @@ func TestAgentMessageWriter_Send_NonASCIIMessagePersists(t *testing.T) {
 func TestAgentMessageWriter_Send_OmitsAttachmentsKeyWhenEmpty(t *testing.T) {
 	mock := setupTestDB(t)
 	emitter := &capturingEmitter{}
-	w := NewAgentMessageWriter(db.DB, emitter, nil)
+	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))
 

workspace-server/internal/handlers/approvals.go

@@ -116,9 +116,6 @@ func (h *ApprovalsHandler) ListAll(c *gin.Context) {
 			"created_at":     createdAt,
 		})
 	}
-	if err := rows.Err(); err != nil {
-		log.Printf("ListPendingApprovals rows.Err: %v", err)
-	}
 
 	c.JSON(http.StatusOK, approvals)
 }
@@ -158,9 +155,6 @@ func (h *ApprovalsHandler) List(c *gin.Context) {
 			"created_at": createdAt,
 		})
 	}
-	if err := rows.Err(); err != nil {
-		log.Printf("ListApprovals rows.Err workspace=%s: %v", workspaceID, err)
-	}
 
 	c.JSON(http.StatusOK, approvals)
 }

workspace-server/internal/handlers/delegation.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
 	"log"
 	"net/http"
@@ -698,7 +699,8 @@ func (h *DelegationHandler) listDelegationsFromLedger(ctx context.Context, works
 
 	var result []map[string]interface{}
 	for rows.Next() {
-		var delegationID, callerID, calleeID, taskPreview, status, resultPreview, errorDetail string
+		var delegationID, callerID, calleeID, taskPreview, status string
+		var resultPreview, errorDetail sql.NullString
 		var lastHeartbeat, deadline, createdAt, updatedAt *time.Time
 		if err := rows.Scan(
 			&delegationID, &callerID, &calleeID, &taskPreview,
@@ -717,11 +719,11 @@ func (h *DelegationHandler) listDelegationsFromLedger(ctx context.Context, works
 			"updated_at":    updatedAt,
 			"_ledger":       true, // marker so callers know this row is from the ledger
 		}
-		if resultPreview != "" {
-			entry["response_preview"] = textutil.TruncateBytes(resultPreview, 300)
+		if resultPreview.Valid && resultPreview.String != "" {
+			entry["response_preview"] = textutil.TruncateBytes(resultPreview.String, 300)
 		}
-		if errorDetail != "" {
-			entry["error"] = errorDetail
+		if errorDetail.Valid && errorDetail.String != "" {
+			entry["error"] = errorDetail.String
 		}
 		if lastHeartbeat != nil {
 			entry["last_heartbeat"] = lastHeartbeat

workspace-server/internal/handlers/delegation_list_test.go

@@ -145,6 +145,54 @@ func TestListDelegationsFromLedger_MultipleRows(t *testing.T) {
 	}
 }
 
+func TestListDelegationsFromLedger_NullsOmitted(t *testing.T) {
+	// last_heartbeat, deadline, result_preview, error_detail are all NULL.
+	// Handler must not panic and must omit those keys from the map.
+	mockDB, mock, err := sqlmock.New()
+	if err != nil {
+		t.Fatalf("failed to create sqlmock: %v", err)
+	}
+	prevDB := db.DB
+	db.DB = mockDB
+	t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
+
+	now := time.Now()
+	rows := sqlmock.NewRows([]string{
+		"delegation_id", "caller_id", "callee_id", "task_preview",
+		"status", "result_preview", "error_detail",
+		"last_heartbeat", "deadline", "created_at", "updated_at",
+	}).
+		AddRow("del-1", "ws-1", "ws-2", "task", "queued", nil, nil, nil, nil, now, now)
+	mock.ExpectQuery("SELECT .+ FROM delegations").
+		WithArgs("ws-1").
+		WillReturnRows(rows)
+
+	broadcaster := newTestBroadcaster()
+	wh := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())
+	dh := NewDelegationHandler(wh, broadcaster)
+
+	got := dh.listDelegationsFromLedger(context.Background(), "ws-1")
+	if len(got) != 1 {
+		t.Fatalf("expected 1 entry, got %d", len(got))
+	}
+	e := got[0]
+	if _, ok := e["last_heartbeat"]; ok {
+		t.Error("last_heartbeat should be absent when NULL")
+	}
+	if _, ok := e["deadline"]; ok {
+		t.Error("deadline should be absent when NULL")
+	}
+	if _, ok := e["response_preview"]; ok {
+		t.Error("response_preview should be absent when NULL result_preview")
+	}
+	if _, ok := e["error"]; ok {
+		t.Error("error should be absent when NULL error_detail")
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("sqlmock expectations: %v", err)
+	}
+}
+
 func TestListDelegationsFromLedger_QueryError(t *testing.T) {
 	// Query failure returns nil — graceful fallback, no panic.
 	mockDB, mock, err := sqlmock.New()
@@ -438,10 +486,3 @@ func TestListDelegationsFromActivityLogs_RowsErr(t *testing.T) {
 		t.Errorf("sqlmock expectations: %v", err)
 	}
 }
-
-// TestListDelegationsFromActivityLogs_ScanErrorSkipped is removed.
-//
-// Same reason as TestListDelegationsFromLedger_ScanError: Go 1.25 causes
-// sqlmock.NewRows([]string{}).AddRow(...) to panic in test SETUP. The handler
-// has no recover(), so a scan panic would crash the process — the correct
-// behaviour. Real-DB integration tests cover this path.

workspace-server/internal/handlers/handlers_additional_test.go

@@ -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)

workspace-server/internal/handlers/handlers_test.go

@@ -29,6 +29,11 @@ func init() {
 // setupTestDB creates a sqlmock DB and assigns it to the global db.DB.
 // It also disables the SSRF URL check so that httptest.NewServer loopback
 // URLs and fake hostnames (*.example) used in tests don't trigger rejections.
+//
+// IMPORTANT: db.DB is saved before assignment and restored via t.Cleanup so
+// that tests running after this one are not polluted by a closed mock.
+// This is the single root cause of the systemic CI/Platform (Go) failures on
+// main HEAD 8026f020 (mc#975).
 func setupTestDB(t *testing.T) sqlmock.Sqlmock {
 	t.Helper()
 	mockDB, mock, err := sqlmock.New()
@@ -57,6 +62,11 @@ func setupTestDB(t *testing.T) sqlmock.Sqlmock {
 	return mock
 }
 
+func waitForHandlerAsyncBeforeDBCleanup(t *testing.T, h *WorkspaceHandler) {
+	t.Helper()
+	t.Cleanup(h.waitAsyncForTest)
+}
+
 // setupTestRedis creates a miniredis instance and assigns it to the global db.RDB.
 func setupTestRedis(t *testing.T) *miniredis.Miniredis {
 	t.Helper()
@@ -356,6 +366,11 @@ func TestWorkspaceCreate(t *testing.T) {
 }
 
 func TestBuildProvisionerConfig_IncludesAwarenessSettings(t *testing.T) {
+	mock := setupTestDB(t)
+	mock.ExpectQuery(`SELECT digest FROM runtime_image_pins`).
+		WithArgs("claude-code").
+		WillReturnError(sql.ErrNoRows)
+
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", "/tmp/configs")
 
@@ -392,21 +407,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)
@@ -631,7 +646,7 @@ func TestActivityHandler_List(t *testing.T) {
 		WillReturnRows(rows)
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -680,7 +695,7 @@ func TestActivityHandler_ListByType(t *testing.T) {
 		WillReturnRows(rows)
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -708,7 +723,7 @@ func TestActivityHandler_Report(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	// Expect the INSERT into activity_logs
 	mock.ExpectExec("INSERT INTO activity_logs").
@@ -737,7 +752,7 @@ func TestActivityHandler_Report_InvalidType(t *testing.T) {
 	setupTestDB(t)
 	setupTestRedis(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -965,7 +980,7 @@ func TestActivityHandler_ListEmpty(t *testing.T) {
 		WillReturnRows(sqlmock.NewRows(columns))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -999,7 +1014,7 @@ func TestActivityHandler_ListCustomLimit(t *testing.T) {
 		WillReturnRows(sqlmock.NewRows(columns))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -1032,7 +1047,7 @@ func TestActivityHandler_ListMaxLimit(t *testing.T) {
 		WillReturnRows(sqlmock.NewRows(columns))
 
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -1060,7 +1075,7 @@ func TestActivityHandler_ReportAllValidTypes(t *testing.T) {
 			mock := setupTestDB(t)
 			setupTestRedis(t)
 			broadcaster := newTestBroadcaster()
-			handler := NewActivityHandler(broadcaster, nil)
+			handler := NewActivityHandler(broadcaster)
 
 			mock.ExpectExec("INSERT INTO activity_logs").
 				WillReturnResult(sqlmock.NewResult(0, 1))
@@ -1091,7 +1106,7 @@ func TestActivityHandler_ReportAllValidTypes(t *testing.T) {
 func TestActivityHandler_ReportMissingBody(t *testing.T) {
 	setupTestDB(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -1120,14 +1135,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()
@@ -1165,7 +1179,7 @@ func TestActivityHandler_Report_SourceIDSpoofRejected(t *testing.T) {
 	setupTestDB(t)
 	setupTestRedis(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -1188,7 +1202,7 @@ func TestActivityHandler_Report_MatchingSourceIDAccepted(t *testing.T) {
 	mock := setupTestDB(t)
 	setupTestRedis(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	mock.ExpectExec("INSERT INTO activity_logs").
 		WillReturnResult(sqlmock.NewResult(0, 1))
@@ -1218,7 +1232,7 @@ func TestActivityHandler_Report_SourceIDLogInjection(t *testing.T) {
 	setupTestDB(t)
 	setupTestRedis(t)
 	broadcaster := newTestBroadcaster()
-	handler := NewActivityHandler(broadcaster, nil)
+	handler := NewActivityHandler(broadcaster)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)

workspace-server/internal/handlers/instructions.go

@@ -248,9 +248,6 @@ func (h *InstructionsHandler) Resolve(c *gin.Context) {
 		b.WriteString(content)
 		b.WriteString("\n\n")
 	}
-	if err := rows.Err(); err != nil {
-		log.Printf("ResolveInstructions rows.Err workspace=%s: %v", workspaceID, err)
-	}
 
 	c.JSON(http.StatusOK, gin.H{
 		"workspace_id": workspaceID,
@@ -261,7 +258,6 @@ func (h *InstructionsHandler) Resolve(c *gin.Context) {
 func scanInstructions(rows interface {
 	Next() bool
 	Scan(dest ...interface{}) error
-	Err() error
 }) []Instruction {
 	var instructions []Instruction
 	for rows.Next() {
@@ -273,9 +269,6 @@ func scanInstructions(rows interface {
 		}
 		instructions = append(instructions, inst)
 	}
-	if err := rows.Err(); err != nil {
-		log.Printf("scanInstructions rows.Err: %v", err)
-	}
 	if instructions == nil {
 		instructions = []Instruction{}
 	}

workspace-server/internal/handlers/mcp.go

@@ -34,7 +34,6 @@ import (
 	"time"
 
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/push"
 	"github.com/gin-gonic/gin"
 )
 
@@ -85,7 +84,6 @@ type mcpTool struct {
 type MCPHandler struct {
 	database    *sql.DB
 	broadcaster *events.Broadcaster
-	notifier    *push.Notifier
 
 	// memv2 is the v2 memory plugin wiring (RFC #2728). nil-safe:
 	// every v2 tool calls memoryV2Available() first and returns a
@@ -96,9 +94,8 @@ type MCPHandler struct {
 
 // NewMCPHandler wires the handler to db and broadcaster.
 // Pass db.DB and the platform broadcaster at router-setup time.
-// notifier may be nil if push notifications are not configured.
-func NewMCPHandler(database *sql.DB, broadcaster *events.Broadcaster, notifier *push.Notifier) *MCPHandler {
-	return &MCPHandler{database: database, broadcaster: broadcaster, notifier: notifier}
+func NewMCPHandler(database *sql.DB, broadcaster *events.Broadcaster) *MCPHandler {
+	return &MCPHandler{database: database, broadcaster: broadcaster}
 }
 
 // ─────────────────────────────────────────────────────────────────────────────

workspace-server/internal/handlers/mcp_test.go

@@ -26,7 +26,7 @@ import (
 func newMCPHandler(t *testing.T) (*MCPHandler, sqlmock.Sqlmock) {
 	t.Helper()
 	mock := setupTestDB(t)
-	h := NewMCPHandler(db.DB, newTestBroadcaster(), nil)
+	h := NewMCPHandler(db.DB, newTestBroadcaster())
 	return h, mock
 }
 
@@ -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'`

workspace-server/internal/handlers/mcp_tools.go

@@ -392,7 +392,7 @@ func (h *MCPHandler) toolSendMessageToUser(ctx context.Context, workspaceID stri
 	// (the tool args don't accept them); pass nil. If a future tool
 	// schema adds an attachments arg, build []AgentMessageAttachment
 	// and pass through.
-	writer := NewAgentMessageWriter(h.database, h.broadcaster, h.notifier)
+	writer := NewAgentMessageWriter(h.database, h.broadcaster)
 	if err := writer.Send(ctx, workspaceID, message, nil); err != nil {
 		if errors.Is(err, ErrWorkspaceNotFound) {
 			return "", fmt.Errorf("workspace not found")

workspace-server/internal/handlers/org.go

@@ -271,62 +271,6 @@ func (e EnvRequirement) IsSatisfied(configured map[string]struct{}) bool {
 	return false
 }
 
-// perWorkspaceUnsatisfied records a single unsatisfied RequiredEnv for a
-// specific workspace during org import preflight.
-type perWorkspaceUnsatisfied struct {
-	Workspace   string
-	FilesDir    string
-	Unsatisfied EnvRequirement
-}
-
-// collectPerWorkspaceUnsatisfied walks the workspace tree and returns every
-// RequiredEnv that is neither in `configured` (global secrets) nor resolvable
-// from the org root or workspace-level .env file. An empty orgBaseDir skips
-// the .env walk so all requirements appear unsatisfied (used by tests to
-// isolate the global-only path).
-func collectPerWorkspaceUnsatisfied(
-	workspaces []OrgWorkspace,
-	orgBaseDir string,
-	configured map[string]struct{},
-) []perWorkspaceUnsatisfied {
-	var result []perWorkspaceUnsatisfied
-	for _, ws := range workspaces {
-		result = append(result, checkWorkspaceRequiredEnv(ws, orgBaseDir, configured)...)
-	}
-	return result
-}
-
-func checkWorkspaceRequiredEnv(
-	ws OrgWorkspace,
-	orgBaseDir string,
-	configured map[string]struct{},
-) []perWorkspaceUnsatisfied {
-	var result []perWorkspaceUnsatisfied
-	// Merge in .env vars from the org root and the workspace-specific dir.
-	// Workspace-level vars override org-root vars, just as loadWorkspaceEnv
-	// implements: org root first, then ws dir on top.
-	if orgBaseDir != "" {
-		wsEnv := loadWorkspaceEnv(orgBaseDir, ws.FilesDir)
-		for k, v := range wsEnv {
-			configured[k] = struct{}{}
-			_ = v // value only used for merging into configured map
-		}
-	}
-	for _, req := range ws.RequiredEnv {
-		if !req.IsSatisfied(configured) {
-			result = append(result, perWorkspaceUnsatisfied{
-				Workspace:   ws.Name,
-				FilesDir:    ws.FilesDir,
-				Unsatisfied: req,
-			})
-		}
-	}
-	for _, child := range ws.Children {
-		result = append(result, checkWorkspaceRequiredEnv(child, orgBaseDir, configured)...)
-	}
-	return result
-}
-
 // UnmarshalYAML accepts either a scalar (string → single) or a map
 // with an `any_of` list (→ group).
 func (e *EnvRequirement) UnmarshalYAML(value *yaml.Node) error {

workspace-server/internal/handlers/org_helpers.go

@@ -15,6 +15,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 )
+
 // resolvePromptRef reads a prompt body from either an inline string or a
 // file ref relative to the workspace's files_dir. Inline always wins when
 // both are non-empty (caller-provided inline is more authoritative than a
@@ -64,9 +65,7 @@ func resolvePromptRef(inline, fileRef, orgBaseDir, filesDir string) (string, err
 
 // envVarRefPattern matches actual ${VAR} or $VAR references (not literal $).
 // Used to detect unresolved placeholders without false positives like "$5".
-// Requires [a-zA-Z_] as the first char after $ so $100 stays literal.
-// Two capture groups: (1) ${VAR} form, (2) $VAR form.
-var envVarRefPattern = regexp.MustCompile(`\$\{([a-zA-Z_][a-zA-Z0-9_]*)\}|\$([a-zA-Z_][a-zA-Z0-9_]*)`)
+var envVarRefPattern = regexp.MustCompile(`\$\{?[A-Za-z_][A-Za-z0-9_]*\}?`)
 
 // hasUnresolvedVarRef returns true if the original string had a ${VAR} or $VAR
 // reference that the expanded string didn't fully replace (i.e. the var was unset).
@@ -133,25 +132,6 @@ func expandWithEnv(s string, env map[string]string) string {
 	return b.String()
 }
 
-// expandEnvRef resolves a single variable reference extracted from s.
-//
-// Guards:
-//   - Empty key → "$$" escape, return "$"
-//   - key[0] not POSIX ident start → "$" + partial chars, return "$<chars>"
-//   - Key in env map → return the mapped value (template override wins)
-//   - Otherwise → only fall back to os.Getenv if the whole input string IS the
-//     variable reference (ref == whole).
-//
-// Bare $VAR format:
-//   $HOME (alone) → ref==whole → os.Getenv ✓  (host HOME is org-template HOME)
-//   $HOME/path (partial) → ref!=whole → literal "$HOME" ✓  (CWE-78: prevents host leak)
-//
-// Braced ${VAR} format:
-//   ${HOME} (alone) → ref==whole → os.Getenv ✓
-//   ${ROLE}/admin (partial) → ref!=whole → literal ✓
-//   "yes and ${NOT_SET}" (embedded) → ref!=whole → literal ✓
-//
-// This is the CWE-78 fix from commit a3a358f9.
 func expandEnvRef(key, ref, whole string, env map[string]string) string {
 	if key == "" {
 		return "$"
@@ -176,7 +156,7 @@ func isEnvIdentPart(c byte) bool {
 	return isEnvIdentStart(c) || (c >= '0' && c <= '9')
 }
 
-// loadWorkspaceEnv reads the org root .env and the workspace-specific .env .env and the workspace-specific .env
+// loadWorkspaceEnv reads the org root .env and the workspace-specific .env
 // (workspace overrides org root). Used by both secret injection and channel
 // config expansion.
 //
@@ -428,11 +408,7 @@ func resolveInsideRoot(root, userPath string) (string, error) {
 		return "", fmt.Errorf("root abs: %w", err)
 	}
 	joined := filepath.Join(absRoot, userPath)
-	// filepath.Join preserves "." components when root is absolute; clean
-	// them before computing the final absolute path so "./subdir/./file.txt"
-	// resolves to root/subdir/file.txt (not root/./subdir/./file.txt).
-	cleaned := filepath.Clean(joined)
-	absJoined, err := filepath.Abs(cleaned)
+	absJoined, err := filepath.Abs(joined)
 	if err != nil {
 		return "", fmt.Errorf("joined abs: %w", err)
 	}

workspace-server/internal/handlers/org_helpers_pure_test.go

@@ -104,8 +104,8 @@ func TestHasUnresolvedVarRef_Resolved(t *testing.T) {
 		// documents this design choice; callers who need empty=resolved should
 		// pre-process the output before calling hasUnresolvedVarRef.
 		{"${VAR}", "", true},
-		{"${VAR}", "value", false},                    // var replaced
-		{"$VAR", "value", false},                      // bare var replaced
+		{"${VAR}", "value", false}, // var replaced
+		{"$VAR", "value", false},   // bare var replaced
 		{"prefix${VAR}suffix", "prefixvaluesuffix", false},
 		{"${A}${B}", "ab", false},
 		// FOO=FOO and BAR=BAR — both vars found and replaced. Expanded output
@@ -125,14 +125,14 @@ func TestHasUnresolvedVarRef_Resolved(t *testing.T) {
 func TestHasUnresolvedVarRef_Unresolved(t *testing.T) {
 	// Expansion left the refs intact → unresolved.
 	cases := []struct {
-		orig    string
+		orig     string
 		expanded string
 	}{
-		{"${VAR}", "${VAR}"},       // untouched
-		{"$VAR", "$VAR"},           // bare untouched
+		{"${VAR}", "${VAR}"}, // untouched
+		{"$VAR", "$VAR"},     // bare untouched
 		{"prefix${VAR}suffix", "prefix${VAR}suffix"},
-		{"${A}${B}", "${A}${B}"},   // both unresolved
-		{"${FOO}", ""},             // empty result with var ref in original
+		{"${A}${B}", "${A}${B}"}, // both unresolved
+		{"${FOO}", ""},           // empty result with var ref in original
 	}
 	for _, tc := range cases {
 		t.Run(tc.orig, func(t *testing.T) {
@@ -205,8 +205,8 @@ func TestMergeCategoryRouting_WorkspaceOverrides(t *testing.T) {
 		"ui":       {"Frontend Engineer"},
 	}
 	ws := map[string][]string{
-		"security": {"SRE Team"}, // narrows
-		"ui":       {},           // drops
+		"security": {"SRE Team"},      // narrows
+		"ui":       {},                // drops
 		"infra":    {"Platform Team"}, // adds
 	}
 	r := mergeCategoryRouting(defaults, ws)
@@ -462,11 +462,47 @@ func TestExpandWithEnv_LiteralDollar(t *testing.T) {
 func TestExpandWithEnv_PartiallyPresent(t *testing.T) {
 	env := map[string]string{"SET": "yes"}
 	result := expandWithEnv("${SET} and ${NOT_SET}", env)
-	// ${SET} resolved from env; ${NOT_SET} stays literal (not whole-string ref,
-	// so os.Getenv fallback is NOT used — CWE-78 regression guard).
 	assert.Equal(t, "yes and ${NOT_SET}", result)
 }
 
+func TestExpandWithEnv_EmbeddedMissingProcessEnvStaysLiteral(t *testing.T) {
+	t.Setenv("MOL_TEST_EMBEDDED_MISSING", "")
+
+	result := expandWithEnv("prefix/${MOL_TEST_EMBEDDED_MISSING}/suffix", map[string]string{})
+	assert.Equal(t, "prefix/${MOL_TEST_EMBEDDED_MISSING}/suffix", result)
+}
+
+// POSIX identifier guard regression tests (CWE-78 fix).
+// Keys not starting with [a-zA-Z_] must not be looked up in env or os.Getenv.
+func TestExpandWithEnv_DigitPrefix_NotExpanded(t *testing.T) {
+	// ${0}, ${5}, ${1VAR} — numeric prefix → not a valid shell identifier.
+	// Guard must return "$0", "$5", "$1VAR" literally; no env lookup.
+	cases := []struct {
+		input string
+		want  string
+	}{
+		{"${0}", "$0"},
+		{"${5}", "$5"},
+		{"${1VAR}", "$1VAR"},
+		{"prefix ${0} suffix", "prefix $0 suffix"},
+		{"$0", "$0"},
+		{"$5", "$5"},
+		{"HOME=${HOME}", "HOME=${HOME}"}, // HOME is valid but embedded in larger string
+	}
+	for _, tc := range cases {
+		t.Run(tc.input, func(t *testing.T) {
+			got := expandWithEnv(tc.input, map[string]string{})
+			assert.Equal(t, tc.want, got)
+		})
+	}
+}
+
+func TestExpandWithEnv_EmptyKey_ReturnsDollar(t *testing.T) {
+	// ${} → "$" (empty key, guard returns "$")
+	result := expandWithEnv("value=${}", map[string]string{})
+	assert.Equal(t, "value=$", result)
+}
+
 // mergeCategoryRouting tests — unions defaults with per-workspace routing.
 
 // ── Additional coverage: mergeCategoryRouting ──────────────────────
@@ -546,8 +582,8 @@ func TestRenderCategoryRoutingYAML_SingleCategory(t *testing.T) {
 
 func TestRenderCategoryRoutingYAML_MultipleCategoriesSorted(t *testing.T) {
 	routing := map[string][]string{
-		"zebra":   {"RoleZ"},
-		"alpha":   {"RoleA"},
+		"zebra":      {"RoleZ"},
+		"alpha":      {"RoleA"},
 		"middleware": {"RoleM"},
 	}
 	result, err := renderCategoryRoutingYAML(routing)
@@ -590,7 +626,7 @@ func TestRenderCategoryRoutingYAML_SpecialCharactersEscaped(t *testing.T) {
 // ── Additional coverage: appendYAMLBlock ───────────────────────────
 func TestAppendYAMLBlock_BothEmpty(t *testing.T) {
 	result := appendYAMLBlock(nil, "")
-	assert.Nil(t, result) // append(nil, []byte("")...) returns nil in Go
+	assert.Nil(t, result)
 }
 
 func TestAppendYAMLBlock_ExistingHasNewline(t *testing.T) {

workspace-server/internal/handlers/org_helpers_security_test.go

@@ -276,121 +276,3 @@ func TestMergeCategoryRouting_OriginalMapsUnmodified(t *testing.T) {
 		t.Error("ws routing should be unmodified after merge")
 	}
 }
-
-// ── expandWithEnv ─────────────────────────────────────────────────────────────
-//
-// CWE-78 regression tests. The original fix (a3a358f9) ensures that partial
-// variable references like $HOME/path are NOT resolved via os.Getenv — the
-// host HOME env var must not leak into org template values. Only whole-string
-// references ($VAR or ${VAR}) may fall back to the host process environment.
-
-func TestExpandWithEnv_PartialRefDollarHomePath(t *testing.T) {
-	// $HOME/path must NOT resolve to the host's HOME env var.
-	// The literal $HOME must be returned as-is.
-	got := expandWithEnv("$HOME/path", nil)
-	if got != "$HOME/path" {
-		t.Errorf("$HOME/path: got %q, want literal $HOME/path", got)
-	}
-}
-
-func TestExpandWithEnv_PartialRefBracedRoleAdmin(t *testing.T) {
-	// ${ROLE}/admin — ROLE is not in env, so expand to the literal ${ROLE}/admin.
-	got := expandWithEnv("${ROLE}/admin", nil)
-	if got != "${ROLE}/admin" {
-		t.Errorf("${ROLE}/admin: got %q, want literal ${ROLE}/admin", got)
-	}
-}
-
-func TestExpandWithEnv_PartialRefMiddleOfString(t *testing.T) {
-	// $ROLE in the middle of a string — literal, not os.Getenv.
-	got := expandWithEnv("prefix/$ROLE/suffix", nil)
-	if got != "prefix/$ROLE/suffix" {
-		t.Errorf("prefix/$ROLE/suffix: got %q, want literal", got)
-	}
-}
-
-func TestExpandWithEnv_WholeVarInEnv(t *testing.T) {
-	// Whole-string $VAR that IS in env — env value wins.
-	env := map[string]string{"FOO": "barvalue"}
-	got := expandWithEnv("$FOO", env)
-	if got != "barvalue" {
-		t.Errorf("$FOO with FOO=barvalue: got %q, want barvalue", got)
-	}
-}
-
-func TestExpandWithEnv_WholeVarBracedInEnv(t *testing.T) {
-	// Whole-string ${VAR} that IS in env — env value wins.
-	env := map[string]string{"FOO": "barvalue"}
-	got := expandWithEnv("${FOO}", env)
-	if got != "barvalue" {
-		t.Errorf("${FOO} with FOO=barvalue: got %q, want barvalue", got)
-	}
-}
-
-func TestExpandWithEnv_WholeVarNotInEnvBare(t *testing.T) {
-	// Whole-string $VAR not in env — falls back to os.Getenv.
-	// If the host has the var, we get the host value. If not, empty.
-	// At minimum, the result must NOT be the literal "$UNDEFINED_VAR_9Z".
-	got := expandWithEnv("$UNDEFINED_VAR_9Z", nil)
-	if got == "$UNDEFINED_VAR_9Z" {
-		t.Errorf("$UNDEFINED_VAR_9Z: should expand (whole-string fallback to os.Getenv), got literal")
-	}
-}
-
-func TestExpandWithEnv_WholeVarNotInEnvBraced(t *testing.T) {
-	// Whole-string ${VAR} not in env — falls back to os.Getenv.
-	got := expandWithEnv("${UNDEFINED_VAR_9Z}", nil)
-	if got == "${UNDEFINED_VAR_9Z}" {
-		t.Errorf("${UNDEFINED_VAR_9Z}: should expand (whole-string fallback to os.Getenv), got literal")
-	}
-}
-
-func TestExpandWithEnv_EmptyString(t *testing.T) {
-	got := expandWithEnv("", map[string]string{"FOO": "bar"})
-	if got != "" {
-		t.Errorf("empty string: got %q, want empty", got)
-	}
-}
-
-func TestExpandWithEnv_NoVarRefs(t *testing.T) {
-	got := expandWithEnv("plain string with no vars", map[string]string{"FOO": "bar"})
-	if got != "plain string with no vars" {
-		t.Errorf("plain string: got %q, want unchanged", got)
-	}
-}
-
-func TestExpandWithEnv_MultipleVarRefs(t *testing.T) {
-	// Two vars, both whole — both expand from env.
-	env := map[string]string{"A": "alpha", "B": "beta"}
-	got := expandWithEnv("$A and $B and more", env)
-	if got != "alpha and beta and more" {
-		t.Errorf("multiple vars: got %q, want alpha and beta and more", got)
-	}
-}
-
-func TestExpandWithEnv_NumericVarRef(t *testing.T) {
-	// $5 — starts with digit, not a valid identifier start.
-	// Must return the literal "$5", not expand via os.Getenv.
-	got := expandWithEnv("$5", map[string]string{"5": "five"})
-	if got != "$5" {
-		t.Errorf("$5: got %q, want literal $5", got)
-	}
-}
-
-func TestExpandWithEnv_DollarEscape(t *testing.T) {
-	// $$ → both $ written literally (each $ is not followed by an identifier char,
-	// so it is written as-is). No special escape sequence for $$.
-	got := expandWithEnv("$$", nil)
-	if got != "$$" {
-		t.Errorf("$$: got %q, want literal $$", got)
-	}
-}
-
-func TestExpandWithEnv_MixedPartialAndWhole(t *testing.T) {
-	// $A is in env (whole), $HOME is partial — only $A expands.
-	env := map[string]string{"A": "alpha"}
-	got := expandWithEnv("$A at $HOME", env)
-	if got != "alpha at $HOME" {
-		t.Errorf("$A at $HOME: got %q, want alpha at $HOME", got)
-	}
-}

workspace-server/internal/handlers/org_import.go

@@ -952,6 +952,54 @@ type PerWorkspaceUnsatisfied struct {
 
 // collectPerWorkspaceUnsatisfied recursively walks workspaces and returns
 // per-workspace RequiredEnv entries that are not covered by (a) a global
+// secret key or (b) a key present in the workspace's .env file(s) (org root
+// .env + per-workspace <files_dir>/.env). This complements
+// collectOrgEnv + loadConfiguredGlobalSecretKeys, which together only
+// validate global-level RequiredEnv against global_secrets. The .env
+// lookup mirrors the runtime resolution in createWorkspaceTree so that
+// the preflight result matches what the container actually receives at
+// start time.
+func collectPerWorkspaceUnsatisfied(workspaces []OrgWorkspace, orgBaseDir string, globalSecrets map[string]struct{}) []PerWorkspaceUnsatisfied {
+	var out []PerWorkspaceUnsatisfied
+	var walk func([]OrgWorkspace)
+	walk = func(wsList []OrgWorkspace) {
+		for _, ws := range wsList {
+			// Build the set of keys available to this workspace from .env.
+			// This is the same three-source stack that createWorkspaceTree
+			// injects into the container:
+			//   1. Org root .env (parseEnvFile, no filesDir)
+			//   2. Workspace <files_dir>/.env (if filesDir is set)
+			//   3. Persona bootstrap env (MOLECULE_PERSONA_ROOT/<filesDir>/env)
+			// Items 1+2 are on-disk and testable; item 3 is host-only and
+			// skipped here (persona env does NOT satisfy required_env —
+			// it carries identity tokens, not workspace LLM keys).
+			envFromFiles := loadWorkspaceEnv(orgBaseDir, ws.FilesDir)
+			// Convert map[string]string (from .env files) to map[string]struct{}
+			// to match IsSatisfied's signature.
+			envSet := make(map[string]struct{}, len(envFromFiles))
+			for k := range envFromFiles {
+				envSet[k] = struct{}{}
+			}
+			for _, req := range ws.RequiredEnv {
+				if req.IsSatisfied(globalSecrets) {
+					continue // covered by a global secret
+				}
+				if req.IsSatisfied(envSet) {
+					continue // covered by a per-workspace .env file
+				}
+				out = append(out, PerWorkspaceUnsatisfied{
+					Workspace:   ws.Name,
+					FilesDir:    ws.FilesDir,
+					Unsatisfied: req,
+				})
+			}
+			walk(ws.Children)
+		}
+	}
+	walk(workspaces)
+	return out
+}
+
 func loadConfiguredGlobalSecretKeys(ctx context.Context) (map[string]struct{}, error) {
 	rows, err := db.DB.QueryContext(ctx,
 		`SELECT key FROM global_secrets WHERE octet_length(encrypted_value) > 0 LIMIT $1`,

workspace-server/internal/handlers/org_plugin_allowlist.go

@@ -17,9 +17,6 @@ import (
 // when one exists, or the workspace's own ID when it is the org root.
 // Returns an empty string if the workspace is not found.
 func resolveOrgID(ctx context.Context, workspaceID string) (string, error) {
-	if db.DB == nil {
-		return "", nil // nil in unit tests
-	}
 	var parentID sql.NullString
 	err := db.DB.QueryRowContext(ctx,
 		`SELECT parent_id FROM workspaces WHERE id = $1`,

workspace-server/internal/handlers/plugins_atomic_test.go

@@ -215,9 +215,6 @@ func TestTarWalk_EmptyDirectory(t *testing.T) {
 	}
 }
 
-// TestTarWalk_NestedDirs is defined in plugins_atomic_tar_test.go to avoid
-// redeclaration. Deeply nested directory walk is tested there.
-
 // TestTarWalk_DirEntryHasTrailingSlash: directory entries must end with '/'
 // per tar format; tar.Header.Typeflag '5' (dir) must produce "name/" not "name".
 func TestTarWalk_DirEntryHasTrailingSlash(t *testing.T) {

workspace-server/internal/handlers/plugins_install_eic_test.go

@@ -342,6 +342,11 @@ func TestPluginInstall_InstanceLookupError_Returns503(t *testing.T) {
 // ---------- dispatch: uninstall ----------
 
 func TestPluginUninstall_SaaS_DispatchesToEIC(t *testing.T) {
+	mock := setupTestDB(t)
+	mock.ExpectExec("DELETE FROM workspace_plugins WHERE workspace_id").
+		WithArgs("ws-1", "browser-automation").
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
 	stubReadPluginManifestViaEIC(t, func(ctx context.Context, instanceID, runtime, pluginName string) ([]byte, error) {
 		return []byte("name: browser-automation\nskills:\n  - browse\n"), nil
 	})

workspace-server/internal/handlers/plugins_test.go

@@ -629,6 +629,9 @@ func TestPluginInstall_RejectsUnknownScheme(t *testing.T) {
 }
 
 func TestPluginInstall_LocalSourceReachesContainerLookup(t *testing.T) {
+	mock := setupTestDB(t)
+	expectAllowlistAllowAll(mock)
+
 	base := t.TempDir()
 	pluginDir := filepath.Join(base, "demo")
 	_ = os.MkdirAll(pluginDir, 0o755)
@@ -955,14 +958,14 @@ func TestLogInstallLimitsOnce(t *testing.T) {
 
 func TestRegexpEscapeForAwk(t *testing.T) {
 	cases := map[string]string{
-		"my-plugin":                 `my-plugin`,
-		"# Plugin: foo /":           `# Plugin: foo \/`,
-		"# Plugin: a.b /":           `# Plugin: a\.b \/`,
-		"foo[bar]":                  `foo\[bar\]`,
-		"a*b+c?":                    `a\*b\+c\?`,
-		"path|with|pipes":           `path\|with\|pipes`,
-		`back\slash`:                `back\\slash`,
-		"":                          ``,
+		"my-plugin":       `my-plugin`,
+		"# Plugin: foo /": `# Plugin: foo \/`,
+		"# Plugin: a.b /": `# Plugin: a\.b \/`,
+		"foo[bar]":        `foo\[bar\]`,
+		"a*b+c?":          `a\*b\+c\?`,
+		"path|with|pipes": `path\|with\|pipes`,
+		`back\slash`:      `back\\slash`,
+		"":                ``,
 	}
 	for in, want := range cases {
 		got := regexpEscapeForAwk(in)
@@ -1247,7 +1250,7 @@ func TestPluginDownload_GithubSchemeStreamsTarball(t *testing.T) {
 		scheme: "github",
 		fetchFn: func(_ context.Context, _ string, dst string) (string, error) {
 			files := map[string]string{
-				"plugin.yaml":            "name: remote-plugin\nversion: 1.0.0\n",
+				"plugin.yaml":             "name: remote-plugin\nversion: 1.0.0\n",
 				"skills/x/SKILL.md":       "---\nname: x\n---\n",
 				"adapters/claude_code.py": "from plugins_registry.builtins import AgentskillsAdaptor as Adaptor\n",
 			}

workspace-server/internal/handlers/plugins_tracking.go

@@ -86,9 +86,6 @@ func recordWorkspacePluginInstall(
 // pair. Called by the uninstall path so the row doesn't persist with a stale
 // installed_sha after the plugin has been removed from the container.
 func deleteWorkspacePluginRow(ctx context.Context, workspaceID, pluginName string) error {
-	if db.DB == nil {
-		return nil // nil in unit tests; no-op since the row is test-only
-	}
 	_, err := db.DB.ExecContext(ctx, `
 		DELETE FROM workspace_plugins WHERE workspace_id = $1 AND plugin_name = $2
 	`, workspaceID, pluginName)

workspace-server/internal/handlers/restart_signals.go

@@ -58,7 +58,7 @@ func (h *WorkspaceHandler) gracefulPreRestart(ctx context.Context, workspaceID s
 	// Non-blocking send — don't stall the restart cycle.
 	// Run in a detached goroutine so the caller (runRestartCycle) can
 	// proceed to stopForRestart without waiting.
-	go func() {
+	h.goAsync(func() {
 		signalCtx, cancel := context.WithTimeout(context.Background(), restartSignalTimeout)
 		defer cancel()
 
@@ -109,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

workspace-server/internal/handlers/restart_signals_test.go

@@ -271,6 +271,7 @@ func TestGracefulPreRestart_URLResolutionError(t *testing.T) {
 		WorkspaceHandler: newHandlerWithTestDeps(t),
 		errToReturn:      context.DeadlineExceeded,
 	}
+	waitForHandlerAsyncBeforeDBCleanup(t, hWrapper.WorkspaceHandler)
 
 	hWrapper.gracefulPreRestart(context.Background(), "ws-url-err-111")
 	time.Sleep(200 * time.Millisecond)

workspace-server/internal/handlers/schedules_handler_test.go

@@ -6,11 +6,12 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
+	"regexp"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/DATA-DOG/go-sqlmock"
+	sqlmock "github.com/DATA-DOG/go-sqlmock"
 	"github.com/gin-gonic/gin"
 )
 
@@ -170,18 +171,29 @@ func TestScheduleHandler_Create_InvalidCron(t *testing.T) {
 }
 
 func TestScheduleHandler_Create_CRLFStripped(t *testing.T) {
-	// Use setupTestDBForQueueTests which sets up QueryMatcherEqual for exact
-	// string matching. The INSERT statement is deterministic enough for that.
-	customSqlmock := setupTestDBForQueueTests(t)
-
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
 	// Prompt with CRLF from a Windows-committed org-template file.
 	// The handler strips \r before inserting so agent doesn't see empty responses.
 	promptWithCRLF := "check\r\ndocs\r\nbefore merge"
 
-	// The handler strips \r → query should receive the LF-only version.
-	customSqlmock.ExpectQuery("INSERT INTO workspace_schedules (workspace_id, name, cron_expr, timezone, prompt, enabled, next_run_at, source) VALUES ($1, $2, $3, $4, $5, $6, $7, 'runtime') RETURNING id").
+	// Use a custom matcher that captures the prompt argument so we can assert
+	// it has no \r characters.
+	matcher := sqlmock.NewArgMatcher(func(a interface{}) bool {
+		if s, ok := a.(string); ok {
+			// This will be called for multiple args; capture the prompt (5th arg).
+			return strings.Contains(s, "check\ndocs\nbefore merge")
+		}
+		return true
+	})
+	customMock, _, _ := sqlmock.New(sqlmock.QueryMatcherOption(matcher))
+	t.Cleanup(func() { customMock.Close() })
+	prevDB := db.DB
+	db.DB = customMock
+	t.Cleanup(func() { db.DB = prevDB })
+
+	customMock.ExpectQuery("INSERT INTO workspace_schedules").
 		WithArgs("ws-crlf", "", "0 9 * * *", "UTC", "check\ndocs\nbefore merge", true, sqlmock.AnyArg()).
 		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow("sched-crlf"))
 
@@ -201,9 +213,6 @@ func TestScheduleHandler_Create_CRLFStripped(t *testing.T) {
 	if w.Code != http.StatusCreated {
 		t.Errorf("expected 201, got %d: %s", w.Code, w.Body.String())
 	}
-	if err := customSqlmock.ExpectationsWereMet(); err != nil {
-		t.Errorf("sqlmock expectations not met: %v", err)
-	}
 }
 
 func TestScheduleHandler_Create_DefaultEnabled(t *testing.T) {
@@ -367,16 +376,16 @@ func TestScheduleHandler_Create_NextRunAtReturned(t *testing.T) {
 // ==================== Update ====================
 
 func TestScheduleHandler_Update_PartialRecomputeCron(t *testing.T) {
-	// Uses QueryMatcherEqual so query strings are compared verbatim — no escaping needed.
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectQuery("SELECT cron_expr, timezone FROM workspace_schedules WHERE id = $1 AND workspace_id = $2").
+	// Changing cron_expr → handler SELECTs current cron+tz, recomputes next_run_at.
+	mock.ExpectQuery(`SELECT cron_expr, timezone FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`).
 		WithArgs("sched-recompute-cron", "ws-1").
 		WillReturnRows(sqlmock.NewRows([]string{"cron_expr", "timezone"}).
 			AddRow("0 8 * * *", "UTC"))
 
-	mock.ExpectExec(`UPDATE workspace_schedules SET name = COALESCE($2, name), cron_expr = COALESCE($3, cron_expr), timezone = COALESCE($4, timezone), prompt = COALESCE($5, prompt), enabled = COALESCE($6, enabled), next_run_at = COALESCE($7, next_run_at), updated_at = now() WHERE id = $1 AND workspace_id = $8`).
+	mock.ExpectExec(regexp.MustCompile(`UPDATE workspace_schedules SET[\s\S]+WHERE id = \$1 AND workspace_id = \$8`)).
 		WithArgs("sched-recompute-cron", nil, "0 6 * * *", nil, nil, nil, sqlmock.AnyArg(), "ws-1").
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
@@ -399,15 +408,15 @@ func TestScheduleHandler_Update_PartialRecomputeCron(t *testing.T) {
 }
 
 func TestScheduleHandler_Update_PartialRecomputeTimezone(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectQuery("SELECT cron_expr, timezone FROM workspace_schedules WHERE id = $1 AND workspace_id = $2").
+	mock.ExpectQuery(`SELECT cron_expr, timezone FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`).
 		WithArgs("sched-recompute-tz", "ws-1").
 		WillReturnRows(sqlmock.NewRows([]string{"cron_expr", "timezone"}).
 			AddRow("0 9 * * *", "UTC"))
 
-	mock.ExpectExec(`UPDATE workspace_schedules SET name = COALESCE($2, name), cron_expr = COALESCE($3, cron_expr), timezone = COALESCE($4, timezone), prompt = COALESCE($5, prompt), enabled = COALESCE($6, enabled), next_run_at = COALESCE($7, next_run_at), updated_at = now() WHERE id = $1 AND workspace_id = $8`).
+	mock.ExpectExec(regexp.MustCompile(`UPDATE workspace_schedules SET[\s\S]+WHERE id = \$1 AND workspace_id = \$8`)).
 		WithArgs("sched-recompute-tz", nil, nil, "America/New_York", nil, nil, sqlmock.AnyArg(), "ws-1").
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
@@ -430,10 +439,10 @@ func TestScheduleHandler_Update_PartialRecomputeTimezone(t *testing.T) {
 }
 
 func TestScheduleHandler_Update_InvalidTimezone(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectQuery("SELECT cron_expr, timezone FROM workspace_schedules WHERE id = $1 AND workspace_id = $2").
+	mock.ExpectQuery(`SELECT cron_expr, timezone FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`).
 		WithArgs("sched-bad-tz", "ws-1").
 		WillReturnRows(sqlmock.NewRows([]string{"cron_expr", "timezone"}).
 			AddRow("0 9 * * *", "UTC"))
@@ -462,10 +471,10 @@ func TestScheduleHandler_Update_InvalidTimezone(t *testing.T) {
 }
 
 func TestScheduleHandler_Update_InvalidCron(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectQuery("SELECT cron_expr, timezone FROM workspace_schedules WHERE id = $1 AND workspace_id = $2").
+	mock.ExpectQuery(`SELECT cron_expr, timezone FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`).
 		WithArgs("sched-bad-cron", "ws-1").
 		WillReturnRows(sqlmock.NewRows([]string{"cron_expr", "timezone"}).
 			AddRow("0 9 * * *", "UTC"))
@@ -489,11 +498,11 @@ func TestScheduleHandler_Update_InvalidCron(t *testing.T) {
 }
 
 func TestScheduleHandler_Update_NotFound(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectExec(`UPDATE workspace_schedules SET name = COALESCE($2, name), cron_expr = COALESCE($3, cron_expr), timezone = COALESCE($4, timezone), prompt = COALESCE($5, prompt), enabled = COALESCE($6, enabled), next_run_at = COALESCE($7, next_run_at), updated_at = now() WHERE id = $1 AND workspace_id = $8`).
-		WithArgs("sched-missing", "renamed", nil, nil, nil, nil, nil, "ws-1").
+	mock.ExpectExec(regexp.MustCompile(`UPDATE workspace_schedules SET[\s\S]+WHERE id = \$1 AND workspace_id = \$8`)).
+		WithArgs("sched-missing", nil, nil, nil, nil, nil, nil, "ws-1").
 		WillReturnResult(sqlmock.NewResult(0, 0)) // no rows affected
 
 	body, _ := json.Marshal(map[string]string{"name": "renamed"})
@@ -515,11 +524,11 @@ func TestScheduleHandler_Update_NotFound(t *testing.T) {
 }
 
 func TestScheduleHandler_Update_DBError(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectExec(`UPDATE workspace_schedules SET name = COALESCE($2, name), cron_expr = COALESCE($3, cron_expr), timezone = COALESCE($4, timezone), prompt = COALESCE($5, prompt), enabled = COALESCE($6, enabled), next_run_at = COALESCE($7, next_run_at), updated_at = now() WHERE id = $1 AND workspace_id = $8`).
-		WithArgs("sched-update-err", "updated", nil, nil, nil, nil, nil, "ws-1").
+	mock.ExpectExec(regexp.MustCompile(`UPDATE workspace_schedules SET[\s\S]+WHERE id = \$1 AND workspace_id = \$8`)).
+		WithArgs("sched-update-err", nil, nil, nil, nil, nil, nil, "ws-1").
 		WillReturnError(sql.ErrConnDone)
 
 	body, _ := json.Marshal(map[string]string{"name": "updated"})
@@ -541,12 +550,12 @@ func TestScheduleHandler_Update_DBError(t *testing.T) {
 }
 
 func TestScheduleHandler_Update_PromptCRLFStripped(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
 	// Changing prompt with CRLF → handler strips \r before the UPDATE.
-	mock.ExpectExec(`UPDATE workspace_schedules SET name = COALESCE($2, name), cron_expr = COALESCE($3, cron_expr), timezone = COALESCE($4, timezone), prompt = COALESCE($5, prompt), enabled = COALESCE($6, enabled), next_run_at = COALESCE($7, next_run_at), updated_at = now() WHERE id = $1 AND workspace_id = $8`).
-		WithArgs("sched-crlf-upd", nil, nil, nil, "fix\nthat", nil, nil, "ws-1").
+	mock.ExpectExec(regexp.MustCompile(`UPDATE workspace_schedules SET[\s\S]+WHERE id = \$1 AND workspace_id = \$8`)).
+		WithArgs("sched-crlf-upd", nil, nil, nil, "fix\r\nthat", nil, nil, "ws-1").
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
 	body, _ := json.Marshal(map[string]string{"prompt": "fix\r\nthat"})
@@ -570,10 +579,10 @@ func TestScheduleHandler_Update_PromptCRLFStripped(t *testing.T) {
 // ==================== Delete ====================
 
 func TestScheduleHandler_Delete_Success(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectExec(`DELETE FROM workspace_schedules WHERE id = $1 AND workspace_id = $2`).
+	mock.ExpectExec(regexp.MustCompile(`DELETE FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`)).
 		WithArgs("sched-del", "ws-1").
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
@@ -593,11 +602,11 @@ func TestScheduleHandler_Delete_Success(t *testing.T) {
 }
 
 func TestScheduleHandler_Delete_NotFound(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
 	// IDOR guard: row belongs to different workspace → 0 rows affected → 404.
-	mock.ExpectExec(`DELETE FROM workspace_schedules WHERE id = $1 AND workspace_id = $2`).
+	mock.ExpectExec(regexp.MustCompile(`DELETE FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`)).
 		WithArgs("sched-idor", "ws-1").
 		WillReturnResult(sqlmock.NewResult(0, 0))
 
@@ -617,10 +626,10 @@ func TestScheduleHandler_Delete_NotFound(t *testing.T) {
 }
 
 func TestScheduleHandler_Delete_DBError(t *testing.T) {
-	mock := setupTestDBForQueueTests(t)
+	mock := setupTestDB(t)
 	handler := NewScheduleHandler()
 
-	mock.ExpectExec(`DELETE FROM workspace_schedules WHERE id = $1 AND workspace_id = $2`).
+	mock.ExpectExec(regexp.MustCompile(`DELETE FROM workspace_schedules WHERE id = \$1 AND workspace_id = \$2`)).
 		WithArgs("sched-del-err", "ws-1").
 		WillReturnError(sql.ErrConnDone)
 

workspace-server/internal/handlers/secrets.go

@@ -64,7 +64,7 @@ func (h *SecretsHandler) List(c *gin.Context) {
 		})
 	}
 	if err := rows.Err(); err != nil {
-		log.Printf("List workspace secrets iteration error: %v", err)
+		log.Printf("List secrets rows.Err: %v", err)
 	}
 
 	// 2. Global secrets not overridden at workspace level
@@ -95,7 +95,7 @@ func (h *SecretsHandler) List(c *gin.Context) {
 		})
 	}
 	if err := globalRows.Err(); err != nil {
-		log.Printf("List global secrets iteration error: %v", err)
+		log.Printf("List secrets (global) rows.Err: %v", err)
 	}
 
 	c.JSON(http.StatusOK, secrets)
@@ -181,7 +181,7 @@ func (h *SecretsHandler) Values(c *gin.Context) {
 			}
 		}
 		if err := globalRows.Err(); err != nil {
-			log.Printf("secrets.Values: global rows iteration error: %v", err)
+			log.Printf("secrets.Values globalRows.Err: %v", err)
 		}
 	}
 
@@ -205,7 +205,7 @@ func (h *SecretsHandler) Values(c *gin.Context) {
 			}
 		}
 		if err := wsRows.Err(); err != nil {
-			log.Printf("secrets.Values: workspace rows iteration error: %v", err)
+			log.Printf("secrets.Values wsRows.Err: %v", err)
 		}
 	}
 
@@ -337,7 +337,7 @@ func (h *SecretsHandler) ListGlobal(c *gin.Context) {
 		})
 	}
 	if err := rows.Err(); err != nil {
-		log.Printf("ListGlobal iteration error: %v", err)
+		log.Printf("ListGlobal rows.Err: %v", err)
 	}
 	c.JSON(http.StatusOK, secrets)
 }
@@ -416,7 +416,7 @@ func (h *SecretsHandler) restartAllAffectedByGlobalKey(key string) {
 		}
 	}
 	if err := rows.Err(); err != nil {
-		log.Printf("restartAllAffectedByGlobalKey: iteration error: %v", err)
+		log.Printf("restartAllAffectedByGlobalKey rows.Err: %v", err)
 	}
 	if len(ids) == 0 {
 		return

workspace-server/internal/handlers/terminal.go

@@ -109,11 +109,9 @@ func (h *TerminalHandler) HandleConnect(c *gin.Context) {
 	// provisionWorkspaceCP → migration 038). Null instance_id means the
 	// workspace runs as a local Docker container on this tenant.
 	var instanceID string
-	if db.DB != nil {
-		db.DB.QueryRowContext(ctx,
-			`SELECT COALESCE(instance_id, '') FROM workspaces WHERE id = $1`,
-			workspaceID).Scan(&instanceID)
-	}
+	db.DB.QueryRowContext(ctx,
+		`SELECT COALESCE(instance_id, '') FROM workspaces WHERE id = $1`,
+		workspaceID).Scan(&instanceID)
 
 	if instanceID != "" {
 		h.handleRemoteConnect(c, workspaceID, instanceID)
@@ -145,7 +143,7 @@ func (h *TerminalHandler) handleLocalConnect(c *gin.Context, workspaceID string)
 
 	// Look up workspace name for manual container naming
 	var wsName string
-	if db.DB != nil && h.docker != nil {
+	if _, err := h.docker.Ping(ctx); err == nil {
 		db.DB.QueryRowContext(ctx, `SELECT LOWER(REPLACE(name, ' ', '-')) FROM workspaces WHERE id = $1`, workspaceID).Scan(&wsName)
 		if wsName != "" {
 			candidates = append(candidates, wsName)

workspace-server/internal/handlers/terminal_test.go

@@ -340,6 +340,11 @@ func TestSSHCommandCmd_BuildsArgv(t *testing.T) {
 // a workspace must still be able to access its own terminal. The CanCommunicate
 // fast-path returns true when callerID == targetID.
 func TestTerminalConnect_KI005_AllowsOwnTerminal(t *testing.T) {
+	mock := setupTestDB(t)
+	mock.ExpectQuery("SELECT COALESCE").
+		WithArgs("ws-alice").
+		WillReturnRows(sqlmock.NewRows([]string{"instance_id"}).AddRow(""))
+
 	// CanCommunicate fast-path: callerID == targetID → returns true without DB.
 	prev := canCommunicateCheck
 	canCommunicateCheck = func(callerID, targetID string) bool { return callerID == targetID }
@@ -367,6 +372,11 @@ func TestTerminalConnect_KI005_AllowsOwnTerminal(t *testing.T) {
 // skip the CanCommunicate check entirely and fall through to the Docker auth path.
 // We assert they get the nil-docker 503 instead of 403.
 func TestTerminalConnect_KI005_SkipsCheckWithoutHeader(t *testing.T) {
+	mock := setupTestDB(t)
+	mock.ExpectQuery("SELECT COALESCE").
+		WithArgs("ws-any").
+		WillReturnRows(sqlmock.NewRows([]string{"instance_id"}).AddRow(""))
+
 	h := NewTerminalHandler(nil) // nil docker → 503 if reached
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
@@ -439,6 +449,9 @@ func TestTerminalConnect_KI005_AllowsSiblingWorkspace(t *testing.T) {
 	mock.ExpectExec(`UPDATE workspace_auth_tokens SET last_used_at`).
 		WithArgs(sqlmock.AnyArg()).
 		WillReturnResult(sqlmock.NewResult(0, 1))
+	mock.ExpectQuery("SELECT COALESCE").
+		WithArgs("ws-dev").
+		WillReturnRows(sqlmock.NewRows([]string{"instance_id"}).AddRow(""))
 
 	h := NewTerminalHandler(nil)
 	w := httptest.NewRecorder()
@@ -463,7 +476,10 @@ func TestTerminalConnect_KI005_AllowsSiblingWorkspace(t *testing.T) {
 // introduced in GH#1885: internal routing uses org tokens which are not in
 // workspace_auth_tokens, so ValidateToken would always fail for them.
 func TestKI005_OrgToken_SkipsValidateToken(t *testing.T) {
-	setupTestDB(t) // no ValidateToken ExpectQuery — none should fire
+	mock := setupTestDB(t) // no ValidateToken ExpectQuery — none should fire
+	mock.ExpectQuery("SELECT COALESCE").
+		WithArgs("ws-target").
+		WillReturnRows(sqlmock.NewRows([]string{"instance_id"}).AddRow(""))
 	prev := canCommunicateCheck
 	canCommunicateCheck = func(callerID, targetID string) bool {
 		// Simulate platform agent → target workspace (same org).
@@ -544,4 +560,3 @@ func TestSSHCommandCmd_ConnectTimeoutPresent(t *testing.T) {
 			args)
 	}
 }
-

workspace-server/internal/handlers/tokens.go

@@ -67,9 +67,6 @@ func (h *TokenHandler) List(c *gin.Context) {
 		}
 		tokens = append(tokens, t)
 	}
-	if err := rows.Err(); err != nil {
-		log.Printf("ListTokens rows.Err workspace=%s: %v", workspaceID, err)
-	}
 
 	c.JSON(http.StatusOK, gin.H{
 		"tokens": tokens,

workspace-server/internal/handlers/workspace.go

@@ -74,10 +74,7 @@ type WorkspaceHandler struct {
 	// memory plugin). main.go sets this to plugin.DeleteNamespace
 	// when MEMORY_PLUGIN_URL is configured.
 	namespaceCleanupFn func(ctx context.Context, workspaceID string)
-	// asyncWG tracks goroutines launched by goAsync so tests can wait
-	// for async DB users (restart, provision) before asserting results.
-	// Matches the pattern from main commit 1c3b4ff3.
-	asyncWG sync.WaitGroup
+	asyncWG            sync.WaitGroup
 }
 
 func (h *WorkspaceHandler) goAsync(fn func()) {
@@ -595,7 +592,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
@@ -604,7 +601,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
 	}
@@ -628,8 +625,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
@@ -665,8 +660,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'
@@ -726,8 +720,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

workspace-server/internal/handlers/workspace_abilities.go

@@ -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"})
-}

workspace-server/internal/handlers/workspace_broadcast.go

@@ -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]) + "…"
-}

workspace-server/internal/handlers/workspace_budget_test.go

@@ -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)

workspace-server/internal/handlers/workspace_crud.go

@@ -149,19 +149,6 @@ func (h *WorkspaceHandler) Update(c *gin.Context) {
 		}
 	}
 
-	// Validate workspace_dir early so invalid paths are rejected before the
-	// existence check (consistent with name/role/runtime validation above).
-	if wsDir, ok := body["workspace_dir"]; ok {
-		if wsDir != nil {
-			if dirStr, isStr := wsDir.(string); isStr && dirStr != "" {
-				if err := validateWorkspaceDir(dirStr); err != nil {
-					c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace directory"})
-					return
-				}
-			}
-		}
-	}
-
 	ctx := c.Request.Context()
 
 	// Auth is fully enforced at the router layer (WorkspaceAuth middleware, #680).
@@ -219,8 +206,15 @@ func (h *WorkspaceHandler) Update(c *gin.Context) {
 	}
 	needsRestart := false
 	if wsDir, ok := body["workspace_dir"]; ok {
-		// ValidateWorkspaceDir was already called above before the existence check;
-		// the UPDATE itself is unconditional.
+		// Allow null to clear workspace_dir
+		if wsDir != nil {
+			if dirStr, isStr := wsDir.(string); isStr && dirStr != "" {
+				if err := validateWorkspaceDir(dirStr); err != nil {
+					c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace directory"})
+					return
+				}
+			}
+		}
 		if _, err := db.DB.ExecContext(ctx, `UPDATE workspaces SET workspace_dir = $2, updated_at = now() WHERE id = $1`, id, wsDir); err != nil {
 			log.Printf("Update workspace_dir error for %s: %v", id, err)
 		}

workspace-server/internal/handlers/workspace_crud_test.go

@@ -187,43 +187,57 @@ func TestState_QueryError(t *testing.T) {
 // ---------- Update ----------
 
 func TestUpdate_InvalidUUID(t *testing.T) {
-	err := validateWorkspaceID("not-a-uuid")
-	if err == nil {
-		t.Error("expected error for invalid UUID in PATCH path")
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	body := map[string]interface{}{"name": "Test"}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/not-a-uuid", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_InvalidBody(t *testing.T) {
-	_, r := setupWorkspaceCrudTest(t)
+	_, _ = setupWorkspaceCrudTest(t)
 	h := newWorkspaceCrudHandler(t)
-	r.PATCH("/workspaces/:id", h.Update)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
 
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader([]byte("not json")))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r.ServeHTTP(w, req)
+	r2.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400 for malformed JSON, got %d: %s", w.Code, w.Body.String())
+		t.Errorf("expected 400, got %d", w.Code)
 	}
 }
 
 func TestUpdate_WorkspaceNotFound(t *testing.T) {
-	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
-	mock, r := setupWorkspaceCrudTest(t)
+	mock, _ := setupWorkspaceCrudTest(t)
 	h := newWorkspaceCrudHandler(t)
-	r.PATCH("/workspaces/:id", h.Update)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
 	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1\)`).
 		WithArgs(wsID).
-		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(0))
+		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(false))
 
 	body := map[string]interface{}{"name": "New Name"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/"+wsID, bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r.ServeHTTP(w, req)
+	r2.ServeHTTP(w, req)
 
 	if w.Code != http.StatusNotFound {
 		t.Errorf("expected 404, got %d: %s", w.Code, w.Body.String())
@@ -231,78 +245,163 @@ func TestUpdate_WorkspaceNotFound(t *testing.T) {
 }
 
 func TestUpdate_NameTooLong(t *testing.T) {
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
 	longName := make([]byte, 256)
 	for i := range longName {
 		longName[i] = 'x'
 	}
-	err := validateWorkspaceFields(string(longName), "", "", "")
-	if err == nil {
-		t.Error("expected error for name > 255 chars")
+	body := map[string]interface{}{"name": string(longName)}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for name too long, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_RoleTooLong(t *testing.T) {
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
 	longRole := make([]byte, 1001)
 	for i := range longRole {
 		longRole[i] = 'x'
 	}
-	err := validateWorkspaceFields("", string(longRole), "", "")
-	if err == nil {
-		t.Error("expected error for role > 1000 chars")
+	body := map[string]interface{}{"role": string(longRole)}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for role too long, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_NameWithNewline(t *testing.T) {
-	err := validateWorkspaceFields("Name\nwith newline", "", "", "")
-	if err == nil {
-		t.Error("expected error for newline in name")
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	body := map[string]interface{}{"name": "Name\nwith newline"}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for newline in name, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_NameWithYAMLSpecialChars(t *testing.T) {
-	for _, ch := range "{}[]|>*&!" {
-		err := validateWorkspaceFields("namewith"+string(ch), "", "", "")
-		if err == nil {
-			t.Errorf("expected error for YAML special char %c in name", ch)
-		}
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	body := map[string]interface{}{"name": "Name with [brackets]"}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for YAML special chars in name, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_WorkspaceDirSystemPath(t *testing.T) {
-	err := validateWorkspaceDir("/etc/my-workspace")
-	if err == nil {
-		t.Error("expected error for /etc/ system path in workspace_dir")
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	body := map[string]interface{}{"workspace_dir": "/etc/my-workspace"}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for system path workspace_dir, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_WorkspaceDirTraversal(t *testing.T) {
-	err := validateWorkspaceDir("/workspace/../../../etc")
-	if err == nil {
-		t.Error("expected error for traversal in workspace_dir")
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	body := map[string]interface{}{"workspace_dir": "/workspace/../../../etc"}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for traversal in workspace_dir, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestUpdate_WorkspaceDirRelativePath(t *testing.T) {
-	err := validateWorkspaceDir("relative/path")
-	if err == nil {
-		t.Error("expected error for relative workspace_dir")
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.PATCH("/workspaces/:id", h.Update)
+
+	body := map[string]interface{}{"workspace_dir": "relative/path"}
+	b, _ := json.Marshal(body)
+	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400 for relative workspace_dir, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 // ---------- Delete ----------
 
 func TestDelete_InvalidUUID(t *testing.T) {
-	err := validateWorkspaceID("not-a-uuid")
-	if err == nil {
-		t.Error("expected error for invalid UUID in DELETE path")
+	_, _ = setupWorkspaceCrudTest(t)
+	h := newWorkspaceCrudHandler(t)
+	r2 := gin.New()
+	r2.DELETE("/workspaces/:id", h.Delete)
+
+	req, _ := http.NewRequest("DELETE", "/workspaces/not-a-uuid", nil)
+	w := httptest.NewRecorder()
+	r2.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("expected 400, got %d: %s", w.Code, w.Body.String())
 	}
 }
 
 func TestDelete_HasChildrenWithoutConfirm(t *testing.T) {
-	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
-	mock, r := setupWorkspaceCrudTest(t)
+	mock, _ := setupWorkspaceCrudTest(t)
 	h := newWorkspaceCrudHandler(t)
-	r.DELETE("/workspaces/:id", h.Delete)
+	r2 := gin.New()
+	r2.DELETE("/workspaces/:id", h.Delete)
+
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
 	mock.ExpectQuery(`SELECT id, name FROM workspaces WHERE parent_id = \$1 AND status != 'removed'`).
 		WithArgs(wsID).
@@ -312,7 +411,7 @@ func TestDelete_HasChildrenWithoutConfirm(t *testing.T) {
 	req, _ := http.NewRequest("DELETE", "/workspaces/"+wsID, nil)
 	// No ?confirm=true
 	w := httptest.NewRecorder()
-	r.ServeHTTP(w, req)
+	r2.ServeHTTP(w, req)
 
 	if w.Code != http.StatusConflict {
 		t.Errorf("expected 409, got %d: %s", w.Code, w.Body.String())
@@ -331,10 +430,12 @@ func TestDelete_HasChildrenWithoutConfirm(t *testing.T) {
 }
 
 func TestDelete_ChildrenCheckQueryError(t *testing.T) {
-	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
-	mock, r := setupWorkspaceCrudTest(t)
+	mock, _ := setupWorkspaceCrudTest(t)
 	h := newWorkspaceCrudHandler(t)
-	r.DELETE("/workspaces/:id", h.Delete)
+	r2 := gin.New()
+	r2.DELETE("/workspaces/:id", h.Delete)
+
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
 	mock.ExpectQuery(`SELECT id, name FROM workspaces WHERE parent_id = \$1 AND status != 'removed'`).
 		WithArgs(wsID).
@@ -342,7 +443,7 @@ func TestDelete_ChildrenCheckQueryError(t *testing.T) {
 
 	req, _ := http.NewRequest("DELETE", "/workspaces/"+wsID, nil)
 	w := httptest.NewRecorder()
-	r.ServeHTTP(w, req)
+	r2.ServeHTTP(w, req)
 
 	if w.Code != http.StatusInternalServerError {
 		t.Errorf("expected 500, got %d", w.Code)

workspace-server/internal/handlers/workspace_provision.go

@@ -258,7 +258,7 @@ func (h *WorkspaceHandler) buildProvisionerConfig(
 	// present) wins, matching the existing WorkspaceDir precedence.
 	workspacePath := payload.WorkspaceDir
 	workspaceAccess := payload.WorkspaceAccess
-	if (workspacePath == "" || workspaceAccess == "") && db.DB != nil {
+	if workspacePath == "" || workspaceAccess == "" {
 		var dbDir, dbAccess string
 		if err := db.DB.QueryRow(
 			`SELECT COALESCE(workspace_dir, ''), COALESCE(workspace_access, 'none') FROM workspaces WHERE id = $1`,
@@ -805,9 +805,6 @@ func loadWorkspaceSecrets(ctx context.Context, workspaceID string) (map[string]s
 				envVars[k] = string(decrypted)
 			}
 		}
-		if err := globalRows.Err(); err != nil {
-			log.Printf("Provisioner: global_secrets rows.Err workspace=%s: %v", workspaceID, err)
-		}
 	}
 	wsRows, err := db.DB.QueryContext(ctx,
 		`SELECT key, encrypted_value, encryption_version FROM workspace_secrets WHERE workspace_id = $1`, workspaceID)
@@ -826,9 +823,6 @@ func loadWorkspaceSecrets(ctx context.Context, workspaceID string) (map[string]s
 				envVars[k] = string(decrypted)
 			}
 		}
-		if err := wsRows.Err(); err != nil {
-			log.Printf("Provisioner: workspace_secrets rows.Err workspace=%s: %v", workspaceID, err)
-		}
 	}
 	return envVars, ""
 }

workspace-server/internal/handlers/workspace_provision_auto_test.go

@@ -144,6 +144,7 @@ func TestProvisionWorkspaceAuto_RoutesToCPWhenSet(t *testing.T) {
 	rec := &trackingCPProv{startErr: errors.New("simulated CP rejection")}
 	bcast := &concurrentSafeBroadcaster{}
 	h := NewWorkspaceHandler(bcast, nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, h)
 	h.SetCPProvisioner(rec)
 
 	wsID := "ws-routes-to-cp-0123456789abcdef"
@@ -595,6 +596,7 @@ func TestRestartWorkspaceAuto_RoutesToCPWhenSet(t *testing.T) {
 
 	// Mock DB so cpStopWithRetry can run without a real Postgres.
 	mock := setupTestDB(t)
+	waitForHandlerAsyncBeforeDBCleanup(t, h)
 	mock.MatchExpectationsInOrder(false)
 	// provisionWorkspaceCP runs in the goroutine and will hit secrets
 	// SELECTs + UPDATE workspace as failed (we make CP Start return
@@ -670,6 +672,7 @@ func TestRestartWorkspaceAuto_RoutesToDockerWhenOnlyDocker(t *testing.T) {
 
 	bcast := &concurrentSafeBroadcaster{}
 	h := NewWorkspaceHandler(bcast, nil, "http://localhost:8080", t.TempDir())
+	waitForHandlerAsyncBeforeDBCleanup(t, h)
 	stub := &stoppingLocalProv{}
 	h.provisioner = stub
 

workspace-server/internal/handlers/workspace_provision_test.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 	"net/http"
 	"os"
@@ -634,6 +635,11 @@ func TestSeedInitialMemories_EmptyMemoriesNil(t *testing.T) {
 // ==================== buildProvisionerConfig ====================
 
 func TestBuildProvisionerConfig_BasicFields(t *testing.T) {
+	mock := setupTestDB(t)
+	mock.ExpectQuery(`SELECT COALESCE\(workspace_dir`).
+		WithArgs("ws-basic").
+		WillReturnRows(sqlmock.NewRows([]string{"workspace_dir", "workspace_access"}).AddRow("", "none"))
+
 	broadcaster := newTestBroadcaster()
 	tmpDir := t.TempDir()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", tmpDir)
@@ -678,6 +684,14 @@ func TestBuildProvisionerConfig_BasicFields(t *testing.T) {
 }
 
 func TestBuildProvisionerConfig_WorkspacePathFromEnv(t *testing.T) {
+	mock := setupTestDB(t)
+	mock.ExpectQuery(`SELECT COALESCE\(workspace_dir`).
+		WithArgs("ws-env").
+		WillReturnError(sql.ErrNoRows)
+	mock.ExpectQuery(`SELECT digest FROM runtime_image_pins`).
+		WithArgs("claude-code").
+		WillReturnError(sql.ErrNoRows)
+
 	broadcaster := newTestBroadcaster()
 	handler := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())
 

workspace-server/internal/handlers/workspace_test.go

@@ -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)

workspace-server/internal/memory/e2e/swap_test.go

@@ -207,7 +207,7 @@ func setupSwapEnv(t *testing.T) (*handlers.MCPHandler, *flatPlugin, sqlmock.Sqlm
 	resolver := namespace.New(db)
 
 	// MCPHandler needs a real *sql.DB; pass the sqlmock-backed one.
-	h := handlers.NewMCPHandler(db, nil, nil).WithMemoryV2(cl, resolver)
+	h := handlers.NewMCPHandler(db, nil).WithMemoryV2(cl, resolver)
 	return h, plugin, mock
 }
 
@@ -430,7 +430,7 @@ func TestE2E_PluginUnreachable_AgentSeesClearError(t *testing.T) {
 	db, _, _ := sqlmock.New()
 	defer db.Close()
 	resolver := namespace.New(db)
-	h := handlers.NewMCPHandler(db, nil, nil).WithMemoryV2(cl, resolver)
+	h := handlers.NewMCPHandler(db, nil).WithMemoryV2(cl, resolver)
 
 	_, err := h.Dispatch(context.Background(), "root-1", "commit_memory_v2", map[string]interface{}{
 		"content": "x",

workspace-server/internal/models/workspace.go

@@ -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"`

workspace-server/internal/provisioner/cp_provisioner.go

@@ -4,14 +4,12 @@ import (
 	"bytes"
 	"context"
 	"database/sql"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -158,11 +156,6 @@ type cpProvisionRequest struct {
 	Tier        int               `json:"tier"`
 	PlatformURL string            `json:"platform_url"`
 	Env         map[string]string `json:"env"`
-	// ConfigFiles are template + generated config files to write into the
-	// EC2 instance's /configs directory. OFFSEC-010: collected by
-	// collectCPConfigFiles which rejects symlinks and non-regular files
-	// before including them. Serialised as base64 to avoid JSON escaping.
-	ConfigFiles map[string]string `json:"config_files,omitempty"`
 }
 
 type cpProvisionResponse struct {
@@ -186,16 +179,6 @@ func (p *CPProvisioner) Start(ctx context.Context, cfg WorkspaceConfig) (string,
 		}
 		env["ADMIN_TOKEN"] = p.adminToken
 	}
-	// Collect template files and generated configs, with OFFSEC-010 guards:
-	// - Rejects symlinks at the template root (prevents bypass via symlink traversal)
-	// - Skips symlinks during WalkDir (prevents /etc/passwd etc. inclusion)
-	// - Validates all paths are relative and non-escaping
-	// - Caps total size at 12 KiB to prevent payload bloat
-	configFiles, err := collectCPConfigFiles(cfg)
-	if err != nil {
-		return "", fmt.Errorf("cp provisioner: collect config files: %w", err)
-	}
-
 	req := cpProvisionRequest{
 		OrgID:       p.orgID,
 		WorkspaceID: cfg.WorkspaceID,
@@ -203,7 +186,6 @@ func (p *CPProvisioner) Start(ctx context.Context, cfg WorkspaceConfig) (string,
 		Tier:        cfg.Tier,
 		PlatformURL: cfg.PlatformURL,
 		Env:         env,
-		ConfigFiles: configFiles,
 	}
 
 	body, err := json.Marshal(req)
@@ -255,94 +237,6 @@ func (p *CPProvisioner) Start(ctx context.Context, cfg WorkspaceConfig) (string,
 	return result.InstanceID, nil
 }
 
-const cpConfigFilesMaxBytes = 12 << 10
-
-// isCPTemplateConfigFile restricts which files from a template directory are
-// eligible for transport to the control plane. Only config.yaml (the runtime
-// entrypoint config) and files under prompts/ (system prompts) are needed;
-// shipping arbitrary files (e.g. adapter.py, Dockerfile) is both unnecessary
-// and a potential data-exfiltration surface.
-func isCPTemplateConfigFile(name string) bool {
-	name = filepath.ToSlash(filepath.Clean(name))
-	return name == "config.yaml" || strings.HasPrefix(name, "prompts/")
-}
-
-func collectCPConfigFiles(cfg WorkspaceConfig) (map[string]string, error) {
-	files := make(map[string]string)
-	total := 0
-	addFile := func(name string, data []byte) error {
-		name = filepath.ToSlash(filepath.Clean(name))
-		if name == "." || strings.HasPrefix(name, "../") || strings.HasPrefix(name, "/") || strings.Contains(name, "/../") {
-			return fmt.Errorf("invalid config file path %q", name)
-		}
-		total += len(data)
-		if total > cpConfigFilesMaxBytes {
-			return fmt.Errorf("config files exceed %d bytes", cpConfigFilesMaxBytes)
-		}
-		files[name] = base64.StdEncoding.EncodeToString(data)
-		return nil
-	}
-
-	if cfg.TemplatePath != "" {
-		// Reject symlinks on the root itself — WalkDir follows symlinks,
-		// so a symlink TemplatePath that escapes the intended root directory
-		// would bypass the subsequent path-relativization checks below.
-		rootInfo, err := os.Lstat(cfg.TemplatePath)
-		if err != nil {
-			return nil, fmt.Errorf("collectCPConfigFiles: lstat template path: %w", err)
-		}
-		if rootInfo.Mode()&os.ModeSymlink != 0 {
-			return nil, fmt.Errorf("collectCPConfigFiles: template path must not be a symlink")
-		}
-		err = filepath.WalkDir(cfg.TemplatePath, func(path string, d os.DirEntry, walkErr error) error {
-			if walkErr != nil {
-				return walkErr
-			}
-			// Skip symlinks — WalkDir follows them by default, which means
-			// a symlink inside the template dir pointing to /etc/passwd
-			// would be traversed even though the resulting relative-path
-			// check would correctly reject it. Defense-in-depth: don't
-			// follow symlinks at all. (OFFSEC-010)
-			if d.Type()&os.ModeSymlink != 0 {
-				return nil
-			}
-			if d.IsDir() {
-				return nil
-			}
-			info, err := d.Info()
-			if err != nil {
-				return err
-			}
-			if !info.Mode().IsRegular() {
-				return nil
-			}
-			rel, err := filepath.Rel(cfg.TemplatePath, path)
-			if err != nil {
-				return err
-			}
-			if !isCPTemplateConfigFile(rel) {
-				return nil
-			}
-			data, err := os.ReadFile(path)
-			if err != nil {
-				return err
-			}
-			return addFile(rel, data)
-		})
-		if err != nil {
-			return nil, err
-		}
-	}
-	for name, data := range cfg.ConfigFiles {
-		if err := addFile(name, data); err != nil {
-			return nil, err
-		}
-	}
-	if len(files) == 0 {
-		return nil, nil
-	}
-	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

workspace-server/internal/provisioner/cp_provisioner_test.go

@@ -1,15 +1,11 @@
 package provisioner
 
 import (
-	"bytes"
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
-	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -283,105 +279,6 @@ func TestStart_TransportFailureSurfaces(t *testing.T) {
 	}
 }
 
-// TestStart_CollectsConfigFiles — verify that collectCPConfigFiles is called and
-// its result is included in the cpProvisionRequest sent to the control plane.
-// Tests the OFFSEC-010 wiring: the function's symlink guards are only effective
-// if the call site actually invokes it.
-func TestStart_CollectsConfigFiles(t *testing.T) {
-	tmpl := t.TempDir()
-	if err := os.WriteFile(filepath.Join(tmpl, "config.yaml"), []byte("name: test\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	// adapter.py is within the size limit but is NOT config.yaml or prompts/,
-	// so isCPTemplateConfigFile must exclude it from the transport.
-	if err := os.WriteFile(filepath.Join(tmpl, "adapter.py"), bytes.Repeat([]byte("x"), cpConfigFilesMaxBytes), 0o600); err != nil {
-		t.Fatal(err)
-	}
-
-	var gotBody cpProvisionRequest
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		_ = json.NewDecoder(r.Body).Decode(&gotBody)
-		w.WriteHeader(http.StatusCreated)
-		_, _ = io.WriteString(w, `{"instance_id":"i-abc123","state":"pending"}`)
-	}))
-	defer srv.Close()
-
-	p := &CPProvisioner{baseURL: srv.URL, orgID: "org-1", httpClient: srv.Client()}
-	_, err := p.Start(context.Background(), WorkspaceConfig{
-		WorkspaceID:  "ws-1",
-		Runtime:     "python",
-		Tier:         1,
-		PlatformURL:  "http://tenant",
-		TemplatePath: tmpl,
-		ConfigFiles:  map[string][]byte{"generated.json": []byte(`{"key":"value"}`)},
-	})
-	if err != nil {
-		t.Fatalf("Start: %v", err)
-	}
-
-	// config.yaml from TemplatePath must be base64-encoded in ConfigFiles
-	if len(gotBody.ConfigFiles) == 0 {
-		t.Fatal("ConfigFiles is empty: collectCPConfigFiles was not called")
-	}
-
-	// Find config.yaml entry and verify it's valid base64 + correct content
-	var foundTemplate, foundGenerated bool
-	for name, encoded := range gotBody.ConfigFiles {
-		decoded, err := base64.StdEncoding.DecodeString(encoded)
-		if err != nil {
-			t.Errorf("ConfigFiles[%q] is not valid base64: %v", name, err)
-			continue
-		}
-		if name == "config.yaml" && string(decoded) == "name: test\n" {
-			foundTemplate = true
-		}
-		if name == "generated.json" && string(decoded) == `{"key":"value"}` {
-			foundGenerated = true
-		}
-	}
-	if !foundTemplate {
-		t.Errorf("ConfigFiles missing config.yaml from TemplatePath")
-	}
-	if !foundGenerated {
-		t.Errorf("ConfigFiles missing generated.json from ConfigFiles")
-	}
-	// adapter.py must NOT be in ConfigFiles — isCPTemplateConfigFile filters it out
-	for name := range gotBody.ConfigFiles {
-		if name == "adapter.py" {
-			t.Errorf("adapter.py should not be in ConfigFiles — isCPTemplateConfigFile must filter it out")
-		}
-	}
-}
-
-// TestStart_SymlinkTemplatePathError — a symlink TemplatePath should cause
-// collectCPConfigFiles to return an error, which Start must propagate.
-// Without this wiring, OFFSEC-010's root-symlink guard is dead code.
-func TestStart_SymlinkTemplatePathError(t *testing.T) {
-	// Create a temp file and a symlink pointing to it
-	tmp := t.TempDir()
-	realFile := filepath.Join(tmp, "real")
-	if err := os.WriteFile(realFile, []byte("data"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	symlink := filepath.Join(tmp, "template_link")
-	if err := os.Symlink(realFile, symlink); err != nil {
-		t.Fatal(err)
-	}
-
-	p := &CPProvisioner{baseURL: "http://unused", orgID: "org-1", httpClient: &http.Client{Timeout: time.Second}}
-	_, err := p.Start(context.Background(), WorkspaceConfig{
-		WorkspaceID:  "ws-1",
-		Runtime:     "python",
-		TemplatePath: symlink, // symlink root → OFFSEC-010 guard should fire
-	})
-	if err == nil {
-		t.Fatal("expected error for symlink TemplatePath, got nil")
-	}
-	if !strings.Contains(err.Error(), "symlink") {
-		t.Errorf("error should mention symlink, got %q", err.Error())
-	}
-}
-
 // TestStop_SendsBothAuthHeaders — verify #118/#130 compliance on the
 // teardown path. Any call to /cp/workspaces/:id must carry both the
 // platform-wide shared secret AND the per-tenant admin token, or the
@@ -945,67 +842,3 @@ func TestIsRunning_EmptyInstanceIDReturnsFalse(t *testing.T) {
 		t.Errorf("IsRunning with empty instance_id should return running=false, got true")
 	}
 }
-
-// TestCollectCPConfigFiles_SkipsSymlinks — WalkDir follows symlinks by default,
-// but collectCPConfigFiles must skip them so a symlink inside a template dir
-// pointing outside (e.g. ln -s /etc snapshot) cannot be traversed.
-// Verifies OFFSEC-010 defense-in-depth fix. (OFFSEC-010)
-func TestCollectCPConfigFiles_SkipsSymlinks(t *testing.T) {
-	tmpl := t.TempDir()
-	// Write a real file that should be included.
-	if err := os.WriteFile(filepath.Join(tmpl, "config.yaml"), []byte("name: real\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	// Create a subdir with a file that will be symlinked-outside.
-	sensitiveDir := t.TempDir()
-	if err := os.WriteFile(filepath.Join(sensitiveDir, "secret.txt"), []byte("SENSITIVE\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	// Symlink inside template dir pointing to outside path.
-	symlinkPath := filepath.Join(tmpl, "snapshot")
-	if err := os.Symlink(sensitiveDir, symlinkPath); err != nil {
-		t.Fatal(err)
-	}
-
-	files, err := collectCPConfigFiles(WorkspaceConfig{TemplatePath: tmpl})
-	if err != nil {
-		t.Fatalf("collectCPConfigFiles: %v", err)
-	}
-	if files == nil {
-		t.Fatal("files should not be nil")
-	}
-	// config.yaml must be present.
-	if _, ok := files["config.yaml"]; !ok {
-		t.Errorf("config.yaml missing from files")
-	}
-	// The symlinked path must NOT be included (even though WalkDir would
-	// traverse it, the d.Type()&os.ModeSymlink guard skips the entry).
-	for k := range files {
-		if strings.Contains(k, "snapshot") || strings.Contains(k, "secret") {
-			t.Errorf("symlink path %q should not be in files — OFFSEC-010 regression", k)
-		}
-	}
-}
-
-// TestCollectCPConfigFiles_RejectsRootSymlink — if cfg.TemplatePath itself is
-// a symlink, WalkDir would follow it to an arbitrary directory, bypassing the
-// cfg.TemplatePath boundary. The function must reject this case explicitly.
-// (OFFSEC-010)
-func TestCollectCPConfigFiles_RejectsRootSymlink(t *testing.T) {
-	real := t.TempDir()
-	if err := os.WriteFile(filepath.Join(real, "config.yaml"), []byte("name: real\n"), 0o600); err != nil {
-		t.Fatal(err)
-	}
-	link := filepath.Join(t.TempDir(), "template-link")
-	if err := os.Symlink(real, link); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err := collectCPConfigFiles(WorkspaceConfig{TemplatePath: link})
-	if err == nil {
-		t.Error("collectCPConfigFiles with symlink TemplatePath should return error")
-	}
-	if err != nil && !strings.Contains(err.Error(), "symlink") {
-		t.Errorf("expected symlink-related error, got: %v", err)
-	}
-}

workspace-server/internal/provisioner/provisioner_test.go

@@ -62,6 +62,24 @@ func TestValidateConfigSource_TemplateIsDirName(t *testing.T) {
 	}
 }
 
+func TestStartSeedsConfigsBeforeContainerStart(t *testing.T) {
+	src, err := os.ReadFile("provisioner.go")
+	if err != nil {
+		t.Fatalf("read provisioner.go: %v", err)
+	}
+	text := string(src)
+	copyTemplate := strings.Index(text, "p.CopyTemplateToContainer(ctx, resp.ID, cfg.TemplatePath)")
+	writeFiles := strings.Index(text, "p.WriteFilesToContainer(ctx, resp.ID, cfg.ConfigFiles)")
+	start := strings.Index(text, "p.cli.ContainerStart(ctx, resp.ID, container.StartOptions{})")
+
+	if copyTemplate < 0 || writeFiles < 0 || start < 0 {
+		t.Fatalf("expected Start to copy template, write config files, and start container")
+	}
+	if copyTemplate >= start || writeFiles >= start {
+		t.Fatalf("config seeding must happen before ContainerStart: copyTemplate=%d writeFiles=%d start=%d", copyTemplate, writeFiles, start)
+	}
+}
+
 // baseHostConfig returns a fresh HostConfig with typical pre-tier binds,
 // mimicking what Start() builds before calling ApplyTierConfig.
 func baseHostConfig(pluginsPath string) *container.HostConfig {

workspace-server/internal/push/handler.go

@@ -1,75 +0,0 @@
-package push
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-)
-
-// Handler exposes HTTP endpoints for push-token management.
-type Handler struct {
-	repo *Repo
-}
-
-// NewHandler creates a push-token HTTP handler.
-func NewHandler(repo *Repo) *Handler {
-	return &Handler{repo: repo}
-}
-
-// RegisterRoutes mounts push-token routes on the given router group.
-func (h *Handler) RegisterRoutes(rg *gin.RouterGroup) {
-	rg.POST("/push-tokens", h.Create)
-	rg.DELETE("/push-tokens", h.Delete)
-}
-
-// Create handles POST /push-tokens.
-// Body: { "token": "ExponentPushToken[xxx]", "platform": "ios" | "android" }
-func (h *Handler) Create(c *gin.Context) {
-	workspaceID := c.Param("id")
-	if _, err := uuid.Parse(workspaceID); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace id"})
-		return
-	}
-
-	var body struct {
-		Token    string `json:"token" binding:"required"`
-		Platform string `json:"platform" binding:"required,oneof=ios android"`
-	}
-	if err := c.ShouldBindJSON(&body); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
-	}
-
-	if err := h.repo.SaveToken(c.Request.Context(), workspaceID, body.Token, body.Platform); err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to save token"})
-		return
-	}
-
-	c.Status(http.StatusNoContent)
-}
-
-// Delete handles DELETE /push-tokens.
-// Body: { "token": "ExponentPushToken[xxx]" }
-func (h *Handler) Delete(c *gin.Context) {
-	workspaceID := c.Param("id")
-	if _, err := uuid.Parse(workspaceID); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace id"})
-		return
-	}
-
-	var body struct {
-		Token string `json:"token" binding:"required"`
-	}
-	if err := c.ShouldBindJSON(&body); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
-	}
-
-	if err := h.repo.DeleteToken(c.Request.Context(), workspaceID, body.Token); err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to delete token"})
-		return
-	}
-
-	c.Status(http.StatusNoContent)
-}

workspace-server/internal/push/notifier.go

@@ -1,101 +0,0 @@
-package push
-
-import (
-	"context"
-	"database/sql"
-	"log"
-	"time"
-)
-
-// Notifier sends push notifications for agent messages.
-type Notifier struct {
-	repo   *Repo
-	sender *Sender
-}
-
-// NewNotifier creates a Notifier.
-func NewNotifier(db *sql.DB, sender *Sender) *Notifier {
-	return &Notifier{
-		repo:   NewRepo(db),
-		sender: sender,
-	}
-}
-
-// NotifyAgentMessage sends a push notification to all registered devices for a
-// workspace when an agent sends a message. It runs asynchronously (fire-and-
-// forget) so the caller's WebSocket broadcast is never blocked.
-func (n *Notifier) NotifyAgentMessage(ctx context.Context, workspaceID, workspaceName, message string) {
-	if n == nil || n.sender == nil {
-		return
-	}
-
-	// Capture values for the goroutine.
-	wsID := workspaceID
-	wsName := workspaceName
-	msg := message
-
-	go func() {
-		// Use a fresh context with timeout so a slow Expo API doesn't
-		// leak the caller's context deadline.
-		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-		defer cancel()
-
-		tokens, err := n.repo.GetTokens(ctx, wsID)
-		if err != nil {
-			log.Printf("push: failed to get tokens for workspace %s: %v", wsID, err)
-			return
-		}
-		if len(tokens) == 0 {
-			return
-		}
-
-		// Expo accepts batches of up to ~100 messages; we cap lower to stay
-		// well under the limit.
-		const batchSize = 50
-		for i := 0; i < len(tokens); i += batchSize {
-			end := i + batchSize
-			if end > len(tokens) {
-				end = len(tokens)
-			}
-
-			batch := tokens[i:end]
-			messages := make([]Message, 0, len(batch))
-			for _, t := range batch {
-				messages = append(messages, Message{
-					To:    t.Token,
-					Title: wsName,
-					Body:  truncate(msg, 100),
-					Data: map[string]string{
-						"type":          "agent_message",
-						"workspaceId":   wsID,
-						"workspaceSlug": "", // populated by caller if available
-					},
-					Sound:    "default",
-					Priority: "high",
-				})
-			}
-
-			results, err := n.sender.Send(ctx, messages)
-			if err != nil {
-				log.Printf("push: send failed for workspace %s: %v", wsID, err)
-				continue
-			}
-
-			// Remove invalid tokens.
-			for j, r := range results {
-				if ShouldRemoveToken(r) {
-					if delErr := n.repo.DeleteToken(ctx, wsID, batch[j].Token); delErr != nil {
-						log.Printf("push: failed to delete invalid token for workspace %s: %v", wsID, delErr)
-					}
-				}
-			}
-		}
-	}()
-}
-
-func truncate(s string, max int) string {
-	if len(s) <= max {
-		return s
-	}
-	return s[:max] + "…"
-}

workspace-server/internal/push/push_test.go

@@ -1,437 +0,0 @@
-package push
-
-import (
-	"bytes"
-	"context"
-	"database/sql"
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSenderSend(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	expoResponse := map[string]interface{}{
-		"data": []map[string]interface{}{
-			{"status": "ok", "id": "abc123"},
-			{"status": "error", "message": "Invalid token", "details": map[string]string{"error": "DeviceNotRegistered"}},
-		},
-	}
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "POST", r.Method)
-		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))
-
-		var msgs []Message
-		require.NoError(t, json.NewDecoder(r.Body).Decode(&msgs))
-		assert.Len(t, msgs, 2)
-		assert.Equal(t, "ExponentPushToken[test1]", msgs[0].To)
-
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(expoResponse)
-	}))
-	defer server.Close()
-
-	sender := NewSender("")
-	sender.apiURL = server.URL
-
-	results, err := sender.Send(context.Background(), []Message{
-		{To: "ExponentPushToken[test1]", Title: "Test", Body: "Hello"},
-		{To: "ExponentPushToken[test2]", Title: "Test", Body: "World"},
-	})
-	require.NoError(t, err)
-	require.Len(t, results, 2)
-	assert.Equal(t, "ok", results[0].Status)
-	assert.Equal(t, "error", results[1].Status)
-	assert.True(t, ShouldRemoveToken(results[1]))
-}
-
-func TestSenderSendEmpty(t *testing.T) {
-	sender := NewSender("")
-	results, err := sender.Send(context.Background(), nil)
-	require.NoError(t, err)
-	assert.Nil(t, results)
-}
-
-func TestHandlerCreate_InvalidWorkspaceID(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	handler := NewHandler(NewRepo(nil))
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[abc]","platform":"ios"}`
-	req, _ := http.NewRequest("POST", "/workspaces/not-a-uuid/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-}
-
-func TestHandlerCreate(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectExec("INSERT INTO push_tokens").
-		WithArgs("11111111-1111-1111-1111-111111111111", "ExponentPushToken[abc]", "ios").
-		WillReturnResult(sqlmock.NewResult(1, 1))
-
-	repo := NewRepo(db)
-	handler := NewHandler(repo)
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[abc]","platform":"ios"}`
-	req, _ := http.NewRequest("POST", "/workspaces/11111111-1111-1111-1111-111111111111/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusNoContent, w.Code)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestHandlerCreateInvalidPlatform(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	db, _, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	handler := NewHandler(NewRepo(db))
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[abc]","platform":"windows"}`
-	req, _ := http.NewRequest("POST", "/workspaces/11111111-1111-1111-1111-111111111111/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-}
-
-func TestHandlerDelete_BindingError(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	handler := NewHandler(NewRepo(nil))
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{}` // missing required "token" field
-	req, _ := http.NewRequest("DELETE", "/workspaces/11111111-1111-1111-1111-111111111111/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-}
-
-func TestHandlerDelete_InvalidWorkspaceID(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	handler := NewHandler(NewRepo(nil))
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[del]"}`
-	req, _ := http.NewRequest("DELETE", "/workspaces/not-a-uuid/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-}
-
-func TestHandlerDelete(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectExec("DELETE FROM push_tokens").
-		WithArgs("22222222-2222-2222-2222-222222222222", "ExponentPushToken[del]").
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	repo := NewRepo(db)
-	handler := NewHandler(repo)
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[del]"}`
-	req, _ := http.NewRequest("DELETE", "/workspaces/22222222-2222-2222-2222-222222222222/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusNoContent, w.Code)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestHandlerCreate_DBSaveError(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectExec("INSERT INTO push_tokens").
-		WithArgs("11111111-1111-1111-1111-111111111111", "ExponentPushToken[abc]", "ios").
-		WillReturnError(sql.ErrConnDone)
-
-	handler := NewHandler(NewRepo(db))
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[abc]","platform":"ios"}`
-	req, _ := http.NewRequest("POST", "/workspaces/11111111-1111-1111-1111-111111111111/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusInternalServerError, w.Code)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestHandlerDelete_DBError(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectExec("DELETE FROM push_tokens").
-		WithArgs("22222222-2222-2222-2222-222222222222", "ExponentPushToken[del]").
-		WillReturnError(sql.ErrConnDone)
-
-	handler := NewHandler(NewRepo(db))
-
-	router := gin.New()
-	group := router.Group("/workspaces/:id")
-	handler.RegisterRoutes(group)
-
-	w := httptest.NewRecorder()
-	body := `{"token":"ExponentPushToken[del]"}`
-	req, _ := http.NewRequest("DELETE", "/workspaces/22222222-2222-2222-2222-222222222222/push-tokens", bytes.NewBufferString(body))
-	req.Header.Set("Content-Type", "application/json")
-	router.ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusInternalServerError, w.Code)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestSenderSend_HTTPError(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	// Server that hijacks the connection and closes it before sending a response,
-	// causing the HTTP client to receive a connection-closed error.
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Drain request body so client send completes.
-		io.Copy(io.Discard, r.Body)
-		// Hijack and immediately close — no response written.
-		conn, _, _ := w.(http.Hijacker).Hijack()
-		conn.Close()
-	}))
-	defer server.Close()
-
-	sender := NewSender("")
-	sender.apiURL = server.URL
-
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
-	defer cancel()
-
-	_, err := sender.Send(ctx, []Message{
-		{To: "ExponentPushToken[test]", Title: "T", Body: "H"},
-	})
-	require.Error(t, err)
-	assert.True(t, strings.Contains(err.Error(), "post:") || strings.Contains(err.Error(), "context"))
-}
-
-func TestSenderSend_Non200Response(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusServiceUnavailable)
-		w.Write([]byte(`{"error":"rate limited"}`))
-	}))
-	defer server.Close()
-
-	sender := NewSender("")
-	sender.apiURL = server.URL
-
-	_, err := sender.Send(context.Background(), []Message{
-		{To: "ExponentPushToken[test]", Title: "T", Body: "H"},
-	})
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "expo returned 503")
-}
-
-func TestNotifierNotifyAgentMessage_NilGuard(t *testing.T) {
-	// Must not panic when sender is nil.
-	n := NewNotifier(nil, nil)
-	// Should return immediately (nil check passes without panic).
-	n.NotifyAgentMessage(context.Background(), "ws-1", "Test", "Hello world")
-}
-
-func TestNotifierNotifyAgentMessage_ZeroTokens(t *testing.T) {
-	// Verify that NotifyAgentMessage does NOT panic when there are zero registered
-	// tokens — it should return early without calling sender.Send().
-	// Note: the fire-and-forget goroutine inside NotifyAgentMessage is not
-	// directly verifiable here without modifying production code; the key assertion
-	// is that no panic occurs and the method returns cleanly.
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-
-	mock.ExpectQuery("SELECT id, workspace_id, token, platform, created_at FROM push_tokens").
-		WithArgs("ws-1").
-		WillReturnRows(sqlmock.NewRows([]string{"id", "workspace_id", "token", "platform", "created_at"}))
-
-	sender := NewSender("")
-	sender.apiURL = "http://127.0.0.1:1" // unreachable — would error if Send is called
-
-	n := NewNotifier(db, sender)
-	n.NotifyAgentMessage(context.Background(), "ws-1", "Test", "Hello")
-
-	// Give goroutine time to run GetTokens and exit early before closing DB.
-	time.Sleep(200 * time.Millisecond)
-	require.NoError(t, mock.ExpectationsWereMet())
-	db.Close()
-}
-
-func TestRepoGetTokens_DBError(t *testing.T) {
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectQuery("SELECT id, workspace_id, token, platform, created_at FROM push_tokens").
-		WithArgs("ws-1").
-		WillReturnError(sql.ErrConnDone)
-
-	repo := NewRepo(db)
-	_, err = repo.GetTokens(context.Background(), "ws-1")
-	require.Error(t, err)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestRepoGetTokens_ScanError(t *testing.T) {
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	// Return fewer columns than struct has — causes scan error.
-	mock.ExpectQuery("SELECT id, workspace_id, token, platform, created_at FROM push_tokens").
-		WithArgs("ws-1").
-		WillReturnRows(sqlmock.NewRows([]string{"id", "workspace_id", "token"}). // missing platform, created_at
-			AddRow("1", "ws-1", "ExponentPushToken[a]"))
-
-	repo := NewRepo(db)
-	_, err = repo.GetTokens(context.Background(), "ws-1")
-	require.Error(t, err) // scan error
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestRepoSaveToken_Error(t *testing.T) {
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectExec("INSERT INTO push_tokens").
-		WithArgs("ws-1", "ExponentPushToken[xyz]", "android").
-		WillReturnError(sql.ErrConnDone)
-
-	repo := NewRepo(db)
-	err = repo.SaveToken(context.Background(), "ws-1", "ExponentPushToken[xyz]", "android")
-	require.Error(t, err)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestRepoDeleteToken_Error(t *testing.T) {
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectExec("DELETE FROM push_tokens").
-		WithArgs("ws-1", "ExponentPushToken[xyz]").
-		WillReturnError(sql.ErrConnDone)
-
-	repo := NewRepo(db)
-	err = repo.DeleteToken(context.Background(), "ws-1", "ExponentPushToken[xyz]")
-	require.Error(t, err)
-	require.NoError(t, mock.ExpectationsWereMet())
-}
-
-func TestTruncate(t *testing.T) {
-	tests := []struct {
-		name string
-		s    string
-		max  int
-		want string
-	}{
-		{"short string unchanged", "hello", 10, "hello"},
-		{"exact length unchanged", "hello", 5, "hello"},
-		{"long string truncated", "hello world", 5, "hello…"},
-		{"empty string", "", 5, ""},
-		{"single char at max", "a", 1, "a"},
-		{"multi-byte truncation adds ellipsis", "こんにちは世界", 5, ""},
-		{"truncate with ellipsis ends with ellipsis", "hello world", 5, "hello…"},
-		{"truncate at 1 char", "hello", 1, "h…"},
-	}
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			got := truncate(tc.s, tc.max)
-			if tc.want == "" {
-				// Multi-byte / edge cases: verify no expansion beyond max+3.
-				assert.True(t, len(got) <= tc.max+3)
-			} else {
-				assert.Equal(t, tc.want, got)
-			}
-		})
-	}
-}
-
-func TestRepoGetTokens(t *testing.T) {
-	db, mock, err := sqlmock.New()
-	require.NoError(t, err)
-	defer db.Close()
-
-	mock.ExpectQuery("SELECT id, workspace_id, token, platform, created_at FROM push_tokens").
-		WithArgs("ws-1").
-		WillReturnRows(sqlmock.NewRows([]string{"id", "workspace_id", "token", "platform", "created_at"}).
-			AddRow("1", "ws-1", "ExponentPushToken[a]", "ios", "2026-01-01T00:00:00Z").
-			AddRow("2", "ws-1", "ExponentPushToken[b]", "android", "2026-01-01T00:00:00Z"))
-
-	repo := NewRepo(db)
-	tokens, err := repo.GetTokens(context.Background(), "ws-1")
-	require.NoError(t, err)
-	require.Len(t, tokens, 2)
-	assert.Equal(t, "ExponentPushToken[a]", tokens[0].Token)
-	assert.Equal(t, "ios", tokens[0].Platform)
-	assert.Equal(t, "ExponentPushToken[b]", tokens[1].Token)
-	require.NoError(t, mock.ExpectationsWereMet())
-}

workspace-server/internal/push/repo.go

@@ -1,76 +0,0 @@
-package push
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-)
-
-// Token is one registered push token for a workspace.
-type Token struct {
-	ID          string
-	WorkspaceID string
-	Token       string
-	Platform    string
-	CreatedAt   string
-}
-
-// Repo reads and writes push tokens in Postgres.
-type Repo struct {
-	db *sql.DB
-}
-
-// NewRepo creates a token repository backed by db.
-func NewRepo(db *sql.DB) *Repo {
-	return &Repo{db: db}
-}
-
-// SaveToken registers a push token for a workspace. If the same token already
-// exists for the workspace, it updates the timestamp.
-func (r *Repo) SaveToken(ctx context.Context, workspaceID, token, platform string) error {
-	_, err := r.db.ExecContext(ctx, `
-		INSERT INTO push_tokens (workspace_id, token, platform)
-		VALUES ($1, $2, $3)
-		ON CONFLICT (workspace_id, token) DO UPDATE
-		SET updated_at = now()
-	`, workspaceID, token, platform)
-	if err != nil {
-		return fmt.Errorf("push_tokens: save: %w", err)
-	}
-	return nil
-}
-
-// DeleteToken removes a push token. Returns nil even if the token did not exist.
-func (r *Repo) DeleteToken(ctx context.Context, workspaceID, token string) error {
-	_, err := r.db.ExecContext(ctx, `
-		DELETE FROM push_tokens
-		WHERE workspace_id = $1 AND token = $2
-	`, workspaceID, token)
-	if err != nil {
-		return fmt.Errorf("push_tokens: delete: %w", err)
-	}
-	return nil
-}
-
-// GetTokens returns all active push tokens for a workspace.
-func (r *Repo) GetTokens(ctx context.Context, workspaceID string) ([]Token, error) {
-	rows, err := r.db.QueryContext(ctx, `
-		SELECT id, workspace_id, token, platform, created_at
-		FROM push_tokens
-		WHERE workspace_id = $1
-	`, workspaceID)
-	if err != nil {
-		return nil, fmt.Errorf("push_tokens: list: %w", err)
-	}
-	defer rows.Close()
-
-	var tokens []Token
-	for rows.Next() {
-		var t Token
-		if err := rows.Scan(&t.ID, &t.WorkspaceID, &t.Token, &t.Platform, &t.CreatedAt); err != nil {
-			return nil, fmt.Errorf("push_tokens: scan: %w", err)
-		}
-		tokens = append(tokens, t)
-	}
-	return tokens, rows.Err()
-}

workspace-server/internal/push/sender.go

@@ -1,104 +0,0 @@
-package push
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"time"
-)
-
-const expoPushAPI = "https://exp.host/--/api/v2/push/send"
-
-// Message is one Expo push notification.
-type Message struct {
-	To       string            `json:"to"`
-	Title    string            `json:"title,omitempty"`
-	Body     string            `json:"body,omitempty"`
-	Data     map[string]string `json:"data,omitempty"`
-	Sound    string            `json:"sound,omitempty"`
-	Priority string            `json:"priority,omitempty"`
-}
-
-// Sender delivers push notifications via the Expo Push Service.
-type Sender struct {
-	apiURL     string
-	httpClient *http.Client
-	expoToken  string // optional Expo access token for authenticated requests
-}
-
-// NewSender creates a Sender. expoToken may be empty for unauthenticated
-// requests (sufficient for most use cases).
-func NewSender(expoToken string) *Sender {
-	return &Sender{
-		apiURL: expoPushAPI,
-		httpClient: &http.Client{
-			Timeout: 10 * time.Second,
-		},
-		expoToken: expoToken,
-	}
-}
-
-// SendResult is the per-recipient status from Expo.
-type SendResult struct {
-	Status  string `json:"status"`
-	ID      string `json:"id"`
-	Message string `json:"message,omitempty"`
-	Details struct {
-		Error string `json:"error,omitempty"`
-	} `json:"details,omitempty"`
-}
-
-// expoResponse is the wrapper shape returned by the Expo API.
-type expoResponse struct {
-	Data []SendResult `json:"data"`
-}
-
-// Send fires a batch of push messages. It returns a slice of results in the
-// same order as the input, plus an error only when the HTTP call itself fails.
-// Callers should inspect each result's Status field for per-message errors
-// (e.g. "DeviceNotRegistered" → token should be deleted).
-func (s *Sender) Send(ctx context.Context, messages []Message) ([]SendResult, error) {
-	if len(messages) == 0 {
-		return nil, nil
-	}
-
-	body, err := json.Marshal(messages)
-	if err != nil {
-		return nil, fmt.Errorf("push: marshal: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.apiURL, bytes.NewReader(body))
-	if err != nil {
-		return nil, fmt.Errorf("push: new request: %w", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Accept", "application/json")
-	req.Header.Set("Accept-Encoding", "gzip, deflate")
-	if s.expoToken != "" {
-		req.Header.Set("Authorization", "Bearer "+s.expoToken)
-	}
-
-	res, err := s.httpClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("push: post: %w", err)
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("push: expo returned %d", res.StatusCode)
-	}
-
-	var resp expoResponse
-	if err := json.NewDecoder(res.Body).Decode(&resp); err != nil {
-		return nil, fmt.Errorf("push: decode: %w", err)
-	}
-	return resp.Data, nil
-}
-
-// ShouldRemoveToken reports whether a SendResult indicates the token is no
-// longer valid and should be deleted from the database.
-func ShouldRemoveToken(r SendResult) bool {
-	return r.Status == "error" && r.Details.Error == "DeviceNotRegistered"
-}

workspace-server/internal/registry/access_test.go

@@ -14,8 +14,9 @@ func setupMockDB(t *testing.T) sqlmock.Sqlmock {
 	if err != nil {
 		t.Fatalf("sqlmock: %v", err)
 	}
+	prevDB := db.DB
 	db.DB = mockDB
-	t.Cleanup(func() { mockDB.Close() })
+	t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
 	return mock
 }
 

workspace-server/internal/registry/healthsweep_test.go

@@ -31,8 +31,9 @@ func setupTestDB(t *testing.T) sqlmock.Sqlmock {
 	if err != nil {
 		t.Fatalf("failed to create sqlmock: %v", err)
 	}
+	prevDB := db.DB
 	db.DB = mockDB
-	t.Cleanup(func() { mockDB.Close() })
+	t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
 	return mock
 }
 

workspace-server/internal/registry/hibernation_test.go

@@ -17,8 +17,9 @@ func setupHibernationMock(t *testing.T) sqlmock.Sqlmock {
 	if err != nil {
 		t.Fatalf("sqlmock.New: %v", err)
 	}
+	prevDB := db.DB
 	db.DB = mockDB
-	t.Cleanup(func() { mockDB.Close() })
+	t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
 	return mock
 }
 

workspace-server/internal/registry/liveness_test.go

@@ -18,8 +18,9 @@ func setupLivenessTestDB(t *testing.T) sqlmock.Sqlmock {
 	if err != nil {
 		t.Fatalf("failed to create sqlmock: %v", err)
 	}
+	prevDB := db.DB
 	db.DB = mockDB
-	t.Cleanup(func() { mockDB.Close() })
+	t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
 	return mock
 }
 

workspace-server/internal/router/router.go

@@ -20,7 +20,6 @@ import (
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/pendinguploads"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/plugins"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/push"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/supervised"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/ws"
 	"github.com/docker/docker/client"
@@ -147,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
@@ -205,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.
@@ -328,25 +318,13 @@ func Setup(hub *ws.Hub, broadcaster *events.Broadcaster, prov *provisioner.Provi
 
 	// Remaining auth-gated workspace sub-routes — appended to wsAuth group declared above.
 	{
-		// Push notifications (mobile)
-		var pushNotifier *push.Notifier
-		if expoToken := os.Getenv("EXPO_ACCESS_TOKEN"); expoToken != "" {
-			pushNotifier = push.NewNotifier(db.DB, push.NewSender(expoToken))
-		}
-
 		// Activity Logs
-		acth := handlers.NewActivityHandler(broadcaster, pushNotifier)
+		acth := handlers.NewActivityHandler(broadcaster)
 		wsAuth.GET("/activity", acth.List)
 		wsAuth.GET("/session-search", acth.SessionSearch)
 		wsAuth.POST("/activity", acth.Report)
 		wsAuth.POST("/notify", acth.Notify)
 
-		// Push token registration (mobile)
-		if pushNotifier != nil {
-			pushH := push.NewHandler(push.NewRepo(db.DB))
-			pushH.RegisterRoutes(wsAuth)
-		}
-
 		// Chat history — RFC #2945 PR-C (issue #3017) + PR-D (issue
 		// #3026). Server-side rendering of activity_logs rows into
 		// the canonical ChatMessage shape; storage is plugin-shaped
@@ -450,7 +428,7 @@ func Setup(hub *ws.Hub, broadcaster *events.Broadcaster, prov *provisioner.Provi
 		//       opencode session cannot saturate the platform.
 		//   C3: commit_memory/recall_memory with scope=GLOBAL → permission error;
 		//       send_message_to_user excluded unless MOLECULE_MCP_ALLOW_SEND_MESSAGE=true.
-		mcpH := handlers.NewMCPHandler(db.DB, broadcaster, pushNotifier)
+		mcpH := handlers.NewMCPHandler(db.DB, broadcaster)
 		if memBundle != nil {
 			mcpH.WithMemoryV2(memBundle.Plugin, memBundle.Resolver)
 		}

workspace-server/internal/scheduler/scheduler_test.go

@@ -24,8 +24,9 @@ func setupTestDB(t *testing.T) sqlmock.Sqlmock {
 	if err != nil {
 		t.Fatalf("failed to create sqlmock: %v", err)
 	}
+	prevDB := db.DB
 	db.DB = mockDB
-	t.Cleanup(func() { mockDB.Close() })
+	t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
 	return mock
 }
 

workspace-server/migrations/20260514000000_push_tokens.down.sql

@@ -1 +0,0 @@
-DROP TABLE IF EXISTS push_tokens;

workspace-server/migrations/20260514000000_push_tokens.up.sql

@@ -1,11 +0,0 @@
-CREATE TABLE push_tokens (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    workspace_id UUID NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
-    token TEXT NOT NULL,
-    platform TEXT NOT NULL CHECK (platform IN ('ios', 'android')),
-    created_at TIMESTAMPTZ DEFAULT now(),
-    updated_at TIMESTAMPTZ DEFAULT now(),
-    UNIQUE(workspace_id, token)
-);
-
-CREATE INDEX idx_push_tokens_workspace ON push_tokens(workspace_id);

workspace-server/migrations/20260514120000_workspace_abilities.down.sql

@@ -1,3 +0,0 @@
-ALTER TABLE workspaces
-    DROP COLUMN IF EXISTS broadcast_enabled,
-    DROP COLUMN IF EXISTS talk_to_user_enabled;

workspace-server/migrations/20260514120000_workspace_abilities.up.sql

@@ -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;

workspace/_sanitize_a2a.py

@@ -40,8 +40,6 @@ _A2A_BOUNDARY_END = "[/A2A_RESULT_FROM_PEER]"
 # inside the trusted zone. Escape BOTH boundary markers in the raw text
 # before wrapping so they can never close the boundary early.
 # We use "[/ " as the escape prefix — visually distinct from the real marker.
-_A2A_BOUNDARY_START_ESCAPED = "[/ A2A_RESULT_FROM_PEER]"
-_A2A_BOUNDARY_END_ESCAPED = "[/ /A2A_RESULT_FROM_PEER]"
 
 
 def _escape_boundary_markers(text: str) -> str:
@@ -52,8 +50,8 @@ def _escape_boundary_markers(text: str) -> str:
     the boundary early or inject a fake opener.
     """
     return (
-        text.replace(_A2A_BOUNDARY_START, _A2A_BOUNDARY_START_ESCAPED)
-        .replace(_A2A_BOUNDARY_END, _A2A_BOUNDARY_END_ESCAPED)
+        text.replace(_A2A_BOUNDARY_START, "[/ A2A_RESULT_FROM_PEER]")
+        .replace(_A2A_BOUNDARY_END, "[/ /A2A_RESULT_FROM_PEER]")
     )
 
 

workspace/a2a_mcp_server.py

@@ -29,7 +29,6 @@ from typing import Callable
 import inbox
 
 from a2a_tools import (
-    tool_broadcast_message,
     tool_chat_history,
     tool_check_task_status,
     tool_commit_memory,
@@ -161,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}"
 
 

workspace/a2a_tools.py

@@ -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,

workspace/a2a_tools_delegation.py

@@ -49,9 +49,7 @@ from a2a_client import (
 from a2a_tools_rbac import auth_headers_for_heartbeat as _auth_headers_for_heartbeat
 from _sanitize_a2a import (
     _A2A_BOUNDARY_END,
-    _A2A_BOUNDARY_END_ESCAPED,
     _A2A_BOUNDARY_START,
-    _A2A_BOUNDARY_START_ESCAPED,
     sanitize_a2a_result,
 )  # noqa: E402
 
@@ -332,18 +330,8 @@ async def tool_delegate_task(
     # markers so the agent can distinguish trusted (own output) from untrusted
     # (peer-supplied) content.  Explicit wrapping here rather than inside
     # sanitize_a2a_result preserves a clean separation of concerns.
-    #
-    # Truncate at the closer BEFORE sanitizing so the raw closer (which gets
-    # lost during escaping) is removed from the content.  After truncation,
-    # sanitize the remaining text and wrap with escaped boundary markers.
-    if _A2A_BOUNDARY_END in result:
-        result = result[:result.index(_A2A_BOUNDARY_END)]
     escaped = sanitize_a2a_result(result)
-    return (
-        f"{_A2A_BOUNDARY_START_ESCAPED}\n"
-        f"{escaped}\n"
-        f"{_A2A_BOUNDARY_END_ESCAPED}"
-    )
+    return f"{_A2A_BOUNDARY_START}\n{escaped}\n{_A2A_BOUNDARY_END}"
 
 
 async def tool_delegate_task_async(

workspace/a2a_tools_messaging.py

@@ -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}"

workspace/adapter_base.py

@@ -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

workspace/executor_helpers.py

@@ -340,10 +340,6 @@ _CLI_A2A_COMMAND_KEYWORDS: dict[str, str | None] = {
     "delegate_task_async": "delegate --async",
     "check_task_status": "status",
     "get_workspace_info": "info",
-    # `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.

workspace/platform_tools/registry.py

@@ -51,7 +51,6 @@ 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,
@@ -289,44 +288,6 @@ _GET_WORKSPACE_INFO = ToolSpec(
     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=(
@@ -642,7 +603,6 @@ TOOLS: list[ToolSpec] = [
     _CHECK_TASK_STATUS,
     _LIST_PEERS,
     _GET_WORKSPACE_INFO,
-    _BROADCAST_MESSAGE,
     _SEND_MESSAGE_TO_USER,
     # Inbox (standalone-only; in-container returns informational error)
     _WAIT_FOR_MESSAGE,

workspace/tests/snapshots/a2a_instructions_mcp.txt

@@ -5,7 +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.
-- **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.
@@ -27,9 +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).
 
-### 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).
 

workspace/tests/test_a2a_tools_delegation.py

@@ -218,8 +218,7 @@ class TestPollingPathSanitization:
         result = asyncio.run(d.tool_delegate_task("ws-peer", "do it"))
         # tool_delegate_task wraps the sanitized text in _A2A_BOUNDARY_START/END
         # (NOT _A2A_RESULT_FROM_PEER — that marker is for the messaging path).
-        # Wrapped in escaped form to prevent raw closer from appearing in output.
-        assert d._A2A_BOUNDARY_START_ESCAPED in result
-        assert d._A2A_BOUNDARY_END_ESCAPED in result
+        assert d._A2A_BOUNDARY_START in result
+        assert d._A2A_BOUNDARY_END in result
         assert "Sanitized peer reply" in result
 

workspace/tests/test_a2a_tools_impl.py

@@ -277,7 +277,7 @@ class TestToolDelegateTask:
              patch("a2a_tools.report_activity", new=AsyncMock()):
             result = await a2a_tools.tool_delegate_task("ws-1", "do something")
 
-        assert result == "[/ A2A_RESULT_FROM_PEER]\nTask completed!\n[/ /A2A_RESULT_FROM_PEER]"
+        assert result == "[A2A_RESULT_FROM_PEER]\nTask completed!\n[/A2A_RESULT_FROM_PEER]"
 
     async def test_error_response_returns_delegation_failed_message(self):
         """When send_a2a_message returns _A2A_ERROR_PREFIX text, delegation fails."""
@@ -305,7 +305,7 @@ class TestToolDelegateTask:
              patch("a2a_tools.report_activity", new=AsyncMock()):
             result = await a2a_tools.tool_delegate_task("ws-cached", "task")
 
-        assert result == "[/ A2A_RESULT_FROM_PEER]\ndone\n[/ /A2A_RESULT_FROM_PEER]"
+        assert result == "[A2A_RESULT_FROM_PEER]\ndone\n[/A2A_RESULT_FROM_PEER]"
 
     async def test_peer_name_falls_back_to_id_prefix(self):
         """When peer has no name and cache is empty, name = first 8 chars of workspace_id."""
@@ -319,7 +319,7 @@ class TestToolDelegateTask:
              patch("a2a_tools.report_activity", new=AsyncMock()):
             result = await a2a_tools.tool_delegate_task("ws-nona000", "task")
 
-        assert result == "[/ A2A_RESULT_FROM_PEER]\nok\n[/ /A2A_RESULT_FROM_PEER]"
+        assert result == "[A2A_RESULT_FROM_PEER]\nok\n[/A2A_RESULT_FROM_PEER]"
         # Cache should now have been set
         assert a2a_tools._peer_names.get("ws-nona000") is not None
 

workspace/tests/test_delegation_sync_via_polling.py

@@ -69,7 +69,7 @@ class TestFlagOffLegacyPath:
         monkeypatch.delenv("DELEGATION_SYNC_VIA_INBOX", raising=False)
 
         import a2a_tools
-        from _sanitize_a2a import _A2A_BOUNDARY_END_ESCAPED, _A2A_BOUNDARY_START_ESCAPED
+        from _sanitize_a2a import _A2A_BOUNDARY_END, _A2A_BOUNDARY_START
         send_calls = []
 
         async def fake_send(workspace_id, task, source_workspace_id=None):
@@ -91,8 +91,8 @@ class TestFlagOffLegacyPath:
             )
 
         # OFFSEC-003: result is wrapped in boundary markers
-        assert _A2A_BOUNDARY_START_ESCAPED in result
-        assert _A2A_BOUNDARY_END_ESCAPED in result
+        assert _A2A_BOUNDARY_START in result
+        assert _A2A_BOUNDARY_END in result
         assert "legacy ok" in result
         assert send_calls == [("ws-target", "task body", "ws-self")]
         poll_mock.assert_not_called()
@@ -124,7 +124,7 @@ class TestPollModeAutoFallback:
         monkeypatch.delenv("DELEGATION_SYNC_VIA_INBOX", raising=False)
 
         import a2a_tools
-        from _sanitize_a2a import _A2A_BOUNDARY_END_ESCAPED, _A2A_BOUNDARY_START_ESCAPED
+        from _sanitize_a2a import _A2A_BOUNDARY_END, _A2A_BOUNDARY_START
         from a2a_client import _A2A_QUEUED_PREFIX
 
         send_calls = []
@@ -159,8 +159,8 @@ class TestPollModeAutoFallback:
         assert poll_calls[0] == ("ws-target", "task body", "ws-self")
         # Caller sees the real reply, NOT the queued sentinel and NOT
         # a DELEGATION FAILED string. Wrapped in OFFSEC-003 boundary markers.
-        assert _A2A_BOUNDARY_START_ESCAPED in result
-        assert _A2A_BOUNDARY_END_ESCAPED in result
+        assert _A2A_BOUNDARY_START in result
+        assert _A2A_BOUNDARY_END in result
         assert "real response from poll-mode peer" in result
 
     async def test_non_queued_send_result_does_not_trigger_fallback(self, monkeypatch):
@@ -169,7 +169,7 @@ class TestPollModeAutoFallback:
         monkeypatch.delenv("DELEGATION_SYNC_VIA_INBOX", raising=False)
 
         import a2a_tools
-        from _sanitize_a2a import _A2A_BOUNDARY_END_ESCAPED, _A2A_BOUNDARY_START_ESCAPED
+        from _sanitize_a2a import _A2A_BOUNDARY_END, _A2A_BOUNDARY_START
 
         async def fake_send(*_a, **_kw):
             return "normal reply"
@@ -189,8 +189,8 @@ class TestPollModeAutoFallback:
             )
 
         # OFFSEC-003: wrapped in boundary markers
-        assert _A2A_BOUNDARY_START_ESCAPED in result
-        assert _A2A_BOUNDARY_END_ESCAPED in result
+        assert _A2A_BOUNDARY_START in result
+        assert _A2A_BOUNDARY_END in result
         assert "normal reply" in result
         poll_mock.assert_not_called()