@coralai/sps-cli 0.63.5 → 0.65.0

package/dist/manager/makeBackendFactory.js

@@ -8,32 +8,45 @@
  * @boundedContext worker-lifecycle
  */
 import { join } from 'node:path';
-import { loadAgentsConfig } from '../core/intel/agentsConfig.js';
+import { resolveWorkerConfig } from '../core/intel/agentsConfig.js';
 import { resolveBackend } from '../core/agents/resolveBackend.js';
 import { createReviewerModel } from '../providers/llm/modelFactory.js';
+import { getAgentProvider } from '../providers/llm/providers.js';
 /**
- * @param opts.project      项目名(锚定 / transcript 定位)。
- * @param opts.workerModel  项目级 worker model 覆盖(空=用全局默认;来源 conf 的 WORKER_MODEL)。
- * @param opts.logsDir      worker 日志目录(claude-acp)。
- * @param opts.runtimeDir   运行时目录(openai-sdk 的 per-slot sessionFile 落此;claude 不用)。
+ * worker 后端有效配置 = 全局 defaults.json < 项目 conf(WORKER_AGENT/MODE/PROVIDER/MODEL)< SPS_WORKER_* env。
+ * @param opts.project       项目名(锚定 / transcript 定位)。
+ * @param opts.workerModel   项目级 worker model 覆盖(conf WORKER_MODEL)。
+ * @param opts.workerAgent   项目级 worker 后端覆盖(conf WORKER_AGENT:claude|openai)。
+ * @param opts.workerMode    项目级 worker 模式(conf WORKER_MODE:sdk|daemon)。
+ * @param opts.workerProvider 项目级 worker provider(conf WORKER_PROVIDER:codex/…)。
+ * @param opts.logsDir       worker 日志目录。
+ * @param opts.runtimeDir    运行时目录(openai per-slot sessionFile 落此)。
  */
 export function makeBackendFactory(opts) {
-    const agents = loadAgentsConfig();
-    if (opts.workerModel)
-        agents.worker = { ...agents.worker, model: opts.workerModel };
-    return (slot, o) => resolveBackend(agents.worker, {
+    const worker = resolveWorkerConfig({
+        agent: opts.workerAgent,
+        mode: opts.workerMode,
+        providerId: opts.workerProvider,
+        model: opts.workerModel,
+    });
+    const configuredProvider = worker.providerId
+        ? getAgentProvider(worker.providerId)
+        : undefined;
+    return (slot, o) => resolveBackend(worker, {
         cwd: o.cwd,
         project: opts.project,
-        modelName: agents.worker.model,
-        // 与 ACPWorkerRuntime.buildSessionName 同约定 `sps-acp-<project>-<slot>`,
-        // 让 acp 日志文件名 = sps-acp-<project>-worker-<N>-acp-<ts>.log,worker 面板才 tail 得到。
+        modelName: worker.model,
+        // 与 RuntimeSessionRuntime 的会话名同约定 `sps-acp-<project>-<slot>`(关联键)。
         sessionName: `sps-acp-${opts.project}-${slot}`,
         // 模型/端点全走项目 .claude/settings.local.json(Claude Code 原生读);sps-cli 不再对模型做全局 env 注入。
-        acpExtraEnv: o.extraEnv,
+        extraEnv: o.extraEnv,
         logsDir: opts.logsDir,
         resumeSessionId: o.resumeSessionId,
-        // 下面几项仅非-claude 后端用(claude-acp 不触发);惰性 makeModel 不会被 claude 路径调用。
-        makeModel: () => createReviewerModel({ providerId: agents.worker.providerId ?? 'codex', model: agents.worker.model }),
+        providerId: worker.providerId,
+        providerTransport: worker.transport,
+        providerBaseUrl: worker.baseUrl ?? configuredProvider?.baseUrl,
+        // 下面几项仅非-claude 后端用;惰性 makeModel 不会被 claude 路径调用。
+        makeModel: () => createReviewerModel({ providerId: worker.providerId ?? 'codex', model: worker.model }),
         sessionFile: join(opts.runtimeDir, `worker-${slot}-session.json`),
     });
 }

package/dist/manager/makeBackendFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"makeBackendFactory.js","sourceRoot":"","sources":["../../src/manager/makeBackendFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAGvE;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAKlC;IACC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,IAAI,IAAI,CAAC,WAAW;QAAE,MAAM,CAAC,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;IACpF,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACjB,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE;QAC5B,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK;QAC9B,sEAAsE;QACtE,8EAA8E;QAC9E,WAAW,EAAE,WAAW,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE;QAC9C,kFAAkF;QAClF,WAAW,EAAE,CAAC,CAAC,QAAQ;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,kEAAkE;QAClE,SAAS,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACrH,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,IAAI,eAAe,CAAC;KAClE,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"makeBackendFactory.js","sourceRoot":"","sources":["../../src/manager/makeBackendFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAQlC;IACC,MAAM,MAAM,GAAG,mBAAmB,CAAC;QACjC,KAAK,EAAE,IAAI,CAAC,WAAW;QACvB,IAAI,EAAE,IAAI,CAAC,UAAU;QACrB,UAAU,EAAE,IAAI,CAAC,cAAc;QAC/B,KAAK,EAAE,IAAI,CAAC,WAAW;KACxB,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU;QAC1C,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC;QACrC,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CACjB,cAAc,CAAC,MAAM,EAAE;QACrB,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,MAAM,CAAC,KAAK;QACvB,mEAAmE;QACnE,WAAW,EAAE,WAAW,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE;QAC9C,kFAAkF;QAClF,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,eAAe,EAAE,CAAC,CAAC,eAAe;QAClC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,iBAAiB,EAAE,MAAM,CAAC,SAAS;QACnC,eAAe,EAAE,MAAM,CAAC,OAAO,IAAI,kBAAkB,EAAE,OAAO;QAC9D,kDAAkD;QAClD,SAAS,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACvG,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,IAAI,eAAe,CAAC;KAClE,CAAC,CAAC;AACP,CAAC"}

package/dist/manager/runtime-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-coordinator.js","sourceRoot":"","sources":["../../src/manager/runtime-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-coordinator.js","sourceRoot":"","sources":["../../src/manager/runtime-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/manager/supervisor.d.ts

@@ -24,7 +24,7 @@ export interface SpawnOpts {
     branch: string;
     prompt: string;
     outputFile: string;
-    tool: 'claude';
+    tool: 'claude' | 'openai';
     resumeSessionId?: string;
     /** Called when child process exits. Return value is tracked as pending PostAction. */
     onExit: (exitCode: number) => Promise<void> | void;
@@ -37,7 +37,7 @@ export interface ExitEvent {
 }
 export interface WorkerHandle {
     id: string;
-    transport: 'acp-sdk';
+    transport: 'daemon';
     pid: number | null;
     child: ChildProcess | null;
     outputFile: string | null;
@@ -46,7 +46,7 @@ export interface WorkerHandle {
     slot: string;
     branch: string;
     worktree: string;
-    tool: 'claude';
+    tool: 'claude' | 'openai';
     exitCode: number | null;
     sessionId: string | null;
     runId: string | null;
@@ -72,11 +72,11 @@ export declare class ProcessSupervisor {
     getAll(): WorkerHandle[];
     remove(id: string): void;
     get activeCount(): number;
-    registerAcpHandle(handle: Omit<WorkerHandle, 'child' | 'transport'> & {
+    registerDaemonHandle(handle: Omit<WorkerHandle, 'child' | 'transport'> & {
         child?: ChildProcess | null;
-        transport?: 'acp-sdk';
+        transport?: 'daemon';
     }): WorkerHandle;
-    updateAcpHandle(id: string, patch: Partial<Pick<WorkerHandle, 'sessionId' | 'runId' | 'sessionState' | 'remoteStatus' | 'lastEventAt' | 'exitCode' | 'exitedAt' | 'outputFile'>>): WorkerHandle | undefined;
+    updateDaemonHandle(id: string, patch: Partial<Pick<WorkerHandle, 'sessionId' | 'runId' | 'sessionState' | 'remoteStatus' | 'lastEventAt' | 'exitCode' | 'exitedAt' | 'outputFile'>>): WorkerHandle | undefined;
     /**
      * Wait for all pending PostAction promises to settle.
      * Called by tick after each cycle to ensure exit callbacks complete.
@@ -96,7 +96,7 @@ export declare class ProcessSupervisor {
     reloadGlobalEnv(): void;
     private extractSessionId;
     private log;
-    private normalizeAcpHandle;
+    private normalizeDaemonHandle;
     private upsertHandle;
 }
 //# sourceMappingURL=supervisor.d.ts.map

package/dist/manager/supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}

package/dist/manager/supervisor.js

@@ -47,14 +47,14 @@ export class ProcessSupervisor {
     get activeCount() {
         return this.workers.size;
     }
-    registerAcpHandle(handle) {
-        return this.upsertHandle(this.normalizeAcpHandle(handle));
+    registerDaemonHandle(handle) {
+        return this.upsertHandle(this.normalizeDaemonHandle(handle));
     }
-    updateAcpHandle(id, patch) {
+    updateDaemonHandle(id, patch) {
         const current = this.workers.get(id);
         if (!current)
             return undefined;
-        return this.upsertHandle(this.normalizeAcpHandle({ ...current, ...patch }));
+        return this.upsertHandle(this.normalizeDaemonHandle({ ...current, ...patch }));
     }
     /**
      * Wait for all pending PostAction promises to settle.
@@ -81,7 +81,7 @@ export class ProcessSupervisor {
         // Store handle without child reference
         const orphanHandle = {
             ...handle,
-            transport: 'acp-sdk',
+            transport: 'daemon',
             child: null,
             pid,
             outputFile: handle.outputFile ?? null,
@@ -156,10 +156,10 @@ export class ProcessSupervisor {
     log(msg) {
         process.stderr.write(`[supervisor] ${msg}\n`);
     }
-    normalizeAcpHandle(handle) {
+    normalizeDaemonHandle(handle) {
         return {
             ...handle,
-            transport: 'acp-sdk',
+            transport: 'daemon',
             pid: null,
             child: handle.child ?? null,
             outputFile: handle.outputFile ?? null,

package/dist/manager/supervisor.js.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/manager/supervisor.ts"],"names":[],"mappings":"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"}

package/dist/manager/worker-manager-impl.d.ts

@@ -19,7 +19,7 @@ export declare class WorkerManagerImpl implements WorkerManager {
     private readonly taskSlotMap;
     private readonly timeouts;
     /** Abort controllers for ACP completion monitors keyed by slot name. */
-    private readonly acpMonitorAborts;
+    private readonly workerMonitorAborts;
     /** L3 P4-part2:per-slot AgentBackend(worker 执行唯一路径),跨卡暖复用。 */
     private readonly backendFactory;
     private readonly slotBackends;
@@ -40,9 +40,9 @@ export declare class WorkerManagerImpl implements WorkerManager {
     private acquireAndSpawn;
     private handleExit;
     /**
-     * L3 P2:AgentBackend 版完成监控 —— 轮询 backend.runState() 直到终态,语义同 monitorAcpCompletion:
+     * L3 P2:AgentBackend 版完成监控 —— 轮询 backend.runState() 直到终态,语义同 monitorWorkerCompletion:
      *   completed → 直接信任,finalize 完成;failed/cancelled → finalize 失败;
-     *   lost(进程死)→ 回退 CompletionJudge(查 git 证据)。
+     *   lost(进程死且无 terminal)→ 权威失败，不能用 git diff 或完成文案伪造成功。
      * 用轮询(非 subscribe)→ 天然绕开"reclaim/resume 后订阅需重挂"的坑;runState 在 P1 实测可靠返 completed。
      */
     private monitorViaBackend;
@@ -50,7 +50,7 @@ export declare class WorkerManagerImpl implements WorkerManager {
      * Finalize an ACP worker with a known status — emit event and release resources.
      * Bypasses CompletionJudge since ACP protocol provides authoritative status.
      */
-    private finalizeAcpWorker;
+    private finalizeWorker;
     /**
      * R1: Worker PID is still alive — re-attach orphan monitoring.
      */

package/dist/manager/worker-manager-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-manager-impl.d.ts","sourceRoot":"","sources":["../../src/manager/worker-manager-impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-manager-impl.d.ts","sourceRoot":"","sources":["../../src/manager/worker-manager-impl.ts"],"names":[],"mappings":"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"}

package/dist/manager/worker-manager-impl.js

@@ -24,6 +24,7 @@ import { buildMemoryInjection } from '../core/memory2/inject.js';
 import { captureBindUnsub, captureDiscard, captureFlush, captureNote, captureStart } from '../core/memory2/capture.js';
 import { externalObserve } from '../core/memory2/external/agentMemory.js';
 import { importSessionToExternal } from '../core/memory2/external/importTranscript.js';
+import { loadAgentsConfig } from '../core/intel/agentsConfig.js';
 // ─── Timeout Defaults ──────────────────────────────────────────
 const DEFAULT_TIMEOUTS = {
     startupSec: 60, // 60s for worker to start
@@ -41,7 +42,7 @@ export class WorkerManagerImpl {
     taskSlotMap = new Map();
     timeouts = new Map();
     /** Abort controllers for ACP completion monitors keyed by slot name. */
-    acpMonitorAborts = new Map();
+    workerMonitorAborts = new Map();
     /** L3 P4-part2:per-slot AgentBackend(worker 执行唯一路径),跨卡暖复用。 */
     backendFactory;
     slotBackends = new Map();
@@ -111,8 +112,8 @@ export class WorkerManagerImpl {
         const workerId = `${project}:${slot}:${taskId}`;
         // Stop the ACP completion monitor first so it cannot race this cancel and
         // emit a second, contradictory finalize for the same slot.
-        this.acpMonitorAborts.get(slot)?.abort();
-        this.acpMonitorAborts.delete(slot);
+        this.workerMonitorAborts.get(slot)?.abort();
+        this.workerMonitorAborts.delete(slot);
         // 先看是否已完成(避免"完成+NEEDS-FIX"矛盾),否则 cancel 在途 run
         // (会话保活,下次派卡暖复用;不 OS-kill——backend 无 pid 句柄)。
         const backend = this.slotBackends.get(slot);
@@ -270,6 +271,7 @@ export class WorkerManagerImpl {
         const workerId = `${project}:${slot}:${taskId}`;
         let pid = null;
         let sessionId;
+        let backend;
         let resourceAcquired = true; // track whether resource was released by spawn-fail path
         try {
             if (!this.backendFactory) {
@@ -312,7 +314,7 @@ export class WorkerManagerImpl {
             // 执行走 per-slot AgentBackend(北极星,agent 无关)。durable resume 下沉进
             // backend.ensure(构造时 seed resumeSessionId → loadSession);skills 走 dispatch opts。
             // pid 不由 backend 暴露,跨重启续跑靠 sessionId,不靠 pid orphan 监控(见 recover)。
-            const backend = this.getSlotBackend(slot, { cwd, extraEnv, resumeSessionId });
+            backend = this.getSlotBackend(slot, { cwd, extraEnv, resumeSessionId });
             // 读路注入(记忆 v2 §3):派活前把 project+global 记忆拼成 <memory> 块 prepend 进 prompt。
             // agent 无关(只改 prompt 文本);记忆层任何异常都不该阻断派活,故整体兜底吞掉。
             const dispatchPrompt = this.withMemoryInjection(project, prompt, cardTitle ?? '');
@@ -331,7 +333,7 @@ export class WorkerManagerImpl {
             // 提前订阅会因"session 不存在"拿到 no-op(踩过)。dispatch 非阻塞(startRun 只发起 run),
             // agent 输出随后几秒流式产生、结论段在末尾,故此刻订阅仍完整捕获。只吃归一化 WorkerOutputEvent
             // (红线:不碰 jsonl);无 subscribe 的后端跳过(走 agent 主动 memory_save 兜底)。
-            // flush 落点:claude-acp 走 finalizeAcpWorker、其余走 handleExit;失败 discard。
+            // flush 落点:claude-acp 走 finalizeWorker、其余走 handleExit;失败 discard。
             this.startCapture(project, cardId, backend, cwd);
             sessionId = backend.sessionId ?? undefined;
             pid = null;
@@ -361,6 +363,9 @@ export class WorkerManagerImpl {
         if (postState.workers[slot]) {
             postState.workers[slot].pid = pid;
             postState.workers[slot].sessionId = sessionId ?? null;
+            postState.workers[slot].agent = backend?.kind.startsWith('openai')
+                ? 'openai'
+                : 'claude';
             this.wr(postState, `${label}-pid`);
         }
         // v0.41.2: Patch marker file with sessionId + pid now that spawn succeeded.
@@ -420,17 +425,17 @@ export class WorkerManagerImpl {
         }
     }
     /**
-     * L3 P2:AgentBackend 版完成监控 —— 轮询 backend.runState() 直到终态,语义同 monitorAcpCompletion:
+     * L3 P2:AgentBackend 版完成监控 —— 轮询 backend.runState() 直到终态,语义同 monitorWorkerCompletion:
      *   completed → 直接信任,finalize 完成;failed/cancelled → finalize 失败;
-     *   lost(进程死)→ 回退 CompletionJudge(查 git 证据)。
+     *   lost(进程死且无 terminal)→ 权威失败，不能用 git diff 或完成文案伪造成功。
      * 用轮询(非 subscribe)→ 天然绕开"reclaim/resume 后订阅需重挂"的坑;runState 在 P1 实测可靠返 completed。
      */
     monitorViaBackend(ctx, backend) {
         const pollIntervalMs = 10_000; // 10s,与 ACP 监控一致
         // 抢占同 slot 的旧监控(slot 复用时防幽灵轮询)。
-        this.acpMonitorAborts.get(ctx.slot)?.abort();
+        this.workerMonitorAborts.get(ctx.slot)?.abort();
         const abortController = new AbortController();
-        this.acpMonitorAborts.set(ctx.slot, abortController);
+        this.workerMonitorAborts.set(ctx.slot, abortController);
         let pendingTimeout = null;
         const poll = async () => {
             if (abortController.signal.aborted)
@@ -441,26 +446,53 @@ export class WorkerManagerImpl {
                     return;
                 if (st === 'completed') {
                     this.log(`backend monitor: ${ctx.taskId} completed (authoritative)`);
-                    this.acpMonitorAborts.delete(ctx.slot);
+                    this.workerMonitorAborts.delete(ctx.slot);
                     // 方案 C(记忆 v2):完成时把该会话完整 transcript 导入 agentmemory(全 I/O 观测、按项目归类)。
                     // best-effort、异步、门控(external+SPS_MEMORY_IMPORT=on);sps 不解析 jsonl,交给 agentmemory 读。
                     importSessionToExternal(ctx.cwd, backend.sessionId);
-                    this.finalizeAcpWorker(ctx, 'run.completed', 0, { status: 'completed', reason: 'backend_completed' });
+                    this.finalizeWorker(ctx, 'run.completed', 0, { status: 'completed', reason: 'backend_completed' });
                     return;
                 }
                 if (st === 'failed' || st === 'cancelled') {
                     this.log(`backend monitor: ${ctx.taskId} ${st} (authoritative)`);
-                    this.acpMonitorAborts.delete(ctx.slot);
-                    this.finalizeAcpWorker(ctx, 'run.failed', 1, { status: 'failed', reason: `backend_${st}` });
+                    this.workerMonitorAborts.delete(ctx.slot);
+                    this.finalizeWorker(ctx, 'run.failed', 1, { status: 'failed', reason: `backend_${st}` });
                     return;
                 }
                 if (st === 'lost') {
-                    this.log(`backend monitor: ${ctx.taskId} lost — falling back to CompletionJudge`);
-                    this.acpMonitorAborts.delete(ctx.slot);
-                    await this.handleExit({ ...ctx, exitCode: 1 });
+                    this.log(`backend monitor: ${ctx.taskId} lost (authoritative failure)`);
+                    this.workerMonitorAborts.delete(ctx.slot);
+                    this.finalizeWorker(ctx, 'run.failed', 1, {
+                        status: 'failed',
+                        reason: 'backend_lost',
+                    });
                     return;
                 }
-                // running/idle —— 继续轮询
+                if (st === 'awaiting_input') {
+                    const state = this.rd();
+                    const worker = state.workers[ctx.slot];
+                    if (worker &&
+                        (worker.remoteStatus !== 'waiting_input' ||
+                            worker.sessionState !== 'needs_confirmation')) {
+                        worker.remoteStatus = 'waiting_input';
+                        worker.sessionState = 'needs_confirmation';
+                        worker.lastHeartbeat = new Date().toISOString();
+                        this.wr(state, 'backend-awaiting-input');
+                    }
+                }
+                else if (st === 'running') {
+                    const state = this.rd();
+                    const worker = state.workers[ctx.slot];
+                    if (worker &&
+                        (worker.remoteStatus === 'waiting_input' ||
+                            worker.sessionState === 'needs_confirmation')) {
+                        worker.remoteStatus = 'running';
+                        worker.sessionState = 'busy';
+                        worker.lastHeartbeat = new Date().toISOString();
+                        this.wr(state, 'backend-resumed');
+                    }
+                }
+                // running/awaiting_input/idle —— 继续轮询
                 pendingTimeout = setTimeout(poll, pollIntervalMs);
             }
             catch (err) {
@@ -480,7 +512,7 @@ export class WorkerManagerImpl {
      * Finalize an ACP worker with a known status — emit event and release resources.
      * Bypasses CompletionJudge since ACP protocol provides authoritative status.
      */
-    finalizeAcpWorker(ctx, eventType, exitCode, completionResult) {
+    finalizeWorker(ctx, eventType, exitCode, completionResult) {
         this.clearTimeoutForTask(ctx.taskId);
         this.log(`ACP finalize ${ctx.workerId}: ${completionResult.status} (${completionResult.reason})`);
         this.emitEvent({
@@ -525,10 +557,10 @@ export class WorkerManagerImpl {
             ? 'integration' : 'development';
         /* resourceLimiter.tryAcquire() — single worker, no-op */ ;
         this.supervisor.monitorOrphanPid(workerId, pid, {
-            id: workerId, transport: 'acp-sdk', pid,
+            id: workerId, transport: 'daemon', pid,
             outputFile: null, project: ctx.project, seq, slot,
             branch: lease.branch ?? '', worktree: lease.worktree ?? '',
-            tool: 'claude', exitCode: null, sessionId: lease.sessionId ?? null,
+            tool: loadAgentsConfig().worker.agent, exitCode: null, sessionId: lease.sessionId ?? null,
             runId: lease.runId ?? null, sessionState: null, remoteStatus: null,
             lastEventAt: null,
             startedAt: lease.claimedAt ?? new Date().toISOString(),
@@ -537,7 +569,7 @@ export class WorkerManagerImpl {
             workerId, taskId: seq, cardId: seq, project: ctx.project,
             phase, slot, branch: lease.branch ?? '',
             cwd: lease.worktree ?? '', targetBranch: ctx.baseBranch,
-            outputFile: '', tool: 'claude', transport: 'acp-sdk',
+            outputFile: '', tool: loadAgentsConfig().worker.agent, transport: 'daemon',
             exitCode, maxRetries: 0,
         }));
         this.taskSlotMap.set(seq, slot);
@@ -644,7 +676,7 @@ export class WorkerManagerImpl {
         state.workers[slot] = {
             ...createIdleWorkerSlot(), status: 'active', seq: seqNum,
             branch: ctx.branch, worktree: ctx.cwd, claimedAt: ctx.nowIso, lastHeartbeat: ctx.nowIso,
-            mode: 'acp-sdk', transport: 'acp-sdk', agent: ctx.tool,
+            mode: 'daemon', transport: 'daemon', agent: ctx.tool,
             outputFile: null,
         };
         state.activeCards[ctx.seq] = {
@@ -741,10 +773,10 @@ export class WorkerManagerImpl {
         }
         this.timeouts.clear();
         // Abort all ACP monitors
-        for (const [_slot, controller] of this.acpMonitorAborts) {
+        for (const [_slot, controller] of this.workerMonitorAborts) {
             controller.abort();
         }
-        this.acpMonitorAborts.clear();
+        this.workerMonitorAborts.clear();
         // L3 P2:tick 退出时停掉所有 per-slot backend(杀 ACP 子进程释放内存)。
         // sessionId 已由 pipeline 层持久化(pipeline-sessions.json),下次 tick seed resumeSessionId 续 → 停无损。
         for (const [_slot, backend] of this.slotBackends) {