@coralai/sps-cli 0.63.6 → 0.65.1

package/dist/console/routes/chat.js

@@ -32,9 +32,11 @@ import { resolveEligibleSkillNames, SkillsManager } from '../../core/skills/inde
 import { chatTools } from '../../providers/llm/chatTools.js';
 import { skillTools } from '../../providers/llm/skillTools.js';
 import { createReviewerModel } from '../../providers/llm/modelFactory.js';
+import { getAgentProvider } from '../../providers/llm/providers.js';
 import { workerTools } from '../../providers/llm/workerTools.js';
 import { toHttpStatus, toProblemJson } from '../../shared/errors.js';
-import { chatAttachmentsDirFor, chatSessionsDir, chatWorkspaceDir, chatWorkspacesRoot } from '../../shared/runtimePaths.js';
+import { chatAttachmentsDirFor, chatSessionsDir, chatWorkspacesRoot } from '../../shared/runtimePaths.js';
+import { workspacesRoot } from '../../core/workspacePaths.js';
 import { listArtifacts } from '../../shared/artifacts.js';
 import { sendResult } from '../lib/resultToJson.js';
 const MAX_CONCURRENT_SESSIONS = 5;
@@ -168,6 +170,35 @@ function endTurn(sessionId) {
         clearInterval(t.heartbeat);
     activeStreams.delete(sessionId);
 }
+function appendInteractionBlock(sessionId, assistantId, blocks, event) {
+    const block = {
+        type: 'interaction',
+        id: event.interactionId,
+        kind: event.kind,
+        title: event.title,
+        schema: event.schema,
+        revision: event.revision ?? 1,
+        status: 'pending',
+    };
+    blocks.push(block);
+    chatBus.emit('chat.message.chunk.interaction', {
+        sessionId,
+        assistantId,
+        turnId: assistantId,
+        seq: bumpSeq(sessionId),
+        ...block,
+    });
+    return block;
+}
+function findInteractionBlock(session, interactionId) {
+    for (let index = session.messages.length - 1; index >= 0; index--) {
+        const message = session.messages[index];
+        const block = message.blocks?.find((candidate) => candidate.type === 'interaction' && candidate.id === interactionId);
+        if (block)
+            return { message, block };
+    }
+    return null;
+}
 /** 取"最后一轮"状态:优先持久 lastTurn;旧文件无则从末条 assistant/error 消息推导(按已结束)。 */
 function deriveLastTurn(s) {
     if (s.lastTurn)
@@ -207,13 +238,17 @@ function reconcileStaleTurns(log) {
         /* non-fatal */
     }
 }
