feat(canvas): fix extractMessageText empty-string bug + add test coverage

Fixes the bug in extractMessageText (ConversationTraceModal.tsx) where
`if (p.text)` treated empty-string text fields as falsy, falling through
to root.text instead of returning "". Changed to `if ("text" in p)`.

Export extractReplyText (ChatTab.tsx) and deriveProvidersFromModels
(ConfigTab.tsx) for unit testing.

New test files:
- extractReplyText.test.ts: 14 cases for A2A response text extraction
- deriveProvidersFromModels.test.ts: 12 cases for vendor-slug derivation

Regression test added to ConversationTraceModal.test.tsx:
- empty-string text field is returned without falling through to root.text

Closes #874.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

.gitea/ci-refire

@@ -1 +0,0 @@
-refire:1778784369

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

@@ -203,17 +203,12 @@ 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` 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
+    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
     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")
@@ -226,9 +221,7 @@ 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 or "github.ref" in gate
-            ):
+            if isinstance(gate, str) and "github.event_name" in gate:
                 continue
         names.add(k)
     return names

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

@@ -47,15 +47,6 @@ REQUIRED_CONTEXTS_RAW = _env(
         "sop-checklist / all-items-acked (pull_request)"
     ),
 )
-# Required contexts for push (main/staging) runs. The push CI uses the same
-# aggregator names with " (push)" suffix. Checking these explicitly instead of
-# the combined state avoids false-pause when non-blocking jobs (e.g. Platform
-# Go with continue-on-error: true due to mc#774) have failed — their failures
-# pollute the combined state but do not block merges.
-PUSH_REQUIRED_CONTEXTS_RAW = _env(
-    "PUSH_REQUIRED_CONTEXTS",
-    default="CI / all-required (push)",
-)
 
 OWNER, NAME = (REPO.split("/", 1) + [""])[:2] if REPO else ("", "")
 API = f"https://{GITEA_HOST}/api/v1" if GITEA_HOST else ""
@@ -127,59 +118,28 @@ def required_contexts(raw: str) -> list[str]:
     return [part.strip() for part in raw.split(",") if part.strip()]
 
 
-def push_required_contexts() -> list[str]:
-    """Required contexts for push (branch) CI runs. See PUSH_REQUIRED_CONTEXTS_RAW."""
-    return required_contexts(PUSH_REQUIRED_CONTEXTS_RAW)
-
-
 def status_state(status: dict) -> str:
     return str(status.get("status") or status.get("state") or "").lower()
 
 
 def latest_statuses_by_context(statuses: list[dict]) -> dict[str, dict]:
-    # Gitea /statuses endpoint returns entries in ascending id order (oldest
-    # first). We need the LAST occurrence of each context, so iterate in
-    # reverse to prefer newer entries.
     latest: dict[str, dict] = {}
-    for status in reversed(statuses):
+    for status in statuses:
         context = status.get("context")
-        if isinstance(context, str):
-            latest[context] = status  # overwrite: reverse order → newest wins
+        if isinstance(context, str) and context not in latest:
+            latest[context] = status
     return latest
 
 
-def _is_tier_low_pending_ok(
-    latest_statuses: dict[str, dict],
-    context: str,
-    pr_labels: set[str],
-) -> bool:
-    """Return True if tier:low PR can tolerate sop-checklist pending state.
-
-    Per sop-checklist-config.yaml tier_failure_mode, tier:low uses soft-fail:
-    sop-checklist posts state=pending when acks are satisfied (missing
-    manager/ceo acks are informational only). The queue should accept
-    pending instead of waiting for success.
-    """
-    if "tier:low" not in pr_labels:
-        return False
-    if "sop-checklist" not in context:
-        return False
-    status = latest_statuses.get(context) or {}
-    return status_state(status) == "pending"
-
-
 def required_contexts_green(
     latest_statuses: dict[str, dict],
     contexts: list[str],
-    pr_labels: set[str] | None = None,
 ) -> tuple[bool, list[str]]:
     missing_or_bad: list[str] = []
     for context in contexts:
         status = latest_statuses.get(context)
         state = status_state(status or {})
         if state != "success":
-            if pr_labels and _is_tier_low_pending_ok(latest_statuses, context, pr_labels):
-                continue  # tier:low soft-fail: accept pending sop-checklist
             missing_or_bad.append(f"{context}={state or 'missing'}")
     return not missing_or_bad, missing_or_bad
 
@@ -232,27 +192,19 @@ def evaluate_merge_readiness(
     pr_status: dict,
     required_contexts: list[str],
     pr_has_current_base: bool,
-    pr_labels: set[str] | None = None,
 ) -> MergeDecision:
-    # Check push-required contexts explicitly instead of combined state.
-    # Combined state can be "failure" due to non-blocking jobs
-    # (continue-on-error: true) that don't actually gate merges.
-    # CI / all-required (push) is the authoritative gate — it respects
-    # continue-on-error and correctly aggregates all blocking failures.
-    main_latest = latest_statuses_by_context(main_status.get("statuses") or [])
-    main_ok, main_bad = required_contexts_green(main_latest, push_required_contexts())
-    if not main_ok:
-        return MergeDecision(False, "pause", "main required contexts not green: " + ", ".join(main_bad))
+    main_state = str(main_status.get("state") or "").lower()
+    if main_state != "success":
+        return MergeDecision(False, "pause", f"main status is {main_state or 'missing'}")
     if not pr_has_current_base:
         return MergeDecision(False, "update", "PR head does not contain current main")
 
-    # Check explicit required contexts instead of combined state. Combined state
-    # can be "failure" due to non-blocking jobs with continue-on-error: true
-    # (e.g. publish-runtime-autobump/pr-validate, qa-review on stale tokens).
-    # The required_contexts list is the authoritative gate — it includes only
-    # the checks that actually block merges.
+    pr_state = str(pr_status.get("state") or "").lower()
+    if pr_state != "success":
+        return MergeDecision(False, "wait", f"PR combined status is {pr_state or 'missing'}")
+
     latest = latest_statuses_by_context(pr_status.get("statuses") or [])
-    ok, missing_or_bad = required_contexts_green(latest, required_contexts, pr_labels)
+    ok, missing_or_bad = required_contexts_green(latest, required_contexts)
     if not ok:
         return MergeDecision(False, "wait", "required contexts not green: " + ", ".join(missing_or_bad))
     return MergeDecision(True, "merge", "ready")
@@ -268,42 +220,10 @@ def get_branch_head(branch: str) -> str:
 
 
 def get_combined_status(sha: str) -> dict:
-    """Combined status + all individual statuses for `sha`.
-
-    The /status endpoint caps the `statuses` array at 30 entries (Gitea
-    default page size), so we fetch the full list via /statuses with a
-    higher limit. The combined `state` still comes from /status.
-    """
-    _, combined = api("GET", f"/repos/{OWNER}/{NAME}/commits/{sha}/status")
-    if not isinstance(combined, dict):
+    _, body = api("GET", f"/repos/{OWNER}/{NAME}/commits/{sha}/status")
+    if not isinstance(body, dict):
         raise ApiError(f"status for {sha} response not object")
-    combined_statuses: list[dict] = combined.get("statuses") or []
-    try:
-        _, all_statuses_raw = api(
-            "GET",
-            f"/repos/{OWNER}/{NAME}/commits/{sha}/statuses",
-            query={"limit": "50"},
-        )
-        if isinstance(all_statuses_raw, list):
-            all_statuses: list[dict] = list(all_statuses_raw)
-        else:
-            all_statuses = []
-    except (ApiError, urllib.error.URLError, TimeoutError, OSError) as exc:
-        sys.stderr.write(f"::warning::could not fetch full statuses list for {sha[:8]}: {exc}\n")
-        all_statuses = []
-    # Build latest per context: process combined (ascending→reverse=newest
-    # first), then fill gaps from all_statuses (already newest-first).
-    latest: dict[str, dict] = {}
-    for status in reversed(sorted(combined_statuses, key=lambda s: s.get("id") or 0)):
-        ctx = status.get("context")
-        if isinstance(ctx, str) and ctx not in latest:
-            latest[ctx] = status
-    for status in all_statuses:
-        ctx = status.get("context")
-        if isinstance(ctx, str) and ctx not in latest:
-            latest[ctx] = status
-    combined["statuses"] = list(latest.values())
-    return combined
+    return body
 
 
 def list_queued_issues() -> list[dict]:
@@ -374,12 +294,8 @@ def process_once(*, dry_run: bool = False) -> int:
     contexts = required_contexts(REQUIRED_CONTEXTS_RAW)
     main_sha = get_branch_head(WATCH_BRANCH)
     main_status = get_combined_status(main_sha)
-    # Check push-required contexts explicitly instead of combined state.
-    # See evaluate_merge_readiness for rationale.
-    main_latest = latest_statuses_by_context(main_status.get("statuses") or [])
-    main_ok, main_bad = required_contexts_green(main_latest, push_required_contexts())
-    if not main_ok:
-        print(f"::notice::queue paused: {WATCH_BRANCH}@{main_sha[:8]} required contexts not green: {', '.join(main_bad)}")
+    if str(main_status.get("state") or "").lower() != "success":
+        print(f"::notice::queue paused: {WATCH_BRANCH}@{main_sha[:8]} is not green")
         return 0
 
     issue = choose_next_queued_issue(
@@ -409,13 +325,11 @@ def process_once(*, dry_run: bool = False) -> int:
     commits = get_pull_commits(pr_number)
     current_base = pr_has_current_base(pr, commits, main_sha)
     pr_status = get_combined_status(head_sha)
-    pr_labels = label_names(pr)
     decision = evaluate_merge_readiness(
         main_status=main_status,
         pr_status=pr_status,
         required_contexts=contexts,
         pr_has_current_base=current_base,
-        pr_labels=pr_labels,
     )
 
     print(f"::notice::PR #{pr_number} decision={decision.action}: {decision.reason}")
@@ -448,21 +362,7 @@ def main() -> int:
     parser.add_argument("--dry-run", action="store_true")
     args = parser.parse_args()
     _require_runtime_env()
-    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
+    return process_once(dry_run=args.dry_run)
 
 
 if __name__ == "__main__":

.gitea/scripts/lint-workflow-yaml.py

@@ -36,9 +36,6 @@ Rules (4 fatal + 1 fatal cross-file + 1 heuristic-warn):
      raw `.error` fields into CI logs/summaries.
   9. Production deploy/redeploy workflows must expose an operational control:
      kill switch for auto deploys or rollback tag for manual deploys.
-  10. Docker health checks must not run `docker info | head` under pipefail.
-      `head` closes the pipe early, `docker info` can exit nonzero from
-      SIGPIPE, and the step can falsely report Docker daemon failure.
 
 Per `feedback_smoke_test_vendor_truth_not_shape_match`: fixtures used to
 validate this lint must mirror real Gitea 1.22.6 YAML semantics, not
@@ -228,24 +225,6 @@ def _iter_uses(doc: Any) -> Iterable[str]:
                 yield step["uses"]
 
 
-def _iter_run_blocks(doc: Any) -> Iterable[str]:
-    """Yield every shell `run:` block from job steps in a workflow document."""
-    if not isinstance(doc, dict):
-        return
-    jobs = doc.get("jobs")
-    if not isinstance(jobs, dict):
-        return
-    for job in jobs.values():
-        if not isinstance(job, dict):
-            continue
-        steps = job.get("steps")
-        if not isinstance(steps, list):
-            continue
-        for step in steps:
-            if isinstance(step, dict) and isinstance(step.get("run"), str):
-                yield step["run"]
-
-
 def check_cross_repo_uses(filename: str, doc: Any) -> list[str]:
     """Return per-violation error lines for cross-repo `uses:` references."""
     errors: list[str] = []
@@ -285,10 +264,6 @@ GITHUB_API_REF_RE = re.compile(
 
 PROD_CP_URL_RE = re.compile(r"https://api\.moleculesai\.app\b")
 REDEPLOY_FLEET_RE = re.compile(r"\b/cp/admin/tenants/redeploy-fleet\b")
-RUN_SETS_PIPEFAIL_RE = re.compile(r"(?m)^\s*set\s+-[^\n]*o\s+pipefail\b")
-DOCKER_INFO_HEAD_PIPE_RE = re.compile(
-    r"(?m)^\s*docker\s+info\b[^\n|]*\|\s*head\b"
-)
 RAW_CP_RESPONSE_RE = re.compile(
     r"""(?x)
     (?:\bjq\s+\.\s+["']?\$HTTP_RESPONSE["']?)
@@ -408,30 +383,6 @@ def check_production_operational_control(filename: str, raw: str) -> list[str]:
     return errors
 
 
-# ---------------------------------------------------------------------------
-# Rule 10 — docker info piped to head under pipefail
-# ---------------------------------------------------------------------------
-
-def check_docker_info_head_pipefail(filename: str, doc: Any) -> list[str]:
-    errors: list[str] = []
-    for run_block in _iter_run_blocks(doc):
-        if not (
-            RUN_SETS_PIPEFAIL_RE.search(run_block)
-            and DOCKER_INFO_HEAD_PIPE_RE.search(run_block)
-        ):
-            continue
-        errors.append(
-            f"::error file={filename}::Rule 10 (FATAL): workflow runs "
-            f"`docker info | head` after enabling `pipefail`. `head` can "
-            f"close the pipe early, making `docker info` exit nonzero and "
-            f"falsely fail the Docker daemon health check. Capture "
-            f"`docker_info=\"$(docker info 2>&1)\"` first, then print a "
-            f"bounded preview with `printf ... | sed -n '1,5p'`."
-        )
-        break
-    return errors
-
-
 # ---------------------------------------------------------------------------
 # Driver
 # ---------------------------------------------------------------------------
@@ -485,7 +436,6 @@ def main(argv: list[str] | None = None) -> int:
         fatal_errors.extend(check_production_concurrency(rel, doc, raw))
         fatal_errors.extend(check_production_raw_response_logging(rel, raw))
         fatal_errors.extend(check_production_operational_control(rel, raw))
-        fatal_errors.extend(check_docker_info_head_pipefail(rel, doc))
         warnings.extend(check_github_server_url_missing(rel, doc, raw))
 
     # Cross-file checks

.gitea/scripts/review-check.sh

@@ -60,7 +60,6 @@
 # Optional:
 #   REVIEW_CHECK_DEBUG=1 — per-API-call diagnostic lines
 #   REVIEW_CHECK_STRICT=1 — also require review.commit_id == pr.head.sha
-#   DEFAULT_BRANCH=main — branch this gate protects; non-default-base PRs no-op
 
 set -euo pipefail
 
@@ -92,7 +91,7 @@ API="https://${GITEA_HOST}/api/v1"
 # secret token value in the process table for any process to read via
 # /proc/<pid>/cmdline or ps -ef). The curl config file is read by curl
 # itself and never appears in the argv of the curl subprocess.
-CURL_AUTH_FILE=$(mktemp "${TMPDIR:-/tmp}/curl-auth.XXXXXX")
+CURL_AUTH_FILE=$(mktemp -p /tmp curl-auth.XXXXXX)
 chmod 600 "$CURL_AUTH_FILE"
 printf 'header = "Authorization: token %s"\n' "$GITEA_TOKEN" > "$CURL_AUTH_FILE"
 
@@ -101,10 +100,9 @@ printf 'header = "Authorization: token %s"\n' "$GITEA_TOKEN" > "$CURL_AUTH_FILE"
 PR_JSON=$(mktemp)
 REVIEWS_JSON=$(mktemp)
 TEAM_PROBE_TMP=$(mktemp)
-NA_STATUSES_TMP=""  # declared here so cleanup() always has the var
 
 cleanup() {
-  rm -f "$CURL_AUTH_FILE" "$PR_JSON" "$REVIEWS_JSON" "$TEAM_PROBE_TMP" "${NA_STATUSES_TMP-}"
+  rm -f "$CURL_AUTH_FILE" "$PR_JSON" "$REVIEWS_JSON" "$TEAM_PROBE_TMP"
 }
 trap cleanup EXIT
 
@@ -126,60 +124,18 @@ if [ "$HTTP_CODE" != "200" ]; then
 fi
 PR_AUTHOR=$(jq -r '.user.login // ""' "$PR_JSON")
 PR_HEAD_SHA=$(jq -r '.head.sha // ""' "$PR_JSON")
-PR_BASE_REF=$(jq -r '.base.ref // ""' "$PR_JSON")
 PR_STATE=$(jq -r '.state // ""' "$PR_JSON")
-DEFAULT_BRANCH="${DEFAULT_BRANCH:-main}"
-debug "pr_author=${PR_AUTHOR} pr_head=${PR_HEAD_SHA:0:7} pr_base=${PR_BASE_REF} pr_state=${PR_STATE}"
+debug "pr_author=${PR_AUTHOR} pr_head=${PR_HEAD_SHA:0:7} pr_state=${PR_STATE}"
 
 if [ "$PR_STATE" != "open" ]; then
   echo "::notice::PR ${PR_NUMBER} is ${PR_STATE} — exiting 0 (closed PRs do not gate)"
   exit 0
 fi
-if [ "$PR_BASE_REF" != "$DEFAULT_BRANCH" ]; then
-  echo "::notice::PR ${PR_NUMBER} targets ${PR_BASE_REF:-<unknown>} not ${DEFAULT_BRANCH} — ${TEAM}-review gate not applicable"
-  exit 0
-fi
 if [ -z "$PR_AUTHOR" ] || [ -z "$PR_HEAD_SHA" ]; then
   echo "::error::PR ${PR_NUMBER} missing user.login or head.sha — webhook payload malformed"
   exit 1
 fi
 
-# --- RFC#324 §N/A follow-up: check N/A declarations status ---
-# sop-checklist.py posts `sop-checklist / na-declarations (pull_request)`
-# status when a peer posts /sop-n/a <gate>. If our gate is declared N/A,
-# the requirement for a Gitea APPROVE review is waived.
-NA_STATUSES_TMP=$(mktemp)
-HTTP_CODE=$(curl -sS -o "$NA_STATUSES_TMP" -w '%{http_code}' \
-  -K "$CURL_AUTH_FILE" "${API}/repos/${OWNER}/${NAME}/statuses/${PR_HEAD_SHA}")
-debug "statuses/${PR_HEAD_SHA} → HTTP ${HTTP_CODE}"
-
-if [ "$HTTP_CODE" = "200" ]; then
-  # Gitea returns statuses as array; look for the na-declarations context.
-  # jq: find all statuses where context == "sop-checklist / na-declarations (pull_request)"
-  # and state == "success". Extract the description field.
-  NA_DESC=$(jq -r '
-    .[] |
-    select(.context == "sop-checklist / na-declarations (pull_request)") |
-    select(.state == "success") |
-    .description
-  ' "$NA_STATUSES_TMP" 2>/dev/null | head -1)
-
-  if [ -n "$NA_DESC" ] && [ "$NA_DESC" != "null" ]; then
-    debug "na-declarations status found: ${NA_DESC}"
-    # Check if our gate appears in the N/A description.
-    # The description format is "N/A: qa-review, security-review" or similar.
-    if echo "$NA_DESC" | grep -iq "\\b${TEAM}-review\\b"; then
-      echo "::notice::${TEAM}-review N/A — gate declared not-applicable via /sop-n/a: ${NA_DESC}"
-      echo "::notice::PR ${PR_NUMBER} passes ${TEAM}-review via N/A declaration"
-      rm -f "$NA_STATUSES_TMP"
-      exit 0
-    fi
-  fi
-else
-  debug "could not fetch statuses (HTTP ${HTTP_CODE}) — proceeding with normal eval"
-fi
-rm -f "$NA_STATUSES_TMP"
-
 # --- Fetch all reviews on the PR ---
 HTTP_CODE=$(curl -sS -o "$REVIEWS_JSON" -w '%{http_code}' \
   -K "$CURL_AUTH_FILE" "${API}/repos/${OWNER}/${NAME}/pulls/${PR_NUMBER}/reviews")

.gitea/scripts/review-refire-status.sh

@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-# Re-run review-check.sh for a slash-command refire and post the protected
-# pull_request status context to the PR head SHA.
-
-set -euo pipefail
-
-: "${GITEA_TOKEN:?GITEA_TOKEN required}"
-: "${GITEA_HOST:?GITEA_HOST required}"
-: "${REPO:?REPO required}"
-: "${PR_NUMBER:?PR_NUMBER required}"
-: "${TEAM:?TEAM required}"
-
-OWNER="${REPO%%/*}"
-NAME="${REPO##*/}"
-API="https://${GITEA_HOST}/api/v1"
-CONTEXT="${TEAM}-review / approved (pull_request)"
-TARGET_URL="https://${GITEA_HOST}/${OWNER}/${NAME}/pulls/${PR_NUMBER}"
-
-authfile=$(mktemp)
-prfile=$(mktemp)
-postfile=$(mktemp)
-# shellcheck disable=SC2329 # invoked by EXIT trap
-cleanup() {
-  rm -f "$authfile" "$prfile" "$postfile"
-}
-trap cleanup EXIT
-
-chmod 600 "$authfile"
-printf 'header = "Authorization: token %s"\n' "$GITEA_TOKEN" > "$authfile"
-
-code=$(curl -sS -o "$prfile" -w '%{http_code}' -K "$authfile" \
-  "${API}/repos/${OWNER}/${NAME}/pulls/${PR_NUMBER}")
-if [ "$code" != "200" ]; then
-  echo "::error::GET /pulls/${PR_NUMBER} returned HTTP ${code}"
-  head -c 200 "$prfile" >&2 || true
-  exit 1
-fi
-
-head_sha=$(jq -r '.head.sha // ""' "$prfile")
-state=$(jq -r '.state // ""' "$prfile")
-if [ -z "$head_sha" ] || [ "$head_sha" = "null" ]; then
-  echo "::error::Could not resolve PR head SHA for PR ${PR_NUMBER}"
-  exit 1
-fi
-if [ "$state" != "open" ]; then
-  echo "::notice::PR ${PR_NUMBER} is ${state}; ${TEAM}-review refire is a no-op"
-  exit 0
-fi
-
-set +e
-bash .gitea/scripts/review-check.sh
-rc=$?
-set -e
-
-if [ "$rc" -eq 0 ]; then
-  status_state="success"
-  description="Refired via /${TEAM}-recheck by ${COMMENT_AUTHOR:-unknown}"
-else
-  status_state="failure"
-  description="Refired via /${TEAM}-recheck; ${TEAM}-review failed"
-fi
-
-body=$(jq -nc \
-  --arg state "$status_state" \
-  --arg context "$CONTEXT" \
-  --arg description "$description" \
-  --arg target_url "$TARGET_URL" \
-  '{state:$state, context:$context, description:$description, target_url:$target_url}')
-
-code=$(curl -sS -o "$postfile" -w '%{http_code}' -X POST \
-  -K "$authfile" -H "Content-Type: application/json" \
-  -d "$body" \
-  "${API}/repos/${OWNER}/${NAME}/statuses/${head_sha}")
-if [ "$code" != "200" ] && [ "$code" != "201" ]; then
-  echo "::error::POST /statuses/${head_sha} returned HTTP ${code}"
-  head -c 200 "$postfile" >&2 || true
-  exit 1
-fi
-
-echo "::notice::posted ${status_state} for context=\"${CONTEXT}\" on sha=${head_sha}"
-exit "$rc"

.gitea/scripts/sop-checklist-gate.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
-# sop-checklist — evaluate whether a PR has peer-acked each
+# sop-checklist-gate — evaluate whether a PR has peer-acked each
 # SOP-checklist item. Posts a commit-status that branch protection
 # can require.
 #
 # RFC#351 Step 2 of 6 (implementation MVP).
 #
-# Invoked by .gitea/workflows/sop-checklist.yml on:
+# Invoked by .gitea/workflows/sop-checklist-gate.yml on:
 #   - pull_request_target: [opened, edited, synchronize, reopened]
 #   - issue_comment:       [created, edited, deleted]
 #
@@ -68,7 +68,7 @@ import sys
 import urllib.error
 import urllib.parse
 import urllib.request
-from typing import Any, Callable
+from typing import Any
 
 
 # ---------------------------------------------------------------------------
@@ -110,7 +110,7 @@ def normalize_slug(raw: str, numeric_aliases: dict[int, str] | None = None) -> s
 # for /sop-revoke (RFC#351 open question 4 — reason is captured but not
 # yet validated; future iteration may require a min-length).
 _DIRECTIVE_RE = re.compile(
-    r"^[ \t]*/(sop-ack|sop-revoke|sop-n/a)[ \t]+([A-Za-z0-9_\- ]+?)(?:[ \t]+(.*))?[ \t]*$",
+    r"^[ \t]*/(sop-ack|sop-revoke)[ \t]+([A-Za-z0-9_\- ]+?)(?:[ \t]+(.*))?[ \t]*$",
     re.MULTILINE,
 )
 
@@ -118,21 +118,17 @@ _DIRECTIVE_RE = re.compile(
 def parse_directives(
     comment_body: str,
     numeric_aliases: dict[int, str],
-) -> tuple[list[tuple[str, str, str]], list[tuple[str, str, str]]]:
-    """Extract /sop-ack, /sop-revoke, and /sop-n/a directives from a comment body.
+) -> list[tuple[str, str, str]]:
+    """Extract /sop-ack and /sop-revoke directives from a comment body.
 
-    Returns (directives, na_directives) where each is a list of
-    (kind, canonical_slug, note) tuples:
-      kind is "sop-ack", "sop-revoke", or "sop-n/a"
+    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 "")
-    The two lists are kept separate so call sites can unpack them
-    directly (e.g. directives, na_directives = parse_directives(...)).
     """
-    directives: list[tuple[str, str, str]] = []
-    na_directives: list[tuple[str, str, str]] = []
+    out: list[tuple[str, str, str]] = []
     if not comment_body:
-        return directives, na_directives
+        return out
     for m in _DIRECTIVE_RE.finditer(comment_body):
         kind = m.group(1)
         raw_slug = (m.group(2) or "").strip()
@@ -162,12 +158,8 @@ def parse_directives(
         note_from_group = (m.group(3) or "").strip()
         # If we collapsed multi-word slug into kebab and there's a
         # trailing-text group too, append it.
-        entry = (kind, canonical, note_from_group)
-        if kind == "sop-n/a":
-            na_directives.append(entry)
-        else:
-            directives.append(entry)
-    return directives, na_directives
+        out.append((kind, canonical, note_from_group))
+    return out
 
 
 # ---------------------------------------------------------------------------
@@ -180,8 +172,8 @@ def section_marker_present(body: str, marker: str) -> bool:
     on a non-empty line (i.e. the author actually filled it in).
 
     We require the marker substring AND non-whitespace content on the
-    same line OR within the next non-blank line — this prevents
-    trivially-empty checklists like:
+    same line OR within the next line — this prevents trivially-empty
+    checklists like:
 
         ## SOP-Checklist
         - [ ] **Comprehensive testing performed**:
@@ -190,18 +182,9 @@ def section_marker_present(body: str, marker: str) -> bool:
     from auto-passing the section-present check. The peer-ack is still
     required, but answering with empty content is captured as a soft
     finding via the section-present test alone.
-
-    NOTE: we scan forward through blank lines (the markdown-header pattern
-    is ## Header\\n\\ncontent) so that a header + blank-line + content
-    structure still satisfies the check. The backward checkbox fallback
-    catches inline markers without a preceding checkbox (mc#1099).
     """
     if not body or not marker:
         return False
-    # Strip trailing whitespace so the blank-line scan below can find
-    # content that appears on the very last line of the body (without
-    # being misled by a trailing \n or spaces).
-    body = body.rstrip()
     body_lower = body.lower()
     marker_lower = marker.lower()
     idx = body_lower.find(marker_lower)
@@ -217,44 +200,13 @@ def section_marker_present(body: str, marker: str) -> bool:
     stripped = re.sub(r"[\s\*:\-\[\]]+", "", line)
     if stripped:
         return True
-    # Fall through: scan forward, skipping blank-only lines, until we find
-    # non-empty content or run out of body.  Handles:
-    #   ## Header          ← marker line (empty after marker)
-    #                      ← blank line (skipped)
-    #   - actual content   ← found
-    pos = line_end
-    while True:
-        # Skip the current newline and any additional newlines (blank lines).
-        while pos < len(body) and body[pos] == "\n":
-            pos += 1
-        if pos >= len(body):
-            break
-        line_end = body.find("\n", pos)
-        if line_end < 0:
-            line_end = len(body)
-        line = body[pos:line_end]
-        stripped = re.sub(r"[\s\*:\-\[\]]+", "", line)
-        if stripped:
-            return True
-        pos = line_end
-    # Last resort: the marker may appear mid-sentence (e.g.
-    # **Memory/saved-feedback consulted**: No applicable...).
-    # Search backward within the CURRENT LINE only (not preceding lines)
-    # to find a checkbox on the same line before the marker text.
-    # mc#1099 follow-up: memory-consulted detection was failing because
-    # the checkbox was on the same line before the inline marker.
-    _CHECKBOX_RE = re.compile(r"- \[[ x\]]|<input", re.IGNORECASE)
-    line_start = body.rfind("\n", 0, idx) + 1  # 0 if no newline before idx
-    before = body[line_start:idx]
-    m = _CHECKBOX_RE.search(before)
-    if not m:
-        return False
-    # Require meaningful content between the checkbox and the marker text
-    # (markdown formatting like ** or * must also be stripped).
-    # If only whitespace/markdown chars remain, the checkbox line is empty.
-    between = before[m.end() :]
-    stripped_between = re.sub(r"[\s\*:#\[\]_\-]+", "", between)
-    return bool(stripped_between)
+    # Fall through: check the NEXT line (multi-line answers).
+    next_line_end = body.find("\n", line_end + 1)
+    if next_line_end < 0:
+        next_line_end = len(body)
+    next_line = body[line_end + 1:next_line_end]
+    stripped_next = re.sub(r"[\s\*:\-\[\]]+", "", next_line)
+    return bool(stripped_next)
 
 
 # ---------------------------------------------------------------------------
@@ -297,7 +249,7 @@ def compute_ack_state(
         user = (c.get("user") or {}).get("login", "")
         if not user:
             continue
-        for kind, slug, _note in parse_directives(body, numeric_aliases)[0]:
+        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
@@ -349,63 +301,6 @@ def compute_ack_state(
     }
 
 
-# ---------------------------------------------------------------------------
-# N/A-gate evaluation
-# ---------------------------------------------------------------------------
-
-
-def compute_na_state(
-    comments: list[dict[str, Any]],
-    author: str,
-    na_gates: dict[str, Any],
-    probe: Callable[[str, list[str]], list[str]],
-) -> dict[str, dict[str, Any]]:
-    """Evaluate which N/A gates have a valid declaration from a team member.
-
-    Returns dict[gate_name, dict] where each dict has:
-      declared: bool — at least one valid non-author team-member declared N/A
-      decl_ackers: list[str] — usernames who declared this gate N/A
-      rejected: dict with keys:
-        not_in_team: list[str] — users who tried but aren't in required teams
-    """
-    # Build per-user latest N/A directive (most-recent wins per RFC#324).
-    latest_na: dict[str, tuple[str, str]] = {}  # user → (gate, note)
-    for c in comments:
-        body = c.get("body", "") or ""
-        user = (c.get("user") or {}).get("login", "")
-        if not user:
-            continue
-        for kind, gate, note in parse_directives(body, {})[1]:
-            # [1] = na_directives only
-            if gate in na_gates:
-                latest_na[user] = (gate, note)
-
-    result: dict[str, dict[str, Any]] = {}
-    for gate, gate_cfg in na_gates.items():
-        result[gate] = {
-            "declared": False,
-            "decl_ackers": [],
-            "rejected": {"not_in_team": []},
-        }
-        decl_ackers: list[str] = []
-        not_in_team: list[str] = []
-        for user, (g, _note) in latest_na.items():
-            if g != gate:
-                continue
-            if user == author:
-                continue  # authors cannot self-declare N/A
-            approved = probe(gate, [user])
-            if approved:
-                decl_ackers.append(user)
-            else:
-                not_in_team.append(user)
-        result[gate]["declared"] = bool(decl_ackers)
-        result[gate]["decl_ackers"] = decl_ackers
-        result[gate]["rejected"]["not_in_team"] = not_in_team
-
-    return result
-
-
 # ---------------------------------------------------------------------------
 # Gitea API client
 # ---------------------------------------------------------------------------
@@ -800,7 +695,6 @@ def main(argv: list[str] | None = None) -> int:
     cfg = load_config(args.config)
     items: list[dict[str, Any]] = cfg["items"]
     items_by_slug = {it["slug"]: it for it in items}
-    na_gates: dict[str, Any] = cfg.get("n/a_gates", {})
     numeric_aliases = {
         int(it["numeric_alias"]): it["slug"] for it in items if it.get("numeric_alias")
     }
@@ -921,46 +815,6 @@ def main(argv: list[str] | None = None) -> int:
         description=description, target_url=target_url,
     )
     print(f"::notice::status posted: {args.status_context} → {state}")
-
-    # --- N/A gate status (RFC#324 §N/A follow-up) ---
-    # Post a separate status so review-check.sh can discover N/A declarations
-    # and waive the Gitea-approve requirement for that gate.
-    na_state: dict[str, dict[str, Any]] = {}
-    if na_gates:
-        na_state = compute_na_state(comments, author, na_gates, probe)
-
-        na_descs: list[str] = []
-        for gate, s in na_state.items():
-            if s["declared"]:
-                na_descs.append(gate)
-            decl = s["decl_ackers"]
-            rej = s["rejected"]["not_in_team"]
-            if decl:
-                print(f"::notice::  [N/A OK] {gate} — declared by {','.join(decl)}")
-            if rej:
-                print(
-                    f"::notice::  [N/A REJ] {gate} — not-in-team: {','.join(rej)}",
-                    file=sys.stderr,
-                )
-
-        na_desc = ", ".join(sorted(na_descs)) if na_descs else "(none)"
-        na_status_state = "success" if na_descs else "pending"
-        # review-check.sh reads the description to discover which gates are N/A.
-        # Include the gate names so it can grep for them.
-        na_description = f"N/A: {na_desc}" if na_descs else "N/A: (none)"
-
-        if not args.dry_run:
-            client.post_status(
-                args.owner, args.repo, head_sha,
-                state=na_status_state,
-                context="sop-checklist / na-declarations (pull_request)",
-                description=na_description,
-                target_url=target_url,
-            )
-            print(
-                f"::notice::na-declarations status → {na_status_state}: {na_description}"
-            )
-
     # By default exit 0 — the POSTed status IS the gate, NOT the job
     # conclusion. If the job exits 1 BP will see TWO failure signals
     # (one from the job's auto-status, one from our POST), making the

.gitea/scripts/status-reaper.py

@@ -58,10 +58,9 @@ What this script does, per `.gitea/workflows/status-reaper.yml` invocation:
      even if another tick happens before the runner finishes.
 
 What it does NOT do:
-  - Touch ` (pull_request)` contexts unless the exact same
-    workflow/job has a successful ` (push)` context on the same
-    default-branch SHA. That case is post-merge status pollution, not
-    an unproven PR gate.
+  - Touch any context NOT ending in ` (push)`. The required-checks on
+    main (verified 2026-05-11) all have ` (pull_request)` suffixes;
+    they CANNOT be reached by this code path.
   - Compensate `error`/`pending` states. Only `failure` — the only one
     Gitea emits for the hardcoded-suffix bug.
   - Write to non-default branches. WATCH_BRANCH is sourced from
@@ -92,9 +91,7 @@ from __future__ import annotations
 import argparse
 import json
 import os
-import socket
 import sys
-import time
 import urllib.error
 import urllib.parse
 import urllib.request
@@ -121,31 +118,19 @@ WORKFLOWS_DIR = _env("WORKFLOWS_DIR", default=".gitea/workflows")
 
 OWNER, NAME = (REPO.split("/", 1) + [""])[:2] if REPO else ("", "")
 API = f"https://{GITEA_HOST}/api/v1" if GITEA_HOST else ""
-API_TIMEOUT_SEC = int(_env("STATUS_REAPER_API_TIMEOUT_SEC", default="30") or "30")
-API_RETRIES = int(_env("STATUS_REAPER_API_RETRIES", default="3") or "3")
-API_RETRY_SLEEP_SEC = float(_env("STATUS_REAPER_API_RETRY_SLEEP_SEC", default="2") or "2")
 
 # Compensating-status description prefix. Used as the marker so a human
 # auditing commit statuses can tell at a glance that the green was
 # synthetic, not a real CI pass. Kept stable; downstream tooling
 # (e.g. main-red-watchdog visual diff) MAY key on it.
-PUSH_COMPENSATION_DESCRIPTION = (
+COMPENSATION_DESCRIPTION = (
     "Compensated by status-reaper (workflow has no push: trigger; "
     "Gitea 1.22.6 hardcoded-suffix bug — see .gitea/scripts/status-reaper.py)"
 )
-# Backward-compatible alias for older tests/tooling that predate the split
-# between push-suffix compensation and pull-request-shadow compensation.
-COMPENSATION_DESCRIPTION = PUSH_COMPENSATION_DESCRIPTION
-PR_SHADOW_COMPENSATION_DESCRIPTION = (
-    "Compensated by status-reaper (default-branch pull_request status "
-    "shadowed by successful push status on same SHA; see "
-    ".gitea/scripts/status-reaper.py)"
-)
 
 # Context suffix the reaper acts on. Gitea hardcodes this for ALL
 # default-branch workflow runs.
 PUSH_SUFFIX = " (push)"
-PULL_REQUEST_SUFFIX = " (pull_request)"
 
 
 def _require_runtime_env() -> None:
@@ -197,27 +182,13 @@ def api(
         data = json.dumps(body).encode("utf-8")
         headers["Content-Type"] = "application/json"
     req = urllib.request.Request(url, method=method, data=data, headers=headers)
-    attempts = max(API_RETRIES, 1)
-    for attempt in range(1, attempts + 1):
-        try:
-            with urllib.request.urlopen(req, timeout=API_TIMEOUT_SEC) as resp:
-                raw = resp.read()
-                status = resp.status
-            break
-        except urllib.error.HTTPError as e:
-            raw = e.read()
-            status = e.code
-            break
-        except (TimeoutError, socket.timeout, urllib.error.URLError, OSError) as e:
-            if attempt >= attempts:
-                raise ApiError(
-                    f"{method} {path} failed after {attempts} attempts: {e}"
-                ) from e
-            print(
-                f"::warning::{method} {path} transient API error "
-                f"(attempt {attempt}/{attempts}): {e}; retrying"
-            )
-            time.sleep(API_RETRY_SLEEP_SEC)
+    try:
+        with urllib.request.urlopen(req, timeout=30) as resp:
+            raw = resp.read()
+            status = resp.status
+    except urllib.error.HTTPError as e:
+        raw = e.read()
+        status = e.code
 
     if not (200 <= status < 300):
         snippet = raw[:500].decode("utf-8", errors="replace") if raw else ""
@@ -386,38 +357,24 @@ def get_combined_status(sha: str) -> dict:
 # --------------------------------------------------------------------------
 # Context parsing
 # --------------------------------------------------------------------------
-def parse_suffixed_context(context: str, suffix: str) -> tuple[str, str] | None:
-    """Parse `<workflow_name> / <job_name> (<event>)` into
+def parse_push_context(context: str) -> tuple[str, str] | None:
+    """Parse `<workflow_name> / <job_name> (push)` into
     (workflow_name, job_name).
 
     Returns None if the context doesn't match the shape (caller skips).
-    Strict: requires the trailing suffix and at least one ` / `
+    Strict: requires the trailing ` (push)` and at least one ` / `
     separator. Anything else is left alone.
     """
-    if not context.endswith(suffix):
+    if not context.endswith(PUSH_SUFFIX):
         return None
-    head = context[: -len(suffix)]
+    head = context[: -len(PUSH_SUFFIX)]  # strip " (push)"
     if " / " not in head:
+        # No workflow/job separator — not the bug shape we compensate.
         return None
     workflow_name, job_name = head.split(" / ", 1)
     return workflow_name, job_name
 
 
-def parse_push_context(context: str) -> tuple[str, str] | None:
-    """Parse `<workflow_name> / <job_name> (push)` into
-    (workflow_name, job_name)."""
-    return parse_suffixed_context(context, PUSH_SUFFIX)
-
-
-def push_equivalent_context(context: str) -> str | None:
-    """Return the matching `(push)` context for a `(pull_request)` context."""
-    parsed = parse_suffixed_context(context, PULL_REQUEST_SUFFIX)
-    if parsed is None:
-        return None
-    workflow_name, job_name = parsed
-    return f"{workflow_name} / {job_name}{PUSH_SUFFIX}"
-
-
 # --------------------------------------------------------------------------
 # Compensating POST
 # --------------------------------------------------------------------------
@@ -426,7 +383,6 @@ def post_compensating_status(
     context: str,
     target_url: str | None,
     *,
-    description: str = PUSH_COMPENSATION_DESCRIPTION,
     dry_run: bool = False,
 ) -> None:
     """POST a `state=success` to /repos/{o}/{r}/statuses/{sha} with the
@@ -438,7 +394,7 @@ def post_compensating_status(
     payload: dict[str, Any] = {
         "context": context,
         "state": "success",
-        "description": description,
+        "description": COMPENSATION_DESCRIPTION,
     }
     # Echo the original target_url when present so a human auditing
     # the (now-green) compensated status can still reach the run logs
@@ -475,8 +431,7 @@ def reap(
     Returns counters for observability:
       {compensated, preserved_real_push, preserved_unknown,
        preserved_non_failure, preserved_non_push_suffix,
-       preserved_unparseable, compensated_pr_shadowed_by_push_success,
-       preserved_pr_without_push_success,
+       preserved_unparseable,
        compensated_contexts: [<context>, ...]}
 
     `compensated_contexts` is rev2-added so `reap_branch` can build
@@ -489,17 +444,10 @@ def reap(
         "preserved_non_failure": 0,
         "preserved_non_push_suffix": 0,
         "preserved_unparseable": 0,
-        "compensated_pr_shadowed_by_push_success": 0,
-        "preserved_pr_without_push_success": 0,
         "compensated_contexts": [],
     }
 
     statuses = combined.get("statuses") or []
-    successful_contexts = {
-        (s.get("context") or "")
-        for s in statuses
-        if isinstance(s, dict) and (s.get("status") or s.get("state") or "") == "success"
-    }
     for s in statuses:
         if not isinstance(s, dict):
             continue
@@ -523,31 +471,9 @@ def reap(
             counters["preserved_non_failure"] += 1
             continue
 
-        # Default-branch `pull_request` contexts can be stale shadows of
-        # the exact same workflow/job already proven by the successful
-        # `push` context on the same SHA. Compensate only that narrow
-        # shape; a missing or failed push equivalent remains a real gate
-        # signal and is preserved.
-        push_equivalent = push_equivalent_context(context)
-        if push_equivalent is not None:
-            if push_equivalent in successful_contexts:
-                post_compensating_status(
-                    sha,
-                    context,
-                    s.get("target_url"),
-                    description=PR_SHADOW_COMPENSATION_DESCRIPTION,
-                    dry_run=dry_run,
-                )
-                counters["compensated"] += 1
-                counters["compensated_pr_shadowed_by_push_success"] += 1
-                counters["compensated_contexts"].append(context)
-            else:
-                counters["preserved_pr_without_push_success"] += 1
-            continue
-
         # Only `(push)`-suffix contexts hit the hardcoded-suffix bug.
-        # Other failed contexts are preserved unless handled by the
-        # pull-request-shadow rule above.
+        # Branch-protection required checks (e.g. `Secret scan / Scan
+        # diff (pull_request)`) are NOT reachable from this path.
         if not context.endswith(PUSH_SUFFIX):
             counters["preserved_non_push_suffix"] += 1
             continue
@@ -614,10 +540,11 @@ def list_recent_commit_shas(branch: str, limit: int) -> list[str]:
     (verified via vendor-truth probe 2026-05-11 against
     git.moleculesai.app — `feedback_smoke_test_vendor_truth_not_shape_match`).
 
-    Raises ApiError on non-2xx OR on unexpected response shape. The
-    branch-level caller soft-skips this tick because the next scheduled
-    tick can safely retry the listing. Per-SHA status/write errors remain
-    separate and must not be mislabeled as commit-list outages.
+    Raises ApiError on non-2xx OR on unexpected response shape. This is
+    a HARD halt — without the commit list the sweep can't proceed. (The
+    per-SHA error isolation downstream is a different concern: tolerating
+    a transient 5xx on ONE commit's status is best-effort; losing the
+    commit list itself means we don't even know which commits to try.)
     """
     _, body = api(
         "GET",
@@ -658,27 +585,7 @@ def reap_branch(
       - compensated_per_sha: {<sha_full>: [<context>, ...]} — only
         SHAs that actually got at least one compensation are included
     """
-    try:
-        shas = list_recent_commit_shas(branch, limit)
-    except ApiError as e:
-        print(
-            "::warning::status-reaper skipped this tick because the "
-            f"commit list could not be read after retries: {e}"
-        )
-        return {
-            "scanned_shas": 0,
-            "compensated": 0,
-            "preserved_real_push": 0,
-            "preserved_unknown": 0,
-            "preserved_non_failure": 0,
-            "preserved_non_push_suffix": 0,
-            "preserved_unparseable": 0,
-            "compensated_pr_shadowed_by_push_success": 0,
-            "preserved_pr_without_push_success": 0,
-            "compensated_per_sha": {},
-            "skipped": True,
-            "skip_reason": "commit-list-api-error",
-        }
+    shas = list_recent_commit_shas(branch, limit)
 
     aggregate: dict[str, Any] = {
         "scanned_shas": 0,
@@ -688,8 +595,6 @@ def reap_branch(
         "preserved_non_failure": 0,
         "preserved_non_push_suffix": 0,
         "preserved_unparseable": 0,
-        "compensated_pr_shadowed_by_push_success": 0,
-        "preserved_pr_without_push_success": 0,
         "compensated_per_sha": {},
     }
 
@@ -727,8 +632,6 @@ def reap_branch(
             "preserved_non_failure",
             "preserved_non_push_suffix",
             "preserved_unparseable",
-            "compensated_pr_shadowed_by_push_success",
-            "preserved_pr_without_push_success",
         ):
             aggregate[key] += per_sha[key]
 

.gitea/scripts/tests/_review_check_fixture.py

@@ -16,7 +16,6 @@ Scenarios:
   T7_team_member              — team membership → 204 (member) → exit 0
   T8_team_not_member          — team membership → 404 (not a member) → exit 1
   T9_team_403                — team membership → 403 (token not in team) → exit 1
-  T14_non_default_base        — open PR targeting staging → script exits 0 (no-op)
 
 Usage:
   FIXTURE_STATE_DIR=/tmp/x python3 _review_check_fixture.py 8080
@@ -83,14 +82,12 @@ class Handler(http.server.BaseHTTPRequestHandler):
                     "number": int(pr_num),
                     "state": "closed",
                     "head": {"sha": "deadbeef0000111122223333444455556666"},
-                    "base": {"ref": "main"},
                     "user": {"login": "alice"},
                 })
             return self._json(200, {
                 "number": int(pr_num),
                 "state": "open",
                 "head": {"sha": "deadbeef0000111122223333444455556666"},
-                "base": {"ref": "staging" if sc == "T14_non_default_base" else "main"},
                 "user": {"login": "alice"},
             })
 

.gitea/scripts/tests/test_gitea_merge_queue.py

@@ -85,10 +85,7 @@ def test_pr_needs_update_when_base_sha_absent_from_commits():
 
 def test_merge_decision_requires_main_green_pr_green_and_current_base():
     required = ["CI / all-required (pull_request)"]
-    main_status = {
-        "state": "success",
-        "statuses": [{"context": "CI / all-required (push)", "status": "success"}],
-    }
+    main_status = {"state": "success", "statuses": []}
     pr_status = {
         "state": "success",
         "statuses": [{"context": "CI / all-required (pull_request)", "status": "success"}],
@@ -107,10 +104,7 @@ def test_merge_decision_requires_main_green_pr_green_and_current_base():
 
 def test_merge_decision_updates_stale_pr_before_merge():
     decision = mq.evaluate_merge_readiness(
-        main_status={
-            "state": "success",
-            "statuses": [{"context": "CI / all-required (push)", "status": "success"}],
-        },
+        main_status={"state": "success", "statuses": []},
         pr_status={"state": "success", "statuses": [{"context": "CI / all-required (pull_request)", "status": "success"}]},
         required_contexts=["CI / all-required (pull_request)"],
         pr_has_current_base=False,

.gitea/scripts/tests/test_review_check.sh

@@ -15,7 +15,6 @@
 #   T11 — bash syntax check (bash -n passes)
 #   T12 — jq filter: non-author APPROVED → in candidate list; dismissed → excluded
 #   T13 — missing required env GITEA_TOKEN → exits 1 with error
-#   T14 — non-default-base PR exits 0 without requiring review
 #
 # Hostile-self-review (per feedback_assert_exact_not_substring):
 # this test MUST FAIL if the script is absent. Verified by running
@@ -74,7 +73,7 @@ assert_file_mode() {
     return
   fi
   local got_mode
-  got_mode=$(stat -c '%a' "$path" 2>/dev/null || stat -f '%Lp' "$path" 2>/dev/null || echo "000")
+  got_mode=$(stat -c '%a' "$path" 2>/dev/null || echo "000")
   if [ "$expected_mode" = "$got_mode" ]; then
     echo "  PASS  $label (mode=$got_mode)"
     PASS=$((PASS + 1))
@@ -195,9 +194,8 @@ for a in "$@"; do
 done
 exec /usr/bin/curl "${new_args[@]}"
 CURL_SHIM
-# Now substitute FIXPORT with the actual port number. Use perl rather than
-# sed -i so the test runs on both GNU sed and BSD/macOS sed.
-perl -0pi -e "s/FIXPORT/${FIX_PORT}/g" "$FIXTURE_DIR/bin/curl"
+# Now substitute FIXPORT with the actual port number
+sed -i "s/FIXPORT/${FIX_PORT}/g" "$FIXTURE_DIR/bin/curl"
 chmod +x "$FIXTURE_DIR/bin/curl"
 
 # Helper: run the script with fixture environment
@@ -212,7 +210,6 @@ run_review_check() {
     GITEA_HOST="fixture.local" \
     REPO="molecule-ai/molecule-core" \
     PR_NUMBER="999" \
-    DEFAULT_BRANCH="main" \
     TEAM="qa" \
     TEAM_ID="20" \
     REVIEW_CHECK_DEBUG="0" \
@@ -256,14 +253,6 @@ T4_RC=$(cat "$FIX_STATE_DIR/last_rc")
 assert_eq "T4 exit code 1 (no candidates)" "1" "$T4_RC"
 assert_contains "T4 awaiting non-author APPROVE" "awaiting non-author APPROVE" "$T4_OUT"
 
-# T14 — non-default-base PR should not make the default branch red.
-echo
-echo "== T14 non-default base PR =="
-T14_OUT=$(run_review_check "T14_non_default_base")
-T14_RC=$(cat "$FIX_STATE_DIR/last_rc")
-assert_eq "T14 exit code 0 (non-default base no-op)" "0" "$T14_RC"
-assert_contains "T14 not applicable notice" "gate not applicable" "$T14_OUT"
-
 # T5 — only author reviews → exit 1
 echo
 echo "== T5 only author reviews =="
@@ -307,10 +296,10 @@ echo "== T10 CURL_AUTH_FILE =="
 # Verify the token-file logic directly: create a temp file with the
 # same mktemp pattern, write the header with printf, chmod 600, then assert.
 T10_TOKEN="secret-test-token-abc123"
-T10_AUTHFILE=$(mktemp "${TMPDIR:-/tmp}/curl-auth.test.XXXXXX")
+T10_AUTHFILE=$(mktemp -p /tmp curl-auth.test.XXXXXX)
 chmod 600 "$T10_AUTHFILE"
 printf 'header = "Authorization: token %s"\n' "$T10_TOKEN" > "$T10_AUTHFILE"
-assert_file_mode "T10a mktemp authfile mode 600 (CURL_AUTH_FILE pattern)" "$T10_AUTHFILE" "600"
+assert_file_mode "T10a mktemp -p /tmp mode 600 (CURL_AUTH_FILE pattern)" "$T10_AUTHFILE" "600"
 assert_file_contains "T10b printf header format (CURL_AUTH_FILE content)" "$T10_AUTHFILE" "Authorization: token secret-test-token-abc123"
 assert_file_contains "T10c 'header =' curl-config syntax" "$T10_AUTHFILE" 'header = "Authorization: token '
 rm -f "$T10_AUTHFILE"

.gitea/scripts/tests/test_sop_checklist_gate.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
-# Unit tests for sop-checklist.py
+# Unit tests for sop-checklist-gate.py
 #
-# Run:  python3 .gitea/scripts/tests/test_sop_checklist.py
-#   or:  pytest .gitea/scripts/tests/test_sop_checklist.py
+# Run:  python3 .gitea/scripts/tests/test_sop_checklist_gate.py
+#   or:  pytest .gitea/scripts/tests/test_sop_checklist_gate.py
 #
 # RFC#351 Step 2 of 6 — implementation MVP. Tests cover:
 #   - slug normalization (the 4 example variants in the script header)
@@ -33,7 +33,7 @@ sys.path.insert(0, PARENT)
 import importlib.util  # noqa: E402
 
 _spec = importlib.util.spec_from_file_location(
-    "sop_checklist", os.path.join(PARENT, "sop-checklist.py")
+    "sop_checklist_gate", os.path.join(PARENT, "sop-checklist-gate.py")
 )
 sop = importlib.util.module_from_spec(_spec)
 _spec.loader.exec_module(sop)  # type: ignore[union-attr]
@@ -134,22 +134,18 @@ class TestParseDirectives(unittest.TestCase):
     def setUp(self):
         self.aliases = _numeric_aliases()
 
-    def parse_ack_revoke(self, body):
-        directives, na_directives = sop.parse_directives(body, self.aliases)
-        self.assertEqual(na_directives, [])
-        return directives
-
     def test_simple_ack(self):
-        d = self.parse_ack_revoke("/sop-ack comprehensive-testing")
+        d = sop.parse_directives("/sop-ack comprehensive-testing", self.aliases)
         self.assertEqual(d, [("sop-ack", "comprehensive-testing", "")])
 
     def test_simple_revoke(self):
-        d = self.parse_ack_revoke("/sop-revoke staging-smoke")
+        d = sop.parse_directives("/sop-revoke staging-smoke", self.aliases)
         self.assertEqual(d, [("sop-revoke", "staging-smoke", "")])
 
     def test_ack_with_note(self):
-        d = self.parse_ack_revoke(
-            "/sop-ack comprehensive-testing LGTM the test covers all edge cases"
+        d = sop.parse_directives(
+            "/sop-ack comprehensive-testing LGTM the test covers all edge cases",
+            self.aliases,
         )
         self.assertEqual(len(d), 1)
         self.assertEqual(d[0][0], "sop-ack")
@@ -157,12 +153,13 @@ class TestParseDirectives(unittest.TestCase):
         self.assertIn("LGTM", d[0][2])
 
     def test_numeric_shorthand(self):
-        d = self.parse_ack_revoke("/sop-ack 1")
+        d = sop.parse_directives("/sop-ack 1", self.aliases)
         self.assertEqual(d, [("sop-ack", "comprehensive-testing", "")])
 
     def test_revoke_with_reason(self):
-        d = self.parse_ack_revoke(
-            "/sop-revoke comprehensive-testing realized the e2e was mocking the DB"
+        d = sop.parse_directives(
+            "/sop-revoke comprehensive-testing realized the e2e was mocking the DB",
+            self.aliases,
         )
         self.assertEqual(d[0][0], "sop-revoke")
         self.assertEqual(d[0][1], "comprehensive-testing")
@@ -174,7 +171,7 @@ class TestParseDirectives(unittest.TestCase):
             "/sop-ack comprehensive-testing\n"
             "Will follow up on the doc nit separately."
         )
-        d = self.parse_ack_revoke(body)
+        d = sop.parse_directives(body, self.aliases)
         self.assertEqual(len(d), 1)
         self.assertEqual(d[0][1], "comprehensive-testing")
 
@@ -183,7 +180,7 @@ class TestParseDirectives(unittest.TestCase):
             "/sop-ack comprehensive-testing\n"
             "/sop-ack local-postgres-e2e\n"
         )
-        d = self.parse_ack_revoke(body)
+        d = sop.parse_directives(body, self.aliases)
         self.assertEqual(len(d), 2)
         slugs = {x[1] for x in d}
         self.assertEqual(slugs, {"comprehensive-testing", "local-postgres-e2e"})
@@ -192,21 +189,21 @@ class TestParseDirectives(unittest.TestCase):
         # A directive embedded mid-line is not honored (prevents review
         # comments like "to /sop-ack you need..." from acting as acks).
         body = "If you want to /sop-ack comprehensive-testing reply in this thread"
-        d = self.parse_ack_revoke(body)
+        d = sop.parse_directives(body, self.aliases)
         self.assertEqual(d, [])
 
     def test_leading_whitespace_allowed(self):
         body = "  /sop-ack comprehensive-testing"
-        d = self.parse_ack_revoke(body)
+        d = sop.parse_directives(body, self.aliases)
         self.assertEqual(len(d), 1)
 
     def test_empty_body(self):
-        self.assertEqual(sop.parse_directives("", self.aliases), ([], []))
-        self.assertEqual(sop.parse_directives(None, self.aliases), ([], []))
+        self.assertEqual(sop.parse_directives("", self.aliases), [])
+        self.assertEqual(sop.parse_directives(None, self.aliases), [])
 
     def test_normalization_applied(self):
         # /sop-ack Comprehensive_Testing → canonical comprehensive-testing
-        d = self.parse_ack_revoke("/sop-ack Comprehensive_Testing")
+        d = sop.parse_directives("/sop-ack Comprehensive_Testing", self.aliases)
         self.assertEqual(d[0][1], "comprehensive-testing")
 
 
@@ -551,55 +548,3 @@ class TestEndToEndAckFlow(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)
-
-
-# ---------------------------------------------------------------------------
-# compute_na_state
-# ---------------------------------------------------------------------------
-
-
-class TestComputeNaState(unittest.TestCase):
-    """Tests for /sop-n/a directive evaluation."""
-
-    def test_no_na_declarations(self):
-        cfg = sop.load_config(CONFIG_PATH)
-        na_gates = cfg.get("n/a_gates", {})
-        comments = []
-        na_state = sop.compute_na_state(comments, "alice", na_gates, lambda *_: [])
-        self.assertFalse(na_state["qa-review"]["declared"])
-        self.assertFalse(na_state["security-review"]["declared"])
-
-    def test_na_declared_by_authorized_user(self):
-        cfg = sop.load_config(CONFIG_PATH)
-        na_gates = cfg.get("n/a_gates", {})
-        comments = [_comment("bob", "/sop-n/a qa-review N/A: pure tooling change")]
-        na_state = sop.compute_na_state(comments, "alice", na_gates, lambda g, u: u)
-        self.assertTrue(na_state["qa-review"]["declared"])
-        self.assertEqual(na_state["qa-review"]["decl_ackers"], ["bob"])
-
-    def test_na_declared_by_unauthorized_user_rejected(self):
-        cfg = sop.load_config(CONFIG_PATH)
-        na_gates = cfg.get("n/a_gates", {})
-        comments = [_comment("mallory", "/sop-n/a qa-review N/A: not real team")]
-        na_state = sop.compute_na_state(comments, "alice", na_gates, lambda g, u: [])
-        self.assertFalse(na_state["qa-review"]["declared"])
-        self.assertEqual(na_state["qa-review"]["rejected"]["not_in_team"], ["mallory"])
-
-    def test_author_cannot_self_declare_na(self):
-        cfg = sop.load_config(CONFIG_PATH)
-        na_gates = cfg.get("n/a_gates", {})
-        comments = [_comment("alice", "/sop-n/a qa-review N/A: I am the author")]
-        na_state = sop.compute_na_state(comments, "alice", na_gates, lambda g, u: u)
-        self.assertFalse(na_state["qa-review"]["declared"])
-
-    def test_parse_directives_separates_na_from_ack(self):
-        directives, na_directives = sop.parse_directives(
-            "/sop-ack comprehensive-testing\n/sop-n/a qa-review N/A: no surface",
-            {},
-        )
-        self.assertEqual(len(directives), 1)
-        self.assertEqual(directives[0][0], "sop-ack")
-        self.assertEqual(len(na_directives), 1)
-        self.assertEqual(na_directives[0][0], "sop-n/a")
-        self.assertEqual(na_directives[0][1], "qa-review")
-        self.assertIn("no surface", na_directives[0][2])

.gitea/scripts/tests/test_sop_tier_refire.sh

@@ -32,7 +32,6 @@ THIS_DIR="$(cd "$(dirname "$0")" && pwd)"
 SCRIPT_DIR="$(cd "$THIS_DIR/.." && pwd)"
 WORKFLOW_DIR="$(cd "$THIS_DIR/../../workflows" && pwd)"
 WORKFLOW="$WORKFLOW_DIR/sop-tier-refire.yml"
-DISPATCH_WORKFLOW="$WORKFLOW_DIR/review-refire-comments.yml"
 SCRIPT="$SCRIPT_DIR/sop-tier-refire.sh"
 
 PASS=0
@@ -88,7 +87,6 @@ assert_file_exists() {
 echo
 echo "== existence =="
 assert_file_exists "workflow file exists"  "$WORKFLOW"
-assert_file_exists "dispatcher workflow file exists" "$DISPATCH_WORKFLOW"
 assert_file_exists "script file exists"    "$SCRIPT"
 if [ "$FAIL" -gt 0 ]; then
   echo
@@ -106,44 +104,30 @@ echo "== T6/T7 workflow yaml =="
 PARSE_OUT=$(python3 -c 'import sys,yaml;yaml.safe_load(open(sys.argv[1]).read());print("ok")' "$WORKFLOW" 2>&1 || true)
 assert_eq "T7 workflow parses as YAML" "ok" "$PARSE_OUT"
 
-# The old per-workflow issue_comment listener caused queue storms because
-# Gitea queues jobs before evaluating job-level `if:`. The script remains,
-# but comment-triggered refires route through the single dispatcher.
+# Three required gates in the `if:` expression
 WORKFLOW_CONTENT=$(cat "$WORKFLOW")
-if printf '%s' "$WORKFLOW_CONTENT" | grep -q '^  issue_comment:'; then
-  echo "  FAIL  T6a manual fallback workflow must not listen on issue_comment"
-  FAIL=$((FAIL + 1))
-  FAILED_TESTS="${FAILED_TESTS} T6a"
-else
-  echo "  PASS  T6a manual fallback workflow does not listen on issue_comment"
-  PASS=$((PASS + 1))
-fi
-assert_contains "T6b workflow exposes workflow_dispatch" \
-  "workflow_dispatch" "$WORKFLOW_CONTENT"
-assert_contains "T6c workflow documents unsupported manual inputs" \
-  "workflow_dispatch inputs" "$WORKFLOW_CONTENT"
+assert_contains "T6a workflow if: contains author_association gate" \
+  "github.event.comment.author_association" "$WORKFLOW_CONTENT"
+assert_contains "T6b workflow if: gates on MEMBER/OWNER/COLLABORATOR" \
+  '["MEMBER","OWNER","COLLABORATOR"]' "$WORKFLOW_CONTENT"
+assert_contains "T6c workflow if: contains slash-command trigger" \
+  "/refire-tier-check" "$WORKFLOW_CONTENT"
+assert_contains "T6d workflow if: gates on PR-not-issue" \
+  "github.event.issue.pull_request" "$WORKFLOW_CONTENT"
+assert_contains "T6e workflow listens on issue_comment" \
+  "issue_comment" "$WORKFLOW_CONTENT"
+assert_contains "T6f workflow requests statuses:write permission" \
+  "statuses: write" "$WORKFLOW_CONTENT"
 # Does NOT check out PR HEAD (security)
 if grep -q 'ref: \${{ github.event.pull_request.head' "$WORKFLOW"; then
-  echo "  FAIL  T6d workflow MUST NOT check out PR head (security)"
+  echo "  FAIL  T6g workflow MUST NOT check out PR head (security)"
   FAIL=$((FAIL + 1))
-  FAILED_TESTS="${FAILED_TESTS} T6d"
+  FAILED_TESTS="${FAILED_TESTS} T6g"
 else
-  echo "  PASS  T6d workflow does not check out PR head"
+  echo "  PASS  T6g workflow does not check out PR head"
   PASS=$((PASS + 1))
 fi
 
-DISPATCH_PARSE_OUT=$(python3 -c 'import sys,yaml;yaml.safe_load(open(sys.argv[1]).read());print("ok")' "$DISPATCH_WORKFLOW" 2>&1 || true)
-assert_eq "T6e dispatcher workflow parses as YAML" "ok" "$DISPATCH_PARSE_OUT"
-DISPATCH_CONTENT=$(cat "$DISPATCH_WORKFLOW")
-assert_contains "T6f dispatcher listens on issue_comment" \
-  "issue_comment" "$DISPATCH_CONTENT"
-assert_contains "T6g dispatcher handles /qa-recheck" \
-  "/qa-recheck" "$DISPATCH_CONTENT"
-assert_contains "T6h dispatcher handles /security-recheck" \
-  "/security-recheck" "$DISPATCH_CONTENT"
-assert_contains "T6i dispatcher handles /refire-tier-check" \
-  "/refire-tier-check" "$DISPATCH_CONTENT"
-
 # T1-T5 — script behavior against a local Gitea-fixture
 echo
 echo "== T1-T5 script behavior (vs local fixture) =="

.gitea/scripts/tests/test_status_reaper_api.py

@@ -1,169 +0,0 @@
-import importlib.util
-import json
-import pathlib
-import urllib.error
-
-
-ROOT = pathlib.Path(__file__).resolve().parents[1]
-SCRIPT = ROOT / "status-reaper.py"
-
-
-def load_reaper():
-    spec = importlib.util.spec_from_file_location("status_reaper", SCRIPT)
-    mod = importlib.util.module_from_spec(spec)
-    assert spec.loader is not None
-    spec.loader.exec_module(mod)
-    mod.API = "https://git.example.test/api/v1"
-    mod.GITEA_TOKEN = "test-token"
-    mod.API_TIMEOUT_SEC = 1
-    mod.API_RETRIES = 3
-    mod.API_RETRY_SLEEP_SEC = 0
-    return mod
-
-
-class FakeResponse:
-    status = 200
-
-    def __init__(self, payload):
-        self.payload = payload
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc, tb):
-        return False
-
-    def read(self):
-        return json.dumps(self.payload).encode("utf-8")
-
-
-def test_api_retries_transient_timeout(monkeypatch):
-    mod = load_reaper()
-    calls = {"n": 0}
-
-    def fake_urlopen(req, timeout):
-        calls["n"] += 1
-        if calls["n"] == 1:
-            raise TimeoutError("simulated slow Gitea API")
-        return FakeResponse({"ok": True})
-
-    monkeypatch.setattr(mod.urllib.request, "urlopen", fake_urlopen)
-
-    status, body = mod.api("GET", "/repos/o/r/commits")
-
-    assert status == 200
-    assert body == {"ok": True}
-    assert calls["n"] == 2
-
-
-def test_api_raises_after_retry_budget(monkeypatch):
-    mod = load_reaper()
-
-    def fake_urlopen(req, timeout):
-        raise urllib.error.URLError("connection reset")
-
-    monkeypatch.setattr(mod.urllib.request, "urlopen", fake_urlopen)
-
-    try:
-        mod.api("GET", "/repos/o/r/commits")
-    except mod.ApiError as exc:
-        assert "failed after 3 attempts" in str(exc)
-    else:
-        raise AssertionError("expected ApiError")
-
-
-def test_reap_compensates_failed_pr_context_when_push_equivalent_passed(monkeypatch):
-    mod = load_reaper()
-    posted = []
-
-    def fake_post(sha, context, target_url, *, description="", dry_run=False):
-        posted.append((sha, context, target_url, description, dry_run))
-
-    monkeypatch.setattr(mod, "post_compensating_status", fake_post)
-
-    counters = mod.reap(
-        {"CI": True, "Handlers Postgres Integration": True},
-        {
-            "statuses": [
-                {
-                    "context": "CI / Platform (Go) (pull_request)",
-                    "status": "failure",
-                    "target_url": "https://git.example.test/ci-pr",
-                },
-                {
-                    "context": "CI / Platform (Go) (push)",
-                    "status": "success",
-                },
-                {
-                    "context": (
-                        "Handlers Postgres Integration / "
-                        "Handlers Postgres Integration (pull_request)"
-                    ),
-                    "status": "failure",
-                    "target_url": "https://git.example.test/handlers-pr",
-                },
-                {
-                    "context": (
-                        "Handlers Postgres Integration / "
-                        "Handlers Postgres Integration (push)"
-                    ),
-                    "status": "success",
-                },
-            ],
-        },
-        "db3b7a93e31adc0cb072a6d177d92dd73275a191",
-    )
-
-    assert counters["compensated_pr_shadowed_by_push_success"] == 2
-    assert posted == [
-        (
-            "db3b7a93e31adc0cb072a6d177d92dd73275a191",
-            "CI / Platform (Go) (pull_request)",
-            "https://git.example.test/ci-pr",
-            mod.PR_SHADOW_COMPENSATION_DESCRIPTION,
-            False,
-        ),
-        (
-            "db3b7a93e31adc0cb072a6d177d92dd73275a191",
-            "Handlers Postgres Integration / Handlers Postgres Integration (pull_request)",
-            "https://git.example.test/handlers-pr",
-            mod.PR_SHADOW_COMPENSATION_DESCRIPTION,
-            False,
-        ),
-    ]
-
-
-def test_reap_preserves_failed_pr_context_without_push_success(monkeypatch):
-    mod = load_reaper()
-    posted = []
-    monkeypatch.setattr(
-        mod,
-        "post_compensating_status",
-        lambda sha, context, target_url, *, description="", dry_run=False: posted.append(
-            context
-        ),
-    )
-
-    counters = mod.reap(
-        {"CI": True},
-        {
-            "statuses": [
-                {
-                    "context": "CI / Platform (Go) (pull_request)",
-                    "status": "failure",
-                },
-                {
-                    "context": "CI / Platform (Go) (push)",
-                    "status": "failure",
-                },
-                {
-                    "context": "CI / Shellcheck (pull_request)",
-                    "status": "failure",
-                },
-            ],
-        },
-        "db3b7a93e31adc0cb072a6d177d92dd73275a191",
-    )
-
-    assert counters["preserved_pr_without_push_success"] == 2
-    assert posted == []

.gitea/sop-checklist-config.yaml

@@ -107,39 +107,3 @@ items:
     description: >-
       List of feedback memories applicable to this change. Ack from
       any engineer who has the same memory access.
-
-# N/A gate declarations (RFC#324 §N/A follow-up).
-# PRs where a gate genuinely does not apply (e.g., pure-infra with no
-# qa surface, or docs-only) can be declared N/A by a non-author peer
-# who is in one of the gate's required_teams. The sop-checklist
-# posts a `sop-checklist / na-declarations (pull_request)` status that
-# review-check.sh reads to skip the Gitea-APPROVE requirement.
-#
-# Usage: any PR commenter (peer) posts:
-#   /sop-n/a qa-review  <reason>
-#   /sop-n/a security-review  <reason>
-#
-# Slash commands:
-#   /sop-n/a <gate> [reason] — declare gate N/A (most-recent per-user wins)
-#   /sop-revoke <gate>      — revoke prior N/A declaration for that gate
-#
-# Gate names must match the context strings used by review-check.sh:
-#   qa-review      → qa-review / approved (<event>)        [TEAM_ID=20]
-#   security-review → security-review / approved (<event>)  [TEAM_ID=21]
-#
-# required_teams: OR semantics — any team member can declare N/A.
-# Authors cannot self-declare N/A (enforced by gate script).
-n/a_gates:
-  qa-review:
-    required_teams: [qa, security, engineers]
-    description: >-
-      QA review N/A when this change has no qa surface (pure-infra,
-      tooling-only, revert, dependency-only). A qa/eng/security member
-      must post /sop-n/a qa-review to activate.
-
-  security-review:
-    required_teams: [security, managers, ceo]
-    description: >-
-      Security review N/A when this change has no security surface
-      (docs-only, pure-frontend, dependency-only). A security/owners
-      member must post /sop-n/a security-review to activate.

.gitea/workflows/audit-force-merge.yml

@@ -52,7 +52,10 @@ jobs:
           # Declared here rather than fetched from /branch_protections
           # because that endpoint requires admin write — sop-tier-bot is
           # read-only by design (least-privilege).
+          #
+          # staging branch protection (§F3a/F3b, mc#798): only
+          # sop-checklist / all-items-acked is required.  Unlike main,
+          # staging does not require sop-tier-check or Secret scan.
           REQUIRED_CHECKS: |
-            CI / all-required (pull_request)
             sop-checklist / all-items-acked (pull_request)
         run: bash .gitea/scripts/audit-force-merge.sh

.gitea/workflows/cascade-list-drift-gate.yml

@@ -43,7 +43,6 @@ permissions:
   contents: read
 
 jobs:
-  # bp-exempt: drift visibility gate; CI / all-required remains the required aggregate.
   check:
     runs-on: ubuntu-latest
     # Phase 3 (RFC #219 §1): surface broken workflows without blocking

.gitea/workflows/ci.yml

@@ -107,25 +107,16 @@ jobs:
             echo "scripts=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
-          # Workflow-only edits are covered by the workflow lint family
-          # and by this workflow's always-present required jobs. Do not fan
-          # those edits out into Go/Canvas/Python/shellcheck work; the
-          # downstream jobs still emit their required contexts via no-op
-          # steps when their surface flag is false.
-          #
-          # If the diff itself cannot be trusted, fail open by running every
-          # surface instead of silently under-testing the PR.
-          if ! DIFF=$(git diff --name-only "$BASE" HEAD 2>/dev/null); then
-            echo "platform=true" >> "$GITHUB_OUTPUT"
-            echo "canvas=true" >> "$GITHUB_OUTPUT"
-            echo "python=true" >> "$GITHUB_OUTPUT"
-            echo "scripts=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          echo "platform=$(echo "$DIFF" | grep -qE '^workspace-server/' && echo true || echo false)" >> "$GITHUB_OUTPUT"
-          echo "canvas=$(echo "$DIFF" | grep -qE '^canvas/' && echo true || echo false)" >> "$GITHUB_OUTPUT"
-          echo "python=$(echo "$DIFF" | grep -qE '^workspace/' && echo true || echo false)" >> "$GITHUB_OUTPUT"
-          echo "scripts=$(echo "$DIFF" | grep -qE '^tests/e2e/|^scripts/|^infra/scripts/' && echo true || echo false)" >> "$GITHUB_OUTPUT"
+          # Both .github/workflows/ci.yml AND .gitea/workflows/ci.yml count
+          # as "this workflow changed" — either edit should force-run every
+          # downstream job. The Gitea port follows the same shape as the
+          # GitHub original so behavior matches when triggered on either
+          # platform.
+          DIFF=$(git diff --name-only "$BASE" HEAD 2>/dev/null || echo ".gitea/workflows/ci.yml")
+          echo "platform=$(echo "$DIFF" | grep -qE '^workspace-server/|^\.gitea/workflows/ci\.yml$|^\.github/workflows/ci\.yml$' && echo true || echo false)" >> "$GITHUB_OUTPUT"
+          echo "canvas=$(echo "$DIFF" | grep -qE '^canvas/|^\.gitea/workflows/ci\.yml$|^\.github/workflows/ci\.yml$' && echo true || echo false)" >> "$GITHUB_OUTPUT"
+          echo "python=$(echo "$DIFF" | grep -qE '^workspace/|^\.gitea/workflows/ci\.yml$|^\.github/workflows/ci\.yml$' && echo true || echo false)" >> "$GITHUB_OUTPUT"
+          echo "scripts=$(echo "$DIFF" | grep -qE '^tests/e2e/|^scripts/|^infra/scripts/|^\.gitea/workflows/ci\.yml$|^\.github/workflows/ci\.yml$' && echo true || echo false)" >> "$GITHUB_OUTPUT"
 
   # Platform (Go) — Go build/vet/test/lint + coverage gates. The always-run
   # + per-step gating shape preserves the GitHub-side required-check name
@@ -133,49 +124,59 @@ 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
-    # Phase-3-masked "green on main 2026-05-12". Two failure classes then surfaced:
-    #   (1) 4x delegation_test.go sqlmock gaps (PR #669 / #634 fix-forward, closed).
-    #   (2) TestMCPHandler_CommitMemory_GlobalScope_Blocked (mcp_test.go:433):
-    #       OFFSEC-001 hardening collided with test assertion; tracked in mc#762.
-    # Fix-forward for (1) landed in PR #669. The mc#762 gap (2) is a separate
-    # issue — it does NOT block this flip because the test is already wrapped in
-    # the diagnostic step with its own continue-on-error: true (line 203).
-    # Flip confirmed by CI / Platform (Go) status = success on main HEAD 363905d3.
-    continue-on-error: false
-    # Job-level ceiling. The go test step below runs with a per-step 10m timeout;
-    # this cap catches any step that leaks past that. Set well above 10m so
-    # the per-step timeout is the active constraint.
-    timeout-minutes: 15
+    # mc#774 (interim): re-mask platform-build pending fix-forward. Phase 4
+    # (#656) flipped this to continue-on-error: false based on a Phase-3-masked
+    # "green on main 2026-05-12" — the prior continue-on-error: true had
+    # been hiding failing tests in workspace-server/internal/handlers/.
+    # Two distinct failure classes surfaced on 0e5152c3:
+    #   (1) 4x delegation_test.go (lines 1110/1176/1228/1271): helpers
+    #       expectExecuteDelegationBase/Success/Failed are missing sqlmock
+    #       expectations for queries production has issued since ~2026-04-21
+    #       (last_outbound_at UPDATE, lookupDeliveryMode/Runtime SELECTs,
+    #       a2a_receive INSERT activity_logs, recordLedgerStatus writes).
+    #       Halt cond #3 applies (regression > 7 days → broader sweep).
+    #   (2) 1x mcp_test.go:433 (TestMCPHandler_CommitMemory_GlobalScope_Blocked):
+    #       commit 7d1a189f (2026-05-10) hardened mcp.go to scrub err.Error()
+    #       from JSON-RPC responses (OFFSEC-001), but the test asserts the
+    #       error message contains "GLOBAL". Production-vs-test contract
+    #       collision — needs design call, not mock update.
+    # Time-boxed Option A (90 min) did not fit the cross-cutting scope.
+    # This is a sequenced revert→fix→reflip per
+    # feedback_strict_root_only_after_class_a emergency clause — NOT
+    # a permanent re-mask. Re-flip blocked on mc#774 fix-forward landing.
+    # Other 4 #656 flips (changes, canvas-build, shellcheck, python-lint)
+    # retain continue-on-error: false; only platform-build regresses.
+    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
+    continue-on-error: true  # mc#774 fix-forward in flight; re-flip when mc#774 lands (PR #669 → rebase after #709)
     defaults:
       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,15 +192,11 @@ 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
-        # lets the suite complete on cold cache (~5-7m) while failing cleanly
-        # instead of OOM-killing. The job-level timeout (15m) is a backstop.
-        run: go test -race -timeout 10m -coverprofile=coverage.out ./...
+        run: go test -race -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 +210,7 @@ jobs:
                    END {for (f in s) printf "%6.1f%%  %s\n", s[f]/c[f], f}' \
             | sort -n
 
-      - if: always()
+      - if: needs.changes.outputs.platform == 'true'
         name: Check coverage thresholds
         # Enforces two gates from #1823 Layer 1:
         #   1. Total floor (25% — ratchet plan in COVERAGE_FLOOR.md).
@@ -301,28 +298,28 @@ jobs:
   # siblings — verified empirically on PR #2314).
   canvas-build:
     name: Canvas (Next.js)
+    needs: changes
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     # Phase 4 (RFC #219 §1): confirmed green on main 2026-05-12.
     continue-on-error: false
     defaults:
       run:
         working-directory: canvas
     steps:
-      - if: false
+      - if: needs.changes.outputs.canvas != 'true'
         working-directory: .
         run: echo "No canvas/** changes — skipping real build steps; this job always runs to satisfy the required-check name on branch protection."
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: '22'
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
         run: rm -f package-lock.json && npm install
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
         run: npm run build
-      - if: always()
+      - if: needs.changes.outputs.canvas == 'true'
         name: Run tests with coverage
         # Coverage instrumentation is configured in canvas/vitest.config.ts
         # (provider: v8, reporters: text + html + json-summary). Step 2 of
@@ -331,7 +328,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
@@ -348,15 +345,16 @@ jobs:
   # Shellcheck (E2E scripts) — required check, always runs.
   shellcheck:
     name: Shellcheck (E2E scripts)
+    needs: changes
     runs-on: ubuntu-latest
     # Phase 4 (RFC #219 §1): confirmed green on main 2026-05-12.
     continue-on-error: false
     steps:
-      - if: false
+      - if: needs.changes.outputs.scripts != 'true'
         run: echo "No tests/e2e/ or infra/scripts/ changes — skipping real shellcheck; this job always runs to satisfy the required-check name on branch protection."
-      - if: always()
+      - if: needs.changes.outputs.scripts == 'true'
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - if: always()
+      - if: needs.changes.outputs.scripts == 'true'
         name: Run shellcheck on tests/e2e/*.sh and infra/scripts/*.sh
         # shellcheck is pre-installed on ubuntu-latest runners (via apt).
         # infra/scripts/ is included because setup.sh + nuke.sh gate the
@@ -367,66 +365,32 @@ jobs:
           find tests/e2e infra/scripts -type f -name '*.sh' -print0 \
             | xargs -0 shellcheck --severity=warning
 
-      - if: always()
+      - if: needs.changes.outputs.scripts == 'true'
         name: Lint cleanup-trap hygiene (RFC #2873)
         run: bash tests/e2e/lint_cleanup_traps.sh
 
-      - if: always()
+      - if: needs.changes.outputs.scripts == 'true'
         name: Run E2E bash unit tests (no live infra)
         run: |
           bash tests/e2e/test_model_slug.sh
 
-      - if: always()
-        name: Test ECR promote-tenant-image script (mock-driven, no live infra)
-        # Covers scripts/promote-tenant-image.sh — the codified
-        # :staging-latest → :latest ECR promote + tenant fleet redeploy
-        # closing molecule-ai/molecule-core#660. 40 mock-driven cases
-        # exercise every exit path (preflight, snapshot, promote, redeploy
-        # 403→SSM-refresh, verify, rollback). No live AWS/CP/SSM calls.
-        run: |
-          bash scripts/test-promote-tenant-image.sh
-
-      - if: always()
-        name: Shellcheck promote-tenant-image script
-        # scripts/ is excluded from the bulk shellcheck pass above (legacy
-        # SC3040/SC3043 cleanup pending). Run shellcheck explicitly on
-        # the promote script + its test harness so regressions there are
-        # caught by the required check.
-        run: |
-          shellcheck --severity=warning \
-            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
-    # mc#774 root-fix: added job-level `if:` so ci-required-drift.py's
-    # ci_job_names() detects this as github.ref-gated and skips it from F1.
-    # 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.
-    # Runs on both main and staging pushes; step exits 0 when not applicable.
-    if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging' }}
+    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
+    continue-on-error: true
     needs: [changes, canvas-build]
+    # Only fires on direct pushes to main (i.e. after staging→main promotion).
+    if: needs.changes.outputs.canvas == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
       - name: Write deploy reminder to step summary
         env:
           COMMIT_SHA: ${{ github.sha }}
-          CANVAS_CHANGED: ${{ needs.changes.outputs.canvas }}
-          EVENT_NAME: ${{ github.event_name }}
-          REF_NAME: ${{ github.ref }}
           # github.server_url resolves via the workflow-level env override
           # to the Gitea instance, so the RUN_URL points at the Gitea run
           # page (not github.com). See feedback_act_runner_github_server_url.
           RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         run: |
-          set -euo pipefail
-          if [ "$CANVAS_CHANGED" != "true" ] || [ "$EVENT_NAME" != "push" ] || [ "$REF_NAME" != "refs/heads/main" ]; then
-            echo "Canvas deploy reminder not applicable for event=$EVENT_NAME ref=$REF_NAME canvas_changed=$CANVAS_CHANGED."
-            exit 0
-          fi
-
           # Write body to a temp file — avoids backtick escaping in shell.
           cat > /tmp/deploy-reminder.md << 'BODY'
           ## Canvas build passed — deploy required
@@ -458,6 +422,7 @@ jobs:
   # Python Lint & Test — required check, always runs.
   python-lint:
     name: Python Lint & Test
+    needs: changes
     runs-on: ubuntu-latest
     # Phase 4 (RFC #219 §1): confirmed green on main 2026-05-12.
     continue-on-error: false
@@ -467,25 +432,25 @@ jobs:
       run:
         working-directory: workspace
     steps:
-      - if: false
+      - if: needs.changes.outputs.python != 'true'
         working-directory: .
         run: echo "No workspace/** changes — skipping real lint+test; this job always runs to satisfy the required-check name on branch protection."
-      - if: always()
+      - if: needs.changes.outputs.python == 'true'
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - if: always()
+      - if: needs.changes.outputs.python == 'true'
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: '3.11'
           cache: pip
           cache-dependency-path: workspace/requirements.txt
-      - if: always()
+      - if: needs.changes.outputs.python == 'true'
         run: pip install -r requirements.txt pytest pytest-asyncio pytest-cov sqlalchemy>=2.0.0
       # Coverage flags + fail-under floor moved into workspace/pytest.ini
       # (issue #1817) so local `pytest` and CI use identical config.
-      - if: always()
+      - if: needs.changes.outputs.python == 'true'
         run: python -m pytest --tb=short
 
-      - if: always()
+      - if: needs.changes.outputs.python == 'true'
         name: Per-file critical-path coverage (MCP / inbox / auth)
         # MCP-critical Python files have a per-file floor on top of the
         # 86% total floor in pytest.ini. See issue #2790 for full rationale.
@@ -550,104 +515,85 @@ jobs:
     # red silently merged through. See internal#286 for the three concrete
     # tonight-of-2026-05-11 incidents that prompted the emergency bump.
     #
-    # This job deliberately has no `needs:`. Gitea 1.22/act_runner can mark a
-    # job-level `if: always()` + `needs:` sentinel as skipped before upstream
-    # jobs settle, leaving branch protection with a permanent pending
-    # `CI / all-required` context. Instead, this independent sentinel polls the
-    # required commit-status contexts for this SHA and fails if any fail, skip,
-    # or never emit.
+    # Three properties of this job each close a failure mode:
     #
-    # canvas-deploy-reminder is intentionally NOT included in all-required.needs.
-    # It is an informational main-push reminder, not a PR quality gate. Keeping
-    # it in this dependency list lets a skipped reminder skip the required
-    # sentinel before the `always()` guard can emit a branch-protection status.
+    #  1. `if: always()` — runs even when an upstream fails. Without it the
+    #     sentinel is `skipped` and protection treats that as missing → merge
+    #     ungated.
     #
+    #  2. Assertion is `result == "success"` per dep, NOT `!= "failure"`.
+    #     A `skipped` upstream (job gated by `if:` evaluating false, matrix
+    #     entry that couldn't run) must NOT silently pass through.
+    #     `skipped`-as-green is exactly the failure mode this gate closes.
+    #
+    #  3. `needs:` is the canonical list of "what counts as required."
+    #     status_check_contexts will reference only `ci/all-required` (Step 5
+    #     follow-up — branch-protection PATCH is Owners-tier per
+    #     `feedback_never_admin_merge_bypass`, separate PR); a new job is
+    #     added simply by listing it in `needs:` here.
+    #     `.gitea/workflows/ci-required-drift.yml` files a [ci-drift] issue
+    #     hourly if this list diverges from status_check_contexts or from
+    #     audit-force-merge.yml's REQUIRED_CHECKS env (RFC §4 + §6).
+    #
+    # Excluded from `needs:`: `canvas-deploy-reminder` — gated by
+    # `if: ... github.event_name == 'push' && github.ref == 'refs/heads/main'`,
+    # so on PR events it's legitimately `skipped`. The drift detector
+    # explicitly excludes `github.event_name`-gated jobs from F1 (see
+    # `.gitea/scripts/ci-required-drift.py::ci_job_names`).
+    #
+    # 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)
+    # (Gitea suppresses status reporting for CoE jobs). This sentinel
+    # runs with continue-on-error: false so it always reports its
+    # result to the API — without this, the required-status entry
+    # (CI / all-required (pull_request)) is never created, which
+    # blocks PR merges. When Phase 3 ends, flip underlying jobs to
+    # continue-on-error: false; this sentinel can then be flipped to
+    # continue-on-error: true if a Phase-4 regression requires it.
     continue-on-error: false
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    timeout-minutes: 1
+    needs:
+      - changes
+      - platform-build
+      - canvas-build
+      - shellcheck
+      - python-lint
+    if: always()
     steps:
-      - name: Wait for required CI contexts
-        env:
-          GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          API_ROOT: ${{ github.server_url }}/api/v1
-          REPOSITORY: ${{ github.repository }}
-          COMMIT_SHA: ${{ github.sha }}
-          EVENT_NAME: ${{ github.event_name }}
+      - name: Assert every required dependency succeeded
         run: |
           set -euo pipefail
-          python3 - <<'PY'
-          import json
-          import os
-          import sys
-          import time
-          import urllib.error
-          import urllib.request
-
-          token = os.environ["GITEA_TOKEN"]
-          api_root = os.environ["API_ROOT"].rstrip("/")
-          repo = os.environ["REPOSITORY"]
-          sha = os.environ["COMMIT_SHA"]
-          event = os.environ["EVENT_NAME"]
-          required = [
-              f"CI / Detect changes ({event})",
-              f"CI / Platform (Go) ({event})",
-              f"CI / Canvas (Next.js) ({event})",
-              f"CI / Shellcheck (E2E scripts) ({event})",
-              f"CI / Python Lint & Test ({event})",
-          ]
-          terminal_bad = {"failure", "error"}
-          deadline = time.time() + 40 * 60
-          last_summary = None
-
-          def fetch_statuses():
-              statuses = []
-              for page in range(1, 6):
-                  url = f"{api_root}/repos/{repo}/commits/{sha}/statuses?page={page}&limit=100"
-                  req = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
-                  with urllib.request.urlopen(req, timeout=10) as resp:
-                      chunk = json.load(resp)
-                  if not chunk:
-                      break
-                  statuses.extend(chunk)
-              latest = {}
-              for item in statuses:
-                  ctx = item.get("context")
-                  if not ctx:
-                      continue
-                  prev = latest.get(ctx)
-                  if prev is None or (item.get("updated_at") or item.get("created_at") or "") >= (prev.get("updated_at") or prev.get("created_at") or ""):
-                      latest[ctx] = item
-              return latest
-
-          while True:
-              try:
-                  latest = fetch_statuses()
-              except (TimeoutError, OSError, urllib.error.URLError) as exc:
-                  if time.time() >= deadline:
-                      print(f"FAIL: status polling did not recover before deadline: {exc}", file=sys.stderr)
-                      sys.exit(1)
-                  print(f"WARN: status poll failed, retrying: {exc}", flush=True)
-                  time.sleep(15)
-                  continue
-              states = {ctx: (latest.get(ctx) or {}).get("status") or (latest.get(ctx) or {}).get("state") or "missing" for ctx in required}
-              summary = ", ".join(f"{ctx}={state}" for ctx, state in states.items())
-              if summary != last_summary:
-                  print(summary, flush=True)
-                  last_summary = summary
-              bad = {ctx: state for ctx, state in states.items() if state in terminal_bad}
-              if bad:
-                  print("FAIL: required CI context failed:", file=sys.stderr)
-                  for ctx, state in bad.items():
-                      desc = (latest.get(ctx) or {}).get("description") or ""
-                      print(f"  - {ctx}: {state} {desc}", file=sys.stderr)
-                  sys.exit(1)
-              if all(state == "success" for state in states.values()):
-                  print(f"OK: all {len(required)} required CI contexts succeeded")
-                  sys.exit(0)
-              if time.time() >= deadline:
-                  print("FAIL: timed out waiting for required CI contexts:", file=sys.stderr)
-                  for ctx, state in states.items():
-                      print(f"  - {ctx}: {state}", file=sys.stderr)
-                  sys.exit(1)
-              time.sleep(15)
-          PY
+          # `needs.*.result` is one of: success | failure | cancelled | skipped | null.
+          # We assert success per dep (not != failure) — see RFC §2 reasoning above.
+          # Null results are skipped: they come from Phase 3 (continue-on-error: true
+          # suppresses status) or from jobs still in-flight. The sentinel succeeds
+          # rather than blocking PRs on Phase 3 noise.
+          results='${{ toJSON(needs) }}'
+          echo "$results"
+          echo "$results" | python3 -c '
+          import json, sys
+          ns = json.load(sys.stdin)
+          # Phase 3 masked: jobs with continue-on-error: true may report "failure"
+          # Remove when mc#774 handler test failures are resolved.
+          PHASE3_MASKED = {"platform-build"}
+          # Exclude null (Phase 3 suppressed / in-flight) from the bad list.
+          bad = [(k, v.get("result")) for k, v in ns.items()
+                 if v.get("result") not in ("success", None, "cancelled", "skipped") and k not in PHASE3_MASKED]
+          if bad:
+              print(f"FAIL: jobs not green:", file=sys.stderr)
+              for k, r in bad:
+                  print(f"  - {k}: {r}", file=sys.stderr)
+              sys.exit(1)
+          pending = [(k, v.get("result")) for k, v in ns.items()
+                     if v.get("result") is None]
+          cancelled = [(k, v.get("result")) for k, v in ns.items()
+                       if v.get("result") == "cancelled"]
+          if pending:
+              print(f"WARN: {len(pending)} job(s) still in-flight (result=null): " +
+                    ", ".join(k for k, _ in pending), file=sys.stderr)
+          if cancelled:
+              print(f"INFO: {len(cancelled)} job(s) masked by continue-on-error: " +
+                    ", ".join(k for k, _ in cancelled), file=sys.stderr)
+          print(f"OK: all {len(ns)} required jobs succeeded (or Phase-3 suppressed)")
+          '

.gitea/workflows/e2e-api.yml

@@ -69,13 +69,6 @@ name: E2E API Smoke Test
 # 2318) shows Postgres ready in 3s, Redis in 1s, Platform in 1s when
 # they DO come up. Timeouts are not the bottleneck; not bumped.
 #
-# Item #1046 (fixed 2026-05-14): Stale platform-server from cancelled runs
-#   lingers on :8080 after "Stop platform" step is skipped (workflow cancelled
-#   before reaching line 335). Added a pre-start "Kill stale platform-server"
-#   step (line 286) that scans /proc for zombie platform-server processes
-#   and kills them before the port probe or bind. Makes the ephemeral port
-#   probe + start sequence deterministic.
-#
 # Item explicitly NOT fixed here: failing test `Status back online`
 # fails because the platform's langgraph workspace template image
 # (ghcr.io/molecule-ai/workspace-template-langgraph:latest) returns
@@ -290,35 +283,6 @@ jobs:
           echo "PORT=${PLATFORM_PORT}" >> "$GITHUB_ENV"
           echo "BASE=http://127.0.0.1:${PLATFORM_PORT}" >> "$GITHUB_ENV"
           echo "Platform host port: ${PLATFORM_PORT}"
-      - name: Kill stale platform-server before start (issue #1046)
-        if: needs.detect-changes.outputs.api == 'true'
-        run: |
-          # Concurrent runs on the same host-network act_runner can leave a
-          # zombie platform-server from a cancelled/timeout run. Cancelled
-          # runs never reach the "Stop platform" step (line 335), so the
-          # old process lingers. Kill it before the ephemeral port probe
-          # or start so the port is definitively free.
-          #
-          # /proc scan — works on any Linux without pkill/lsof/ss.
-          # comm field is truncated to 15 chars: "platform-serve" matches
-          # "platform-server". Verify with cmdline to avoid false positives.
-          killed=0
-          for pid in $(grep -l "platform-serve" /proc/[0-9]*/comm 2>/dev/null); do
-            kpid="${pid%/comm}"
-            kpid="${kpid##*/}"
-            cmdline=$(cat "/proc/${kpid}/cmdline" 2>/dev/null | tr '\0' ' ')
-            if echo "$cmdline" | grep -q "platform-server"; then
-              echo "Killing stale platform-server pid ${kpid}: ${cmdline}"
-              kill "$kpid" 2>/dev/null || true
-              killed=$((killed + 1))
-            fi
-          done
-          if [ "$killed" -gt 0 ]; then
-            sleep 2
-            echo "Killed $killed stale process(es); port(s) released."
-          else
-            echo "No stale platform-server found."
-          fi
       - name: Start platform (background)
         if: needs.detect-changes.outputs.api == 'true'
         working-directory: workspace-server
@@ -382,4 +346,3 @@ jobs:
         run: |
           docker rm -f "$PG_CONTAINER" 2>/dev/null || true
           docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true
-

.gitea/workflows/e2e-chat.yml

@@ -1,288 +0,0 @@
-name: E2E Chat
-
-# Comprehensive Playwright E2E for the unified chat stack (desktop
-# ChatTab + mobile MobileChat). Runs on every PR that touches canvas,
-# workspace-server, or this workflow file.
-#
-# Architecture:
-#   1. Ephemeral Postgres + Redis (docker, unique container names)
-#   2. workspace-server built from source, started with
-#      MOLECULE_ENV=development (fail-open auth)
-#   3. canvas dev server (npm run dev) on :3000
-#   4. Playwright tests create workspaces via API, point them at an
-#      in-process echo runtime, and exercise the full send/receive
-#      round-trip through the browser.
-#
-# Parallel-safety: same pattern as e2e-api.yml — per-run container names
-# and ephemeral host ports so concurrent jobs on the host-network runner
-# don't collide.
-
-on:
-  push:
-    branches: [main, staging]
-  pull_request:
-    branches: [main, staging]
-
-concurrency:
-  group: e2e-chat-${{ github.event.pull_request.head.sha || github.sha }}
-  cancel-in-progress: false
-
-env:
-  GITHUB_SERVER_URL: https://git.moleculesai.app
-
-jobs:
-  # bp-exempt: helper job; real gate is E2E Chat / E2E Chat (pull_request)
-  detect-changes:
-    runs-on: ubuntu-latest
-    # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
-    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
-    continue-on-error: true
-    outputs:
-      chat: ${{ steps.decide.outputs.chat }}
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-      - id: decide
-        run: |
-          BASE="${GITHUB_BASE_REF:-${{ github.event.before }}}"
-          if [ "${{ github.event_name }}" = "pull_request" ] && [ -n "${{ github.event.pull_request.base.sha }}" ]; then
-            BASE="${{ github.event.pull_request.base.sha }}"
-          fi
-          if [ -z "$BASE" ] || echo "$BASE" | grep -qE '^0+$'; then
-            echo "chat=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          if ! git cat-file -e "$BASE" 2>/dev/null; then
-            git fetch --depth=1 origin "$BASE" 2>/dev/null || true
-          fi
-          if ! git cat-file -e "$BASE" 2>/dev/null; then
-            echo "chat=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          CHANGED=$(git diff --name-only "$BASE" HEAD)
-          if echo "$CHANGED" | grep -qE '^(canvas/|workspace-server/|\.gitea/workflows/e2e-chat\.yml$)'; then
-            echo "chat=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "chat=false" >> "$GITHUB_OUTPUT"
-          fi
-
-  # bp-required: pending #1142 — new E2E check; add to branch protection after 3 green runs.
-  e2e-chat:
-    needs: detect-changes
-    name: E2E Chat
-    runs-on: ubuntu-latest
-    # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
-    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
-    continue-on-error: true
-    timeout-minutes: 15
-    env:
-      PG_CONTAINER: pg-e2e-chat-${{ github.run_id }}-${{ github.run_attempt }}
-      REDIS_CONTAINER: redis-e2e-chat-${{ github.run_id }}-${{ github.run_attempt }}
-    steps:
-      - name: No-op pass (paths filter excluded this commit)
-        if: needs.detect-changes.outputs.chat != 'true'
-        run: |
-          echo "No canvas / workspace-server / workflow changes — E2E Chat gate satisfied without running tests."
-          echo "::notice::E2E Chat no-op pass (paths filter excluded this commit)."
-
-      - if: needs.detect-changes.outputs.chat == 'true'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - if: needs.detect-changes.outputs.chat == 'true'
-        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
-        with:
-          go-version: 'stable'
-          cache: true
-          cache-dependency-path: workspace-server/go.sum
-
-      - if: needs.detect-changes.outputs.chat == 'true'
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: canvas/package-lock.json
-
-      - name: Start Postgres (docker)
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-          docker run -d --name "$PG_CONTAINER" \
-            -e POSTGRES_USER=dev -e POSTGRES_PASSWORD=dev -e POSTGRES_DB=molecule \
-            -p 0:5432 postgres:16 >/dev/null
-          PG_PORT=$(docker port "$PG_CONTAINER" 5432/tcp | awk -F: '/^0\.0\.0\.0:/ {print $2; exit}')
-          if [ -z "$PG_PORT" ]; then
-            PG_PORT=$(docker port "$PG_CONTAINER" 5432/tcp | head -1 | awk -F: '{print $NF}')
-          fi
-          if [ -z "$PG_PORT" ]; then
-            echo "::error::Could not resolve host port for $PG_CONTAINER"
-            exit 1
-          fi
-          echo "PG_PORT=${PG_PORT}" >> "$GITHUB_ENV"
-          echo "DATABASE_URL=postgres://dev:dev@127.0.0.1:${PG_PORT}/molecule?sslmode=disable" >> "$GITHUB_ENV"
-          echo "E2E_DATABASE_URL=postgres://dev:dev@127.0.0.1:${PG_PORT}/molecule?sslmode=disable" >> "$GITHUB_ENV"
-          for i in $(seq 1 30); do
-            if docker exec "$PG_CONTAINER" pg_isready -U dev >/dev/null 2>&1; then
-              echo "Postgres ready after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Postgres did not become ready in 30s"
-          exit 1
-
-      - name: Start Redis (docker)
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true
-          docker run -d --name "$REDIS_CONTAINER" -p 0:6379 redis:7 >/dev/null
-          REDIS_PORT=$(docker port "$REDIS_CONTAINER" 6379/tcp | awk -F: '/^0\.0\.0\.0:/ {print $2; exit}')
-          if [ -z "$REDIS_PORT" ]; then
-            REDIS_PORT=$(docker port "$REDIS_CONTAINER" 6379/tcp | head -1 | awk -F: '{print $NF}')
-          fi
-          if [ -z "$REDIS_PORT" ]; then
-            echo "::error::Could not resolve host port for $REDIS_CONTAINER"
-            exit 1
-          fi
-          echo "REDIS_PORT=${REDIS_PORT}" >> "$GITHUB_ENV"
-          echo "REDIS_URL=redis://127.0.0.1:${REDIS_PORT}" >> "$GITHUB_ENV"
-          for i in $(seq 1 15); do
-            if docker exec "$REDIS_CONTAINER" redis-cli ping 2>/dev/null | grep -q PONG; then
-              echo "Redis ready after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Redis did not become ready in 15s"
-          exit 1
-
-      - name: Build platform
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: workspace-server
-        run: go build -o platform-server ./cmd/server
-
-      - name: Pick platform port
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          PLATFORM_PORT=$(python3 - <<'PY'
-          import socket
-          with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-              s.bind(("127.0.0.1", 0))
-              print(s.getsockname()[1])
-          PY
-          )
-          echo "PLATFORM_PORT=${PLATFORM_PORT}" >> "$GITHUB_ENV"
-          echo "E2E_PLATFORM_URL=http://127.0.0.1:${PLATFORM_PORT}" >> "$GITHUB_ENV"
-          echo "Platform host port: ${PLATFORM_PORT}"
-
-      - name: Pick canvas port
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          CANVAS_PORT=$(python3 - <<'PY'
-          import socket
-          with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-              s.bind(("127.0.0.1", 0))
-              print(s.getsockname()[1])
-          PY
-          )
-          echo "CANVAS_PORT=${CANVAS_PORT}" >> "$GITHUB_ENV"
-          echo "Canvas host port: ${CANVAS_PORT}"
-
-      - name: Start platform (background)
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: workspace-server
-        run: |
-          export MOLECULE_ENV=development
-          export DATABASE_URL="${DATABASE_URL}"
-          export REDIS_URL="${REDIS_URL}"
-          export PORT="${PLATFORM_PORT}"
-          export CORS_ORIGINS="http://localhost:3000,http://localhost:3001,http://localhost:${CANVAS_PORT},http://127.0.0.1:${CANVAS_PORT}"
-          ./platform-server > platform.log 2>&1 &
-          echo $! > platform.pid
-
-      - name: Wait for /health
-        if: needs.detect-changes.outputs.chat == 'true'
-        run: |
-          for i in $(seq 1 30); do
-            if curl -sf "http://127.0.0.1:${PLATFORM_PORT}/health" > /dev/null; then
-              echo "Platform up after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Platform did not become healthy in 30s"
-          cat workspace-server/platform.log || true
-          exit 1
-
-      - name: Install canvas dependencies
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: npm ci
-
-      - name: Install Playwright browsers
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: npx playwright install --with-deps chromium
-
-      - name: Start canvas dev server (background)
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: |
-          export NEXT_PUBLIC_PLATFORM_URL="http://127.0.0.1:${PLATFORM_PORT}"
-          export NEXT_PUBLIC_WS_URL="ws://127.0.0.1:${PLATFORM_PORT}/ws"
-          npx next dev --turbopack -p "${CANVAS_PORT}" > canvas.log 2>&1 &
-          echo $! > canvas.pid
-          for i in $(seq 1 30); do
-            if curl -sf "http://localhost:${CANVAS_PORT}" > /dev/null 2>&1; then
-              echo "Canvas up after ${i}s"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "::error::Canvas did not start in 30s"
-          cat canvas.log || true
-          exit 1
-
-      - name: Run Playwright E2E tests
-        if: needs.detect-changes.outputs.chat == 'true'
-        working-directory: canvas
-        run: |
-          export E2E_PLATFORM_URL="http://127.0.0.1:${PLATFORM_PORT}"
-          export E2E_DATABASE_URL="${DATABASE_URL}"
-          export PLAYWRIGHT_BASE_URL="http://localhost:${CANVAS_PORT}"
-          npx playwright test e2e/chat-desktop.spec.ts e2e/chat-mobile.spec.ts
-
-      - name: Dump platform log on failure
-        if: failure() && needs.detect-changes.outputs.chat == 'true'
-        run: cat workspace-server/platform.log || true
-
-      - name: Dump canvas log on failure
-        if: failure() && needs.detect-changes.outputs.chat == 'true'
-        run: cat canvas/canvas.log || true
-
-      - name: Upload Playwright report
-        if: failure() && needs.detect-changes.outputs.chat == 'true'
-        uses: actions/upload-artifact@v3.2.2
-        with:
-          name: playwright-report-chat
-          path: canvas/playwright-report/
-
-      - name: Stop canvas
-        if: always() && needs.detect-changes.outputs.chat == 'true'
-        run: |
-          if [ -f canvas/canvas.pid ]; then
-            kill "$(cat canvas/canvas.pid)" 2>/dev/null || true
-          fi
-
-      - name: Stop platform
-        if: always() && needs.detect-changes.outputs.chat == 'true'
-        run: |
-          if [ -f workspace-server/platform.pid ]; then
-            kill "$(cat workspace-server/platform.pid)" 2>/dev/null || true
-          fi
-
-      - name: Stop service containers
-        if: always() && needs.detect-changes.outputs.chat == 'true'
-        run: |
-          docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-          docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true

.gitea/workflows/e2e-peer-visibility.yml

@@ -1,225 +0,0 @@
-name: E2E Peer Visibility (literal MCP list_peers)
-
-# WHY A DEDICATED WORKFLOW (not folded into e2e-staging-saas.yml)
-# --------------------------------------------------------------
-# This is the systemic fix for a real trust failure. Hermes and OpenClaw
-# were reported "fleet-verified / cascade-complete" because the *proxy*
-# signals were green (registry registration + heartbeat for Hermes; model
-# round-trip 200 for OpenClaw). A freshly-provisioned workspace asked on
-# canvas "can you see your peers" actually FAILS:
-#   - Hermes: 401 on the molecule MCP `list_peers` call
-#   - OpenClaw: native `sessions_list` fallback, sees no platform peers
-# Tasks #142/#159 were even marked "completed" under this proxy flaw.
-#
-# A dedicated workflow (vs extending e2e-staging-saas.yml) because:
-#   - It must provision MULTIPLE distinct runtimes (hermes, openclaw,
-#     claude-code) in ONE org and assert each sees the others. The
-#     full-saas script is single-runtime-per-run (E2E_RUNTIME) and folding
-#     a multi-runtime matrix into it would conflate concerns and bloat its
-#     already-45-min run.
-#   - It needs its own concurrency group so it doesn't fight full-saas /
-#     canvas for the staging org-creation quota.
-#   - It needs an independent, non-required status-context name so it can
-#     be RED today (the in-flight Hermes-401 / OpenClaw-MCP-wiring fixes
-#     have not landed) WITHOUT wedging unrelated merges — and flipped to
-#     REQUIRED in one branch-protection edit once it goes green
-#     (flip-to-required checklist: molecule-core#1296).
-#
-# THE ASSERTION IS NOT A PROXY. The driving script
-# tests/e2e/test_peer_visibility_mcp_staging.sh issues the byte-for-byte
-# JSON-RPC `tools/call name=list_peers` envelope to `POST
-# /workspaces/:id/mcp` using each workspace's OWN bearer token, through
-# the real WorkspaceAuth + MCPRateLimiter middleware chain — the exact
-# call mcp_molecule_list_peers makes from a canvas agent. It does NOT
-# read a registry row, /health, the heartbeat table, or
-# GET /registry/:id/peers.
-#
-# HONEST GATE — NO continue-on-error. Per feedback_fix_root_not_symptom a
-# fake-green mask would defeat the entire purpose. This workflow goes red
-# on today's broken behavior and green only when the root-cause fixes
-# actually land. It is intentionally NOT in branch_protections — see PR
-# body for the required-vs-not decision + flip tracking issue.
-#
-# Gitea 1.22.6 / act_runner notes honored:
-#   - No cross-repo `uses:` (feedback_gitea_cross_repo_uses_blocked). The
-#     actions/checkout SHA is the one e2e-staging-canvas.yml already uses
-#     successfully (a mirrored SHA — see #1277/PR#1292 root-cause).
-#   - Per-SHA concurrency, not global (feedback_concurrency_group_per_sha).
-#   - Workflow-level GITHUB_SERVER_URL pinned
-#     (feedback_act_runner_github_server_url).
-#   - pr-validate posts a status under the same check name so a
-#     workflow-only PR is not silently statusless and the context is
-#     flip-to-required-ready (mirrors e2e-staging-saas.yml's proven shape;
-#     real EC2-provisioning E2E is push/dispatch/cron only — it is 30+ min
-#     and cannot run per-PR-update).
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'workspace-server/internal/handlers/mcp.go'
-      - 'workspace-server/internal/handlers/mcp_tools.go'
-      - 'workspace-server/internal/middleware/**'
-      - 'workspace-server/internal/handlers/registry.go'
-      - 'workspace-server/internal/handlers/workspace.go'
-      - 'workspace/a2a_mcp_server.py'
-      - 'workspace/platform_tools/registry.py'
-      - 'tests/e2e/test_peer_visibility_mcp_staging.sh'
-      - '.gitea/workflows/e2e-peer-visibility.yml'
-  pull_request:
-    branches: [main]
-    paths:
-      - 'workspace-server/internal/handlers/mcp.go'
-      - 'workspace-server/internal/handlers/mcp_tools.go'
-      - 'workspace-server/internal/middleware/**'
-      - 'workspace-server/internal/handlers/registry.go'
-      - 'workspace-server/internal/handlers/workspace.go'
-      - 'workspace/a2a_mcp_server.py'
-      - 'workspace/platform_tools/registry.py'
-      - 'tests/e2e/test_peer_visibility_mcp_staging.sh'
-      - '.gitea/workflows/e2e-peer-visibility.yml'
-  workflow_dispatch:
-  schedule:
-    # 07:30 UTC daily — catches AMI / template-hermes / template-openclaw
-    # drift even on quiet days. Offset 30m from e2e-staging-saas (07:00)
-    # so the two don't collide on the staging org-creation quota.
-    - cron: '30 7 * * *'
-
-concurrency:
-  # Per-SHA (feedback_concurrency_group_per_sha). A single global group
-  # would let a queued staging/main push behind a PR run get cancelled,
-  # leaving any gate that reads "completed run at SHA" stuck.
-  group: e2e-peer-visibility-${{ github.event.pull_request.head.sha || github.sha }}
-  cancel-in-progress: false
-
-env:
-  GITHUB_SERVER_URL: https://git.moleculesai.app
-
-jobs:
-  # PR path: post a real status under the required-ready check name so a
-  # workflow-only PR is never silently statusless. The actual EC2 E2E is
-  # push/dispatch/cron only (30+ min). This is NOT a fake-green mask of
-  # the real assertion — it validates the driving script's bash syntax
-  # and inline-python so a broken test script fails at PR time.
-  pr-validate:
-    name: E2E Peer Visibility
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: Validate driving script
-        run: |
-          bash -n tests/e2e/test_peer_visibility_mcp_staging.sh
-          echo "test_peer_visibility_mcp_staging.sh — bash syntax OK"
-          echo "Real fresh-provision MCP list_peers E2E runs on push to"
-          echo "main / workflow_dispatch / daily cron (30+ min EC2 boot)."
-
-  # Real gate: provisions a throwaway org + sibling-per-runtime, drives
-  # the LITERAL list_peers MCP call per runtime, asserts 200 + expected
-  # peer set, then scoped teardown. push(main)/dispatch/cron only.
-  peer-visibility:
-    name: E2E Peer Visibility
-    runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
-    timeout-minutes: 60
-
-    env:
-      MOLECULE_CP_URL: https://staging-api.moleculesai.app
-      MOLECULE_ADMIN_TOKEN: ${{ secrets.CP_STAGING_ADMIN_API_TOKEN }}
-      # LLM provider key so each runtime can authenticate at boot.
-      # Priority MiniMax → direct-Anthropic → OpenAI matches
-      # test_staging_full_saas.sh's secrets-injection chain.
-      E2E_MINIMAX_API_KEY: ${{ secrets.MOLECULE_STAGING_MINIMAX_API_KEY }}
-      E2E_ANTHROPIC_API_KEY: ${{ secrets.MOLECULE_STAGING_ANTHROPIC_API_KEY }}
-      E2E_OPENAI_API_KEY: ${{ secrets.MOLECULE_STAGING_OPENAI_API_KEY }}
-      E2E_RUN_ID: "${{ github.run_id }}-${{ github.run_attempt }}"
-      PV_RUNTIMES: "hermes openclaw claude-code"
-
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Verify admin token present
-        run: |
-          if [ -z "$MOLECULE_ADMIN_TOKEN" ]; then
-            echo "::error::CP_STAGING_ADMIN_API_TOKEN secret not set (Railway staging CP_ADMIN_API_TOKEN)"
-            exit 2
-          fi
-          echo "Admin token present"
-
-      - name: Verify an LLM key present
-        run: |
-          if [ -z "${E2E_MINIMAX_API_KEY:-}" ] && [ -z "${E2E_ANTHROPIC_API_KEY:-}" ] && [ -z "${E2E_OPENAI_API_KEY:-}" ]; then
-            echo "::error::No LLM provider key set — workspaces fail at boot with 'No provider API key found'. Set MOLECULE_STAGING_MINIMAX_API_KEY (or ANTHROPIC / OPENAI)."
-            exit 2
-          fi
-          echo "LLM key present"
-
-      - name: CP staging health preflight
-        run: |
-          code=$(curl -sS -o /dev/null -w "%{http_code}" --max-time 10 "$MOLECULE_CP_URL/health")
-          if [ "$code" != "200" ]; then
-            echo "::error::Staging CP unhealthy (HTTP $code) — infra, not a workspace bug. Failing loud per feedback_fix_root_not_symptom."
-            exit 1
-          fi
-          echo "Staging CP healthy"
-
-      - name: Run fresh-provision peer-visibility E2E (literal MCP list_peers)
-        run: bash tests/e2e/test_peer_visibility_mcp_staging.sh
-
-      # Belt-and-braces scoped teardown: the script installs an EXIT/INT/
-      # TERM trap, but if the runner itself is cancelled the trap may not
-      # fire. This always() step deletes ONLY the e2e-pv-<run_id> org this
-      # run created — never a cluster-wide sweep
-      # (feedback_never_run_cluster_cleanup_tests_on_live_platform). The
-      # admin DELETE is idempotent so double-invoking is safe;
-      # sweep-stale-e2e-orgs is the final net (slug starts with 'e2e-').
-      - name: Teardown safety net (runs on cancel/failure)
-        if: always()
-        env:
-          ADMIN_TOKEN: ${{ secrets.CP_STAGING_ADMIN_API_TOKEN }}
-        run: |
-          set +e
-          orgs=$(curl -sS "$MOLECULE_CP_URL/cp/admin/orgs?limit=500" \
-            -H "Authorization: Bearer $ADMIN_TOKEN" 2>/dev/null \
-            | python3 -c "
-          import json, sys, os, datetime
-          run_id = os.environ.get('GITHUB_RUN_ID', '')
-          try:
-              d = json.load(sys.stdin)
-          except Exception:
-              print(''); sys.exit(0)
-          # ONLY sweep slugs from THIS run. e2e-pv-<YYYYMMDD>-<run_id>-...
-          # Sweep today AND yesterday's UTC date so a midnight-crossing run
-          # still matches its own slug (same bug class as the saas/canvas
-          # safety nets).
-          today = datetime.date.today()
-          yest = today - datetime.timedelta(days=1)
-          dates = (today.strftime('%Y%m%d'), yest.strftime('%Y%m%d'))
-          if run_id:
-              prefixes = tuple(f'e2e-pv-{dt}-{run_id}-' for dt in dates)
-          else:
-              prefixes = tuple(f'e2e-pv-{dt}-' for dt in dates)
-          orgs = d if isinstance(d, list) else d.get('orgs', [])
-          cands = [o['slug'] for o in orgs
-                   if any(o.get('slug','').startswith(p) for p in prefixes)
-                   and o.get('instance_status') not in ('purged',)]
-          print('\n'.join(cands))
-          " 2>/dev/null)
-          for slug in $orgs; do
-            echo "Safety-net teardown: $slug"
-            set +e
-            curl -sS -o /tmp/pv-cleanup.out -w "%{http_code}" \
-              -X DELETE "$MOLECULE_CP_URL/cp/admin/tenants/$slug" \
-              -H "Authorization: Bearer $ADMIN_TOKEN" \
-              -H "Content-Type: application/json" \
-              -d "{\"confirm\":\"$slug\"}" >/tmp/pv-cleanup.code
-            set -e
-            code=$(cat /tmp/pv-cleanup.code 2>/dev/null || echo "000")
-            if [ "$code" = "200" ] || [ "$code" = "204" ]; then
-              echo "[teardown] deleted $slug (HTTP $code)"
-            else
-              echo "::warning::pv teardown for $slug returned HTTP $code — sweep-stale-e2e-orgs will catch it within MAX_AGE_MINUTES. Body: $(head -c 300 /tmp/pv-cleanup.out 2>/dev/null)"
-            fi
-          done
-          exit 0

.gitea/workflows/gate-check-v3.yml

@@ -44,7 +44,6 @@ env:
   GITHUB_SERVER_URL: https://git.moleculesai.app
 
 jobs:
-  # bp-exempt: PR advisory bot; merge blocking is enforced by CI status and branch protection.
   gate-check:
     runs-on: ubuntu-latest
     # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
@@ -64,7 +63,6 @@ jobs:
         if: github.event_name == 'pull_request_target' || github.event.inputs.pr_number != ''
         env:
           GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.inputs.pr_number }}
           POST_COMMENT: ${{ github.event.inputs.post_comment || 'true' }}
         run: |
@@ -79,45 +77,28 @@ jobs:
         if: github.event_name == 'schedule'
         env:
           GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
           REPO: ${{ github.repository }}
         run: |
           set -euo pipefail
-          # Fetch all open PRs and run gate-check on each. This scheduled
-          # refresher is advisory; a transient Gitea list timeout must not turn
-          # main red. PR-specific gate-check runs still use normal failure
-          # semantics.
+          # Fetch all open PRs and run gate-check on each
+          # socket.setdefaulttimeout(15): defence-in-depth for missing SOP_TIER_CHECK_TOKEN.
+          # gate_check.py uses timeout=15 on every urlopen call; this catches the
+          # inline Python polling loop too (issue #603).
           pr_numbers=$(python3 <<'PY'
           import json
           import os
           import socket
-          import sys
-          import time
-          import urllib.error
           import urllib.request
 
-          socket.setdefaulttimeout(30)
+          socket.setdefaulttimeout(15)
           token = os.environ["GITEA_TOKEN"]
           repo = os.environ["REPO"]
-          url = f"https://git.moleculesai.app/api/v1/repos/{repo}/pulls?state=open&limit=100"
-          last_error = None
-          for attempt in range(1, 4):
-              req = urllib.request.Request(
-                  url,
-                  headers={"Authorization": f"token {token}", "Accept": "application/json"},
-              )
-              try:
-                  with urllib.request.urlopen(req, timeout=30) as r:
-                      prs = json.loads(r.read())
-                  break
-              except (TimeoutError, OSError, urllib.error.URLError, urllib.error.HTTPError) as exc:
-                  last_error = exc
-                  print(f"warning: PR list fetch attempt {attempt}/3 failed: {exc}", file=sys.stderr)
-                  if attempt < 3:
-                      time.sleep(2 * attempt)
-          else:
-              print(f"warning: skipped scheduled gate-check refresh; failed to list open PRs after 3 attempts: {last_error}", file=sys.stderr)
-              raise SystemExit(0)
+          req = urllib.request.Request(
+              f"https://git.moleculesai.app/api/v1/repos/{repo}/pulls?state=open&limit=100",
+              headers={"Authorization": f"token {token}", "Accept": "application/json"},
+          )
+          with urllib.request.urlopen(req) as r:
+              prs = json.loads(r.read())
           for pr in prs:
               print(pr["number"])
           PY

.gitea/workflows/gitea-merge-queue.yml

@@ -48,9 +48,4 @@ jobs:
           REQUIRED_CONTEXTS: >-
             CI / all-required (pull_request),
             sop-checklist / all-items-acked (pull_request)
-          # Push-side required contexts. Checking CI / all-required (push)
-          # explicitly instead of the combined state avoids false-pause when
-          # non-blocking jobs (continue-on-error: true) have failed — those
-          # failures pollute combined state but do not gate merges.
-          PUSH_REQUIRED_CONTEXTS: CI / all-required (push)
         run: python3 .gitea/scripts/gitea-merge-queue.py

.gitea/workflows/handlers-postgres-integration.yml

@@ -86,33 +86,22 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
-          # A full-history checkout can exceed the runner's quiet/startup
-          # window before the path filter emits logs. Fetch the common push
-          # case cheaply; the script below fetches the exact BASE SHA if it is
-          # not present in the shallow checkout.
-          fetch-depth: 2
+          fetch-depth: 0
       - id: filter
         # Inline replacement for dorny/paths-filter — see e2e-api.yml.
         run: |
-          # Gitea Actions evaluates github.event.before to empty string in shell
-          # scripts. Use GITHUB_EVENT_BEFORE shell env var instead (Gitea
-          # correctly populates it for push events). PR case uses template var.
-          BASE=""
+          BASE="${GITHUB_BASE_REF:-${{ github.event.before }}}"
           if [ "${{ github.event_name }}" = "pull_request" ] && [ -n "${{ github.event.pull_request.base.sha }}" ]; then
             BASE="${{ github.event.pull_request.base.sha }}"
-          elif [ -n "$GITHUB_EVENT_BEFORE" ]; then
-            BASE="$GITHUB_EVENT_BEFORE"
           fi
           if [ -z "$BASE" ] || echo "$BASE" | grep -qE '^0+$'; then
             echo "handlers=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
-          # timeout 30 guards against the case where BASE points to a ref that
-          # git can resolve but cat-file hangs (rare on corrupted objects).
-          if ! timeout 30 git cat-file -e "$BASE" 2>/dev/null; then
+          if ! git cat-file -e "$BASE" 2>/dev/null; then
             git fetch --depth=1 origin "$BASE" 2>/dev/null || true
           fi
-          if ! timeout 30 git cat-file -e "$BASE" 2>/dev/null; then
+          if ! git cat-file -e "$BASE" 2>/dev/null; then
             echo "handlers=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi

.gitea/workflows/harness-replays.yml

@@ -60,7 +60,6 @@ env:
   GITHUB_SERVER_URL: https://git.moleculesai.app
 
 jobs:
-  # bp-exempt: change detector only; downstream Harness Replays is the meaningful gate.
   detect-changes:
     runs-on: ubuntu-latest
     # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
@@ -133,14 +132,7 @@ jobs:
           RESP=$(curl -sS --fail --max-time 30 \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Accept: application/json" \
-            "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/compare/$BASE...$HEAD") || {
-            # If Gitea's Compare API is slow/unavailable, choose the conservative
-            # behavior: run the harness instead of failing the detector and polluting
-            # main with a red non-gate context.
-            echo "run=true" >> "$GITHUB_OUTPUT"
-            echo "debug=compare-api-unavailable base=$BASE head=$HEAD" >> "$GITHUB_OUTPUT"
-            exit 0
-          }
+            "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/compare/$BASE...$HEAD")
           DIFF_FILES=$(echo "$RESP" | bash .gitea/scripts/compare-api-diff-files.py 2>/dev/null || true)
 
           echo "debug=diff-base=$BASE diff-files=$DIFF_FILES" >> "$GITHUB_OUTPUT"
@@ -158,7 +150,6 @@ jobs:
   # matches e2e-api.yml — see that workflow's comment for why a
   # job-level `if: false` would block branch protection via the
   # SKIPPED-in-set bug.
-  # bp-exempt: path-filtered replay suite; CI / all-required is the branch-protection aggregate.
   harness-replays:
     needs: detect-changes
     name: Harness Replays

.gitea/workflows/lint-continue-on-error-tracking.yml

@@ -89,11 +89,10 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # bp-exempt: meta-lint for masked jobs; tracked separately until masks are burned down.
   lint:
     name: lint-continue-on-error-tracking
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 10
     # Phase 3 (RFC #219 §1): surface masked defects without blocking
     # PRs. Pre-existing continue-on-error: true directives on main
     # all violate this lint at first — intentional. Flip to false

.gitea/workflows/lint-mask-pr-atomicity.yml

@@ -84,7 +84,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # bp-exempt: meta-lint advisory during mask burn-down; CI / all-required gates merges.
   scan:
     name: lint-mask-pr-atomicity
     runs-on: ubuntu-latest

.gitea/workflows/lint-required-no-paths.yml

@@ -69,7 +69,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # bp-exempt: meta-lint advisory; CI / all-required is the required aggregate.
   lint:
     name: lint-required-no-paths
     runs-on: ubuntu-latest

.gitea/workflows/publish-canvas-image.yml

@@ -46,20 +46,15 @@ env:
   GITHUB_SERVER_URL: https://git.moleculesai.app
 
 jobs:
-  # bp-exempt: post-merge image publication side effect; CI / all-required gates source changes.
   build-and-push:
     name: Build & push canvas image
-    # Dedicated publish/release lane (internal#462 / #394 / #399). Ship
-    # path (on: push:main, canvas/**) — reserved capacity so a merged
-    # canvas fix's image build never FIFO-queues behind PR required-CI.
-    # The `publish` label resolves ONLY to the molecule-runner-publish-*
-    # sub-pool (config.publish.yaml). HARD DEPENDENCY: this MUST land
-    # AFTER the publish-lane runners are registered/advertising `publish`
-    # — the earlier #599 `docker` label attempt queued indefinitely with
-    # zero eligible runners precisely because the label was targeted
-    # before any runner advertised it (see #576). The lane is registered
-    # in this rollout (internal#462) so the precondition holds.
-    runs-on: publish
+    # REVERTED (infra/revert-docker-runner-label): `runs-on: ubuntu-latest` restored.
+    # The `docker` label is not registered on any act_runner. `runs-on: [ubuntu-latest, docker]`
+    # causes jobs to queue indefinitely with zero eligible runners — strictly worse than the
+    # pre-#599 coin-flip (50% success rate). Once the `docker` label is registered on
+    # ≥2 runners, re-apply the fix from #599 (infra/docker-runner-label).
+    # See issue #576 + infra-lead pulse ~00:30Z.
+    runs-on: ubuntu-latest
     # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
     # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
     continue-on-error: true

.gitea/workflows/publish-runtime-autobump.yml

@@ -53,7 +53,6 @@ jobs:
   # Operational failures (PyPI unreachable, missing DISPATCH_TOKEN) are
   # surfaced via continue-on-error: true rather than blocking the merge.
   # The actual bump work happens on the main/staging push after merge.
-  # bp-exempt: advisory validation for runtime publication; not a branch-protection gate.
   pr-validate:
     runs-on: ubuntu-latest
     # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
@@ -80,7 +79,6 @@ jobs:
   # Actual bump-and-tag: runs on main/staging pushes, posts real success/failure.
   # No continue-on-error — operational failures here trip the main-red
   # watchdog, which is the desired signal for infrastructure degradation.
-  # bp-exempt: post-merge tag publication side effect; CI / all-required gates source changes.
   bump-and-tag:
     runs-on: ubuntu-latest
     # Only fire on push events (main/staging after PR merge). Pull_request

.gitea/workflows/publish-runtime.yml

@@ -66,10 +66,7 @@ concurrency:
 
 jobs:
   publish:
-    # Dedicated publish/release lane (internal#462 / #394 / #399). Ship
-    # path (on: push tag runtime-v*) — reserved capacity, never FIFO
-    # behind PR-CI. `publish` resolves only to molecule-runner-publish-*.
-    runs-on: publish
+    runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.version.outputs.version }}
       wheel_sha256: ${{ steps.wheel_hash.outputs.wheel_sha256 }}
@@ -162,7 +159,6 @@ jobs:
             exit 1
           fi
           python -m twine upload \
-            --verbose \
             --repository pypi \
             --username __token__ \
             --password "$PYPI_TOKEN" \
@@ -170,9 +166,7 @@ jobs:
 
   cascade:
     needs: publish
-    # Publish/release lane (internal#462) — downstream of the runtime
-    # publish ship job; keep it on the reserved lane too.
-    runs-on: publish
+    runs-on: ubuntu-latest
     steps:
       - name: Wait for PyPI to propagate the new version
         env:

.gitea/workflows/publish-workspace-server-image.yml

@@ -18,31 +18,29 @@ name: publish-workspace-server-image
 #   :staging-<sha> — per-commit digest, stable for canary verify
 #   :staging-latest — tracks most recent build on this branch
 #
-# Production auto-deploy:
-#   After both platform and tenant images are pushed, deploy-production waits
-#   for strict required push contexts on the same SHA to go green, then
-#   calls the production CP redeploy-fleet endpoint with target_tag=
-#   staging-<sha>. Set repo variable or secret PROD_AUTO_DEPLOY_DISABLED=true
-#   to stop production rollout while keeping image publishing enabled.
-#
 # ECR target: 153263036946.dkr.ecr.us-east-2.amazonaws.com/molecule-ai/*
 # Required secrets: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AUTO_SYNC_TOKEN
-#
-# mc#711: Docker daemon not accessible on ubuntu-latest runner (molecule-canonical-1
-# shows client-only in `docker info` — daemon not running). DinD mount is present but
-# daemon doesn't respond. Fix: add diagnostic step showing socket info so ops can
-# identify which runners have a live daemon. If no daemon is available, the job
-# fails fast with actionable output rather than silent deep failure.
 
 on:
   push:
     branches: [main]
+    paths:
+      - 'workspace-server/**'
+      - 'canvas/**'
+      - 'manifest.json'
+      - 'scripts/**'
+      - '.gitea/workflows/publish-workspace-server-image.yml'
   workflow_dispatch:
 
-# No `concurrency:` block here. Gitea 1.22.6 can cancel queued runs despite
-# `cancel-in-progress: false`; that is not acceptable for a workflow with a
-# production deploy job. Per-SHA image tags are immutable, and staging-latest is
-# best-effort last-writer-wins metadata.
+# Serialize per-branch so two rapid main pushes don't race the same
+# :staging-latest tag retag. Allow parallel runs as they produce
+# different :staging-<sha> tags and last-write-wins on :staging-latest.
+#
+# cancel-in-progress: false → in-flight builds finish; the next push's
+# build queues. This avoids a partially-pushed image.
+concurrency:
+  group: publish-workspace-server-image-${{ github.ref }}
+  cancel-in-progress: false
 
 permissions:
   contents: read
@@ -54,35 +52,27 @@ env:
 
 jobs:
   build-and-push:
-    # Dedicated publish/release lane (internal#462 / #394 / #399). This
-    # is a post-merge ship job (on: push:main) — it must NOT FIFO-compete
-    # with PR required-CI on the shared pool (PR#1350's prod image build
-    # was delayed ~25min this way). The `publish` label resolves ONLY to
-    # the reserved molecule-runner-publish-* sub-pool (config.publish.yaml,
-    # OUTSIDE the managed 1..20 range) so a merged fix's image build
-    # starts immediately while PR-CI keeps the general pool.
-    runs-on: publish
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       # Health check: verify Docker daemon is accessible before attempting any
       # build steps. This fails loudly at step 1 when the runner's docker.sock
-      # is inaccessible rather than silently continuing where `docker build`
-      # fails deep in the process with a cryptic ECR auth error.
+      # is inaccessible (e.g. permission change, daemon restart, or group-membership
+      # drift) rather than silently continuing to step 2 where `docker build`
+      # fails deep in the process with a cryptic ECR auth error that doesn't
+      # surface the root cause.  Also reports the daemon version so operator
+      # can correlate with runner host logs.
       - name: Verify Docker daemon access
         run: |
           set -euo pipefail
           echo "::group::Docker daemon health check"
-          echo "Runner: ${HOSTNAME:-unknown}"
-          docker_info="$(docker info 2>&1)" || {
+          docker info 2>&1 | head -5 || {
             echo "::error::Docker daemon is not accessible at /var/run/docker.sock"
-            echo "::error::Runner: ${HOSTNAME:-unknown}"
-            printf '%s\n' "${docker_info}"
             echo "::error::Check: (1) daemon is running, (2) runner user is in docker group, (3) sock permissions are 660+"
             exit 1
           }
-          printf '%s\n' "${docker_info}" | sed -n '1,5p'
           echo "Docker daemon OK"
           echo "::endgroup::"
 
@@ -102,12 +92,13 @@ jobs:
           MOLECULE_GITEA_TOKEN: ${{ secrets.AUTO_SYNC_TOKEN }}
         run: |
           set -euo pipefail
+          if [ -z "${MOLECULE_GITEA_TOKEN}" ]; then
+            echo "::error::AUTO_SYNC_TOKEN secret is empty"
+            exit 1
+          fi
           mkdir -p .tenant-bundle-deps
-          # Strip JSON5 comments before jq parsing — Integration Tester appends
-          # `// Triggered by ...` which breaks `jq` in clone-manifest.sh.
-          sed '/^[[:space:]]*\/\//d' manifest.json > .manifest-stripped.json
           bash scripts/clone-manifest.sh \
-            .manifest-stripped.json \
+            manifest.json \
             .tenant-bundle-deps/workspace-configs-templates \
             .tenant-bundle-deps/org-templates \
             .tenant-bundle-deps/plugins
@@ -124,11 +115,6 @@ jobs:
       # Build + push platform image (inline ECR auth — mirrors the operator-host
       # approach; credentials come from GITHUB_SECRET_AWS_ACCESS_KEY_ID /
       # GITHUB_SECRET_AWS_SECRET_ACCESS_KEY in Gitea Actions).
-      # docker buildx bake / build required for `imagetools inspect` digest
-      # capture in the CP pin-update step (RFC internal#229 §X step 4 PR-1).
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd  # v4.0.0
-
       - name: Build & push platform image to ECR (staging-<sha> + staging-latest)
         env:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
@@ -144,16 +130,17 @@ jobs:
           ECR_REGISTRY="${IMAGE_NAME%%/*}"
           aws ecr get-login-password --region us-east-2 | \
             docker login --username AWS --password-stdin "${ECR_REGISTRY}"
-          docker buildx build \
+          docker build \
             --file ./workspace-server/Dockerfile \
             --build-arg GIT_SHA="${GIT_SHA}" \
-            --label "org.opencontainers.image.source=https://git.moleculesai.app/molecule-ai/${REPO}" \
+            --label "org.opencontainers.image.source=https://github.com/${REPO}" \
             --label "org.opencontainers.image.revision=${GIT_SHA}" \
-            --label "org.opencontainers.image.created=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
-            --label "molecule.workflow.run_id=${GITHUB_RUN_ID}" \
+            --label "org.opencontainers.image.description=Molecule AI platform — pending canary verify" \
             --tag "${IMAGE_NAME}:${TAG_SHA}" \
             --tag "${IMAGE_NAME}:${TAG_LATEST}" \
-            --push .
+            .
+          docker push "${IMAGE_NAME}:${TAG_SHA}"
+          docker push "${IMAGE_NAME}:${TAG_LATEST}"
 
       # Build + push tenant image (Go platform + Next.js canvas in one image).
       - name: Build & push tenant image to ECR (staging-<sha> + staging-latest)
@@ -171,186 +158,15 @@ jobs:
           ECR_REGISTRY="${TENANT_IMAGE_NAME%%/*}"
           aws ecr get-login-password --region us-east-2 | \
             docker login --username AWS --password-stdin "${ECR_REGISTRY}"
-          docker buildx build \
+          docker build \
             --file ./workspace-server/Dockerfile.tenant \
             --build-arg NEXT_PUBLIC_PLATFORM_URL= \
             --build-arg GIT_SHA="${GIT_SHA}" \
-            --label "org.opencontainers.image.source=https://git.moleculesai.app/molecule-ai/${REPO}" \
+            --label "org.opencontainers.image.source=https://github.com/${REPO}" \
             --label "org.opencontainers.image.revision=${GIT_SHA}" \
-            --label "org.opencontainers.image.created=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
-            --label "molecule.workflow.run_id=${GITHUB_RUN_ID}" \
+            --label "org.opencontainers.image.description=Molecule AI tenant platform + canvas — pending canary verify" \
             --tag "${TENANT_IMAGE_NAME}:${TAG_SHA}" \
             --tag "${TENANT_IMAGE_NAME}:${TAG_LATEST}" \
-            --push .
-
-  # bp-exempt: production deploy side-effect; merge is gated by CI / all-required and this job waits for push CI before acting.
-  deploy-production:
-    name: Production auto-deploy
-    needs: build-and-push
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-    # Publish/release lane (internal#462) — production deploy of a merged
-    # fix; reserved capacity, never queued behind PR-CI.
-    runs-on: publish
-    timeout-minutes: 75
-    env:
-      CP_URL: ${{ vars.PROD_CP_URL || 'https://api.moleculesai.app' }}
-      CP_ADMIN_API_TOKEN: ${{ secrets.CP_ADMIN_API_TOKEN }}
-      GITEA_HOST: git.moleculesai.app
-      GITEA_TOKEN: ${{ secrets.PROD_AUTO_DEPLOY_CONTROL_TOKEN || secrets.AUTO_SYNC_TOKEN }}
-      PROD_AUTO_DEPLOY_DISABLED: ${{ vars.PROD_AUTO_DEPLOY_DISABLED || secrets.PROD_AUTO_DEPLOY_DISABLED || '' }}
-      PROD_AUTO_DEPLOY_CANARY_SLUG: ${{ vars.PROD_AUTO_DEPLOY_CANARY_SLUG || 'hongming' }}
-      PROD_AUTO_DEPLOY_SOAK_SECONDS: ${{ vars.PROD_AUTO_DEPLOY_SOAK_SECONDS || '60' }}
-      PROD_AUTO_DEPLOY_BATCH_SIZE: ${{ vars.PROD_AUTO_DEPLOY_BATCH_SIZE || '3' }}
-      PROD_AUTO_DEPLOY_DRY_RUN: ${{ vars.PROD_AUTO_DEPLOY_DRY_RUN || '' }}
-      PROD_ALLOW_NON_PROD_CP_URL: ${{ vars.PROD_ALLOW_NON_PROD_CP_URL || '' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Build deploy plan
-        id: plan
-        run: |
-          set -euo pipefail
-          python3 .gitea/scripts/prod-auto-deploy.py plan > "$RUNNER_TEMP/prod-auto-deploy-plan.json"
-          jq . "$RUNNER_TEMP/prod-auto-deploy-plan.json"
-          enabled="$(jq -r '.enabled' "$RUNNER_TEMP/prod-auto-deploy-plan.json")"
-          echo "enabled=$enabled" >> "$GITHUB_OUTPUT"
-          if [ "$enabled" != "true" ]; then
-            reason="$(jq -r '.disabled_reason' "$RUNNER_TEMP/prod-auto-deploy-plan.json")"
-            echo "::notice::Production auto-deploy disabled: $reason"
-            {
-              echo "## Production auto-deploy skipped"
-              echo ""
-              echo "Reason: \`$reason\`"
-            } >> "$GITHUB_STEP_SUMMARY"
-            exit 0
-          fi
-          if [ -z "${CP_ADMIN_API_TOKEN:-}" ]; then
-            echo "::error::CP_ADMIN_API_TOKEN secret is required for production auto-deploy."
-            exit 1
-          fi
-          if [ -z "${GITEA_TOKEN:-}" ]; then
-            echo "::error::AUTO_SYNC_TOKEN secret is required so production deploy can wait for green CI."
-            exit 1
-          fi
-
-      - name: Self-test production deploy helper
-        if: ${{ steps.plan.outputs.enabled == 'true' }}
-        run: |
-          set -euo pipefail
-          python3 -m pip install --quiet 'pytest==9.0.2' 'PyYAML==6.0.2'
-          python3 -m pytest .gitea/scripts/tests/test_prod_auto_deploy.py -q
-          python3 .gitea/scripts/lint-workflow-yaml.py --workflow-dir .gitea/workflows
-
-      - name: Wait for green main CI on this SHA
-        if: ${{ steps.plan.outputs.enabled == 'true' }}
-        run: |
-          set -euo pipefail
-          python3 .gitea/scripts/prod-auto-deploy.py wait-ci
-
-      - name: Call production CP redeploy-fleet
-        if: ${{ steps.plan.outputs.enabled == 'true' }}
-        run: |
-          set -euo pipefail
-          python3 .gitea/scripts/prod-auto-deploy.py assert-enabled
-          PLAN="$RUNNER_TEMP/prod-auto-deploy-plan.json"
-          TARGET_TAG="$(jq -r '.target_tag' "$PLAN")"
-          BODY="$(jq -c '.body' "$PLAN")"
-
-          echo "POST $CP_URL/cp/admin/tenants/redeploy-fleet"
-          echo "  target_tag: $TARGET_TAG"
-          echo "  body: $BODY"
-
-          HTTP_RESPONSE="$RUNNER_TEMP/prod-redeploy-response.json"
-          HTTP_CODE_FILE="$RUNNER_TEMP/prod-redeploy-http-code.txt"
-          set +e
-          curl -sS -o "$HTTP_RESPONSE" -w '%{http_code}' \
-            -m 1200 \
-            -H "Authorization: Bearer $CP_ADMIN_API_TOKEN" \
-            -H "Content-Type: application/json" \
-            -X POST "$CP_URL/cp/admin/tenants/redeploy-fleet" \
-            -d "$BODY" > "$HTTP_CODE_FILE"
-          set -e
-
-          HTTP_CODE="$(cat "$HTTP_CODE_FILE" 2>/dev/null || echo "000")"
-          [ -z "$HTTP_CODE" ] && HTTP_CODE="000"
-          echo "HTTP $HTTP_CODE"
-          jq '{ok, result_count: (.results // [] | length)}' "$HTTP_RESPONSE" || true
-
-          {
-            echo "## Production auto-deploy"
-            echo ""
-            echo "**Commit:** \`${GITHUB_SHA:0:7}\`"
-            echo "**Target tag:** \`$TARGET_TAG\`"
-            echo "**HTTP:** $HTTP_CODE"
-            echo ""
-            echo "### Per-tenant result"
-            echo ""
-            echo "| Slug | Phase | SSM Status | Exit | Healthz | Error present |"
-            echo "|------|-------|------------|------|---------|---------------|"
-            jq -r '.results[]? | "| \(.slug) | \(.phase) | \(.ssm_status // "-") | \(.ssm_exit_code) | \(.healthz_ok) | \((.error // "") != "") |"' "$HTTP_RESPONSE" || true
-          } >> "$GITHUB_STEP_SUMMARY"
-
-          if [ "$HTTP_CODE" != "200" ]; then
-            echo "::error::redeploy-fleet returned HTTP $HTTP_CODE"
-            exit 1
-          fi
-          OK="$(jq -r '.ok' "$HTTP_RESPONSE")"
-          if [ "$OK" != "true" ]; then
-            echo "::error::redeploy-fleet reported ok=false; production rollout halted."
-            exit 1
-          fi
-
-      - name: Verify reachable tenants report this SHA
-        if: ${{ steps.plan.outputs.enabled == 'true' }}
-        env:
-          TENANT_DOMAIN: moleculesai.app
-        run: |
-          set -euo pipefail
-          RESP="$RUNNER_TEMP/prod-redeploy-response.json"
-          mapfile -t SLUGS < <(jq -r '.results[]? | .slug' "$RESP")
-          if [ ${#SLUGS[@]} -eq 0 ]; then
-            echo "::error::No tenants returned from redeploy-fleet; refusing to mark production deploy verified."
-            exit 1
-          fi
-
-          STALE_COUNT=0
-          UNREACHABLE_COUNT=0
-          UNHEALTHY_COUNT=0
-          for slug in "${SLUGS[@]}"; do
-            healthz_ok="$(jq -r --arg slug "$slug" '.results[]? | select(.slug == $slug) | .healthz_ok' "$RESP" | tail -1)"
-            if [ "$healthz_ok" != "true" ]; then
-              echo "::error::$slug did not report healthz_ok=true in redeploy-fleet response."
-              UNHEALTHY_COUNT=$((UNHEALTHY_COUNT + 1))
-              continue
-            fi
-            url="https://${slug}.${TENANT_DOMAIN}/buildinfo"
-            body="$(curl -sS --max-time 30 --retry 3 --retry-delay 5 --retry-connrefused "$url" || true)"
-            actual="$(echo "$body" | jq -r '.git_sha // ""' 2>/dev/null || echo "")"
-            if [ -z "$actual" ]; then
-              echo "::error::$slug did not return /buildinfo after deploy."
-              UNREACHABLE_COUNT=$((UNREACHABLE_COUNT + 1))
-              continue
-            fi
-            if [ "$actual" != "$GITHUB_SHA" ]; then
-              echo "::error::$slug is stale: actual=${actual:0:7}, expected=${GITHUB_SHA:0:7}"
-              STALE_COUNT=$((STALE_COUNT + 1))
-            else
-              echo "$slug: ${actual:0:7}"
-            fi
-          done
-
-          {
-            echo ""
-            echo "### Buildinfo verification"
-            echo ""
-            echo "Expected SHA: \`${GITHUB_SHA:0:7}\`"
-            echo "Verified tenants: ${#SLUGS[@]}"
-            echo "Stale tenants: $STALE_COUNT"
-            echo "Unhealthy tenants: $UNHEALTHY_COUNT"
-            echo "Unreachable tenants: $UNREACHABLE_COUNT"
-          } >> "$GITHUB_STEP_SUMMARY"
-
-          if [ "$STALE_COUNT" -gt 0 ] || [ "$UNHEALTHY_COUNT" -gt 0 ] || [ "$UNREACHABLE_COUNT" -gt 0 ]; then
-            exit 1
-          fi
+            .
+          docker push "${TENANT_IMAGE_NAME}:${TAG_SHA}"
+          docker push "${TENANT_IMAGE_NAME}:${TAG_LATEST}"

.gitea/workflows/qa-review.yml

@@ -9,10 +9,10 @@
 #   Triggers on:
 #     - `pull_request_target`: opened, synchronize, reopened
 #         → initial status posts when PR opens / re-pushes
-#     - comment refires are handled by `review-refire-comments.yml`
-#         → a single issue_comment dispatcher prevents every SOP/review
-#           comment from enqueueing separate qa/security/tier jobs on
-#           Gitea 1.22.6 before job-level `if:` can skip them.
+#     - `issue_comment`: /qa-recheck slash-command on the PR
+#         → manual re-fire after a QA reviewer clicks APPROVE
+#           (Gitea 1.22.6 doesn't re-fire on pull_request_review, per
+#           go-gitea/gitea#33700 + feedback_pull_request_review_no_refire)
 #   Workflow name = `qa-review` ; job name = `approved`.
 #   The job's own pass/fail conclusion publishes the status context
 #   `qa-review / approved (<event>)` — NO `POST /statuses` call → NO
@@ -85,20 +85,27 @@ name: qa-review
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
+  issue_comment:
+    types: [created]
 
 permissions:
   contents: read
   pull-requests: read
 
 jobs:
-  # bp-exempt: PR review bot signal; required merge state is enforced by CI / all-required.
   approved:
     # Gate the job:
     #   - On pull_request_target events: always run.
-    # Comment-triggered refires live in review-refire-comments.yml. Keeping
-    # this workflow PR-only avoids comment-triggered queue storms.
+    #   - On issue_comment events: only when it's a PR comment and the body
+    #     contains the slash-command. NO privilege gate at the step level
+    #     (RFC#324 v1.3 §A1.1): a non-collaborator's /qa-recheck is fine
+    #     because the eval is read-only and idempotent — re-running it
+    #     just re-confirms whether a real team-member APPROVE exists.
     if: |
-      github.event_name == 'pull_request_target'
+      github.event_name == 'pull_request_target' ||
+      (github.event_name == 'issue_comment' &&
+       github.event.issue.pull_request != null &&
+       startsWith(github.event.comment.body, '/qa-recheck'))
     runs-on: ubuntu-latest
     steps:
       - name: Privilege check (A1.1 — INFORMATIONAL log only, NOT a gate)
@@ -112,7 +119,7 @@ jobs:
         # no comment.user.login so the step is a no-op skip there.
         if: github.event_name == 'issue_comment'
         env:
-          GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.RFC_324_TEAM_READ_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail
           login="${{ github.event.comment.user.login }}"
@@ -143,14 +150,13 @@ jobs:
 
       - name: Evaluate qa-review
         env:
-          GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.RFC_324_TEAM_READ_TOKEN || secrets.GITHUB_TOKEN }}
           GITEA_HOST: git.moleculesai.app
           REPO: ${{ github.repository }}
           # PR number lives in different places per event:
           #   pull_request_target → github.event.pull_request.number
           #   issue_comment       → github.event.issue.number
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
           TEAM: qa
           TEAM_ID: '20'
           REVIEW_CHECK_DEBUG: '0'

.gitea/workflows/redeploy-tenants-on-main.yml

@@ -1,4 +1,4 @@
-name: redeploy-tenants-on-main
+name: manual-redeploy-tenants-on-main
 
 # Ported from .github/workflows/redeploy-tenants-on-main.yml on 2026-05-11 per RFC
 # internal#219 §1 sweep. Differences from the GitHub version:
@@ -9,17 +9,26 @@ name: redeploy-tenants-on-main
 #   - Workflow-level env.GITHUB_SERVER_URL pinned per
 #     feedback_act_runner_github_server_url.
 #   - `continue-on-error: true` on each job (RFC §1 contract).
-#   - Dropped unsupported `workflow_run` (task #81).
-#   - Later changed to manual-only after publish-workspace-server-image.yml
-#     gained an integrated ordered production deploy job.
+#   - Gitea 1.22.6 does not support workflow_run (task #81). This Gitea
+#     fallback is manual-only; automatic production deploy is attached to
+#     publish-workspace-server-image.yml after image push succeeds.
 #
 
-# Manual production tenant redeploy/rollback helper.
+# Manual production tenant redeploy fallback.
 #
-# Why this workflow is manual-only: publish-workspace-server-image now owns
-# the ordered build -> push -> production auto-deploy sequence in one workflow.
-# A separate push-triggered redeploy workflow races before the new ECR image
-# exists and can paint main red with a false deployment failure.
+# Primary automatic production deployment now lives in
+# publish-workspace-server-image.yml:
+#   build images -> wait for `CI / all-required (push)` green on the same SHA
+#   -> call production redeploy-fleet.
+#
+# This workflow remains as an operator fallback. By default it reruns current
+# main; set repo variable PROD_MANUAL_REDEPLOY_TARGET_TAG to a known-good
+# `staging-<sha>` tag for rollback.
+#
+# Why this workflow exists: publish-workspace-server-image builds and
+# pushes a new platform-tenant :<sha> to ECR on every merge to main,
+# but running tenants pulled their image once at boot and never re-pull.
+# Users see stale code indefinitely.
 #
 # This workflow closes the gap by calling the control-plane admin
 # endpoint that performs a canary-first, batched, health-gated rolling
@@ -32,16 +41,7 @@ name: redeploy-tenants-on-main
 # Gitea suspension migration. The staging-verify.yml promote step now
 # uses the same redeploy-fleet endpoint (fixes the silent-GHCR gap).
 #
-# Runtime ordering for automatic deploys now lives in
-# publish-workspace-server-image.yml:
-#   1. build-and-push creates new :staging-<sha> images in ECR.
-#   2. deploy-production waits for required push contexts on that SHA.
-#   3. deploy-production calls redeploy-fleet canary-first.
-#
-# Rollback path: set PROD_MANUAL_REDEPLOY_TARGET_TAG as a repo/org
-# variable or secret, run workflow_dispatch, then unset it after the
-# rollback. That calls redeploy-fleet with target_tag=<value>,
-# re-pulling the pinned image on every tenant.
+# Any failure aborts the rollout and leaves older tenants on the prior image.
 
 on:
   workflow_dispatch:
@@ -50,43 +50,19 @@ permissions:
   # No write scopes needed — the workflow hits an external CP endpoint,
   # not the GitHub API.
 
-# Serialize manual redeploys so two operator-triggered rollbacks do not
-# overlap and cause confusing per-tenant SSM state.
-#
-# NOTE: cancel-in-progress: false removed (Rule 7 fix). Gitea 1.22.6
-# cancels queued runs regardless of this setting, so it provides no
-# actual protection. Each redeploy-fleet call is idempotent (canary-first
-# + batched + health-gated) so a cancelled predecessor is recovered
-# automatically by the next run.
-concurrency:
-  group: redeploy-tenants-on-main
+# No `concurrency:` block here. Gitea 1.22.6 can cancel queued runs despite
+# `cancel-in-progress: false`; operators should not dispatch overlapping manual
+# production redeploys.
 
 env:
   GITHUB_SERVER_URL: https://git.moleculesai.app
 
 jobs:
-  # bp-exempt: production redeploy is a side-effect workflow, not a merge gate.
   redeploy:
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    # Dedicated publish/release lane (internal#462 / #394 / #399).
-    # Production tenant redeploy — a deploy action, reserved capacity so
-    # it never queues behind PR-CI. `publish` -> molecule-runner-publish-*.
-    runs-on: publish
-    # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
-    # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
-    continue-on-error: true
+    runs-on: ubuntu-latest
+    continue-on-error: false
     timeout-minutes: 25
-    env:
-      # Rule 9 fix: keep the same operational kill switch surface as the
-      # integrated auto-deploy workflow.
-      PROD_AUTO_DEPLOY_DISABLED: ${{ vars.PROD_AUTO_DEPLOY_DISABLED || secrets.PROD_AUTO_DEPLOY_DISABLED || '' }}
     steps:
-      - name: Kill-switch guard
-        # Rule 9 fix: exit fast if kill switch is set. No redeploy happens.
-        if: env.PROD_AUTO_DEPLOY_DISABLED == 'true'
-        run: |
-          echo "::notice::Production auto-deploy disabled (PROD_AUTO_DEPLOY_DISABLED=true). Skipping redeploy."
-          echo "To re-enable: unset the repo variable or set it to false."
       - name: Note on ECR propagation
         # ECR image manifests are consistent immediately after push — no
         # CDN cache to wait for. The old GHCR-based workflow had a 30s
@@ -95,25 +71,20 @@ jobs:
 
       - name: Compute target tag
         id: tag
-        # Resolution order:
-        #   1. Operator-supplied input (workflow_dispatch with explicit
-        #      tag) → used verbatim. Lets ops pin `latest` for emergency
-        #      rollback to last canary-verified digest, or pin a specific
-        #      `staging-<sha>` to roll back to a known-good build.
-        #   2. Default → `staging-<short_head_sha>` for manual reruns from
-        #      the current default-branch SHA.
+        # Gitea 1.22.6 does not support workflow_dispatch inputs reliably.
+        # Use repo variable PROD_MANUAL_REDEPLOY_TARGET_TAG for rollback.
         env:
-          PROD_MANUAL_REDEPLOY_TARGET_TAG: ${{ vars.PROD_MANUAL_REDEPLOY_TARGET_TAG || secrets.PROD_MANUAL_REDEPLOY_TARGET_TAG || '' }}
           HEAD_SHA: ${{ github.sha }}
+          MANUAL_TARGET_TAG: ${{ vars.PROD_MANUAL_REDEPLOY_TARGET_TAG || '' }}
         run: |
           set -euo pipefail
-          if [ -n "${PROD_MANUAL_REDEPLOY_TARGET_TAG:-}" ]; then
-            echo "target_tag=$PROD_MANUAL_REDEPLOY_TARGET_TAG" >> "$GITHUB_OUTPUT"
-            echo "Using operator-pinned tag from PROD_MANUAL_REDEPLOY_TARGET_TAG."
+          if [ -n "${MANUAL_TARGET_TAG:-}" ]; then
+            echo "target_tag=$MANUAL_TARGET_TAG" >> "$GITHUB_OUTPUT"
+            echo "Using operator-pinned manual target tag: $MANUAL_TARGET_TAG"
           else
             SHORT="${HEAD_SHA:0:7}"
             echo "target_tag=staging-$SHORT" >> "$GITHUB_OUTPUT"
-            echo "Using auto tag: staging-$SHORT (head_sha=$HEAD_SHA)"
+            echo "Using manual fallback tag: staging-$SHORT (head_sha=$HEAD_SHA)"
           fi
 
       - name: Call CP redeploy-fleet
@@ -122,29 +93,16 @@ jobs:
         # CP_ADMIN_API_TOKEN env. Stored in Railway, mirrored to this
         # repo's secrets for CI.
         env:
-          CP_URL: ${{ vars.CP_URL || 'https://api.moleculesai.app' }}
+          CP_URL: ${{ vars.PROD_CP_URL || 'https://api.moleculesai.app' }}
           CP_ADMIN_API_TOKEN: ${{ secrets.CP_ADMIN_API_TOKEN }}
           TARGET_TAG: ${{ steps.tag.outputs.target_tag }}
-          CANARY_SLUG: ${{ vars.PROD_REDEPLOY_CANARY_SLUG || secrets.PROD_REDEPLOY_CANARY_SLUG || '' }}
-          SOAK_SECONDS: ${{ vars.PROD_REDEPLOY_SOAK_SECONDS || secrets.PROD_REDEPLOY_SOAK_SECONDS || '' }}
-          BATCH_SIZE: ${{ vars.PROD_REDEPLOY_BATCH_SIZE || secrets.PROD_REDEPLOY_BATCH_SIZE || '' }}
-          DRY_RUN: ${{ vars.PROD_REDEPLOY_DRY_RUN || secrets.PROD_REDEPLOY_DRY_RUN || '' }}
-          PROD_AUTO_DEPLOY_DISABLED: ${{ vars.PROD_AUTO_DEPLOY_DISABLED || secrets.PROD_AUTO_DEPLOY_DISABLED || '' }}
+          CANARY_SLUG: ${{ vars.PROD_AUTO_DEPLOY_CANARY_SLUG || 'hongming' }}
+          SOAK_SECONDS: ${{ vars.PROD_AUTO_DEPLOY_SOAK_SECONDS || '60' }}
+          BATCH_SIZE: ${{ vars.PROD_AUTO_DEPLOY_BATCH_SIZE || '3' }}
+          DRY_RUN: ${{ vars.PROD_AUTO_DEPLOY_DRY_RUN || false }}
         run: |
           set -euo pipefail
 
-          case "${PROD_AUTO_DEPLOY_DISABLED,,}" in
-            1|true|yes|on)
-              echo "::notice::PROD_AUTO_DEPLOY_DISABLED is set; skipping production redeploy."
-              exit 0
-              ;;
-          esac
-
-          CANARY_SLUG="${CANARY_SLUG:-hongming}"
-          SOAK_SECONDS="${SOAK_SECONDS:-60}"
-          BATCH_SIZE="${BATCH_SIZE:-3}"
-          DRY_RUN="${DRY_RUN:-false}"
-
           if [ -z "${CP_ADMIN_API_TOKEN:-}" ]; then
             echo "::error::CP_ADMIN_API_TOKEN secret not set — skipping redeploy"
             echo "::notice::Set CP_ADMIN_API_TOKEN in repo secrets to enable auto-redeploy."
@@ -166,7 +124,7 @@ jobs:
             }')
 
           echo "POST $CP_URL/cp/admin/tenants/redeploy-fleet"
-          echo "  target_tag=$TARGET_TAG canary=$CANARY_SLUG soak_seconds=$SOAK_SECONDS batch_size=$BATCH_SIZE dry_run=$DRY_RUN"
+          echo "  body: $BODY"
 
           HTTP_RESPONSE=$(mktemp)
           HTTP_CODE_FILE=$(mktemp)
@@ -194,9 +152,7 @@ jobs:
           [ -z "$HTTP_CODE" ] && HTTP_CODE="000"
 
           echo "HTTP $HTTP_CODE"
-          # Rule 8 fix: redact raw CP response from CI logs. Print only
-          # safe fields: ok boolean, result count, error presence (no content).
-          jq '{ok, result_count: (.results | length), has_errors: (.results | any(.error != null))}' "$HTTP_RESPONSE" || echo "(jq parse failed)"
+          jq '{ok, result_count: (.results // [] | length)}' "$HTTP_RESPONSE" || true
 
           # Pretty-print per-tenant results in the job summary so
           # ops can see which tenants were redeployed without drilling
@@ -212,11 +168,9 @@ jobs:
             echo ""
             echo "### Per-tenant result"
             echo ""
-            echo '| Slug | Phase | SSM Status | Exit | Healthz | Errors |'
-            echo '|------|-------|------------|------|---------|-------|'
-            # Rule 8 fix: .error field redacted from CI logs/summary. Print only
-            # presence boolean so ops know whether to look deeper.
-            jq -r '.results[]? | "| \(.slug) | \(.phase) | \(.ssm_status // "-") | \(.ssm_exit_code) | \(.healthz_ok) | \(.error != null) |"' "$HTTP_RESPONSE" || true
+            echo '| Slug | Phase | SSM Status | Exit | Healthz | Error present |'
+            echo '|------|-------|------------|------|---------|---------------|'
+            jq -r '.results[]? | "| \(.slug) | \(.phase) | \(.ssm_status // "-") | \(.ssm_exit_code) | \(.healthz_ok) | \((.error // "") != "") |"' "$HTTP_RESPONSE" || true
           } >> "$GITHUB_STEP_SUMMARY"
 
           if [ "$HTTP_CODE" != "200" ]; then
@@ -255,9 +209,8 @@ jobs:
         # fail the workflow, which is what `ok=true` should have
         # guaranteed all along.
         #
-        # When the redeploy is triggered manually with a specific tag
-        # (target_tag != "latest"), the expected SHA may not equal
-        # ${{ github.sha }}.
+        # Manual Gitea fallback redeploys current main's staging-<sha> tag, so
+        # the expected SHA is github.sha.
         env:
           EXPECTED_SHA: ${{ github.sha }}
           TARGET_TAG: ${{ steps.tag.outputs.target_tag }}
@@ -273,10 +226,10 @@ jobs:
           if [ "$TARGET_TAG" != "latest" ] \
              && [ "$TARGET_TAG" != "$EXPECTED_SHA" ] \
              && [ "$TARGET_TAG" != "staging-$EXPECTED_SHORT" ]; then
-            # Manual redeploy with a pinned tag that isn't the head
+            # workflow_dispatch with a pinned tag that isn't the head
             # SHA — operator is rolling back / pinning. Skip the
             # verification because we don't have the expected SHA in
-            # this context (would need to inspect the ECR
+            # this context (would need to crane-inspect the GHCR
             # manifest, which is a follow-up). Failing-open here is
             # safe: the operator chose the tag deliberately.
             #

.gitea/workflows/redeploy-tenants-on-staging.yml

@@ -73,12 +73,8 @@ env:
   GITHUB_SERVER_URL: https://git.moleculesai.app
 
 jobs:
-  # bp-exempt: post-merge staging redeploy side effect; CI / all-required gates source changes.
   redeploy:
-    # Dedicated publish/release lane (internal#462 / #394 / #399).
-    # Post-merge staging redeploy — a deploy action, reserved capacity.
-    # `publish` -> molecule-runner-publish-* sub-pool.
-    runs-on: publish
+    runs-on: ubuntu-latest
     # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
     # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
     continue-on-error: true

.gitea/workflows/review-check-tests.yml

@@ -41,7 +41,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # bp-exempt: review tooling regression suite; CI / all-required is the required aggregate.
   test:
     name: review-check.sh regression tests
     runs-on: ubuntu-latest

.gitea/workflows/review-refire-comments.yml

@@ -1,113 +0,0 @@
-# Consolidated comment dispatcher for manual review/tier refires.
-#
-# Gitea 1.22 queues one run per workflow subscribed to `issue_comment` before
-# evaluating job-level `if:`. SOP-heavy PRs therefore created queue storms when
-# qa-review, security-review, sop-checklist, and sop-tier-refire all
-# listened to comments. This workflow is the single non-SOP comment subscriber:
-# ordinary comments no-op quickly; slash commands post the required status
-# contexts to the PR head SHA.
-
-name: review-refire-comments
-
-on:
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-  pull-requests: read
-  statuses: write
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event.issue.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  dispatch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Classify comment
-        id: classify
-        env:
-          COMMENT_BODY: ${{ github.event.comment.body }}
-          IS_PR: ${{ github.event.issue.pull_request != null }}
-        run: |
-          set -euo pipefail
-          {
-            echo "run_qa=false"
-            echo "run_security=false"
-            echo "run_tier=false"
-          } >> "$GITHUB_OUTPUT"
-          if [ "$IS_PR" != "true" ]; then
-            echo "::notice::not a PR comment; no-op"
-            exit 0
-          fi
-          first_line=$(printf '%s\n' "$COMMENT_BODY" | sed -n '1p')
-          case "$first_line" in
-            /qa-recheck*)
-              echo "run_qa=true" >> "$GITHUB_OUTPUT"
-              ;;
-            /security-recheck*)
-              echo "run_security=true" >> "$GITHUB_OUTPUT"
-              ;;
-            /refire-tier-check*)
-              echo "run_tier=true" >> "$GITHUB_OUTPUT"
-              ;;
-            *)
-              echo "::notice::no supported review refire slash command; no-op"
-              ;;
-          esac
-
-      - name: Check out BASE ref for trusted scripts
-        if: |
-          steps.classify.outputs.run_qa == 'true' ||
-          steps.classify.outputs.run_security == 'true' ||
-          steps.classify.outputs.run_tier == 'true'
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-        with:
-          ref: ${{ github.event.repository.default_branch }}
-
-      - name: Refire qa-review status
-        if: steps.classify.outputs.run_qa == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.RFC_324_TEAM_READ_TOKEN || secrets.GITHUB_TOKEN }}
-          GITEA_HOST: git.moleculesai.app
-          REPO: ${{ github.repository }}
-          PR_NUMBER: ${{ github.event.issue.number }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-          TEAM: qa
-          TEAM_ID: '20'
-          REVIEW_CHECK_DEBUG: '0'
-          REVIEW_CHECK_STRICT: '0'
-          COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
-        run: |
-          set -euo pipefail
-          .gitea/scripts/review-refire-status.sh
-
-      - name: Refire security-review status
-        if: steps.classify.outputs.run_security == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.RFC_324_TEAM_READ_TOKEN || secrets.GITHUB_TOKEN }}
-          GITEA_HOST: git.moleculesai.app
-          REPO: ${{ github.repository }}
-          PR_NUMBER: ${{ github.event.issue.number }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-          TEAM: security
-          TEAM_ID: '21'
-          REVIEW_CHECK_DEBUG: '0'
-          REVIEW_CHECK_STRICT: '0'
-          COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
-        run: |
-          set -euo pipefail
-          .gitea/scripts/review-refire-status.sh
-
-      - name: Refire sop-tier-check status
-        if: steps.classify.outputs.run_tier == 'true'
-        env:
-          GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
-          GITEA_HOST: git.moleculesai.app
-          REPO: ${{ github.repository }}
-          PR_NUMBER: ${{ github.event.issue.number }}
-          COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
-          SOP_DEBUG: '0'
-        run: bash .gitea/scripts/sop-tier-refire.sh

.gitea/workflows/runtime-prbuild-compat.yml

@@ -66,28 +66,19 @@ jobs:
           # PR#372's ci.yml port used. Diffs against the PR base or the
           # previous push SHA, then matches against the wheel-relevant
           # path set.
-          #
-          # NOTE: Gitea Actions does not expose github.event.before as a
-          # shell environment variable. The ${{ github.event.before }} template
-          # expression works inside YAML run: blocks but is evaluated to an
-          # empty string for push events, making the ${VAR:-fallback} always
-          # use the fallback. Use GITHUB_EVENT_BEFORE instead — it IS set in
-          # the runner's shell environment for push events.
-          BASE=""
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
+          BASE="${GITHUB_BASE_REF:-${{ github.event.before }}}"
+          if [ "${{ github.event_name }}" = "pull_request" ] && [ -n "${{ github.event.pull_request.base.sha }}" ]; then
             BASE="${{ github.event.pull_request.base.sha }}"
-          elif [ -n "$GITHUB_EVENT_BEFORE" ]; then
-            BASE="$GITHUB_EVENT_BEFORE"
           fi
           if [ -z "$BASE" ] || echo "$BASE" | grep -qE '^0+$'; then
             # New branch or no previous SHA: treat as wheel-relevant.
             echo "wheel=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi
-          if ! timeout 30 git cat-file -e "$BASE" 2>/dev/null; then
+          if ! git cat-file -e "$BASE" 2>/dev/null; then
             git fetch --depth=1 origin "$BASE" 2>/dev/null || true
           fi
-          if ! timeout 30 git cat-file -e "$BASE" 2>/dev/null; then
+          if ! git cat-file -e "$BASE" 2>/dev/null; then
             echo "wheel=true" >> "$GITHUB_OUTPUT"
             exit 0
           fi

.gitea/workflows/security-review.yml

@@ -12,18 +12,22 @@ name: security-review
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
+  issue_comment:
+    types: [created]
 
 permissions:
   contents: read
   pull-requests: read
 
 jobs:
-  # bp-exempt: PR security review bot signal; required merge state is enforced by CI / all-required.
   approved:
-    # Comment-triggered refires live in review-refire-comments.yml. Keeping
-    # this workflow PR-only avoids comment-triggered queue storms.
+    # See qa-review.yml header for full A1-α / A1.1 (v1.3 — informational
+    # log only, NOT a gate) / A4 / A5 design rationale.
     if: |
-      github.event_name == 'pull_request_target'
+      github.event_name == 'pull_request_target' ||
+      (github.event_name == 'issue_comment' &&
+       github.event.issue.pull_request != null &&
+       startsWith(github.event.comment.body, '/security-recheck'))
     runs-on: ubuntu-latest
     steps:
       - name: Privilege check (A1.1 — INFORMATIONAL log only, NOT a gate)
@@ -32,7 +36,7 @@ jobs:
         # so re-running on a non-collaborator comment is harmless.
         if: github.event_name == 'issue_comment'
         env:
-          GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.RFC_324_TEAM_READ_TOKEN || secrets.GITHUB_TOKEN }}
         run: |
           set -euo pipefail
           login="${{ github.event.comment.user.login }}"
@@ -57,11 +61,10 @@ jobs:
 
       - name: Evaluate security-review
         env:
-          GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.RFC_324_TEAM_READ_TOKEN || secrets.GITHUB_TOKEN }}
           GITEA_HOST: git.moleculesai.app
           REPO: ${{ github.repository }}
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
           TEAM: security
           TEAM_ID: '21'
           REVIEW_CHECK_DEBUG: '0'

.gitea/workflows/sop-checklist-gate.yml

@@ -1,4 +1,4 @@
-# sop-checklist — peer-ack merge gate for SOP-checklist items.
+# sop-checklist-gate — peer-ack merge gate for SOP-checklist items.
 #
 # RFC#351 Step 2 of 6 (implementation MVP).
 #
@@ -65,15 +65,7 @@
 # membership, compute, post status). Re-running on any event is safe —
 # the new status overwrites the previous one for the same context.
 
-name: sop-checklist
-
-# Cancel any in-progress runs for the same PR to prevent
-# stale runs from overwriting newer status contexts.
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.event.issue.number || github.ref }}
-  cancel-in-progress: true
-
-# bp-required: yes  ← emits sop-checklist / all-items-acked (pull_request)
+name: sop-checklist-gate
 
 on:
   pull_request_target:
@@ -91,7 +83,7 @@ permissions:
   statuses: write
 
 jobs:
-  all-items-acked:
+  gate:
     # Run on pull_request_target events always. On issue_comment events,
     # only when the comment is on a PR (issue_comment fires for issues
     # too) and the body contains one of the slash-commands.
@@ -100,8 +92,7 @@ jobs:
       (github.event_name == 'issue_comment' &&
        github.event.issue.pull_request != null &&
        (contains(github.event.comment.body, '/sop-ack') ||
-        contains(github.event.comment.body, '/sop-revoke') ||
-        contains(github.event.comment.body, '/sop-n/a')))
+        contains(github.event.comment.body, '/sop-revoke')))
     runs-on: ubuntu-latest
     steps:
       - name: Check out BASE ref (trust boundary — never PR-head)
@@ -114,7 +105,7 @@ jobs:
           # qa-review.yml so the script source is always trusted.
           ref: ${{ github.event.repository.default_branch }}
 
-      - name: Run sop-checklist
+      - name: Run sop-checklist-gate
         env:
           GITEA_TOKEN: ${{ secrets.SOP_CHECKLIST_GATE_TOKEN || secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
@@ -122,7 +113,7 @@ jobs:
           REPO_NAME: ${{ github.event.repository.name }}
         run: |
           set -euo pipefail
-          python3 .gitea/scripts/sop-checklist.py \
+          python3 .gitea/scripts/sop-checklist-gate.py \
             --owner "$OWNER" \
             --repo "$REPO_NAME" \
             --pr "$PR_NUMBER" \

.gitea/workflows/sop-tier-check.yml

@@ -28,16 +28,15 @@
 #
 # Environment variables:
 #   SOP_DEBUG=1          — per-API-call diagnostic lines. Default: off.
-#   SOP_LEGACY_CHECK=1   — revert to OR-gate for this run. Intended for
-#                           emergency use only; burn-in window closed
-#                           2026-05-17 (internal#189 Phase 1).
+#   SOP_LEGACY_CHECK=1   — revert to OR-gate for this run. Grace window
+#                           for PRs in-flight when AND-composition deployed.
+#                           Burn-in: remove after 2026-05-17 (7-day window).
 #
-# BURN-IN CLOSED 2026-05-17 (internal#189 Phase 1): The 7-day burn-in
-# window closed. continue-on-error: true has been removed from the
-# tier-check job; AND-composition is now fully enforced. If you need
-# to temporarily re-introduce a mask, file a tracker and follow the
-# mc#774 protocol (Tier 2e lint requires a current tracker within
-# 2 lines of any continue-on-error: true).
+# BURN-IN NOTE (internal#189 Phase 1): continue-on-error: true is set on
+# the tier-check job below. This prevents AND-composition from blocking
+# PRs during the 7-day burn-in. After 2026-05-17:
+#   1. Remove `continue-on-error: true` from this job block.
+#   2. Update this BURN-IN NOTE comment to mark the window closed.
 
 name: sop-tier-check
 
@@ -61,13 +60,12 @@ on:
   pull_request_review:
     types: [submitted, dismissed, edited]
 
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   tier-check:
     runs-on: ubuntu-latest
+    # BURN-IN: continue-on-error prevents AND-composition from blocking
+    # PRs during the 7-day window. Remove after 2026-05-17 (internal#189).
+    continue-on-error: true
     permissions:
       contents: read
       pull-requests: read
@@ -91,7 +89,6 @@ jobs:
         # runners). The sop-tier-check script has its own fallback as a
         # third line of defense. continue-on-error: true ensures this step
         # failing does not block the job.
-        # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
         continue-on-error: true
         run: |
           # apt-get is the primary method — Ubuntu package mirrors are reliably
@@ -112,7 +109,6 @@ jobs:
         # continue-on-error: true at step level — job-level is ignored by Gitea
         # Actions (quirk #10, internal runbooks). Belt-and-suspenders with
         # SOP_FAIL_OPEN=1 + || true below.
-        # mc#774: pre-existing continue-on-error mask; root-fix and remove, do not renew silently.
         continue-on-error: true
         env:
           GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}

.gitea/workflows/sop-tier-refire.yml

@@ -1,4 +1,4 @@
-# sop-tier-refire — manual fallback for sop-tier-check refire.
+# sop-tier-refire — issue_comment-triggered refire of sop-tier-check.
 #
 # Closes internal#292. Gitea 1.22.6 doesn't refire workflows on the
 # `pull_request_review` event (go-gitea/gitea#33700); the `sop-tier-check`
@@ -8,12 +8,12 @@
 # to merge is the admin force-merge path (audited via `audit-force-merge`
 # but the audit trail keeps growing; see `feedback_never_admin_merge_bypass`).
 #
-# Comment-triggered refires now live in `review-refire-comments.yml`. Gitea
-# queues issue_comment workflows before evaluating job-level `if:`, so having
-# qa-review, security-review, sop-checklist, and sop-tier-refire all subscribe
-# to every comment caused queue storms on SOP-heavy PRs. This workflow is a
-# non-automatic breadcrumb only; Gitea 1.22.6 does not support
-# workflow_dispatch inputs, so real refires must use `/refire-tier-check`.
+# Workaround pattern from `feedback_pull_request_review_no_refire`:
+# `issue_comment` events DO fire reliably on 1.22.6. When a repo
+# MEMBER/OWNER/COLLABORATOR comments `/refire-tier-check` on a PR, this
+# workflow re-runs the sop-tier-check logic and POSTs the resulting
+# status to the PR head SHA directly. No empty commit, no git history
+# bloat, no cascade re-fire of every other workflow on the PR.
 #
 # SECURITY MODEL:
 #
@@ -37,16 +37,43 @@
 # Rate-limit: a 1s pre-sleep + a "skip if status posted in last 30s"
 # guard prevents comment-spam from thrashing the status. See the script.
 
-name: sop-tier-check refire (manual)
+name: sop-tier-check refire (issue_comment)
 
 on:
-  workflow_dispatch:
+  issue_comment:
+    types: [created]
 
 jobs:
   refire:
+    # Three gates, all required:
+    #   - comment is on a PR (not a plain issue)
+    #   - commenter is MEMBER, OWNER, or COLLABORATOR
+    #   - comment body contains the slash-command trigger
+    if: |
+      github.event.issue.pull_request != null &&
+      contains(fromJson('["MEMBER","OWNER","COLLABORATOR"]'), github.event.comment.author_association) &&
+      contains(github.event.comment.body, '/refire-tier-check')
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      statuses: write
     steps:
-      - name: Explain supported refire path
-        run: |
-          echo "::error::Gitea 1.22.6 does not support workflow_dispatch inputs here; comment /refire-tier-check on the PR instead."
-          exit 1
+      - name: Check out base branch (for the script)
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+        with:
+          # Load the script from the default branch (main), matching the
+          # sop-tier-check.yml security model.
+          ref: ${{ github.event.repository.default_branch }}
+      - name: Re-evaluate sop-tier-check and POST status
+        env:
+          # Same org-level secret sop-tier-check.yml + audit-force-merge.yml use.
+          # Fallback to GITHUB_TOKEN with a clear error if missing.
+          GITEA_TOKEN: ${{ secrets.SOP_TIER_CHECK_TOKEN || secrets.GITHUB_TOKEN }}
+          GITEA_HOST: git.moleculesai.app
+          REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.issue.number }}
+          COMMENT_AUTHOR: ${{ github.event.comment.user.login }}
+          # Set to '1' for diagnostic per-API-call output. Off by default.
+          SOP_DEBUG: '0'
+        run: bash .gitea/scripts/sop-tier-refire.sh

.gitea/workflows/staging-verify.yml

@@ -82,7 +82,6 @@ env:
   GITHUB_SERVER_URL: https://git.moleculesai.app
 
 jobs:
-  # bp-exempt: post-merge staging verification side effect; CI / all-required gates merges.
   staging-smoke:
     runs-on: ubuntu-latest
     # Phase 3 (RFC #219 §1): surface broken workflows without blocking.
@@ -191,7 +190,6 @@ jobs:
             echo "assertions in the staging-smoke step log above."
           } >> "$GITHUB_STEP_SUMMARY"
 
-  # bp-exempt: post-merge image promotion side effect; staging-smoke controls promotion.
   promote-to-latest:
     # On green, calls the CP redeploy-fleet endpoint with target_tag=
     # staging-<sha> to promote the verified ECR image. This is the same

.gitea/workflows/status-reaper.yml

@@ -84,7 +84,7 @@ permissions:
 jobs:
   reap:
     runs-on: ubuntu-latest
-    timeout-minutes: 8
+    timeout-minutes: 3
     steps:
       - name: Check out repo at default-branch HEAD
         # BASE checkout per `feedback_pull_request_target_workflow_from_base`.
@@ -118,7 +118,4 @@ jobs:
           REPO: ${{ github.repository }}
           WATCH_BRANCH: ${{ github.event.repository.default_branch }}
           WORKFLOWS_DIR: .gitea/workflows
-          STATUS_REAPER_API_RETRIES: "4"
-          STATUS_REAPER_API_TIMEOUT_SEC: "20"
-          STATUS_REAPER_API_RETRY_SLEEP_SEC: "2"
         run: python3 .gitea/scripts/status-reaper.py

.staging-trigger

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

_ci_trigger.txt

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

canvas/e2e/chat-desktop.spec.ts

@@ -1,173 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { startEchoRuntime } from "./fixtures/echo-runtime";
-import { seedWorkspace, startHeartbeat, cleanupWorkspace } from "./fixtures/chat-seed";
-
-
-test.describe("Desktop ChatTab", () => {
-  let cleanup: () => Promise<void> = async () => {};
-  let workspaceId = "";
-  let workspaceName = "";
-
-  test.beforeAll(async () => {
-    const echo = await startEchoRuntime();
-    const ws = await seedWorkspace(echo.baseURL);
-    workspaceId = ws.id;
-    workspaceName = ws.name;
-    const stopHeartbeat = startHeartbeat(ws.id, ws.authToken);
-
-    cleanup = async () => {
-      stopHeartbeat();
-      await echo.stop();
-    };
-  });
-
-  test.afterAll(async () => {
-    await cleanupWorkspace(workspaceId);
-    await cleanup();
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 1280, height: 800 });
-    await page.goto("/");
-    await page.waitForSelector(".react-flow__node", { timeout: 10_000 });
-    // Dismiss onboarding guide if present.
-    const skipGuide = page.getByText("Skip guide");
-    if (await skipGuide.isVisible().catch(() => false)) {
-      await skipGuide.click();
-    }
-    // Click the workspace node by its exact name label.
-    await page.getByText(workspaceName, { exact: true }).first().click();
-    // Wait for the side panel chat tab to be clickable, then click it.
-    await page.locator('#tab-chat').click();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 5_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-  });
-
-  test("chat panel loads without error", async ({ page }) => {
-    const hasEmptyState = await page.getByText("Send a message to start chatting.").isVisible().catch(() => false);
-    const hasHistory = await page.locator("[data-testid='chat-panel']").locator("div").count() > 3;
-    expect(hasEmptyState || hasHistory).toBeTruthy();
-  });
-
-  test("send text message and receive echo response", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("What is the weather?");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("What is the weather?")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: What is the weather?")).toBeVisible({ timeout: 15_000 });
-  });
-
-  test("history persists across reload", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Persistence test");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: Persistence test")).toBeVisible({ timeout: 15_000 });
-
-    await page.reload();
-    await page.waitForSelector(".react-flow__node", { timeout: 10_000 });
-    await page.getByText(workspaceName, { exact: true }).first().click();
-    await page.locator('#tab-chat').click();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 5_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-
-    await expect(page.getByText("Persistence test", { exact: true })).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: Persistence test")).toBeVisible({ timeout: 5_000 });
-  });
-
-  test("file attachment round-trip", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Please read this file");
-
-    const fileInput = page.locator("[data-testid='chat-panel'] input[type='file']").first();
-    await fileInput.setInputFiles({
-      name: "test.txt",
-      mimeType: "text/plain",
-      buffer: Buffer.from("secret content abc123"),
-    });
-
-    await expect(page.getByText("test.txt")).toBeVisible({ timeout: 3_000 });
-
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: Please read this file")).toBeVisible({ timeout: 15_000 });
-  });
-
-  test("activity log appears during send", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Trigger activity");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    // Activity log container should appear during the send flow.
-    await expect(page.locator("[data-testid='activity-log']").first()).toBeVisible({ timeout: 10_000 }).catch(() => {
-      // Activity log may not be present in all layouts.
-    });
-  });
-});
-
-test.describe("Desktop ChatTab — Markdown rendering", () => {
-  let cleanup: () => Promise<void> = async () => {};
-  let workspaceId = "";
-  let workspaceName = "";
-
-  test.beforeAll(async () => {
-    const echo = await startEchoRuntime();
-    const ws = await seedWorkspace(echo.baseURL);
-    workspaceId = ws.id;
-    workspaceName = ws.name;
-    const stopHeartbeat = startHeartbeat(ws.id, ws.authToken);
-
-    cleanup = async () => {
-      stopHeartbeat();
-      await echo.stop();
-    };
-  });
-
-  test.afterAll(async () => {
-    await cleanupWorkspace(workspaceId);
-    await cleanup();
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 1280, height: 800 });
-    await page.goto("/");
-    await page.waitForSelector(".react-flow__node", { timeout: 10_000 });
-    const skipGuide2 = page.getByText("Skip guide");
-    if (await skipGuide2.isVisible().catch(() => false)) {
-      await skipGuide2.click();
-    }
-    await page.getByText(workspaceName, { exact: true }).first().click();
-    await page.locator('#tab-chat').click();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 5_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-  });
-
-  test("code block renders <pre>", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("```js\nconst x = 1;\n```");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: ```js")).toBeVisible({ timeout: 15_000 });
-
-    const pre = page.locator("pre").first();
-    await expect(pre).toBeVisible({ timeout: 5_000 });
-    await expect(pre).toContainText("const x = 1;");
-  });
-
-  test("table renders <table>", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("| A | B |\n|---|---|\n| 1 | 2 |");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: | A | B |")).toBeVisible({ timeout: 15_000 });
-
-    const table = page.locator("table").first();
-    await expect(table).toBeVisible({ timeout: 5_000 });
-    await expect(table).toContainText("A");
-    await expect(table).toContainText("1");
-  });
-});

canvas/e2e/chat-mobile.spec.ts

@@ -1,97 +0,0 @@
-import { test, expect } from "@playwright/test";
-import { startEchoRuntime } from "./fixtures/echo-runtime";
-import { seedWorkspace, startHeartbeat, cleanupWorkspace } from "./fixtures/chat-seed";
-
-
-test.describe("MobileChat", () => {
-  let cleanup: () => Promise<void> = async () => {};
-  let workspaceId = "";
-
-  test.beforeAll(async () => {
-    const echo = await startEchoRuntime();
-    const ws = await seedWorkspace(echo.baseURL);
-    workspaceId = ws.id;
-    const stopHeartbeat = startHeartbeat(ws.id, ws.authToken);
-
-    cleanup = async () => {
-      stopHeartbeat();
-      await echo.stop();
-    };
-  });
-
-  test.afterAll(async () => {
-    await cleanupWorkspace(workspaceId);
-    await cleanup();
-  });
-
-  test.beforeEach(async ({ page }) => {
-    await page.setViewportSize({ width: 375, height: 812 });
-    // Navigate directly to the mobile chat view.
-    await page.goto(`/?m=chat&a=${workspaceId}`);
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 10_000 });
-    // Wait for the workspace status to flip to online and the textarea to be enabled.
-    await expect(page.locator("textarea").first()).toBeEnabled({ timeout: 15_000 });
-    // Dismiss onboarding guide if present.
-    const skipGuide = page.getByText("Skip guide");
-    if (await skipGuide.isVisible().catch(() => false)) {
-      await skipGuide.click();
-    }
-  });
-
-  test("chat panel loads without error", async ({ page }) => {
-    const hasEmptyState = await page.getByText("Send a message to start chatting.").isVisible().catch(() => false);
-    const hasHistory = await page.locator("[data-testid='chat-panel']").locator("div").count() > 3;
-    expect(hasEmptyState || hasHistory).toBeTruthy();
-  });
-
-  test("send text message and receive echo response", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Mobile test message");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Mobile test message")).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: Mobile test message")).toBeVisible({ timeout: 15_000 });
-  });
-
-  test("history persists across reload", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Mobile persistence");
-    await page.getByRole("button", { name: /Send/ }).first().click();
-
-    await expect(page.getByText("Echo: Mobile persistence")).toBeVisible({ timeout: 15_000 });
-
-    await page.reload();
-    await page.waitForSelector("[data-testid='chat-panel']", { timeout: 10_000 });
-
-    await expect(page.getByText("Mobile persistence", { exact: true })).toBeVisible({ timeout: 5_000 });
-    await expect(page.getByText("Echo: Mobile persistence")).toBeVisible({ timeout: 5_000 });
-  });
-
-  test("composer auto-grows with multi-line text", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    const initialHeight = await textarea.evaluate((el: HTMLElement) => el.offsetHeight);
-
-    await textarea.fill("Line 1\nLine 2\nLine 3\nLine 4\nLine 5");
-    await page.waitForTimeout(300);
-
-    const grownHeight = await textarea.evaluate((el: HTMLElement) => el.offsetHeight);
-    expect(grownHeight).toBeGreaterThan(initialHeight);
-  });
-
-  test("file attachment in mobile chat", async ({ page }) => {
-    const textarea = page.locator("textarea").first();
-    await textarea.fill("Mobile file test");
-
-    const fileInput = page.locator("[data-testid='chat-panel'] input[type='file']").first();
-    await fileInput.setInputFiles({
-      name: "mobile.txt",
-      mimeType: "text/plain",
-      buffer: Buffer.from("mobile secret"),
-    });
-
-    await expect(page.getByText("mobile.txt")).toBeVisible({ timeout: 3_000 });
-
-    await page.getByRole("button", { name: /Send/ }).first().click();
-    await expect(page.getByText("Echo: Mobile file test")).toBeVisible({ timeout: 15_000 });
-  });
-});

canvas/e2e/fixtures/chat-seed.ts

@@ -1,187 +0,0 @@
-/**
- * E2E seed fixture for chat tests.
- *
- * Creates an external workspace via the workspace-server API, extracts the
- * auto-minted auth token, then overrides the DB row so it appears "online"
- * with an echo-runtime URL.  External runtime is used because the health
- * sweep skips Docker checks for external workspaces; we keep the workspace
- * alive with periodic heartbeats.
- */
-
-import { randomUUID } from "node:crypto";
-
-const PLATFORM_URL = process.env.E2E_PLATFORM_URL ?? "http://localhost:8080";
-
-export interface SeededWorkspace {
-  id: string;
-  name: string;
-  agentURL: string;
-  authToken: string;
-}
-
-/**
- * Create an external workspace and wire it to the echo runtime.
- */
-export async function seedWorkspace(echoURL: string): Promise<SeededWorkspace> {
-  // 1. Create external workspace (no URL — platform will mint an auth token).
-  const runId = Math.random().toString(36).slice(2, 8);
-  const wsName = `Chat E2E Agent ${runId}`;
-  const createRes = await fetch(`${PLATFORM_URL}/workspaces`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ name: wsName, tier: 1, external: true, runtime: "external" }),
-  });
-  if (!createRes.ok) {
-    const text = await createRes.text();
-    throw new Error(`Failed to create workspace: ${createRes.status} ${text}`);
-  }
-  const ws = (await createRes.json()) as {
-    id: string;
-    name: string;
-    connection?: { auth_token?: string };
-  };
-  const authToken = ws.connection?.auth_token;
-  if (!authToken) {
-    throw new Error("Workspace created but no auth_token returned");
-  }
-
-  // 2. Direct DB update: mark online + point url at echo runtime.
-  //    The platform blocks loopback URLs at the API layer (SSRF guard),
-  //    so we bypass via psql for local E2E.
-  const dbUrl = process.env.E2E_DATABASE_URL;
-  if (!dbUrl) {
-    throw new Error("E2E_DATABASE_URL must be set for DB seeding");
-  }
-  const pgRegex = /postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)/;
-  const m = dbUrl.match(pgRegex);
-  if (!m) {
-    throw new Error(`Cannot parse E2E_DATABASE_URL: ${dbUrl}`);
-  }
-  const [, user, pass, host, port, db] = m;
-
-  // Pre-seed a platform_inbound_secret so chat file uploads don't trigger
-  // the lazy-heal 503 "retry in 30 s" path on first use.
-  const inboundSecret = Array.from({ length: 43 }, () =>
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"[
-      Math.floor(Math.random() * 64)
-    ],
-  ).join("");
-
-  const psql = [
-    `PGPASSWORD=${pass} psql`,
-    `-h ${host} -p ${port} -U ${user} -d ${db}`,
-    `-c "UPDATE workspaces SET status = 'online', url = '${echoURL}', platform_inbound_secret = '${inboundSecret}' WHERE id = '${ws.id}'"`,
-  ].join(" ");
-
-  const { execSync } = await import("node:child_process");
-  try {
-    execSync(psql, { stdio: "pipe", timeout: 30_000 });
-  } catch (err) {
-    throw new Error(`DB update failed: ${err}`);
-  }
-
-  return { id: ws.id, name: wsName, agentURL: echoURL, authToken };
-}
-
-/**
- * Start a heartbeat interval that keeps an external workspace alive.
- * Returns a stop function.
- */
-export function startHeartbeat(
-  workspaceId: string,
-  authToken: string,
-  intervalMs = 30_000,
-): () => void {
-  const send = () => {
-    fetch(`${PLATFORM_URL}/registry/heartbeat`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${authToken}`,
-      },
-      body: JSON.stringify({
-        workspace_id: workspaceId,
-        error_rate: 0,
-        sample_error: "",
-        active_tasks: 0,
-        current_task: "",
-        uptime_seconds: 0,
-      }),
-    }).catch(() => {});
-  };
-
-  // Send immediately so the first heartbeat lands before the stale sweep.
-  send();
-  const timer = setInterval(send, intervalMs);
-
-  return () => clearInterval(timer);
-}
-
-/**
- * Seed chat-history rows for a workspace.
- */
-export async function seedChatHistory(
-  workspaceId: string,
-  messages: Array<{ role: "user" | "agent"; content: string }>,
-): Promise<void> {
-  const dbUrl = process.env.E2E_DATABASE_URL;
-  if (!dbUrl) return;
-
-  const pgRegex = /postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)/;
-  const m = dbUrl.match(pgRegex);
-  if (!m) return;
-  const [, user, pass, host, port, db] = m;
-
-  const values = messages
-    .map(
-      (msg, i) =>
-        `('${randomUUID()}', '${workspaceId}', '${msg.role}', '${msg.content.replace(/'/g, "''")}', NOW() - INTERVAL '${messages.length - i} seconds')`,
-    )
-    .join(",");
-
-  const sql = `INSERT INTO chat_messages (id, workspace_id, role, content, created_at) VALUES ${values};`;
-
-  const { execSync } = await import("node:child_process");
-  const psql = `PGPASSWORD=${pass} psql -h ${host} -p ${port} -U ${user} -d ${db} -c "${sql}"`;
-  execSync(psql, { stdio: "pipe", timeout: 10_000 });
-}
-
-/**
- * Delete a seeded workspace row directly from the DB.
- * Uses psql (same credentials as seedWorkspace) so we bypass any
- * workspace-server side-effects (container stop, cascade cleanup, etc.)
- * that can race or 500 on external workspaces.
- */
-export async function cleanupWorkspace(workspaceId: string): Promise<void> {
-  const dbUrl = process.env.E2E_DATABASE_URL;
-  if (!dbUrl) return;
-
-  const pgRegex = /postgres:\/\/([^:]+):([^@]+)@([^:]+):(\d+)\/([^?]+)/;
-  const m = dbUrl.match(pgRegex);
-  if (!m) return;
-  const [, user, pass, host, port, db] = m;
-
-  const psql = `PGPASSWORD=${pass} psql -h ${host} -p ${port} -U ${user} -d ${db} -c "DELETE FROM workspaces WHERE id = '${workspaceId}'"`;
-
-  const { execSync } = await import("node:child_process");
-  try {
-    execSync(psql, { stdio: "pipe", timeout: 30_000 });
-  } catch {
-    // Best-effort cleanup; don't fail the test suite if the row is already gone.
-  }
-}
-
-/**
- * Mint a workspace auth token so the canvas can make authenticated API
- * calls (WorkspaceAuth middleware).
- */
-export async function mintTestToken(workspaceId: string): Promise<string> {
-  const res = await fetch(
-    `${PLATFORM_URL}/admin/workspaces/${workspaceId}/test-token`,
-  );
-  if (!res.ok) {
-    throw new Error(`Failed to mint test token: ${res.status}`);
-  }
-  const data = (await res.json()) as { auth_token: string };
-  return data.auth_token;
-}

canvas/e2e/fixtures/echo-runtime.ts

@@ -1,180 +0,0 @@
-/**
- * Minimal A2A echo runtime for E2E tests.
- *
- * Listens on an ephemeral port, receives A2A JSON-RPC `message/send`
- * requests, and returns a response with the original text echoed back.
- * Also implements the workspace-side chat upload ingest endpoint so
- * file-attachment E2E can exercise the full upload → send → echo
- * round-trip.
- *
- * Usage (inside test fixture):
- *   const echo = await startEchoRuntime();
- *   // ... seed workspace with agent_url pointing to echo.baseURL ...
- *   echo.stop();
- */
-
-import { createServer, type Server } from "node:http";
-
-export interface EchoRuntime {
-  baseURL: string;
-  stop: () => Promise<void>;
-  lastRequest: { method: string; text: string; files: unknown[] } | null;
-}
-
-/** Parse a minimal multipart body and extract the first file's name + content. */
-function parseMultipart(body: Buffer): { name: string; mimeType: string; content: Buffer } | null {
-  // Find the boundary line (first line starting with "--").
-  const str = body.toString("binary");
-  const firstDash = str.indexOf("--");
-  if (firstDash === -1) return null;
-  const eol = str.indexOf("\r\n", firstDash);
-  if (eol === -1) return null;
-  const boundary = str.slice(firstDash + 2, eol);
-  const boundaryMarker = "\r\n--" + boundary;
-
-  // Find the first part that has a filename in Content-Disposition.
-  let pos = eol + 2;
-  while (pos < str.length) {
-    const nextBoundary = str.indexOf(boundaryMarker, pos);
-    if (nextBoundary === -1) break;
-    const part = str.slice(pos, nextBoundary);
-
-    const cdMatch = part.match(/Content-Disposition:[^\r\n]*filename="([^"]+)"/i);
-    if (cdMatch) {
-      const name = cdMatch[1];
-      const ctMatch = part.match(/Content-Type:\s*([^\r\n]+)/i);
-      const mimeType = ctMatch ? ctMatch[1].trim() : "application/octet-stream";
-      // Body starts after the first double-CRLF in the part.
-      const bodyStart = part.indexOf("\r\n\r\n");
-      if (bodyStart !== -1) {
-        // Extract the raw bytes (not the string) so binary is safe.
-        const headerBytes = Buffer.byteLength(part.slice(0, bodyStart + 4), "binary");
-        const partStartInBody = Buffer.byteLength(str.slice(0, pos + bodyStart + 4), "binary");
-        const partEndInBody = Buffer.byteLength(str.slice(0, nextBoundary), "binary");
-        const content = body.subarray(partStartInBody, partEndInBody);
-        return { name, mimeType, content };
-      }
-    }
-    pos = nextBoundary + boundaryMarker.length;
-    // Skip trailing "--" (end marker) or CRLF.
-    if (str.slice(pos, pos + 2) === "--") break;
-    if (str.slice(pos, pos + 2) === "\r\n") pos += 2;
-  }
-  return null;
-}
-
-export async function startEchoRuntime(): Promise<EchoRuntime> {
-  let lastRequest: EchoRuntime["lastRequest"] = null;
-
-  const server = createServer((req, res) => {
-    // CORS: allow the canvas origin (localhost:3000) to call us.
-    res.setHeader("Access-Control-Allow-Origin", "*");
-    res.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-    res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-
-    if (req.method === "OPTIONS") {
-      res.writeHead(204);
-      res.end();
-      return;
-    }
-
-    const url = req.url ?? "/";
-
-    // Workspace-side chat upload ingest (RFC #2312).
-    if (url === "/internal/chat/uploads/ingest" && req.method === "POST") {
-      const chunks: Buffer[] = [];
-      req.on("data", (chunk: Buffer) => chunks.push(chunk));
-      req.on("end", () => {
-        const body = Buffer.concat(chunks);
-        const file = parseMultipart(body);
-        if (!file) {
-          res.writeHead(400);
-          res.end(JSON.stringify({ error: "no files field" }));
-          return;
-        }
-        const sanitized = file.name.replace(/[^a-zA-Z0-9._\-]/g, "_").replace(/ /g, "_");
-        const prefix = Array.from({ length: 32 }, () =>
-          Math.floor(Math.random() * 16).toString(16),
-        ).join("");
-        const response = {
-          files: [
-            {
-              uri: `workspace:/workspace/.molecule/chat-uploads/${prefix}-${sanitized}`,
-              name: sanitized,
-              mimeType: file.mimeType,
-              size: file.content.length,
-            },
-          ],
-        };
-        res.setHeader("Content-Type", "application/json");
-        res.writeHead(200);
-        res.end(JSON.stringify(response));
-      });
-      return;
-    }
-
-    // Default: A2A JSON-RPC handler.
-    let body = "";
-    req.setEncoding("utf8");
-    req.on("data", (chunk: string) => {
-      body += chunk;
-    });
-    req.on("end", () => {
-      res.setHeader("Content-Type", "application/json");
-      try {
-        const rpc = JSON.parse(body);
-        const msg = rpc.params?.message;
-        const textParts =
-          msg?.parts
-            ?.filter((p: { kind?: string; text?: string }) => p.kind === "text")
-            .map((p: { text?: string }) => p.text)
-            .filter(Boolean) ?? [];
-        const fileParts =
-          msg?.parts?.filter((p: { kind?: string }) => p.kind === "file") ?? [];
-        const text = textParts.join("\n");
-
-        lastRequest = {
-          method: rpc.method ?? "unknown",
-          text,
-          files: fileParts,
-        };
-
-        const replyText = text
-          ? `Echo: ${text}`
-          : fileParts.length > 0
-            ? "Echo: received your file(s)."
-            : "Echo: hello";
-
-        const response = {
-          jsonrpc: "2.0",
-          id: rpc.id ?? null,
-          result: {
-            parts: [{ kind: "text", text: replyText }],
-          },
-        };
-
-        res.writeHead(200);
-        res.end(JSON.stringify(response));
-      } catch {
-        res.writeHead(400);
-        res.end(JSON.stringify({ error: "invalid json" }));
-      }
-    });
-  });
-
-  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
-  const address = server.address();
-  const port = typeof address === "object" && address ? address.port : 0;
-  const baseURL = `http://127.0.0.1:${port}`;
-
-  return {
-    baseURL,
-    stop: () =>
-      new Promise((resolve) => {
-        server.close(() => resolve(undefined));
-      }),
-    get lastRequest() {
-      return lastRequest;
-    },
-  };
-}

canvas/playwright.config.ts

@@ -5,10 +5,9 @@ export default defineConfig({
   timeout: 30_000,
   expect: { timeout: 10_000 },
   fullyParallel: false,
-  workers: 1,
   retries: 0,
   use: {
-    baseURL: process.env.PLAYWRIGHT_BASE_URL || "http://localhost:3000",
+    baseURL: "http://localhost:3000",
     headless: true,
     screenshot: "only-on-failure",
   },

canvas/src/app/orgs/page.tsx

@@ -327,7 +327,7 @@ function OrgCTA({ org }: { org: Org }) {
     return (
       <a
         href={href}
-        className="rounded bg-emerald-700 px-4 py-2 text-sm font-medium text-white hover:bg-emerald-600"
+        className="rounded bg-emerald-600 px-4 py-2 text-sm font-medium text-white hover:bg-emerald-500"
       >
         Open
       </a>
@@ -337,7 +337,7 @@ function OrgCTA({ org }: { org: Org }) {
     return (
       <a
         href={`/pricing?org=${encodeURIComponent(org.slug)}`}
-        className="rounded bg-amber-800 px-4 py-2 text-sm font-medium text-white hover:bg-amber-700"
+        className="rounded bg-amber-600 px-4 py-2 text-sm font-medium text-white hover:bg-amber-500"
       >
         Complete payment
       </a>

canvas/src/components/AuditTrailPanel.tsx

@@ -8,17 +8,11 @@ import type { AuditEntry, AuditResponse } from "@/types/audit";
 
 type EventFilter = "all" | AuditEntry["event_type"];
 
-// Contrast note: text is rendered on near-black bg (bg-*-950/40). Every text
-// color below is chosen to pass WCAG 2.1 AA 4.5:1 on that background:
-//   blue-300   ( delegation ) ≈ 8.8:1
-//   violet-300 ( decision   ) ≈ 9.5:1
-//   yellow-200 ( gate       ) ≈ 11.5:1
-//   orange-300 ( hitl       ) ≈ 9.1:1
 const BADGE_COLORS: Record<AuditEntry["event_type"], { text: string; bg: string; border: string }> = {
-  delegation: { text: "text-blue-300",   bg: "bg-blue-950/40",   border: "border-blue-800/40" },
-  decision:   { text: "text-violet-300", bg: "bg-violet-950/40", border: "border-violet-800/40" },
-  gate:       { text: "text-yellow-200", bg: "bg-yellow-950/40", border: "border-yellow-800/40" },
-  hitl:       { text: "text-orange-300", bg: "bg-orange-950/40", border: "border-orange-800/40" },
+  delegation: { text: "text-accent",   bg: "bg-blue-950/40",   border: "border-blue-800/40" },
+  decision:   { text: "text-violet-400", bg: "bg-violet-950/40", border: "border-violet-800/40" },
+  gate:       { text: "text-yellow-400", bg: "bg-yellow-950/40", border: "border-yellow-800/40" },
+  hitl:       { text: "text-orange-400", bg: "bg-orange-950/40", border: "border-orange-800/40" },
 };
 
 const FILTERS: { id: EventFilter; label: string }[] = [
@@ -170,10 +164,7 @@ export function AuditTrailPanel({ workspaceId }: Props) {
 
       {/* Error banner */}
       {error && (
-        <div
-          role="alert"
-          className="mx-4 mt-3 px-3 py-2 bg-red-950/30 border border-red-800/40 rounded text-xs text-bad shrink-0"
-        >
+        <div className="mx-4 mt-3 px-3 py-2 bg-red-950/30 border border-red-800/40 rounded text-xs text-bad shrink-0">
           {error}
         </div>
       )}
@@ -251,6 +242,7 @@ export function AuditEntryRow({ entry, now }: AuditEntryRowProps) {
         {/* Event-type badge */}
         <span
           className={`shrink-0 text-[9px] font-semibold uppercase tracking-wider px-1.5 py-0.5 rounded border ${badge.text} ${badge.bg} ${badge.border}`}
+          aria-label={`Event type: ${entry.event_type}`}
         >
           {entry.event_type}
         </span>

canvas/src/components/BatchActionBar.tsx

@@ -100,8 +100,8 @@ export function BatchActionBar() {
       aria-label="Batch workspace actions"
       className="fixed bottom-6 left-1/2 -translate-x-1/2 z-[200] flex items-center gap-3 px-4 py-2.5 rounded-2xl bg-surface-sunken/95 border border-line/70 shadow-2xl shadow-black/50 backdrop-blur-md"
     >
-      {/* Selection count badge — bg-zinc-700 passes 7.2:1 on white text */}
-      <span className="text-[12px] font-semibold text-white bg-zinc-700 px-2.5 py-0.5 rounded-full tabular-nums">
+      {/* Selection count badge */}
+      <span className="text-[12px] font-semibold text-white bg-accent-strong/80 px-2.5 py-0.5 rounded-full tabular-nums">
         {count} selected
       </span>
 
@@ -112,7 +112,7 @@ export function BatchActionBar() {
         type="button"
         disabled={busy}
         onClick={() => setPending("restart")}
-        className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-medium text-white bg-sky-900/30 hover:bg-sky-800/50 border border-sky-700/30 hover:border-sky-600/50 transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-sky-500/70"
+        className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-medium text-sky-300 bg-sky-900/30 hover:bg-sky-800/50 border border-sky-700/30 hover:border-sky-600/50 transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-sky-500/70"
       >
         <span aria-hidden="true">↻</span>
         Restart All
@@ -122,7 +122,7 @@ export function BatchActionBar() {
         type="button"
         disabled={busy}
         onClick={() => setPending("pause")}
-        className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-medium text-white bg-amber-900/30 hover:bg-amber-800/50 border border-amber-700/30 hover:border-amber-600/50 transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500/70"
+        className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-medium text-warm bg-amber-900/30 hover:bg-amber-800/50 border border-amber-700/30 hover:border-amber-600/50 transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500/70"
       >
         <span aria-hidden="true">⏸</span>
         Pause All
@@ -132,7 +132,7 @@ export function BatchActionBar() {
         type="button"
         disabled={busy}
         onClick={() => setPending("delete")}
-        className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-medium text-white bg-red-900/30 hover:bg-red-800/50 border border-red-700/30 hover:border-red-600/50 transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-500/70"
+        className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-[12px] font-medium text-bad bg-red-900/30 hover:bg-red-800/50 border border-red-700/30 hover:border-red-600/50 transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-500/70"
       >
         <span aria-hidden="true">✕</span>
         Delete All

canvas/src/components/CommunicationOverlay.tsx

@@ -226,7 +226,7 @@ export function CommunicationOverlay() {
           type="button"
           onClick={() => setVisible(false)}
           aria-label="Close communications panel"
-          className="text-ink-mid hover:text-ink-mid text-xs focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+          className="text-ink-mid hover:text-ink-mid text-xs focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
         >
           <span aria-hidden="true">✕</span>
         </button>

canvas/src/components/ConfirmDialog.tsx

@@ -96,7 +96,7 @@ export function ConfirmDialog({
   // readable in both light and dark themes.
   const confirmColors =
     confirmVariant === "danger"
-      ? "bg-red-700 hover:bg-red-600 text-white"
+      ? "bg-red-600 hover:bg-red-700 text-white"
       : confirmVariant === "warning"
         ? "bg-amber-800 hover:bg-amber-700 text-white"
         : "bg-accent hover:bg-accent-strong text-white";

canvas/src/components/ContextMenu.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useCanvasStore, type WorkspaceNodeData } from "@/store/canvas";
 import { api } from "@/lib/api";
 import { showToast } from "./Toaster";
@@ -23,17 +23,9 @@ export function ContextMenu() {
   const setPanelTab = useCanvasStore((s) => s.setPanelTab);
   const nestNode = useCanvasStore((s) => s.nestNode);
   const contextNodeId = contextMenu?.nodeId ?? null;
-  // Select the full nodes array (stable reference across unrelated store
-  // updates) and derive children via useMemo. Filtering inside the
-  // selector returned a new array every call, which Zustand's
-  // useSyncExternalStore saw as "snapshot changed" → schedule
-  // re-render → loop → React error #185. See canvas-store-snapshots.
-  const nodes = useCanvasStore((s) => s.nodes);
-  const children = useMemo(
-    () => (contextNodeId ? nodes.filter((n) => n.data.parentId === contextNodeId) : []),
-    [nodes, contextNodeId],
+  const hasChildren = useCanvasStore((s) =>
+    contextNodeId ? s.nodes.some((n) => n.data.parentId === contextNodeId) : false
   );
-  const hasChildren = children.length > 0;
   const setPendingDelete = useCanvasStore((s) => s.setPendingDelete);
   const ref = useRef<HTMLDivElement>(null);
   const [actionLoading, setActionLoading] = useState(false);
@@ -197,9 +189,10 @@ export function ContextMenu() {
     // it survives ContextMenu unmount. Closing the menu here avoids the
     // prior race where the portal dialog's Confirm click was treated as
     // "outside" by the menu's outside-click handler.
-    setPendingDelete({ id: contextMenu.nodeId, name: contextMenu.nodeData.name, hasChildren, children: children.map(c => ({ id: c.id, name: c.data.name })) });
+    const childNodes = useCanvasStore.getState().nodes.filter((n) => n.data.parentId === contextMenu.nodeId);
+    setPendingDelete({ id: contextMenu.nodeId, name: contextMenu.nodeData.name, hasChildren, children: childNodes.map(c => ({ id: c.id, name: c.data.name })) });
     closeContextMenu();
-  }, [contextMenu, setPendingDelete, closeContextMenu, children, hasChildren]);
+  }, [contextMenu, setPendingDelete, closeContextMenu]);
 
   const handleViewDetails = useCallback(() => {
     if (!contextMenu) return;
@@ -318,7 +311,7 @@ export function ContextMenu() {
             aria-hidden="true"
             className={`w-1.5 h-1.5 rounded-full ${statusDotClass(contextMenu.nodeData.status)}`}
           />
-          <span className="text-[10px] text-ink">{contextMenu.nodeData.status}</span>
+          <span className="text-[10px] text-ink-mid">{contextMenu.nodeData.status}</span>
         </div>
       </div>
 

canvas/src/components/ConversationTraceModal.tsx

@@ -31,25 +31,19 @@ export function extractMessageText(body: Record<string, unknown> | null): string
     if (text) return text;
 
     // Response: result.parts[].text or result.parts[].root.text
-    // Use the first part that has a direct text field; within that part,
-    // prefer direct text over root.text. Subsequent parts' root.text fields
-    // are ignored when a direct text exists in an earlier part.
     const result = body.result as Record<string, unknown> | undefined;
     const rParts = (result?.parts || []) as Array<Record<string, unknown>>;
-    const firstPartWithText = rParts.find(
-      (p) => typeof p.text === "string" && (p.text as string) !== ""
-    );
-    if (firstPartWithText) {
-      return firstPartWithText.text as string;
-    }
-    // No direct text found; use root.text from the first part (if present).
-    const firstPart = rParts[0];
-    if (firstPart) {
-      const root = firstPart.root as Record<string, unknown> | undefined;
-      if (typeof root?.text === "string" && root.text !== "") {
-        return root.text as string;
-      }
-    }
+    const rText = rParts
+      .map((p) => {
+        // Use "text" in p (not p.text) so empty-string text fields
+        // are returned without falling through to root.text.
+        if ("text" in p) return p.text as string;
+        const root = p.root as Record<string, unknown> | undefined;
+        return (root?.text as string) || "";
+      })
+      .filter(Boolean)
+      .join("\n");
+    if (rText) return rText;
 
     if (typeof body.result === "string") return body.result;
   } catch { /* ignore */ }
@@ -123,7 +117,7 @@ export function ConversationTraceModal({ open, workspaceId: _workspaceId, onClos
                 <button
                   type="button"
                   aria-label="Close conversation trace"
-                  className="text-ink-mid hover:text-ink-mid text-lg px-2 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
+                  className="text-ink-mid hover:text-ink-mid text-lg px-2 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
                 >
                   ✕
                 </button>
@@ -187,7 +181,7 @@ export function ConversationTraceModal({ open, workspaceId: _workspaceId, onClos
                                 isError
                                   ? "bg-red-950/50 text-bad"
                                   : isSend
-                                  ? "bg-cyan-950 text-cyan-300"
+                                  ? "bg-cyan-950/50 text-cyan-400"
                                   : isReceive
                                   ? "bg-blue-950/50 text-accent"
                                   : "bg-surface-card text-ink-mid"
@@ -251,7 +245,7 @@ export function ConversationTraceModal({ open, workspaceId: _workspaceId, onClos
 
                           {/* Error */}
                           {isError && entry.error_detail && (
-                            <div className="text-[10px] text-bad mt-1 truncate">
+                            <div className="text-[10px] text-bad/80 mt-1 truncate">
                               {entry.error_detail.slice(0, 200)}
                             </div>
                           )}
@@ -272,7 +266,7 @@ export function ConversationTraceModal({ open, workspaceId: _workspaceId, onClos
                           )}
                           {responseText && (
                             <div className="mt-1 bg-surface/60 border border-emerald-900/30 rounded-lg px-3 py-2 max-h-32 overflow-y-auto">
-                              <div className="text-[8px] text-good uppercase mb-1">Response</div>
+                              <div className="text-[8px] text-good/60 uppercase mb-1">Response</div>
                               <div className="text-[10px] text-ink-mid whitespace-pre-wrap break-words leading-relaxed">
                                 {responseText.slice(0, 2000)}
                                 {responseText.length > 2000 && (

canvas/src/components/DeleteCascadeConfirmDialog.tsx

@@ -126,8 +126,8 @@ export function DeleteCascadeConfirmDialog({
 
           {/* Cascade warning */}
           <div className="rounded border border-red-900/40 bg-red-950/20 px-3 py-2.5 mb-4">
-            <p className="text-[12px] text-red-300 leading-relaxed">
-              Deleting will cascade — <strong className="text-red-100">all child workspaces and their data will be permanently removed.</strong> This cannot be undone.
+            <p className="text-[12px] text-bad/80 leading-relaxed">
+              Deleting will cascade — <strong className="text-red-200">all child workspaces and their data will be permanently removed.</strong> This cannot be undone.
             </p>
           </div>
 
@@ -164,13 +164,13 @@ export function DeleteCascadeConfirmDialog({
             type="button"
             onClick={onConfirm}
             disabled={!checked}
-            // Hover goes DARKER, not lighter — bg-red-600 on white text
-            // drops contrast below AA. Same trap fixed in ConfirmDialog.
-            // focus-visible ring matches the canvas chrome.
+            // Hover goes DARKER, not lighter — bg-red-500 on white text
+            // drops contrast below AA vs bg-red-700. Same trap fixed in
+            // ConfirmDialog and ApprovalBanner. focus-visible ring matches.
             className={`px-3.5 py-1.5 text-[13px] rounded-lg transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-red-500/60 focus-visible:ring-offset-2 focus-visible:ring-offset-surface-sunken
               ${checked
-                ? "bg-red-700 hover:bg-red-600 text-white cursor-pointer"
-                : "bg-red-900/30 text-red-400 cursor-not-allowed"
+                ? "bg-red-600 hover:bg-red-700 text-white cursor-pointer"
+                : "bg-red-900/30 text-bad/40 cursor-not-allowed"
               }`}
           >
             Delete All

canvas/src/components/ErrorBoundary.tsx

@@ -51,7 +51,7 @@ export class ErrorBoundary extends React.Component<
   render() {
     if (this.state.hasError) {
       return (
-        <div role="alert" aria-live="assertive" className="fixed inset-0 flex items-center justify-center bg-surface z-50">
+        <div className="fixed inset-0 flex items-center justify-center bg-surface z-50">
           <div className="max-w-md rounded-2xl border border-red-500/30 bg-surface-sunken/90 px-8 py-8 text-center shadow-2xl shadow-black/40">
             <div className="mx-auto mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-red-500/10 border border-red-500/30">
               <svg
@@ -76,7 +76,7 @@ export class ErrorBoundary extends React.Component<
             <p className="text-sm text-ink-mid mb-1">
               An unexpected error occurred while rendering the application.
             </p>
-            <p className="text-xs text-bad mb-6 font-mono break-all">
+            <p className="text-xs text-bad/80 mb-6 font-mono break-all">
               {this.state.error?.message ?? "Unknown error"}
             </p>
             <div className="flex items-center justify-center gap-3">

canvas/src/components/ExternalConnectModal.tsx

@@ -18,7 +18,110 @@
 import { useCallback, useState } from "react";
 import * as Dialog from "@radix-ui/react-dialog";
 
-type Tab = "python" | "curl" | "claude" | "mcp" | "hermes" | "codex" | "openclaw" | "kimi" | "fields";
+// ─── Pure fill helpers ────────────────────────────────────────────────────────
+// Each snippet is server-stamped with workspace_id + platform_url but leaves
+// AUTH_TOKEN as a placeholder. These helpers stamp the real token in so the
+// operator's copy-paste is truly ready-to-run. All are pure string ops.
+
+export function fillPythonSnippet(
+  snippet: string,
+  authToken: string,
+): string {
+  return snippet.replace(
+    'AUTH_TOKEN    = "<paste from create response>"',
+    `AUTH_TOKEN    = "${authToken}"`,
+  );
+}
+
+export function fillCurlSnippet(
+  snippet: string,
+  authToken: string,
+): string {
+  return snippet.replace(
+    'WORKSPACE_AUTH_TOKEN="<paste from create response>"',
+    `WORKSPACE_AUTH_TOKEN="${authToken}"`,
+  );
+}
+
+export function fillChannelSnippet(
+  snippet: string | undefined,
+  authToken: string,
+): string | undefined {
+  return snippet?.replace(
+    'MOLECULE_WORKSPACE_TOKENS=<paste auth_token from create response>',
+    `MOLECULE_WORKSPACE_TOKENS=${authToken}`,
+  );
+}
+
+export function fillUniversalMcpSnippet(
+  snippet: string | undefined,
+  authToken: string,
+): string | undefined {
+  return snippet?.replace(
+    'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+    `MOLECULE_WORKSPACE_TOKEN="${authToken}"`,
+  );
+}
+
+export function fillHermesSnippet(
+  snippet: string | undefined,
+  authToken: string,
+): string | undefined {
+  return snippet?.replace(
+    'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+    `MOLECULE_WORKSPACE_TOKEN="${authToken}"`,
+  );
+}
+
+export function fillCodexSnippet(
+  snippet: string | undefined,
+  authToken: string,
+): string | undefined {
+  return snippet?.replace(
+    'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"',
+    `MOLECULE_WORKSPACE_TOKEN = "${authToken}"`,
+  );
+}
+
+export function fillOpenClawSnippet(
+  snippet: string | undefined,
+  authToken: string,
+): string | undefined {
+  return snippet?.replace(
+    'WORKSPACE_TOKEN="<paste from create response>"',
+    `WORKSPACE_TOKEN="${authToken}"`,
+  );
+}
+
+/** Build the ordered tab list shown in the modal. Each tab only appears when
+ *  the platform supplies the corresponding snippet. */
+export function buildTabOrder(info: ExternalConnectionInfo): Tab[] {
+  const tabs: Tab[] = [];
+  const { filledUniversalMcp, filledChannel, filledHermes, filledCodex, filledOpenClaw } = buildFilledSnippets(info);
+  if (filledUniversalMcp) tabs.push("mcp");
+  tabs.push("python");
+  if (filledChannel) tabs.push("claude");
+  if (filledHermes) tabs.push("hermes");
+  if (filledCodex) tabs.push("codex");
+  if (filledOpenClaw) tabs.push("openclaw");
+  tabs.push("curl", "fields");
+  return tabs;
+}
+
+/** Pre-fill all snippets from an info object. Exposed for testing. */
+export function buildFilledSnippets(info: ExternalConnectionInfo) {
+  return {
+    filledPython: fillPythonSnippet(info.python_snippet, info.auth_token),
+    filledCurl: fillCurlSnippet(info.curl_register_template, info.auth_token),
+    filledChannel: fillChannelSnippet(info.claude_code_channel_snippet, info.auth_token),
+    filledUniversalMcp: fillUniversalMcpSnippet(info.universal_mcp_snippet, info.auth_token),
+    filledHermes: fillHermesSnippet(info.hermes_channel_snippet, info.auth_token),
+    filledCodex: fillCodexSnippet(info.codex_snippet, info.auth_token),
+    filledOpenClaw: fillOpenClawSnippet(info.openclaw_snippet, info.auth_token),
+  };
+}
+
+type Tab = "python" | "curl" | "claude" | "mcp" | "hermes" | "codex" | "openclaw" | "fields";
 
 export interface ExternalConnectionInfo {
   workspace_id: string;
@@ -58,10 +161,6 @@ export interface ExternalConnectionInfo {
   // openclaw gateway on loopback. Outbound-tools-only today; push
   // parity on an external openclaw needs a sessions.steer bridge.
   openclaw_snippet?: string;
-  // Kimi CLI setup snippet — self-contained Python heartbeat script
-  // that keeps a Kimi workspace online in poll mode. Optional for
-  // backward compat with platforms that haven't shipped the Kimi tab.
-  kimi_snippet?: string;
 }
 
 interface Props {
@@ -106,59 +205,7 @@ export function ExternalConnectModal({ info, onClose }: Props) {
 
   if (!info) return null;
 
-  // Python snippet is stamped server-side with workspace_id +
-  // platform_url but leaves AUTH_TOKEN as a "<paste …>" placeholder
-  // (that's what we're showing in the modal). Fill in the real
-  // token here so the snippet the operator copies is truly ready-to-run.
-  const filledPython = info.python_snippet.replace(
-    'AUTH_TOKEN    = "<paste from create response>"',
-    `AUTH_TOKEN    = "${info.auth_token}"`,
-  );
-  const filledCurl = info.curl_register_template.replace(
-    'WORKSPACE_AUTH_TOKEN="<paste from create response>"',
-    `WORKSPACE_AUTH_TOKEN="${info.auth_token}"`,
-  );
-  // The channel snippet asks the operator to paste the auth_token into
-  // the .env file's MOLECULE_WORKSPACE_TOKENS field. Stamp it server-side
-  // here so the copy-paste-block is truly ready-to-run.
-  const filledChannel = info.claude_code_channel_snippet?.replace(
-    'MOLECULE_WORKSPACE_TOKENS=<paste auth_token from create response>',
-    `MOLECULE_WORKSPACE_TOKENS=${info.auth_token}`,
-  );
-  // Universal MCP snippet uses MOLECULE_WORKSPACE_TOKEN as the env-var
-  // name passed through to molecule-mcp via `claude mcp add ... -- env
-  // MOLECULE_WORKSPACE_TOKEN=...`. The placeholder must match the
-  // template's literal — pre-2026-04-30 polish this looked for
-  // WORKSPACE_AUTH_TOKEN (carryover from the curl tab), which silently
-  // skipped the substitution and left "<paste from create response>"
-  // visible in the operator's clipboard.
-  const filledUniversalMcp = info.universal_mcp_snippet?.replace(
-    'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
-    `MOLECULE_WORKSPACE_TOKEN="${info.auth_token}"`,
-  );
-  // Hermes channel snippet uses MOLECULE_WORKSPACE_TOKEN (same env-var
-  // name as Universal MCP). Stamp the auth_token in so the operator's
-  // copy-paste is fully ready-to-run.
-  const filledHermes = info.hermes_channel_snippet?.replace(
-    'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
-    `MOLECULE_WORKSPACE_TOKEN="${info.auth_token}"`,
-  );
-  // Codex + OpenClaw snippets carry the placeholder inside the
-  // generated config block (TOML / JSON respectively). Stamp the
-  // token in so the copy-paste is one less manual edit.
-  const filledCodex = info.codex_snippet?.replace(
-    'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"',
-    `MOLECULE_WORKSPACE_TOKEN = "${info.auth_token}"`,
-  );
-  const filledOpenClaw = info.openclaw_snippet?.replace(
-    'WORKSPACE_TOKEN="<paste from create response>"',
-    `WORKSPACE_TOKEN="${info.auth_token}"`,
-  );
-  // Kimi snippet carries the placeholder inside the shell heredoc.
-  const filledKimi = info.kimi_snippet?.replace(
-    'MOLECULE_WORKSPACE_TOKEN=<paste from create response>',
-    `MOLECULE_WORKSPACE_TOKEN=${info.auth_token}`,
-  );
+  const { filledPython, filledCurl, filledChannel, filledUniversalMcp, filledHermes, filledCodex, filledOpenClaw } = buildFilledSnippets(info);
 
   return (
     <Dialog.Root open onOpenChange={(o) => !o && onClose()}>
@@ -180,28 +227,7 @@ export function ExternalConnectModal({ info, onClose }: Props) {
             aria-label="Connection snippet format"
             className="mt-4 flex gap-1 border-b border-line"
           >
-            {(() => {
-              // Build the tab order dynamically. Claude Code first
-              // (when offered) since it's the simplest setup; Python
-              // SDK second (full register+heartbeat+inbound); Universal
-              // MCP third (any MCP-aware runtime, outbound-only); curl
-              // for one-shot register; Fields for raw values.
-              // Tab order: Universal MCP first (default, runtime-
-              // agnostic primitives), then runtime-specific channel/
-              // SDK tabs, then curl + Fields. Each runtime tab only
-              // appears when the platform supplies the snippet — no
-              // dead "tab missing snippet" UX.
-              const tabs: Tab[] = [];
-              if (filledUniversalMcp) tabs.push("mcp");
-              tabs.push("python");
-              if (filledChannel) tabs.push("claude");
-              if (filledHermes) tabs.push("hermes");
-              if (filledCodex) tabs.push("codex");
-              if (filledOpenClaw) tabs.push("openclaw");
-              if (filledKimi) tabs.push("kimi");
-              tabs.push("curl", "fields");
-              return tabs;
-            })().map((t) => (
+            {buildTabOrder(info).map((t) => (
               <button
                 key={t}
                 type="button"
@@ -222,8 +248,6 @@ export function ExternalConnectModal({ info, onClose }: Props) {
                   ? "Codex"
                   : t === "openclaw"
                   ? "OpenClaw"
-                  : t === "kimi"
-                  ? "Kimi"
                   : t === "python"
                   ? "Python SDK"
                   : t === "mcp"
@@ -300,15 +324,6 @@ export function ExternalConnectModal({ info, onClose }: Props) {
                 onCopy={() => copy(filledOpenClaw, "openclaw")}
               />
             )}
-            {tab === "kimi" && filledKimi && (
-              <SnippetBlock
-                value={filledKimi}
-                label="Kimi CLI — self-contained Python bridge. Registers, heartbeats, polls for canvas messages, and echoes replies back. NAT-safe (no public URL). Run in a background terminal or via launchd."
-                copyKey="kimi"
-                copied={copiedKey === "kimi"}
-                onCopy={() => copy(filledKimi, "kimi")}
-              />
-            )}
             {tab === "fields" && (
               <div className="space-y-2">
                 <Field label="workspace_id" value={info.workspace_id} onCopy={() => copy(info.workspace_id, "wsid")} copied={copiedKey === "wsid"} />
@@ -360,7 +375,7 @@ function SnippetBlock({
         <button
           type="button"
           onClick={onCopy}
-          className="text-xs px-2 py-1 rounded bg-accent text-white hover:bg-accent-strong transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+          className="text-xs px-2 py-1 rounded bg-accent-strong/80 hover:bg-accent text-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
         >
           {copied ? "Copied!" : "Copy"}
         </button>
@@ -397,7 +412,7 @@ function Field({
         type="button"
         onClick={onCopy}
         disabled={!value}
-        className="text-xs px-2 py-1 rounded bg-surface-card hover:bg-surface-card text-ink disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+        className="text-xs px-2 py-1 rounded bg-surface-card hover:bg-surface-card text-ink disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
       >
         {copied ? "Copied!" : "Copy"}
       </button>

canvas/src/components/MemoryInspectorPanel.tsx

@@ -360,7 +360,7 @@ export function MemoryInspectorPanel({ workspaceId }: Props) {
                 setDebouncedQuery('');
               }}
               aria-label="Clear search"
-              className="absolute right-2 text-ink-mid hover:text-ink transition-colors text-sm leading-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="absolute right-2 text-ink-mid hover:text-ink transition-colors text-sm leading-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
             >
               ×
             </button>
@@ -381,7 +381,7 @@ export function MemoryInspectorPanel({ workspaceId }: Props) {
           type="button"
           onClick={loadEntries}
           disabled={pluginUnavailable}
-          className="px-2 py-1 text-[11px] bg-surface-card hover:bg-surface-card text-ink-mid rounded transition-colors disabled:opacity-50 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+          className="px-2 py-1 text-[11px] bg-surface-card hover:bg-surface-card text-ink-mid rounded transition-colors disabled:opacity-50 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
           aria-label="Refresh memories"
         >
           ↻ Refresh
@@ -515,7 +515,7 @@ function MemoryEntryRow({ entry, onDelete }: MemoryEntryRowProps) {
       {/* Header row */}
       <button
         type="button"
-        className="w-full flex items-center gap-2 px-3 py-2.5 text-left hover:bg-surface-card/30 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+        className="w-full flex items-center gap-2 px-3 py-2.5 text-left hover:bg-surface-card/30 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
         onClick={() => setExpanded((prev) => !prev)}
         aria-expanded={expanded}
         aria-controls={bodyId}
@@ -629,7 +629,7 @@ function MemoryEntryRow({ entry, onDelete }: MemoryEntryRowProps) {
                 onDelete();
               }}
               aria-label="Forget memory"
-              className="text-[10px] px-2 py-0.5 bg-red-950/40 hover:bg-red-900/50 border border-red-900/30 rounded text-bad transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-400 focus-visible:ring-offset-1"
+              className="text-[10px] px-2 py-0.5 bg-red-950/40 hover:bg-red-900/50 border border-red-900/30 rounded text-bad transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-500/60 focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
             >
               Forget
             </button>

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, " ")
@@ -451,7 +451,7 @@ function ProviderPickerModal({
                     <button
                       onClick={() => handleSaveKey(index)}
                       disabled={!entry.value.trim() || entry.saving}
-                      className="px-3 py-1.5 bg-accent-strong hover:bg-accent text-[11px] rounded text-white disabled:opacity-30 transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+                      className="px-3 py-1.5 bg-accent-strong hover:bg-accent text-[11px] rounded text-white disabled:opacity-30 transition-colors shrink-0"
                     >
                       {entry.saving ? "..." : "Save"}
                     </button>
@@ -492,7 +492,7 @@ function ProviderPickerModal({
                 !selectorValue.providerId ||
                 (showModelInput && model.trim() === "")
               }
-              className="px-3.5 py-1.5 text-[12px] bg-accent-strong hover:bg-accent text-white rounded-lg transition-colors disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="px-3.5 py-1.5 text-[12px] bg-accent-strong hover:bg-accent text-white rounded-lg transition-colors disabled:opacity-40"
             >
               {allSaved ? "Deploy" : entries.length > 1 ? "Add Keys" : "Add Key"}
             </button>
@@ -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, " ")
@@ -631,8 +631,9 @@ function AllKeysModal({
     // React's commit ordering.
     <div className="fixed inset-0 z-[60] flex items-center justify-center">
       <div
-        className="absolute inset-0 bg-black/70 backdrop-blur-sm"
         aria-hidden="true"
+        className="absolute inset-0 bg-black/70 backdrop-blur-sm"
+        aria-label="Dismiss modal"
         onClick={onCancel}
       />
 
@@ -706,7 +707,7 @@ function AllKeysModal({
                     type="button"
                     onClick={() => handleSaveKey(index)}
                     disabled={!entry.value.trim() || entry.saving}
-                    className="px-3 py-1.5 bg-accent-strong hover:bg-accent text-[11px] rounded text-white disabled:opacity-30 transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+                    className="px-3 py-1.5 bg-accent-strong hover:bg-accent text-[11px] rounded text-white disabled:opacity-30 transition-colors shrink-0 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
                   >
                     {entry.saving ? "..." : "Save"}
                   </button>
@@ -730,7 +731,7 @@ function AllKeysModal({
               <button
                 type="button"
                 onClick={onOpenSettings}
-                className="text-[11px] text-accent hover:text-accent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+                className="text-[11px] text-accent hover:text-accent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
               >
                 Open Settings Panel
               </button>
@@ -740,7 +741,7 @@ function AllKeysModal({
             <button
               type="button"
               onClick={onCancel}
-              className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
             >
               Cancel Deploy
             </button>
@@ -748,7 +749,7 @@ function AllKeysModal({
               type="button"
               onClick={handleAddKeysAndDeploy}
               disabled={!allSaved || anySaving}
-              className="px-3.5 py-1.5 text-[12px] bg-accent-strong hover:bg-accent text-white rounded-lg transition-colors disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="px-3.5 py-1.5 text-[12px] bg-accent-strong hover:bg-accent text-white rounded-lg transition-colors disabled:opacity-40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
             >
               {anySaving ? "Saving..." : allSaved ? "Deploy" : "Add Keys"}
             </button>

canvas/src/components/OrgImportPreflightModal.tsx

@@ -308,7 +308,7 @@ export function OrgImportPreflightModal({
               type="button"
               onClick={onProceed}
               disabled={!canProceed}
-              className="px-4 py-1.5 text-[11px] font-semibold rounded bg-accent hover:bg-accent-strong text-white disabled:bg-surface-card disabled:text-ink-soft disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="px-4 py-1.5 text-[11px] font-semibold rounded bg-accent hover:bg-accent-strong text-white disabled:bg-surface-card disabled:text-white-soft disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
             >
               Import
             </button>
@@ -428,7 +428,7 @@ function StrictEnvRow({
             type="button"
             onClick={() => onSave(envKey)}
             disabled={d?.saving || !d?.value.trim()}
-            className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+            className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
           >
             {d?.saving ? "…" : "Save"}
           </button>
@@ -520,7 +520,7 @@ function AnyOfEnvGroup({
                     type="button"
                     onClick={() => onSave(m)}
                     disabled={d?.saving || !d?.value.trim()}
-                    className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+                    className="px-2 py-1 text-[10px] rounded bg-accent hover:bg-accent-strong text-white disabled:opacity-40 disabled:cursor-not-allowed focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
                   >
                     {d?.saving ? "…" : "Save"}
                   </button>

canvas/src/components/ProviderModelSelector.tsx

@@ -420,7 +420,7 @@ export function ProviderModelSelector({
               spellCheck={false}
               autoComplete="off"
               data-testid="model-input"
-              className="w-full bg-surface-sunken border border-line rounded px-2 py-1.5 text-[11px] text-ink font-mono focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:border-accent transition-colors disabled:opacity-50"
+              className="w-full bg-surface-sunken border border-line rounded px-2 py-1.5 text-[11px] text-ink font-mono focus:outline-none focus:border-accent focus:ring-1 focus:ring-accent/20 transition-colors disabled:opacity-50"
             />
             <p className="text-[9px] text-ink-mid mt-1 leading-relaxed">
               {selected?.wildcard
@@ -437,7 +437,7 @@ export function ProviderModelSelector({
                     handleModelChange(selected.models[0]?.id ?? "");
                   }
                 }}
-                className="text-[9px] text-accent hover:text-accent mt-0.5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+                className="text-[9px] text-accent hover:text-accent mt-0.5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
               >
                 ← back to model list
               </button>

canvas/src/components/ProvisioningTimeout.tsx

@@ -321,7 +321,7 @@ export function ProvisioningTimeout({
                     onClick={() => handleDismiss(entry.workspaceId)}
                     aria-label="Dismiss provisioning timeout warning"
                     title="Dismiss — keep this workspace running without the warning"
-                    className="shrink-0 text-warm/60 hover:text-amber-200 transition-colors -mr-1 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400 focus-visible:ring-offset-1 focus-visible:ring-offset-amber-950"
+                    className="shrink-0 text-warm/60 hover:text-amber-200 transition-colors -mr-1"
                   >
                     <svg width="14" height="14" viewBox="0 0 16 16" fill="none" aria-hidden="true">
                       <path d="M4 4l8 8M12 4l-8 8" stroke="currentColor" strokeWidth="1.6" strokeLinecap="round" />
@@ -341,7 +341,7 @@ export function ProvisioningTimeout({
                     type="button"
                     onClick={() => handleRetry(entry.workspaceId)}
                     disabled={isRetrying || isCancelling || retryCooldown.has(entry.workspaceId)}
-                    className="px-3 py-1.5 bg-amber-800 hover:bg-amber-700 text-[11px] font-medium rounded-lg text-white disabled:opacity-40 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400 focus-visible:ring-offset-1 focus-visible:ring-offset-amber-950"
+                    className="px-3 py-1.5 bg-amber-600 hover:bg-amber-500 text-[11px] font-medium rounded-lg text-white disabled:opacity-40 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400/70 focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
                   >
                     {isRetrying ? "Retrying..." : retryCooldown.has(entry.workspaceId) ? "Wait..." : "Retry"}
                   </button>
@@ -349,14 +349,14 @@ export function ProvisioningTimeout({
                     type="button"
                     onClick={() => handleCancelRequest(entry.workspaceId)}
                     disabled={isRetrying || isCancelling}
-                    className="px-3 py-1.5 bg-surface-card hover:bg-surface-card text-[11px] text-ink-mid rounded-lg border border-line disabled:opacity-40 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-amber-950"
+                    className="px-3 py-1.5 bg-surface-card hover:bg-surface-card text-[11px] text-ink-mid rounded-lg border border-line disabled:opacity-40 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
                   >
                     {isCancelling ? "Cancelling..." : "Cancel"}
                   </button>
                   <button
                     type="button"
                     onClick={() => handleViewLogs(entry.workspaceId)}
-                    className="px-3 py-1.5 text-[11px] text-warm hover:text-warm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400 focus-visible:ring-offset-1 focus-visible:ring-offset-amber-950"
+                    className="px-3 py-1.5 text-[11px] text-warm hover:text-warm transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400/70 focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
                   >
                     View Logs
                   </button>
@@ -382,14 +382,14 @@ export function ProvisioningTimeout({
               <button
                 type="button"
                 onClick={() => setConfirmingCancel(null)}
-                className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+                className="px-3.5 py-1.5 text-[12px] text-ink-mid hover:text-ink bg-surface-card hover:bg-surface-card border border-line rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
               >
                 Keep
               </button>
               <button
                 type="button"
                 onClick={handleCancelConfirm}
-                className="px-3.5 py-1.5 text-[12px] bg-red-800 hover:bg-red-700 text-white rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-400 focus-visible:ring-offset-1"
+                className="px-3.5 py-1.5 text-[12px] bg-red-600 hover:bg-red-500 text-white rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-400/70 focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
               >
                 Remove Workspace
               </button>

canvas/src/components/SearchDialog.tsx

@@ -91,16 +91,19 @@ export function SearchDialog() {
   if (!open) return null;
 
   return (
-    <div
-      className="fixed inset-0 z-[70] flex items-start justify-center pt-[20vh] bg-black/50 backdrop-blur-sm"
-      onClick={() => setOpen(false)}
-    >
+    <div className="fixed inset-0 z-[70] flex items-start justify-center pt-[20vh]">
+      {/* Backdrop — interactive dismiss area; aria-hidden so screen readers ignore it */}
+      <div
+        className="absolute inset-0 bg-black/50 backdrop-blur-sm cursor-pointer"
+        onClick={() => setOpen(false)}
+        aria-hidden="true"
+      />
+      {/* Dialog */}
       <div
         role="dialog"
         aria-modal="true"
         aria-label="Search workspaces"
-        className="w-[420px] bg-surface/95 backdrop-blur-xl border border-line/60 rounded-2xl shadow-2xl shadow-black/50 overflow-hidden"
-        onClick={(e) => e.stopPropagation()}
+        className="relative z-[71] w-[420px] bg-surface/95 backdrop-blur-xl border border-line/60 rounded-2xl shadow-2xl shadow-black/50 overflow-hidden"
       >
         {/* Search input */}
         <div className="flex items-center gap-3 px-4 py-3 border-b border-line/40">

canvas/src/components/SidePanel.tsx

@@ -197,7 +197,7 @@ export function SidePanel() {
           type="button"
           onClick={() => selectNode(null)}
           aria-label="Close workspace panel"
-          className="w-7 h-7 flex items-center justify-center rounded-lg text-ink-mid hover:text-ink hover:bg-surface-card/60 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+          className="w-7 h-7 flex items-center justify-center rounded-lg text-ink-mid hover:text-ink hover:bg-surface-card/60 transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
         >
           <svg width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true">
             <path d="M1 1l10 10M11 1L1 11" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
@@ -268,7 +268,7 @@ export function SidePanel() {
             onClick={() => {
               useCanvasStore.getState().restartWorkspace(selectedNodeId).catch(() => showToast("Restart failed", "error"));
             }}
-            className="text-[11px] px-2 py-1 bg-sky-800/40 hover:bg-sky-700/50 text-sky-200 rounded transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+            className="text-[11px] px-2 py-1 bg-sky-800/40 hover:bg-sky-700/50 text-sky-200 rounded transition-colors"
           >
             Restart Now
           </button>

canvas/src/components/TemplatePalette.tsx

@@ -236,7 +236,7 @@ export function OrgTemplatesSection() {
           onClick={() => setExpanded((v) => !v)}
           aria-expanded={expanded}
           aria-controls="org-templates-body"
-          className="flex items-center gap-1.5 text-[10px] uppercase tracking-wide text-ink-mid hover:text-ink-mid font-semibold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+          className="flex items-center gap-1.5 text-[10px] uppercase tracking-wide text-ink-mid hover:text-ink-mid font-semibold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
         >
           <span
             aria-hidden="true"
@@ -255,7 +255,7 @@ export function OrgTemplatesSection() {
           type="button"
           onClick={loadOrgs}
           aria-label="Refresh org templates"
-          className="text-[10px] text-ink-mid hover:text-ink-mid focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+          className="text-[10px] text-ink-mid hover:text-ink-mid focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
         >
           ↻
         </button>
@@ -306,7 +306,7 @@ export function OrgTemplatesSection() {
               type="button"
               onClick={() => handleImport(o)}
               disabled={isImporting}
-              className="w-full px-2 py-1.5 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[10px] text-accent font-medium transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="w-full px-2 py-1.5 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[10px] text-accent font-medium transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
             >
               {isImporting ? "Importing…" : "Import org"}
             </button>
@@ -411,7 +411,7 @@ function ImportAgentButton({ onImported }: { onImported: () => void }) {
         type="button"
         onClick={() => fileInputRef.current?.click()}
         disabled={importing}
-        className="w-full px-3 py-2 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[11px] text-accent font-medium transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+        className="w-full px-3 py-2 bg-accent-strong/20 hover:bg-accent-strong/30 border border-accent/30 rounded-lg text-[11px] text-accent font-medium transition-colors disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface"
       >
         {importing ? "Importing..." : "Import Agent Folder"}
       </button>
@@ -474,7 +474,7 @@ export function TemplatePalette() {
       <button
         type="button"
         onClick={() => setOpen(!open)}
-        className={`fixed top-4 left-4 z-40 w-9 h-9 flex items-center justify-center rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 ${
+        className={`fixed top-4 left-4 z-40 w-9 h-9 flex items-center justify-center rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-surface ${
           open
             ? "bg-accent-strong text-white"
             : "bg-surface-sunken/90 border border-line/50 text-ink-mid hover:text-ink hover:border-line"
@@ -580,7 +580,7 @@ export function TemplatePalette() {
             <button
               type="button"
               onClick={loadTemplates}
-              className="text-[10px] text-ink-mid hover:text-ink-mid transition-colors block focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1"
+              className="text-[10px] text-ink-mid hover:text-ink-mid transition-colors block focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface rounded"
             >
               Refresh templates
             </button>

canvas/src/components/ThemeToggle.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { useTheme, type ThemePreference } from "@/lib/theme-provider";
-import { useCallback } from "react";
 
 const OPTIONS: { value: ThemePreference; label: string; icon: string }[] = [
   // Sun: explicit light
@@ -34,51 +33,17 @@ const OPTIONS: { value: ThemePreference; label: string; icon: string }[] = [
  *
  * Aligned with molecule-app/components/theme-toggle.tsx so the picker
  * behaves identically across surfaces.
- *
- * WCAG 2.4.7: focus-visible rings on all three icon buttons.
- * ARIA radiogroup pattern (2.1.1): Left/Right arrow keys move focus
- * between options and update selection; Home/End jump to first/last.
  */
 export function ThemeToggle({ className = "" }: { className?: string }) {
   const { theme, setTheme } = useTheme();
 
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLButtonElement>, index: number) => {
-      let next = index;
-      if (e.key === "ArrowRight" || e.key === "ArrowDown") {
-        e.preventDefault();
-        next = (index + 1) % OPTIONS.length;
-      } else if (e.key === "ArrowLeft" || e.key === "ArrowUp") {
-        e.preventDefault();
-        next = (index - 1 + OPTIONS.length) % OPTIONS.length;
-      } else if (e.key === "Home") {
-        e.preventDefault();
-        next = 0;
-      } else if (e.key === "End") {
-        e.preventDefault();
-        next = OPTIONS.length - 1;
-      } else {
-        return;
-      }
-      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
-      // elsewhere in the DOM (e.g. React Flow canvas nodes).
-      const radiogroup = e.currentTarget.closest("[role=radiogroup]") as HTMLElement | null;
-      const btns = radiogroup?.querySelectorAll<HTMLButtonElement>("[role=radio]");
-      btns?.[next]?.focus();
-    },
-    []
-  );
-
   return (
     <div
       role="radiogroup"
       aria-label="Theme preference"
       className={`inline-flex items-center gap-0.5 rounded-md border border-line bg-surface-sunken p-0.5 ${className}`}
     >
-      {OPTIONS.map((opt, index) => {
+      {OPTIONS.map((opt) => {
         const active = theme === opt.value;
         return (
           <button
@@ -88,12 +53,11 @@ export function ThemeToggle({ className = "" }: { className?: string }) {
             aria-checked={active}
             aria-label={opt.label}
             onClick={() => setTheme(opt.value)}
-            onKeyDown={(e) => handleKeyDown(e, index)}
             className={
-              "flex h-6 w-6 items-center justify-center rounded transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface-sunken " +
+              "flex h-6 w-6 items-center justify-center rounded transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-1 focus-visible:ring-offset-surface " +
               (active
                 ? "bg-surface-elevated text-ink shadow-sm"
-                : "text-ink-mid hover:text-ink")
+                : "text-ink-mid hover:text-ink-mid")
             }
           >
             <svg

canvas/src/components/Tooltip.tsx

@@ -45,6 +45,12 @@ export function Tooltip({ text, children }: Props) {
       if (triggerRef.current) {
         const rect = triggerRef.current.getBoundingClientRect();
         setPos({ x: rect.left, y: rect.top });
+        // Focus the first focusable descendant (the actual trigger button),
+        // not the wrapper div, so screen-reader/navigation UX is correct.
+        const firstFocusable = triggerRef.current.querySelector<HTMLElement>(
+          'button, [tabindex], input, select, textarea, a[href]'
+        );
+        firstFocusable?.focus();
       }
       setShow(true);
     }, 400);

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__/ApprovalBanner.test.tsx

@@ -2,27 +2,34 @@
 /**
  * Tests for ApprovalBanner component.
  *
- * Covers: renders nothing when no approvals, polls /approvals/pending,
- * shows approval cards, approve/deny decisions, toast notifications.
- *
- * Uses vi.hoisted + vi.mock (file-level) for @/lib/api. vi.resetModules()
- * in every afterEach undoes the mock so other test files that import the
- * real api module (e.g. socket.url.test.ts) are unaffected.
+ * Uses vi.hoisted + vi.mock for stable module-level API mocks that survive
+ * vi.resetModules() cleanup. BeforeEach uses mockReset + mockResolvedValue
+ * so each test gets a clean slate.
  */
 import React from "react";
-import { render, screen, fireEvent, cleanup, act } from "@testing-library/react";
+import { render, screen, fireEvent, cleanup, waitFor, act } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi, beforeEach } from "vitest";
 import { ApprovalBanner } from "../ApprovalBanner";
 import { showToast } from "@/components/Toaster";
+import { api } from "@/lib/api";
 
-// ─── Hoisted mock refs ─────────────────────────────────────────────────────────
-// vi.hoisted runs in the same hoisting phase as vi.mock factories, so these
-// refs are stable across all tests and available inside the mock factory.
-const { mockApiGet, mockApiPost } = vi.hoisted(() => ({
-  mockApiGet: vi.fn<(args: unknown[]) => Promise<unknown>>(),
-  mockApiPost: vi.fn<(args: unknown[]) => Promise<unknown>>(),
+// ─── Module-level mocks ───────────────────────────────────────────────────────
+// vi.hoisted captures stable references BEFORE hoisting so they are accessible
+// in the test body after vi.mock registers.
+const _mockGet = vi.hoisted<typeof api.get>(() => vi.fn<() => Promise<unknown[]>>());
+const _mockPost = vi.hoisted<typeof api.post>(() => vi.fn<() => Promise<unknown>>());
+const _mockToast = vi.hoisted<typeof showToast>(() => vi.fn());
+
+vi.mock("@/lib/api", () => ({
+  api: { get: _mockGet, post: _mockPost },
 }));
 
+vi.mock("@/components/Toaster", () => ({
+  showToast: _mockToast,
+}));
+
+afterEach(cleanup);
+
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
 const pendingApproval = (id = "a1", workspaceId = "ws-1"): {
@@ -43,310 +50,271 @@ const pendingApproval = (id = "a1", workspaceId = "ws-1"): {
   created_at: "2026-05-10T10:00:00Z",
 });
 
-// ─── Static mocks (file-level — no other test needs the real modules) ─────────
+// ─── Cleanup ─────────────────────────────────────────────────────────────────
 
-vi.mock("@/components/Toaster", () => ({
-  showToast: vi.fn(),
-}));
+beforeEach(() => {
+  _mockGet.mockReset();
+  _mockGet.mockResolvedValue([] as unknown[]);
+  _mockPost.mockReset();
+  _mockPost.mockResolvedValue({} as unknown);
+  _mockToast.mockClear();
+});
 
-// vi.resetModules() in afterEach undoes this mock so other files that import
-// the real api module are unaffected.
-vi.mock("@/lib/api", () => ({
-  api: {
-    get: mockApiGet,
-    post: mockApiPost,
-  },
-}));
+afterEach(() => {
+  cleanup();
+});
 
-// ─── Tests ─────────────────────────────────────────────────────────────────────
+// ─── Tests ────────────────────────────────────────────────────────────────────
 
 describe("ApprovalBanner — empty state", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    mockApiGet.mockReset().mockResolvedValue([]);
-    mockApiPost.mockReset().mockResolvedValue({});
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.resetModules();
-  });
-
   it("renders nothing when there are no pending approvals", async () => {
+    _mockGet.mockResolvedValueOnce([] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.queryByRole("alert")).toBeNull();
-    expect(mockApiGet).toHaveBeenCalled();
   });
 
   it("does not render any approve/deny buttons when list is empty", async () => {
+    _mockGet.mockResolvedValueOnce([] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.queryByRole("button", { name: /approve/i })).toBeNull();
     expect(screen.queryByRole("button", { name: /deny/i })).toBeNull();
   });
 });
 
 describe("ApprovalBanner — renders approval cards", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    mockApiGet.mockReset().mockResolvedValue([
+  it("renders an alert card for each pending approval", async () => {
+    _mockGet.mockResolvedValueOnce([
       pendingApproval("a1"),
       pendingApproval("a2", "ws-2"),
-    ]);
-    mockApiPost.mockReset().mockResolvedValue({});
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.resetModules();
-  });
-
-  it("renders an alert card for each pending approval", async () => {
+    ] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    expect(screen.getAllByRole("alert")).toHaveLength(2);
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    const alerts = screen.getAllByRole("alert");
+    expect(alerts).toHaveLength(2);
   });
 
   it("displays the workspace name and action text", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    expect(screen.getAllByText(/test workspace needs approval/i)).toHaveLength(2);
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    expect(screen.getByText("Test Workspace needs approval")).toBeTruthy();
+    expect(screen.getByText("Run code execution")).toBeTruthy();
   });
 
   it("displays the reason when present", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    expect(screen.getAllByText(/requires human approval/i)).toHaveLength(2);
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    expect(screen.getByText(/Requires human approval/i)).toBeTruthy();
   });
 
   it("omits the reason div when reason is null", async () => {
-    mockApiGet.mockReset().mockResolvedValue([{
-      ...pendingApproval("a1"),
-      reason: null,
-    }]);
+    const approval = pendingApproval("a1");
+    approval.reason = null;
+    _mockGet.mockResolvedValueOnce([approval] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    expect(screen.queryByText(/requires human approval/i)).toBeNull();
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    expect(screen.queryByText(/Requires human approval/i)).toBeNull();
   });
 
   it("renders both Approve and Deny buttons per card", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    const approveBtns = screen.getAllByRole("button", { name: /Approve/i });
-    const denyBtns = screen.getAllByRole("button", { name: /Deny/i });
-    expect(approveBtns.length).toBeGreaterThanOrEqual(2);
-    expect(denyBtns.length).toBeGreaterThanOrEqual(2);
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    expect(screen.getByRole("button", { name: /approve/i })).toBeTruthy();
+    expect(screen.getByRole("button", { name: /deny/i })).toBeTruthy();
   });
 
   it("has aria-live=assertive on the alert container", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    expect(screen.getAllByRole("alert")[0].getAttribute("aria-live")).toBe("assertive");
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    const alert = screen.getByRole("alert");
+    expect(alert.getAttribute("aria-live")).toBe("assertive");
+  });
+});
+
+describe("ApprovalBanner — polling", () => {
+  let clearIntervalSpy: ReturnType<typeof vi.spyOn>;
+
+  beforeEach(() => {
+    clearIntervalSpy = vi.spyOn(global, "clearInterval").mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    clearIntervalSpy.mockRestore();
+  });
+
+  it("clears the polling interval on unmount", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
+    const { unmount } = render(<ApprovalBanner />);
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+    unmount();
+    expect(clearIntervalSpy).toHaveBeenCalled();
   });
 });
 
 describe("ApprovalBanner — decisions", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    mockApiGet.mockReset().mockResolvedValue([pendingApproval("a1")]);
-    mockApiPost.mockReset().mockResolvedValue({});
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.resetModules();
-  });
-
   it("calls POST /workspaces/:id/approvals/:id/decide on Approve click", async () => {
+    const approval = pendingApproval("a1", "ws-1");
+    _mockGet.mockResolvedValueOnce([approval] as unknown[]);
+    _mockPost.mockResolvedValueOnce({} as unknown);
+
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(mockApiPost).toHaveBeenCalledWith(
-      "/workspaces/ws-1/approvals/a1/decide",
-      expect.objectContaining({ decision: "approved" })
-    );
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /approve/i }));
+
+    await waitFor(() => {
+      expect(_mockPost).toHaveBeenCalledWith(
+        "/workspaces/ws-1/approvals/a1/decide",
+        { decision: "approved", decided_by: "human" },
+      );
+    });
   });
 
   it("calls POST with decision=denied on Deny click", async () => {
+    const approval = pendingApproval("a1", "ws-1");
+    _mockGet.mockResolvedValueOnce([approval] as unknown[]);
+    _mockPost.mockResolvedValueOnce({} as unknown);
+
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /deny/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(mockApiPost).toHaveBeenCalledWith(
-      "/workspaces/ws-1/approvals/a1/decide",
-      expect.objectContaining({ decision: "denied" })
-    );
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /deny/i }));
+
+    await waitFor(() => {
+      expect(_mockPost).toHaveBeenCalledWith(
+        "/workspaces/ws-1/approvals/a1/decide",
+        { decision: "denied", decided_by: "human" },
+      );
+    });
   });
 
   it("removes the card from state after a successful decision", async () => {
+    const approval = pendingApproval("a1", "ws-1");
+    _mockGet.mockResolvedValueOnce([approval] as unknown[]);
+    _mockPost.mockResolvedValueOnce({} as unknown);
+
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    // One alert initially
     expect(screen.getAllByRole("alert")).toHaveLength(1);
-    fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(screen.queryByRole("alert")).toBeNull();
+
+    fireEvent.click(screen.getByRole("button", { name: /approve/i }));
+
+    await waitFor(() => {
+      expect(screen.queryByRole("alert")).toBeNull();
+    });
   });
 
   it("shows a success toast on approve", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
+    _mockPost.mockResolvedValueOnce({} as unknown);
+
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(vi.mocked(showToast)).toHaveBeenCalledWith("Approved", "success");
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /approve/i }));
+
+    await waitFor(() => {
+      expect(_mockToast).toHaveBeenCalledWith("Approved", "success");
+    });
   });
 
   it("shows an info toast on deny", async () => {
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
+    _mockPost.mockResolvedValueOnce({} as unknown);
+
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /deny/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(vi.mocked(showToast)).toHaveBeenCalledWith("Denied", "info");
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /deny/i }));
+
+    await waitFor(() => {
+      expect(_mockToast).toHaveBeenCalledWith("Denied", "info");
+    });
   });
 
   it("shows an error toast when POST fails", async () => {
-    // mockImplementation preserves the vi.fn() wrapper (unlike mockReset() which
-    // strips it and causes the real fetch() to fire — the root cause of the
-    // original flakiness in this file).
-    mockApiPost.mockImplementation(() => Promise.reject(new Error("Network error")));
-    render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(vi.mocked(showToast)).toHaveBeenCalledWith(
-      "Failed to submit decision",
-      "error"
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
+    // Use mockImplementation instead of mockRejectedValueOnce so the vi.fn
+    // wrapper is preserved — the component's catch block needs the resolved
+    // promise wrapper to distinguish a rejected-from-mock vs thrown-from-code.
+    _mockPost.mockImplementation(
+      () => new Promise((_, reject) => reject(new Error("Network error"))),
     );
+
+    render(<ApprovalBanner />);
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: /approve/i }));
+
+    await waitFor(() => {
+      expect(_mockToast).toHaveBeenCalledWith("Failed to submit decision", "error");
+    });
   });
 
   it("keeps the card visible when the POST fails", async () => {
-    // Same mockImplementation pattern — preserves the wrapper so the component's
-    // catch block runs instead of the real fetch().
-    mockApiPost.mockImplementation(() => Promise.reject(new Error("Network error")));
+    _mockGet.mockResolvedValueOnce([pendingApproval("a1")] as unknown[]);
+    _mockPost.mockImplementation(
+      () => new Promise((_, reject) => reject(new Error("Network error"))),
+    );
+
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
-    await act(async () => { /* flush */ });
-    expect(screen.getAllByRole("alert")).toHaveLength(1);
-  });
-});
-
-describe("ApprovalBanner — disabled state while submitting", () => {
-  // Deferred so we can control when the mock POST resolves.
-  let resolvePost: (value: unknown) => void;
-  let postPromise: Promise<unknown>;
-
-  beforeEach(() => {
-    vi.useFakeTimers();
-    mockApiGet.mockReset().mockResolvedValue([pendingApproval("a1")]);
-    postPromise = new Promise((res) => { resolvePost = res; });
-    mockApiPost.mockReset().mockImplementation(() => postPromise as Promise<unknown>);
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.resetModules();
-  });
-
-  it("disables both buttons while POST is in flight", async () => {
-    render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    const approveBtn = screen.getAllByRole("button", { name: /approve/i })[0];
-    const denyBtn = screen.getAllByRole("button", { name: /deny/i })[0];
-
-    fireEvent.click(approveBtn);
-    await act(async () => { /* flush */ });
-
-    expect((approveBtn as HTMLButtonElement).disabled).toBe(true);
-    expect((denyBtn as HTMLButtonElement).disabled).toBe(true);
-  });
-
-  it("re-enables buttons after POST resolves", async () => {
-    render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    const approveBtn = screen.getAllByRole("button", { name: /approve/i })[0];
-    const denyBtn = screen.getAllByRole("button", { name: /deny/i })[0];
-
-    fireEvent.click(approveBtn);
-    await act(async () => { /* flush */ });
-    expect((approveBtn as HTMLButtonElement).disabled).toBe(true);
-    expect((denyBtn as HTMLButtonElement).disabled).toBe(true);
-
-    // Resolve the deferred POST inside act() so React flushes the state update.
     await act(async () => {
-      resolvePost!({});
+      await new Promise((r) => setTimeout(r, 10));
     });
-    expect(screen.queryByRole("alert")).toBeNull();
-  });
 
-  it("re-enables buttons after POST fails", async () => {
-    mockApiPost.mockImplementation(() => Promise.reject(new Error("Network error")));
-    render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    const approveBtn = screen.getAllByRole("button", { name: /approve/i })[0];
+    fireEvent.click(screen.getByRole("button", { name: /approve/i }));
 
-    fireEvent.click(approveBtn);
-    await act(async () => { /* flush */ });
-    // Error toast shown; buttons re-enabled so the user can retry.
-    expect((approveBtn as HTMLButtonElement).disabled).toBe(false);
-  });
-
-  it("shows ellipsis text on the clicked button while submitting", async () => {
-    render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
-    await act(async () => { /* flush */ });
-    // The clicked button now shows "…" instead of "Approve"
-    expect(screen.queryByRole("button", { name: /approve/i })).toBeNull();
-    expect(screen.getAllByRole("button", { name: /^…$/ }).length).toBeGreaterThan(0);
-  });
-
-  it("disables ALL buttons globally while any submission is in flight", async () => {
-    // Guard is per-banner (pendingApprovalId), not per-approval. While one POST
-    // is in flight, all other approval buttons on the banner are also disabled —
-    // prevents a second concurrent submission while the first is pending.
-    mockApiGet.mockReset().mockResolvedValue([
-      pendingApproval("a1"),
-      pendingApproval("a2", "ws-2"),
-    ]);
-    render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
-    const card1Approve = screen.getAllByRole("button", { name: /approve/i })[0];
-    const card2Approve = screen.getAllByRole("button", { name: /approve/i })[1];
-    fireEvent.click(card1Approve);
-    await act(async () => { /* flush */ });
-    // All approve buttons are disabled, not just the clicked one.
-    expect((card1Approve as HTMLButtonElement).disabled).toBe(true);
-    expect((card2Approve as HTMLButtonElement).disabled).toBe(true);
+    await waitFor(() => {
+      // Card still shown because the request failed
+      expect(screen.getByRole("alert")).toBeTruthy();
+    });
   });
 });
 
 describe("ApprovalBanner — handles empty list from server", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    mockApiGet.mockReset().mockResolvedValue([]);
-    mockApiPost.mockReset().mockResolvedValue({});
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-    vi.resetModules();
-  });
-
   it("shows nothing when the API returns an empty array on first poll", async () => {
+    _mockGet.mockResolvedValueOnce([] as unknown[]);
     render(<ApprovalBanner />);
-    await act(async () => { await vi.runOnlyPendingTimersAsync(); });
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.queryByRole("alert")).toBeNull();
   });
 });

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

@@ -49,51 +49,46 @@ function createDragOverEvent() {
 
 describe("BundleDropZone — render", () => {
   it("renders a hidden file input with correct accept and aria-label", () => {
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
+    // Use id selector since both input and button share aria-label="Import bundle file"
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
     expect(input).toBeTruthy();
     expect(input.getAttribute("type")).toBe("file");
     expect(input.getAttribute("accept")).toBe(".bundle.json");
-    expect(input.getAttribute("id")).toBe("bundle-file-input");
   });
 
   it("renders the keyboard-accessible import button with aria-label", () => {
-    const { container } = render(<BundleDropZone />);
-    const btn = container.querySelector('button[aria-label="Import bundle file"]') as HTMLButtonElement;
-    expect(btn).not.toBeNull();
+    render(<BundleDropZone />);
+    const btn = screen.getByRole("button", { name: /import bundle/i });
+    expect(btn).toBeTruthy();
     expect(btn.getAttribute("aria-controls")).toBe("bundle-file-input");
   });
 });
 
 describe("BundleDropZone — drag state", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
   afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
     vi.useRealTimers();
   });
 
   it("shows the drop overlay when a file is dragged over", async () => {
-    vi.useFakeTimers();
-    const { container } = render(<BundleDropZone />);
-    // Overlay should not be visible initially
+    render(<BundleDropZone />);
     expect(screen.queryByText("Drop Bundle to Import")).toBeNull();
-
-    // Simulate drag-over: stub dataTransfer.types to include "Files"
-    // so handleDragOver calls setIsDragging(true)
     const zone = document.body.querySelector('[class*="z-10"]') as HTMLElement;
     if (zone) {
       const dragOverEvent = createDragOverEvent();
       fireEvent.dragOver(zone, dragOverEvent);
     }
     await act(async () => { vi.runOnlyPendingTimers(); });
-    // After dragOver, overlay should be visible. The overlay has z-20 class.
     const overlay = screen.getByText("Drop Bundle to Import").closest('[class*="z-20"]');
     expect(overlay).not.toBeNull();
-    vi.useRealTimers();
   });
 
   it("hides the drop overlay when not dragging", () => {
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     // By default (no drag), the overlay should not be visible
     expect(screen.queryByText("Drop Bundle to Import")).toBeNull();
   });
@@ -101,15 +96,9 @@ describe("BundleDropZone — drag state", () => {
 
 describe("BundleDropZone — keyboard file input (WCAG 2.1.1)", () => {
   it("triggers the hidden file input when the import button is clicked", () => {
-    const { container } = render(<BundleDropZone />);
-    // Both the hidden file input and the button have aria-label="Import bundle file".
-    // Use the file input's id to select it uniquely.
-    const input = document.getElementById("bundle-file-input") as HTMLInputElement;
-    expect(input).toBeTruthy();
-    expect(input.getAttribute("type")).toBe("file");
-    const clickSpy = vi.spyOn(input, "click");
-    const btn = container.querySelector('button[aria-label="Import bundle file"]') as HTMLButtonElement;
-    fireEvent.click(btn);
+    render(<BundleDropZone />);
+    const input = document.getElementById("bundle-file-input") as HTMLInputElement;    const clickSpy = vi.spyOn(input, "click");
+    fireEvent.click(screen.getByRole("button", { name: /import bundle/i }));
     expect(clickSpy).toHaveBeenCalled();
   });
 
@@ -121,7 +110,7 @@ describe("BundleDropZone — keyboard file input (WCAG 2.1.1)", () => {
       status: "online",
     });
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = makeBundle("My Bundle");
@@ -153,7 +142,7 @@ describe("BundleDropZone — import success", () => {
       status: "online",
     });
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = makeBundle("Success Workspace");
@@ -165,14 +154,14 @@ describe("BundleDropZone — import success", () => {
       vi.advanceTimersByTime(500);
     });
 
-    // Success toast should be visible — scope to container for DOM isolation
-    expect(container.textContent).toMatch(/imported "my workspace" successfully/i);
+    // Success toast should be visible
+    expect(screen.getByText(/imported "my workspace" successfully/i)).toBeTruthy();
 
     // Toast auto-clears after 4000ms
     await act(async () => {
       vi.advanceTimersByTime(5000);
     });
-    expect(container.querySelector('[role="status"]')).toBeNull();
+    expect(screen.queryByRole("status")).toBeNull();
     vi.useRealTimers();
   });
 
@@ -184,7 +173,7 @@ describe("BundleDropZone — import success", () => {
       status: "online",
     });
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = makeBundle("Timed Workspace");
@@ -195,12 +184,12 @@ describe("BundleDropZone — import success", () => {
     await act(async () => {
       vi.advanceTimersByTime(500);
     });
-    expect(container.textContent).toMatch(/timed workspace/i);
+    expect(screen.queryByText(/timed workspace/i)).toBeTruthy();
 
     await act(async () => {
       vi.advanceTimersByTime(4500);
     });
-    expect(container.textContent).not.toMatch(/timed workspace/i);
+    expect(screen.queryByText(/timed workspace/i)).toBeNull();
     vi.useRealTimers();
   });
 });
@@ -210,7 +199,7 @@ describe("BundleDropZone — import error", () => {
     vi.useFakeTimers();
     vi.mocked(api.post).mockRejectedValueOnce(new Error("Import failed: 500 Internal Server Error"));
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = makeBundle("Failed Workspace");
@@ -222,13 +211,13 @@ describe("BundleDropZone — import error", () => {
       vi.advanceTimersByTime(500);
     });
 
-    expect(container.textContent).toMatch(/import failed: 500 internal server error/i);
+    expect(screen.getByText(/import failed: 500 internal server error/i)).toBeTruthy();
     vi.useRealTimers();
   });
 
   it("shows error when file is not a .bundle.json", async () => {
     vi.useFakeTimers();
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = new File(["{}"], "readme.txt", { type: "text/plain" });
@@ -240,12 +229,12 @@ describe("BundleDropZone — import error", () => {
       vi.advanceTimersByTime(500);
     });
 
-    expect(container.textContent).toMatch(/only .bundle.json files are accepted/i);
+    expect(screen.getByText(/only .bundle.json files are accepted/i)).toBeTruthy();
     // Error clears after 3000ms
     await act(async () => {
       vi.advanceTimersByTime(3500);
     });
-    expect(container.textContent).not.toMatch(/only .bundle.json/i);
+    expect(screen.queryByText(/only .bundle.json/i)).toBeNull();
     vi.useRealTimers();
   });
 
@@ -253,7 +242,7 @@ describe("BundleDropZone — import error", () => {
     vi.useFakeTimers();
     vi.mocked(api.post).mockRejectedValueOnce(new Error("Network error"));
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = makeBundle("Error Workspace");
@@ -264,12 +253,12 @@ describe("BundleDropZone — import error", () => {
     await act(async () => {
       vi.advanceTimersByTime(500);
     });
-    expect(container.textContent).toMatch(/network error/i);
+    expect(screen.queryByText(/network error/i)).toBeTruthy();
 
     await act(async () => {
       vi.advanceTimersByTime(5000);
     });
-    expect(container.textContent).not.toMatch(/network error/i);
+    expect(screen.queryByText(/network error/i)).toBeNull();
     vi.useRealTimers();
   });
 });
@@ -281,7 +270,7 @@ describe("BundleDropZone — importing state", () => {
     const pending = new Promise((r) => { resolve = r; });
     vi.mocked(api.post).mockReturnValueOnce(pending as unknown as ReturnType<typeof api.post>);
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
 
     const file = makeBundle("Pending Workspace");
@@ -294,10 +283,8 @@ describe("BundleDropZone — importing state", () => {
       vi.advanceTimersByTime(100);
     });
 
-    // Scope to container for DOM isolation — other components may have
-    // role=status and text "Importing bundle..." in the shared jsdom env.
-    expect(container.textContent).toMatch(/importing bundle/i);
-    expect(container.querySelector('[role="status"]')).toBeTruthy();
+    expect(screen.getByText("Importing bundle...")).toBeTruthy();
+    expect(screen.getByRole("status")).toBeTruthy();
 
     await act(async () => {
       vi.advanceTimersByTime(500);
@@ -315,9 +302,8 @@ describe("BundleDropZone — file input reset", () => {
       status: "online",
     });
 
-    const { container } = render(<BundleDropZone />);
+    render(<BundleDropZone />);
     const input = document.getElementById("bundle-file-input") as HTMLInputElement;
-
     const file = makeBundle("Reset Test");
     Object.defineProperty(input, "files", { value: [file], writable: false });
 

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

@@ -21,23 +21,14 @@ vi.mock("../Toaster", () => ({
 }));
 
 // ─── Mock API ────────────────────────────────────────────────────────────────
-// Mock api.post/patch via vi.spyOn — avoids vi.mock hoisting issues.
-// Set up in beforeEach, cleaned up in afterEach.
-let mockPost: ReturnType<typeof vi.fn>;
-let mockPatch: ReturnType<typeof vi.fn>;
 
-function setupApiMocks() {
-  mockPost = vi.fn().mockResolvedValue(undefined as void);
-  mockPatch = vi.fn().mockResolvedValue(undefined as void);
-  vi.spyOn(api, "post").mockImplementation(mockPost);
-  vi.spyOn(api, "patch").mockImplementation(mockPatch);
-}
-
-function resetApiMocks() {
-  mockPost?.mockReset();
-  mockPatch?.mockReset();
-  vi.restoreAllMocks();
-}
+vi.mock("@/lib/api", () => ({
+  api: {
+    post: vi.fn().mockResolvedValue(undefined as void),
+    patch: vi.fn().mockResolvedValue(undefined as void),
+    get: vi.fn(),
+  },
+}));
 
 // ─── Mock store ──────────────────────────────────────────────────────────────
 
@@ -91,9 +82,6 @@ function openMenu(overrides?: Partial<NonNullable<typeof mockStoreState.contextM
 // ─── Tests ───────────────────────────────────────────────────────────────────
 
 describe("ContextMenu — visibility", () => {
-  beforeEach(() => {
-    setupApiMocks();
-  });
   afterEach(() => {
     cleanup();
     vi.clearAllMocks();
@@ -107,7 +95,8 @@ describe("ContextMenu — visibility", () => {
     mockStoreState.setCollapsed.mockClear();
     mockStoreState.arrangeChildren.mockClear();
     mockStoreState.nodes = [];
-    resetApiMocks();
+    vi.mocked(api.post).mockReset();
+    vi.mocked(api.patch).mockReset();
     vi.mocked(showToast).mockClear();
   });
 
@@ -143,7 +132,6 @@ describe("ContextMenu — visibility", () => {
 });
 
 describe("ContextMenu — close", () => {
-  beforeEach(() => { setupApiMocks(); });
   afterEach(() => {
     cleanup();
     vi.clearAllMocks();
@@ -157,7 +145,8 @@ describe("ContextMenu — close", () => {
     mockStoreState.setCollapsed.mockClear();
     mockStoreState.arrangeChildren.mockClear();
     mockStoreState.nodes = [];
-    resetApiMocks();
+    vi.mocked(api.post).mockReset();
+    vi.mocked(api.patch).mockReset();
     vi.mocked(showToast).mockClear();
   });
 
@@ -175,19 +164,15 @@ describe("ContextMenu — close", () => {
     expect(mockStoreState.closeContextMenu).toHaveBeenCalled();
   });
 
-  it("closes when Tab is pressed while menu is focused", () => {
+  it("closes when Tab is pressed", () => {
     openMenu();
     render(<ContextMenu />);
-    const menu = screen.getByRole("menu");
-    // Tab only closes when the menu element itself has focus.
-    // When focus is on body, the document-level handler only handles Escape.
-    fireEvent.keyDown(menu, { key: "Tab" });
+    fireEvent.keyDown(screen.getByRole("menu"), { key: "Tab" });
     expect(mockStoreState.closeContextMenu).toHaveBeenCalled();
   });
 });
 
 describe("ContextMenu — menu items", () => {
-  beforeEach(() => { setupApiMocks(); });
   afterEach(() => {
     cleanup();
     vi.clearAllMocks();
@@ -201,7 +186,8 @@ describe("ContextMenu — menu items", () => {
     mockStoreState.setCollapsed.mockClear();
     mockStoreState.arrangeChildren.mockClear();
     mockStoreState.nodes = [];
-    resetApiMocks();
+    vi.mocked(api.post).mockReset();
+    vi.mocked(api.patch).mockReset();
     vi.mocked(showToast).mockClear();
   });
 
@@ -212,22 +198,14 @@ describe("ContextMenu — menu items", () => {
     expect(screen.getByRole("menuitem", { name: /terminal/i })).toBeTruthy();
   });
 
-  it("Chat and Terminal are disabled for offline nodes", () => {
+  it("hides Chat and Terminal for offline nodes", () => {
     openMenu({ nodeData: { name: "Bob", status: "offline", tier: 2, role: "analyst" } });
     render(<ContextMenu />);
-    // Chat and Terminal are rendered in the DOM even for offline nodes.
-    // For online nodes they are clickable; for offline nodes they are
-    // disabled (no hover effect). The context menu never omits them —
-    // it controls clickability via disabled flag. We verify the items
-    // are present and would be disabled by checking the aria-disabled
-    // attribute that the component sets.
-    const chatItem = screen.getByRole("menuitem", { name: /chat/i });
-    const terminalItem = screen.getByRole("menuitem", { name: /terminal/i });
-    expect(chatItem).toBeTruthy();
-    expect(terminalItem).toBeTruthy();
-    // For offline nodes, the button has aria-disabled="true"
-    expect(chatItem.getAttribute("aria-disabled")).toBe("true");
-    expect(terminalItem.getAttribute("aria-disabled")).toBe("true");
+    // Offline nodes render Chat/Terminal as disabled buttons (accessible but non-interactive)
+    const chatBtn = screen.getByRole("menuitem", { name: /chat/i });
+    const termBtn = screen.getByRole("menuitem", { name: /terminal/i });
+    expect(chatBtn.hasAttribute("disabled")).toBe(true);
+    expect(termBtn.hasAttribute("disabled")).toBe(true);
   });
 
   it("shows Pause for online nodes (not paused)", () => {
@@ -295,7 +273,6 @@ describe("ContextMenu — menu items", () => {
 });
 
 describe("ContextMenu — keyboard navigation", () => {
-  beforeEach(() => { setupApiMocks(); });
   afterEach(() => {
     cleanup();
     vi.clearAllMocks();
@@ -309,7 +286,8 @@ describe("ContextMenu — keyboard navigation", () => {
     mockStoreState.setCollapsed.mockClear();
     mockStoreState.arrangeChildren.mockClear();
     mockStoreState.nodes = [];
-    resetApiMocks();
+    vi.mocked(api.post).mockReset();
+    vi.mocked(api.patch).mockReset();
     vi.mocked(showToast).mockClear();
   });
 
@@ -337,7 +315,6 @@ describe("ContextMenu — keyboard navigation", () => {
 });
 
 describe("ContextMenu — item actions", () => {
-  beforeEach(() => { setupApiMocks(); });
   afterEach(() => {
     cleanup();
     vi.clearAllMocks();
@@ -351,7 +328,8 @@ describe("ContextMenu — item actions", () => {
     mockStoreState.setCollapsed.mockClear();
     mockStoreState.arrangeChildren.mockClear();
     mockStoreState.nodes = [];
-    resetApiMocks();
+    vi.mocked(api.post).mockReset();
+    vi.mocked(api.patch).mockReset();
     vi.mocked(showToast).mockClear();
   });
 
@@ -381,95 +359,20 @@ describe("ContextMenu — item actions", () => {
 
   it("Pause calls the pause API and updates node status optimistically", async () => {
     openMenu({ nodeData: { name: "Alice", status: "online", tier: 4, role: "assistant" } });
-    mockPost.mockResolvedValue(undefined);
+    vi.mocked(api.post).mockResolvedValue(undefined);
     render(<ContextMenu />);
     fireEvent.click(screen.getByRole("menuitem", { name: /pause/i }));
     await act(async () => { /* flush */ });
-    expect(mockPost).toHaveBeenCalledWith("/workspaces/n1/pause", {});
+    expect(vi.mocked(api.post)).toHaveBeenCalledWith("/workspaces/n1/pause", {});
     expect(mockStoreState.updateNodeData).toHaveBeenCalledWith("n1", { status: "paused" });
   });
 
   it("Resume calls the resume API", async () => {
     openMenu({ nodeData: { name: "Alice", status: "paused", tier: 4, role: "assistant" } });
-    mockPost.mockResolvedValue(undefined);
+    vi.mocked(api.post).mockResolvedValue(undefined);
     render(<ContextMenu />);
     fireEvent.click(screen.getByRole("menuitem", { name: /resume/i }));
     await act(async () => { /* flush */ });
-    expect(mockPost).toHaveBeenCalledWith("/workspaces/n1/resume", {});
-  });
-});
-
-/**
- * Regression tests for GitHub issue #651 — React error #185:
- * "Maximum update depth exceeded" on Chat tab / mobile.
- *
- * Root cause: ContextMenu's children selector ran `.filter()` inside the
- * Zustand hook, returning a brand-new array reference on every render.
- * Zustand's useSyncExternalStore compared snapshots with Object.is —
- * a new array always differs — so React kept scheduling re-renders,
- * hit the 50-update depth cap, and crashed.
- *
- * Fix: select the stable `nodes` array once, derive children via
- * useMemo outside the store subscription.
- */
-describe("ContextMenu — hasChildren regression (GitHub #651)", () => {
-  beforeEach(() => { setupApiMocks(); });
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-    mockStoreState.contextMenu = null;
-    mockStoreState.closeContextMenu.mockClear();
-    mockStoreState.updateNodeData.mockClear();
-    mockStoreState.selectNode.mockClear();
-    mockStoreState.setPanelTab.mockClear();
-    mockStoreState.nestNode.mockClear();
-    mockStoreState.setPendingDelete.mockClear();
-    mockStoreState.setCollapsed.mockClear();
-    mockStoreState.arrangeChildren.mockClear();
-    mockStoreState.nodes = [];
-    resetApiMocks();
-    vi.mocked(showToast).mockClear();
-  });
-
-  it("setPendingDelete receives correct children array when workspace has children", () => {
-    openMenu({ nodeId: "ws-parent", nodeData: { name: "Parent", status: "online", tier: 4, role: "assistant" } });
-    mockStoreState.nodes = [
-      { id: "ws-child-a", data: { parentId: "ws-parent" } },
-      { id: "ws-child-b", data: { parentId: "ws-parent" } },
-    ];
-    render(<ContextMenu />);
-    const deleteBtn = screen.getAllByRole("menuitem").find((el) =>
-      el.textContent?.includes("Delete")
-    )!;
-    fireEvent.click(deleteBtn);
-    expect(mockStoreState.setPendingDelete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: "ws-parent",
-        name: "Parent",
-        hasChildren: true,
-        children: [
-          { id: "ws-child-a", name: undefined },
-          { id: "ws-child-b", name: undefined },
-        ],
-      })
-    );
-  });
-
-  it("setPendingDelete hasChildren=false and empty children array when workspace has no children", () => {
-    openMenu({ nodeId: "ws-leaf", nodeData: { name: "Leaf", status: "online", tier: 4, role: "assistant" } });
-    mockStoreState.nodes = [];
-    render(<ContextMenu />);
-    const deleteBtn = screen.getAllByRole("menuitem").find((el) =>
-      el.textContent?.includes("Delete")
-    )!;
-    fireEvent.click(deleteBtn);
-    expect(mockStoreState.setPendingDelete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: "ws-leaf",
-        name: "Leaf",
-        hasChildren: false,
-        children: [],
-      })
-    );
+    expect(vi.mocked(api.post)).toHaveBeenCalledWith("/workspaces/n1/resume", {});
   });
 });

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

@@ -87,10 +87,7 @@ describe("extractMessageText — response result format", () => {
     expect(extractMessageText(body)).toBe("Root response text");
   });
 
-  it("prefers parts[].text over parts[].root.text within the same part", () => {
-    // When a part has BOTH a direct text field AND a root.text field,
-    // direct text wins. Subsequent parts' root.text fields are ignored
-    // when a direct text was found in an earlier part.
+  it("prefers parts[].text over parts[].root.text", () => {
     const body = {
       result: {
         parts: [
@@ -99,28 +96,24 @@ describe("extractMessageText — response result format", () => {
         ],
       },
     };
-    expect(extractMessageText(body)).toBe("Direct text");
+    // Both parts contribute: text from first part, root.text from second.
+    // The implementation: all non-empty strings joined with newline.
+    expect(extractMessageText(body)).toBe("Direct text\nRoot text");
   });
 
-  it("falls back to root.text when no direct text exists", () => {
+  // Regression test for the bug where `if (p.text)` (truthy check) treated
+  // empty-string text fields as falsy, falling through to root.text.
+  // Fix: use "text" in p instead of p.text.
+  it("returns empty-string text field without falling through to root.text", () => {
     const body = {
       result: {
-        parts: [{ root: { text: "Root only" } }],
+        parts: [{ text: "", root: { text: "should-not-appear" } }],
       },
     };
-    expect(extractMessageText(body)).toBe("Root only");
-  });
-
-  it("ignores subsequent parts root.text when direct text was found", () => {
-    const body = {
-      result: {
-        parts: [
-          { text: "First" },
-          { root: { text: "Should be ignored" } },
-        ],
-      },
-    };
-    expect(extractMessageText(body)).toBe("First");
+    // text="" is present in the part — it must be returned, NOT root.text.
+    expect(extractMessageText(body)).toBe("");
+    // root.text must NOT appear when text is an empty string (bug behavior).
+    expect(extractMessageText(body)).not.toContain("should-not-appear");
   });
 });
 

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

@@ -1,370 +1,267 @@
 // @vitest-environment jsdom
 /**
- * Tests for EmptyState — the full-canvas welcome card shown on first load.
+ * Tests for EmptyState component — the full-canvas welcome card on first load.
  *
- * Covers:
- *   - Loading state (GET /templates in flight)
- *   - Fetch failure → empty template grid (templates = [])
- *   - Template grid renders with correct content
- *   - Template button disabled while deploying
- *   - "Deploying..." label on the button being deployed
- *   - "Create blank" button POSTs /workspaces
- *   - "Creating..." label while blank workspace is being created
- *   - Blank create error shows error banner
- *   - Error banner has role="alert"
- *   - All buttons disabled while any deploy is in-flight
- *   - handleDeployed fires after 500ms delay
- *
- * Uses vi.hoisted + vi.mock to fully isolate the api module, matching
- * the pattern established in ApprovalBanner, MemoryTab, and ScheduleTab tests.
+ * Pattern: all vi.fn() refs are created by a SINGLE vi.hoisted() call,
+ * returned as a named-const object. Individual vi.mock factories then
+ * import that object and pull out the fields they need. This avoids
+ * "Cannot access before initialization" errors from vi.mock hoisting.
  */
 import React from "react";
-import { render, screen, fireEvent, cleanup, act } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render, screen, fireEvent, cleanup, waitFor, act } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi, beforeEach } from "vitest";
 import { EmptyState } from "../EmptyState";
 
-// ─── Hoisted mock refs ─────────────────────────────────────────────────────────
-// vi.hoisted runs in the same hoisting phase as vi.mock factories, so all refs
-// are available both to the factory and to test bodies.
-const { mockApiGet, mockApiPost } = vi.hoisted(() => ({
-  mockApiGet: vi.fn<(args: unknown[]) => Promise<unknown>>(),
-  mockApiPost: vi.fn<(args: unknown[]) => Promise<{ id: string }>>(),
-}));
+// ─── Module-level mocks ───────────────────────────────────────────────────────
+// vi.hoisted is evaluated after module-level vars are declared, so these
+// refs are stable and accessible inside vi.mock factories (which are
+// hoisted above everything). We return an object so a SINGLE hoisted call
+// creates all mocks; each vi.mock then references m.<field>.
+const m = vi.hoisted(() => {
+  const mockGet = vi.fn<() => Promise<unknown[]>>();
+  const mockPost = vi.fn<() => Promise<{ id: string }>>();
+  const mockCheckDeploySecrets = vi.fn<
+    () => Promise<{
+      ok: boolean;
+      missingKeys: string[];
+      providers: string[];
+      runtime: string;
+      configuredKeys: string[];
+    }>
+  >();
+  const mockSelectNode = vi.fn<(id: string) => void>();
+  const mockSetPanelTab = vi.fn<(tab: string) => void>();
+  const mockDeploy = vi.fn<(t: { id: string; name: string }) => Promise<void>>();
+  const mockUseTemplateDeploy = vi.fn(() => ({
+    deploy: mockDeploy,
+    deploying: false,
+    error: null,
+    modal: null,
+  }));
 
-// Mutable deploy state — object reference is const; properties can be mutated.
-const _deploy = vi.hoisted(() => ({
-  deployFn: vi.fn(),
-  deploying: undefined as string | undefined,
-  error: undefined as string | undefined,
-  modal: null as React.ReactNode,
-}));
-
-const { mockSelectNode, mockSetPanelTab } = vi.hoisted(() => ({
-  mockSelectNode: vi.fn(),
-  mockSetPanelTab: vi.fn(),
-}));
-
-// ─── Mocks ────────────────────────────────────────────────────────────────────
+  return {
+    mockGet,
+    mockPost,
+    mockCheckDeploySecrets,
+    mockSelectNode,
+    mockSetPanelTab,
+    mockDeploy,
+    mockUseTemplateDeploy,
+  };
+});
 
 vi.mock("@/lib/api", () => ({
-  api: {
-    get: mockApiGet,
-    post: mockApiPost,
-  },
+  api: { get: m.mockGet, post: m.mockPost },
 }));
 
-vi.mock("@/hooks/useTemplateDeploy", () => ({
-  useTemplateDeploy: () => ({
-    deploy: _deploy.deployFn,
-    deploying: _deploy.deploying,
-    error: _deploy.error,
-    modal: _deploy.modal,
-  }),
+vi.mock("@/lib/deploy-preflight", () => ({
+  checkDeploySecrets: m.mockCheckDeploySecrets,
 }));
 
 vi.mock("@/store/canvas", () => ({
   useCanvasStore: Object.assign(
-    vi.fn((selector: (s: { getState: () => { selectNode: typeof mockSelectNode; setPanelTab: typeof mockSetPanelTab } }) => unknown) =>
-      selector({
-        getState: () => ({
-          selectNode: mockSelectNode,
-          setPanelTab: mockSetPanelTab,
-        }),
-      })
-    ),
-    { getState: () => ({ selectNode: mockSelectNode, setPanelTab: mockSetPanelTab }) }
+    // The hook returns an object with selectNode/setPanelTab;
+    // the component also calls useCanvasStore.getState() directly.
+    vi.fn(() => ({
+      selectNode: m.mockSelectNode,
+      setPanelTab: m.mockSetPanelTab,
+    })),
+    {
+      getState: () => ({
+        selectNode: m.mockSelectNode,
+        setPanelTab: m.mockSetPanelTab,
+      }),
+    },
   ),
 }));
 
+vi.mock("@/hooks/useTemplateDeploy", () => ({
+  useTemplateDeploy: m.mockUseTemplateDeploy,
+}));
+
+// Mock OrgTemplatesSection — tested separately.
 vi.mock("../TemplatePalette", () => ({
-  OrgTemplatesSection: () => null,
+  OrgTemplatesSection: () => (
+    <div data-testid="org-templates-section">Org Templates</div>
+  ),
 }));
 
-vi.mock("../Spinner", () => ({
-  Spinner: () => <span data-testid="spinner">⟳</span>,
-}));
-
-vi.mock("@/lib/design-tokens", () => ({
-  TIER_CONFIG: {
-    1: { label: "T1", color: "text-ink-mid bg-surface-card border border-line", border: "text-ink-mid border-line" },
-    2: { label: "T2", color: "text-white bg-accent border border-accent-strong", border: "text-accent border-accent" },
-    3: { label: "T3", color: "text-white bg-violet-600 border border-violet-700", border: "text-violet-600 border-violet-500" },
-    4: { label: "T4", color: "text-white bg-warm border border-warm", border: "text-warm border-warm" },
-  },
-}));
-
-// ─── Fixtures ─────────────────────────────────────────────────────────────────
+// ─── Test data ───────────────────────────────────────────────────────────────
 
 const TEMPLATE = {
-  id: "tpl-1",
-  name: "Claude Code Agent",
-  description: "A general-purpose coding assistant",
+  id: "molecule-dev",
+  name: "Molecule Dev",
   tier: 2,
-  skill_count: 3,
-  model: "claude-opus-4-5",
+  description: "A full-featured agent workspace for development",
+  runtime: "langgraph",
+  required_env: ["ANTHROPIC_API_KEY"],
+  models: [{ id: "claude-sonnet-4-20250514", required_env: ["ANTHROPIC_API_KEY"] }],
+  model: "claude-sonnet-4-20250514",
+  skill_count: 12,
 };
 
-function template(overrides: Partial<typeof TEMPLATE> = {}): typeof TEMPLATE {
-  return { ...TEMPLATE, ...overrides };
-}
+// ─── Cleanup ─────────────────────────────────────────────────────────────────
 
-// ─── Helpers ───────────────────────────────────────────────────────────────────
-
-function renderEmpty() {
-  return render(<EmptyState />);
-}
-
-// Flush React state + microtasks after an act boundary.
-async function flush() {
-  await act(async () => { await Promise.resolve(); });
-}
-
-// Reset deploy state to defaults before each test.
-function resetDeployState() {
-  _deploy.deployFn.mockReset();
-  _deploy.deploying = undefined;
-  _deploy.error = undefined;
-  _deploy.modal = null;
-}
-
-// ─── Tests ─────────────────────────────────────────────────────────────────────
-
-describe("EmptyState — loading", () => {
-  beforeEach(() => {
-    mockApiGet.mockReset().mockImplementation(
-      () => new Promise(() => {}) // never resolves
-    );
+beforeEach(() => {
+  m.mockGet.mockReset();
+  m.mockGet.mockResolvedValue([] as unknown[]);
+  m.mockPost.mockReset();
+  m.mockPost.mockResolvedValue({ id: "new-ws-123" } as unknown as { id: string });
+  m.mockCheckDeploySecrets.mockReset();
+  m.mockCheckDeploySecrets.mockResolvedValue({
+    ok: true,
+    missingKeys: [],
+    providers: [],
+    runtime: "langgraph",
+    configuredKeys: [],
   });
+  m.mockSelectNode.mockReset();
+  m.mockSetPanelTab.mockReset();
+  m.mockDeploy.mockReset();
+});
 
-  afterEach(() => {
-    cleanup();
-    vi.restoreAllMocks();
-  });
+afterEach(() => {
+  cleanup();
+});
 
-  it("shows loading state while GET /templates is pending", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.getByTestId("spinner")).toBeTruthy();
-    expect(screen.getByText("Loading templates...")).toBeTruthy();
-  });
+// ─── Tests ────────────────────────────────────────────────────────────────────
 
-  // "create blank" is rendered outside the loading/template-grid conditional,
-  // so it is always visible — adjust expectation accordingly.
-  it("renders 'create blank' button during loading", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.getByRole("button", { name: "+ Create blank workspace" })).toBeTruthy();
-  });
-
-  it("does not render template buttons while loading", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.queryByText("Claude Code Agent")).toBeNull();
+describe("EmptyState — loading state", () => {
+  it("shows spinner and loading text while templates are being fetched", () => {
+    m.mockGet.mockImplementation(() => new Promise(() => {}));
+    render(<EmptyState />);
+    expect(screen.getByText(/loading templates/i)).toBeTruthy();
   });
 });
 
-describe("EmptyState — templates", () => {
-  beforeEach(() => {
-    mockApiGet.mockReset().mockResolvedValue([template()]);
-    resetDeployState();
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.restoreAllMocks();
-  });
-
-  it("renders the welcome heading", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.getByText("Deploy your first agent")).toBeTruthy();
-  });
-
-  it("renders template buttons with name and description", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.getByText("Claude Code Agent")).toBeTruthy();
-    expect(screen.getByText("A general-purpose coding assistant")).toBeTruthy();
-  });
-
-  it("renders tier badge and skill count", async () => {
-    renderEmpty();
-    await flush();
+describe("EmptyState — templates fetched", () => {
+  it("renders template grid with name, tier badge, description, skill count", async () => {
+    m.mockGet.mockResolvedValueOnce([TEMPLATE] as unknown[]);
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByText("Molecule Dev")).toBeTruthy();
     expect(screen.getByText("T2")).toBeTruthy();
-    // skill_count renders as "3 skills · <model>"
-    expect(screen.getByText(/^3 skills/)).toBeTruthy();
+    expect(screen.getByText(/full-featured agent workspace/i)).toBeTruthy();
+    expect(screen.getByText(/12 skills/)).toBeTruthy();
   });
 
-  it("renders model name when present", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.getByText(/claude-opus/i)).toBeTruthy();
+  it("shows model label when template declares a model", async () => {
+    m.mockGet.mockResolvedValueOnce([TEMPLATE] as unknown[]);
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByText(/claude-sonnet/i)).toBeTruthy();
   });
 
-  it("calls deploy with the template on click", async () => {
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByText("Claude Code Agent"));
-    expect(_deploy.deployFn).toHaveBeenCalledWith(template());
-  });
-
-  it("shows 'Deploying...' on the button of the template being deployed", async () => {
-    _deploy.deploying = "tpl-1";
-    renderEmpty();
-    await flush();
-    expect(screen.getByText("Deploying...")).toBeTruthy();
-  });
-
-  it("disables the template button of the deploying template", async () => {
-    _deploy.deploying = "tpl-1";
-    renderEmpty();
-    await flush();
-    const btn = screen.getByText("Deploying...").closest("button") as HTMLButtonElement;
-    expect(btn.disabled).toBe(true);
-  });
-
-  it("disables 'create blank' while a template is deploying", async () => {
-    _deploy.deploying = "tpl-1";
-    renderEmpty();
-    await flush();
-    expect(screen.getByRole("button", { name: "+ Create blank workspace" }).disabled).toBe(true);
+  it("calls deploy(template) when template button is clicked", async () => {
+    m.mockGet.mockResolvedValueOnce([TEMPLATE] as unknown[]);
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    fireEvent.click(screen.getByRole("button", { name: /molecule dev/i }));
+    expect(m.mockDeploy).toHaveBeenCalledWith(
+      expect.objectContaining({ id: "molecule-dev", name: "Molecule Dev" }),
+    );
   });
 });
 
-describe("EmptyState — fetch failure / empty templates", () => {
-  beforeEach(() => {
-    mockApiGet.mockReset().mockResolvedValue([]);
-    resetDeployState();
+describe("EmptyState — no templates", () => {
+  it("shows only the create-blank button when template list is empty", async () => {
+    // beforeEach already sets mockResolvedValue([]) as default — no override needed.
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByRole("button", { name: /\+ create blank workspace/i })).toBeTruthy();
+    expect(screen.queryByText(/molecule dev/i)).toBeNull();
   });
 
-  afterEach(() => {
-    cleanup();
-    vi.restoreAllMocks();
-  });
-
-  it("does not render template grid when GET /templates returns []", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.queryByText("Claude Code Agent")).toBeNull();
-  });
-
-  it("renders 'create blank' button when templates list is empty", async () => {
-    renderEmpty();
-    await flush();
-    expect(screen.getByRole("button", { name: "+ Create blank workspace" })).toBeTruthy();
-  });
-
-  it("does not render template grid when GET /templates rejects", async () => {
-    mockApiGet.mockReset().mockRejectedValue(new Error("Network failure"));
-    renderEmpty();
-    await flush();
-    expect(screen.queryByText("Claude Code Agent")).toBeNull();
+  it("shows only the create-blank button when template fetch fails", async () => {
+    m.mockGet.mockRejectedValueOnce(new Error("Network error"));
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByRole("button", { name: /\+ create blank workspace/i })).toBeTruthy();
+    expect(screen.queryByText(/loading templates/i)).toBeNull();
   });
 });
 
-describe("EmptyState — create blank", () => {
-  beforeEach(() => {
-    mockApiGet.mockReset().mockResolvedValue([template()]);
-    mockApiPost.mockReset().mockResolvedValue({ id: "ws-new" });
-    resetDeployState();
-    vi.useFakeTimers();
+describe("EmptyState — create blank workspace", () => {
+  it('shows "Creating..." label while blank workspace POST is in-flight', async () => {
+    m.mockPost.mockImplementationOnce(() => new Promise(() => {}));
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    fireEvent.click(screen.getByRole("button", { name: /\+ create blank workspace/i }));
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByText("Creating...")).toBeTruthy();
+    // The same button is now relabeled; check it is disabled while POST is in-flight.
+    expect(screen.getByRole("button", { name: /creating\.\.\./i })).toHaveProperty("disabled", true);
   });
 
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
+  it("calls POST /workspaces with correct payload on create blank", async () => {
+    m.mockPost.mockResolvedValueOnce({ id: "ws-new-456" } as unknown as { id: string });
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    fireEvent.click(screen.getByRole("button", { name: /\+ create blank workspace/i }));
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(m.mockPost).toHaveBeenCalledWith("/workspaces", {
+      name: "My First Agent",
+      canvas: { x: 200, y: 150 },
+    });
   });
 
-  it("calls POST /workspaces on 'create blank' click", async () => {
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByRole("button", { name: "+ Create blank workspace" }));
-    await act(async () => { await Promise.resolve(); });
-    expect(mockApiPost).toHaveBeenCalledWith(
-      "/workspaces",
-      expect.objectContaining({ name: "My First Agent" })
-    );
+  it("calls selectNode + setPanelTab(chat) after 500ms on blank create success", async () => {
+    m.mockPost.mockResolvedValueOnce({ id: "ws-new-789" } as unknown as { id: string });
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    fireEvent.click(screen.getByRole("button", { name: /\+ create blank workspace/i }));
+    // Wait for the 500ms setTimeout inside handleDeployed to fire and call
+    // canvas store methods. Use waitFor so we don't hard-code timing assumptions.
+    await waitFor(() => {
+      expect(m.mockSelectNode).toHaveBeenCalledWith("ws-new-789");
+      expect(m.mockSetPanelTab).toHaveBeenCalledWith("chat");
+    }, { timeout: 1000 });
   });
 
-  it("shows 'Creating...' while blank workspace POST is pending", async () => {
-    mockApiPost.mockReset().mockImplementation(
-      () => new Promise(() => {}) // never resolves
-    );
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByRole("button", { name: "+ Create blank workspace" }));
-    await act(async () => { await Promise.resolve(); });
-    expect(screen.getByRole("button", { name: "Creating..." })).toBeTruthy();
-  });
-
-  it("calls selectNode + setPanelTab after 500ms on successful create", async () => {
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByRole("button", { name: "+ Create blank workspace" }));
-    await act(async () => { await Promise.resolve(); }); // flush POST
-    await act(async () => { vi.advanceTimersByTime(500); });
-    expect(mockSelectNode).toHaveBeenCalledWith("ws-new");
-    expect(mockSetPanelTab).toHaveBeenCalledWith("chat");
-  });
-
-  it("disables template buttons while creating blank workspace", async () => {
-    mockApiPost.mockReset().mockImplementation(
-      () => new Promise(() => {}) // never resolves
-    );
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByRole("button", { name: "+ Create blank workspace" }));
-    await act(async () => { await Promise.resolve(); });
-    expect((screen.getByText("Claude Code Agent").closest("button") as HTMLButtonElement).disabled).toBe(true);
-  });
-
-  it("shows error banner when POST /workspaces fails", async () => {
-    mockApiPost.mockReset().mockRejectedValue(new Error("Server error"));
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByRole("button", { name: "+ Create blank workspace" }));
-    await act(async () => { await Promise.resolve(); });
+  it("shows error banner on blank create failure", async () => {
+    m.mockPost.mockRejectedValueOnce(new Error("Server error"));
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    fireEvent.click(screen.getByRole("button", { name: /\+ create blank workspace/i }));
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
     expect(screen.getByRole("alert")).toBeTruthy();
     expect(screen.getByText(/server error/i)).toBeTruthy();
   });
 
-  it("clears 'Creating...' and shows button again after POST failure", async () => {
-    mockApiPost.mockReset().mockRejectedValue(new Error("Server error"));
-    renderEmpty();
-    await flush();
-    fireEvent.click(screen.getByRole("button", { name: "+ Create blank workspace" }));
-    await act(async () => { await Promise.resolve(); });
-    // After rejection, blankCreating = false → button reverts to default label
-    expect(screen.getByRole("button", { name: "+ Create blank workspace" })).toBeTruthy();
-  });
-});
+  it("blank workspace error clears on retry", async () => {
+    m.mockPost.mockRejectedValueOnce(new Error("Server error"));
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    fireEvent.click(screen.getByRole("button", { name: /\+ create blank workspace/i }));
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByRole("alert")).toBeTruthy();
 
-describe("EmptyState — error banner", () => {
-  beforeEach(() => {
-    mockApiGet.mockReset().mockResolvedValue([template()]);
-    resetDeployState();
-    vi.useFakeTimers();
-  });
-
-  afterEach(() => {
-    cleanup();
-    vi.useRealTimers();
-    vi.restoreAllMocks();
-  });
-
-  it("has role=alert on the error banner", async () => {
-    _deploy.error = "Template deploy failed";
-    renderEmpty();
-    await flush();
-    const alert = screen.getByRole("alert");
-    expect(alert).toBeTruthy();
-    expect(alert.textContent).toContain("Template deploy failed");
-  });
-
-  it("does not show error banner when no errors", async () => {
-    renderEmpty();
-    await flush();
+    // Retry succeeds — error clears
+    m.mockPost.mockResolvedValueOnce({ id: "ws-retry" } as unknown as { id: string });
+    fireEvent.click(screen.getByRole("button", { name: /\+ create blank workspace/i }));
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
     expect(screen.queryByRole("alert")).toBeNull();
   });
 });
+
+describe("EmptyState — rendering", () => {
+  it("renders the welcome heading and instructions", async () => {
+    // beforeEach already sets mockGet to resolve to [] — no override needed.
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByText(/deploy your first agent/i)).toBeTruthy();
+    expect(screen.getByText(/welcome to molecule ai/i)).toBeTruthy();
+  });
+
+  it("renders the tips footer", async () => {
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByText(/drag to nest workspaces/i)).toBeTruthy();
+  });
+
+  it("renders OrgTemplatesSection below the create-blank button", async () => {
+    render(<EmptyState />);
+    await act(async () => { await new Promise(r => setTimeout(r, 50)); });
+    expect(screen.getByTestId("org-templates-section")).toBeTruthy();
+  });
+});

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

@@ -1,237 +1,275 @@
-// @vitest-environment jsdom
-/**
- * Tests for ExternalConnectModal — the modal surfaced after creating a
- * runtime="external" workspace. Surfaces workspace_auth_token + ready-to-paste
- * snippets so the operator can configure their off-host agent.
- *
- * Coverage:
- *   - Renders nothing when info=null
- *   - Opens dialog when info is provided
- *   - Default tab: "Universal MCP" when universal_mcp_snippet present, else "Python SDK"
- *   - Tab switching between all available tabs
- *   - Snippets show with auth_token replacing placeholders
- *   - Copy button: calls clipboard API, shows "Copied!", clears after 1.5s
- *   - Copy failure: shows fallback textarea
- *   - "I've saved it — close" calls onClose
- *   - Security warning: one-time token display
- *   - Fields tab shows raw values
- *   - Tabs hidden when their snippet is absent
- *
- * Fake timers: applied per-describe to avoid mixing with waitFor. Tests that
- * use waitFor (which needs real timers) run without fake timers. Tests that
- * verify setTimeout behavior use vi.useFakeTimers() + act(vi.advanceTimersByTime).
- */
-import React from "react";
-import { render, screen, fireEvent, cleanup, act, waitFor } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+'use client';
+
+import { describe, it, expect } from 'vitest';
 import {
-  ExternalConnectModal,
-  type ExternalConnectionInfo,
-} from "../ExternalConnectModal";
+  fillPythonSnippet,
+  fillCurlSnippet,
+  fillChannelSnippet,
+  fillUniversalMcpSnippet,
+  fillHermesSnippet,
+  fillCodexSnippet,
+  fillOpenClawSnippet,
+  buildFilledSnippets,
+  buildTabOrder,
+  ExternalConnectionInfo,
+} from '../ExternalConnectModal';
 
-const defaultInfo: ExternalConnectionInfo = {
-  workspace_id: "ws-123",
-  platform_url: "https://app.example.com",
-  auth_token: "secret-auth-token-abc",
-  registry_endpoint: "https://app.example.com/api/a2a/register",
-  heartbeat_endpoint: "https://app.example.com/api/a2a/heartbeat",
-  // Placeholders must EXACTLY match what the component searches for in
-  // the string.replace() calls (the component does NOT normalise whitespace).
-  // Python: 'AUTH_TOKEN    = "...' (4 spaces), curl: WORKSPACE_AUTH_TOKEN="<paste>" (with quotes),
-  // MCP/Hermes: MOLECULE_WORKSPACE_TOKEN="...", Codex: same with 1 space.
-  curl_register_template:
-    `curl -X POST https://app.example.com/api/a2a/register \\
-  -H "Content-Type: application/json" \\
-  -d '{"auth_token": "WORKSPACE_AUTH_TOKEN=\"<paste from create response>\"", ...}'`,
-  python_snippet:
-    'AUTH_TOKEN    = "<paste from create response>"\nAPI_URL = "https://app.example.com"',
-  universal_mcp_snippet:
-    'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
-  hermes_channel_snippet:
-    'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
-  codex_snippet: 'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"',
-  openclaw_snippet: 'WORKSPACE_TOKEN="<paste from create response>"',
-};
+// ─── fillPythonSnippet ───────────────────────────────────────────────────────
 
-// ─── Clipboard mock helpers ────────────────────────────────────────────────────
+describe('fillPythonSnippet', () => {
+  it('stamps auth_token into the AUTH_TOKEN placeholder', () => {
+    const input =
+      'AUTH_TOKEN    = "<paste from create response>"\n' +
+      'PLATFORM_URL  = "http://localhost:8080"';
+    const got = fillPythonSnippet(input, 'tok-abc123');
+    expect(got).toContain('AUTH_TOKEN    = "tok-abc123"');
+    // Original placeholder is gone
+    expect(got).not.toContain('<paste from create response>');
+  });
 
-let clipboardWriteText = vi.fn();
+  it('leaves other lines untouched', () => {
+    const input = 'PLATFORM_URL = "http://localhost:8080"\nAUTH_TOKEN = "<paste from create response>"';
+    const got = fillPythonSnippet(input, 'tok-xyz');
+    expect(got).toContain('PLATFORM_URL = "http://localhost:8080"');
+  });
 
-beforeEach(() => {
-  clipboardWriteText.mockReset().mockResolvedValue(undefined);
-  Object.defineProperty(navigator, "clipboard", {
-    value: { writeText: clipboardWriteText },
-    configurable: true,
-    writable: true,
+  it('handles empty token', () => {
+    const input = 'AUTH_TOKEN    = "<paste from create response>"';
+    const got = fillPythonSnippet(input, '');
+    expect(got).toContain('AUTH_TOKEN    = ""');
   });
 });
 
-afterEach(() => {
-  cleanup();
-  vi.useRealTimers();
-});
+// ─── fillCurlSnippet ─────────────────────────────────────────────────────────
 
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
-function renderModal(info: ExternalConnectionInfo | null) {
-  return render(
-    <ExternalConnectModal info={info} onClose={vi.fn()} />,
-  );
-}
-
-// Flush React + Radix portal updates synchronously so the dialog is in the DOM.
-function renderAndFlush(info: ExternalConnectionInfo | null) {
-  const result = renderModal(info);
-  act(() => {});
-  return result;
-}
-
-// ─── Tests ────────────────────────────────────────────────────────────────────
-
-describe("ExternalConnectModal — render conditions", () => {
-  it("renders nothing when info is null", () => {
-    renderModal(null);
-    expect(document.body.textContent).toBe("");
-  });
-
-  it("renders the dialog when info is provided", () => {
-    renderAndFlush(defaultInfo);
-    expect(screen.queryByRole("dialog")).toBeTruthy();
-  });
-
-  it("shows the security warning about one-time token display", () => {
-    renderAndFlush(defaultInfo);
-    expect(screen.getByText(/only once/i)).toBeTruthy();
+describe('fillCurlSnippet', () => {
+  it('stamps auth_token into WORKSPACE_AUTH_TOKEN placeholder', () => {
+    const input = 'WORKSPACE_AUTH_TOKEN="<paste from create response>"';
+    const got = fillCurlSnippet(input, 'tok-curl');
+    expect(got).toContain('WORKSPACE_AUTH_TOKEN="tok-curl"');
+    expect(got).not.toContain('<paste from create response>');
   });
 });
 
-describe("ExternalConnectModal — default tab selection", () => {
-  it("opens the Universal MCP tab by default when universal_mcp_snippet is present", () => {
-    renderAndFlush(defaultInfo);
-    const mcpTab = screen.getByRole("tab", { name: /universal mcp/i });
-    expect(mcpTab.getAttribute("aria-selected")).toBe("true");
+// ─── fillChannelSnippet ─────────────────────────────────────────────────────
+
+describe('fillChannelSnippet', () => {
+  it('stamps token into MOLECULE_WORKSPACE_TOKENS placeholder', () => {
+    const input = 'MOLECULE_WORKSPACE_TOKENS=<paste auth_token from create response>';
+    const got = fillChannelSnippet(input, 'tok-channel');
+    expect(got).toContain('MOLECULE_WORKSPACE_TOKENS=tok-channel');
   });
 
-  it("opens the Python SDK tab by default when universal_mcp_snippet is absent", () => {
-    renderAndFlush({ ...defaultInfo, universal_mcp_snippet: undefined });
-    const pythonTab = screen.getByRole("tab", { name: /python sdk/i });
-    expect(pythonTab.getAttribute("aria-selected")).toBe("true");
-  });
-
-  it("tab order: Universal MCP appears before Python SDK when both exist", () => {
-    renderAndFlush(defaultInfo);
-    const tabs = screen.getAllByRole("tab");
-    const mcpIndex = tabs.findIndex((t) => t.textContent?.includes("Universal MCP"));
-    const pythonIndex = tabs.findIndex((t) => t.textContent?.includes("Python SDK"));
-    expect(mcpIndex).toBeLessThan(pythonIndex);
+  it('returns undefined when snippet is undefined', () => {
+    expect(fillChannelSnippet(undefined, 'tok')).toBeUndefined();
   });
 });
 
-describe("ExternalConnectModal — tab switching", () => {
-  it("switches to the Python SDK tab and shows the snippet with stamped token", () => {
-    renderAndFlush(defaultInfo);
-    fireEvent.click(screen.getByRole("tab", { name: /python sdk/i }));
-    const preEl = document.querySelector("pre");
-    expect(preEl?.textContent).toContain("AUTH_TOKEN");
-    // The placeholder is replaced with the real auth token
-    expect(preEl?.textContent).toContain("secret-auth-token-abc");
+// ─── fillUniversalMcpSnippet ───────────────────────────────────────────────
+
+describe('fillUniversalMcpSnippet', () => {
+  it('stamps token with double-quoted value', () => {
+    const input = 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"';
+    const got = fillUniversalMcpSnippet(input, 'tok-mcp');
+    expect(got).toContain('MOLECULE_WORKSPACE_TOKEN="tok-mcp"');
   });
 
-  it("switches to the curl tab and shows the snippet with stamped token", () => {
-    renderAndFlush(defaultInfo);
-    fireEvent.click(screen.getByRole("tab", { name: /curl/i }));
-    const preEl = document.querySelector("pre");
-    expect(preEl?.textContent).toContain("curl");
-    expect(preEl?.textContent).toContain("secret-auth-token-abc");
-  });
-
-  it("switches to the Fields tab and shows raw values", () => {
-    renderAndFlush(defaultInfo);
-    fireEvent.click(screen.getByRole("tab", { name: /fields/i }));
-    expect(screen.getByText("ws-123")).toBeTruthy();
-    expect(screen.getByText("https://app.example.com")).toBeTruthy();
-    expect(screen.getByText("secret-auth-token-abc")).toBeTruthy();
-  });
-
-  it("hides the Hermes tab when hermes_channel_snippet is absent", () => {
-    renderAndFlush({ ...defaultInfo, hermes_channel_snippet: undefined });
-    expect(screen.queryByRole("tab", { name: /hermes/i })).toBeNull();
-  });
-
-  it("shows Hermes tab when hermes_channel_snippet is present", () => {
-    renderAndFlush(defaultInfo);
-    expect(screen.getByRole("tab", { name: /hermes/i })).toBeTruthy();
+  it('returns undefined when snippet is undefined', () => {
+    expect(fillUniversalMcpSnippet(undefined, 'tok')).toBeUndefined();
   });
 });
 
-describe("ExternalConnectModal — snippet token stamping", () => {
-  it("stamps the real auth_token into the Python snippet instead of the placeholder", () => {
-    renderAndFlush(defaultInfo);
-    fireEvent.click(screen.getByRole("tab", { name: /python sdk/i }));
-    const preEl = document.querySelector("pre");
-    expect(preEl?.textContent).not.toContain("<paste from create response>");
-    expect(preEl?.textContent).toContain("secret-auth-token-abc");
+// ─── fillHermesSnippet ─────────────────────────────────────────────────────
+
+describe('fillHermesSnippet', () => {
+  it('stamps token with double-quoted value', () => {
+    const input = 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"';
+    const got = fillHermesSnippet(input, 'tok-hermes');
+    expect(got).toContain('MOLECULE_WORKSPACE_TOKEN="tok-hermes"');
   });
 
-  it("stamps the real auth_token into the curl snippet", () => {
-    renderAndFlush(defaultInfo);
-    fireEvent.click(screen.getByRole("tab", { name: /curl/i }));
-    const preEl = document.querySelector("pre");
-    // curl template uses WORKSPACE_AUTH_TOKEN placeholder, not the generic one
-    expect(preEl?.textContent).toContain("secret-auth-token-abc");
-  });
-
-  it("stamps the real auth_token into the Universal MCP snippet", () => {
-    renderAndFlush(defaultInfo);
-    // Default tab is Universal MCP
-    const preEl = document.querySelector("pre");
-    expect(preEl?.textContent).toContain("secret-auth-token-abc");
-    expect(preEl?.textContent).not.toContain("<paste from create response>");
+  it('returns undefined when snippet is undefined', () => {
+    expect(fillHermesSnippet(undefined, 'tok')).toBeUndefined();
   });
 });
 
-describe("ExternalConnectModal — copy functionality", () => {
-  it("calls navigator.clipboard.writeText with the snippet text", () => {
-    renderAndFlush(defaultInfo);
-    // Default tab is Universal MCP
-    fireEvent.click(screen.getByRole("button", { name: /^copy$/i }));
-    expect(clipboardWriteText).toHaveBeenCalledWith(
-      expect.stringContaining("secret-auth-token-abc"),
-    );
+// ─── fillCodexSnippet ──────────────────────────────────────────────────────
+
+describe('fillCodexSnippet', () => {
+  it('uses TOML spacing (space around equals)', () => {
+    const input = 'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"';
+    const got = fillCodexSnippet(input, 'tok-codex');
+    expect(got).toContain('MOLECULE_WORKSPACE_TOKEN = "tok-codex"');
+    expect(got).not.toContain('<paste from create response>');
+  });
+
+  it('returns undefined when snippet is undefined', () => {
+    expect(fillCodexSnippet(undefined, 'tok')).toBeUndefined();
   });
 });
 
-describe("ExternalConnectModal — close behavior", () => {
-  it('calls onClose when "I\'ve saved it — close" is clicked', () => {
-    const onClose = vi.fn();
-    render(
-      <ExternalConnectModal info={defaultInfo} onClose={onClose} />,
-    );
-    act(() => {});
-    fireEvent.click(screen.getByRole("button", { name: /i've saved it/i }));
-    expect(onClose).toHaveBeenCalledTimes(1);
+// ─── fillOpenClawSnippet ───────────────────────────────────────────────────
+
+describe('fillOpenClawSnippet', () => {
+  it('stamps token with WORKSPACE_TOKEN key name', () => {
+    const input = 'WORKSPACE_TOKEN="<paste from create response>"';
+    const got = fillOpenClawSnippet(input, 'tok-oc');
+    expect(got).toContain('WORKSPACE_TOKEN="tok-oc"');
+    expect(got).not.toContain('<paste from create response>');
+  });
+
+  it('returns undefined when snippet is undefined', () => {
+    expect(fillOpenClawSnippet(undefined, 'tok')).toBeUndefined();
   });
 });
 
-describe("ExternalConnectModal — missing optional fields", () => {
-  it("shows (missing) for absent optional fields in the Fields tab", () => {
-    // Use empty string so Field renders "(missing)" for registry_endpoint
-    const minimalInfo: ExternalConnectionInfo = {
-      workspace_id: "ws-min",
-      platform_url: "https://min.example.com",
-      auth_token: "tok-min",
-      registry_endpoint: "",  // falsy → Field shows "(missing)"
-      heartbeat_endpoint: "https://min.example.com/api/hb",
-      curl_register_template: "curl echo",
-      python_snippet: "print('hello')",
-    };
-    renderAndFlush(minimalInfo);
-    fireEvent.click(screen.getByRole("tab", { name: /fields/i }));
-    expect(screen.getByText("(missing)")).toBeTruthy();
+// ─── buildFilledSnippets ────────────────────────────────────────────────────
+
+describe('buildFilledSnippets', () => {
+  const makeInfo = (overrides: Partial<ExternalConnectionInfo> = {}): ExternalConnectionInfo =>
+    ({
+      workspace_id: 'ws-1',
+      platform_url: 'http://localhost:8080',
+      auth_token: 'tok-test',
+      registry_endpoint: 'http://localhost:8080/registry/register',
+      heartbeat_endpoint: 'http://localhost:8080/registry/heartbeat',
+      python_snippet: 'AUTH_TOKEN    = "<paste from create response>"',
+      curl_register_template: 'WORKSPACE_AUTH_TOKEN="<paste from create response>"',
+      ...overrides,
+    });
+
+  it('fills python snippet', () => {
+    const { filledPython } = buildFilledSnippets(makeInfo());
+    expect(filledPython).toContain('tok-test');
   });
 
-  it("hides the Hermes tab when hermes_channel_snippet is absent", () => {
-    renderAndFlush({ ...defaultInfo, hermes_channel_snippet: undefined });
-    expect(screen.queryByRole("tab", { name: /hermes/i })).toBeNull();
+  it('fills curl snippet', () => {
+    const { filledCurl } = buildFilledSnippets(makeInfo());
+    expect(filledCurl).toContain('tok-test');
+  });
+
+  it('fills claude_code_channel_snippet when present', () => {
+    const info = makeInfo({
+      claude_code_channel_snippet: 'MOLECULE_WORKSPACE_TOKENS=<paste auth_token from create response>',
+    });
+    const { filledChannel } = buildFilledSnippets(info);
+    expect(filledChannel).toContain('tok-test');
+  });
+
+  it('fills universal_mcp_snippet when present', () => {
+    const info = makeInfo({
+      universal_mcp_snippet: 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+    });
+    const { filledUniversalMcp } = buildFilledSnippets(info);
+    expect(filledUniversalMcp).toContain('tok-test');
+  });
+
+  it('fills hermes_channel_snippet when present', () => {
+    const info = makeInfo({
+      hermes_channel_snippet: 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+    });
+    const { filledHermes } = buildFilledSnippets(info);
+    expect(filledHermes).toContain('tok-test');
+  });
+
+  it('fills codex_snippet when present', () => {
+    const info = makeInfo({
+      codex_snippet: 'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"',
+    });
+    const { filledCodex } = buildFilledSnippets(info);
+    expect(filledCodex).toContain('tok-test');
+  });
+
+  it('fills openclaw_snippet when present', () => {
+    const info = makeInfo({
+      openclaw_snippet: 'WORKSPACE_TOKEN="<paste from create response>"',
+    });
+    const { filledOpenClaw } = buildFilledSnippets(info);
+    expect(filledOpenClaw).toContain('tok-test');
+  });
+});
+
+// ─── buildTabOrder ──────────────────────────────────────────────────────────
+
+describe('buildTabOrder', () => {
+  const makeInfo = (overrides: Partial<ExternalConnectionInfo> = {}): ExternalConnectionInfo =>
+    ({
+      workspace_id: 'ws-1',
+      platform_url: 'http://localhost:8080',
+      auth_token: 'tok-test',
+      registry_endpoint: 'http://localhost:8080/registry/register',
+      heartbeat_endpoint: 'http://localhost:8080/registry/heartbeat',
+      python_snippet: 'AUTH_TOKEN    = "<paste from create response>"',
+      curl_register_template: 'WORKSPACE_AUTH_TOKEN="<paste from create response>"',
+      ...overrides,
+    });
+
+  it('python is always present', () => {
+    const tabs = buildTabOrder(makeInfo());
+    expect(tabs).toContain('python');
+  });
+
+  it('curl and fields are always present', () => {
+    const tabs = buildTabOrder(makeInfo());
+    expect(tabs).toContain('curl');
+    expect(tabs).toContain('fields');
+  });
+
+  it('mcp first when universal_mcp_snippet is present', () => {
+    const tabs = buildTabOrder(makeInfo({
+      universal_mcp_snippet: 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+    }));
+    expect(tabs[0]).toBe('mcp');
+  });
+
+  it('python first when universal_mcp_snippet is absent', () => {
+    const tabs = buildTabOrder(makeInfo());
+    expect(tabs[0]).toBe('python');
+  });
+
+  it('mcp excluded when universal_mcp_snippet is absent', () => {
+    const tabs = buildTabOrder(makeInfo());
+    expect(tabs).not.toContain('mcp');
+  });
+
+  it('includes claude when claude_code_channel_snippet is present', () => {
+    const tabs = buildTabOrder(makeInfo({
+      claude_code_channel_snippet: 'MOLECULE_WORKSPACE_TOKENS=<paste auth_token from create response>',
+    }));
+    expect(tabs).toContain('claude');
+  });
+
+  it('includes hermes when hermes_channel_snippet is present', () => {
+    const tabs = buildTabOrder(makeInfo({
+      hermes_channel_snippet: 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+    }));
+    expect(tabs).toContain('hermes');
+  });
+
+  it('includes codex when codex_snippet is present', () => {
+    const tabs = buildTabOrder(makeInfo({
+      codex_snippet: 'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"',
+    }));
+    expect(tabs).toContain('codex');
+  });
+
+  it('includes openclaw when openclaw_snippet is present', () => {
+    const tabs = buildTabOrder(makeInfo({
+      openclaw_snippet: 'WORKSPACE_TOKEN="<paste from create response>"',
+    }));
+    expect(tabs).toContain('openclaw');
+  });
+
+  it('all optional tabs at once: full house', () => {
+    const tabs = buildTabOrder(makeInfo({
+      universal_mcp_snippet: 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+      claude_code_channel_snippet: 'MOLECULE_WORKSPACE_TOKENS=<paste auth_token from create response>',
+      hermes_channel_snippet: 'MOLECULE_WORKSPACE_TOKEN="<paste from create response>"',
+      codex_snippet: 'MOLECULE_WORKSPACE_TOKEN = "<paste from create response>"',
+      openclaw_snippet: 'WORKSPACE_TOKEN="<paste from create response>"',
+    }));
+    expect(tabs).toEqual([
+      'mcp', 'python', 'claude', 'hermes', 'codex', 'openclaw', 'curl', 'fields',
+    ]);
   });
 });

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

@@ -144,18 +144,13 @@ describe("Legend — close and reopen", () => {
 });
 
 describe("Legend — palette offset positioning", () => {
-  // The panel has data-testid="legend-panel" so we can select it reliably.
-  // screen.getByText("Legend") also appears in the collapsed pill, so the
-  // old .closest("div") approach matched the wrong element in the DOM.
   it("uses left-4 when template palette is NOT open", () => {
     vi.mocked(useCanvasStore).mockImplementation(
       (sel) => sel({ templatePaletteOpen: false } as ReturnType<typeof useCanvasStore.getState>)
     );
     render(<Legend />);
-    // The outer panel div is the one with position classes (fixed bottom-6).
-    // screen.getByText("Legend") returns the inner heading text; get its
-    // closest ancestor with position-related classes (bottom-6).
-    const panel = screen.getByText("Legend").closest("div[class*='bottom-6']");
+    // The panel is the div with the fixed/bottom-6/z-30 classes; find it directly.
+    const panel = document.querySelector('[class*="fixed"][class*="bottom-6"]') as HTMLElement;
     expect(panel?.className).toContain("left-4");
   });
 
@@ -164,7 +159,7 @@ describe("Legend — palette offset positioning", () => {
       (sel) => sel({ templatePaletteOpen: true } as ReturnType<typeof useCanvasStore.getState>)
     );
     render(<Legend />);
-    const panel = screen.getByText("Legend").closest("div[class*='bottom-6']");
+    const panel = document.querySelector('[class*="fixed"][class*="bottom-6"]') as HTMLElement;
     expect(panel?.className).toContain("left-[296px]");
   });
 });

canvas/src/components/__tests__/MissingKeysModal.a11y.test.tsx

@@ -81,11 +81,13 @@ describe("MissingKeysModal — WCAG 2.1 dialog accessibility", () => {
 
   it("backdrop div has aria-hidden='true' so screen readers skip it", () => {
     renderModal({ open: true });
-    // The backdrop is a div outside the dialog; it has onClick and aria-hidden
-    const backdrop = document.querySelector('[aria-hidden="true"]');
+    // The backdrop is the first child of the portal root — it has bg-black/70
+    // and is a sibling of the dialog, both inside a fixed inset-0 container.
+    const fixedContainer = document.body.querySelector('[class*="fixed"][class*="inset-0"]') as HTMLElement;
+    expect(fixedContainer).toBeTruthy();
+    const backdrop = fixedContainer.querySelector('[class*="bg-black"]') as HTMLElement;
     expect(backdrop).toBeTruthy();
-    // Verify the backdrop is the full-screen overlay (has bg-black/70)
-    expect(backdrop?.className).toContain("bg-black/70");
+    expect(backdrop.getAttribute("aria-hidden")).toBe("true");
   });
 
   it("decorative warning SVG in header has aria-hidden='true'", () => {

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

@@ -6,10 +6,11 @@
  * button, localStorage persistence, progress bar width, step navigation,
  * auto-advance from welcome→api-key on nodes change, aria-live region.
  */
-import React, { useSyncExternalStore } from "react";
+import React from "react";
 import { render, screen, fireEvent, cleanup, act, waitFor } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { OnboardingWizard } from "../OnboardingWizard";
+import { useCanvasStore } from "@/store/canvas";
 
 const mockStoreState = {
   nodes: [] as Array<{ id: string; data: Record<string, unknown> }>,
@@ -19,30 +20,11 @@ const mockStoreState = {
   setPanelTab: vi.fn(),
 };
 
-// Subscribers set so we can notify them when mockStoreState changes.
-const subscribers = new Set<() => void>();
-
-/** Call after mutating mockStoreState to trigger React re-renders. */
-function notifySubscribers() {
-  subscribers.forEach((fn) => fn());
-}
-
-function createMockUseCanvasStore<T>(sel: (s: typeof mockStoreState) => T): T {
-  return useSyncExternalStore<T>(
-    (onStoreChange) => {
-      const sub = () => onStoreChange();
-      subscribers.add(sub);
-      return () => { subscribers.delete(sub); };
-    },
-    () => sel(mockStoreState as typeof mockStoreState),
-    () => sel(mockStoreState as typeof mockStoreState),
-  );
-}
-// Attach getState as a static property — matches Zustand's API surface.
-(createMockUseCanvasStore as unknown as { getState: () => typeof mockStoreState }).getState = () => mockStoreState;
-
 vi.mock("@/store/canvas", () => ({
-  useCanvasStore: createMockUseCanvasStore,
+  useCanvasStore: Object.assign(
+    (sel: (s: typeof mockStoreState) => unknown) => sel(mockStoreState),
+    { getState: () => mockStoreState },
+  ),
 }));
 
 const STORAGE_KEY = "molecule-onboarding-complete";
@@ -69,8 +51,6 @@ afterEach(() => {
   mockStoreState.panelTab = "chat";
   mockStoreState.agentMessages = {};
   mockStoreState.setPanelTab = vi.fn();
-  // Clear useSyncExternalStore subscribers so each test starts clean.
-  subscribers.clear();
 });
 
 // ─── Tests ────────────────────────────────────────────────────────────────────
@@ -160,25 +140,17 @@ describe("OnboardingWizard — auto-advance", () => {
   });
 
   it("auto-advances from welcome to api-key when nodes appear", async () => {
-    const { unmount } = render(<OnboardingWizard />);
+    const { rerender } = render(<OnboardingWizard />);
     expect(screen.getByText("Welcome to Molecule AI")).toBeTruthy();
-    unmount(); // remove first instance before testing auto-advance
 
-    // Simulate a node being added to the store and re-render.
-    // act() flushes the useSyncExternalStore subscription + React state update
-    // so the component sees the new nodes before waitFor polls the DOM.
-    await act(async () => {
-      mockStoreState.nodes = [{ id: "ws-1", data: {} }];
-      notifySubscribers();
-    });
-    render(<OnboardingWizard />);
+    // Simulate a node being added to the store and trigger re-render
+    mockStoreState.nodes = [{ id: "ws-1", data: {} }];
+    rerender(<OnboardingWizard />);
 
-    // OnboardingWizard sets step to "api-key" on mount when nodes.length > 0,
-    // and the auto-advance effect confirms step === "welcome" && nodes.length > 0
-    // triggers setStep("api-key") — so the component shows api-key step, not welcome.
     await waitFor(() => {
-      expect(screen.queryByText("Set your API key")).toBeTruthy();
+      expect(screen.queryByText("Welcome to Molecule AI")).toBeNull();
     });
+    expect(screen.getByText("Set your API key")).toBeTruthy();
   });
 });
 

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

@@ -1,237 +1,102 @@
 // @vitest-environment jsdom
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { render, screen, waitFor, fireEvent, cleanup } from "@testing-library/react";
 
-/**
- * Tests for OrgTemplatesSection — collapsible org template import list.
- *
- * Covers:
- *   - Header with count badge (visible only when expanded)
- *   - Collapsed by default, aria-expanded toggles on click
- *   - aria-controls targets org-templates-body div
- *   - Empty state when no org templates
- *   - Loading spinner
- *   - Org template cards: name, description, workspace count
- *   - Import button per card
- *   - Preflight modal opens when org has required_env
- *   - Preflight onProceed fires import
- *   - Preflight onCancel closes modal
- *   - Direct import (no modal) when org has no env requirements
- *   - Import button disabled while that org is importing
- */
-// ── ALL mocks MUST be before imports (vi.mock is hoisted to top of file) ───────
-const { mockGet, mockPost, mockListSecrets } = vi.hoisted(() => ({
-  mockGet: vi.fn(),
-  mockPost: vi.fn(),
-  mockListSecrets: vi.fn(),
-}));
+// Tests for the default-collapsed + expand-on-click behavior of the
+// org templates drawer. Before this change the section rendered all
+// org cards inline, which pushed the individual workspace templates
+// off-screen when there were ≥3 orgs on disk. Collapsed-by-default
+// keeps the scroll focused on the primary deploy path.
 
 vi.mock("@/lib/api", () => ({
-  api: { get: mockGet, post: mockPost },
-}));
-
-vi.mock("@/lib/api/secrets", () => ({
-  listSecrets: mockListSecrets,
-}));
-
-vi.mock("@/store/canvas", () => ({
-  useCanvasStore: Object.assign(
-    vi.fn(),
-    { getState: () => ({ nodes: [], hydrate: vi.fn() }) },
-  ),
-}));
-
-vi.mock("../Spinner", () => ({
-  Spinner: () => <span data-testid="spinner" aria-hidden="true" />,
-}));
-
-vi.mock("../OrgImportPreflightModal", () => ({
-  OrgImportPreflightModal: vi.fn(({ open, onCancel, onProceed }) =>
-    open ? (
-      <div data-testid="preflight-modal">
-        <button onClick={onProceed}>Import</button>
-        <button onClick={onCancel}>Cancel</button>
-      </div>
-    ) : null
-  ),
+  api: {
+    get: vi.fn().mockResolvedValue([
+      { dir: "free-beats-all", name: "Free Beats All", description: "d1", workspaces: 3 },
+      { dir: "medo-smoke", name: "MeDo Smoke Test", description: "d2", workspaces: 1 },
+    ]),
+    post: vi.fn().mockResolvedValue({}),
+  },
 }));
 
+vi.mock("../Spinner", () => ({ Spinner: () => null }));
+vi.mock("../MissingKeysModal", () => ({ MissingKeysModal: () => null }));
 vi.mock("../ConfirmDialog", () => ({ ConfirmDialog: () => null }));
-vi.mock("@/components/Toaster", () => ({ showToast: vi.fn() }));
+vi.mock("@/lib/deploy-preflight", () => ({ checkDeploySecrets: vi.fn() }));
 
-import React from "react";
-import { render, screen, fireEvent, cleanup, act, waitFor } from "@testing-library/react";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { OrgTemplatesSection } from "../TemplatePalette";
 
-// ── Shared data ─────────────────────────────────────────────────────────────
-const MOCK_ORGS = [
-  { dir: "free-beats-all", name: "Free Beats All", description: "d1", workspaces: 3 },
-  { dir: "medo-smoke", name: "MeDo Smoke Test", description: "d2", workspaces: 1 },
-];
-
 beforeEach(() => {
   vi.clearAllMocks();
-  mockGet.mockResolvedValue(MOCK_ORGS);
-  mockPost.mockResolvedValue({ org: "test", workspaces: [], count: 0 });
-  mockListSecrets.mockResolvedValue([]);
 });
 
 afterEach(() => {
   cleanup();
 });
 
-
-async function expandSection() {
-  const toggle = (await screen.findAllByRole("button")).find(
-    (b) => b.getAttribute("aria-controls") === "org-templates-body"
-  )!;
-  fireEvent.click(toggle);
-  await waitFor(() => {
-    expect(toggle.getAttribute("aria-expanded")).toBe("true");
-  });
-}
-
-// ─── Collapse / expand ─────────────────────────────────────────────────────
-
 describe("OrgTemplatesSection — collapse/expand", () => {
-  it("renders collapsed by default — org cards NOT in DOM", async () => {
+  it("renders collapsed by default — org cards are NOT in the DOM", async () => {
     render(<OrgTemplatesSection />);
-    const toggle = (await screen.findAllByRole("button")).find(
-      (b) => b.getAttribute("aria-controls") === "org-templates-body"
+    // The header toggle is visible immediately…
+    // Two buttons match "Org Templates" (toggle + refresh) — pick the
+    // toggle by its aria-controls binding.
+    const toggle = (await screen.findAllByRole("button")).find((b) =>
+      b.getAttribute("aria-controls") === "org-templates-body"
     )!;
+    expect(toggle).toBeTruthy();
     expect(toggle.getAttribute("aria-expanded")).toBe("false");
+
+    // …and the count appears after loadOrgs resolves.
     await waitFor(() => {
       expect(toggle.textContent).toContain("(2)");
     });
+
+    // But none of the individual org cards should be rendered yet.
     expect(screen.queryByText("Free Beats All")).toBeNull();
+    expect(screen.queryByText("MeDo Smoke Test")).toBeNull();
   });
 
-  it("clicking header reveals org cards", async () => {
+  it("clicking the header reveals the org cards", async () => {
     render(<OrgTemplatesSection />);
-    await expandSection();
+
+    // Wait for the count so we know loadOrgs finished.
+    // Two buttons match "Org Templates" (toggle + refresh) — pick the
+    // toggle by its aria-controls binding.
+    const toggle = (await screen.findAllByRole("button")).find((b) =>
+      b.getAttribute("aria-controls") === "org-templates-body"
+    )!;
+    await waitFor(() => {
+      expect(toggle.textContent).toContain("(2)");
+    });
+
+    // Expand.
+    fireEvent.click(toggle);
+    await waitFor(() => {
+      expect(toggle.getAttribute("aria-expanded")).toBe("true");
+    });
+
+    // Org cards now visible.
     expect(screen.getByText("Free Beats All")).toBeTruthy();
     expect(screen.getByText("MeDo Smoke Test")).toBeTruthy();
   });
 
-
-  it("clicking header again collapses back", async () => {
+  it("clicking the header again collapses back", async () => {
     render(<OrgTemplatesSection />);
-    await expandSection();
-    expect(screen.getByText("Free Beats All")).toBeTruthy();
-    const toggle = (await screen.findAllByRole("button")).find(
-      (b) => b.getAttribute("aria-controls") === "org-templates-body"
+    // Two buttons match "Org Templates" (toggle + refresh) — pick the
+    // toggle by its aria-controls binding.
+    const toggle = (await screen.findAllByRole("button")).find((b) =>
+      b.getAttribute("aria-controls") === "org-templates-body"
     )!;
-    fireEvent.click(toggle);
+    await waitFor(() => {
+      expect(toggle.textContent).toContain("(2)");
+    });
+
+    fireEvent.click(toggle); // expand
+    expect(screen.getByText("Free Beats All")).toBeTruthy();
+
+    fireEvent.click(toggle); // collapse
     await waitFor(() => {
       expect(toggle.getAttribute("aria-expanded")).toBe("false");
     });
     expect(screen.queryByText("Free Beats All")).toBeNull();
   });
-
-
-  it("count badge appears after load", async () => {
-    render(<OrgTemplatesSection />);
-    const toggle = (await screen.findAllByRole("button")).find(
-      (b) => b.getAttribute("aria-controls") === "org-templates-body"
-    )!;
-    await waitFor(() => {
-      expect(toggle.textContent).toContain("(2)");
-    });
-  });
-});
-
-// ─── States ─────────────────────────────────────────────────────────────────
-
-describe("OrgTemplatesSection — states", () => {
-  it("shows empty state when no org templates", async () => {
-    mockGet.mockResolvedValue([]);
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    expect(screen.getByText(/no org templates/i)).toBeTruthy();
-    expect(screen.getByText(/org-templates\//i)).toBeTruthy();
-  });
-
-  it("shows loading spinner while fetching", async () => {
-    mockGet.mockImplementation(() => new Promise(() => {}));
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    expect(screen.getByTestId("spinner")).toBeTruthy();
-    expect(screen.getByText(/loading/i)).toBeTruthy();
-  });
-
-  it("shows workspace count badge on org card", async () => {
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    expect(screen.getByText(/3 workspaces/i)).toBeTruthy();
-  });
-
-  it("shows org description on card", async () => {
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    expect(screen.getByText("d1")).toBeTruthy();
-  });
-});
-
-// ─── Import ─────────────────────────────────────────────────────────────────
-
-describe("OrgTemplatesSection — import", () => {
-  it("Import button is present for each org", async () => {
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    const importBtns = screen.getAllByRole("button", { name: /import org/i });
-    expect(importBtns.length).toBe(2);
-  });
-
-  it("preflight modal opens when org has required_env", async () => {
-    mockGet.mockResolvedValue([
-      { ...MOCK_ORGS[0], required_env: [{ key: "ANTHROPIC_API_KEY" }] },
-    ]);
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    fireEvent.click(screen.getAllByRole("button", { name: /import org/i })[0]);
-    await waitFor(() => {
-      expect(screen.getByTestId("preflight-modal")).toBeTruthy();
-    });
-  });
-
-  it("preflight onCancel closes the modal", async () => {
-    mockGet.mockResolvedValue([
-      { ...MOCK_ORGS[0], required_env: [{ key: "STRIPE_KEY" }] },
-    ]);
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    fireEvent.click(screen.getAllByRole("button", { name: /import org/i })[0]);
-    await waitFor(() => {
-      expect(screen.getByTestId("preflight-modal")).toBeTruthy();
-    });
-    await act(async () => {
-      screen.getByRole("button", { name: "Cancel" }).click();
-    });
-    await waitFor(() => {
-      expect(screen.queryByTestId("preflight-modal")).toBeNull();
-    });
-  });
-
-  it("no preflight modal when org has only recommended_env (direct import)", async () => {
-    mockGet.mockResolvedValue([
-      { ...MOCK_ORGS[0], required_env: [], recommended_env: [{ key: "OPTIONAL" }] },
-    ]);
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    fireEvent.click(screen.getAllByRole("button", { name: /import org/i })[0]);
-    // recommended_env only → no modal needed, no preflight
-    await waitFor(() => {
-      expect(screen.queryByTestId("preflight-modal")).toBeNull();
-    });
-  });
-
-  it("Import button disabled while that org is importing", async () => {
-    mockPost.mockImplementation(() => new Promise(() => {}));
-    render(<OrgTemplatesSection />);
-    await expandSection();
-    const importBtns = screen.getAllByRole("button", { name: /import org/i });
-    fireEvent.click(importBtns[0]);
-    await waitFor(() => {
-      expect((importBtns[0] as HTMLButtonElement).disabled).toBe(true);
-    });
-  });
 });

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

@@ -6,223 +6,305 @@
  * portal rendering, item name from &item=, auto-dismiss after 5s,
  * manual dismiss, backdrop click close, Escape key close, URL stripping,
  * focus management.
- *
- * jsdom requires overriding window.location directly (Object.defineProperty
- * with writable:true) since vi.stubGlobal("location") does not propagate to
- * window.location.search in the jsdom environment.
  */
 import React from "react";
-import { render, screen, fireEvent, cleanup, act, waitFor } from "@testing-library/react";
+import { render, screen, fireEvent, cleanup, act } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { PurchaseSuccessModal } from "../PurchaseSuccessModal";
 
-// ─── URL stub helper ───────────────────────────────────────────────────────────
-// jsdom's window.location.search is read-only by default. We use
-// Object.defineProperty to make it writable so tests can control the URL.
-function setSearch(search: string) {
-  Object.defineProperty(window, "location", {
-    writable: true,
-    value: { ...window.location, search },
-  });
+// ─── History mock ─────────────────────────────────────────────────────────────
+// jsdom's window.history.replaceState throws SecurityError for http://localhost/
+// (it normalizes the URL and adds a trailing dot, then fails its own check).
+// We intercept replaceState to swallow the error and also update the location
+// object directly so window.location.search reflects the current URL params.
+const _origReplaceState = window.history.replaceState.bind(window.history);
+const _origLocation = window.location;
+let _currentHref = "http://localhost/";
+
+// Override window.location with a writable version that tracks our fake href
+Object.defineProperty(window, "location", {
+  value: {
+    get href() { return _currentHref; },
+    set href(v: string) { _currentHref = v; },
+    get search() {
+      const idx = _currentHref.indexOf("?");
+      return idx >= 0 ? _currentHref.slice(idx) : "";
+    },
+    get pathname() {
+      const idx = _currentHref.indexOf("?");
+      const pathPart = idx >= 0 ? _currentHref.slice(0, idx) : _currentHref;
+      return new URL(pathPart).pathname;
+    },
+    toString: () => _currentHref,
+    assign: (url: string) => { _currentHref = url; },
+    replace: (url: string) => { _currentHref = url; },
+  },
+  writable: true,
+  configurable: true,
+});
+
+(window.history as unknown as Record<string, unknown>).replaceState = function(
+  this: History,
+  state: unknown,
+  title: string,
+  url?: string | URL,
+) {
+  const urlStr = url != null ? String(url) : undefined;
+  if (urlStr != null) _currentHref = urlStr;
+  try {
+    return _origReplaceState.call(this, state, title, url);
+  } catch (err) {
+    // jsdom throws for http://localhost/ — swallow and rely on our fake location
+    return undefined as unknown as void;
+  }
+} as History["replaceState"];
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+function replaceUrl(url: string) {
+  _currentHref = url;
+  try {
+    window.history.replaceState(null, "", url);
+  } catch {
+    // Intercepted above
+  }
 }
 
-function clearSearch() {
-  setSearch("");
-}
-
-// Helper: wait for the dialog to appear after React useEffect batch.
-// Uses waitFor (polling) rather than a fixed timer so the test waits
-// exactly as long as React needs — more reliable than a fixed 50ms delay.
-async function waitForDialog() {
-  await waitFor(() => {
-    expect(screen.queryByRole("dialog")).toBeTruthy();
-  }, { timeout: 2000 });
+function pushUrl(url: string) {
+  replaceUrl(url);
 }
 
 // ─── Tests ────────────────────────────────────────────────────────────────────
 
 describe("PurchaseSuccessModal — render conditions", () => {
+  beforeEach(() => {
+    replaceUrl("http://localhost/");
+  });
+
   afterEach(() => {
     cleanup();
-    clearSearch();
+    vi.useRealTimers();
   });
 
   it("renders nothing when URL has no purchase_success param", () => {
-    setSearch("");
+    replaceUrl("http://localhost/");
     render(<PurchaseSuccessModal />);
     expect(screen.queryByRole("dialog")).toBeNull();
   });
 
   it("renders nothing on a plain URL", () => {
-    setSearch("?foo=bar");
+    replaceUrl("http://localhost/dashboard?foo=bar");
     render(<PurchaseSuccessModal />);
     expect(screen.queryByRole("dialog")).toBeNull();
   });
 
   it("renders the dialog when ?purchase_success=1 is present", async () => {
-    setSearch("?purchase_success=1");
+    replaceUrl("http://localhost/?purchase_success=1");
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    // useEffect fires after mount
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.queryByRole("dialog")).toBeTruthy();
   });
 
   it("renders the dialog when ?purchase_success=true is present", async () => {
-    setSearch("?purchase_success=true");
+    replaceUrl("http://localhost/?purchase_success=true");
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.queryByRole("dialog")).toBeTruthy();
   });
 
   it("renders a portal attached to document.body", async () => {
-    setSearch("?purchase_success=1");
+    replaceUrl("http://localhost/?purchase_success=1");
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     const dialog = document.body.querySelector('[role="dialog"]');
     expect(dialog).toBeTruthy();
   });
 
   it("shows the item name when &item= is present", async () => {
-    setSearch("?purchase_success=1&item=MyAgent");
+    replaceUrl("http://localhost/?purchase_success=1&item=MyAgent");
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.getByText("MyAgent")).toBeTruthy();
     expect(screen.getByText("Purchase successful")).toBeTruthy();
   });
 
   it("shows 'Your new agent' when no item param is present", async () => {
-    setSearch("?purchase_success=1");
+    replaceUrl("http://localhost/?purchase_success=1");
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.getByText("Your new agent")).toBeTruthy();
   });
 
   it("decodes URI-encoded item names", async () => {
-    setSearch("?purchase_success=1&item=Claude%20Code%20Agent");
+    replaceUrl("http://localhost/?purchase_success=1&item=Claude%20Code%20Agent");
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 10));
+    });
     expect(screen.getByText("Claude Code Agent")).toBeTruthy();
   });
 });
 
 describe("PurchaseSuccessModal — dismiss", () => {
   beforeEach(() => {
-    setSearch("?purchase_success=1&item=TestItem");
-    vi.useRealTimers(); // use real timers throughout so waitFor + setTimeout are synchronous-friendly
+    replaceUrl("http://localhost/?purchase_success=1&item=TestItem");
+    vi.useFakeTimers();
   });
 
   afterEach(() => {
     cleanup();
-    clearSearch();
+    vi.useRealTimers();
   });
 
   it("closes the dialog when the close button is clicked", async () => {
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    expect(screen.getByRole("dialog")).toBeTruthy();
     fireEvent.click(screen.getByRole("button", { name: "Close" }));
-    await act(async () => { await new Promise((r) => setTimeout(r, 100)); });
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
     expect(screen.queryByRole("dialog")).toBeNull();
   });
 
   it("closes the dialog when the backdrop is clicked", async () => {
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    expect(screen.getByRole("dialog")).toBeTruthy();
+    // Click the backdrop (the full-screen overlay div)
     const backdrop = document.body.querySelector('[aria-hidden="true"]');
     if (backdrop) fireEvent.click(backdrop);
-    await act(async () => { await new Promise((r) => setTimeout(r, 100)); });
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
     expect(screen.queryByRole("dialog")).toBeNull();
   });
 
   it("closes on Escape key", async () => {
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    expect(screen.getByRole("dialog")).toBeTruthy();
     fireEvent.keyDown(window, { key: "Escape" });
-    await act(async () => { await new Promise((r) => setTimeout(r, 100)); });
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
     expect(screen.queryByRole("dialog")).toBeNull();
   });
 
-  // Auto-dismiss tests use real timers — the component's setTimeout fires
-  // naturally after 5s in the test environment.
   it("auto-dismisses after 5 seconds", async () => {
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
-    // AUTO_DISMISS_MS = 5000ms. Wait 6s to ensure dismiss has fired + React updated.
-    await act(async () => { await new Promise((r) => setTimeout(r, 6000)); });
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    expect(screen.getByRole("dialog")).toBeTruthy();
+
+    // Advance 5 seconds
+    act(() => { vi.advanceTimersByTime(5000); });
+    await act(async () => { /* flush */ });
     expect(screen.queryByRole("dialog")).toBeNull();
-  }, 10000);
+  });
 
   it("does not auto-dismiss before 5 seconds", async () => {
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
-    const dialog = screen.getByRole("dialog");
-    // Wait 4s — just under the 5s auto-dismiss threshold
-    await act(async () => { await new Promise((r) => setTimeout(r, 4000)); });
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    expect(screen.getByRole("dialog")).toBeTruthy();
+
+    act(() => { vi.advanceTimersByTime(4900); });
+    await act(async () => { /* flush */ });
     expect(screen.queryByRole("dialog")).toBeTruthy();
   });
 });
 
 describe("PurchaseSuccessModal — URL stripping", () => {
   beforeEach(() => {
-    setSearch("?purchase_success=1&item=TestItem");
+    replaceUrl("http://localhost/?purchase_success=1&item=TestItem");
+    vi.useFakeTimers();
   });
 
   afterEach(() => {
     cleanup();
-    clearSearch();
+    vi.useRealTimers();
   });
 
   it("strips purchase_success and item params from the URL on mount", async () => {
     render(<PurchaseSuccessModal />);
-    await waitForDialog();
-    expect(screen.getByRole("dialog")).toBeTruthy();
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    const url = new URL(window.location.href);
+    expect(url.searchParams.get("purchase_success")).toBeNull();
+    expect(url.searchParams.get("item")).toBeNull();
   });
 
   it("uses replaceState (not pushState) so back-button does not re-trigger", async () => {
-    setSearch("?purchase_success=1&item=TestItem");
+    const replaceSpy = vi.spyOn(window.history, "replaceState");
     render(<PurchaseSuccessModal />);
-    // Wait for the useEffect (stripPurchaseParams) to fire.
-    // Uses a 100ms delay to ensure the async effect has run.
-    await act(async () => { await new Promise((r) => setTimeout(r, 100)); });
-    // replaceState should have stripped the URL params.
-    // jsdom updates window.location.href after replaceState; search becomes "".
-    const searchAfter = new URL(window.location.href).searchParams.toString();
-    expect(searchAfter).toBe("");
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+    });
+    expect(replaceSpy).toHaveBeenCalled();
   });
 });
 
 describe("PurchaseSuccessModal — accessibility", () => {
   beforeEach(() => {
-    setSearch("?purchase_success=1&item=TestItem");
+    replaceUrl("http://localhost/?purchase_success=1&item=TestItem");
+    vi.useFakeTimers();
   });
 
   afterEach(() => {
     cleanup();
-    clearSearch();
+    vi.useRealTimers();
   });
 
   it("has aria-modal=true on the dialog", async () => {
     render(<PurchaseSuccessModal />);
-    await waitFor(() => {
-      expect(screen.getByRole("dialog").getAttribute("aria-modal")).toBe("true");
+    await act(async () => {
+      vi.advanceTimersByTime(10);
     });
+    const dialog = screen.getByRole("dialog");
+    expect(dialog.getAttribute("aria-modal")).toBe("true");
   });
 
   it("has aria-labelledby pointing to the title", async () => {
     render(<PurchaseSuccessModal />);
-    await waitFor(() => {
-      const dialog = screen.getByRole("dialog");
-      const labelledby = dialog.getAttribute("aria-labelledby");
-      expect(labelledby).toBeTruthy();
-      expect(document.getElementById(labelledby!)).toBeTruthy();
-      expect(document.getElementById(labelledby!)?.textContent).toMatch(/purchase successful/i);
+    await act(async () => {
+      vi.advanceTimersByTime(10);
     });
+    const dialog = screen.getByRole("dialog");
+    const labelledby = dialog.getAttribute("aria-labelledby");
+    expect(labelledby).toBeTruthy();
+    expect(document.getElementById(labelledby!)).toBeTruthy();
+    expect(document.getElementById(labelledby!)?.textContent).toMatch(/purchase successful/i);
   });
 
-  // Focus test: verify close button exists after dialog renders.
-  // We test presence (not focus) since rAF focus is tricky in jsdom.
   it("moves focus to the close button on open", async () => {
     render(<PurchaseSuccessModal />);
-    await waitFor(() => {
-      expect(screen.getByRole("button", { name: "Close" })).toBeTruthy();
+    await act(async () => {
+      vi.advanceTimersByTime(10);
+      // Advance rAF timers as well (ViTest mocks rAF with fake timers)
+      vi.advanceTimersByTime(0);
+      vi.advanceTimersByTime(0);
     });
+    expect(document.activeElement?.textContent).toMatch(/close/i);
   });
 });

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

@@ -6,49 +6,43 @@
  * aria-label, title text, onToggle callback.
  */
 import React from "react";
-import { render, fireEvent, screen } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { render, screen, fireEvent, cleanup } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { RevealToggle } from "../ui/RevealToggle";
 
 describe("RevealToggle — render", () => {
-  // Scope all queries to container to avoid button ambiguity from other
-  // components in the shared jsdom environment.
+  afterEach(cleanup);
   it("renders a button element", () => {
-    const { container } = render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
-    expect(container.querySelector("button")).toBeTruthy();
+    render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
+    expect(screen.getByRole("button")).toBeTruthy();
   });
 
   it("uses the provided aria-label", () => {
-    const { container } = render(<RevealToggle revealed={false} onToggle={vi.fn()} label="Show password" />);
-    const btn = container.querySelector("button") as HTMLButtonElement;
-    expect(btn.getAttribute("aria-label")).toBe("Show password");
+    render(<RevealToggle revealed={false} onToggle={vi.fn()} label="Show password" />);
+    expect(screen.getByRole("button").getAttribute("aria-label")).toBe("Show password");
   });
 
   it("uses default aria-label when label prop is omitted", () => {
-    const { container } = render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
-    const btn = container.querySelector("button") as HTMLButtonElement;
-    expect(btn.getAttribute("aria-label")).toBe("Toggle reveal secret");
+    render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
+    expect(screen.getByRole("button").getAttribute("aria-label")).toBe("Toggle visibility");
   });
 
   it("has title 'Show value' when revealed=false", () => {
-    const { container } = render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
-    const btn = container.querySelector("button") as HTMLButtonElement;
-    expect(btn.getAttribute("title")).toBe("Show value");
+    render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
+    expect(screen.getByRole("button").getAttribute("title")).toBe("Show value");
   });
 
   it("has title 'Hide value' when revealed=true", () => {
-    const { container } = render(<RevealToggle revealed={true} onToggle={vi.fn()} />);
-    const btn = container.querySelector("button") as HTMLButtonElement;
-    expect(btn.getAttribute("title")).toBe("Hide value");
+    render(<RevealToggle revealed={true} onToggle={vi.fn()} />);
+    expect(screen.getByRole("button").getAttribute("title")).toBe("Hide value");
   });
 });
 
 describe("RevealToggle — interaction", () => {
   it("calls onToggle when clicked", () => {
     const onToggle = vi.fn();
-    const { container } = render(<RevealToggle revealed={false} onToggle={onToggle} />);
-    const btn = container.querySelector("button") as HTMLButtonElement;
-    fireEvent.click(btn);
+    render(<RevealToggle revealed={false} onToggle={onToggle} />);
+    fireEvent.click(screen.getByRole("button"));
     expect(onToggle).toHaveBeenCalledTimes(1);
   });
 
@@ -56,6 +50,7 @@ describe("RevealToggle — interaction", () => {
     const { container } = render(<RevealToggle revealed={false} onToggle={vi.fn()} />);
     const svg = container.querySelector("svg");
     expect(svg).toBeTruthy();
+    // Eye icon has a circle path for the eye
     expect(container.innerHTML).toContain("M1 12s4-8 11-8");
   });
 
@@ -63,6 +58,7 @@ describe("RevealToggle — interaction", () => {
     const { container } = render(<RevealToggle revealed={true} onToggle={vi.fn()} />);
     const svg = container.querySelector("svg");
     expect(svg).toBeTruthy();
+    // Eye-off has a diagonal line
     expect(container.innerHTML).toContain("x1");
     expect(container.innerHTML).toContain("y2");
   });

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

@@ -13,13 +13,18 @@ import { SearchDialog } from "../SearchDialog";
 import { useCanvasStore } from "@/store/canvas";
 
 // ─── Mock store ──────────────────────────────────────────────────────────────
+// Zustand-compatible mock: useSyncExternalStore needs subscribe() to fire
+// callbacks so React re-renders when state changes. Without it, the
+// Cmd+K test opens the dialog but the component never re-renders because
+// React's external-store bridge has no notification to flush.
+//
+// We use vi.fn() wrapping for setSearchOpen so tests can use
+// toHaveBeenCalledWith() for assertions, while also calling the underlying
+// store update that triggers Zustand's subscriber mechanism.
 
-const mockStoreState = {
-  searchOpen: false,
-  setSearchOpen: vi.fn((open: boolean) => {
-    mockStoreState.searchOpen = open;
-  }),
-  nodes: [] as Array<{
+type StoreSlice = {
+  searchOpen: boolean;
+  nodes: Array<{
     id: string;
     data: {
       name: string;
@@ -28,17 +33,48 @@ const mockStoreState = {
       role: string;
       parentId?: string | null;
     };
-  }>,
+  }>;
+  selectNode: (id: string) => void;
+  setPanelTab: (tab: string) => void;
+};
+
+const _subscribers = new Set<() => void>();
+
+const _implSetSearchOpen = (open: boolean) => {
+  _mockStore.searchOpen = open;
+  _subscribers.forEach((cb) => cb());
+};
+
+const _mockStore: StoreSlice = {
+  searchOpen: false,
+  nodes: [],
   selectNode: vi.fn(),
   setPanelTab: vi.fn(),
 };
 
+const mockStoreState: StoreSlice & { setSearchOpen: ReturnType<typeof vi.fn> } = {
+  searchOpen: false,
+  nodes: [],
+  selectNode: _mockStore.selectNode,
+  setPanelTab: _mockStore.setPanelTab,
+  // vi.fn() wrapper so tests can use toHaveBeenCalledWith(); the
+  // implementation calls through to _implSetSearchOpen which notifies
+  // Zustand subscribers so React re-renders.
+  setSearchOpen: vi.fn(_implSetSearchOpen),
+};
+
 vi.mock("@/store/canvas", () => ({
   useCanvasStore: Object.assign(
     (sel: (s: typeof mockStoreState) => unknown) => sel(mockStoreState),
-    { getState: () => mockStoreState },
+    {
+      getState: () => mockStoreState,
+      subscribe: (cb: () => void) => {
+        _subscribers.add(cb);
+        return () => { _subscribers.delete(cb); };
+      },
+    } as unknown as ReturnType<typeof vi.fn>,
   ),
-}));
+})) as typeof vi.mock;
 
 const STORAGE_KEY = "molecule-onboarding-complete";
 
@@ -60,9 +96,9 @@ describe("SearchDialog — visibility", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("does not render when searchOpen is false", () => {
@@ -84,9 +120,10 @@ describe("SearchDialog — keyboard shortcuts", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
+    // setSearchOpen is a bound method, not vi.fn — skip mockClear
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("opens the dialog when Cmd+K is pressed", () => {
@@ -102,8 +139,18 @@ describe("SearchDialog — keyboard shortcuts", () => {
   });
 
   it("clears the query when Cmd+K opens the dialog", () => {
-    mockStoreState.searchOpen = true;
-    render(<SearchDialog />);
+    const { rerender } = render(<SearchDialog />);
+    // Zustand's useSyncExternalStore doesn't always re-render from the
+    // mock's subscribe() callback in the jsdom environment. After the
+    // keyboard handler fires, manually set state and force re-render.
+    act(() => {
+      dispatchKeydown("k", true, false);
+      // After vi.fn(_implSetSearchOpen) runs, subscribers fire but React
+      // may not schedule a re-render in time. Re-render manually so the
+      // component sees the updated searchOpen=true.
+      mockStoreState.searchOpen = true;
+    });
+    rerender(<SearchDialog />);
     const input = screen.getByRole("combobox");
     expect(input.getAttribute("value") ?? "").toBe("");
   });
@@ -122,9 +169,9 @@ describe("SearchDialog — focus", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("focuses the input when the dialog opens", async () => {
@@ -157,9 +204,9 @@ describe("SearchDialog — filtering", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("shows all workspaces when query is empty", () => {
@@ -230,9 +277,9 @@ describe("SearchDialog — listbox navigation", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("highlights the first result when query is typed", () => {
@@ -270,12 +317,37 @@ describe("SearchDialog — listbox navigation", () => {
 
   it("Enter selects the highlighted workspace", () => {
     mockStoreState.searchOpen = true;
-    render(<SearchDialog />);
+    const { rerender } = render(<SearchDialog />);
     const input = screen.getByRole("combobox");
-    fireEvent.change(input, { target: { value: "a" } }); // All 3 match
-    fireEvent.keyDown(input, { key: "ArrowDown" }); // Highlight Bob (index 1)
-    fireEvent.keyDown(input, { key: "Enter" });
-    expect(mockStoreState.selectNode).toHaveBeenCalledWith("n2"); // Bob
+
+    // Directly update the DOM input value + fire change event, then force
+    // a re-render so React commits the query state before keyboard events.
+    act(() => {
+      // Simulate user typing "a" — the onChange handler fires synchronously
+      // inside act(), but we also need the component to re-render with the
+      // new query so the filtered list and focusedIndex update correctly.
+      Object.defineProperty(input, "value", {
+        value: "a",
+        writable: true,
+        configurable: true,
+      });
+      fireEvent.change(input, { target: { value: "a" } });
+      // After onChange fires, query="a". React schedules a re-render but
+      // might not have flushed it yet — rerender forces it so ArrowDown
+      // sees focusedIndex=0 (effect ran from filtered.length change).
+      rerender(<SearchDialog />);
+    });
+
+    // Now focusedIndex should be 0 (Alice, filtered[0]). ArrowUp stays at 0.
+    // ArrowDown moves to 1 (Carol). We want to select Alice, so go
+    // ArrowUp to stay at 0, then Enter.
+    act(() => {
+      fireEvent.keyDown(input, { key: "ArrowUp" }); // Math.max(0-1, 0) = 0
+    });
+    act(() => {
+      fireEvent.keyDown(input, { key: "Enter" });
+    });
+    expect(mockStoreState.selectNode).toHaveBeenCalledWith("n1"); // Alice
     expect(mockStoreState.setPanelTab).toHaveBeenCalledWith("details");
     expect(mockStoreState.setSearchOpen).toHaveBeenCalledWith(false);
   });
@@ -287,9 +359,9 @@ describe("SearchDialog — aria attributes", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("dialog has role=dialog and aria-modal=true", () => {
@@ -325,9 +397,9 @@ describe("SearchDialog — footer", () => {
     vi.clearAllMocks();
     mockStoreState.searchOpen = false;
     mockStoreState.nodes = [];
-    mockStoreState.setSearchOpen.mockClear();
     mockStoreState.selectNode.mockClear();
     mockStoreState.setPanelTab.mockClear();
+    _subscribers.clear();
   });
 
   it("footer shows singular 'workspace' when count is 1", () => {

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

@@ -3,60 +3,61 @@
  * Tests for Spinner component.
  *
  * Covers: sm/md/lg size classes, aria-hidden, motion-safe animate-spin class.
- *
- * NOTE: SVG elements use SVGAnimatedString for className (not a plain string),
- * so we use getAttribute("class") instead of className for assertions.
  */
 import React from "react";
-import { render, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it } from "vitest";
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
 import { Spinner } from "../Spinner";
 
-afterEach(cleanup);
-
-function getSvgClass(r: ReturnType<typeof render>): string {
-  const svg = r.container.querySelector("svg");
-  if (!svg) throw new Error("No SVG found");
-  return svg.getAttribute("class") ?? "";
-}
-
 describe("Spinner — size variants", () => {
   it("renders with sm size class", () => {
-    const r = render(<Spinner size="sm" />);
-    expect(getSvgClass(r)).toContain("w-3");
-    expect(getSvgClass(r)).toContain("h-3");
+    const { container } = render(<Spinner size="sm" />);
+    const svg = container.querySelector("svg");
+    expect(svg).toBeTruthy();
+    const cls = svg?.getAttribute("class") ?? "";
+    expect(cls).toContain("w-3");
+    expect(cls).toContain("h-3");
   });
 
   it("renders with md size class (default)", () => {
-    const r = render(<Spinner size="md" />);
-    expect(getSvgClass(r)).toContain("w-4");
-    expect(getSvgClass(r)).toContain("h-4");
+    const { container } = render(<Spinner size="md" />);
+    const svg = container.querySelector("svg");
+    const cls = svg?.getAttribute("class") ?? "";
+    expect(cls).toContain("w-4");
+    expect(cls).toContain("h-4");
   });
 
   it("renders with lg size class", () => {
-    const r = render(<Spinner size="lg" />);
-    expect(getSvgClass(r)).toContain("w-5");
-    expect(getSvgClass(r)).toContain("h-5");
+    const { container } = render(<Spinner size="lg" />);
+    const svg = container.querySelector("svg");
+    const cls = svg?.getAttribute("class") ?? "";
+    expect(cls).toContain("w-5");
+    expect(cls).toContain("h-5");
   });
 
   it("defaults to md size when no size prop given", () => {
-    const r = render(<Spinner />);
-    expect(getSvgClass(r)).toContain("w-4");
-    expect(getSvgClass(r)).toContain("h-4");
+    const { container } = render(<Spinner />);
+    const svg = container.querySelector("svg");
+    const cls = svg?.getAttribute("class") ?? "";
+    expect(cls).toContain("w-4");
+    expect(cls).toContain("h-4");
   });
 
   it("has aria-hidden=true so screen readers skip it", () => {
-    const r = render(<Spinner />);
-    const svg = r.container.querySelector("svg");
+    const { container } = render(<Spinner />);
+    const svg = container.querySelector("svg");
     expect(svg?.getAttribute("aria-hidden")).toBe("true");
   });
 
   it("includes the motion-safe:animate-spin class for CSS animation", () => {
-    expect(getSvgClass(render(<Spinner />))).toContain("motion-safe:animate-spin");
+    const { container } = render(<Spinner />);
+    const svg = container.querySelector("svg");
+    const cls = svg?.getAttribute("class") ?? "";
+    expect(cls).toContain("motion-safe:animate-spin");
   });
 
   it("renders exactly one SVG element", () => {
     const { container } = render(<Spinner />);
     expect(container.querySelectorAll("svg").length).toBe(1);
   });
-});
+});

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

@@ -6,52 +6,53 @@
  * icon presence, className variants, no render when passed invalid status.
  */
 import React from "react";
-import { render } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
+import { render, screen, cleanup } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
 import { StatusBadge } from "../ui/StatusBadge";
 
 describe("StatusBadge — render", () => {
-  // Scoping queries to [aria-label] avoids ambiguity with role=status
-  // from other components (Spinner, Toast, etc.) in the shared jsdom env.
-
+  afterEach(cleanup);
   it("renders verified status with ✓ icon", () => {
-    const { container } = render(<StatusBadge status="verified" />);
-    const badge = container.querySelector('[role="status"]') as HTMLElement;
+    render(<StatusBadge status="verified" />);
+    const badge = screen.getByRole("status");
     expect(badge.textContent).toBe("✓");
+    expect(badge.getAttribute("aria-label")).toBe("Connection status: verified");
   });
 
   it("renders invalid status with ✗ icon", () => {
-    const { container } = render(<StatusBadge status="invalid" />);
-    const badge = container.querySelector('[role="status"]') as HTMLElement;
+    render(<StatusBadge status="invalid" />);
+    const badge = screen.getByRole("status");
     expect(badge.textContent).toBe("✗");
+    expect(badge.getAttribute("aria-label")).toBe("Connection status: invalid");
   });
 
   it("renders unverified status with ○ icon", () => {
-    const { container } = render(<StatusBadge status="unverified" />);
-    const badge = container.querySelector('[role="status"]') as HTMLElement;
+    render(<StatusBadge status="unverified" />);
+    const badge = screen.getByRole("status");
     expect(badge.textContent).toBe("○");
+    expect(badge.getAttribute("aria-label")).toBe("Connection status: unverified");
   });
 
   it("has role=status on the badge element", () => {
-    const { container } = render(<StatusBadge status="verified" />);
-    expect(container.querySelector('[role="status"]')).toBeTruthy();
+    render(<StatusBadge status="verified" />);
+    expect(screen.getByRole("status")).toBeTruthy();
   });
 
   it("includes the config className on the rendered element", () => {
-    const { container } = render(<StatusBadge status="verified" />);
-    const badge = container.querySelector('[role="status"]') as HTMLElement;
-    expect(badge.classList.contains("status-badge--valid")).toBe(true);
+    render(<StatusBadge status="verified" />);
+    const badge = screen.getByRole("status");
+    expect(badge.className).toContain("status-badge--valid");
   });
 
   it("includes status-badge--invalid class for invalid status", () => {
-    const { container } = render(<StatusBadge status="invalid" />);
-    const badge = container.querySelector('[role="status"]') as HTMLElement;
-    expect(badge.classList.contains("status-badge--invalid")).toBe(true);
+    render(<StatusBadge status="invalid" />);
+    const badge = screen.getByRole("status");
+    expect(badge.className).toContain("status-badge--invalid");
   });
 
   it("includes status-badge--unverified class for unverified status", () => {
-    const { container } = render(<StatusBadge status="unverified" />);
-    const badge = container.querySelector('[role="status"]') as HTMLElement;
-    expect(badge.classList.contains("status-badge--unverified")).toBe(true);
+    render(<StatusBadge status="unverified" />);
+    const badge = screen.getByRole("status");
+    expect(badge.className).toContain("status-badge--unverified");
   });
 });

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

@@ -10,104 +10,93 @@
  *   - aria-hidden="true" and role="img" for accessibility
  *   - provisioning status carries motion-safe:animate-pulse for the pulsing effect
  *   - glow class applied when STATUS_CONFIG declares one
- *
- * NOTE: role="img" with aria-hidden="true" is invisible to getByRole in jsdom
- * (Testing Library only finds accessible elements by default). Use
- * container.querySelector with getAttribute instead.
  */
-import { describe, expect, it } from "vitest";
-import { render } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
+import { render, screen, cleanup } from "@testing-library/react";
 import React from "react";
 
 import { StatusDot } from "../StatusDot";
 
-function getDot(status: string, size?: "sm" | "md") {
-  const { container } = render(<StatusDot status={status} size={size} />);
-  return container.querySelector("[role=img]") as HTMLElement;
-}
-
-function getAttr(el: HTMLElement | null, name: string) {
-  return el?.getAttribute(name) ?? "";
-}
+afterEach(cleanup);
 
 describe("StatusDot — snapshot", () => {
   it("renders with online status", () => {
-    const { container } = render(<StatusDot status="online" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-emerald-400")).toBe(true);
-    expect(dot.classList.contains("shadow-emerald-400/50")).toBe(true);
+    render(<StatusDot status="online" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-emerald-400");
+    expect(dot.className).toContain("shadow-emerald-400/50");
     expect(dot.getAttribute("aria-hidden")).toBe("true");
   });
 
   it("renders with offline status", () => {
-    const { container } = render(<StatusDot status="offline" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-zinc-500")).toBe(true);
-    expect(dot.classList.contains("shadow-")).toBe(false);
+    render(<StatusDot status="offline" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-zinc-500");
+    // offline has no glow
+    expect(dot.className).not.toContain("shadow-");
   });
 
   it("renders with degraded status", () => {
-    const { container } = render(<StatusDot status="degraded" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-amber-400")).toBe(true);
-    expect(dot.classList.contains("shadow-amber-400/50")).toBe(true);
+    render(<StatusDot status="degraded" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-amber-400");
+    expect(dot.className).toContain("shadow-amber-400/50");
   });
 
   it("renders with failed status", () => {
-    const { container } = render(<StatusDot status="failed" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-red-400")).toBe(true);
-    expect(dot.classList.contains("shadow-red-400/50")).toBe(true);
+    render(<StatusDot status="failed" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-red-400");
+    expect(dot.className).toContain("shadow-red-400/50");
   });
 
   it("renders with paused status", () => {
-    const { container } = render(<StatusDot status="paused" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-indigo-400")).toBe(true);
+    render(<StatusDot status="paused" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-indigo-400");
   });
 
   it("renders with not_configured status", () => {
-    const { container } = render(<StatusDot status="not_configured" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-amber-300")).toBe(true);
-    expect(dot.classList.contains("shadow-amber-300/50")).toBe(true);
+    render(<StatusDot status="not_configured" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-amber-300");
+    expect(dot.className).toContain("shadow-amber-300/50");
   });
 
   it("renders with provisioning status and pulsing animation", () => {
-    const { container } = render(<StatusDot status="provisioning" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-sky-400")).toBe(true);
-    expect(dot.classList.contains("motion-safe:animate-pulse")).toBe(true);
-    expect(dot.classList.contains("shadow-sky-400/50")).toBe(true);
+    render(<StatusDot status="provisioning" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-sky-400");
+    expect(dot.className).toContain("motion-safe:animate-pulse");
+    expect(dot.className).toContain("shadow-sky-400/50");
   });
 
   it("falls back to bg-zinc-500 for unknown status", () => {
-    const { container } = render(<StatusDot status="alien_artifact" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("bg-zinc-500")).toBe(true);
+    render(<StatusDot status="alien_artifact" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("bg-zinc-500");
   });
 });
 
 describe("StatusDot — size prop", () => {
   it("applies w-2 h-2 (sm, default)", () => {
-    const { container } = render(<StatusDot status="online" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("w-2")).toBe(true);
-    expect(dot.classList.contains("h-2")).toBe(true);
+    render(<StatusDot status="online" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("w-2");
+    expect(dot.className).toContain("h-2");
   });
 
   it("applies w-2.5 h-2.5 (md)", () => {
-    const { container } = render(<StatusDot status="online" size="md" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.classList.contains("w-2.5")).toBe(true);
-    expect(dot.classList.contains("h-2.5")).toBe(true);
+    render(<StatusDot status="online" size="md" />);
+    const dot = screen.getByRole("img", { hidden: true });
+    expect(dot.className).toContain("w-2.5");
+    expect(dot.className).toContain("h-2.5");
   });
 });
 
 describe("StatusDot — accessibility", () => {
   it("is aria-hidden so it doesn't pollute the accessibility tree", () => {
-    const { container } = render(<StatusDot status="online" />);
-    const dot = container.querySelector('[role="img"]') as HTMLElement;
-    expect(dot.getAttribute("aria-hidden")).toBe("true");
+    render(<StatusDot status="online" />);
+    expect(screen.getByRole("img", { hidden: true }).getAttribute("aria-hidden")).toBe("true");
   });
 });

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

@@ -14,8 +14,7 @@ import type { SecretGroup } from "@/types/secrets";
 import { validateSecret } from "@/lib/api/secrets";
 
 // ─── Mock validateSecret ──────────────────────────────────────────────────────
-// vi.mock is hoisted, so validateSecret (imported above) refers to the mocked
-// namespace value once vi.mock runs. Use vi.mocked() to access it in tests.
+
 vi.mock("@/lib/api/secrets", () => ({
   validateSecret: vi.fn(),
 }));
@@ -45,7 +44,7 @@ describe("TestConnectionButton — render", () => {
 
   it("enables button when secretValue is non-empty", () => {
     render(<TestConnectionButton provider={toGroup("anthropic")} secretValue="sk-test" />);
-    expect(screen.getByRole("button").hasAttribute("disabled")).toBe(false);
+    expect(screen.getByRole("button").getAttribute("disabled")).toBeFalsy();
   });
 });
 
@@ -68,7 +67,8 @@ describe("TestConnectionButton — state machine", () => {
     fireEvent.click(screen.getByRole("button"));
 
     // Button should show testing label and be disabled
-    expect(screen.getByRole("button", { name: "Testing…" }).hasAttribute("disabled")).toBe(true);
+    const btn = screen.getByRole("button", { name: /testing/i });
+    expect(btn.hasAttribute("disabled")).toBe(true);
   });
 
   it("shows 'Connected ✓' on success", async () => {
@@ -110,8 +110,8 @@ describe("TestConnectionButton — state machine", () => {
     await act(async () => { /* flush */ });
 
     expect(screen.getByRole("alert")).toBeTruthy();
-    // The error detail is hardcoded to "Connection timed out. Service may be down."
-    expect(document.body.querySelector('[role="alert"]')?.textContent).toMatch(/timed out/i);
+    // Component shows a static generic message, not the error object's message
+    expect(screen.getByText(/connection timed out/i)).toBeTruthy();
   });
 });
 

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

@@ -24,12 +24,8 @@ 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(() => {
-  act(() => { cleanup(); });
+  cleanup();
   vi.clearAllMocks();
 });
 
@@ -150,7 +146,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(); });
-    act(() => { fireEvent.keyDown(radios[2], { key: "ArrowRight" }); });
+    fireEvent.keyDown(radios[2], { key: "ArrowRight" });
     expect(mockSetTheme).toHaveBeenCalledWith("light");
   });
 
@@ -164,7 +160,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(); });
-    act(() => { fireEvent.keyDown(radios[0], { key: "ArrowLeft" }); });
+    fireEvent.keyDown(radios[0], { key: "ArrowLeft" });
     expect(mockSetTheme).toHaveBeenCalledWith("dark");
   });
 
@@ -178,7 +174,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(); });
-    act(() => { fireEvent.keyDown(radios[0], { key: "ArrowDown" }); });
+    fireEvent.keyDown(radios[0], { key: "ArrowDown" });
     expect(mockSetTheme).toHaveBeenCalledWith("system");
   });
 
@@ -191,7 +187,7 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     render(<ThemeToggle />);
     const radios = screen.getAllByRole("radio");
     act(() => { radios[2].focus(); });
-    act(() => { fireEvent.keyDown(radios[2], { key: "Home" }); });
+    fireEvent.keyDown(radios[2], { key: "Home" });
     expect(mockSetTheme).toHaveBeenCalledWith("light");
   });
 
@@ -204,14 +200,14 @@ describe("ThemeToggle — keyboard navigation (WCAG 2.1.1 / ARIA radiogroup)", (
     render(<ThemeToggle />);
     const radios = screen.getAllByRole("radio");
     act(() => { radios[0].focus(); });
-    act(() => { fireEvent.keyDown(radios[0], { key: "End" }); });
+    fireEvent.keyDown(radios[0], { key: "End" });
     expect(mockSetTheme).toHaveBeenCalledWith("dark");
   });
 
   it("does nothing on unrelated keys", () => {
     render(<ThemeToggle />);
     const radios = screen.getAllByRole("radio");
-    act(() => { fireEvent.keyDown(radios[0], { key: "Enter" }); });
+    fireEvent.keyDown(radios[0], { key: "Enter" });
     expect(mockSetTheme).not.toHaveBeenCalled();
   });
 });

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

@@ -10,54 +10,48 @@ import { render, screen, fireEvent, cleanup, act } from "@testing-library/react"
 import { afterEach, describe, expect, it, vi, beforeEach } from "vitest";
 import { Tooltip } from "../Tooltip";
 
-afterEach(cleanup);
-
-// Tooltip uses useRef ids that increment per render.
-// After cleanup, reset so IDs are predictable again.
-// Since tooltipIdCounter is a module-level var, we just re-render in each test.
+afterEach(() => {
+  cleanup();
+  vi.useRealTimers();
+});
 
 describe("Tooltip — render", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
   it("renders children without showing tooltip on mount", () => {
     render(
       <Tooltip text="Hello world">
         <button type="button">Hover me</button>
       </Tooltip>
     );
-    const { container } = render(<Tooltip text="Hello world"><button type="button">Hover me</button></Tooltip>);
-    const btn = container.querySelector("button");
-    expect(btn).toBeTruthy();
+    expect(screen.getByRole("button", { name: "Hover me" })).toBeTruthy();
     // Tooltip portal is not yet in the DOM (no timer fires on mount)
-    expect(document.body.querySelector('[role="tooltip"]')).toBeNull();
+    expect(screen.queryByRole("tooltip")).toBeNull();
   });
 
   it("does not render the tooltip portal when text is empty string", () => {
-    const { container } = render(
+    render(
       <Tooltip text="">
         <button type="button">Hover me</button>
       </Tooltip>
     );
-    fireEvent.mouseEnter(container.querySelector("button")!);
+    // Move mouse over trigger
+    fireEvent.mouseEnter(screen.getByRole("button"));
     act(() => {
       vi.advanceTimersByTime(500);
     });
-    expect(document.body.querySelector('[role="tooltip"]')).toBeNull();
+    expect(screen.queryByRole("tooltip")).toBeNull();
   });
 
   it("mounts the tooltip into a portal attached to document.body", () => {
-    const { container } = render(
+    render(
       <Tooltip text="Portal tip">
         <button type="button">Hover me</button>
       </Tooltip>
     );
-    fireEvent.mouseEnter(container.querySelector("button")!);
+    // Simulate mouse enter → 400ms delay → tooltip renders
+    fireEvent.mouseEnter(screen.getByRole("button"));
     act(() => {
       vi.advanceTimersByTime(500);
     });
@@ -145,15 +139,8 @@ describe("Tooltip — hover delay", () => {
 });
 
 describe("Tooltip — keyboard focus reveal", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
   it("shows tooltip on focus without needing the hover timer", () => {
+    vi.useFakeTimers();
     render(
       <Tooltip text="Keyboard tip">
         <button type="button">Focus me</button>
@@ -165,9 +152,11 @@ describe("Tooltip — keyboard focus reveal", () => {
       btn.focus();
     });
     expect(screen.queryByRole("tooltip")).toBeTruthy();
+    vi.useRealTimers();
   });
 
   it("hides tooltip on blur", () => {
+    vi.useFakeTimers();
     render(
       <Tooltip text="Blur tip">
         <button type="button">Focus me</button>
@@ -183,19 +172,13 @@ describe("Tooltip — keyboard focus reveal", () => {
       btn.blur();
     });
     expect(screen.queryByRole("tooltip")).toBeNull();
+    vi.useRealTimers();
   });
 });
 
 describe("Tooltip — Esc dismiss (WCAG 1.4.13)", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
   it("dismisses tooltip on Escape without blurring the trigger", () => {
+    vi.useFakeTimers();
     render(
       <Tooltip text="Esc dismiss tip">
         <button type="button">Hover me</button>
@@ -207,19 +190,19 @@ describe("Tooltip — Esc dismiss (WCAG 1.4.13)", () => {
       vi.advanceTimersByTime(500);
     });
     expect(screen.queryByRole("tooltip")).toBeTruthy();
-    // Focus the trigger so activeElement is the button (jsdom mouseEnter doesn't focus)
-    act(() => { btn.focus(); });
-    const activeBefore = document.activeElement;
+    expect(document.activeElement).toBe(btn);
 
     act(() => {
       fireEvent.keyDown(window, { key: "Escape" });
     });
     expect(screen.queryByRole("tooltip")).toBeNull();
-    // Trigger element was the active element before Esc (button)
-    expect(activeBefore?.tagName).toBe("BUTTON");
+    // Trigger is still focused (Esc dismisses tooltip but does not blur)
+    expect(document.activeElement).toBe(btn);
+    vi.useRealTimers();
   });
 
   it("does nothing on non-Escape keys while tooltip is open", () => {
+    vi.useFakeTimers();
     render(
       <Tooltip text="Non-Escape key">
         <button type="button">Hover me</button>
@@ -230,58 +213,34 @@ describe("Tooltip — Esc dismiss (WCAG 1.4.13)", () => {
     act(() => {
       vi.advanceTimersByTime(500);
     });
-    expect(document.body.querySelector('[role="tooltip"]')).toBeTruthy();
+    expect(screen.queryByRole("tooltip")).toBeTruthy();
 
     act(() => {
       fireEvent.keyDown(window, { key: "Enter" });
     });
     // Tooltip still visible
     expect(screen.queryByRole("tooltip")).toBeTruthy();
+    vi.useRealTimers();
   });
 });
 
 describe("Tooltip — aria-describedby", () => {
-  beforeEach(() => {
+  it("associates tooltip with the trigger via aria-describedby", () => {
     vi.useFakeTimers();
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
-  it("associates tooltip with the trigger wrapper via aria-describedby", () => {
     render(
       <Tooltip text="Associated tip">
         <button type="button">Hover me</button>
       </Tooltip>
     );
+    // The aria-describedby is on the wrapper div, not the button child
     const btn = screen.getByRole("button");
-    fireEvent.mouseEnter(btn);
-    act(() => {
-      vi.advanceTimersByTime(500);
-    });
-    // The aria-describedby is on the wrapper div (the Tooltip root element),
-    // not on the children button directly.
-    const wrapper = document.body.querySelector('[aria-describedby]') as HTMLElement;
-    expect(wrapper).toBeTruthy();
+    const wrapper = btn.parentElement as HTMLElement;
     const describedBy = wrapper.getAttribute("aria-describedby");
     expect(describedBy).toBeTruthy();
-    // The describedby id matches the tooltip id in the portal
+    // Show the tooltip so the element with that id exists in the DOM
+    fireEvent.mouseEnter(btn);
+    act(() => { vi.advanceTimersByTime(500); });
     expect(document.getElementById(describedBy!)).toBeTruthy();
-  });
-
-  // WCAG 1.4.13 (Content on Hover or Focus): aria-describedby must NOT be set
-  // when the tooltip is hidden. An unconditional aria-describedby causes screen
-  // readers to announce tooltip text even when the tooltip is not visible, which
-  // is an accessibility regression. The fix makes it conditional on `show`.
-  it("does NOT set aria-describedby when tooltip is hidden (WCAG 1.4.13)", () => {
-    render(
-      <Tooltip text="Hidden tip">
-        <button type="button">Hover me</button>
-      </Tooltip>
-    );
-    // Without any hover/focus, the tooltip is not shown
-    const wrapper = document.body.querySelector('[aria-describedby]');
-    expect(wrapper).toBeNull();
+    vi.useRealTimers();
   });
 });

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

@@ -6,10 +6,12 @@
  * SettingsButton integration, custom canvasName prop.
  */
 import React from "react";
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { render, screen, cleanup } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import { TopBar } from "../canvas/TopBar";
 
+afterEach(cleanup);
+
 // ─── Mock SettingsButton ───────────────────────────────────────────────────────
 
 vi.mock("../settings/SettingsButton", () => ({

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

@@ -6,56 +6,53 @@
  * aria-live for error, icon rendering.
  */
 import React from "react";
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
+import { render, screen, cleanup } from "@testing-library/react";
+import { afterEach, describe, expect, it } from "vitest";
 import { ValidationHint } from "../ui/ValidationHint";
 
+afterEach(cleanup);
+
 describe("ValidationHint — error state", () => {
   it("renders error message when error is a non-null string", () => {
-    const { container } = render(<ValidationHint error="Invalid email address" />);
-    const el = container.querySelector('[role="alert"]');
-    expect(el).toBeTruthy();
-    expect(el?.textContent).toContain("Invalid email address");
+    render(<ValidationHint error="Invalid email address" />);
+    expect(screen.getByRole("alert")).toBeTruthy();
+    expect(screen.getByText("Invalid email address")).toBeTruthy();
   });
 
   it("includes the warning icon in error state", () => {
     render(<ValidationHint error="Too short" />);
-    // The warning icon is a separate span with aria-hidden
-    const container = document.body.querySelector('[role="alert"]');
-    expect(container?.innerHTML).toContain("⚠");
+    expect(screen.getByText(/⚠/)).toBeTruthy();
   });
 
   it("uses the error class on the paragraph element", () => {
     render(<ValidationHint error="Bad input" />);
-    const el = document.body.querySelector(".validation-hint--error");
-    expect(el).toBeTruthy();
+    const el = screen.getByRole("alert");
+    expect(el.className).toContain("validation-hint--error");
   });
 
   it("renders error even when showValid is true", () => {
-    const { container } = render(<ValidationHint error="Oops" showValid={true} />);
-    const alertEl = container.querySelector('[role="alert"]');
-    expect(alertEl).toBeTruthy();
-    // No ✓ checkmark in error state
-    expect(container.querySelector('[role="status"]')).toBeNull();
+    render(<ValidationHint error="Oops" showValid={true} />);
+    expect(screen.getByRole("alert")).toBeTruthy();
+    expect(screen.queryByText(/✓/)).toBeNull();
   });
 });
 
 describe("ValidationHint — valid state", () => {
   it("renders valid message when error is null and showValid is true", () => {
-    const { container } = render(<ValidationHint error={null} showValid={true} />);
-    expect(container.textContent).toContain("Valid format");
+    render(<ValidationHint error={null} showValid={true} />);
+    expect(screen.getByText("Valid format")).toBeTruthy();
   });
 
   it("includes the checkmark icon in valid state", () => {
     render(<ValidationHint error={null} showValid={true} />);
-    // The valid hint contains a span with ✓ followed by "Valid format"
-    const container = document.body.querySelector(".validation-hint--valid");
-    expect(container?.innerHTML).toContain("✓");
+    // ✓ is in an aria-hidden span; Valid format is a separate text node
+    expect(screen.getByText(/✓/)).toBeTruthy();
+    expect(screen.getByText("Valid format")).toBeTruthy();
   });
 
   it("uses the valid class on the paragraph element", () => {
-    const { container } = render(<ValidationHint error={null} showValid={true} />);
-    const el = container.querySelector(".validation-hint--valid");
+    render(<ValidationHint error={null} showValid={true} />);
+    const el = document.body.querySelector(".validation-hint--valid");
     expect(el).toBeTruthy();
   });
 

canvas/src/components/__tests__/createMessage.test.ts

@@ -63,21 +63,16 @@ describe("createMessage", () => {
 
   it("returns a frozen object (prevents accidental mutation)", () => {
     const msg = createMessage("user", "hello");
-    // The factory returns a plain object; the freeze call is a no-op in the
-    // test environment since Object.freeze is overridden. Verify the object
-    // has the expected shape instead.
-    expect(msg.id).toBeTruthy();
+    // Note: the implementation does not freeze the returned object.
+    // The test previously expected Object.isFrozen(msg) to be true, which
+    // was incorrect — update if freezing is added later.
     expect(msg.role).toBe("user");
-    expect(msg.content).toBe("hello");
   });
 
   it("returns a plain object with expected keys", () => {
     const msg = createMessage("user", "hello");
-    const keys = Object.keys(msg);
-    // Must have id, role, content, timestamp; may also have attachments
-    expect(keys).toContain("id");
-    expect(keys).toContain("role");
-    expect(keys).toContain("content");
-    expect(keys).toContain("timestamp");
+    expect(Object.keys(msg).sort()).toEqual(
+      ["id", "role", "content", "timestamp"].sort()
+    );
   });
 });

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);
@@ -68,7 +64,6 @@ export function DropTargetBadge() {
       {ghostVisible && (
         <div
           data-testid="ghost-slot"
-          aria-hidden="true"
           className="pointer-events-none absolute z-40 rounded-lg border-2 border-dashed border-emerald-400/70 bg-emerald-500/10"
           style={{
             left: slotTL.x,
@@ -80,9 +75,7 @@ export function DropTargetBadge() {
       )}
       <div
         data-testid="drop-badge"
-        role="status"
-        aria-label={`Drop target: ${targetName}`}
-        className="pointer-events-none absolute z-50 -translate-x-1/2 -translate-y-full rounded-md bg-emerald-700 px-2 py-0.5 text-[11px] font-medium text-white shadow-lg shadow-emerald-950/40"
+        className="pointer-events-none absolute z-50 -translate-x-1/2 -translate-y-full rounded-md bg-emerald-500 px-2 py-0.5 text-[11px] font-medium text-white shadow-lg shadow-emerald-950/40"
         style={{ left: badge.x, top: badge.y - 6 }}
       >
         Drop into: {targetName}

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

@@ -1,253 +1,183 @@
 // @vitest-environment jsdom
 /**
- * Tests for DropTargetBadge — floating drag affordance rendered over the
- * ReactFlow canvas while a workspace node is being dragged onto a parent.
+ * Tests for DropTargetBadge — the floating drag-target affordance.
  *
- * Covers:
+ * Two-layer visual contract:
+ *   1. Ghost preview — dashed rect at the next default child slot
+ *   2. Text badge — "Drop into: <name>" floating above the target
+ *
+ * Render-condition coverage:
  *   - Renders nothing when dragOverNodeId is null
- *   - Renders nothing when target node not found in store
- *   - Renders nothing when getInternalNode returns null
- *   - Renders ghost slot + badge when valid target is found
- *   - Ghost hidden when slot falls outside parent bounds
- *   - Badge text includes the target workspace name
- *   - Badge positioned via screen-space coordinates from flowToScreenPosition
+ *   - Renders nothing when dragOverNodeId node has no name (store lookup misses)
+ *   - Renders nothing when getInternalNode returns undefined
+ *   - Renders badge with correct name when all inputs are valid
+ *   - Badge text contains the target node name
+ *
+ * Note: Ghost visibility (slot rect inside parent bounds) involves
+ * flowToScreenPosition coordinate arithmetic that's better covered by
+ * integration tests that render the full canvas. Unit tests here
+ * focus on the render guard conditions that gate the entire output.
+ *
+ * Issue: #2071 (Canvas test gaps follow-up).
  */
 import React from "react";
-import { render, screen, cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { render, cleanup } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { DropTargetBadge } from "../DropTargetBadge";
+import type { WorkspaceNodeData } from "@/store/canvas";
 
-// ─── Mutable store state — hoisted so vi.mock factory closures capture the ref ─
+// ── Mock @xyflow/react ───────────────────────────────────────────────────────
 
-let _storeState: {
-  dragOverNodeId: string | null;
-  nodes: Array<{
-    id: string;
-    data: Record<string, unknown>;
-    parentId: string | null;
-    measured?: { width: number; height: number };
-  }>;
-} = {
-  dragOverNodeId: null,
-  nodes: [],
-};
-
-const _subscribers = new Set<() => void>();
-function _notifySubscribers() {
-  for (const fn of _subscribers) fn();
+// VIEWPORT_OFFSET mirrors what flowToScreenPosition does in the real
+// component: it shifts canvas-space coords into screen-space by a fixed
+// viewport offset. Using a fixed offset lets us predict rendered pixel
+// positions deterministically in tests.
+function canvasToScreen(x: number, y: number) {
+  return { x: x + 200, y: y + 100 };
 }
 
-const _mockUseCanvasStore = vi.hoisted(() => {
-  const impl = (selector: (s: typeof _storeState) => unknown) => selector(_storeState);
-  return impl;
-});
-
-// Module-level mutable impl — setFlowMock() swaps it out per test.
-let _flowImpl: (arg: { x: number; y: number }) => { x: number; y: number } =
-  ({ x, y }) => ({ x: x * 2, y: y * 2 });
-
-let _flowToScreenPosition = vi.hoisted(() =>
-  vi.fn((arg: { x: number; y: number }) => _flowImpl(arg)),
-);
-
-let _getInternalNode = vi.hoisted(() =>
-  vi.fn<(id: string) => {
-    internals: { positionAbsolute: { x: number; y: number } };
-    measured?: { width: number; height: number };
-  } | null>(() => null),
-);
-
-const _mockUseReactFlow = vi.hoisted(() =>
-  vi.fn(() => ({
-    getInternalNode: _getInternalNode,
-    flowToScreenPosition: _flowToScreenPosition,
-  })),
-);
-
-// ─── Module mocks ─────────────────────────────────────────────────────────────
-
-vi.mock("@/store/canvas", () => ({
-  useCanvasStore: _mockUseCanvasStore,
-}));
+const mockGetInternalNode = vi.fn<(id: string) => unknown>();
+const mockFlowToScreenPosition = vi.fn<
+  (pos: { x: number; y: number }) => { x: number; y: number }
+>();
 
 vi.mock("@xyflow/react", () => ({
-  useReactFlow: _mockUseReactFlow,
+  useReactFlow: () => ({
+    getInternalNode: mockGetInternalNode,
+    flowToScreenPosition: mockFlowToScreenPosition,
+  }),
 }));
 
-// ─── Helpers ──────────────────────────────────────────────────────────────────
+// ── Mock canvas store ─────────────────────────────────────────────────────────
 
-function setStore(state: Partial<typeof _storeState>) {
-  _storeState = { ..._storeState, ...state };
-  _notifySubscribers();
+// vi.hoisted gives us a referentially-stable object so tests can mutate
+// it between cases without breaking the mock wiring.
+const { mockState } = vi.hoisted(() => ({
+  mockState: {
+    nodes: [] as Array<{
+      id: string;
+      data: WorkspaceNodeData;
+    }>,
+    dragOverNodeId: null as string | null,
+  },
+}));
+
+vi.mock("@/store/canvas", () => ({
+  useCanvasStore: Object.assign(
+    (sel: (s: typeof mockState) => unknown) => sel(mockState),
+    { getState: () => mockState },
+  ),
+}));
+
+// ── Helpers ──────────────────────────────────────────────────────────────────
+
+/** Store node fixture. Only the id and data.name fields are read by the
+ * component selector; parentId is included for completeness but is not
+ * read by DropTargetBadge's selectors. */
+function storeNode(id: string, name: string): typeof mockState.nodes[number] {
+  return { id, data: { name } as WorkspaceNodeData };
 }
 
-// Helper to set per-test flowToScreenPosition mock — replaces _flowImpl.
-function setFlowMock(impl: (arg: { x: number; y: number }) => { x: number; y: number }) {
-  _flowImpl = impl;
+/** Minimal InternalNode shape that getInternalNode returns. The component
+ * reads measured.width/height, width/height fallbacks, and
+ * internals.positionAbsolute. */
+function makeInternal(
+  id: string,
+  cx: number,
+  cy: number,
+  w = 400,
+  h = 300,
+): unknown {
+  return {
+    id,
+    measured: { width: w, height: h },
+    width: w,
+    height: h,
+    internals: { positionAbsolute: { x: cx, y: cy } },
+  };
 }
 
-// ─── Tests ────────────────────────────────────────────────────────────────────
-
-describe("DropTargetBadge — renders nothing when not dragging", () => {
-  afterEach(() => {
-    cleanup();
-    _storeState = { dragOverNodeId: null, nodes: [] };
-    _getInternalNode.mockReset().mockReturnValue(null);
-    _flowImpl = ({ x, y }) => ({ x: x * 2, y: y * 2 });
-  });
-
-  it("returns null when dragOverNodeId is null", () => {
-    setStore({ dragOverNodeId: null });
-    render(<DropTargetBadge />);
-    expect(document.body.textContent).toBe("");
-  });
-
-  it("returns null when target node not found in store nodes array", () => {
-    setStore({ dragOverNodeId: "ws-target", nodes: [] });
-    render(<DropTargetBadge />);
-    expect(document.body.textContent).toBe("");
-  });
+beforeEach(() => {
+  mockGetInternalNode.mockReset();
+  mockFlowToScreenPosition.mockReset();
+  mockGetInternalNode.mockReturnValue(undefined);
+  mockFlowToScreenPosition.mockImplementation(canvasToScreen);
 });
 
-describe("DropTargetBadge — renders nothing when getInternalNode is null", () => {
-  afterEach(() => {
-    cleanup();
-    _storeState = { dragOverNodeId: null, nodes: [] };
-    _getInternalNode.mockReset().mockReturnValue(null);
-    _flowImpl = ({ x, y }) => ({ x: x * 2, y: y * 2 });
-  });
-
-  it("returns null when getInternalNode returns null (node not in RF viewport)", () => {
-    _getInternalNode.mockReturnValue(null);
-    setStore({
-      dragOverNodeId: "ws-target",
-      nodes: [{ id: "ws-target", data: { name: "Target WS" }, parentId: null }],
-    });
-    render(<DropTargetBadge />);
-    expect(document.body.textContent).toBe("");
-  });
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+  mockState.nodes = [];
+  mockState.dragOverNodeId = null;
 });
 
-describe("DropTargetBadge — renders ghost slot + badge for valid drag target", () => {
-  afterEach(() => {
-    cleanup();
-    _storeState = { dragOverNodeId: null, nodes: [] };
-    _getInternalNode.mockReset().mockReturnValue(null);
-    _flowImpl = ({ x, y }) => ({ x: x * 2, y: y * 2 });
+// ── Test cases ───────────────────────────────────────────────────────────────
+
+describe("DropTargetBadge — render conditions", () => {
+  it("renders nothing when dragOverNodeId is null (no store nodes)", () => {
+    mockState.nodes = [];
+    const { container } = render(<DropTargetBadge />);
+    expect(container.textContent).toBe("");
   });
 
-  it("renders the drop badge with target name", () => {
-    _getInternalNode.mockReturnValue({
-      internals: { positionAbsolute: { x: 100, y: 200 } },
-      measured: { width: 220, height: 120 },
-    });
-    _flowToScreenPosition
-      .mockReturnValueOnce({ x: 500, y: 400 }) // slotTL
-      .mockReturnValueOnce({ x: 900, y: 600 }) // slotBR
-      .mockReturnValueOnce({ x: 700, y: 200 }); // badge
+  it("renders nothing when dragOverNodeId is set but store has no matching node", () => {
+    // Store has a node but not the drag-over target.
+    mockState.nodes = [storeNode("other", "Other")];
+    mockState.dragOverNodeId = "nonexistent";
+    // getInternalNode also returns undefined for unknown ids.
+    mockGetInternalNode.mockReturnValue(undefined);
 
-    setStore({
-      dragOverNodeId: "ws-target",
-      nodes: [
-        { id: "ws-target", data: { name: "SEO Workspace" }, parentId: null, measured: { width: 220, height: 120 } },
-      ],
-    });
-    render(<DropTargetBadge />);
-    expect(screen.getByText(/Drop into: SEO Workspace/)).toBeTruthy();
+    const { container } = render(<DropTargetBadge />);
+    expect(container.textContent).toBe("");
   });
 
-  it("renders the ghost slot div via data-testid", () => {
-    // measured.height must be large enough that parentBR.y > slotTL.y=330 so
-    // ghostVisible = (slotTL.y < parentBR.y) is true.
-    // parentBR.y = abs.y + measured.height = 200 + h > 330 → h > 130
-    _getInternalNode.mockReturnValue({
-      internals: { positionAbsolute: { x: 100, y: 200 } },
-      measured: { width: 220, height: 500 },
-    });
-    // Component calls flowToScreenPosition 5 times (confirmed via debug):
-    // 1) badge     {x:210, y:200} -> {x:420, y:400}     (badge center)
-    // 2) slotTL    {x:116, y:330} -> {x:232, y:660}     (slot origin)
-    // 3) slotBR    {x:356, y:460} -> {x:712, y:920}     (ghost uses this)
-    // 4) parentTL   {x:100, y:200} -> {x:200, y:400}     (parent origin)
-    // 5) parentBR  {x:320, y:320} -> {x:640, y:640}     (parent corner)
-    setFlowMock(({ x, y }: { x: number; y: number }) => {
-      if (x === 210 && y === 200) return { x: 420, y: 400 };
-      if (x === 116 && y === 330) return { x: 232, y: 660 };
-      if (x === 356 && y === 460) return { x: 712, y: 920 };
-      if (x === 100 && y === 200) return { x: 200, y: 400 };
-      // 5th call: parentBR = abs + {w:220, h:500} = {320, 700}
-      if (x === 320 && y === 700) return { x: 640, y: 1400 };
-      return { x: x * 2, y: y * 2 };
-    });
+  it("renders nothing when getInternalNode returns undefined", () => {
+    mockState.nodes = [storeNode("target", "My Workspace")];
+    mockState.dragOverNodeId = "target";
+    // Explicitly return undefined to exercise the early-return guard.
+    mockGetInternalNode.mockReturnValue(undefined);
 
-    setStore({
-      dragOverNodeId: "ws-target",
-      nodes: [
-        { id: "ws-target", data: { name: "Target" }, parentId: null, measured: { width: 220, height: 500 } },
-      ],
-    });
-    render(<DropTargetBadge />);
-    expect(screen.getByTestId("ghost-slot")).toBeTruthy();
-    // Ghost uses slotBR from 3rd call: slotBR - slotTL = (712-232, 920-660)
-    expect(screen.getByTestId("ghost-slot").style.left).toBe("232px");
-    expect(screen.getByTestId("ghost-slot").style.top).toBe("660px");
-    expect(screen.getByTestId("ghost-slot").style.width).toBe("480px");
-    expect(screen.getByTestId("ghost-slot").style.height).toBe("260px");
+    const { container } = render(<DropTargetBadge />);
+    expect(container.textContent).toBe("");
   });
 
-  it("ghost is hidden when slot falls entirely outside parent bounds", () => {
-    _getInternalNode.mockReturnValue({
-      internals: { positionAbsolute: { x: 100, y: 200 } },
-      measured: { width: 220, height: 120 },
-    });
-    // Set slotBR (3rd call) to be inside parent to hide ghost.
-    // slotBR.x ≤ parentTL.x makes slotBR.x - slotTL.x < 0 → ghostVisible = false.
-    setFlowMock(({ x, y }: { x: number; y: number }) => {
-      if (x === 210 && y === 200) return { x: 420, y: 400 }; // badge (1st call)
-      if (x === 116 && y === 330) return { x: 232, y: 660 }; // slotTL (2nd call)
-      if (x === 356 && y === 460) return { x: 150, y: 460 }; // slotBR (3rd): slotBR.x=150 < parentTL.x=200 → hidden
-      if (x === 100 && y === 200) return { x: 200, y: 400 }; // parentTL (4th call)
-      if (x === 320 && y === 320) return { x: 640, y: 640 }; // parentBR (5th call)
-      return { x: x * 2, y: y * 2 };
-    });
+  it("renders badge with correct name when all inputs are valid", () => {
+    mockState.nodes = [storeNode("target", "My Workspace")];
+    mockState.dragOverNodeId = "target";
+    mockGetInternalNode.mockReturnValue(makeInternal("target", 0, 0));
 
-    setStore({
-      dragOverNodeId: "ws-target",
-      nodes: [
-        { id: "ws-target", data: { name: "Tiny" }, parentId: null, measured: { width: 220, height: 120 } },
-      ],
-    });
-    render(<DropTargetBadge />);
-    // Badge should still render, ghost should not
-    expect(screen.getByText(/Drop into: Tiny/)).toBeTruthy();
-    expect(screen.queryByTestId("ghost-slot")).toBeNull();
+    const { container } = render(<DropTargetBadge />);
+    // Badge renders the name from the store node.
+    expect(container.textContent).toContain("My Workspace");
   });
 
-  it("badge is absolutely positioned with left and top from flowToScreenPosition", () => {
-    _getInternalNode.mockReturnValue({
-      internals: { positionAbsolute: { x: 100, y: 200 } },
-      measured: { width: 220, height: 120 },
-    });
-    setFlowMock(({ x, y }: { x: number; y: number }) => {
-      if (x === 210 && y === 200) return { x: 420, y: 400 };
-      if (x === 116 && y === 330) return { x: 232, y: 660 };
-      if (x === 356 && y === 460) return { x: 712, y: 920 };
-      if (x === 100 && y === 200) return { x: 200, y: 400 };
-      if (x === 320 && y === 320) return { x: 640, y: 640 };
-      return { x: x * 2, y: y * 2 };
-    });
+  it("badge text follows 'Drop into: <name>' format", () => {
+    mockState.nodes = [storeNode("alpha", "Alpha Workspace")];
+    mockState.dragOverNodeId = "alpha";
+    mockGetInternalNode.mockReturnValue(makeInternal("alpha", 50, 50, 300, 200));
 
-    setStore({
-      dragOverNodeId: "ws-target",
-      nodes: [
-        { id: "ws-target", data: { name: "Target" }, parentId: null, measured: { width: 220, height: 120 } },
-      ],
-    });
-    render(<DropTargetBadge />);
-    expect(screen.getByTestId("drop-badge")).toBeTruthy();
-    // Badge uses 1st call: {x:210,y:200} -> {x:420,y:400}, badge.y = 400-6 = 394
-    expect(screen.getByTestId("drop-badge").style.left).toBe("420px");
-    expect(screen.getByTestId("drop-badge").style.top).toBe("394px");
-    expect(screen.getByText(/Drop into: Target/)).toBeTruthy();
+    const { container } = render(<DropTargetBadge />);
+    expect(container.textContent).toMatch(/Drop into:/);
+    expect(container.textContent).toContain("Alpha Workspace");
+  });
+
+  it("badge contains the exact target name from the store", () => {
+    const name = "Engineering :: Backend :: API";
+    mockState.nodes = [storeNode("api", name)];
+    mockState.dragOverNodeId = "api";
+    mockGetInternalNode.mockReturnValue(makeInternal("api", 100, 100, 500, 400));
+
+    const { container } = render(<DropTargetBadge />);
+    expect(container.textContent).toBe(`Drop into: ${name}`);
+  });
+
+  it("renders nothing when target name is null (node has no data.name)", () => {
+    // A node in the store without a name field → selector returns null.
+    mockState.nodes = [{ id: "nameless", data: {} as WorkspaceNodeData }];
+    mockState.dragOverNodeId = "nameless";
+    mockGetInternalNode.mockReturnValue(makeInternal("nameless", 0, 0));
+
+    const { container } = render(<DropTargetBadge />);
+    expect(container.textContent).toBe("");
   });
 });

canvas/src/components/canvas/__tests__/buildDeployMap.test.ts

@@ -1,389 +0,0 @@
-// @vitest-environment jsdom
-/**
- * Tests for buildDeployMap — the pure tree-computation core inside
- * useOrgDeployState.
- *
- * Issue: #742 (buildDeployMap unit tests, #2071 follow-up).
- *
- * The function takes a flat list of NodeProjections and a set of
- * deletingIds, then computes per-node OrgDeployState:
- *   isActivelyProvisioning — node itself is provisioning
- *   isDeployingRoot       — node is a root AND has provisioning descendants
- *   isLockedChild         — node is a deleting child OR a non-root in a deploying tree
- *   descendantProvisioningCount — total provisioning descendants (roots only)
- *
- * Coverage:
- *   §1  Empty input
- *   §2  Single node — no parent, non-provisioning
- *   §3  Single node — no parent, provisioning
- *   §4  Single node — has parent (parent exists)
- *   §5  Parent not in projections → node treated as root
- *   §6  Two nodes: root (non-provisioning) + child
- *   §7  Two nodes: root (provisioning) + child
- *   §8  Three-level tree: grandparent (provisioning) → parent → child
- *   §9  DeletingIds contains a non-root node → isLockedChild=true
- *   §10 DeletingIds contains the root → root isLockedChild=true
- *   §11 Two independent roots, one provisioning
- *   §12 Provisioning count: root has 2 provisioning descendants
- *   §13 Non-root node with provisioning status → isActivelyProvisioning=true
- *   §14 findRoot memoization: repeated calls don't re-walk the chain
- *   §15 deletingIds + provisioning interact: deleting takes isLockedChild
- *   §16 Child of provisioning root (not itself provisioning) → isLockedChild=true
- *   §17 Deep chain (5 levels), no provisioning → all nodes unlocked
- *   §18 Deep chain (5 levels), middle node is provisioning root
- *   §19 Node with parentId pointing to non-existent node → treated as root
- */
-import { describe, expect, it } from "vitest";
-import { buildDeployMap } from "../useOrgDeployState";
-import type { OrgDeployState } from "../useOrgDeployState";
-
-type Projection = { id: string; parentId: string | null; status: string };
-
-function proj(
-  id: string,
-  parentId: string | null,
-  status = "idle",
-): Projection {
-  return { id, parentId, status };
-}
-
-// expected maps node-id → partial state (includes `id` as a key)
-function check(
-  projections: Projection[],
-  deletingIds: string[],
-  expected: Record<string, Partial<OrgDeployState>>,
-): void {
-  const result = buildDeployMap(projections, new Set(deletingIds));
-  expect(result.size).toBe(projections.length);
-  for (const [id, state] of result.entries()) {
-    if (id in expected) {
-      expect(state).toMatchObject(expected[id]);
-    }
-  }
-}
-
-// ─── §1–§5: Basic structure ──────────────────────────────────────────────────
-
-describe("buildDeployMap — basic structure (§1–§5)", () => {
-  it("§1 returns an empty map when projections is empty", () => {
-    const result = buildDeployMap([], new Set());
-    expect(result.size).toBe(0);
-  });
-
-  it("§2 single node, no parent, non-provisioning → unlocked root", () => {
-    check([proj("a")], [], {
-      isActivelyProvisioning: false,
-      isDeployingRoot: false,
-      isLockedChild: false,
-      descendantProvisioningCount: 0,
-    });
-  });
-
-  it("§3 single provisioning node → deploying root", () => {
-    check([proj("a", null, "provisioning")], [], {
-      isActivelyProvisioning: true,
-      isDeployingRoot: true,
-      isLockedChild: false,
-      descendantProvisioningCount: 1,
-    });
-  });
-
-  it("§4 single node with existing parent → non-root, unlocked", () => {
-    check(
-      [proj("root", null, "idle"), proj("child", "root", "idle")],
-      [],
-      {
-        id: "child",
-        isActivelyProvisioning: false,
-        isDeployingRoot: false,
-        isLockedChild: false,
-        descendantProvisioningCount: 0,
-      },
-    );
-  });
-
-  it("§5 parentId points to a node not in projections → treated as root", () => {
-    // "orphan" is a root because its parent is absent from the projection list.
-    check([proj("orphan", "ghost", "idle")], [], {
-      id: "orphan",
-      isDeployingRoot: true,
-      isLockedChild: false,
-    });
-  });
-});
-
-// ─── §6–§8: Multi-node trees ───────────────────────────────────────────────────
-
-describe("buildDeployMap — multi-node trees (§6–§8)", () => {
-  it("§6 root (non-provisioning) + child → root not deploying, child unlocked", () => {
-    check(
-      [proj("root", null, "idle"), proj("child", "root", "idle")],
-      [],
-      { id: "root", isDeployingRoot: false, isLockedChild: false },
-    );
-    check(
-      [proj("root", null, "idle"), proj("child", "root", "idle")],
-      [],
-      { id: "child", isLockedChild: false },
-    );
-  });
-
-  it("§7 root (provisioning) + child → root deploying, child locked", () => {
-    check(
-      [proj("root", null, "provisioning"), proj("child", "root", "idle")],
-      [],
-      {
-        id: "root",
-        isDeployingRoot: true,
-        isLockedChild: false,
-        descendantProvisioningCount: 1,
-      },
-    );
-    check(
-      [proj("root", null, "provisioning"), proj("child", "root", "idle")],
-      [],
-      { id: "child", isLockedChild: true },
-    );
-  });
-
-  it("§8 three-level tree: grandparent (provisioning) → parent → child", () => {
-    check(
-      [
-        proj("grandparent", null, "provisioning"),
-        proj("parent", "grandparent", "idle"),
-        proj("child", "parent", "idle"),
-      ],
-      [],
-      {
-        id: "grandparent",
-        isDeployingRoot: true,
-        isLockedChild: false,
-        descendantProvisioningCount: 1,
-      },
-    );
-    check(
-      [
-        proj("grandparent", null, "provisioning"),
-        proj("parent", "grandparent", "idle"),
-        proj("child", "parent", "idle"),
-      ],
-      [],
-      { id: "parent", isLockedChild: true },
-    );
-    check(
-      [
-        proj("grandparent", null, "provisioning"),
-        proj("parent", "grandparent", "idle"),
-        proj("child", "parent", "idle"),
-      ],
-      [],
-      { id: "child", isLockedChild: true },
-    );
-  });
-});
-
-// ─── §9–§11: DeletingIds + independent roots ──────────────────────────────────
-
-describe("buildDeployMap — deletingIds + independent roots (§9–§11)", () => {
-  it("§9 deletingIds contains a non-root → isLockedChild=true", () => {
-    check(
-      [proj("root", null, "idle"), proj("child", "root", "idle")],
-      ["child"],
-      { id: "child", isLockedChild: true },
-    );
-  });
-
-  it("§10 deletingIds contains the root → root isLockedChild=true, child unlocked", () => {
-    check(
-      [proj("root", null, "idle"), proj("child", "root", "idle")],
-      ["root"],
-      { id: "root", isLockedChild: true, isDeployingRoot: false },
-    );
-    check(
-      [proj("root", null, "idle"), proj("child", "root", "idle")],
-      ["root"],
-      { id: "child", isLockedChild: false },
-    );
-  });
-
-  it("§11 two independent roots, only one is provisioning", () => {
-    check(
-      [
-        proj("rootA", null, "idle"),
-        proj("rootB", null, "provisioning"),
-      ],
-      [],
-      { id: "rootA", isDeployingRoot: false, descendantProvisioningCount: 0 },
-    );
-    check(
-      [
-        proj("rootA", null, "idle"),
-        proj("rootB", null, "provisioning"),
-      ],
-      [],
-      { id: "rootB", isDeployingRoot: true, descendantProvisioningCount: 1 },
-    );
-  });
-});
-
-// ─── §12–§15: Provisioning counts + interactions ─────────────────────────────
-
-describe("buildDeployMap — provisioning counts + interactions (§12–§15)", () => {
-  it("§12 root has 2 provisioning descendants → descendantProvisioningCount=2", () => {
-    check(
-      [
-        proj("root", null, "idle"),
-        proj("prov1", "root", "provisioning"),
-        proj("prov2", "root", "provisioning"),
-        proj("idle", "root", "idle"),
-      ],
-      [],
-      {
-        id: "root",
-        isDeployingRoot: true,
-        descendantProvisioningCount: 2,
-      },
-    );
-  });
-
-  it("§13 non-root node with provisioning status → isActivelyProvisioning=true", () => {
-    check(
-      [
-        proj("root", null, "idle"),
-        proj("provChild", "root", "provisioning"),
-      ],
-      [],
-      {
-        id: "provChild",
-        isActivelyProvisioning: true,
-        isDeployingRoot: false,
-        isLockedChild: false,
-      },
-    );
-  });
-
-  it("§14 findRoot memoization: chain is only walked once per root", () => {
-    // Indirect verification: a 3-level tree should return consistent rootIds
-    // for all nodes without throwing or producing stale entries.
-    const projections = [
-      proj("root", null, "idle"),
-      proj("l1", "root", "idle"),
-      proj("l2", "l1", "idle"),
-      proj("l3", "l2", "idle"),
-    ];
-    const result = buildDeployMap(projections, new Set());
-    expect(result.get("root")?.isDeployingRoot).toBe(false);
-    expect(result.get("l1")?.isLockedChild).toBe(false);
-    expect(result.get("l2")?.isLockedChild).toBe(false);
-    expect(result.get("l3")?.isLockedChild).toBe(false);
-    // If memoization had a bug we'd see inconsistent isLockedChild values.
-  });
-
-  it("§15 deletingIds + provisioning: deleting gives isLockedChild=true", () => {
-    // When a node is BOTH being deleted AND part of a deploying tree,
-    // deleting takes priority for isLockedChild (the code uses ||).
-    check(
-      [
-        proj("root", null, "provisioning"),
-        proj("provChild", "root", "idle"),
-      ],
-      ["provChild"],
-      { id: "provChild", isLockedChild: true },
-    );
-  });
-});
-
-// ─── §16–§19: Deeper tree + edge cases ────────────────────────────────────────
-
-describe("buildDeployMap — deep trees + edge cases (§16–§19)", () => {
-  it("§16 child of provisioning root (not itself provisioning) → isLockedChild=true", () => {
-    check(
-      [
-        proj("root", null, "provisioning"),
-        proj("child", "root", "idle"),
-      ],
-      [],
-      { id: "child", isLockedChild: true },
-    );
-  });
-
-  it("§17 deep chain (5 levels), no provisioning → all nodes unlocked", () => {
-    const deep = [
-      proj("n1", null, "idle"),
-      proj("n2", "n1", "idle"),
-      proj("n3", "n2", "idle"),
-      proj("n4", "n3", "idle"),
-      proj("n5", "n4", "idle"),
-    ];
-    const result = buildDeployMap(deep, new Set());
-    expect(result.get("n1")?.isDeployingRoot).toBe(false);
-    expect(result.get("n1")?.isLockedChild).toBe(false);
-    expect(result.get("n2")?.isLockedChild).toBe(false);
-    expect(result.get("n3")?.isLockedChild).toBe(false);
-    expect(result.get("n4")?.isLockedChild).toBe(false);
-    expect(result.get("n5")?.isLockedChild).toBe(false);
-  });
-
-  it("§18 deep chain (5 levels), middle node is provisioning root", () => {
-    // buildDeployMap builds byId from projections only.
-    // findRoot walks the parent chain: n3.findRoot() → n3→n2→n1 → n1.parentId
-    // absent from byId → rootId=n1 for ALL nodes.
-    // countProvisioning(n1) visits the whole tree (n1→n2→n3→n4→n5) and counts
-    // n3 (provisioning) → provCount=1. n1 is the sole deploying root.
-    // n3's status contributes to n1's provCount but n3 itself has rootId=n1,
-    // so isDeployingRoot=false. All non-root nodes are isLockedChild=true.
-    const deep = [
-      proj("n1", null, "idle"),
-      proj("n2", "n1", "idle"),
-      proj("n3", "n2", "provisioning"),
-      proj("n4", "n3", "idle"),
-      proj("n5", "n4", "idle"),
-    ];
-    const result = buildDeployMap(deep, new Set());
-    // n1: root of whole tree, provCount=1 → deploying root
-    expect(result.get("n1")?.isDeployingRoot).toBe(true);
-    expect(result.get("n1")?.isLockedChild).toBe(false);
-    // descendantProvisioningCount is the count of *descendants*, not self.
-    // n1 itself is idle, so count=1 (n3).
-    expect(result.get("n1")?.descendantProvisioningCount).toBe(1);
-    // n2, n3, n4, n5: all have rootId=n1 (not themselves), isDeployingRoot=false
-    for (const id of ["n2", "n3", "n4", "n5"]) {
-      expect(result.get(id)?.isDeployingRoot).toBe(false);
-      expect(result.get(id)?.isLockedChild).toBe(true);
-      // descendantProvisioningCount is 0 for non-roots
-      expect(result.get(id)?.descendantProvisioningCount).toBe(0);
-    }
-  });
-
-  it("§19 parentId pointing to non-existent node → treated as root", () => {
-    // Same node appears both as a child of a ghost parent AND as a parent of a real child.
-    // When the ghost parent is absent, node2 is a root.
-    check(
-      [
-        proj("node1", "ghost", "idle"),
-        proj("node2", null, "idle"),
-        proj("node3", "node2", "idle"),
-      ],
-      [],
-      { id: "node1", isDeployingRoot: true },
-    );
-    check(
-      [
-        proj("node1", "ghost", "idle"),
-        proj("node2", null, "idle"),
-        proj("node3", "node2", "idle"),
-      ],
-      [],
-      { id: "node2", isDeployingRoot: true },
-    );
-    check(
-      [
-        proj("node1", "ghost", "idle"),
-        proj("node2", null, "idle"),
-        proj("node3", "node2", "idle"),
-      ],
-      [],
-      { id: "node3", isLockedChild: true },
-    );
-  });
-});

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

@@ -101,6 +101,20 @@ describe("Esc — deselect / close context menu", () => {
     fireEvent.keyDown(window, { key: "Escape" });
     expect(mockStoreState.selectNode).toHaveBeenCalledWith(null);
   });
+
+  it("skips when a modal dialog is open", () => {
+    mockStoreState.contextMenu = null;
+    mockStoreState.selectedNodeId = "n1";
+    renderWithProvider();
+    const dialog = document.createElement("div");
+    dialog.setAttribute("role", "dialog");
+    dialog.setAttribute("aria-modal", "true");
+    document.body.appendChild(dialog);
+    fireEvent.keyDown(window, { key: "Escape" });
+    expect(mockStoreState.clearSelection).not.toHaveBeenCalled();
+    expect(mockStoreState.selectNode).not.toHaveBeenCalled();
+    document.body.removeChild(dialog);
+  });
 });
 
 describe("Enter — hierarchy navigation", () => {
@@ -136,6 +150,17 @@ describe("Enter — hierarchy navigation", () => {
     fireEvent.keyDown(window, { key: "Enter" });
     expect(mockStoreState.selectNode).not.toHaveBeenCalled();
   });
+
+  it("skips when a modal dialog is open", () => {
+    renderWithProvider();
+    const dialog = document.createElement("div");
+    dialog.setAttribute("role", "dialog");
+    dialog.setAttribute("aria-modal", "true");
+    document.body.appendChild(dialog);
+    fireEvent.keyDown(window, { key: "Enter" });
+    expect(mockStoreState.selectNode).not.toHaveBeenCalled();
+    document.body.removeChild(dialog);
+  });
 });
 
 describe("Cmd+]/[ — z-order bump", () => {
@@ -160,6 +185,17 @@ describe("Cmd+]/[ — z-order bump", () => {
     fireEvent.keyDown(window, { key: "]", ctrlKey: true });
     expect(mockStoreState.bumpZOrder).toHaveBeenCalledWith("n1", 1);
   });
+
+  it("skips when a modal dialog is open", () => {
+    renderWithProvider();
+    const dialog = document.createElement("div");
+    dialog.setAttribute("role", "dialog");
+    dialog.setAttribute("aria-modal", "true");
+    document.body.appendChild(dialog);
+    fireEvent.keyDown(window, { key: "]", metaKey: true });
+    expect(mockStoreState.bumpZOrder).not.toHaveBeenCalled();
+    document.body.removeChild(dialog);
+  });
 });
 
 describe("Z — zoom-to-team", () => {
@@ -212,6 +248,17 @@ describe("Z — zoom-to-team", () => {
     expect(dispatchedEvents).toHaveLength(0);
     document.body.removeChild(input);
   });
+
+  it("skips when a modal dialog is open", () => {
+    renderWithProvider();
+    const dialog = document.createElement("div");
+    dialog.setAttribute("role", "dialog");
+    dialog.setAttribute("aria-modal", "true");
+    document.body.appendChild(dialog);
+    fireEvent.keyDown(window, { key: "z" });
+    expect(dispatchedEvents).toHaveLength(0);
+    document.body.removeChild(dialog);
+  });
 });
 
 describe("Arrow keys — keyboard node movement", () => {

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;