baxian 2.0.2 → 2.0.4

package/dist/agent/manager.js

@@ -1,15 +1,18 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { randomBytes } from 'node:crypto';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import { join, normalize } from 'node:path';
 import { tmpdir } from 'node:os';
 import { createSignalToken, PASSIVE_VERDICT_WATCH } from './phase-signal.js';
 import { tmuxInstallHint } from './preflight.js';
-import { BRANCH_PREFIX, isValidBranchName, PHASE_EXPECTED_STATUS, PHASE_REQUIRES_AGENT_BOUND_TO_TASK, TASK_TERMINAL_STATUSES as TERMINAL_STATUSES, TASK_ACTIVE_STATUS_SET as ACTIVE_TASK_STATUSES, TASK_OWNER_ROLES, effectiveTaskReviewRound, isSpecStagePhase, isTaskOpen, repoIdentityKey, taskGenerationGuard, taskReviewRound, taskMatchesGeneration, } from '../shared/index.js';
+import { BRANCH_PREFIX, isValidBranchName, PHASE_EXPECTED_STATUS, PHASE_REQUIRES_AGENT_BOUND_TO_TASK, TASK_TERMINAL_STATUSES as TERMINAL_STATUSES, TASK_ACTIVE_STATUS_SET as ACTIVE_TASK_STATUSES, TASK_OWNER_ROLES, effectiveTaskReviewRound, isSpecStagePhase, isTaskOpen, repoIdentityKey, taskAttentionGeneration, taskGenerationGuard, taskReviewRound, taskMatchesGeneration, } from '../shared/index.js';
 import { buildProjectDriver, makeDriverExec } from '../platform/driver-host.js';
 import { DriverOpError, buildDriverRunContext, GitDriver, safeDriverErrorText } from '../platform/git-driver.js';
+import { versionTimeOf } from '../platform/row-schema.js';
 import { checkOpenPrBinding, checkPrBinding } from '../platform/pr-binding.js';
 import { collectPendingFeedback, scanCommentSourcesOnce } from '../platform/feedback.js';
-import { recheckPassProvenance } from '../platform/verdict-engine.js';
+import { prReviewCacheRevision } from '../platform/pr-conversation-cache.js';
+import { deadTokens, recheckPassProvenance } from '../platform/verdict-engine.js';
 import { platformBindingMismatch, taskNeedsPlatformBindingAudit, } from '../platform/startup.js';
 import { AGENT_STORE_NOOP } from '../state/agent-store.js';
 import { SkillRegistry } from '../skill/registry.js';
@@ -27,7 +30,7 @@ import { resolveProjectTool } from '../config/validator.js';
 import { SHA_HEX_SOURCE } from '../platform/types.js';
 import { bodyDigest } from '../platform/body-digest.js';
 import { validateCommentBody } from '../platform/command-renderer.js';