-async function streamAssistantResponse(sessionId, assistantId, userContent, log, attachments) {
-    // ── ChatBackend 分发:openai 走 in-process Agents SDK;否则(claude)走下面原有 daemon/ACP 路径。──
-    if (readSession(sessionId)?.agentKind === 'openai') {
+async function streamAssistantResponse(sessionId, assistantId, userContent, log, attachments, dependencies = {}) {
+    const selected = readSession(sessionId);
+    // 旧 OpenAI 会话没有 agentMode，继续走历史 SDK 会话文件；只有显式 daemon 的
+    // 新会话才迁入统一宿主，避免升级后丢掉既有上下文。
+    if (selected?.agentKind === 'openai' &&
+        (selected.agentMode ?? 'sdk') === 'sdk') {
         await streamOpenaiChat(sessionId, assistantId, userContent, log);
         return;
     }
-    if (!(await ensureDaemon())) {
+    const backend = selected?.agentKind === 'openai' ? 'openai' : 'claude';
+    if (!(await (dependencies.ensureDaemon ?? ensureDaemon)())) {
         persistAndEmitComplete(sessionId, {
             id: assistantId,
             role: 'error',
@@ -223,11 +258,11 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
         }, log);
         return;
     }
-    const client = new DaemonClient();
+    const client = dependencies.createDaemonClient?.() ?? new DaemonClient();
     const slot = chatSlot(sessionId);
     activeSessions.add(slot);
     // v0.51.4: read per-session cwd; falls back to daemon's startup cwd when unset.
-    // ACPWorkerRuntime resets the slot's session if cwdOverride differs from
+    // RuntimeSessionRuntime resets the slot's session if cwdOverride differs from
     // existing.cwd, so switching cwd between sessions is safe.
     const persisted = readSession(sessionId);
     const sessionCwd = persisted?.cwd ?? undefined;
@@ -240,12 +275,17 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
     //      · daemon/宿主重启过 → 适配器重 spawn 并 loadSession 重载完整历史
     // B) transcript 不在 / loadSession 失败(SESSION_LOST)/ 老会话无 id 且底层已 offline
     //      → 用已持久 messages 把历史重建进 prompt 兜底。
-    const savedId = persisted?.claudeSessionId;
+    const savedId = backend === 'openai'
+        ? persisted?.runtimeSessionId
+        : persisted?.claudeSessionId;
     let resumeSessionId;
     let replayHistory = false;
     if (savedId) {
-        if (sessionCwd && !jsonlExists(sessionCwd, savedId))
+        if (backend === 'claude' &&
+            sessionCwd &&
+            !jsonlExists(sessionCwd, savedId)) {
             replayHistory = true;
+        }
         else
             resumeSessionId = savedId;
     }
@@ -274,10 +314,20 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
     const hasCwdModelSettings = cwdModel !== undefined;
     let effModel = persisted?.model;
     let effProviderId = persisted?.providerId;
-    if (!effModel && !effProviderId && !hasCwdModelSettings) {
-        const w = loadAgentsConfig().worker;
-        effModel = w.model;
-        effProviderId = w.providerId;
+    const agentsConfig = loadAgentsConfig();
+    if (backend === 'openai') {
+        const openaiDefaults = agentsConfig.worker.agent === 'openai'
+            ? agentsConfig.worker
+            : {
+                model: agentsConfig.reviewer.model,
+                providerId: agentsConfig.reviewer.providerId,
+            };
+        effModel ||= openaiDefaults.model;
+        effProviderId ||= openaiDefaults.providerId;
+    }
+    else if (!effModel && !effProviderId && !hasCwdModelSettings) {
+        effModel = agentsConfig.worker.model;
+        effProviderId = agentsConfig.worker.providerId;
     }
     // 🔴 端点走「写文件」这条稳路:cwd 无模型配置或同模型需补配置,且用非官方 provider(codex-proxy/三方)——**无论是
     // 前端显式选的还是这里回落的**——都把 model+端点写进 cwd 的 .claude/settings.local.json,让 claude
@@ -287,7 +337,11 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
     // 同一模型也重写一次以补齐 provider env(例如 Ollama 无 key 时所需的占位 token)。
     // cwd 明确配置了其它模型时仍保持项目优先，不用全局/会话默认覆盖。
     const mayWriteProviderSettings = !cwdModel || !effModel || cwdModel === effModel.trim();
-    if (sessionCwd && mayWriteProviderSettings && effProviderId && effProviderId !== 'official') {
+    if (backend === 'claude' &&
+        sessionCwd &&
+        mayWriteProviderSettings &&
+        effProviderId &&
+        effProviderId !== 'official') {
         try {
             writeModelSettingsFile(sessionCwd, effModel, effProviderId);
         }
@@ -295,13 +349,17 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
             /* 写不了(只读目录等)→ 退回 extraEnv 注入兜底 */
         }
     }
-    const modelEnv = resolveWorkerModelEnv(effModel, effProviderId);
+    const modelEnv = backend === 'claude'
+        ? resolveWorkerModelEnv(effModel, effProviderId)
+        : {};
     // codex-proxy:选它(或回落到它) → 先确保 sidecar 在跑;否则按 cwd 的 settings.local.json 探测(逐项目)。
     try {
-        if (effProviderId === CODEX_PROXY_ID)
-            await ensureCodexProxyRunning();
-        else
-            await ensureCodexProxyForCwd(sessionCwd);
+        if (backend === 'claude') {
+            if (effProviderId === CODEX_PROXY_ID)
+                await ensureCodexProxyRunning();
+            else
+                await ensureCodexProxyForCwd(sessionCwd);
+        }
     }
     catch (err) {
         emitEnsureError(err);
@@ -323,6 +381,21 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
     // 🔴 模型不在此——留 settings.local.json 原生读(跨平台稳,不走 env)。没配=不设 outputStyle。
     const chatCfg = sessionCwd ? readProjectAgentConfig(sessionCwd, 'chat') : {};
     const chatEnv = { SPS_MANAGED: '1', ...modelEnv };
+    const openaiProvider = getAgentProvider(effProviderId ?? '');
+    const provider = backend === 'openai'
+        ? {
+            providerId: effProviderId ?? 'official',
+            model: effModel ?? 'gpt-5.4',
+            transport: effProviderId === 'codex'
+                ? 'codex'
+                : effProviderId === 'official' || !effProviderId
+                    ? 'responses'
+                    : 'chat_completions',
+            ...(openaiProvider?.baseUrl
+                ? { baseUrl: openaiProvider.baseUrl }
+                : {}),
+        }
+        : undefined;
     const ensureOpts = { mcpServers, extraEnv: chatEnv };
     if (resumeSessionId)
         ensureOpts.resumeSessionId = resumeSessionId;
@@ -330,6 +403,8 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
         ensureOpts.skills = skillWhitelist;
     if (chatCfg.outputStyle)
         ensureOpts.outputStyle = chatCfg.outputStyle;
+    if (provider)
+        ensureOpts.provider = provider;
     const ensureArg = ensureOpts;
     // resume 失败退回全新会话时:丢 resumeSessionId,保留 skills + 模型 env + MCP。
     const retryOpts = { mcpServers, extraEnv: chatEnv };
@@ -337,10 +412,12 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
         retryOpts.skills = skillWhitelist;
     if (chatCfg.outputStyle)
         retryOpts.outputStyle = chatCfg.outputStyle;
+    if (provider)
+        retryOpts.provider = provider;
     const retryArg = retryOpts;
     let rec;
     try {
-        rec = await client.ensureSession(slot, 'claude', sessionCwd, ensureArg);
+        rec = await client.ensureSession(slot, backend, sessionCwd, ensureArg);
     }
     catch (err) {
         // 可恢复失败 → 退回全新会话 + 重放历史兜底:
@@ -360,7 +437,7 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
             }
             replayHistory = true;
             try {
-                rec = await client.ensureSession(slot, 'claude', sessionCwd, retryArg);
+                rec = await client.ensureSession(slot, backend, sessionCwd, retryArg);
             }
             catch (err2) {
                 emitEnsureError(err2);
@@ -372,11 +449,14 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
             return;
         }
     }
-    // 持久化底层 claude sessionId(首轮 / resume 后变更)→ 后续(含跨重启)可 resume。
+    // 持久化底层 sessionId(首轮 / resume 后变更)→ 后续(含跨重启)可 resume。
     if (rec?.sessionId && rec.sessionId !== savedId) {
         const s = readSession(sessionId);
         if (s) {
-            s.claudeSessionId = rec.sessionId;
+            if (backend === 'openai')
+                s.runtimeSessionId = rec.sessionId;
+            else
+                s.claudeSessionId = rec.sessionId;
             writeSession(s);
         }
     }
@@ -395,7 +475,25 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
     if (replayHistory) {
         log.info(`chat[${sessionId}]: durable resume 兜底 —— 用 ${persisted?.messages?.length ?? 0} 条持久消息重建上下文`);
     }
-    const subscription = client.subscribeRun(slot);
+    // OpenAI 输出已 durable 化：先 startRun 确立新 runId，再按 cursor 订阅回放，
+    // 避免订阅时重放上一轮 terminal。Claude 无 durable sequence，仍先订阅再派活。
+    if (backend === 'openai') {
+        try {
+            await client.startRun(slot, fullPrompt, backend, sessionCwd);
+        }
+        catch (err) {
+            activeSessions.delete(slot);
+            persistAndEmitComplete(sessionId, {
+                id: assistantId,
+                role: 'error',
+                content: `startRun failed: ${err instanceof Error ? err.message : String(err)}`,
+                ts: new Date().toISOString(),
+                status: 'error',
+            }, log);
+            return;
+        }
+    }
+    const subscription = client.subscribeRunResilient(slot);
     // 复用 POST 时 startTurn 预登记的进行中回合(blocks 引用,后续就地追加);未预登记则退化自建(防御)。
     const blocks = activeStreams.get(sessionId)?.blocks ?? startTurn(sessionId, assistantId);
     let accumulatedText = '';
@@ -407,8 +505,14 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
                 // 据此写回 claudeSessionId = durable resume 锚(ACP 路在 ensureSession 已拿到,不发此事件)。
                 try {
                     const s = readSession(sessionId);
-                    if (s && s.claudeSessionId !== evt.sessionId) {
-                        s.claudeSessionId = evt.sessionId;
+                    const currentId = backend === 'openai'
+                        ? s?.runtimeSessionId
+                        : s?.claudeSessionId;
+                    if (s && currentId !== evt.sessionId) {
+                        if (backend === 'openai')
+                            s.runtimeSessionId = evt.sessionId;
+                        else
+                            s.claudeSessionId = evt.sessionId;
                         writeSession(s);
                     }
                 }
@@ -493,15 +597,27 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
                     locations: evt.locations,
                 });
             }
+            else if (evt.event === 'interaction') {
+                appendInteractionBlock(sessionId, assistantId, blocks, evt);
+            }
             else if (evt.event === 'complete') {
                 const ts = new Date().toISOString();
                 const isError = evt.stopReason === 'failed';
                 const isCancelled = evt.stopReason === 'cancelled';
+                const isWaitingInput = evt.stopReason === 'waiting_input';
+                if (isWaitingInput) {
+                    const pendingInteraction = [...blocks]
+                        .reverse()
+                        .find((block) => block.type === 'interaction' && block.status === 'pending');
+                    if (pendingInteraction && typeof evt.sequence === 'number') {
+                        pendingInteraction.resumeAfterSequence = evt.sequence;
+                    }
+                }
                 // 兜底:正常收尾(end_turn)但一段 text 都没流到,且本回合有过工具调用 —— 大概率是
                 // claude-agent-acp 丢了「工具后收尾文本」的 agent_message_chunk 推流(见 recoverTrailingText)。
                 // 从转录按「最后一次工具调用之后」精确捞回那段文本,补进 content + 尾随一个 text block。
                 if (!isError && !isCancelled && accumulatedText.trim() === '' &&
-                    sessionCwd && rec?.sessionId) {
+                    backend === 'claude' && sessionCwd && rec?.sessionId) {
                     const lastTool = [...blocks].reverse().find((b) => b.type === 'tool_use');
                     if (lastTool && lastTool.type === 'tool_use') {
                         try {
@@ -519,7 +635,13 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
                     id: assistantId,
                     role: isError ? 'error' : 'assistant',
                     content: accumulatedText.trim() ||
-                        (isError ? `stopped: ${evt.stopReason}` : isCancelled ? '(已中断)' : ''),
+                        (isError
+                            ? evt.error ?? `stopped: ${evt.stopReason}`
+                            : isCancelled
+                                ? '(已中断)'
+                                : isWaitingInput
+                                    ? '等待用户输入'
+                                    : ''),
                     blocks: blocks.length > 0 ? blocks : undefined,
                     truncated: truncated || undefined,
                     ts,
@@ -531,7 +653,9 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
         }
     })();
     try {
-        await client.startRun(slot, fullPrompt, 'claude', sessionCwd);
+        if (backend === 'claude') {
+            await client.startRun(slot, fullPrompt, backend, sessionCwd);
+        }
     }
     catch (err) {
         subscription.cancel();
@@ -579,6 +703,197 @@ async function streamAssistantResponse(sessionId, assistantId, userContent, log,
         endTurn(sessionId); // 安全网:completepath 已 endTurn;此处兜底停心跳/撤快照(重复调用无害)
     }
 }
+function openaiResumeEnsureArgs(sessionId, session) {
+    if (!session.runtimeSessionId) {
+        throw new Error('OpenAI runtime session id is missing');
+    }
+    const cwd = session.cwd ?? undefined;
+    const config = loadAgentsConfig();
+    const defaults = config.worker.agent === 'openai'
+        ? config.worker
+        : {
+            model: config.reviewer.model,
+            providerId: config.reviewer.providerId,
+        };
+    const model = session.model || defaults.model;
+    const providerId = session.providerId || defaults.providerId || 'official';
+    const configuredProvider = getAgentProvider(providerId);
+    const spsMcp = spsMcpStdioConfig({
+        cwd: cwd ?? process.cwd(),
+        project: cwd ? basename(cwd) : 'chat',
+        agentId: sessionId,
+    });
+    return {
+        cwd,
+        resumeSessionId: session.runtimeSessionId,
+        opts: {
+            resumeSessionId: session.runtimeSessionId,
+            mcpServers: [
+                { name: 'sps', command: spsMcp.command, args: spsMcp.args },
+            ],
+            extraEnv: { SPS_MANAGED: '1' },
+            provider: {
+                providerId,
+                model,
+                transport: providerId === 'codex'
+                    ? 'codex'
+                    : providerId === 'official'
+                        ? 'responses'
+                        : 'chat_completions',
+                ...(configuredProvider?.baseUrl
+                    ? { baseUrl: configuredProvider.baseUrl }
+                    : {}),
+            },
+        },
+    };
+}
+async function streamInteractionResponse(sessionId, assistantId, client, slot, afterSequence, log) {
+    const blocks = activeStreams.get(sessionId)?.blocks ??
+        startTurn(sessionId, assistantId);
+    const subscription = client.subscribeRunResilient(slot, afterSequence);
+    let accumulatedText = '';
+    let truncated = false;
+    try {
+        for await (const evt of subscription) {
+            if (evt.event === 'text') {
+                if (truncated)
+                    continue;
+                const budget = MAX_ASSISTANT_CONTENT_BYTES -
+                    Buffer.byteLength(accumulatedText, 'utf8');
+                if (budget <= 0) {
+                    truncated = true;
+                    continue;
+                }
+                const piece = Buffer.byteLength(evt.text, 'utf8') <= budget
+                    ? evt.text
+                    : Buffer.from(evt.text, 'utf8')
+                        .subarray(0, budget)
+                        .toString('utf8');
+                accumulatedText += piece;
+                const last = blocks[blocks.length - 1];
+                if (last?.type === 'text')
+                    last.text += piece;
+                else
+                    blocks.push({ type: 'text', text: piece });
+                chatBus.emit('chat.message.chunk.text', {
+                    sessionId,
+                    assistantId,
+                    turnId: assistantId,
+                    seq: bumpSeq(sessionId),
+                    text: piece,
+                });
+                if (piece.length < evt.text.length)
+                    truncated = true;
+            }
+            else if (evt.event === 'tool_use') {
+                const input = sanitizeToolInput(evt.input);
+                blocks.push({
+                    type: 'tool_use',
+                    id: evt.id,
+                    title: evt.title,
+                    kind: evt.kind,
+                    status: evt.status,
+                    input,
+                    locations: evt.locations,
+                });
+                chatBus.emit('chat.message.chunk.tool_use', {
+                    sessionId,
+                    assistantId,
+                    turnId: assistantId,
+                    seq: bumpSeq(sessionId),
+                    id: evt.id,
+                    title: evt.title,
+                    kind: evt.kind,
+                    status: evt.status,
+                    input,
+                    locations: evt.locations,
+                });
+            }
+            else if (evt.event === 'tool_update') {
+                const tool = blocks.find((block) => block.type === 'tool_use' && block.id === evt.id);
+                const input = evt.input == null ? undefined : sanitizeToolInput(evt.input);
+                if (tool?.type === 'tool_use') {
+                    tool.status = evt.status;
+                    if (input !== undefined &&
+                        !isEmptyToolInput(input) &&
+                        isEmptyToolInput(tool.input)) {
+                        tool.input = input;
+                    }
+                    if (evt.locations != null && tool.locations == null) {
+                        tool.locations = evt.locations;
+                    }
+                }
+                chatBus.emit('chat.message.chunk.tool_update', {
+                    sessionId,
+                    assistantId,
+                    turnId: assistantId,
+                    seq: bumpSeq(sessionId),
+                    id: evt.id,
+                    status: evt.status,
+                    input,
+                    locations: evt.locations,
+                });
+            }
+            else if (evt.event === 'interaction') {
+                appendInteractionBlock(sessionId, assistantId, blocks, evt);
+            }
+            else if (evt.event === 'complete') {
+                const waitingInput = evt.stopReason === 'waiting_input';
+                const failed = evt.stopReason === 'failed';
+                const cancelled = evt.stopReason === 'cancelled';
+                if (waitingInput) {
+                    const pending = [...blocks]
+                        .reverse()
+                        .find((block) => block.type === 'interaction' &&
+                        block.status === 'pending');
+                    if (pending && typeof evt.sequence === 'number') {
+                        pending.resumeAfterSequence = evt.sequence;
+                    }
+                }
+                persistAndEmitComplete(sessionId, {
+                    id: assistantId,
+                    role: failed ? 'error' : 'assistant',
+                    content: accumulatedText.trim() ||
+                        (failed
+                            ? evt.error ?? 'interaction resume failed'
+                            : cancelled
+                                ? '(已中断)'
+                                : waitingInput
+                                    ? '等待用户输入'
+                                    : ''),
+                    blocks: blocks.length ? blocks : undefined,
+                    truncated: truncated || undefined,
+                    ts: new Date().toISOString(),
+                    status: failed ? 'error' : 'complete',
+                }, log);
+                return;
+            }
+        }
+        throw new Error('Interaction event stream ended without a terminal event');
+    }
+    catch (error) {
+        if (activeStreams.has(sessionId)) {
+            persistAndEmitComplete(sessionId, {
+                id: assistantId,
+                role: 'error',
+                content: `interaction resume failed: ${error instanceof Error ? error.message : String(error)}`,
+                ts: new Date().toISOString(),
+                status: 'error',
+            }, log);
+        }
+    }
+    finally {
+        subscription.cancel();
+        try {
+            await client.clearRun(slot);
+        }
+        catch {
+            /* best effort */
+        }
+        activeSessions.delete(slot);
+        endTurn(sessionId);
+    }
+}
 // ─── openai ChatBackend 适配器 ──────────────────────────────────────
 // claude 走 daemon/ACP(上面);openai 走 in-process Agents SDK run(stream),
 // 把文本流映射成与 claude 一致的 chunk 事件 + 同样 persistAndEmitComplete 落库。
@@ -776,7 +1091,7 @@ function persistAndEmitComplete(sessionId, msg, log) {
     }
     endTurn(sessionId); // 停心跳 + 撤销进行中快照(始终执行,含 session 缺失兜底)
 }
-export function createChatRoute(log, chat) {
+export function createChatRoute(log, chat, dependencies = {}) {
     const app = new Hono();
     // v0.57:进程启动即对账 —— 上个进程遗留的 lastTurn=running(死回合)翻成 error,
     // 让轮询兜底(GET lastTurn)在宿主/进程重启后也讲真话,不永卡 running。
@@ -789,11 +1104,19 @@ export function createChatRoute(log, chat) {
     });
     app.post('/sessions', async (c) => {
         const body = (await c.req.json().catch(() => ({})));
+        const agentKind = body.agentKind === 'openai' ? 'openai' : 'claude';
+        const configuredWorker = loadAgentsConfig().worker;
+        // 新建会话默认 daemon:openai 走真正的独立进程 agent(sps openai-agent,带 sandbox + 工具 + 技能)。
+        // 旧会话(已持久 agentMode='sdk')不受影响,dispatch 侧仍按各自持久值走。
+        const agentMode = body.agentMode ??
+            (configuredWorker.agent === agentKind ? configuredWorker.mode : 'daemon');
         const r = await chat.create({
             title: body.title,
             project: body.project,
             cwd: body.cwd,
-            agentKind: body.agentKind === 'openai' ? 'openai' : 'claude',
+            namespace: body.namespace,
+            agentKind,
+            agentMode,
             model: body.model,
             providerId: body.providerId,
             dedicated: body.dedicated === true,
@@ -813,8 +1136,9 @@ export function createChatRoute(log, chat) {
             ...r.value,
             model: displayChatModel(c.req.param('id'), r.value.agentKind, cwd),
         };
-        // P1:对话专属工作目录(~/.coral/chats/<id>)才扫产物 —— 真项目 cwd 不扫(会列出整仓)。
-        if (cwd && cwd.startsWith(chatWorkspacesRoot())) {
+        // P1:对话专属工作目录才扫产物 —— 真项目 cwd 不扫(会列出整仓)。
+        // 兼容新根 <WORKSPACES_ROOT> 与 legacy ~/.coral/chats(双读,不硬切)。
+        if (cwd && (cwd.startsWith(workspacesRoot()) || cwd.startsWith(chatWorkspacesRoot()))) {
             detail.artifacts = listArtifacts(cwd);
         }
         return c.json(detail);
@@ -828,14 +1152,14 @@ export function createChatRoute(log, chat) {
         const r = await chat.delete(id);
         if (!r.ok)
             return c.json(toProblemJson(r.error), toHttpStatus(r.error));
-        // v0.51.8：删除该 session 的附件目录（best effort）
-        // P1:同时删除对话专属工作目录 ~/.coral/chats/<id>(仅 dedicated 会话有,按 id 键定,安全)
+        // v0.51.8：删除该 session 的私有附件暂存目录(best effort)。
+        // 🔴 只清附件,**绝不删工作区目录**——目录是用户产物,且同一 cwd 可被多个 chat 共用;
+        // 工作区的删除只走"项目管理"里用户显式选择的完整删除,不由 chat 删除触发。
         try {
             const { rmSync } = await import('node:fs');
-            for (const dir of [chatAttachmentsDirFor(id), chatWorkspaceDir(id)]) {
-                if (existsSync(dir))
-                    rmSync(dir, { recursive: true, force: true });
-            }
+            const attachments = chatAttachmentsDirFor(id);
+            if (existsSync(attachments))
+                rmSync(attachments, { recursive: true, force: true });
         }
         catch {
             /* non-fatal */
@@ -843,6 +1167,169 @@ export function createChatRoute(log, chat) {
         chatBus.emit('chat.session.deleted', { sessionId: id });
         return c.body(null, 204);
     });
+    app.post('/sessions/:id/interactions/:interactionId', async (c) => {
+        const id = c.req.param('id');
+        const interactionId = c.req.param('interactionId');
+        const session = readSession(id);
+        if (!session) {
+            return c.json({ type: 'not-found', title: 'Session not found', status: 404 }, 404);
+        }
+        if (session.agentKind !== 'openai' ||
+            (session.agentMode ?? 'sdk') !== 'daemon') {
+            return c.json({
+                type: 'validation',
+                title: 'Session does not support durable interactions',
+                status: 422,
+            }, 422);
+        }
+        const found = findInteractionBlock(session, interactionId);
+        if (!found) {
+            return c.json({ type: 'not-found', title: 'Interaction not found', status: 404 }, 404);
+        }
+        if (found.block.status !== 'pending') {
+            return c.json({
+                type: 'conflict',
+                title: `Interaction is already ${found.block.status}`,
+                status: 409,
+            }, 409);
+        }
+        const body = (await c.req.json().catch(() => null));
+        if (!body ||
+            !Object.prototype.hasOwnProperty.call(body, 'answer') ||
+            !Number.isInteger(body.expectedRevision)) {
+            return c.json({
+                type: 'validation',
+                title: 'answer and integer expectedRevision are required',
+                status: 422,
+            }, 422);
+        }
+        if (body.expectedRevision !== found.block.revision) {
+            return c.json({
+                type: 'conflict',
+                title: 'Interaction revision changed',
+                status: 409,
+                detail: `expected ${body.expectedRevision}, current ${found.block.revision}`,
+            }, 409);
+        }
+        const afterSequence = found.block.resumeAfterSequence;
+        if (!Number.isInteger(afterSequence)) {
+            return c.json({
+                type: 'conflict',
+                title: 'Interaction checkpoint cursor is unavailable',
+                status: 409,
+            }, 409);
+        }
+        const slot = chatSlot(id);
+        if (activeSessions.has(slot)) {
+            return c.json({ type: 'conflict', title: 'session busy', status: 409 }, 409);
+        }
+        if (!(await (dependencies.ensureDaemon ?? ensureDaemon)())) {
+            return c.json({ type: 'unavailable', title: 'Agent daemon unavailable', status: 503 }, 503);
+        }
+        const client = dependencies.createDaemonClient?.() ?? new DaemonClient();
+        try {
+            const ensure = openaiResumeEnsureArgs(id, session);
+            await client.ensureSession(slot, 'openai', ensure.cwd, ensure.opts);
+            await client.submitInteraction(slot, interactionId, body.answer, body.expectedRevision);
+        }
+        catch (error) {
+            return c.json({
+                type: 'interaction-resume',
+                title: 'Interaction could not be resumed',
+                status: 409,
+                detail: error instanceof Error ? error.message : String(error),
+            }, 409);
+        }
+        const latest = readSession(id);
+        const latestFound = latest
+            ? findInteractionBlock(latest, interactionId)
+            : null;
+        if (latest && latestFound) {
+            latestFound.block.status = 'answered';
+            latestFound.block.answer = body.answer;
+            latestFound.block.revision += 1;
+            writeSession(latest);
+        }
+        chatBus.emit('chat.message.interaction.updated', {
+            sessionId: id,
+            interactionId,
+            status: 'answered',
+            revision: found.block.revision + 1,
+            answer: body.answer,
+        });
+        const assistantId = randomUUID();
+        activeSessions.add(slot);
+        startTurn(id, assistantId);
+        chatBus.emit('chat.message.pending', {
+            sessionId: id,
+            assistantId,
+            turnId: assistantId,
+            seq: 0,
+            ts: new Date().toISOString(),
+        });
+        void streamInteractionResponse(id, assistantId, client, slot, afterSequence, log);
+        return c.json({ assistantId }, 202);
+    });
+    app.post('/sessions/:id/interactions/:interactionId/cancel', async (c) => {
+        const id = c.req.param('id');
+        const interactionId = c.req.param('interactionId');
+        const session = readSession(id);
+        if (!session) {
+            return c.json({ type: 'not-found', title: 'Session not found', status: 404 }, 404);
+        }
+        const found = findInteractionBlock(session, interactionId);
+        if (!found) {
+            return c.json({ type: 'not-found', title: 'Interaction not found', status: 404 }, 404);
+        }
+        const body = (await c.req.json().catch(() => null));
+        if (found.block.status !== 'pending' ||
+            !body ||
+            !Number.isInteger(body.expectedRevision) ||
+            body.expectedRevision !== found.block.revision) {
+            return c.json({
+                type: 'conflict',
+                title: 'Interaction is no longer pending at this revision',
+                status: 409,
+            }, 409);
+        }
+        if (!(await (dependencies.ensureDaemon ?? ensureDaemon)())) {
+            return c.json({
+                type: 'unavailable',
+                title: 'Agent daemon unavailable',
+                status: 503,
+            }, 503);
+        }
+        const client = dependencies.createDaemonClient?.() ?? new DaemonClient();
+        try {
+            const ensure = openaiResumeEnsureArgs(id, session);
+            await client.ensureSession(chatSlot(id), 'openai', ensure.cwd, ensure.opts);
+            await client.cancelInteraction(chatSlot(id), interactionId, body.expectedRevision);
+        }
+        catch (error) {
+            return c.json({
+                type: 'interaction-cancel',
+                title: 'Interaction could not be cancelled',
+                status: 409,
+                detail: error instanceof Error ? error.message : String(error),
+            }, 409);
+        }
+        const latest = readSession(id);
+        const latestFound = latest
+            ? findInteractionBlock(latest, interactionId)
+            : null;
+        if (latest && latestFound) {
+            latestFound.block.status = 'cancelled';
+            latestFound.block.revision += 1;
+            writeSession(latest);
+        }
+        chatBus.emit('chat.message.interaction.updated', {
+            sessionId: id,
+            interactionId,
+            status: 'cancelled',
+            revision: found.block.revision + 1,
+        });
+        return c.body(null, 204);
+    });
     app.post('/sessions/:id/interrupt', async (c) => {
         const r = await chat.interrupt(c.req.param('id'));
         if (!r.ok)
@@ -933,7 +1420,7 @@ export function createChatRoute(log, chat) {
             seq: 0,
             ts: new Date().toISOString(),
         });
-        streamAssistantResponse(id, assistantId, body.content, log, attachments).catch((err) => {
+        streamAssistantResponse(id, assistantId, body.content, log, attachments, dependencies).catch((err) => {
             log.error(`chat[${id}] stream error: ${err instanceof Error ? err.message : String(err)}`);
             // 极端:streamAssistantResponse 未走到任何 persistAndEmitComplete 就抛 → 兜底落错 + 收尾。
             if (activeStreams.has(id)) {
@@ -968,6 +1455,8 @@ export function createChatStreamRoute() {
                     'chat.message.chunk.text',
                     'chat.message.chunk.tool_use',
                     'chat.message.chunk.tool_update',
+                    'chat.message.chunk.interaction',
+                    'chat.message.interaction.updated',
                     'chat.message.complete',
                     'chat.message.error', // v0.57:明确的回合异常终止(带 turnId)
                     'chat.message.heartbeat', // v0.57:流式进行中心跳(带 turnId),区分"还在生成"vs"卡死"