baxian 1.2.0 → 1.2.2

package/dist/agent/manager.js

@@ -2,7 +2,7 @@ import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { createSignalToken } from './phase-signal.js';
-import { BRANCH_PREFIX, PHASE_EXPECTED_STATUS, PHASE_REQUIRES_AGENT_BOUND_TO_TASK, TASK_TERMINAL_STATUSES as TERMINAL_STATUSES, TASK_ACTIVE_STATUS_SET as ACTIVE_TASK_STATUSES, } from '../shared/index.js';
+import { BRANCH_PREFIX, PHASE_EXPECTED_STATUS, PHASE_REQUIRES_AGENT_BOUND_TO_TASK, TASK_TERMINAL_STATUSES as TERMINAL_STATUSES, TASK_ACTIVE_STATUS_SET as ACTIVE_TASK_STATUSES, isGitHubRepo, repoSlug, } from '../shared/index.js';
 import { AGENT_STORE_NOOP } from '../state/agent-store.js';
 import { PostApproveStore } from '../state/post-approve-store.js';
 import { SkillRegistry } from '../skill/registry.js';
@@ -73,7 +73,7 @@ function agentRuntimeKindFor(agent) {
 }
 const DEFAULT_DISPATCH_ACK_TIMEOUT_MS = 30_000;
 const DEFAULT_DISPATCH_SETTLE_TIMEOUT_MS = 3_000;