-// 这两个入口冲突证明当前调用已被并发 pass 接管，应判 stale 而不是派发失败。
+import { buildReviewTokenLine, extractReviewTokens, rowTokens } from '../platform/markers.js';
 const BENIGN_DISPATCH_CONFLICT_CODES = new Set(['dispatch-superseded', 'dispatch-in-flight']);
 export function isBenignDispatchConflict(err) {
     return err instanceof ApiError
@@ -40,6 +43,16 @@ function requireTaskQaAgentId(task, operation) {
         throw new Error(`${operation}: task ${task.id} has no QA participant`);
     return task.qaAgentId;
 }
+function samePassProvenance(left, right) {
+    return left !== undefined
+        && right !== undefined
+        && left.sourceKey === right.sourceKey
+        && left.id === right.id
+        && left.bodyDigest === right.bodyDigest
+        && left.token === right.token
+        && left.failToken === right.failToken
+        && left.anchorSha === right.anchorSha;
+}
 export class EnsureSessionError extends Error {
     partial;
     constructor(partial, message) {
@@ -81,10 +94,6 @@ export function buildLaunchCommand(agent) {
                 segments.push('--dangerously-bypass-approvals-and-sandbox');
             break;
         case 'opencode':
-            // opencode materializes skills into .agents/skills (shared with codex; see skillSubdirFor).
-            // Its .agents/.claude compatibility scans can't both be disabled by env, so also turn off
-            // the .claude/skills scan — that closes the last collision source: a claude-code agent's
-            // .claude/skills/baxian-* in a shared base repo.
             segments.push('env OPENCODE_DISABLE_CLAUDE_CODE_SKILLS=1 opencode');
             if (yolo)
                 segments.push('--auto');
@@ -98,7 +107,6 @@ export function buildLaunchCommand(agent) {
     if (agent.model) {
         segments.push(`--model ${shellQuote(agent.model)}`);
     }
-    // opencode has no --add-dir; extra roots go through its permission model instead (validator rejects the pairing).
     if (agent.addDirs && agent.addDirs.length > 0 && agent.runtime !== 'opencode') {
         for (const dir of agent.addDirs) {
             segments.push(`--add-dir ${shellQuote(dir)}`);
@@ -106,15 +114,12 @@ export function buildLaunchCommand(agent) {
     }
     return segments.join(' ');
 }
-// cd re-resolves by pathname: a reused pane shell may sit on a deleted-and-recreated cwd inode.
 export function launchCommandIn(dir, agent) {
     return `cd ${shellQuote(dir)} && ${buildLaunchCommand(agent)}`;
 }
 function agentRuntimeKindFor(agent) {
     return agent.runtime;
 }
-// restart-repl drives the REPL back to a shell before relaunch. Each runtime exits
-// via its own slash command (a bare "exit" would be sent to the model as chat text).
 const REPL_EXIT_COMMAND = {
     'claude-code': '/exit',
     codex: '/quit',
@@ -146,11 +151,6 @@ export function skillSubdirFor(runtime) {
     switch (runtime) {
         case 'codex':
         case 'opencode':
-            // opencode has no way to disable its .agents/skills compatibility scan (only .claude via
-            // env), and when it shares a base repo with a codex agent it loads the codex copy of a
-            // same-named baxian-* skill (verified: the .agents copy wins over .opencode). So opencode
-            // materializes into .agents/skills too — both runtimes share one runtime-agnostic copy
-            // (serialized by the same skill-dir lock) instead of colliding on duplicate names.
             return '.agents/skills';
         case 'qodercli':
             return '.qoder/skills';
@@ -161,8 +161,6 @@ export function skillSubdirFor(runtime) {
 const DEFAULT_DISPATCH_ACK_TIMEOUT_MS = 30_000;
 const DEFAULT_NEED_INPUT_RETRY_INTERVAL_MS = 5_000;
 const DEFAULT_DISPATCH_SETTLE_TIMEOUT_MS = 3_000;
-// DELETE runtime cleanup runs while holding the deletion tombstone + rotated lock; an unbounded remote
-// probe/kill would block rollback/finally forever, so every tmux round-trip in it carries this deadline.
 const DELETE_CLEANUP_TIMEOUT_MS = 15_000;
 const PLATFORM_HEAD_SHA_RE = new RegExp(`^${SHA_HEX_SOURCE}$`);
 function createSignalTokenExcluding(...excluded) {
@@ -186,7 +184,6 @@ const RUNTIME_LIVENESS_SAMPLES = 3;
 export function canDispatchWithBinding(binding) {
     return !binding?.taskId && !binding?.creationToken && binding?.status !== 'awaiting_human';
 }
-// 派发期 hold：prompt 从未注入、pane 无在途回合，重派安全；ack_unknown 一类不在此列
 export const RECOVERABLE_QA_DISPATCH_HOLD_PHASES = new Set([
     'checkout-preparation-failed',
     'dirty-workdir',
@@ -220,8 +217,6 @@ function shouldReleaseHeldBinding(state, boundTask) {
     if (state.awaitingPhase != null && REGREET_REQUIRED_HOLD_PHASES.has(state.awaitingPhase))
         return false;
     const taskIsTerminal = !!boundTask && TERMINAL_STATUSES.includes(boundTask.status);
-    // 任务已退回 verdict 门禁且当前持有者不是本 agent：这次绑定是转码失败的残留
-    // （fresh-acquire 释放被脏树挡下），Resume 时补完释放，否则 dev 被永久占住
     const staleCodeHandoff = state.awaitingPhase != null
         && CHECKOUT_HOLD_PHASES.has(state.awaitingPhase)
         && !!boundTask
@@ -245,6 +240,7 @@ export class AgentManager {
     paneStreamerManager;
     pluginRegistry;
     platformDefaultBranchOf;
+    prConversationCache;
     platformDriverExec;
     phaseSignalWatcher;
     errorRecordStore;
@@ -253,6 +249,7 @@ export class AgentManager {
     dispatchSettleTimeoutMs;
     dispatchAckResendIntervalMs = 3_000;
     taskMutationQueue = Promise.resolve();
+    taskMutationScope = new AsyncLocalStorage();
     agentOperationQueues = new Map();
     agentIndex;
     platformRunner;
@@ -273,10 +270,10 @@ export class AgentManager {
     cancelInterruptGuardWaitMs = DEFAULT_DISPATCH_ACK_TIMEOUT_MS + 5_000;
     markCompleteInFlight = new Set();
     specVerdictInFlight = new Set();
-    // 引用计数：cancelTask 与 startCreatedTaskSession 的清理段可合法并存（启动期 Stop），先完成者不得清掉后者的 guard。
+    codeVerdictInFlight = new Set();
+    retryTaskInFlight = new Set();
     cancelCleanupInFlight = new Map();
     deletionInFlight = new Set();
-    // Diverged ids live in a separate set the DELETE finally never clears: a post-commit replaceConfig throw must fail-stop for the whole process.
     divergedAgents = new Set();
     deletionGeneration = new Map();
     compactInFlight = new Set();
@@ -294,6 +291,7 @@ export class AgentManager {
         this.paneStreamerManager = deps.paneStreamerManager;
         this.pluginRegistry = deps.pluginRegistry;
         this.platformDefaultBranchOf = deps.platformDefaultBranchOf;
+        this.prConversationCache = deps.prConversationCache;
         this.errorRecordStore = deps.errorRecordStore;
         this.phaseSignalWatcher = deps.phaseSignalWatcher
             ?? (deps.paneStreamerManager
@@ -320,10 +318,26 @@ export class AgentManager {
         };
     }
     withTaskLock(fn) {
-        const next = this.taskMutationQueue.then(fn);
+        const inherited = this.taskMutationScope.getStore();
+        if (inherited?.active)
+            return fn();
+        const next = this.taskMutationQueue.then(() => {
+            const scope = { active: true };
+            return this.taskMutationScope.run(scope, async () => {
+                try {
+                    return await fn();
+                }
+                finally {
+                    scope.active = false;
+                }
+            });
+        });
         this.taskMutationQueue = next.catch(() => undefined);
         return next;
     }
+    outsideTaskMutationScope(fn) {
+        return this.taskMutationScope.exit(fn);
+    }
     withAgentOperationLease(agentId, fn) {
         const previous = this.agentOperationQueues.get(agentId) ?? Promise.resolve();
         const next = previous.then(fn);
@@ -386,7 +400,7 @@ export class AgentManager {
             return true;
         }
         catch (err) {
-            console.warn(`[AgentManager] safeEmit ${event.type} failed (audit log loss; state machine unaffected):`, err);
+            console.warn(`[AgentManager] safeEmit ${event.type} failed; persistence or handler delivery may be incomplete:`, err);
             return false;
         }
     }
@@ -401,7 +415,6 @@ export class AgentManager {
             data,
         });
     }
-    // 配置层 intervention（无 agent/task 上下文）：如 repo-conflict——离线绕过锁的同 repo 冲突项目。
     async emitConfigIntervention(projectId, data) {
         const key = this.configInterventionKey(projectId, data);
         if (this.configInterventionKeys.has(key))
@@ -487,7 +500,6 @@ export class AgentManager {
             this.deletionInFlight.add(id);
         return null;
     }
-    // Scan + claim share createTask/dispatchPendingTask's withTaskLock, so a delete can't pass an open-task scan that a concurrent commit then orphans.
     async scanOpenThenClaimDeletion(targets) {
         return this.withTaskLock(async () => {
             for (const id of targets) {
@@ -519,7 +531,6 @@ export class AgentManager {
         for (const id of agentIds)
             this.deletionInFlight.delete(id);
     }
-    // strict 读取：守卫扫描不能把读失败折叠成「无活跃任务」放行提交
     async listActiveParticipantSeats() {
         const tasks = await this.taskStore.listStrict();
         return tasks
@@ -541,21 +552,18 @@ export class AgentManager {
             return { taskId: task.id, projectId: task.projectId, participants: [...byId.values()] };
         });
     }
-    // A completed DELETE keeps blocking this id past tombstone release; the process dies with any suspended flow, so no persistence is needed.
     bumpDeletionGeneration(agentId) {
         this.deletionGeneration.set(agentId, this.deletionGenerationOf(agentId) + 1);
     }
     deletionGenerationOf(agentId) {
         return this.deletionGeneration.get(agentId) ?? 0;
     }
-    // Boolean tombstone alone is ABA-prone (delete→recreate same id); commits must hold both the tombstone-clear and an unchanged generation from entry.
     deletionGateOpen(agentId, genAtEntry) {
         return !this.isDeletionInFlight(agentId) && this.deletionGenerationOf(agentId) === genAtEntry;
     }
     isDeletionInFlight(agentId) {
         return this.deletionInFlight.has(agentId) || this.divergedAgents.has(agentId);
     }
-    // replaceConfig 抛错后的 fail-stop：进入 divergedAgents（不随 DELETE finally 释放），重建/分配持续被拒直到重启。
     retainTombstoneForDivergence(agentId) {
         this.divergedAgents.add(agentId);
     }
@@ -574,7 +582,6 @@ export class AgentManager {
         }
         const runner = this.createRunnerFor(agent);
         const tmux = new TmuxManager(runner);
-        // Side-effects run inside the lifecycle section (serialized with DELETE cleanup) behind a re-checked generation gate; the entry gate is only a fast-fail.
         return this.runUnderSessionLifecycle(agentId, () => this.ensureSessionLocked(tmux, runner, agent, project, agentId, mode, genAtEntry));
     }
     async ensureSessionLocked(tmux, runner, agent, project, agentId, mode, genAtEntry) {
@@ -592,7 +599,6 @@ export class AgentManager {
         catch (err) {
             throw new EnsureSessionError({ createdSession: false, agentId }, `ensureWorkdir failed: ${err instanceof Error ? err.message : String(err)}`);
         }
-        // Gate the Workdir write too: a DELETE→recreate during the slow ensureWorkdir must not persist a stale Workdir onto the new incarnation.
         assertGenerationOpen();
         await this.agentStore.update(agentId, (existing) => {
             if (!existing || !this.deletionGateOpen(agentId, genAtEntry))
@@ -615,7 +621,6 @@ export class AgentManager {
             throw new EnsureSessionError({ createdSession: false, agentId }, `tmux probe failed: ${err instanceof Error ? err.message : String(err)}; ` +
                 `if tmux is missing, ${tmuxInstallHint(agent.projectId)}`);
         }
-        // Re-gate after the probe await: a DELETE may have tombstoned mid-probe, and build/adopt would else create a session cleanup can only reap later.
         assertGenerationOpen();
         if (!snapshot) {
             return this.buildFreshSession(tmux, agent, agentId, workdir, workdir);
@@ -651,11 +656,6 @@ export class AgentManager {
         const subdir = skillSubdirFor(agent.runtime);
         const destRoot = `${workdir}/${subdir}`;
         await this.excludeInjectedSkills(runner, workdir, subdir);
-        // opencode's skills are model-invoked, not slash commands; the dispatched /<skill> sigil
-        // reaches the model as message text and it loads the skill from .opencode/skills. We do NOT
-        // wrap skills as .opencode/commands: opencode expands $ARGUMENTS in a command template and
-        // would execute a `!`cmd`` / inline a @path embedded in an untrusted task title/description
-        // before the skill runs. Message-body payloads are not expanded, so this path is injection-safe.
         await this.runUnderSkillDirLock(this.skillDirLockKey(agent, workdir), async () => {
             await this.ensureSkillDirSafe(runner, workdir, subdir, [
                 ...this.skillRegistry.names(),
@@ -664,7 +664,6 @@ export class AgentManager {
             await this.skillRegistry.materialize((path, content) => this.atomicWriteFile(runner, workdir, path, content), destRoot, scope);
         });
     }
-    // A rollback only kills if no adoption bumped the generation since its create.
     sessionLifecycleChain = new Map();
     adoptGeneration = new Map();
     runUnderSessionLifecycle(agentId, fn) {
@@ -678,7 +677,6 @@ export class AgentManager {
         });
         return cur;
     }
-    // Inside the lifecycle lock, a generation bump since create means handoff — stand down.
     async rollbackCreatedSession(agentId, partial, reason, opts = {}) {
         await this.runUnderSessionLifecycle(agentId, async () => {
             try {
@@ -715,7 +713,6 @@ export class AgentManager {
                     return;
                 }
                 const runner = this.createRunnerFor(cfg);
-                // Rollback may run before or after the claim write, so accept empty-or-ours.
                 const outcome = await new TmuxManager(runner).killSessionRef(ref, { kind: 'emptyOr', claim: agentId });
                 if (outcome === 'refused') {
                     console.warn(`[AgentManager] ${agentId} rollback (${reason}): tmux generation/claim changed — leaving session ${ref.sessionId} untouched`);
@@ -766,7 +763,7 @@ export class AgentManager {
         const top = subdir.split('/')[0];
         const keep = keepNames.map((n) => `! -name ${shellQuote(n)}`).join(' ');
         const inner = 
-        // canonicalSelfGuard (cd+pwd -P) rejects a rebound MIDDLE ancestor, not just a symlinked leaf, so the find/rm can't escape.
+        // Keep the canonical Workdir check and find/rm in one command to fail closed on a rebound ancestor.
         `${canonicalSelfGuard(workdir)} && ` +
             `cd ${shellQuote(workdir)} && ` +
             `for d in ${top} ${subdir}; do if [ -L "$d" ]; then ` +
@@ -795,9 +792,7 @@ export class AgentManager {
         return tagged !== this.skillRegistry.contentHash(this.agentSkillScope(agentId));
     }
     async excludeInjectedSkills(runner, workdir, subdir) {
-        const inner = 
-        // canonicalSelfGuard (cd+pwd -P) rejects a rebound MIDDLE ancestor too, so the info/exclude write can't escape.
-        `${canonicalSelfGuard(workdir)} && ` +
+        const inner = `${canonicalSelfGuard(workdir)} && ` +
             `cd ${shellQuote(workdir)} && ` +
             `if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then echo BX_SKILLS_NON_GIT; exit 0; fi; ` +
             `tracked="$(git ls-files -- ${shellQuote(`${subdir}/baxian-*`)} 2>/dev/null | head -5)"; ` +
@@ -828,15 +823,12 @@ export class AgentManager {
             ['mouse', 'on'],
         ];
     }
-    // A name (or even a bare $id) can rebind to a same-name successor mid-flight;
-    // every option write goes through the identity-checked by-ref batch.
     async setSessionOptions(tmux, agentId, ref, entries, expectedClaim = agentId) {
         const outcome = await tmux.setSessionOptionsIfAlive(ref, entries, { expectedClaim });
         if (outcome === 'gone') {
             throw new Error(`tmux session ${ref.sessionId} (${agentId}) vanished before its options could be applied`);
         }
     }
-    // Snapshot's claim check is a filter; the returned PaneRef re-proves generation+claim on every op.
     async resolveClaimedPane(tmux, agentId, expectedPaneId) {
         const snapshot = await tmux.getSessionSnapshot(agentId);
         if (!snapshot)
@@ -861,7 +853,6 @@ export class AgentManager {
         try {
             createdRef = await tmux.createSession(agentId, sessionDir);
             createdSession = true;
-            // First batch writes the claim itself, so it must prove the session is still unclaimed.
             await this.setSessionOptions(tmux, agentId, createdRef, [
                 ['@baxian-agent-id', agentId],
                 ['@baxian-runtime', agent.runtime],
@@ -955,7 +946,7 @@ export class AgentManager {
                     }
                 }
                 await this.markDialogPending(agentId, creationToken);
-                void this.slowPollDialogPending(agentId, creationToken).catch((pollErr) => {
+                void this.outsideTaskMutationScope(() => this.slowPollDialogPending(agentId, creationToken)).catch((pollErr) => {
                     console.warn(`[bootstrap] slowPoll for ${agentId} crashed:`, pollErr);
                 });
                 return;
@@ -1038,7 +1029,6 @@ export class AgentManager {
         const agent = this.getAgentConfig(agentId);
         if (!agent)
             return false;
-        // Pin the incarnation before reading state so a DELETE→recreate reusing %0 can't route the greeting handshake to the new session.
         const genAtEntry = this.deletionGenerationOf(agentId);
         const state = await this.agentStore.get(agentId);
         if (state?.awaitingPhase !== 'greeting_failed')
@@ -1170,7 +1160,6 @@ export class AgentManager {
         if (!(err instanceof EnsureSessionError) || !err.partial.dialogPending) {
             return false;
         }
-        // The error belongs to the caller's incarnation; gate every side-effect so a DELETE→recreate reusing %0 can't write the stale dialog/fail onto the new agent.
         const gateOpen = () => opts.expectedGeneration === undefined || this.deletionGateOpen(agentId, opts.expectedGeneration);
         let state = await this.agentStore.get(agentId);
         if (!state || !gateOpen())
@@ -1230,10 +1219,10 @@ export class AgentManager {
         err.partial.handled = true;
         const snapshotPaneId = state.paneId;
         const snapshotTaskId = state.taskId;
-        void this.slowPollDialogPending(agentId, state.creationToken, {
+        void this.outsideTaskMutationScope(() => this.slowPollDialogPending(agentId, state.creationToken, {
             ...(snapshotPaneId !== undefined ? { expectedPaneId: snapshotPaneId } : {}),
             expectedTaskId: snapshotTaskId,
-        }).catch((pollErr) => {
+        })).catch((pollErr) => {
             console.warn(`[runtime] slowPoll for ${agentId} crashed:`, pollErr);
         });
         return true;
@@ -1301,6 +1290,7 @@ export class AgentManager {
                 return;
             const now = new Date().toISOString();
             let projectIdForEmit = '';
+            let taskIdForEmit;
             let wrote = false;
             const isBootstrapPath = creationToken !== undefined;
             if (isBootstrapPath && !(await this.runGreetingHandshake(agentId, cfg, pane))) {
@@ -1316,6 +1306,7 @@ export class AgentManager {
                     return AGENT_STORE_NOOP;
                 }
                 projectIdForEmit = fresh.projectId;
+                taskIdForEmit = fresh.taskId;
                 wrote = true;
                 if (isBootstrapPath) {
                     return {
@@ -1329,11 +1320,15 @@ export class AgentManager {
                         updatedAt: now,
                     };
                 }
+                const awaitingReason = fresh.taskId
+                    ? `Runtime dialog resolved; agent REPL ready. Open task ${fresh.taskId}: cancel it if it is still active, ` +
+                        'otherwise Resume can release the binding; Delete the agent if the binding cannot be recovered.'
+                    : 'Runtime dialog resolved; agent REPL ready. Click Resume to release the binding and let baxian pick the next task.';
                 return {
                     ...fresh,
                     paneId,
                     awaitingPhase: 'agent_dialog_resolved_runtime',
-                    awaitingReason: 'Runtime dialog resolved; agent REPL ready. Click Resume to release the binding and let baxian pick the next task.',
+                    awaitingReason,
                     updatedAt: now,
                 };
             });
@@ -1350,9 +1345,13 @@ export class AgentManager {
                 });
             }
             else {
-                await this.emitIntervention(projectIdForEmit, agentId, undefined, {
+                const note = taskIdForEmit
+                    ? `Runtime dialog resolved; agent REPL ready. Open task ${taskIdForEmit}: cancel it if it is still active, ` +
+                        'otherwise Resume can release the binding; Delete the agent if the binding cannot be recovered.'
+                    : 'Runtime dialog resolved; agent REPL ready. Click Resume to continue.';
+                await this.emitIntervention(projectIdForEmit, agentId, taskIdForEmit, {
                     phase: 'agent_dialog_resolved_runtime',
-                    note: 'Runtime dialog resolved; agent REPL ready. Click Resume to continue.',
+                    note,
                 });
             }
             return;
@@ -1363,7 +1362,7 @@ export class AgentManager {
             return;
         const controller = new AbortController();
         this.runtimeMenuWatchers.set(agentId, controller);
-        void this.runtimeMenuWatchLoop(agentId, controller.signal)
+        void this.outsideTaskMutationScope(() => this.runtimeMenuWatchLoop(agentId, controller.signal))
             .catch((err) => {
             console.warn(`[runtimeMenuWatch] ${agentId} loop crashed:`, err);
         })
@@ -1424,6 +1423,10 @@ export class AgentManager {
             }
             else if (!onMenu && pendingMenu) {
                 pendingMenu = false;
+                await this.emitIntervention(fresh.projectId, agentId, fresh.taskId, {
+                    phase: 'agent_runtime_menu_resolved',
+                    previousPhase: 'agent_runtime_menu_pending',
+                });
             }
         }
     }
@@ -1440,7 +1443,6 @@ export class AgentManager {
             signal.addEventListener('abort', onAbort, { once: true });
         });
     }
-    // Runs inside the caller's lifecycle section (ensureSessionLocked routed the snapshot here).
     async adoptOrRestartSessionLocked(tmux, runner, agent, agentId, workdir, sessionDir, snapshot) {
         const sessionRef = snapshot.ref;
         this.adoptGeneration.set(agentId, (this.adoptGeneration.get(agentId) ?? 0) + 1);
@@ -1582,8 +1584,6 @@ export class AgentManager {
             throw new EnsureSessionError({ createdSession: false, agentId }, `REPL relaunch failed: ${relErr instanceof Error ? relErr.message : String(relErr)}`);
         }
     }
-    // Frees a bootstrap blocked on its predecessor's half-created session (nonce
-    // env present but claim never written); anything else is left alone.
     async reclaimHalfCreatedSession(tmux, agentId, knownSnapshot) {
         let snapshot;
         try {
@@ -1607,7 +1607,6 @@ export class AgentManager {
             return false;
         let outcome;
         try {
-            // claim-still-empty rides the kill itself — a claim racing the probes makes the server refuse.
             outcome = await tmux.killSessionRef(snapshot.ref, { kind: 'unclaimed' });
         }
         catch (err) {
@@ -1642,14 +1641,10 @@ export class AgentManager {
             console.warn(`[AgentManager] ${agentId}: session ${sessionRef.sessionId} already gone (${reason})`);
         }
     }
-    // Create-on-null only under this predicate (evaluated inside the store's serialized commit): closes the delete→recreate ABA yet keeps lazy first-allocation for config-only agents.
     bindingInitPredicate(agentId, genAtEntry) {
         return this.deletionGateOpen(agentId, genAtEntry) && this.getAgentConfig(agentId) !== undefined;
     }
-    async acquireAgentForTask(agentId, taskId, phase, 
-    // 锁代必须由 acquire 原子交出：事后重读 claim/binding 的窗口里并发派发方可以
-    // release + re-acquire 同一 agent/同一 task，读到的会是 successor 的代
-    opts = {}) {
+    async acquireAgentForTask(agentId, taskId, phase, opts = {}) {
         const genAtEntry = this.deletionGenerationOf(agentId);
         if (this.isDeletionInFlight(agentId))
             return false;
@@ -1769,15 +1764,12 @@ export class AgentManager {
                     return false;
                 }
             }
-            // expectedHold 是 hold 世代快照的严格 CAS（全 undefined 表示“期望无 hold”）：
-            // hold 消失（被并发 Resume 清掉）或换代同样意味着接管，不得继续释放
             const matchesExpectedHold = (binding) => {
                 const held = binding.status === 'awaiting_human';
                 return (held ? binding.awaitingPhase : undefined) === opts.expectedHold.phase
                     && (held ? binding.awaitingSince : undefined) === opts.expectedHold.since
                     && (held ? binding.awaitingNonce : undefined) === opts.expectedHold.nonce;
             };
-            // 世代门前置：hold 换代时任何 pane/workdir 副作用都不得发生（末尾 CAS 只兜最后窗口）
             if (opts.expectedHold && !matchesExpectedHold(state)) {
                 console.warn(`[AgentManager] releaseAgentForTask: agent ${agentId} hold generation changed or cleared before release; refusing`);
                 return false;
@@ -1801,7 +1793,6 @@ export class AgentManager {
                     if (!latest)
                         return AGENT_STORE_NOOP;
                     if (opts.clearAwaitingHuman && latest.status === 'awaiting_human') {
-                        // The hold-generation CAS lives inside the atomic update: a hold written after any pre-read survives.
                         if (opts.expectedHold
                             && (latest.awaitingPhase !== opts.expectedHold.phase
                                 || latest.awaitingSince !== opts.expectedHold.since
@@ -1819,8 +1810,6 @@ export class AgentManager {
                             ...(latest.workdir !== undefined ? { workdir: latest.workdir } : {}),
                             ...(latest.startedAt !== undefined ? { startedAt: latest.startedAt } : {}),
                             ...(latest.creationToken !== undefined ? { creationToken: latest.creationToken } : {}),
-                            // Release voids the open question: strip the watermark, bump the epoch so
-                            // any in-flight/queued commit of the old generation fences server-side.
                             needInput: { epoch: (latest.needInput?.epoch ?? 0) + 1 },
                         };
                         return cleared;
@@ -1852,7 +1841,6 @@ export class AgentManager {
                         || !await this.lockManager.isOwner(agentId, expectedTaskId, lockToken)) {
                         return false;
                     }
-                    // 释放中被写入的新 hold（如 ack_unknown）比 cleanup 失败信息更关键，不得覆盖
                     if (!holdMatchesExpected(latest)) {
                         console.warn(`[AgentManager] releaseAgentForTask: agent ${agentId} hold generation changed during release; not overwriting with branch-cleanup-pending`);
                         return false;
@@ -1918,7 +1906,6 @@ export class AgentManager {
                         sessionConfirmedAbsent = true;
                     }
                     await this.assertTaskGeneration(agentId, expectedTaskId, lockToken, releaseWorkdir);
-                    // 仍重验持久化世代，防护当前进程租约之外的状态写入。
                     if (opts.expectedHold) {
                         const beforeBranchOps = await this.agentStore.get(agentId);
                         if (!beforeBranchOps || !matchesExpectedHold(beforeBranchOps)) {
@@ -1990,9 +1977,6 @@ export class AgentManager {
                     await this.assertTaskGeneration(agentId, expectedTaskId, lockToken, releaseWorkdir);
                 }
                 catch (err) {
-                    // REPL 忙碌不是清理失败：pane 完好、绑定未动、非 dev 无分支凭据可留。落
-                    // branch-cleanup-pending（不在可恢复白名单）会把常态忙碌变成永久 hold（#558 验收 1），
-                    // 故拒绝释放而不落 hold，由调用方按「仍绑定且未 hold」判定重新排队本 pass
                     if (opts.deferWhenBusy && err instanceof ReplNotReadyError && cfg.role !== 'dev') {
                         console.warn(`[AgentManager] releaseAgentForTask: agent ${agentId} REPL is busy; refusing release without a hold ` +
                             `(the pass can be re-queued): ${err.message}`);
@@ -2019,7 +2003,6 @@ export class AgentManager {
                     || (state.workdir !== undefined && existing.workdir !== state.workdir)) {
                     return AGENT_STORE_NOOP;
                 }
-                // 世代 CAS 在原子写入内判定：预读后被重写或清除的 hold 都不得被这次释放清掉
                 if (opts.expectedHold && !matchesExpectedHold(existing)) {
                     holdGenerationChanged = true;
                     return AGENT_STORE_NOOP;
@@ -2125,7 +2108,6 @@ export class AgentManager {
             if (candidateTasks.length === 0)
                 continue;
             const candidateByBranch = new Map(candidateTasks.map(task => [task.branch, task]));
-            // Pin the incarnation before the first state/workdir/refs snapshot so a DELETE→same-id recreate (possibly a different workdir) in the read→gate window is rejected.
             const genAtEntry = this.deletionGenerationOf(cfg.id);
             const state = await this.agentStore.get(cfg.id);
             if (!state || !canDispatchWithBinding(state))
@@ -2224,20 +2206,11 @@ export class AgentManager {
             }
         }
     }
-    // ---- need-input watermark: epoch-fenced monotonic persistence + retry convergence ----
     needInputRetry = new Map();
     needInputRetryInFlight = new Set();
     gitReviewRecoveryAlerted = new Set();
-    // Watermark writes currently in the store chain. A restore bump snapshots these along
-    // with the queue: an answer whose write has not settled yet would otherwise be invisible
-    // to the migration and its error-enqueue would land after the arm already cleared the
-    // queue — deleting the only proof the user answered.
     needInputWritesInFlight = new Map();
     needInputWriteSeq = 0;
-    // Serializes the probe→bump→queue-clear section of concurrent arms for one
-    // (agentId, taskId): without it a stale replay probed before a successor's bump can
-    // itself bump afterwards, ghost-fencing the installed successor. All locked steps are
-    // bounded (memory probe + one store update); subscribe stays outside the lock.
     needInputArmLocks = new Map();
     needInputRetryTimer = null;
     needInputRetryKey(agentId, taskId, epoch) {
@@ -2252,12 +2225,6 @@ export class AgentManager {
             return null;
         return { agentId, taskId, epoch };
     }
-    // Standard commit entry: one agentStore.update, NEVER called from inside another
-    // updater (the store's per-id chain is non-reentrant).
-    // The ledger entry lives until the result is fully handed over — an error is IN the
-    // retry queue before deregistration, in the same synchronous continuation. Splitting
-    // those two across promise jobs would open a window where neither the ledger nor the
-    // queue holds the intent and a concurrent restore snapshot loses the answer.
     async commitNeedInputWatermark(intent) {
         const writeId = ++this.needInputWriteSeq;
         this.needInputWritesInFlight.set(writeId, intent);
@@ -2325,8 +2292,6 @@ export class AgentManager {
         });
         this.ensureNeedInputRetryTimer();
     }
-    // ok deletes only when the queued item is still covered by what was written
-    // (a concurrent edge may have raised it mid-flight); fenced is terminal either way.
     settleNeedInputRetry(key, wroteAskSeq, wroteAnsweredSeq, result) {
         const cur = this.needInputRetry.get(key);
         if (!cur)
@@ -2356,7 +2321,7 @@ export class AgentManager {
         if (this.needInputRetryTimer)
             return;
         this.needInputRetryTimer = setInterval(() => {
-            void this.needInputRetryPass();
+            void this.outsideTaskMutationScope(() => this.needInputRetryPass());
         }, this.needInputRetryIntervalMs);
         this.needInputRetryTimer.unref?.();
     }
@@ -2411,9 +2376,6 @@ export class AgentManager {
         }
         return owed;
     }
-    // Only the generation this arm directly succeeds (bumps are +1 and serialized per key).
-    // Anything older was already superseded — a fresh arm in between stripped its question
-    // on purpose, and transplanting it would relight a prompt nobody asked.
     collectPredecessorNeedInputDelta(agentId, taskId, epoch) {
         let delta = null;
         const merge = (wm) => {
@@ -2449,14 +2411,7 @@ export class AgentManager {
         });
         return run;
     }
-    // 'restore' must also merge queued retry seqs of the CURRENT persisted epoch: after
-    // session-gone the queue can hold the only proof an answer happened (the entry is
-    // gone, so needInputInherit has nothing to merge), and the arm clears the queue.
     async bumpNeedInputEpochForArm(agentId, taskId, mode) {
-        // Contributions are collected INSIDE the updater: it runs when the store chain
-        // reaches this bump, so an answer whose commit started while the bump was queued
-        // (registered in the ledger, or already error-queued) is still visible. A snapshot
-        // taken at call time would miss exactly that window.
         const collectContributions = () => {
             const queued = new Map();
             if (mode !== 'restore')
@@ -2507,16 +2462,10 @@ export class AgentManager {
         }
         catch (err) {
             console.warn(`[AgentManager] needInput epoch bump failed (agent=${agentId} task=${taskId}):`, err);
-            // Fall back to the persisted watermark for a restore: without it the entry would
-            // start at 0/0 and swallow the answer to a question that is still open in the
-            // store, leaving the badge lit forever. No bump means no generation advance —
-            // the caller must not treat this as a fresh generation.
             if (mode === 'restore') {
                 try {
                     const cur = await this.agentStore.get(agentId);
                     if (cur?.taskId === taskId && cur.needInput) {
-                        // Same-generation intents still owed to the store hold questions the
-                        // persisted watermark has not caught up with; merge them in.
                         const owed = this.collectSameEpochNeedInput(agentId, taskId, cur.needInput.epoch);
                         return {
                             wm: {
@@ -2536,16 +2485,12 @@ export class AgentManager {
         }
         return { wm, bumped: wm !== null };
     }
-    // Single entry for arming phase-signal watches — every path must flow through the
-    // epoch bump, or stale-generation commits could survive the re-arm.
     async startPhaseSignalWatch(args) {
         if (!this.phaseSignalWatcher)
             return true;
         const { needInputMode, ...rest } = args;
         const mode = needInputMode ?? 'restore';
         const watcher = this.phaseSignalWatcher;
-        // Claim ownership before bumping: a rejected arm must not bump (it would fence the
-        // owner), and the claim keeps this arm visible to later probes while it subscribes.
         const gateResult = await this.withNeedInputArmLock(args.agentId, args.taskId, async () => {
             const claim = watcher.claimArm?.({
                 taskId: args.taskId,
@@ -2558,8 +2503,6 @@ export class AgentManager {
             if (claim === null)
                 return 'rejected';
             const bump = await this.bumpNeedInputEpochForArm(args.agentId, args.taskId, mode);
-            // Only a real generation advance may drop the queue: same-generation intents
-            // (bump failed, watermark read back) are still owed to the store.
             if (bump.bumped)
                 this.clearNeedInputRetryFor(args.agentId, args.taskId);
             return { ...bump, claim };
@@ -2567,28 +2510,22 @@ export class AgentManager {
         if (gateResult === 'rejected')
             return false;
         const { wm, bumped, claim } = gateResult;
-        // Same synchronous section as the bump result: old-generation answers must not slip
-        // between the bump and the handoff (start() migrates the predecessor synchronously).
         if (wm !== null && bumped && mode === 'restore') {
             const delta = this.collectPredecessorNeedInputDelta(args.agentId, args.taskId, wm.epoch);
             if (delta) {
-                void this.commitNeedInputWatermark({
+                void this.outsideTaskMutationScope(() => this.commitNeedInputWatermark({
                     agentId: args.agentId,
                     taskId: args.taskId,
                     epoch: wm.epoch,
                     askSeq: Math.max(delta.askSeq, wm.askSeq),
                     answeredSeq: Math.max(delta.answeredSeq, wm.answeredSeq),
-                });
+                }));
             }
         }
-        // wm === null (no binding / store error): arm anyway with badge commits disabled —
-        // the badge is display-only, the signal watch drives task progress.
         try {
             return await watcher.start({
                 ...rest,
                 ...(claim != null ? { armClaimId: claim } : {}),
-                // Inherit is about restore semantics, not about having a generation: a degraded
-                // restore still has to keep the predecessor's pending question in memory.
                 needInputInherit: mode === 'restore',
                 ...(wm !== null ? { needInput: wm } : {}),
             });
@@ -2597,10 +2534,6 @@ export class AgentManager {
             watcher.releaseArm?.(claim);
         }
     }
-    // Web-fallback confirm: settles the newest known question (store ∪ retry queue) as
-    // answered in ONE store update — usable when no watch entry exists (pre-recovery,
-    // arm failure, post-stop). Queue contributions are snapshotted synchronously; the
-    // updater derives everything else from `existing`, so no nested store calls.
     async confirmNeedInputAnswered(agentId) {
         const queueAsk = new Map();
         for (const [key, wm] of this.needInputRetry) {
@@ -2654,15 +2587,7 @@ export class AgentManager {
             this.settleNeedInputRetry(this.needInputRetryKey(agentId, s.taskId, s.epoch), s.askSeq, s.askSeq, 'ok');
         }
     }
-    // The user typed into the agent's terminal — its open question counts as answered.
-    // The store fallback runs only when no watch entry exists (pre-recovery, arm failure,
-    // post-stop): with a live entry it would race the entry's in-flight writes and could
-    // confirm an ask that arrived after this input.
     async notifyHumanTerminalInput(agentId) {
-        // Rearm first: it settles entry state synchronously, so a question printed during
-        // this call cannot be confirmed by mistake. The binding read only decides whether a
-        // watcher of the CURRENT task took the input — a leftover entry of a finished task
-        // must not suppress the store fallback.
         const handled = await this.phaseSignalWatcher?.rearmNeedInput(agentId);
         let taskId;
         try {
@@ -2813,11 +2738,8 @@ export class AgentManager {
             }
             if ((state.awaitingPhase === 'dirty-workdir' || state.awaitingPhase === 'checkout-preparation-failed')
                 && boundTask && ACTIVE_TASK_STATUSES.has(boundTask.status)
-                // verdict 门禁状态没有在途派发：清掉 hold 后由 spec verdict 重新走完整转码，Resume 放行
                 && boundTask.status !== 'spec-ready' && boundTask.status !== 'max_rounds') {
                 if (state.taskId && boundTask.qaAgentId === agentId) {
-                    // 停驻的 review pass 已死（任务离开 review）：重派会伪造新 pass，只清 hold 并释放绑定；
-                    // 快照 hold/task 世代供释放路径 CAS，且不得借用 cancel-cleanup 的绕行凭据
                     if (boundTask.status !== 'review') {
                         return {
                             resumed: true,
@@ -2992,8 +2914,6 @@ export class AgentManager {
                     await this.markAwaitingHuman(agentId, 'code-dispatch-failed', reason, { expectedTaskId: result.redispatchCodeTaskId }).catch(() => undefined);
                     return { resumed: false, releasedBinding: false, reason };
                 }
-                // 重派与首派同样不经 startSession 的 post-ack finalize：残留的 bootstrap 标记
-                // 会让下一次 recover 把已送达的 code prompt 再判成未送达
                 const lockToken = (await this.agentStore.get(agentId))?.lockToken;
                 await this.finalizeReplayedBootstrap(agentId, result.redispatchCodeTaskId, 'code', lockToken);
             }
@@ -3055,7 +2975,6 @@ export class AgentManager {
                 console.error(`[AgentManager] resumeAgent review redispatch failed for ${agentId}:`, err);
                 const reason = `QA review redispatch on Resume failed: ${err instanceof Error ? err.message : String(err)}`;
                 const reviewTaskId = result.redispatchReviewTaskId;
-                // 锁代未变（未被 successor re-acquire）才允许补挂；markAwaitingHuman 内的 CAS 原子复核同一条件
                 const restoreHoldIfStillOurs = async (phase, holdReason) => {
                     const after = await this.agentStore.get(agentId);
                     if (after?.taskId === reviewTaskId
@@ -3067,7 +2986,6 @@ export class AgentManager {
                         });
                     }
                 };
-                // handled 只代表 startSession 已尝试落 hold；落库可能已失败，必须核实并按需补挂
                 if (err instanceof EnsureSessionError && err.partial.handled) {
                     try {
                         await restoreHoldIfStillOurs(result.previousPhase ?? 'checkout-preparation-failed', reason);
@@ -3083,7 +3001,6 @@ export class AgentManager {
                         };
                     }
                 }
-                // ack_unknown：prompt 可能已在跑，必须恢复 ack hold 的可见性，而非按普通失败补挂 checkout hold
                 if (err instanceof DispatchTerminalError && err.reason === 'ack_unknown') {
                     try {
                         await restoreHoldIfStillOurs('dispatch-failed:ack_unknown', `${err.message}. Prompt may still be running in the pane; verify before resuming.`);
@@ -3099,7 +3016,6 @@ export class AgentManager {
                         };
                     }
                 }
-                // pass 被接管（token 轮换或任务离开 review）说明该 pass 已死，补挂会把新 pass 的 QA 打成 hold
                 let passSuperseded = false;
                 let recoveryReadFailed = false;
                 try {
@@ -3114,7 +3030,6 @@ export class AgentManager {
                     return { resumed: false, releasedBinding: false, reason };
                 try {
                     if (recoveryReadFailed) {
-                        // 读失败时无法证明接管，优先恢复可见性：锁代/绑定 CAS 全部由 markAwaitingHuman 原子判定
                         await this.markAwaitingHuman(agentId, result.previousPhase ?? 'checkout-preparation-failed', reason, {
                             expectedTaskId: reviewTaskId,
                             ...(recoveryLockToken !== undefined ? { expectedLockToken: recoveryLockToken } : {}),
@@ -3391,7 +3306,6 @@ export class AgentManager {
             const out = [];
             for (const t of tasks) {
                 const bound = t.agentId === agentId || t.qaAgentId === agentId;
-                // spec-ready 不豁免：approve/打回都依赖 dev Workdir，dev 丢失后停驻只是假活
                 if (t.status === 'merge-ready')
                     continue;
                 if (ACTIVE_TASK_STATUSES.has(t.status) && bound) {
@@ -3456,7 +3370,6 @@ export class AgentManager {
         return last;
     }
     async restartReplOnly(agentId, opts = {}) {
-        // Re-verify the entry generation so a request that slept across a DELETE→recreate can't restart the NEW incarnation's REPL (claim check alone can't tell).
         const genAtEntry = opts.expectedGeneration ?? this.deletionGenerationOf(agentId);
         if (!this.deletionGateOpen(agentId, genAtEntry)) {
             throw new Error(`restart-repl: agent ${agentId} is being deleted or was recreated; aborting`);
@@ -3491,7 +3404,6 @@ export class AgentManager {
         const project = this.getProjectConfig(cfg.projectId);
         if (!project)
             throw new Error(`restart-repl: project ${cfg.projectId} does not exist`);
-        // Re-verify before Workdir/skill/session-option side-effects: pane writes fail-closed on a stale PaneRef, but ensureWorkdir/skills would write old-cfg files under a recreated id.
         if (!this.deletionGateOpen(agentId, genAtEntry)) {
             throw new Error(`restart-repl: agent ${agentId} is being deleted or was recreated; aborting`);
         }
@@ -3520,7 +3432,6 @@ export class AgentManager {
             await this.tagSessionSkillsVersion(tmux, agentId, snapshot.ref);
         };
         await this.runUnderSkillDirLock(this.skillDirLockKey(cfg, workdir), relaunch);
-        // Final writeback is generation-gated too, so a DELETE→recreate reusing %0 can't persist the old incarnation's paneId onto the new agent.
         await this.agentStore.update(agentId, (state) => {
             if (!state || !this.deletionGateOpen(agentId, genAtEntry))
                 return AGENT_STORE_NOOP;
@@ -3531,7 +3442,6 @@ export class AgentManager {
             };
         });
     }
-    // Holds only the pass captured in the task tuple: a successor pass (rotated token/phase/status) is never overwritten.
     async holdReplayFailureIfCurrent(agentId, taskAtEntry, holdPhase, reason, entryHold, extraCurrent) {
         return this.withTaskLock(async () => {
             const fresh = await this.taskStore.get(taskAtEntry.id);
@@ -3547,7 +3457,6 @@ export class AgentManager {
                 expectedHold: entryHold,
             }))
                 return true;
-            // Entry hold gone (Resume raced): write over the empty generation, never over a foreign hold.
             if (await this.markAwaitingHuman(agentId, holdPhase, reason, {
                 expectedTaskId: taskAtEntry.id,
                 expectedHold: { phase: undefined, since: undefined, nonce: undefined },
@@ -3678,14 +3587,11 @@ export class AgentManager {
                 retireOldOnce();
         }
     }
-    async redispatchTaskPromptAfterReplRestart(agentId, taskId, expected) {
+    async redispatchTaskPromptAfterReplRestart(agentId, taskId) {
         const agent = this.getAgentConfig(agentId);
         const loadedTask = await this.taskStore.get(taskId);
         if (!agent || !loadedTask || !TASK_OWNER_ROLES.has(agent.role))
             return false;
-        if (expected && !taskMatchesGeneration(loadedTask, expected))
-            return false;
-        const rootGenerationMatches = (fresh, signalToken = expected?.signalToken) => !expected || taskMatchesGeneration(fresh, { ...expected, signalToken });
         const task = loadedTask;
         if (task.agentId !== agentId)
             return false;
@@ -3702,8 +3608,7 @@ export class AgentManager {
             return fresh?.agentId === agentId
                 && fresh.status === task.status
                 && fresh.phase === task.phase
-                && fresh.signalToken === signalToken
-                && rootGenerationMatches(fresh, signalToken);
+                && fresh.signalToken === signalToken;
         };
         const clearEntryHold = async () => this.withTaskLock(async () => {
             if (!(await taskStillCurrent()))
@@ -3714,10 +3619,10 @@ export class AgentManager {
             }
             return this.clearAwaitingHuman(agentId, { expectedHold: entryHold });
         });
-        const holdReplayFailure = (phase, reason) => this.holdReplayFailureIfCurrent(agentId, task, phase, reason, entryHold, async (fresh) => rootGenerationMatches(fresh, task.signalToken));
+        const holdReplayFailure = (phase, reason) => this.holdReplayFailureIfCurrent(agentId, task, phase, reason, entryHold);
         try {
             if (task.status === 'approved' && agent.role === 'dev') {
-                return await this.replayApprovedHolderAfterReplRestart(agentId, task, entryHold, { clearEntryHold, holdReplayFailure, rootGenerationMatches });
+                return await this.replayApprovedHolderAfterReplRestart(agentId, task, entryHold, { clearEntryHold, holdReplayFailure });
             }
             const mapped = this.mapTaskStateToExpectedWatcher(task);
             if (!mapped || mapped.agentId !== agentId)
@@ -3736,8 +3641,7 @@ export class AgentManager {
                     if (fresh?.agentId !== agentId
                         || fresh.status !== task.status
                         || fresh.phase !== task.phase
-                        || fresh.signalToken !== signalToken
-                        || !rootGenerationMatches(fresh, signalToken))
+                        || fresh.signalToken !== signalToken)
                         return false;
                     const rotatePendingPr = mapped.expectedKinds.includes('pr-created')
                         && fresh.pendingPrSignalToken === signalToken;
@@ -3750,7 +3654,7 @@ export class AgentManager {
                     return true;
                 },
                 stillCurrent: taskStillCurrent,
-                holdFailure: (newToken, reason) => this.holdReplayFailureIfCurrent(agentId, { ...task, signalToken: newToken }, 'restart-redispatch-failed', reason, entryHold, async (fresh) => rootGenerationMatches(fresh, newToken)),
+                holdFailure: (newToken, reason) => this.holdReplayFailureIfCurrent(agentId, { ...task, signalToken: newToken }, 'restart-redispatch-failed', reason, entryHold),
                 continueWith: (newToken, fence) => this.continueSession(taskId, agentId, phase, {
                     ...opts,
                     signalToken: newToken,
@@ -3773,7 +3677,6 @@ export class AgentManager {
                 });
             };
             if (task.status === 'in_progress' && task.phase === undefined && agent.role === 'dev') {
-                // An undelivered bootstrap never started work, so the fresh-dispatch clean gate still applies.
                 const delivered = (await this.agentStore.get(agentId))?.bootstrappingTaskId !== taskId;
                 return await replayInitialBootstrap('develop', {
                     ...(delivered ? { allowDirtyWorkdir: true } : {}),
@@ -3796,7 +3699,6 @@ export class AgentManager {
                     ...(agent.role === 'dev' ? { allowDirtyWorkdir: true } : {}),
                 });
             }
-            // A direct (no-SDD) pass never persists a phase, so fixing + undefined is the plain code-feedback round.
             if (task.status === 'fixing'
                 && (task.phase === 'code' || task.phase === undefined)
                 && agent.role === 'dev') {
@@ -3809,7 +3711,6 @@ export class AgentManager {
             return false;
         }
         catch (err) {
-            // A post-entry throw may land after clearEntryHold; only a tuple-checked hold on the live generation is safe.
             const message = err instanceof Error ? err.message : String(err);
             if (await holdReplayFailure('restart-redispatch-failed', `REPL restarted but replaying the task prompt failed: ${message}. Resume to retry, or cancel the task.`)) {
                 return true;
@@ -3817,49 +3718,9 @@ export class AgentManager {
             throw err;
         }
     }
-    async redispatchCurrentTaskPhase(taskId, expected) {
-        const current = await this.taskStore.get(taskId);
-        if (!current || !taskMatchesGeneration(current, expected))
-            return 'stale';
-        if (current.status === 'review') {
-            let changedByRedispatch = false;
-            try {
-                await this.dispatchReviewToQa(taskId, {
-                    fromStatus: ['review'],
-                    bumpRound: false,
-                    expectSignalToken: current.signalToken,
-                    expectPhase: current.phase,
-                    expectedTask: expected,
-                    onSideEffect: () => { changedByRedispatch = true; },
-                });
-                return 'dispatched';
-            }
-            catch (err) {
-                if (!changedByRedispatch && isBenignDispatchConflict(err))
-                    return 'stale';
-                if (!changedByRedispatch
-                    && err instanceof ApiError
-                    && err.code === 'dispatch-unsupported') {
-                    return 'unsupported';
-                }
-                if (changedByRedispatch)
-                    throw err;
-                const fresh = await this.taskStore.get(taskId);
-                if (!fresh || !taskMatchesGeneration(fresh, expected))
-                    return 'stale';
-                throw err;
-            }
-        }
-        const redispatched = await this.redispatchTaskPromptAfterReplRestart(current.agentId, taskId, expected);
-        if (redispatched)
-            return 'dispatched';
-        const fresh = await this.taskStore.get(taskId);
-        return !fresh || !taskMatchesGeneration(fresh, expected) ? 'stale' : 'unsupported';
-    }
-    // approved hosts the post-approve holder pass.
     async replayApprovedHolderAfterReplRestart(agentId, task, entryHold, holdGen) {
         const taskId = task.id;
-        const { clearEntryHold, holdReplayFailure, rootGenerationMatches } = holdGen;
+        const { clearEntryHold, holdReplayFailure } = holdGen;
         if (task.postApproveRevoked) {
             return holdReplayFailure('restart-redispatch-failed', `The post-approve completion was deliberately revoked (${task.postApproveRevoked.reason}); ` +
                 'the block stays effective, so the pass is not replayed. Re-request changes to restart the review round, or cancel the task.');
@@ -3871,7 +3732,6 @@ export class AgentManager {
                 return holdReplayFailure('restart-redispatch-failed', 'REPL restarted during the post-approve pass but the stored completion cannot be tied to a persisted approved head; re-request the review verdict or cancel the task.');
             }
             if (stored.approvedHeadSha !== task.postApproveHeadSha) {
-                // Provably a dead episode's residue: retire it by token, then rebuild for the current head.
                 await this.clearPostApproveCompletionIfMatches(taskId, { generation: stored.generation, token: stored.token, headSha: stored.approvedHeadSha });
                 completion = await this.holdIncompleteGitPostApproveEpisode(holdReplayFailure);
             }
@@ -3891,7 +3751,6 @@ export class AgentManager {
             && fresh.status === task.status
             && fresh.phase === task.phase
             && fresh.signalToken === task.signalToken
-            && rootGenerationMatches(fresh, task.signalToken)
             && fresh.postApproveRevoked === undefined
             && fresh.postApproveHeadSha === task.postApproveHeadSha
             && fresh.postApproveGeneration === task.postApproveGeneration
@@ -3952,8 +3811,8 @@ export class AgentManager {
         const project = this.getProjectConfig(cfg.projectId);
         if (!project)
             throw new Error(`Unknown project: ${cfg.projectId}`);
-        const group = this.findAgentGroup(agentId);
-        return { targets: group?.map(agent => agent.id) ?? [agentId] };
+        const team = this.findAgentTeam(agentId);
+        return { targets: team?.map(agent => agent.id) ?? [agentId] };
     }
     async cleanupRemovedAgentRuntime(targets) {
         const failures = [];
@@ -3963,7 +3822,6 @@ export class AgentManager {
                 continue;
             const runner = this.createRunnerFor(cfg);
             const tmux = new TmuxManager(runner);
-            // No releaseAgentForTask: the binding dies with the state file in phase 3, and deletability was already enforced by the phase-1 API gates — so cleanup only stops watchers and kills the session.
             this.stopRuntimeMenuWatch(id);
             if (this.paneStreamerManager) {
                 try {
@@ -3990,7 +3848,6 @@ export class AgentManager {
                         return;
                     }
                     if (snapshot.claim === null) {
-                        // A nonce-owned unclaimed session is this project's own half-created leftover — reclaim it.
                         let nonceOwned;
                         try {
                             nonceOwned = await tmux.hasCreationNonce(id, cleanupOpts);
@@ -4054,13 +3911,13 @@ export class AgentManager {
         const now = new Date().toISOString();
         if (cfg.role !== 'dev')
             throw new Error(`Agent ${cfg.id} is not a dev agent`);
-        const group = this.findAgentGroup(cfg.id);
+        const team = this.findAgentTeam(cfg.id);
         const devAgentId = cfg.id;
         const qaAgentId = input.preferredAgentId === ''
             ? '_unassigned_preview_qa'
-            : group?.find(agent => agent.role === 'qa')?.id;
+            : team?.find(agent => agent.role === 'qa')?.id;
         if (!qaAgentId)
-            throw new Error(`Agent ${cfg.id} has no qa agent in its group`);
+            throw new Error(`Agent ${cfg.id} has no qa agent in its Agent Team`);
         const fakeTask = {
             id: 'task-9999999999',
             projectId,
@@ -4102,11 +3959,11 @@ export class AgentManager {
             return undefined;
         return buildProjectDriver(project, this.pluginRegistry, this.platformDriverExec);
     }
-    findAgentGroup(anchorAgentId) {
+    findAgentTeam(anchorAgentId) {
         for (const project of this.config.project) {
-            for (const group of project.agent) {
-                if (group.some(agent => agent.id === anchorAgentId))
-                    return group;
+            for (const team of project.agent) {
+                if (team.some(agent => agent.id === anchorAgentId))
+                    return team;
             }
         }
         return undefined;
@@ -4117,8 +3974,8 @@ export class AgentManager {
             return undefined;
         let longest;
         let longestBytes = -1;
-        for (const pair of project.agent) {
-            for (const a of pair) {
+        for (const team of project.agent) {
+            for (const a of team) {
                 if (a.role !== 'dev' || !a.workdir)
                     continue;
                 const bytes = Buffer.byteLength(a.workdir, 'utf8');
@@ -4133,6 +3990,99 @@ export class AgentManager {
     async getTask(taskId) {
         return this.taskStore.get(taskId);
     }
+    async recordTaskAttention(event) {
+        if (!event.taskId)
+            return;
+        await this.withTaskLock(async () => {
+            const task = await this.taskStore.get(event.taskId);
+            if (!task)
+                return;
+            const reasonValue = typeof event.data.phase === 'string'
+                ? event.data.phase
+                : typeof event.data.reason === 'string'
+                    ? event.data.reason
+                    : 'human-intervention';
+            const reason = reasonValue.trim() || 'human-intervention';
+            const previousPhase = typeof event.data.previousPhase === 'string'
+                ? event.data.previousPhase.trim()
+                : '';
+            const clearedReason = reason === 'mr-reopened'
+                ? 'mr-closed-unmerged'
+                : reason === 'resumed'
+                    || reason === 'git-review-dispatch-hold-cleared'
+                    || reason === 'agent_runtime_menu_resolved'
+                    ? previousPhase
+                    : '';
+            if (clearedReason) {
+                if (task.attention?.reason !== clearedReason
+                    || Date.parse(event.timestamp) < Date.parse(task.attention.occurredAt))
+                    return;
+                const next = { ...task, updatedAt: new Date().toISOString() };
+                delete next.attention;
+                await this.taskStore.set(next);
+                return;
+            }
+            if (reason === 'resumed'
+                || reason === 'git-review-dispatch-hold-cleared'
+                || reason === 'agent_runtime_menu_resolved')
+                return;
+            const runbookValue = [
+                event.data.note,
+                event.data.recommendation,
+                event.data.message,
+                event.data.error,
+                ...(typeof event.data.phase === 'string' ? [event.data.reason] : []),
+            ]
+                .find(value => typeof value === 'string' && value.trim() !== '');
+            const runbook = typeof runbookValue === 'string'
+                ? runbookValue.trim()
+                : `Task ${task.id} requires human intervention for ${reason}. Inspect the task and its linked agent before choosing an action.`;
+            const occurredAt = Number.isFinite(Date.parse(event.timestamp))
+                ? event.timestamp
+                : new Date().toISOString();
+            const generation = taskAttentionGeneration(task);
+            let recommendedActions;
+            if (task.status === 'max_rounds') {
+                recommendedActions = ['verdict', 'cancel'];
+            }
+            else if (TERMINAL_STATUSES.includes(task.status)) {
+                recommendedActions = task.remoteCleanup !== undefined
+                    && task.remoteCleanup.stage !== 'manual'
+                    ? ['cancel']
+                    : ['retry'];
+            }
+            else if (task.status === 'review') {
+                recommendedActions = isSpecStagePhase(task.phase)
+                    ? ['advance', 'cancel']
+                    : ['advance', 'verdict', 'cancel'];
+            }
+            else if (task.status === 'spec-ready' || task.status === 'merge-ready') {
+                recommendedActions = ['verdict', 'cancel'];
+            }
+            else {
+                recommendedActions = ['advance', 'cancel'];
+            }
+            if (task.attention
+                && Date.parse(task.attention.occurredAt) > Date.parse(occurredAt))
+                return;
+            if (task.attention
+                && task.attention.reason === reason
+                && task.attention.runbook === runbook
+                && Date.parse(task.attention.occurredAt) >= Date.parse(occurredAt))
+                return;
+            await this.taskStore.set({
+                ...task,
+                attention: {
+                    reason,
+                    runbook,
+                    occurredAt,
+                    recommendedActions,
+                    generation,
+                },
+                updatedAt: new Date().toISOString(),
+            });
+        });
+    }
     async getAgentState(agentId) {
         return this.agentStore.get(agentId);
     }
@@ -4143,8 +4093,6 @@ export class AgentManager {
         const task = await this.taskStore.get(taskId);
         return task ? this.completionOf(task) : null;
     }
-    // completion 与效果字段同居 TaskState：consumedFeedback/pendingRedispatch 与 token CAS
-    // 必须同一次持久化（spec §6 双写协议）。
     completionOf(task) {
         if (task.postApproveToken === undefined || task.postApproveHeadSha === undefined
             || task.postApproveGeneration === undefined || task.postApprovePhase === undefined)
@@ -4221,15 +4169,30 @@ export class AgentManager {
             delete next.reviewDispatch;
             delete next.reviewRoundPending;
         }
-        if (nextStatus !== task.status && next.outbox) {
-            const outbox = next.outbox.filter(entry => entry.type !== 'git.spec-verdict');
-            if (outbox.length > 0)
-                next.outbox = outbox;
-            else
-                delete next.outbox;
-        }
+        if (nextStatus !== task.status)
+            this.stripGitVerdictOutbox(next);
         return next;
     }
+    stripGitVerdictOutbox(task) {
+        if (!task.outbox)
+            return;
+        const outbox = task.outbox.filter(entry => entry.type !== 'git.spec-verdict' && entry.type !== 'git.code-verdict');
+        if (outbox.length > 0)
+            task.outbox = outbox;
+        else
+            delete task.outbox;
+    }
+    stripCodeVerdictOutboxForAnchor(task, anchorSha) {
+        if (!task.outbox)
+            return;
+        const normalizedAnchor = anchorSha.toLowerCase();
+        const outbox = task.outbox.filter(entry => entry.type !== 'git.code-verdict'
+            || entry.data.anchorSha.toLowerCase() === normalizedAnchor);
+        if (outbox.length > 0)
+            task.outbox = outbox;
+        else
+            delete task.outbox;
+    }
     async confirmPostApprovePromptDelivered(taskId, expected) {
         await this.withTaskLock(async () => {
             const task = await this.taskStore.get(taskId);
@@ -4268,7 +4231,6 @@ export class AgentManager {
             this.phaseSignalWatcher?.stop(taskId);
         });
     }
-    // CAS for an existing pass: never creates a record nor touches the marker, so it cannot resurrect a revoked completion.
     async updatePostApproveCompletionIfToken(taskId, expectedToken, patch, opts = {}) {
         return this.withTaskLock(async () => {
             const task = await this.taskStore.get(taskId);
@@ -4289,13 +4251,11 @@ export class AgentManager {
             return true;
         });
     }
-    // Deliberate clear: the persisted marker keeps a restart replay from rebuilding the completion and bypassing the block.
     async revokePostApproveCompletion(taskId, reason, opts = {}) {
         return this.withTaskLock(async () => {
             const task = await this.taskStore.get(taskId);
             if (!task || task.status !== 'approved')
                 return false;
-            // Head binds the revoke to one approved episode; an unpersisted head cannot disprove it, so blocking stays fail closed.
             if (opts.expectedHeadSha !== undefined
                 && task.postApproveHeadSha !== undefined
                 && task.postApproveHeadSha !== opts.expectedHeadSha)
@@ -4333,7 +4293,6 @@ export class AgentManager {
             return true;
         });
     }
-    // Marker/token/head/pending are re-checked inside the committing critical section, so a concurrent revoke never loses.
     async completeApprovedPassToMergeReady(taskId, expected) {
         return this.withTaskLock(async () => {
             const task = await this.taskStore.get(taskId);
@@ -4427,6 +4386,9 @@ export class AgentManager {
     specVerdictOutbox(task) {
         return task.outbox?.find((entry) => entry.type === 'git.spec-verdict');
     }
+    codeVerdictOutbox(task) {
+        return task.outbox?.find((entry) => entry.type === 'git.code-verdict');
+    }
     async mutateTaskOutboxEntry(taskId, key, mutate) {
         return this.withTaskLock(async () => {
             const task = await this.taskStore.get(taskId);
@@ -4456,6 +4418,10 @@ export class AgentManager {
                     await this.deliverSpecVerdictOutbox(taskId, entry.key);
                     continue;
                 }
+                if (entry.type === 'git.code-verdict') {
+                    await this.deliverCodeVerdictOutbox(taskId, entry.key);
+                    continue;
+                }
                 await this.eventBus.emit({
                     id: `outbox:${entry.key}`,
                     type: 'human.intervention',
@@ -4498,8 +4464,6 @@ export class AgentManager {
             headSha: completion.approvedHeadSha,
         });
     }
-    // 启动期按「未引用」跳过 skill 池的插件，被热配置首次引用时同步重扫；仍不可物化即拒绝提交——
-    // 可解析但物化为空的 tool 会让派发要求加载一个不存在的 skill。
     async ensurePluginSkillPools(next) {
         if (!this.pluginRegistry)
             return;
@@ -4508,7 +4472,6 @@ export class AgentManager {
             if (tool === undefined)
                 continue;
             const plugin = this.pluginRegistry.resolveTool(tool);
-            // 静默放行会存下一个「无 driver、无平台 skill、重启即 fatal」的配置（启动期同判据）
             if (plugin === undefined) {
                 throw new Error(`project '${project.id}': no git-driver plugin provides tool '${tool}' — install it under ~/.baxian/plugins/ first`);
             }
@@ -4550,7 +4513,6 @@ export class AgentManager {
             && task.failToken === lease.failToken
             && lease.effectiveRound === effectiveTaskReviewRound(task);
     }
-    // startSession 按 agent 的 projectId 解析 repo/workdir，项目归属不入判会跨仓库检出
     gitReviewQaConfigUsable(task) {
         const qaAgentId = requireTaskQaAgentId(task, 'gitReviewQaConfigUsable');
         const config = this.getAgentConfig(qaAgentId);
@@ -4581,6 +4543,10 @@ export class AgentManager {
                 return null;
             if (Object.hasOwn(opts, 'expectPhase') && current.phase !== opts.expectPhase)
                 return null;
+            if (current.status === 'review'
+                && current.reviewHeadAnchorSha?.toLowerCase() === opts.headSha.toLowerCase()
+                && this.codeVerdictOutbox(current) !== undefined)
+                return null;
             if (opts.patch?.branch && opts.patch.branch !== current.branch) {
                 const existing = await this.findTaskByBranch(opts.patch.branch, current.projectId);
                 if (existing && existing.id !== taskId)
@@ -4601,6 +4567,7 @@ export class AgentManager {
                 ? 'review'
                 : 'recheck');
             const next = this.stripPostApproveEpisodeFields(current);
+            this.stripGitVerdictOutbox(next);
             delete next.passProvenance;
             Object.assign(next, opts.patch ?? {}, {
                 status: 'review',
@@ -4670,6 +4637,7 @@ export class AgentManager {
                 return null;
             const now = new Date().toISOString();
             const next = this.stripPostApproveEpisodeFields(current);
+            this.stripGitVerdictOutbox(next);
             delete next.reviewDispatch;
             delete next.reviewRoundPending;
             const postApproveGeneration = createSignalToken();
@@ -4769,6 +4737,7 @@ export class AgentManager {
                 },
                 updatedAt: now,
             };
+            this.stripCodeVerdictOutboxForAnchor(next, verifiedHeadSha);
             await this.taskStore.set(next);
             if (qaHold !== undefined) {
                 const cleared = await this.clearAwaitingHuman(qaId, {
@@ -4814,6 +4783,9 @@ export class AgentManager {
             }
             next.reviewDispatchedAt = now;
             delete next.reviewDispatch;
+            if (next.attention?.reason === 'git-review-dispatch-recovery-uncertain') {
+                delete next.attention;
+            }
             await this.taskStore.set(next);
             return true;
         });
@@ -4935,7 +4907,6 @@ export class AgentManager {
                 continue;
             const qaAgentId = requireTaskQaAgentId(task, 'retryPendingGitReviewDispatches');
             if (!this.gitReviewQaConfigUsable(task)) {
-                // 快照可能已过期：告警前 live 复核；按 lease 代际告警一次，emit 成功才落闩
                 const latch = `qa-config:${task.id}:${lease.generation}`;
                 if (!this.gitReviewRecoveryAlerted.has(latch)) {
                     try {
@@ -5109,7 +5080,6 @@ export class AgentManager {
         const tasks = await this.taskStore.list({ status: 'approved' });
         for (const task of tasks) {
             if (task.postApproveRevoked) {
-                // Finish an interrupted revoke: the marker is authoritative, the leftover record must not re-arm.
                 try {
                     if (task.postApproveToken !== undefined) {
                         await this.taskStore.set({
@@ -5230,7 +5200,6 @@ export class AgentManager {
             }
         }
     }
-    // 创建期快照（spec §4）：git 任务在建任务那一刻定身份。
     platformBindingFields(projectId) {
         return { platformBinding: this.platformBindingFor(projectId) };
     }
@@ -5247,7 +5216,6 @@ export class AgentManager {
             tool,
         };
     }
-    // agent 面一律 PATH 解析 tool；server 面 binary/env 不进入该轨。
     agentGitPreflightContext(projectId) {
         const project = this.getProjectConfig(projectId);
         if (!project || !this.pluginRegistry)
@@ -5268,8 +5236,6 @@ export class AgentManager {
             driverFor: (exec) => new GitDriver(plugin, renderCtx, exec),
         };
     }
-    // cli 字段族每次派发实时渲染，不做创建时快照。渲染前按持久化 binding 校验身份——
-    // 离线漂移的配置会把旧任务的 PR 号/分支/令牌带到新仓库，与平台操作同一守卫。
     platformCliContextOf(task) {
         this.assertPlatformBinding(task);
         const project = this.getProjectConfig(task.projectId);
@@ -5287,13 +5253,11 @@ export class AgentManager {
             ...(project.gitCli?.notes !== undefined ? { notes: project.gitCli.notes } : {}),
         };
     }
-    // base 快照一经持久化不可变；无快照保持缺省，由 agent 现场显式查询。
     async ensureGitBaseSnapshot(task, phase) {
         if (phase !== 'develop' && phase !== 'code')
             return task;
         if (task.baseBranch !== undefined)
             return task;
-        // 读默认分支与落快照都以 binding 为前提：失配任务先写入新仓库的 base 会永久污染不可变快照
         this.assertPlatformBinding(task);
         const base = this.platformDefaultBranchOf?.(task.projectId);
         if (base === undefined)
@@ -5310,20 +5274,28 @@ export class AgentManager {
             return next;
         });
     }
-    async noteReviewConversationRevision(taskId) {
+    async noteReviewConversationRevision(taskId, conversation) {
         await this.withTaskLock(async () => {
             const task = await this.taskStore.get(taskId);
             if (!task || TERMINAL_STATUSES.includes(task.status))
                 return;
             const now = new Date().toISOString();
-            await this.taskStore.set({ ...task, reviewConversationUpdatedAt: now, updatedAt: now });
+            const next = { ...task, reviewConversationUpdatedAt: now, updatedAt: now };
+            const repoKey = next.platformBinding?.repoKey;
+            if (conversation !== undefined
+                && this.prConversationCache !== undefined
+                && repoKey !== undefined
+                && next.prNumber === conversation.prNumber) {
+                this.prConversationCache.put(next.id, prReviewCacheRevision(next, repoKey), conversation.payload, next.reviewConversationUpdatedAt ?? '');
+            }
+            await this.taskStore.set(next);
         });
     }
     assertPlatformBinding(task) {
         const mismatch = platformBindingMismatch(this.config, task);
         if (mismatch === undefined)
             return;
-        void this.emitPlatformBindingIntervention(task, mismatch);
+        void this.outsideTaskMutationScope(() => this.emitPlatformBindingIntervention(task, mismatch));
         if (mismatch.reason === 'missing-binding-snapshot') {
             throw new Error(`platform binding missing for task ${task.id}; refusing platform operations`);
         }
@@ -5339,7 +5311,6 @@ export class AgentManager {
             throw new Error(`no git driver resolvable for project ${task.projectId}`);
         return { task, driver };
     }
-    // 配置锁也覆盖终态任务尚未完成的远端清理；否则 cancel 落 intent 后即可改写/删除其 binding。
     async listActiveGitTasks(projectId) {
         const tasks = await this.taskStore.listStrict(projectId !== undefined ? { projectId } : undefined);
         return tasks.filter(t => (t.remoteCleanup !== undefined && t.remoteCleanup.stage !== 'manual')
@@ -5352,8 +5323,6 @@ export class AgentManager {
         const [row] = await driver.runOp('prView', { prNumber: task.prNumber });
         return row;
     }
-    // git 模式的 head 刷新一律经任务解析出的 driver（spec §4 两执行面）：QA checkout 的
-    // moved-head fallback 不得旁路到硬编码 gh，否则自定义/非 github driver 会错误调用 gh。
     async platformFetchPrHeadSha(taskId) {
         const headSha = String((await this.platformFetchPrView(taskId)).headSha);
         if (!PLATFORM_HEAD_SHA_RE.test(headSha)) {
@@ -5863,8 +5832,12 @@ export class AgentManager {
                 return null;
             if (task.prNumber !== undefined && task.prNumber !== observation.prNumber)
                 return null;
+            const repairsDeliveryConfirmation = confirmation?.source === 'human'
+                && (task.status === 'review' || task.status === 'fixing')
+                && Object.hasOwn(confirmation, 'expectedSignalToken');
             if (confirmation !== undefined) {
                 if (task.status !== 'in_progress'
+                    && !repairsDeliveryConfirmation
                     && (task.phase !== confirmation.phase
                         || task.deliveryConfirmation?.phase !== confirmation.phase))
                     return null;
@@ -5891,7 +5864,7 @@ export class AgentManager {
                 ...(confirmation !== undefined
                     ? {
                         phase: confirmation.phase,
-                        deliveryConfirmation: task.status === 'in_progress'
+                        deliveryConfirmation: task.status === 'in_progress' || repairsDeliveryConfirmation
                             ? { phase: confirmation.phase, source: confirmation.source, at: now }
                             : task.deliveryConfirmation,
                         ...(confirmation.branch !== undefined ? { branch: confirmation.branch } : {}),
@@ -5997,8 +5970,6 @@ export class AgentManager {
         return this.repoCache;
     }
     async rollbackFailedDispatch(taskId, agentId, reason, expectedLockToken) {
-        // Pin the incarnation: task rollback / intervention below await, and a DELETE→same-id recreate in that
-        // window must not let the final state write-back resurrect the deleted agent.
         const genAtEntry = this.deletionGenerationOf(agentId);
         const existing = await this.agentStore.get(agentId);
         if (existing && existing.taskId !== undefined && existing.taskId !== taskId) {
@@ -6046,8 +6017,6 @@ export class AgentManager {
         else {
             const now = new Date().toISOString();
             await this.agentStore.update(agentId, (latest) => {
-                // Never resurrect a deleted/recreated incarnation: if the state is gone or the generation moved
-                // since entry, this rollback is stale — clear nothing rather than rebuild from the old snapshot.
                 if (!latest || !this.deletionGateOpen(agentId, genAtEntry))
                     return AGENT_STORE_NOOP;
                 if (latest.taskId === taskId && latest.lockToken !== expectedLockToken)
@@ -6145,17 +6114,15 @@ export class AgentManager {
                 };
                 return this.persistQueuedTask(unassigned, 'unassigned');
             }
-            // Capture generation before the first config/group read so a DELETE→same-id recreate in the read→commit window fails the gate.
             const genAtEntry = this.deletionGenerationOf(input.preferredAgentId);
             const target = await this.pickAgent(projectId, input.preferredAgentId);
-            const group = this.findAgentGroup(input.preferredAgentId);
-            const dev = group?.find(agent => agent.role === 'dev');
+            const team = this.findAgentTeam(input.preferredAgentId);
+            const dev = team?.find(agent => agent.role === 'dev');
             if (!dev)
-                throw new ApiError(409, `Agent ${input.preferredAgentId} has no dev agent in its group`);
-            const qa = group?.find(agent => agent.role === 'qa');
+                throw new ApiError(409, `Agent ${input.preferredAgentId} has no dev agent in its Agent Team`);
+            const qa = team?.find(agent => agent.role === 'qa');
             if (!qa)
-                throw new ApiError(409, `Agent ${input.preferredAgentId} has no qa agent in its group`);
-            // Pin EVERY participant's generation: a member (e.g. QA) deleted→reintroduced after the snapshot leaves isDeletionInFlight false and the preferred generation unchanged, yet the task would still carry its stale id.
+                throw new ApiError(409, `Agent ${input.preferredAgentId} has no qa agent in its Agent Team`);
             const participantGens = new Map([dev.id, qa.id]
                 .map(id => [id, this.deletionGenerationOf(id)]));
             const participantsFresh = () => this.deletionGenerationOf(input.preferredAgentId) === genAtEntry
@@ -6168,11 +6135,9 @@ export class AgentManager {
                 qaAgentId: qa.id,
                 status: 'pending',
             };
-            // A DELETE→recreate of the preferred OR any participant after the group snapshot must not persist a
-            // pending task carrying its stale devAgentId/qaAgentId; reject and let the client re-select.
             const persistQueuedOrReject = (reason) => {
                 if (!participantsFresh()) {
-                    throw new ApiError(409, `Agent ${input.preferredAgentId} or a group member is being deleted or recreated during task creation; please retry`);
+                    throw new ApiError(409, `Agent ${input.preferredAgentId} or an Agent Team member is being deleted or recreated during task creation; please retry`);
                 }
                 return this.persistQueuedTask(queued, reason, input.preferredAgentId);
             };
@@ -6186,7 +6151,6 @@ export class AgentManager {
             if (!lockToken) {
                 return persistQueuedOrReject('agent_locked');
             }
-            // Three-step transaction (queued task → binding → in_progress): any failure leaves at worst a queued task and/or a stale binding to it, both reclaimable — never an active task with no binding.
             const releaseLock = async () => {
                 try {
                     await this.lockManager.releaseIfOwner(target.id, taskId, lockToken);
@@ -6219,7 +6183,6 @@ export class AgentManager {
                         ...(existing?.paneId !== undefined ? { paneId: existing.paneId } : {}),
                         ...(existing?.workdir !== undefined ? { workdir: existing.workdir } : {}),
                         ...(existing?.creationToken !== undefined ? { creationToken: existing.creationToken } : {}),
-                        // A new task never inherits the previous one's question: void the watermark.
                         needInput: { epoch: (existing?.needInput?.epoch ?? 0) + 1 },
                     };
                 });
@@ -6232,7 +6195,6 @@ export class AgentManager {
                 await releaseLock();
                 return (await this.taskStore.get(taskId)) ?? queued;
             }
-            // Binding-before-active: a DELETE slipping in after the binding commit sees a still-'pending' task and can rotate the lock; re-verify lock ownership + preferred/participant generations before the active write, else roll back.
             if (this.isDeletionInFlight(target.id)
                 || !this.deletionGateOpen(target.id, genAtEntry)
                 || !participantsFresh()
@@ -6285,6 +6247,9 @@ export class AgentManager {
     }
     async createAndStartTask(projectId, input, opts = {}) {
         const task = await this.createTask(projectId, input);
+        return this.startCreatedTask(task, opts);
+    }
+    async startCreatedTask(task, opts = {}) {
         if (task.status === 'in_progress' && task.agentId) {
             const signalToken = createSignalToken();
             await this.updateTask(task.id, this.dispatchTokenFields(signalToken));
@@ -6378,8 +6343,6 @@ export class AgentManager {
         const cfg = this.getAgentConfig(agentId);
         if (!cfg)
             throw new ApiError(404, `Unknown agent: ${agentId}`);
-        // Pin the incarnation before reading paneId: paneId equality is ABA-blind (a recreate reuses %0), so a
-        // DELETE→same-id recreate during the upload would otherwise paste the stale image into the new session.
         const genAtEntry = this.deletionGenerationOf(agentId);
         const state = await this.agentStore.get(agentId);
         const paneId = state?.paneId;
@@ -6413,7 +6376,6 @@ export class AgentManager {
             await assertUploadStillValid();
             const tmux = new TmuxManager(runner);
             const pane = await this.resolveClaimedPane(tmux, agentId, paneId);
-            // resolveClaimedPane resolved by the CURRENT same-name session; re-verify once more before injecting so a DELETE→recreate in that gap can't take the paste.
             await assertUploadStillValid();
             await tmux.injectPrompt(pane, `${path} `, agentId);
             return { path };
@@ -6465,7 +6427,7 @@ export class AgentManager {
             await tmux.sendKeysLiteral(pane, command);
             await tmux.sendEnter(pane);
             guardHandedOff = true;
-            void this.waitForReplPromptReady(tmux, pane, cfg.runtime, this.compactIdleWaitMs)
+            void this.outsideTaskMutationScope(() => this.waitForReplPromptReady(tmux, pane, cfg.runtime, this.compactIdleWaitMs))
                 .catch(err => {
                 console.warn(`[AgentManager] sendSlashCommand(${agentId}, ${command}) post idle wait failed:`, err);
             })
@@ -6486,9 +6448,6 @@ export class AgentManager {
     }
     registerPendingDispatchRetry(taskId, entry, budgetOverride) {
         const prev = this.pendingDispatchRetryByTask.get(taskId);
-        // 预算随登记代走：同 kind 但 pass 换代（token/agent 变化）时必须重置 since 与告警标志。
-        // budgetOverride 供对账内部重排延续同一笔欠投递的预算——它只经 startSession 的 armedToken
-        // fence 注入，外部 successor 的登记结构上拿不到
         const sameGeneration = prev?.kind === entry.kind
             && prev.agentId === entry.agentId
             && prev.signalToken === entry.signalToken;
@@ -6511,6 +6470,16 @@ export class AgentManager {
     clearPendingDispatchRetry(taskId) {
         this.pendingDispatchRetryByTask.delete(taskId);
     }
+    resetPendingDispatchRetryBudget(taskId) {
+        const entry = this.pendingDispatchRetryByTask.get(taskId);
+        if (!entry)
+            return;
+        this.pendingDispatchRetryByTask.set(taskId, {
+            ...entry,
+            since: Date.now(),
+            budgetAlerted: undefined,
+        });
+    }
     clearPendingDispatchRetryIfMatches(taskId, expected) {
         const entry = this.pendingDispatchRetryByTask.get(taskId);
         if (entry?.agentId === expected.agentId && entry.signalToken === expected.signalToken) {
@@ -6528,8 +6497,6 @@ export class AgentManager {
             return null;
         if (phase !== 'review' && phase !== 'recheck')
             return null;
-        // 无本次派发的 pass 令牌就不登记（宁走既有失败路径，不造无 fence 重试）；
-        // 令牌漂移说明 pass 已被接管，忙碌属于旧派发，不得登记到 successor 上
         const passToken = dispatch.passToken;
         if (!passToken)
             return null;
@@ -6652,7 +6619,6 @@ export class AgentManager {
                     error: `Task ${taskId} has no preferredAgentId; agentId is required in request body`,
                 };
             }
-            // Capture generation before the first config/state read so a DELETE→same-id recreate in the read→commit window fails the gate.
             const genAtEntry = this.deletionGenerationOf(agentId);
             const cfg = this.getAgentConfig(agentId);
             if (!cfg)
@@ -6683,22 +6649,21 @@ export class AgentManager {
             }
             const now = new Date().toISOString();
             const initiallyUnassigned = fresh.preferredAgentId === '';
-            const group = initiallyUnassigned ? this.findAgentGroup(agentId) : undefined;
+            const team = initiallyUnassigned ? this.findAgentTeam(agentId) : undefined;
             const devId = initiallyUnassigned
-                ? group?.find(agent => agent.role === 'dev')?.id
+                ? team?.find(agent => agent.role === 'dev')?.id
                 : fresh.devAgentId;
             if (!devId) {
                 await this.lockManager.releaseIfOwner(agentId, taskId, lockToken);
-                return { task: fresh, errorCode: 409, error: `Agent ${agentId} has no dev agent in its group` };
+                return { task: fresh, errorCode: 409, error: `Agent ${agentId} has no dev agent in its Agent Team` };
             }
             const qaId = initiallyUnassigned
-                ? group?.find(agent => agent.role === 'qa')?.id
+                ? team?.find(agent => agent.role === 'qa')?.id
                 : fresh.qaAgentId;
             if (!qaId) {
                 await this.lockManager.releaseIfOwner(agentId, taskId, lockToken);
-                return { task: fresh, errorCode: 409, error: `Agent ${agentId} has no qa agent in its group` };
+                return { task: fresh, errorCode: 409, error: `Agent ${agentId} has no qa agent in its Agent Team` };
             }
-            // Pin every participant's generation (mirror createTask) so a member deleted→recreated before the active write isn't baked in.
             const participantGens = new Map([devId, qaId]
                 .map(pid => [pid, this.deletionGenerationOf(pid)]));
             const participantsFresh = () => [...participantGens].every(([pid, gen]) => this.deletionGenerationOf(pid) === gen && !this.isDeletionInFlight(pid));
@@ -6712,8 +6677,6 @@ export class AgentManager {
                 status: 'in_progress',
                 updatedAt: now,
             };
-            // Binding-first: the fresh task snapshot already exists on disk, so a failure at any later
-            // step leaves at worst a stale binding to a still-unclaimed task — an existing reclaimable state.
             const releaseLock = async () => {
                 try {
                     await this.lockManager.releaseIfOwner(agentId, taskId, lockToken);
@@ -6739,7 +6702,6 @@ export class AgentManager {
                         ...(existing?.paneId !== undefined ? { paneId: existing.paneId } : {}),
                         ...(existing?.workdir !== undefined ? { workdir: existing.workdir } : {}),
                         ...(existing?.creationToken !== undefined ? { creationToken: existing.creationToken } : {}),
-                        // A new task never inherits the previous one's question: void the watermark.
                         needInput: { epoch: (existing?.needInput?.epoch ?? 0) + 1 },
                     };
                 });
@@ -6752,7 +6714,6 @@ export class AgentManager {
                 await releaseLock();
                 return { task: fresh, errorCode: 409, error: `Agent ${agentId} is being deleted` };
             }
-            // Re-verify lock ownership + preferred/participant generations before the active write, else a DELETE after the binding commit orphans it.
             if (this.isDeletionInFlight(agentId)
                 || !this.deletionGateOpen(agentId, genAtEntry)
                 || !participantsFresh()
@@ -6883,7 +6844,6 @@ export class AgentManager {
         const agent = this.getAgentConfig(agentId);
         if (!agent)
             throw new Error(`Unknown agent: ${agentId}`);
-        // Pin the incarnation: a DELETE completing during dispatch bumps this, and every gated commit/side-effect below refuses the stale generation.
         const genAtEntry = this.deletionGenerationOf(agentId);
         const task = await this.taskStore.get(taskId);
         if (!task)
@@ -6930,8 +6890,6 @@ export class AgentManager {
             return false;
         }
         const assertOwner = async () => {
-            // Also gate on the entry generation: a DELETE→same-id recreate can pass the task/lock check on the
-            // reused binding, so every Workdir/runtime side-effect guarded by assertOwner must fail closed on it.
             if (!this.deletionGateOpen(agentId, genAtEntry)) {
                 throw new Error(`Agent ${agentId} is being deleted or was recreated for task ${taskId}; operation aborted`);
             }
@@ -7049,7 +7007,6 @@ export class AgentManager {
         await this.agentStore.update(agentId, (stateNow) => {
             if (!stateNow || stateNow.taskId !== taskId)
                 return AGENT_STORE_NOOP;
-            // Watermark stays: the arm-time epoch bump owns superseding the old question.
             return {
                 ...stateNow,
                 paneId,
@@ -7131,7 +7088,6 @@ export class AgentManager {
                     cancelHoldWon = true;
                     return AGENT_STORE_NOOP;
                 }
-                // Binding must already exist and still hold our lock; never re-create a deleted agent's state nor write under a bumped deletion generation (ABA).
                 if (!existing || existing.taskId !== taskId || existing.lockToken !== lockToken
                     || !this.deletionGateOpen(agentId, genAtEntry)) {
                     deletedDuringDispatch = true;
@@ -7162,10 +7118,6 @@ export class AgentManager {
                 return false;
             }
             agentMarkedRunning = true;
-            // armed pass 的 fence 延伸到最终 paste：checkout//clear/artifacts 的 await 窗口里 pass 可被
-            // push/其他 dispatcher 轮换，旧 prompt 不得注入 successor；guard 在 composer/paste/Enter
-            // 的 task-mutation 队列槽内复核（与轮换串行），漂移即放弃投递。
-            // cancel 只写终态不轮换 token，故 fence 须同时复核任务仍处本相位的可投递状态
             const passDeliverableStatuses = opts.dialogFailFromStatuses ?? PHASE_EXPECTED_STATUS[phase] ?? [...ACTIVE_TASK_STATUSES];
             const passStillArmed = opts.dispatchPassToken !== undefined
                 ? async () => {
@@ -7187,8 +7139,6 @@ export class AgentManager {
                 console.warn(`[AgentManager] startSession[${phase}]: injection fenced off (pass superseded) for task ${taskId}`);
                 return false;
             }
-            // prompt 已确认投递：只 CAS 清理本次派发那一代的登记；successor 在窗口内登记的新 pending 不受影响，
-            // 且清理先于可失败的审计事件——事件写失败不能把已投递的 prompt 重新变回 pending
             if (opts.dispatchPassToken !== undefined) {
                 this.clearPendingDispatchRetryIfMatches(taskId, { agentId, signalToken: opts.dispatchPassToken });
             }
@@ -7215,8 +7165,6 @@ export class AgentManager {
             return true;
         }
         catch (err) {
-            // 注入阶段的忙碌（预注入活回合检查）仍在任何按键之前：登记 pending 并保持 checkout/绑定原样，
-            // 在途回合还在使用该工作树，park/release 会拽走它
             const injectBusyPend = await this.queueQaBusyPendingRetry(taskId, agentId, phase, ensure.createdSession, err, { passToken: opts.dispatchPassToken, pendingBudget: opts.dispatchPendingBudget });
             if (injectBusyPend)
                 throw injectBusyPend;
@@ -7322,7 +7270,6 @@ export class AgentManager {
     }
     async injectAndAwaitAckSteps(tmux, pane, prompt, agentId, runtime, revalidate, guardBeforePaste) {
         const paneId = pane.paneId;
-        // 静态忙信号（文本忙样式/working title）可能是残稿或 stale title 冒充，一律由帧活性仲裁；ready 视图覆盖 stale title。
         const preTitle = await tmux.readPaneTitle(pane);
         const preFrame = await tmux.capturePaneById(pane, { ansi: false, scrollback: 0 });
         const staticBusy = hasOscTitleWorking(preTitle)
@@ -7333,12 +7280,10 @@ export class AgentManager {
         }
         await revalidate?.();
         if (guardBeforePaste) {
-            // A stale replay must not touch the pane at all: the guard runs before the first composer scrub.
             if (!(await guardBeforePaste())) {
                 return { acked: false, composerDelivered: false, aborted: true };
             }
             const staged = await tmux.stagePromptBuffer(paneId, prompt, agentId);
-            // Fence + scrub + paste share one task-mutation-queue slot, so a rotation lands before or after, never between.
             let pasted = false;
             try {
                 pasted = await this.withTaskLock(async () => {
@@ -7350,7 +7295,6 @@ export class AgentManager {
                 });
             }
             catch (pasteErr) {
-                // Buffer still present proves the paste never landed; missing/unprobeable fails closed to a composer scrub.
                 let bufferConsumed = true;
                 try {
                     await tmux.dropStagedBuffer(staged.buf);
@@ -7390,7 +7334,6 @@ export class AgentManager {
             baseline = await tmux.captureSettledSnapshot(pane, { timeoutMs: this.dispatchSettleTimeoutMs });
             baselineTitle = await tmux.readPaneTitle(pane);
             if (guardBeforePaste) {
-                // The Enter is the actual submission; it takes the same fenced queue slot.
                 const submitted = await this.withTaskLock(async () => {
                     if (!(await guardBeforePaste()))
                         return false;
@@ -7402,7 +7345,6 @@ export class AgentManager {
                         await tmux.clearComposerDraft(pane);
                     }
                     catch (err) {
-                        // Fail closed: a submit-ready stale prompt could not be confirmed gone.
                         const message = err instanceof Error ? err.message : String(err);
                         throw new Error(`fence-rejected prompt could not be scrubbed from the composer of pane ${paneId}; verify the pane before reuse: ${message}`);
                     }
@@ -7426,7 +7368,6 @@ export class AgentManager {
                 baselineTitle,
                 resend: guardBeforePaste
                     ? async () => {
-                        // A resend is a fresh submission of whatever sits in the composer; it takes the same fence.
                         const resent = await this.withTaskLock(async () => {
                             if (!(await guardBeforePaste()))
                                 return false;
@@ -7588,8 +7529,6 @@ export class AgentManager {
                 await branches.assertClean(verifiedWorkdir);
             const actualRef = await branches.currentRef(verifiedWorkdir);
             if (actualRef !== `refs/heads/${task.branch}`) {
-                // dev 可能已被释放过（如 spec max_rounds 停驻默认分支）；switchToTaskBranch 自带
-                // assertClean，脏树时抛 DirtyWorkdirError fail-closed，不会覆盖未提交的改动
                 await this.assertTaskGeneration(agentId, taskId, lockToken, verifiedWorkdir);
                 await branches.switchToTaskBranch(verifiedWorkdir, taskId, task.branch, task.branchCreatedByBaxian === true, {
                     requireExistingWork: true,
@@ -7662,7 +7601,6 @@ export class AgentManager {
             return false;
         }
         await this.assertTaskLockOwner(agentId, taskId, lockToken);
-        // A revoke marks before clearing and a push transitions before clearing; every half-window must abort the paste.
         const postApprovePassStillLive = async () => {
             const [taskFresh, completionFresh] = await Promise.all([
                 this.taskStore.get(taskId),
@@ -7720,9 +7658,6 @@ export class AgentManager {
                 || latest.workdir !== verifiedWorkdir) {
                 return AGENT_STORE_NOOP;
             }
-            // The continuation prompt supersedes the previous question, but the arm-time
-            // epoch bump owns that transition — stripping here would race an arm that
-            // already re-established the watermark (post-approve arms before injecting).
             return {
                 ...latest,
                 paneId,
@@ -7835,7 +7770,6 @@ export class AgentManager {
             return { ...rest, updatedAt: new Date().toISOString() };
         });
     }
-    // continueSession never runs startSession's post-ack finalization; a surviving marker would make recover() roll the running task back to pending.
     async finalizeReplayedBootstrap(agentId, taskId, phase, expectedLockToken) {
         let cleared = false;
         let deliveredWorkdir;
@@ -8045,10 +7979,10 @@ export class AgentManager {
                     if (await this.rollbackUndeliveredBootstrap(state))
                         continue;
                     await this.markDialogPending(state.id, state.creationToken);
-                    void this.slowPollDialogPending(state.id, state.creationToken, {
+                    void this.outsideTaskMutationScope(() => this.slowPollDialogPending(state.id, state.creationToken, {
                         ...(state.paneId !== undefined ? { expectedPaneId: state.paneId } : {}),
                         expectedTaskId: state.taskId,
-                    }).catch((pollErr) => {
+                    })).catch((pollErr) => {
                         console.warn(`[recover] slowPoll for ${state.id} crashed:`, pollErr);
                     });
                     continue;
@@ -8190,8 +8124,6 @@ export class AgentManager {
             if (this.markCompleteInFlight.has(taskId)) {
                 throw new ApiError(409, `Task ${taskId} is being completed (merge in progress); try again shortly`);
             }
-            // 终态不早退：状态不再改写，但残留的 pane/绑定（上次清理中途失败）仍走同一条强制清理路径。
-            // 唯一例外：清理已在进行中的重复取消——重跑只会重复中断同一批 pane，等它收尾即可。
             const alreadyTerminal = TERMINAL_STATUSES.includes(task.status);
             if (alreadyTerminal && this.cancelCleanupInFlight.has(taskId))
                 return task;
@@ -8238,10 +8170,8 @@ export class AgentManager {
             cleanupClaimed = true;
             return task;
         });
-        // stop again post-write: a rollback may have re-armed between the pre-lock stop() and the cancelled write
         if (cleanupClaimed)
             this.phaseSignalWatcher?.stop(taskId);
-        // 两阶段：先中断全部 pane 再释放任一 binding，避免 dev 先空闲、被派新任务时旧任务的 qa prompt 仍在跑。
         try {
             const stopped = [];
             for (const id of [devToRelease, qaToRelease]) {
@@ -8638,6 +8568,169 @@ export class AgentManager {
             return dispatched;
         }
     }
+    async advanceTask(taskId, opts = {}) {
+        let task = await this.taskStore.get(taskId);
+        if (!task)
+            throw new ApiError(404, `Task ${taskId} not found`);
+        const executor = opts.executor ?? (task.status === 'review' ? 'qa' : 'dev');
+        let updated;
+        if (task.status === 'pending') {
+            if (executor !== 'dev')
+                throw new ApiError(409, 'Pending tasks can only advance to Dev');
+            const result = await this.dispatchPendingTask(taskId, opts.agentId);
+            if (result.errorCode !== undefined)
+                throw new ApiError(result.errorCode, result.error ?? 'Dispatch failed');
+            if (!result.task)
+                throw new ApiError(404, `Task ${taskId} disappeared during dispatch`);
+            updated = result.task;
+        }
+        else if (executor === 'qa') {
+            if (task.status !== 'in_progress' && task.status !== 'fixing' && task.status !== 'review') {
+                throw new ApiError(409, `Task ${taskId} cannot advance to QA from ${task.status}`);
+            }
+            updated = await this.dispatchReviewToQa(taskId, {
+                fromStatus: [task.status],
+                confirmUncertainNotDelivered: true,
+                ...(opts.stage !== undefined ? { stage: opts.stage } : {}),
+                ...(opts.actorId !== undefined ? { actorId: opts.actorId } : {}),
+                ...(opts.prNumber !== undefined ? { prNumber: opts.prNumber } : {}),
+            });
+        }
+        else if (task.status === 'review') {
+            throw new ApiError(409, 'Review cannot advance to Dev without a request-changes verdict');
+        }
+        else if (task.status === 'in_progress' || task.status === 'fixing') {
+            if (!task.devAgentId)
+                throw new ApiError(409, `Task ${taskId} has no Dev participant`);
+            const replayed = await this.redispatchTaskPromptAfterReplRestart(task.devAgentId, taskId);
+            if (!replayed)
+                throw new ApiError(409, `Task ${taskId} changed or its Dev prompt could not be replayed`);
+            updated = (await this.taskStore.get(taskId)) ?? task;
+        }
+        else if (task.status === 'approved') {
+            if (!task.devAgentId)
+                throw new ApiError(409, `Task ${taskId} has no Dev participant`);
+            if (task.postApproveRevoked) {
+                if (opts.confirmRevoked !== true) {
+                    throw new ApiError(409, `Task ${taskId} post-approve replay is revoked; confirmRevoked=true is required`);
+                }
+                task = await this.restoreRevokedPostApprove(task);
+            }
+            const replayed = await this.redispatchTaskPromptAfterReplRestart(task.devAgentId, taskId);
+            if (!replayed)
+                throw new ApiError(409, `Task ${taskId} changed or its post-approve prompt could not be replayed`);
+            updated = (await this.taskStore.get(taskId)) ?? task;
+        }
+        else {
+            throw new ApiError(409, `Task ${taskId} cannot be advanced from ${task.status}`);
+        }
+        await this.auditHumanTaskOperation(updated, 'advance', executor, opts.note);
+        return updated;
+    }
+    async restoreRevokedPostApprove(task) {
+        if (!task.postApproveRevoked || task.prNumber === undefined) {
+            throw new ApiError(409, `Task ${task.id} has no revoked post-approve episode`);
+        }
+        const [binding, accepted] = await Promise.all([
+            this.platformVerifyPrBinding(task.id, task.prNumber),
+            this.platformVerifyAcceptedPass(task.id),
+        ]);
+        if (!binding.ok) {
+            throw new ApiError(409, `Cannot restore task ${task.id}: PR binding ${binding.reason}`);
+        }
+        if (accepted.kind !== 'valid') {
+            throw new ApiError(409, `Cannot restore task ${task.id}: ${accepted.reason}`);
+        }
+        if (accepted.pendingCount > 0) {
+            throw new ApiError(409, `Cannot restore task ${task.id}: the accepted pass has pending feedback`);
+        }
+        const reviewedPass = task.passProvenance;
+        if (!reviewedPass || binding.headSha.toLowerCase() !== reviewedPass.anchorSha.toLowerCase()) {
+            throw new ApiError(409, `Cannot restore task ${task.id}: the current PR head is not the accepted head`);
+        }
+        return this.withTaskLock(async () => {
+            const fresh = await this.taskStore.get(task.id);
+            if (!fresh || fresh.status !== 'approved'
+                || fresh.postApproveRevoked?.generation !== task.postApproveRevoked.generation
+                || fresh.prNumber !== task.prNumber
+                || !samePassProvenance(fresh.passProvenance, reviewedPass)) {
+                throw new ApiError(409, `Task ${task.id} changed while restoring post-approve replay`);
+            }
+            const generation = createSignalToken();
+            const token = createSignalTokenExcluding(generation);
+            const next = {
+                ...this.stripPostApproveEpisodeFields(fresh),
+                postApproveGeneration: generation,
+                postApproveHeadSha: binding.headSha,
+                postApproveToken: token,
+                postApprovePhase: 'installed',
+                pendingRedispatch: true,
+                redispatchCount: 0,
+                updatedAt: new Date().toISOString(),
+            };
+            await this.taskStore.set(next);
+            return next;
+        });
+    }
+    async submitTaskVerdict(taskId, action, comments, note) {
+        const task = await this.taskStore.get(taskId);
+        if (!task)
+            throw new ApiError(404, `Task ${taskId} not found`);
+        let updated;
+        if (task.status === 'spec-ready'
+            || (task.status === 'max_rounds' && isSpecStagePhase(task.phase))) {
+            if (action !== 'approve' && action !== 'request-changes') {
+                throw new ApiError(409, `Task ${taskId} requires a spec approve or request-changes verdict`);
+            }
+            updated = await this.submitSpecVerdict(taskId, action, comments);
+        }
+        else if (task.status === 'review' && !isSpecStagePhase(task.phase)) {
+            if (action !== 'pass' && action !== 'request-changes') {
+                throw new ApiError(409, `Task ${taskId} requires a code pass or request-changes verdict`);
+            }
+            updated = await this.submitCodeVerdict(taskId, action, comments);
+        }
+        else if (task.status === 'max_rounds') {
+            if (action === 'continue')
+                updated = await this.continueDevRound(taskId);
+            else if (action === 'complete')
+                updated = await this.markTaskComplete(taskId);
+            else
+                throw new ApiError(409, `Task ${taskId} requires continue or complete at code max_rounds`);
+        }
+        else if (task.status === 'merge-ready') {
+            if (action !== 'confirm-merge') {
+                throw new ApiError(409, `Task ${taskId} requires confirm-merge`);
+            }
+            updated = await this.markTaskComplete(taskId);
+        }
+        else {
+            throw new ApiError(409, `Task ${taskId} cannot accept a verdict from ${task.status}`);
+        }
+        await this.auditHumanTaskOperation(updated, 'verdict', action, note);
+        return updated;
+    }
+    async auditHumanTaskOperation(task, operation, action, note, details = {}) {
+        const emitted = await this.safeEmit({
+            id: '',
+            type: 'task.updated',
+            timestamp: new Date().toISOString(),
+            projectId: task.projectId,
+            ...(task.agentId ? { agentId: task.agentId } : {}),
+            taskId: task.id,
+            data: {
+                ...details,
+                operation,
+                action,
+                actor: 'human',
+                provenance: 'human',
+                note: note?.trim() || `${operation}:${action}`,
+            },
+        });
+        if (!emitted) {
+            throw new ApiError(500, `Task ${task.id} ${operation} completed, but its audit event could not be persisted; verify the task state before retrying`);
+        }
+    }
     async dispatchGitFixToDev(taskId) {
         const task = await this.taskStore.get(taskId);
         if (!task || task.status !== 'fixing')
@@ -8730,7 +8823,7 @@ export class AgentManager {
         const devState = await this.agentStore.get(devAgentId);
         if (devState?.taskId !== taskId || !devState.workdir) {
             throw new ApiError(409, `Dev ${devAgentId} no longer holds task ${taskId}'s Workdir (cannot continue); ` +
-                `use mark-complete to merge the PR as-is, or cancel the task`);
+                `submit a complete verdict to merge the PR as-is, or cancel the task`);
         }
         const prevReviewRound = task.reviewRound;
         const transitioned = await this.transitionTaskStatus(taskId, 'fixing', { fromStatus: ['max_rounds'] }, { reviewRound: prevReviewRound + 1, fixDispatchedAt: new Date().toISOString() });
@@ -8822,26 +8915,53 @@ export class AgentManager {
             const t = await this.taskStore.get(taskId);
             if (!t)
                 throw new ApiError(404, 'Task not found');
-            const retryable = TERMINAL_STATUSES.includes(t.status)
-                || (t.status === 'max_rounds' && isSpecStagePhase(t.phase));
-            if (!retryable) {
+            if (!TERMINAL_STATUSES.includes(t.status)) {
                 throw new ApiError(409, `Task ${taskId} cannot be retried in status "${t.status}"; cancel it first or wait for completion`);
             }
+            if (t.replacementTaskId !== undefined) {
+                throw new ApiError(409, `Task ${taskId} was already retried as ${t.replacementTaskId}`);
+            }
+            if (this.retryTaskInFlight.has(taskId)) {
+                throw new ApiError(409, `Task ${taskId} retry is already in progress`);
+            }
+            this.retryTaskInFlight.add(taskId);
             return t;
         });
-        const input = {
-            title: old.title,
-            description: old.description,
-            preferredAgentId: this.resolveRetryPreferredAgentId(old),
-        };
-        if (old.images?.length) {
-            input.images = await this.readStagedImages(old.id, old.images);
+        try {
+            const input = {
+                title: old.title,
+                description: old.description,
+                preferredAgentId: this.resolveRetryPreferredAgentId(old),
+            };
+            if (old.images?.length) {
+                input.images = await this.readStagedImages(old.id, old.images);
+            }
+            await this.validateTaskDispatch(old.projectId, input);
+            const replacement = await this.createTask(old.projectId, input);
+            await this.withTaskLock(async () => {
+                const source = await this.taskStore.get(taskId);
+                if (!source)
+                    throw new ApiError(404, `Task ${taskId} disappeared while recording its retry`);
+                if (source.replacementTaskId !== undefined && source.replacementTaskId !== replacement.id) {
+                    throw new ApiError(409, `Task ${taskId} was already retried as ${source.replacementTaskId}`);
+                }
+                const next = {
+                    ...source,
+                    replacementTaskId: replacement.id,
+                    updatedAt: new Date().toISOString(),
+                };
+                if (old.attention !== undefined
+                    && source.attention?.reason === old.attention.reason
+                    && source.attention.occurredAt === old.attention.occurredAt) {
+                    delete next.attention;
+                }
+                await this.taskStore.set(next);
+            });
+            return this.startCreatedTask(replacement);
         }
-        await this.validateTaskDispatch(old.projectId, input);
-        if (!TERMINAL_STATUSES.includes(old.status)) {
-            await this.cancelTask(old.id);
+        finally {
+            this.retryTaskInFlight.delete(taskId);
         }
-        return this.createAndStartTask(old.projectId, input);
     }
     resolveRetryPreferredAgentId(task) {
         const configured = this.getAgentConfig(task.preferredAgentId);
@@ -8851,7 +8971,7 @@ export class AgentManager {
         const anchors = new Set([task.qaAgentId, task.devAgentId, task.agentId]
             .filter((agentId) => typeof agentId === 'string' && agentId !== ''));
         for (const anchor of anchors) {
-            const dev = this.findAgentGroup(anchor)?.find(agent => TASK_OWNER_ROLES.has(agent.role));
+            const dev = this.findAgentTeam(anchor)?.find(agent => TASK_OWNER_ROLES.has(agent.role));
             const current = dev ? this.getAgentConfig(dev.id) : undefined;
             if (current?.projectId === task.projectId)
                 return current.id;
@@ -8893,13 +9013,13 @@ export class AgentManager {
                     }
                     if (!TASK_OWNER_ROLES.has(cfg.role))
                         throw new ApiError(400, 'Agent is not a dev agent');
-                    const group = this.findAgentGroup(cfg.id);
-                    const dev = group?.find(agent => agent.role === 'dev');
+                    const team = this.findAgentTeam(cfg.id);
+                    const dev = team?.find(agent => agent.role === 'dev');
                     if (!dev)
-                        throw new ApiError(409, `Agent ${cfg.id} has no dev agent in its group`);
-                    const qa = group?.find(agent => agent.role === 'qa');
+                        throw new ApiError(409, `Agent ${cfg.id} has no dev agent in its Agent Team`);
+                    const qa = team?.find(agent => agent.role === 'qa');
                     if (!qa)
-                        throw new ApiError(409, `Agent ${cfg.id} has no qa agent in its group`);
+                        throw new ApiError(409, `Agent ${cfg.id} has no qa agent in its Agent Team`);
                     task.preferredAgentId = patch.preferredAgentId;
                     task.devAgentId = dev.id;
                     task.qaAgentId = qa.id;
@@ -8937,22 +9057,22 @@ export class AgentManager {
                 throw new ApiError(409, `Task ${taskId} is not at max_rounds (status=${task.status})`);
             }
             if (isSpecStagePhase(task.phase)) {
-                throw new ApiError(409, `Mark complete is only supported for code-phase tasks`);
+                throw new ApiError(409, `Complete verdict is only supported for code-phase tasks`);
             }
             if (!task.prNumber || !task.branch) {
-                throw new ApiError(400, `Task ${taskId} has no PR/branch; cannot mark complete`);
+                throw new ApiError(400, `Task ${taskId} has no PR/branch; cannot complete`);
             }
             for (const agentId of [task.agentId, task.qaAgentId]) {
                 if (!agentId)
                     continue;
                 const state = await this.agentStore.get(agentId);
                 if (state?.status === 'awaiting_human' && state.taskId === taskId) {
-                    throw new ApiError(409, `Agent ${agentId} is awaiting human intervention on this task; resume/restart/delete it before marking complete`);
+                    throw new ApiError(409, `Agent ${agentId} is awaiting human intervention on this task; resume/restart/delete it before completing`);
                 }
             }
             const claimed = await this.transitionTaskStatus(taskId, 'merge-ready', { fromStatus: ['max_rounds'] });
             if (!claimed) {
-                throw new ApiError(409, `Task ${taskId} changed status during mark-complete; aborted`);
+                throw new ApiError(409, `Task ${taskId} changed status during complete verdict; aborted`);
             }
             try {
                 await this.mergePr(taskId, { humanOverride: true });
@@ -9005,8 +9125,6 @@ export class AgentManager {
         const agent = this.getAgentConfig(agentId);
         if (!agent)
             return;
-        // Pin the incarnation before the first state/paneId read: paneId equality is ABA-blind (a recreated
-        // agent reuses %0), so a DELETE→same-id recreate would otherwise let post-merge /clear hit a new session.
         const genAtEntry = this.deletionGenerationOf(agentId);
         const state = await this.agentStore.get(agentId);
         if (!state)
@@ -9062,7 +9180,6 @@ export class AgentManager {
                 return;
             }
         }
-        // A DELETE→recreate (gen bump) before this pane work must skip it, or /clear lands on the new incarnation's reused pane.
         if (!this.deletionGateOpen(agentId, genAtEntry))
             return;
         const runner = this.createRunnerFor(agent);
@@ -9284,15 +9401,11 @@ export class AgentManager {
                 return;
             }
             if (Date.now() >= deadline) {
-                // 与 stableIdle 分支同一类型：忙碌超时是「常态忙」而非故障，调用方（release/派发）
-                // 据此延后重排；菜单/对话框/REPL 退出等仍是普通 Error，不得被当成可延后
                 throw new ReplNotReadyError(paneId, runtime, cap, `stayed busy past ${timeoutMs}ms`);
             }
             await new Promise(r => setTimeout(r, this.compactIdlePollMs));
         }
     }
-    // 注入前置门：codex 忙碌回合的工具间隙会闪现单帧 idle footer（#558 事故放大器），
-    // 连续 K 帧稳定就绪才放行，任何忙碌/不确定帧清零计数；超时按忙碌分类抛 ReplNotReadyError。
     async waitForReplPromptStableIdle(tmux, pane, runtime, timeoutMs) {
         const paneId = pane.paneId;
         const samples = Math.max(1, this.readyStableSamples);
@@ -9370,8 +9483,6 @@ export class AgentManager {
     async armPostDispatchSignalOrHold(taskId, agentId, expectedKinds, token, skipSnapshot = false) {
         const armed = await this.setupPhaseSignalWatcher(taskId, agentId, expectedKinds, token, {
             skipSnapshot,
-            // Every post-dispatch arm follows a freshly injected prompt: the previous
-            // question is superseded, its watermark must not carry over.
             needInputMode: 'fresh',
         });
         if (!armed)
@@ -9471,6 +9582,247 @@ export class AgentManager {
         }
         return parked;
     }
+    async submitCodeVerdict(taskId, verdict, comments) {
+        const trimmed = comments?.trim() ?? '';
+        if (verdict === 'request-changes' && !trimmed) {
+            throw new ApiError(400, 'comments is required for request-changes');
+        }
+        if (extractReviewTokens(trimmed).length > 0) {
+            throw new ApiError(400, 'comments must not contain baxian review markers');
+        }
+        const task = await this.withTaskLock(async () => {
+            const fresh = await this.taskStore.get(taskId);
+            if (!fresh)
+                throw new ApiError(404, `Task ${taskId} not found`);
+            const pending = this.codeVerdictOutbox(fresh);
+            const kind = verdict === 'pass' ? 'pass' : 'fail';
+            if (pending !== undefined
+                && (pending.data.kind !== kind || pending.data.comments !== trimmed)) {
+                throw new ApiError(409, `Task ${taskId} has a different code verdict already in progress`);
+            }
+            if (pending === undefined && (fresh.status !== 'review' || isSpecStagePhase(fresh.phase))) {
+                throw new ApiError(409, `Task ${taskId} is not awaiting a code review verdict`);
+            }
+            if (this.codeVerdictInFlight.has(taskId)) {
+                throw new ApiError(409, `Task ${taskId} code verdict is already being processed`);
+            }
+            this.codeVerdictInFlight.add(taskId);
+            return fresh;
+        });
+        try {
+            return await this.executeCodeVerdict(task, verdict, trimmed);
+        }
+        finally {
+            this.codeVerdictInFlight.delete(taskId);
+        }
+    }
+    codeVerdictCommentBody(entry) {
+        const lines = [
+            entry.data.kind === 'pass'
+                ? 'Human code verdict: pass'
+                : 'Human code verdict: request changes',
+        ];
+        if (entry.data.comments)
+            lines.push('', entry.data.comments);
+        lines.push('', buildReviewTokenLine({
+            kind: entry.data.kind,
+            anchorSha: entry.data.anchorSha,
+            token: entry.data.token,
+        }));
+        const body = lines.join('\n');
+        try {
+            validateCommentBody(body);
+        }
+        catch (err) {
+            throw new ApiError(400, `Invalid code verdict comment: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        return body;
+    }
+    async scanCodeVerdictMarker(driver, entry, oppositeToken) {
+        const scans = await this.platformScanComments(driver, entry.data.prNumber);
+        if (scans.some(scan => !scan.ok))
+            return 'unknown';
+        const dead = deadTokens(scans);
+        if (dead.has(entry.data.token))
+            return 'dead';
+        let present = false;
+        let opposite = false;
+        for (const scan of scans) {
+            for (const row of scan.rows) {
+                if (row.system === true || versionTimeOf(row) === undefined)
+                    continue;
+                for (const marker of rowTokens(row)) {
+                    if (dead.has(marker.token))
+                        continue;
+                    if (marker.anchorSha.toLowerCase() !== entry.data.anchorSha.toLowerCase())
+                        continue;
+                    if (marker.kind === entry.data.kind && marker.token === entry.data.token)
+                        present = true;
+                    if (marker.kind !== entry.data.kind && marker.token === oppositeToken)
+                        opposite = true;
+                }
+            }
+        }
+        if (opposite)
+            return 'opposite';
+        return present ? 'present' : 'absent';
+    }
+    async reconcileCodeVerdictComment(driver, entry) {
+        const expectedDigest = bodyDigest(this.codeVerdictCommentBody(entry));
+        const scans = await this.platformScanComments(driver, entry.data.prNumber);
+        if (scans.some(scan => !scan.ok))
+            return 'unknown';
+        if (deadTokens(scans).has(entry.data.token))
+            return 'dead';
+        if (scans.some(scan => scan.rows.some(row => row.system !== true
+            && versionTimeOf(row) !== undefined
+            && row.bodyDigest === expectedDigest)))
+            return 'present';
+        return 'absent';
+    }
+    async verifyCodeVerdictHead(taskId, prNumber, anchorSha) {
+        try {
+            const binding = await this.platformVerifyPrBinding(taskId, prNumber);
+            if (!binding.ok)
+                return { ok: false, reason: `the PR binding is ${binding.reason}` };
+            if (binding.headSha.toLowerCase() !== anchorSha.toLowerCase()) {
+                return { ok: false, reason: 'the PR head changed' };
+            }
+            return { ok: true };
+        }
+        catch (err) {
+            throw new ApiError(503, `Cannot verify code verdict head for task ${taskId}: ${safeDriverErrorText(err)}`);
+        }
+    }
+    async deliverCodeVerdictOutbox(taskId, key) {
+        let task = await this.taskStore.get(taskId);
+        let entry = task ? this.codeVerdictOutbox(task) : undefined;
+        if (!task || !entry || entry.key !== key)
+            return;
+        const driver = this.platformDriverFor(task.projectId);
+        if (!driver)
+            throw new ApiError(503, `Git driver unavailable for task ${task.id}`);
+        const binding = await this.verifyCodeVerdictHead(task.id, entry.data.prNumber, entry.data.anchorSha);
+        if (!binding.ok) {
+            await this.mutateTaskOutboxEntry(task.id, key, current => current.type === 'git.code-verdict' ? undefined : null);
+            throw new ApiError(409, `Cannot write code verdict for task ${task.id}: ${binding.reason}`);
+        }
+        if (entry.data.writeAttemptedAt !== undefined) {
+            const reconciled = await this.reconcileCodeVerdictComment(driver, entry);
+            if (reconciled === 'dead') {
+                await this.mutateTaskOutboxEntry(task.id, key, current => current.type === 'git.code-verdict' ? undefined : null);
+                throw new ApiError(409, `Code verdict token for task ${task.id} was dismissed; advance QA to create a new review pass`);
+            }
+            if (reconciled === 'present') {
+                return;
+            }
+            if (reconciled === 'unknown'
+                || Date.now() - Date.parse(entry.data.writeAttemptedAt) < driver.visibilityLagMs) {
+                throw new ApiError(503, `Code verdict comment outcome is still being reconciled for task ${task.id}`);
+            }
+        }
+        const expectedAttempt = entry.data.writeAttemptedAt;
+        const claimed = await this.mutateTaskOutboxEntry(task.id, entry.key, current => current.type === 'git.code-verdict' && current.data.writeAttemptedAt === expectedAttempt
+            ? { ...current, data: { ...current.data, writeAttemptedAt: new Date().toISOString() } }
+            : null);
+        const claimedEntry = claimed ? this.codeVerdictOutbox(claimed) : undefined;
+        if (!claimed || claimedEntry?.key !== entry.key) {
+            throw new ApiError(503, `Code verdict comment write is already claimed for task ${task.id}`);
+        }
+        task = claimed;
+        entry = claimedEntry;
+        let writeFailure;
+        try {
+            await driver.runOp('comment', {
+                prNumber: entry.data.prNumber,
+                body: this.codeVerdictCommentBody(entry),
+            });
+        }
+        catch (error) {
+            writeFailure = { error };
+        }
+        const reconciled = await this.reconcileCodeVerdictComment(driver, entry);
+        if (reconciled === 'dead') {
+            await this.mutateTaskOutboxEntry(task.id, key, current => current.type === 'git.code-verdict' ? undefined : null);
+            throw new ApiError(409, `Code verdict token for task ${task.id} was dismissed; advance QA to create a new review pass`);
+        }
+        if (writeFailure !== undefined && reconciled !== 'present') {
+            const { error } = writeFailure;
+            const uncertain = !(error instanceof DriverOpError)
+                || error.info.exitCode === 255
+                || isTransientNetworkFailure(error.info.stderrTail ?? '')
+                || isTransientNetworkFailure(error.message);
+            if (reconciled === 'unknown' || uncertain) {
+                throw new ApiError(503, `Code verdict comment outcome is unknown for task ${task.id}; the persisted outbox will reconcile it`);
+            }
+            await this.mutateTaskOutboxEntry(task.id, key, current => current.type === 'git.code-verdict' ? undefined : null);
+            throw new ApiError(502, `Code verdict comment was rejected for task ${task.id}: ${safeDriverErrorText(error)}`);
+        }
+        if (reconciled !== 'present') {
+            throw new ApiError(503, `Code verdict comment is not yet visible for task ${task.id}; the persisted outbox will reconcile it`);
+        }
+    }
+    async executeCodeVerdict(task, verdict, comments) {
+        if (task.status !== 'review' || isSpecStagePhase(task.phase)
+            || task.prNumber === undefined || task.reviewHeadAnchorSha === undefined
+            || task.passToken === undefined || task.failToken === undefined) {
+            throw new ApiError(409, `Task ${task.id} has no complete code review generation`);
+        }
+        const kind = verdict === 'pass' ? 'pass' : 'fail';
+        const token = kind === 'pass' ? task.passToken : task.failToken;
+        const existingEntry = this.codeVerdictOutbox(task);
+        const entry = existingEntry ?? {
+            key: token,
+            type: 'git.code-verdict',
+            data: {
+                prNumber: task.prNumber,
+                kind,
+                anchorSha: task.reviewHeadAnchorSha,
+                token,
+                comments,
+            },
+        };
+        this.codeVerdictCommentBody(entry);
+        const driver = this.platformDriverFor(task.projectId);
+        if (!driver)
+            throw new ApiError(503, `Git driver unavailable for task ${task.id}`);
+        const binding = await this.verifyCodeVerdictHead(task.id, task.prNumber, task.reviewHeadAnchorSha);
+        if (!binding.ok) {
+            throw new ApiError(409, `Cannot submit code verdict for task ${task.id}: ${binding.reason}`);
+        }
+        if (existingEntry === undefined) {
+            const marker = await this.scanCodeVerdictMarker(driver, entry, kind === 'pass' ? task.failToken : task.passToken);
+            if (marker === 'present')
+                return task;
+            if (marker === 'opposite') {
+                throw new ApiError(409, `Task ${task.id} already has the opposite verdict on the current review head`);
+            }
+            if (marker === 'dead') {
+                throw new ApiError(409, `Code verdict token for task ${task.id} was dismissed; advance QA to create a new review pass`);
+            }
+            if (marker === 'unknown') {
+                throw new ApiError(503, `Cannot safely check existing code verdict comments for task ${task.id}`);
+            }
+            const created = await this.withTaskLock(async () => {
+                const fresh = await this.taskStore.get(task.id);
+                if (!fresh || !taskMatchesGeneration(fresh, taskGenerationGuard(task))
+                    || this.codeVerdictOutbox(fresh) !== undefined)
+                    return null;
+                const next = {
+                    ...fresh,
+                    outbox: [...(fresh.outbox ?? []), entry],
+                    updatedAt: new Date().toISOString(),
+                };
+                await this.taskStore.set(next);
+                return next;
+            });
+            if (!created)
+                throw new ApiError(409, `Task ${task.id} changed while recording the code verdict`);
+            task = created;
+        }
+        await this.deliverCodeVerdictOutbox(task.id, entry.key);
+        return (await this.taskStore.get(task.id)) ?? task;
+    }
     async submitSpecVerdict(taskId, verdict, comments) {
         const trimmed = comments?.trim();
         if (verdict === 'request-changes' && !trimmed) {
@@ -9812,7 +10164,6 @@ export class AgentManager {
             return null;
         }
         const newToken = createSignalToken();
-        // spec 阶段的扩轮决策不延续到 code 评审：cap 共享字段，进入编码时归零
         const transition = await this.transitionTaskStatus(taskId, 'in_progress', {
             fromStatus: ['review', 'fixing', 'in_progress', 'spec-ready', 'max_rounds'],
             ...(expectedTask !== undefined ? { expectTask: expectedTask } : {}),
@@ -9868,8 +10219,6 @@ export class AgentManager {
             }
             else if (err instanceof EnsureSessionError && err.partial.handled
                 && (task.status === 'spec-ready' || task.status === 'max_rounds')) {
-                // dev 已被 checkout/dialog hold 且 prompt 未送达；resumeAgent 不重派这些 hold，
-                // 任务停在 in_progress 会同时封死 Resume 与 verdict——退回 verdict 门禁状态
                 const rolledBack = await this.transitionTaskStatus(taskId, task.status, { fromStatus: ['in_progress'] }, {
                     ...(task.phase !== undefined ? { phase: task.phase } : {}),
                     agentId: task.agentId,
@@ -9881,8 +10230,6 @@ export class AgentManager {
                         + 'moved on; leaving its status as-is');
                 }
                 else if (!devBoundBefore) {
-                    // 转码前 dev 未持有本任务（如 max_rounds 重占用）：任务已退回
-                    // verdict 门禁，释放本次新占用，否则 dev 会被回退后的任务永久占住
                     const released = await this.releaseAgentForTask(devAgentId, taskId, 'idle', { allowAwaitingHuman: true })
                         .catch(() => false);
                     if (!released) {
@@ -9907,8 +10254,6 @@ export class AgentManager {
             });
             return null;
         }
-        // 重占用（released dev）的 acquire 会写 bootstrappingTaskId，而 continueSession 不做
-        // startSession 的 post-ack finalize；残留标记会让 recover 把已运行的任务按未送达回滚
         await this.finalizeReplayedBootstrap(devAgentId, taskId, 'code', acquiredLockToken);
         return await this.taskStore.get(taskId);
     }
@@ -9916,7 +10261,6 @@ export class AgentManager {
         const cfg = this.getAgentConfig(agentId);
         if (!cfg)
             throw new Error(`injectTextToAgent: unknown agent ${agentId}`);
-        // Pin the incarnation before reading state so a DELETE→recreate reusing %0 can't route the text to the new session.
         const genAtEntry = this.deletionGenerationOf(agentId);
         await this.acquireCompactGuard(agentId);
         try {
@@ -9953,7 +10297,6 @@ export class AgentManager {
             }
             const tmux = new TmuxManager(this.createRunnerFor(cfg));
             const pane = await this.resolveClaimedPane(tmux, agentId, paneId);
-            // resolveClaimedPane resolved by the CURRENT same-name session; re-verify incarnation + binding before paste (same as the image path).
             if (!this.deletionGateOpen(agentId, genAtEntry)) {
                 throw new Error(`injectTextToAgent: agent ${agentId} was deleted or recreated before paste`);
             }
@@ -10119,7 +10462,6 @@ export class AgentManager {
         }
     }
     startCompactionThenRelease(agentId, state, taskId) {
-        // 人工介入/重建中的 pane 不发 /clear;confirm 语义要求解绑,落回直接释放
         const expectedPaneId = state.paneId;
         if (!expectedPaneId || state.status === 'awaiting_human' || state.creationToken)
             return false;
@@ -10137,8 +10479,8 @@ export class AgentManager {
 function buildAgentIndex(config) {
     const index = new Map();
     for (const project of config.project) {
-        for (const pair of project.agent) {
-            for (const agent of pair) {
+        for (const team of project.agent) {
+            for (const agent of team) {
                 index.set(agent.id, { ...agent, projectId: project.id });
             }
         }