-// Dev-facing deliverable phases that weave the task's uploaded image paths into the prompt (task-055).
+// Dev-facing deliverable phases that weave the task's uploaded image paths into the prompt.
 const IMAGE_DISPATCH_PHASES = new Set(['develop', 'code', 'fix', 'server-feedback']);
 export function canDispatchWithBinding(binding) {
     return !binding?.taskId && !binding?.creationToken && binding?.status !== 'awaiting_human';
@@ -121,7 +121,7 @@ export class AgentManager {
     dispatchAckTimeoutMs;
     dispatchSettleTimeoutMs;
     // Re-send Enter after this long of continuous post-paste idle — recovers a swallowed first Enter
-    // (task-071) without risking a double-submit (a real submit goes busy well within this window).
+    // without risking a double-submit (a real submit goes busy well within this window).
     dispatchAckResendIntervalMs = 3_000;
     taskMutationQueue = Promise.resolve();
     agentIndex;
@@ -185,12 +185,32 @@ export class AgentManager {
     getReviewStore() {
         return this.reviewStore;
     }
+    // Non-GitHub repos are forced to server review mode — there is no platform PR/review
+    // to map onto. GitHub honors the global config. Snapshotted per-task at creation.
+    effectiveReviewMode(projectId) {
+        const project = this.getProjectConfig(projectId);
+        if (project && !isGitHubRepo(project.repo))
+            return 'server';
+        return this.config.review.mode ?? 'github';
+    }
     // Snapshot-aware afterDone read: an EXPLICIT null snapshot must win over hot
-    // config — `??` would swallow it and reroute an already-decided task (PR #288).
+    // config — `??` would swallow it and reroute an already-decided task.
     resolveAfterDone(task) {
         if (task.afterDone !== undefined)
             return task.afterDone;
-        return this.config.review.afterDone ?? null;
+        return this.coerceAfterDone(task.projectId, this.config.review.afterDone);
+    }
+    // Non-GitHub repos have no PR platform: 'pr' degrades to 'branch' (push + optional
+    // ff-merge). An unset afterDone defaults to 'branch' so reviewed work actually reaches
+    // the remote; an explicit null still means "don't publish". GitHub is unchanged.
+    coerceAfterDone(projectId, configured) {
+        const project = this.getProjectConfig(projectId);
+        if (project && !isGitHubRepo(project.repo)) {
+            if (configured === 'pr' || configured === undefined)
+                return 'branch';
+            return configured;
+        }
+        return configured ?? null;
     }
     getReviewTransport() {
         this.reviewTransportInstance ??= new ReviewTransport({
@@ -564,7 +584,7 @@ export class AgentManager {
             if (!discoveredPaneId)
                 return false;
             const probeNow = new Date().toISOString();
-            // 撤销 updatedAt guard（round-13 codex review）：updatedAt 太宽，正常 background updates
+            // 不用 updatedAt guard：updatedAt 太宽，正常 background updates
             // (repoPath refresh / poller bump 等) 也会触发假阳性让合法 retry dialog 路径误拒。
             // race ("DELETE+recreate 后旧回调写新 agent") 在持锁路径下是 theoretical (retry endpoint 持锁
             // 全程到 handleDialogPendingFromRuntime 返回；startSession/continueSession 由 acquireAgentForTask
@@ -601,7 +621,7 @@ export class AgentManager {
             // fromStatus 来自 caller 显式计算：startSession/continueSession 用 opts.dialogFailFromStatuses ??
             // PHASE_EXPECTED_STATUS[phase]，dispatchReviewToQa 走 bypassTaskStatusGate 时显式传 [taskStatusAtClaim]
             // (manual review 入口可能是 approved/fixing/in_progress，但 phase='review' 的 default 只接受 'review' →
-            // 不传就 skip → task 卡 active 死锁，见 owner round-15 评审)。
+            // 不传就 skip → task 卡 active 死锁)。
             const expectedFromStatuses = opts.expectedFromStatuses ?? [...ACTIVE_TASK_STATUSES];
             const transitioned = await this.transitionTaskStatus(state.taskId, 'failed', { fromStatus: expectedFromStatuses });
             if (transitioned) {
@@ -1220,7 +1240,7 @@ export class AgentManager {
             // code-dispatch-failed: the code-phase prompt never reached the pane (spec
             // approval already transitioned the task). Resume = clear the hold AND
             // redispatch the code prompt (outside this lock) — without the redispatch
-            // the task would stay in_progress with nothing running (PR #288).
+            // the task would stay in_progress with nothing running.
             if (state.awaitingPhase === 'code-dispatch-failed'
                 && boundTask && ACTIVE_TASK_STATUSES.has(boundTask.status)
                 && state.taskId) {
@@ -1413,7 +1433,7 @@ export class AgentManager {
                 const bound = t.agentId === agentId || t.qaAgentId === agentId;
                 // Human gates are decision states, not running work: an absent agent
                 // session must not terminally fail a task whose published PR/branch
-                // would then be orphaned — Confirm/Cancel remain the only exits (PR #288).
+                // would then be orphaned — Confirm/Cancel remain the only exits.
                 if (t.status === 'ready' || t.status === 'merge-ready')
                     continue;
                 if (ACTIVE_TASK_STATUSES.has(t.status) && bound) {
@@ -1655,7 +1675,7 @@ export class AgentManager {
         return this.config.project.find(p => p.id === projectId);
     }
     getProjectByRepo(repo) {
-        return this.config.project.find(p => p.repo === repo);
+        return this.config.project.find(p => repoSlug(p.repo) === repo);
     }
     findQaPartner(devAgentId) {
         for (const project of this.config.project) {
@@ -1845,10 +1865,11 @@ export class AgentManager {
         // Three independent endpoints — fetch concurrently, not back-to-back. Reviews
         // cover the same-identity `gh pr review --comment` reply path (a PR review with
         // a body, surfaced via submitted_at, not an inline/issue comment).
+        const repo = repoSlug(project.repo);
         const [inlineReplies, issueComments, reviews] = await Promise.all([
-            this.ghCreatedAt(`repos/${project.repo}/pulls/${task.prNumber}/comments`, '.[] | select(.in_reply_to_id != null) | .created_at'),
-            this.ghCreatedAt(`repos/${project.repo}/issues/${task.prNumber}/comments`, '.[].created_at'),
-            this.ghCreatedAt(`repos/${project.repo}/pulls/${task.prNumber}/reviews`, '.[] | select(.submitted_at != null) | .submitted_at'),
+            this.ghCreatedAt(`repos/${repo}/pulls/${task.prNumber}/comments`, '.[] | select(.in_reply_to_id != null) | .created_at'),
+            this.ghCreatedAt(`repos/${repo}/issues/${task.prNumber}/comments`, '.[].created_at'),
+            this.ghCreatedAt(`repos/${repo}/pulls/${task.prNumber}/reviews`, '.[] | select(.submitted_at != null) | .submitted_at'),
         ]);
         const stamps = [...inlineReplies, ...issueComments, ...reviews];
         return stamps.some(ts => {
@@ -1876,7 +1897,7 @@ export class AgentManager {
         if (!project) {
             throw new Error(`fetchPrHeadSha: unknown project ${task.projectId}`);
         }
-        const result = await this.platformRunner.exec(`gh pr view ${task.prNumber} --repo ${shellQuote(project.repo)} --json headRefOid --jq .headRefOid`);
+        const result = await this.platformRunner.exec(`gh pr view ${task.prNumber} --repo ${shellQuote(repoSlug(project.repo))} --json headRefOid --jq .headRefOid`);
         if (result.exitCode !== 0) {
             throw new Error(`gh pr view failed for PR #${task.prNumber}: ${result.stderr || result.stdout}`);
         }
@@ -1900,7 +1921,7 @@ export class AgentManager {
         const project = this.getProjectConfig(task.projectId);
         if (!project)
             return undefined;
-        const result = await this.platformRunner.exec(`gh pr view ${prNumber} --repo ${shellQuote(project.repo)} --json headRefName,headRefOid --jq '.headRefName + "\\t" + .headRefOid'`);
+        const result = await this.platformRunner.exec(`gh pr view ${prNumber} --repo ${shellQuote(repoSlug(project.repo))} --json headRefName,headRefOid --jq '.headRefName + "\\t" + .headRefOid'`);
         if (result.exitCode !== 0)
             return undefined;
         const [headRefName, headSha] = result.stdout.trim().split('\t');
@@ -1979,7 +2000,7 @@ export class AgentManager {
     createRepoStore(agent, project, runner) {
         const host = resolveAgentHost(this.config.host, agent.host);
         if (this.repoStoreFactory) {
-            return this.repoStoreFactory(runner, project.repo, agent.mode, host, this.repoCache);
+            return this.repoStoreFactory(runner, repoSlug(project.repo), agent.mode, host, this.repoCache);
         }
         return new RepoStore(runner, project.repo, agent.mode, host, this.repoCache);
     }
@@ -2059,9 +2080,19 @@ export class AgentManager {
         return this.withTaskLock(async () => {
             const taskId = await this.taskStore.nextId();
             const now = new Date().toISOString();
+            // Server review has no platform fallback: a dev with no QA partner would strand (server mode
+            // is forced for non-GitHub repos). Fail fast BEFORE staging images — a rejected create must not
+            // orphan state/task-images/<taskId> with no TaskState to reclaim it. The dispatch path also
+            // guards (unassigned-claim entry). Unassigned skips this: empty preferredAgentId → no dev config.
+            if (this.getAgentConfig(input.preferredAgentId)?.role === 'dev'
+                && this.effectiveReviewMode(projectId) === 'server'
+                && !this.findQaPartner(input.preferredAgentId)) {
+                throw new ApiError(400, `Project "${projectId}" uses server review mode (forced for non-GitHub repos); ` +
+                    `dev "${input.preferredAgentId}" needs a QA partner — add a QA agent paired with this dev before creating tasks.`);
+            }
             // Stage images first so the task is written + emitted (task.created) WITH its images already
             // on disk — a pending task is never observable, or crash-recoverable, without them. A persist
-            // failure here throws before any store write / lock, so nothing half-created survives (task-055).
+            // failure here throws before any store write / lock, so nothing half-created survives.
             const imageFilenames = input.images?.length
                 ? await this.persistTaskImages(taskId, input.images)
                 : undefined;
@@ -2077,7 +2108,7 @@ export class AgentManager {
                     reviewRound: 0,
                     status: 'pending',
                     branch: BRANCH_PREFIX + taskId,
-                    reviewMode: this.config.review.mode ?? 'github',
+                    reviewMode: this.effectiveReviewMode(projectId),
                     createdAt: now,
                     updatedAt: now,
                     ...(imageFilenames ? { images: imageFilenames } : {}),
@@ -2106,7 +2137,7 @@ export class AgentManager {
                     reviewRound: 0,
                     status: 'pending',
                     branch: BRANCH_PREFIX + taskId,
-                    reviewMode: this.config.review.mode ?? 'github',
+                    reviewMode: this.effectiveReviewMode(projectId),
                     createdAt: now,
                     updatedAt: now,
                     ...(qa ? { qaAgentId: qa.id } : {}),
@@ -2139,7 +2170,7 @@ export class AgentManager {
                     reviewRound: 0,
                     status: 'pending',
                     branch: BRANCH_PREFIX + taskId,
-                    reviewMode: this.config.review.mode ?? 'github',
+                    reviewMode: this.effectiveReviewMode(projectId),
                     createdAt: now,
                     updatedAt: now,
                     ...(qa ? { qaAgentId: qa.id } : {}),
@@ -2171,7 +2202,7 @@ export class AgentManager {
                 reviewRound: 0,
                 status: 'in_progress',
                 branch: BRANCH_PREFIX + taskId,
-                reviewMode: this.config.review.mode ?? 'github',
+                reviewMode: this.effectiveReviewMode(projectId),
                 createdAt: now,
                 updatedAt: now,
                 ...(imageFilenames ? { images: imageFilenames } : {}),
@@ -2203,7 +2234,7 @@ export class AgentManager {
     }
     async createAndStartTask(projectId, input, opts = {}) {
         // createTask stages images atomically before the task is visible (store + task.created),
-        // so a pending task can never be observed — or crash-recovered — without its images (task-055).
+        // so a pending task can never be observed — or crash-recovered — without its images.
         const task = await this.createTask(projectId, input);
         if (task.status === 'in_progress' && task.agentId) {
             // Persist token first — prompt build 和 watcher 验证共用 task.signalToken。
@@ -2294,7 +2325,7 @@ export class AgentManager {
         }
         return (await this.taskStore.get(taskId)) ?? null;
     }
-    /** task-055 entry A: write an uploaded image to the running agent's host, paste its path (no Enter). */
+    /** Write an uploaded image to the running agent's host, paste its path (no Enter). */
     async attachImageToRunningAgent(agentId, bytes, ext) {
         const cfg = this.getAgentConfig(agentId);
         if (!cfg)
@@ -2320,8 +2351,7 @@ export class AgentManager {
             this.compactInFlight.delete(agentId);
         }
     }
-    // busy 时注入会把指令拼进正在运行的回合，宁可 409。
-    async compactAgent(agentId) {
+    async sendSlashCommand(agentId, command) {
         const cfg = this.getAgentConfig(agentId);
         if (!cfg)
             throw new ApiError(404, `Unknown agent: ${agentId}`);
@@ -2344,7 +2374,7 @@ export class AgentManager {
                     || now.paneId !== paneId
                     || now.taskId !== taskIdAtStart
                     || now.updatedAt !== updatedAtAtStart) {
-                    throw new ApiError(409, `Agent ${agentId} session changed while waiting; compact aborted`);
+                    throw new ApiError(409, `Agent ${agentId} session changed while waiting; ${command} aborted`);
                 }
             };
             const tmux = new TmuxManager(this.createRunnerFor(cfg));
@@ -2359,18 +2389,22 @@ export class AgentManager {
             };
             await waitReady();
             await assertSessionUnchanged();
-            // 残留草稿会被「草稿/compact」连带提交；C-c 清线后再发。
             await tmux.sendKeysToPane(paneId, 'C-c');
             await waitReady();
             await assertSessionUnchanged();
-            await tmux.sendKeysLiteral(paneId, '/compact');
+            await tmux.sendKeysLiteral(paneId, command);
             await tmux.sendEnter(paneId);
-            // 压缩仍在运行：guard 交给后台尾随等待，runtime 回到 idle 才释放，
-            // 否则紧随的上传/派发会粘进压缩中的 pane。
+            if (command === '/clear') {
+                await this.agentStore.update(agentId, (s) => {
+                    if (!s)
+                        return AGENT_STORE_NOOP;
+                    return { ...s, injectedSkills: undefined };
+                });
+            }
             guardHandedOff = true;
             void this.waitForReplPromptReady(tmux, paneId, cfg.runtime, this.compactIdleWaitMs)
                 .catch(err => {
-                console.warn(`[AgentManager] compactAgent(${agentId}) post-/compact idle wait failed:`, err);
+                console.warn(`[AgentManager] sendSlashCommand(${agentId}, ${command}) post idle wait failed:`, err);
             })
                 .finally(() => {
                 this.compactInFlight.delete(agentId);
@@ -2381,6 +2415,12 @@ export class AgentManager {
                 this.compactInFlight.delete(agentId);
         }
     }
+    async compactAgent(agentId) {
+        return this.sendSlashCommand(agentId, '/compact');
+    }
+    async clearAgent(agentId) {
+        return this.sendSlashCommand(agentId, '/clear');
+    }
     async persistTaskImages(taskId, images) {
         const dir = join(this.imageStagingRoot, taskId);
         await mkdir(dir, { recursive: true });
@@ -2392,7 +2432,7 @@ export class AgentManager {
         }
         return filenames;
     }
-    // Retry reads staged bytes up-front; a missing source is a visible 409, never a silent drop (task-055).
+    // Retry reads staged bytes up-front; a missing source is a visible 409, never a silent drop.
     async readStagedImages(taskId, filenames) {
         const dir = join(this.imageStagingRoot, taskId);
         const out = [];
@@ -2410,7 +2450,7 @@ export class AgentManager {
         return out;
     }
     // Materialize staged task images onto the agent host at dispatch; absolute host paths get
-    // woven into the prompt. Missing staging aborts the dispatch loudly (no silent skip, task-055).
+    // woven into the prompt. Missing staging aborts the dispatch loudly (no silent skip).
     async materializeTaskImages(runner, task) {
         const filenames = task.images ?? [];
         if (filenames.length === 0)
@@ -2434,7 +2474,7 @@ export class AgentManager {
     // Dev-facing deliverable phases all carry the task's uploaded images, since the image is a
     // persistent task input the dev needs while producing or revising the spec/code — and a fresh
     // runtime (restart/recovery) loses the original context. IMAGE_DISPATCH_PHASES 中的后续阶段经
-    // continueSession 触发此方法；QA 阶段和 post-approve 不传图（task-055）。
+    // continueSession 触发此方法；QA 阶段和 post-approve 不传图。
     async imagePathsForDispatch(runner, task, phase) {
         if (!IMAGE_DISPATCH_PHASES.has(phase))
             return [];
@@ -2653,6 +2693,14 @@ export class AgentManager {
         const hasQaPartner = !!(task.qaAgentId ?? this.findQaPartner(agentId)?.id);
         let prompt;
         try {
+            // Server review has no platform fallback: a dev with no QA partner would emit a
+            // completion signal nobody consumes and the task strands (server mode is forced
+            // for non-GitHub repos via effectiveReviewMode). Enforce at this single dispatch
+            // chokepoint — the catch below removes the worktree, then the task fails cleanly.
+            if (task.reviewMode === 'server' && !hasQaPartner) {
+                throw new DispatchTerminalError('server_review_needs_qa', `Task ${task.id} runs in server review mode but dev "${agentId}" has no QA partner; ` +
+                    `pair a QA agent with this dev (server review has no platform fallback to absorb the verdict).`);
+            }
             const imagePaths = await this.imagePathsForDispatch(runner, task, phase);
             prompt = buildPromptInline({
                 task,
@@ -2775,7 +2823,7 @@ export class AgentManager {
             }
             // dedup baseline 记录的是「已 paste 进 idle composer 的 skill 文本」：paste 落入 composer 即进
             // REPL 上下文，与 submit-ack 无关。ack 超时（首个 Enter 被吞）下 skill 仍在 composer，跳过落盘会让
-            // 下一轮整组重注入——正是 task-071 的 SKILLS 重复注入。但 composerDelivered=false（paste 时 pane
+            // 下一轮整组重注入——即 SKILLS 重复注入。但 composerDelivered=false（paste 时 pane
             // 已 busy，文本进了运行中输入流而非 composer）则不能落盘，否则恢复提示会缺必需 skill。freshRuntime
             // 负责 REPL 真正重启时作废 baseline。
             if (ack.composerDelivered) {
@@ -2905,7 +2953,7 @@ export class AgentManager {
             });
             // "pane already busy at baseline" means the paste landed on an already-running input stream,
             // NOT an idle composer — the skills did NOT become context, so callers must not record them
-            // as injected (codex 3345468647). Any other timeout (idle composer / swallowed Enter) did
+            // as injected. Any other timeout (idle composer / swallowed Enter) did
             // deliver the prompt text into the composer.
             const composerDelivered = !/pane already busy at baseline/.test(message);
             return { acked: false, composerDelivered };
@@ -3028,7 +3076,7 @@ export class AgentManager {
                 && opts.postApproveRedispatchCount > 0
                 && !ensure.freshRuntime;
             // code phase (post spec-approval) flows through here, not startSession — materialize the
-            // task's uploaded images so a fresh code-phase context still sees their paths (task-055).
+            // task's uploaded images so a fresh code-phase context still sees their paths.
             const imagePaths = await this.imagePathsForDispatch(runner, task, phase);
             prompt = buildPromptInline({
                 task,
@@ -3440,7 +3488,7 @@ export class AgentManager {
         let qaToRelease;
         // Server-mode ready gate may have already published remote artifacts
         // (pushed branch / open PR). Capture before flipping to cancelled so the
-        // post-lock cleanup can retire them instead of orphaning (PR #288).
+        // post-lock cleanup can retire them instead of orphaning.
         // mayBeInFlight: approved+marker means the publish prompt may STILL be
         // running — retirement must wait for the dev interrupt or the in-flight
         // push/pr-create would recreate the artifacts right after cleanup.
@@ -3484,7 +3532,7 @@ export class AgentManager {
                 }
             }
             else if (task.status === 'merge-ready' && task.prNumber !== undefined && task.branch && task.agentId) {
-                // GitHub-mode gate cancel leaves the same orphaned PR/branch (PR #288).
+                // GitHub-mode gate cancel leaves the same orphaned PR/branch.
                 publishedCleanup = {
                     afterDone: 'pr',
                     branch: task.branch,
@@ -3570,7 +3618,7 @@ export class AgentManager {
             const project = this.getProjectConfig(result.projectId);
             try {
                 if (publishedCleanup.afterDone === 'pr' && publishedCleanup.prNumber !== undefined && project) {
-                    const close = await this.platformRunner.exec(`gh pr close ${publishedCleanup.prNumber} --repo ${shellQuote(project.repo)} ` +
+                    const close = await this.platformRunner.exec(`gh pr close ${publishedCleanup.prNumber} --repo ${shellQuote(repoSlug(project.repo))} ` +
                         `--comment ${shellQuote('Task cancelled in baxian; closing the published PR.')} --delete-branch`);
                     if (close.exitCode !== 0)
                         throw new Error(close.stderr.trim() || close.stdout.trim());
@@ -3605,7 +3653,7 @@ export class AgentManager {
         }
         return result;
     }
-    // task-044 重构：create-time 不再校验 awaiting_human / creating / bound —— 这些都是"忙"，
+    // create-time 不再校验 awaiting_human / creating / bound —— 这些都是"忙"，
     // 允许入队（落 pending）；可执行性判断下沉到 dispatchPendingTask（或 createTask 已空闲分支）。
     // 仍保留：agent 存在/同 project/role=dev（非空时）+ prompt size 上界。
     async validateTaskDispatch(projectId, input) {
@@ -3868,7 +3916,7 @@ export class AgentManager {
             throw new ApiError(409, `Continue one round is only supported for code-phase tasks`);
         }
         // Server-mode continue: grant one round past the cap, then re-run the server
-        // fix protocol from the stored findings — no PR exists at this point (PR #288).
+        // fix protocol from the stored findings — no PR exists at this point.
         if (task.reviewMode === 'server') {
             if (!task.agentId) {
                 throw new ApiError(400, `Task ${taskId} has no dev agent; cannot continue`);
@@ -4070,7 +4118,7 @@ export class AgentManager {
             return { expectedKinds: ['spec-fixed'], agentId: task.agentId };
         }
         if (task.phase !== 'spec' && task.status === 'fixing' && task.agentId) {
-            // Code-track fixing: dev emits pr-fixed when the round is done (task-060).
+            // Code-track fixing: dev emits pr-fixed when the round is done.
             return { expectedKinds: ['pr-fixed'], agentId: task.agentId };
         }
         if (task.phase === undefined && task.status === 'in_progress' && task.agentId) {
@@ -4156,7 +4204,7 @@ export class AgentManager {
             preferredAgentId: old.preferredAgentId,
         };
         // Retry preserves uploaded images: read the old task's staged bytes up-front
-        // (missing → visible 409 before any new task/binding is created). task-055.
+        // (missing → visible 409 before any new task/binding is created).
         if (old.images?.length) {
             input.images = await this.readStagedImages(old.id, old.images);
         }
@@ -4222,14 +4270,14 @@ export class AgentManager {
         const matchHead = opts.matchHeadSha
             ? ` --match-head-commit ${shellQuote(opts.matchHeadSha)}`
             : '';
-        const result = await this.platformRunner.exec(`gh pr merge ${task.prNumber} --repo ${shellQuote(project.repo)}${matchHead} --squash --delete-branch`);
+        const result = await this.platformRunner.exec(`gh pr merge ${task.prNumber} --repo ${shellQuote(repoSlug(project.repo))}${matchHead} --squash --delete-branch`);
         if (result.exitCode !== 0) {
             throw new Error(`gh pr merge failed for PR #${task.prNumber}: ${result.stderr || result.stdout}`);
         }
     }
     // Manually finish a max_rounds task: merge its PR, then reuse the normal merged
     // cleanup chain (pr.merged handler → transition merged + post-merge worktree/branch
-    // cleanup + /compact + release). Same path the poller drives when it detects the merge.
+    // cleanup + /clear + release). Same path the poller drives when it detects the merge.
     async markTaskComplete(taskId) {
         const peek = await this.taskStore.get(taskId);
         if (!peek)
@@ -4247,7 +4295,7 @@ export class AgentManager {
         const task = await this.claimCompleteGate(taskId, ['max_rounds', 'approved']);
         try {
             // Server-mode publish retry: a failed afterDone dispatch leaves the task
-            // 'approved' with dev released — mark-complete re-runs the publish (PR #288).
+            // 'approved' with dev released — mark-complete re-runs the publish.
             const serverApprovedRetry = task.status === 'approved' && task.reviewMode === 'server';
             if (!serverApprovedRetry && task.status !== 'max_rounds') {
                 throw new ApiError(409, `Task ${taskId} is not at max_rounds (status=${task.status})`);
@@ -4267,7 +4315,7 @@ export class AgentManager {
                 // publishDispatchedAt persists delivery across restarts: set = the
                 // prompt reached the pane before the restart (still in flight, 409);
                 // cleared = the dispatch failed and this approved state is retryable —
-                // stop the recovered watch and let the retry own the dispatch (PR #288).
+                // stop the recovered watch and let the retry own the dispatch.
                 if (this.phaseSignalWatcher?.expectedKindsFor(taskId).has('code-ready')) {
                     if (!this.phaseSignalWatcher.isRecovered(taskId) || task.publishDispatchedAt) {
                         throw new ApiError(409, `Task ${taskId} publish is in flight; retry only after it fails`);
@@ -4287,13 +4335,13 @@ export class AgentManager {
                 return (await this.taskStore.get(taskId));
             }
             // Server-mode capped task, human accepts as-is: no PR exists yet — run the
-            // afterDone flow (or finish directly) instead of the legacy PR merge (PR #288).
+            // afterDone flow (or finish directly) instead of the legacy PR merge.
             // Inside the in-flight claim so a concurrent Continue can't act on the same
             // max_rounds snapshot and release dev mid-publish.
             if (task.reviewMode === 'server') {
                 // Max_rounds never routed an approve verdict — snapshot afterDone NOW so
                 // the eventual ready-confirm uses this decision, not future hot config.
-                const afterDone = this.config.review.afterDone ?? null;
+                const afterDone = this.coerceAfterDone(task.projectId, this.config.review.afterDone);
                 await this.updateTask(taskId, { afterDone });
                 if (afterDone === null) {
                     const done = await this.transitionTaskStatus(taskId, 'done', { fromStatus: ['max_rounds'] });
@@ -4364,11 +4412,9 @@ export class AgentManager {
         if (!dev)
             return;
         this.phaseSignalWatcher?.stop(taskId);
-        // Keep the agent BOUND (non-dispatchable) until branch cleanup + /compact finish, then
+        // Keep the agent BOUND (non-dispatchable) until branch cleanup + context reset finish, then
         // release. dispatchPostMergeCleanup owns the whole lifecycle: worktree removal → branch
-        // delete → compact → release. Holding the binding is what stops the Start button (and
-        // dispatchPendingTask) from giving this agent a new task before it has cleaned up and
-        // compacted its context.
+        // delete → /clear (or /compact if cleanup failed) → release.
         if (task.prNumber && task.branch) {
             const ctx = {
                 prNumber: task.prNumber,
@@ -4425,7 +4471,8 @@ export class AgentManager {
         const tmux = new TmuxManager(runner);
         const prompt = buildPostMergeCleanupPrompt(ctx, cleanupResult);
         const runtime = agentRuntimeKindFor(agent);
-        void this.runPostMergeCompaction(tmux, state.paneId, agentId, ctx.taskId, runtime, prompt).catch(err => console.warn(`[AgentManager] runPostMergeCompaction(${agentId}) failed:`, err));
+        const cleanSlate = cleanupResult.outcome === 'deleted' || cleanupResult.outcome === 'absent';
+        void this.runPostMergeCompaction(tmux, state.paneId, agentId, ctx.taskId, runtime, prompt, cleanSlate).catch(err => console.warn(`[AgentManager] runPostMergeCompaction(${agentId}) failed:`, err));
     }
     // Release the post-merge binding (clears taskId + frees the lock we held → agent dispatchable
     // again). Shared success tail. Skips when the binding has already moved to another task, so it
@@ -4442,7 +4489,7 @@ export class AgentManager {
         }
     }
     // Removes the merged worktree but KEEPS taskId on the binding, so the agent remains
-    // non-dispatchable while branch delete + /compact run. Only worktreePath is dropped.
+    // non-dispatchable while branch delete + /clear run. Only worktreePath is dropped.
     async removeMergedWorktree(cfg, agentId, expectedTaskId) {
         await this.withTaskLock(async () => {
             const state = await this.agentStore.get(agentId);
@@ -4507,12 +4554,12 @@ export class AgentManager {
             return { outcome: 'failed', detail };
         }
     }
-    async runPostMergeCompaction(tmux, paneId, agentId, originalTaskId, runtime, prompt) {
+    async runPostMergeCompaction(tmux, paneId, agentId, originalTaskId, runtime, prompt, cleanSlate) {
         // 等待获取（而非无条件 add）：手动 compact 持锁时直接进入会并发注入，
         // 且 finally 会误删对方的 guard 放穿后续请求。
         await this.acquireCompactGuard(agentId);
         try {
-            await this.runPostMergeCompactionSteps(tmux, paneId, agentId, originalTaskId, runtime, prompt);
+            await this.runPostMergeCompactionSteps(tmux, paneId, agentId, originalTaskId, runtime, prompt, cleanSlate);
         }
         finally {
             this.compactInFlight.delete(agentId);
@@ -4529,7 +4576,7 @@ export class AgentManager {
         this.compactInFlight.add(agentId);
         return true;
     }
-    async runPostMergeCompactionSteps(tmux, paneId, agentId, originalTaskId, runtime, prompt) {
+    async runPostMergeCompactionSteps(tmux, paneId, agentId, originalTaskId, runtime, prompt, cleanSlate) {
         const bindingStillOurs = async () => {
             const s = await this.agentStore.get(agentId);
             return !!s && s.taskId === originalTaskId && s.paneId === paneId;
@@ -4553,7 +4600,7 @@ export class AgentManager {
                 await this.waitForReplPromptReady(tmux, paneId, runtime, this.compactIdleWaitMs);
                 if (!await bindingStillOurs())
                     return;
-                await tmux.sendKeysLiteral(paneId, '/compact');
+                await tmux.sendKeysLiteral(paneId, cleanSlate ? '/clear' : '/compact');
                 await tmux.sendEnter(paneId);
                 await new Promise(r => setTimeout(r, this.compactIdlePollMs));
                 await this.waitForReplPromptReady(tmux, paneId, runtime, this.compactIdleWaitMs);
@@ -4834,7 +4881,7 @@ export class AgentManager {
             return null;
         const { qaId, devAgentId, projectId, newToken, newRound } = claim;
         // continueSession failure after the transition would otherwise strand the
-        // task in 'review' with a fresh token nobody will ever signal (PR #288).
+        // task in 'review' with a fresh token nobody will ever signal.
         const rollback = async () => {
             await this.transitionTaskStatus(taskId, claim.originalStatus, { fromStatus: ['review'] }, {
                 signalToken: claim.originalToken,
@@ -4851,7 +4898,7 @@ export class AgentManager {
         // The entry signal (code/spec-done|fixed) was already consumed by the
         // watcher; a pre-transition failure must re-arm it with the unrotated token
         // or the agent's re-emit after the operator fixes availability has no
-        // consumer (PR #288).
+        // consumer.
         const rearmEntrySignal = async () => {
             const entryKind = claim.originalStatus === 'fixing'
                 ? (opts.phase === 'spec' ? 'spec-fixed' : 'code-fixed')
@@ -4935,7 +4982,7 @@ export class AgentManager {
         // A continuation consumed the QA's reviewed signal (not the dev's entry
         // signal): rollback restores the prior slice's review/token, so re-arm the
         // reviewed watcher — the QA's re-emit replays the stored batch findings and
-        // resumes the next-slice dispatch (PR #288).
+        // resumes the next-slice dispatch.
         const rearmConsumedSignal = async () => {
             if (opts.continuation) {
                 await this.setupPhaseSignal(taskId, qaId, expectedKind, { skipSnapshot: true });
@@ -5005,7 +5052,7 @@ export class AgentManager {
                 taskPhase: (task.phase ?? 'code'),
                 currentSpecRound: task.specReviewRound,
                 // Continue-one-round enters from max_rounds — failure must restore THAT,
-                // not silently demote the human's pause decision to 'review' (PR #288).
+                // not silently demote the human's pause decision to 'review'.
                 originalStatus: task.status,
                 originalToken: task.signalToken,
             };
@@ -5101,7 +5148,7 @@ export class AgentManager {
                 await this.releaseAgentForTask(devAgentId, taskId, 'idle').catch(() => undefined);
                 // Rollback restored review/old-token, but the QA's reviewed signal was
                 // consumed — without a subscriber its re-emit can never retry the fix
-                // dispatch (PR #288).
+                // dispatch.
                 await rearmReviewedSignal();
             }
             throw err;
@@ -5137,7 +5184,7 @@ export class AgentManager {
         await this.updateTask(taskId, { signalToken: newToken });
         // The publish prompt never reached the pane — restore the pre-rotation token
         // (so recovery still matches the pre-dispatch arm) and clear the delivery
-        // marker so retry knows this approved state is preemptible (PR #288).
+        // marker so retry knows this approved state is preemptible.
         const rollbackToken = async () => {
             await this.updateTask(taskId, { signalToken: originalToken, publishDispatchedAt: undefined })
                 .catch(() => undefined);
@@ -5160,7 +5207,7 @@ export class AgentManager {
         // path below clears it. The remaining crash window (marker written, paste
         // never ran) fails CLOSED — retry 409s on a publish that never started and
         // the operator escapes via Cancel — instead of the old window's fail-open
-        // double publish (paste ran, marker missing, retry re-pastes) (PR #288).
+        // double publish (paste ran, marker missing, retry re-pastes).
         await this.updateTask(taskId, { publishDispatchedAt: new Date().toISOString() });
         let resumed = false;
         try {
@@ -5268,7 +5315,7 @@ export class AgentManager {
             const project = this.getProjectConfig(task.projectId);
             const mergeAuto = project?.merge === 'auto';
             // Snapshot from verdict time — a hot config flip between publish and
-            // confirm must not reroute an already-published artifact (PR #288).
+            // confirm must not reroute an already-published artifact.
             const afterDone = this.resolveAfterDone(task);
             if (task.status === 'merge-ready') {
                 if (mergeAuto && task.prNumber) {
@@ -5303,7 +5350,7 @@ export class AgentManager {
                     matchHeadSha: task.latestHeadSha,
                 }));
                 // pr.merged's fromStatus now includes 'ready' — let the handler own the
-                // merged transition + full cleanup chain (branch delete, /compact, release).
+                // merged transition + full cleanup chain (branch delete, /clear, release).
                 await this.eventBus.emit({
                     id: '',
                     type: 'pr.merged',
@@ -5347,7 +5394,7 @@ export class AgentManager {
     }
     // Merge failures keep the gate: transient gh/network errors retry via another
     // Confirm, a stale head resolves via Cancel or an external decision — terminal
-    // 'failed' would orphan the published PR/branch outside the task flow (PR #288).
+    // 'failed' would orphan the published PR/branch outside the task flow.
     async executeConfirmMerge(task, merge) {
         try {
             await merge();
@@ -5418,7 +5465,7 @@ export class AgentManager {
             const defaultBranch = db.stdout.trim().replace(/^origin\//, '');
             if (db.exitCode !== 0 || defaultBranch === '') {
                 // A silent 'main' fallback would push the reviewed branch onto the wrong
-                // ref for repos whose default branch differs (PR #288).
+                // ref for repos whose default branch differs.
                 throw new Error(`ffMergeBranch: cannot resolve default branch: ${db.stderr.trim() || 'empty origin/HEAD'}`);
             }
             const fetch = await runner.exec(`${cd}git fetch origin`);
@@ -5426,7 +5473,7 @@ export class AgentManager {
                 throw new Error(`ffMergeBranch [git fetch] failed: ${fetch.stderr.trim()}`);
             }
             // Reviewed-head guard (branch path): refuse if origin/<branch> moved after
-            // the gate — symmetric with the pr path's --match-head-commit (PR #288).
+            // the gate — symmetric with the pr path's --match-head-commit.
             if (task.latestHeadSha) {
                 const remoteHead = await runner.exec(`${cd}git rev-parse ${shellQuote(`origin/${branch}`)}`);
                 if (remoteHead.exitCode !== 0 || remoteHead.stdout.trim() !== task.latestHeadSha) {
@@ -5442,7 +5489,7 @@ export class AgentManager {
                 throw new Error(`ffMergeBranch [push] failed: ${push.stderr.trim() || push.stdout.trim()}`);
             }
             // The merge has landed; branch deletion is cleanup — a transient failure
-            // here must not flip an already-merged task to failed (PR #288).
+            // here must not flip an already-merged task to failed.
             const del = await runner.exec(`${cd}git push origin --delete ${shellQuote(branch)}`);
             if (del.exitCode !== 0) {
                 console.warn(`[AgentManager] ffMergeBranch: post-merge branch delete failed for ${branch}: ${del.stderr.trim() || del.stdout.trim()}`);