@sanqianx/claude-ai-workbench 0.13.1 → 0.13.2-rc.10

package/README.md

@@ -8,10 +8,16 @@
 
 外壳使用真实 Agent Terminal 页面和 REST/SSE，不重新实现消息流。`embed=1` 与可配置 `apiBase` 隐藏重复品牌/项目管理，并接受同源父窗口的项目、主题与知识范围消息；独立产品行为保持不变。
 
+重复收到当前项目的嵌入通知不会取消正在创建的会话；真正切换项目时仍隔离迟到的响应和草稿。项目查找尚未完成时，以最新的选择为准。
+
 受信任本地外壳通过 `KB_WORKBENCH_RUNTIME_TOKEN`、`KB_EVENT_BRIDGE_URL` 和引擎地址连接后台服务。原生工作台捕获原始用户输入及成功最终回答，通过持久化 outbox 投递到 bridge 的鉴权入口；不捕获系统提示词、注入的知识、工具输出或供应商凭据。`/api/health` 中 `conversationCapture` 展示启用状态、待投递数和错误；已有用户显式关闭的捕获设置不会被覆盖。桥接不可用时保留待投递记录，恢复或重启后继续，不伪造会话。
 
 工作台是产品供应商与凭据的活动配置源。后台维护默认模型持久化，不随会话临时模型切换；解析后的凭据只交给鉴权本地服务，不进入浏览器消息。SDK 会话从当前项目登记的工作区恢复，也兼容旧登记文件。
 
+四客户端的会话历史使用同目录临时文件原子替换。磁盘写满、临时写入失败或 Windows 拒绝替换时保留上一次完整记录，不截断或删除原历史；空间恢复后新会话仍可正常持久化。已经被旧版截断的历史不能凭空恢复。
+
+MiniMax 向量模型使用独立的 `/v1/embeddings` 接口，不复用聊天的 `/anthropic` 路由。官方域名的已知接口后缀在运行期规范化为服务根地址，现有配置文件不被迁移或改写；自定义网关路径保持原样。
+
 Windows 上 Claude Code 探测与实际启动使用同一解析结果：失效的 `CLAUDE_CODE_EXECPATH` 不遮住有效安装，npm/CMD/PowerShell 启动脚本解析成实际文件，JavaScript 入口用当前 Node 探测版本。`/system/doctor` 返回实际启动路径、被跳过的失效路径及版本探测错误。发现和会话失败使用 `log/v2`；受外壳守护时写入外壳统一诊断，独立运行保存在工作台数据目录的 `diagnostics.jsonl`，不记录凭据或原始提示词。
 
 ## 仓库结构
@@ -59,10 +65,14 @@ npm run start:agent-terminal
 - 页面：`http://127.0.0.1:5760/agent-terminal/`
 - 数据目录：`~/.agent-terminal`（`AGENT_TERMINAL_DATA_DIR` 覆盖；端口 `AGENT_TERMINAL_PORT`）
 - 首次使用：设置 → 模型供应商 → 添加供应商（Base URL / API Key / 模型列表），然后添加本地项目文件夹即可开聊。
-- Agent 发现自动扫描本机：Claude Code（Agent SDK，支持 Anthropic 兼容端点如 MiniMax）、Codex（`codex exec --json`，使用自身登录）、OpenCode（`opencode run --format json`）、ZCode（已安装但暂无 headless CLI，如实标注不可用）。
+- Agent 发现自动扫描本机：Claude Code（Agent SDK，支持 Anthropic 兼容端点如 MiniMax）、Codex（app-server，保留 CLI 回退）、OpenCode（serve + SSE，保留 CLI 回退）、ZCode（桌面内置 app-server）。版本探测成功不等于认证或任务执行成功，实际运行失败另写诊断日志。
+- OpenCode 启动健康检查的期限同时约束连接、响应头与 JSON 响应体，超时释放连接及未就绪子进程并按现有策略回退 CLI；不会等待操作系统的长连接超时再把任务误报为模块不可达。
+- ZCode 原生认证使用已有桌面供应商配置，保留显式环境变量覆盖及个人配置；共享 Workbench 模型通过临时本机连接接入，上游 API Key 只在内存中，临时文件仅保存本机访问令牌，关闭时清理。不改写桌面安装资源或用户模型配置。同时支持旧版 runtimeModel 与新版 modelSelection 协议，失败和完成事件均结束当前任务。
 - 零点击模型检测：填好 Base URL 与 API Key 后自动探测 `/v1/models` 并合并 models.dev 能力数据（上下文窗口、模态、推理），保存时自动填充模型列表与上下文大小。
 - 会话内模型切换：切换供应商/模型不换会话，历史跨供应商延续（Claude 保留 resume，CLI 保留线程参数）。
 - 运行时体验对齐：中断不再误报退出码错误、stderr 聚合为单个折叠、上下文用量按轮取最大值而非累计求和。
+- 交互会话不设默认整任务时限，原生 Agent 可以连续工作数小时；任务仍会在正常完成、无法恢复的请求或进程错误、手动中止或服务关闭时结束，不保证永远运行。
+- `profile.timeoutMs` 仍只是单次模型请求超时（Claude 环境变量 `API_TIMEOUT_MS`），不作为任务总时限；知识引擎的后台维护超时不受此改动影响。
 
 ## 启动开发服务器
 

package/apps/agent-terminal/app.css

@@ -40,6 +40,8 @@ button { cursor:pointer; color:inherit; }
 .fin:focus-visible, .pop-search:focus-visible, .composer textarea:focus-visible { outline:none; }
 .view { display:none; height:100vh; }
 .view.active { display:flex; }
+.view[inert] { cursor:wait; }
+.view[inert] button, .view[inert] textarea { opacity:.55; }
 .linklike { border:0; color:var(--blue); background:transparent; padding:0; font-size:inherit; }
 .linklike:hover { text-decoration:underline; }
 

package/apps/agent-terminal/app.js

@@ -5,9 +5,15 @@ const embedParams = new URLSearchParams(location.search);
 const embedded = embedParams.get('embed') === '1';
 const configuredApiBase = embedParams.get('apiBase');
 const apiBase = configuredApiBase && /^\/api\/[a-z0-9/-]+$/i.test(configuredApiBase) ? configuredApiBase.replace(/\/$/, '') : '/api/claude-workbench/v1';
+function abortStopLabel(reason) {
+  // Historic events carry no reason; user aborts keep the neutral wording.
+  if (reason === 'runtime-timeout') return '运行超时，已停止';
+  return '已停止';
+}
 let selectionEpoch = 0;
 let sessionEpoch = 0;
 let sessionCreationEpoch = 0;
+let pendingEmbedSelection = null;
 const projectDrafts = new Map();
 function savedProjectDraft(projectId, text) {
   try {
@@ -158,6 +164,10 @@ async function init() {
   wireComposer();
   wireSettings();
   wireProjectModal();
+  $('view-terminal').inert = false;
+  $('view-terminal').setAttribute('aria-busy', 'false');
+  $('view-settings').inert = false;
+  if (!state.activeSessionId) $('session-title').textContent = '选择或创建一个会话';
   // Ready is the usable-page boundary: the host may immediately select a
   // project or open settings, so data and handlers must both be available.
   if (window.parent !== window) window.parent.postMessage({ type: 'kb:ready', app: 'agent-terminal' }, '*');
@@ -1103,7 +1113,7 @@ function renderEvent(event) {
       endTurnVisuals();
       {
         const stopNote = el('div', 'turn-note');
-        stopNote.append(icon('stop', 12), el('span', null, ' 已停止'));
+        stopNote.append(icon('stop', 12), el('span', null, ` ${abortStopLabel(event.reason)}`));
         col.append(stopNote);
       }
       {
@@ -2407,11 +2417,19 @@ window.addEventListener('message', async ev => {
   if (data.type === 'kb:open-settings') { openSettings('providers'); return; }
   if (data.type === 'kb:sidebar') setEmbedSidebarVisible(!!data.visible);
   else if (data.type === 'kb:select-project') {
-    const epoch = ++selectionEpoch;
-    if (!embedFindProject(data.project)) await refreshProjects();
-    if (epoch !== selectionEpoch) return;
-    reply({ type: 'kb:projects', ok: embedSelectProject(data.project), activeProjectId: state.activeProjectId,
-      projects: state.projects.map(p => ({ id: p.id, name: p.name, rootPath: p.rootPath })) });
+    const project = embedFindProject(data.project);
+    // Repeated context receipts are not a workspace change. Invalidating a
+    // creation here leaves a real backend session orphaned in the sidebar.
+    const changed = !project || project.id !== state.activeProjectId || !!pendingEmbedSelection;
+    const epoch = changed ? ++selectionEpoch : selectionEpoch;
+    const pending = changed ? { epoch } : null;
+    if (pending) pendingEmbedSelection = pending;
+    try {
+      if (!project) await refreshProjects();
+      if (epoch !== selectionEpoch) return;
+      reply({ type: 'kb:projects', ok: embedSelectProject(data.project), activeProjectId: state.activeProjectId,
+        projects: state.projects.map(p => ({ id: p.id, name: p.name, rootPath: p.rootPath })) });
+    } finally { if (pendingEmbedSelection === pending) pendingEmbedSelection = null; }
   } else if (data.type === 'kb:list-sessions') {
     const project = embedFindProject(data.project);
     if (!project) { reply({ type: 'kb:sessions', ok: false, project: data.project, sessions: [] }); return; }

package/apps/agent-terminal/index.html

@@ -9,7 +9,7 @@
 <body>
 
 <!-- ============ 终端视图 ============ -->
-<div id="view-terminal" class="view active">
+<div id="view-terminal" class="view active" inert aria-busy="true">
   <aside class="sidebar">
     <div class="brand"><h1><svg class="ics" viewBox="0 0 24 24" aria-hidden="true"><path d="m5 8 4 4-4 4"/><path d="M13 16h6"/></svg>Agent Terminal</h1><span class="ver" id="app-version"></span></div>
     <button class="new-session" id="btn-new-session"><svg class="ics" viewBox="0 0 24 24" aria-hidden="true"><path d="M12 5v14M5 12h14"/></svg><span>新会话</span></button>
@@ -33,7 +33,7 @@
 
   <div class="main">
     <div class="top-strip">
-      <span class="t" id="session-title">选择或创建一个会话</span>
+      <span class="t" id="session-title">正在加载工作台…</span>
       <span class="session-provider" id="session-provider"></span>
       <span class="st" id="session-status" hidden><svg class="ics" viewBox="0 0 24 24" aria-hidden="true"><path d="M12 3l1.9 5.8L20 12l-6.1 3.2L12 21l-1.9-5.8L4 12l6.1-3.2z"/></svg><span id="session-status-text"></span></span>
       <span style="flex:1"></span>
@@ -84,7 +84,7 @@
 </div>
 
 <!-- ============ 设置视图 ============ -->
-<div id="view-settings" class="view">
+<div id="view-settings" class="view" inert>
   <div class="settings-wrap">
     <nav class="settings-nav">
       <button class="ghost settings-back" id="settings-back"><svg class="ics" viewBox="0 0 24 24" aria-hidden="true"><path d="M20 12H4"/><path d="m11 5-7 7 7 7"/></svg><span>返回</span></button>

package/docs/sdk/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: 3.1.0
 info:
   title: Claude AI Workbench API
-  version: 0.13.1
+  version: 0.13.2-rc.10
   description: Versioned local API for AI Profile, credential and Claude Code session management.
 servers:
   - url: http://127.0.0.1:5760/api/claude-workbench/v1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanqianx/claude-ai-workbench",
-  "version": "0.13.1",
+  "version": "0.13.2-rc.10",
   "description": "Shared Claude Code terminal and Anthropic-compatible AI profile modules for local developer tools.",
   "type": "commonjs",
   "main": "src/index.js",

package/packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/client",
-  "version": "0.13.1",
+  "version": "0.13.2-rc.10",
   "type": "commonjs",
   "main": "index.js",
   "browser": "index.js",
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@claude-ai-workbench/contracts": "0.13.1"
+    "@claude-ai-workbench/contracts": "0.13.2-rc.10"
   },
   "engines": {
     "node": ">=18"

package/packages/contracts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/contracts",
-  "version": "0.13.1",
+  "version": "0.13.2-rc.10",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claude-ai-workbench/core",
-  "version": "0.13.1",
+  "version": "0.13.2-rc.10",
   "type": "commonjs",
   "main": "index.js",
   "browser": "index.js",
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@claude-ai-workbench/contracts": "0.13.1"
+    "@claude-ai-workbench/contracts": "0.13.2-rc.10"
   },
   "engines": {
     "node": ">=18"

package/packages/server/bin/agent-terminal-server.js

@@ -29,12 +29,13 @@ app.server.listen(port, host, () => {
 });
 
 let stopping = false;
-function shutdown() {
+async function shutdown() {
   if (stopping) return; stopping = true;
-  app.service.destroy();
+  setTimeout(() => process.exit(1), 10000).unref();
+  try { await app.service.destroy(); }
+  catch { process.stderr.write('SHUTDOWN_FAILED: 客户端运行环境未能完整关闭。\n'); process.exitCode = 1; }
   app.server.closeAllConnections?.();
-  app.server.close(() => process.exit(0));
-  setTimeout(() => process.exit(0), 3000).unref();
+  app.server.close(() => process.exit(process.exitCode || 0));
 }
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);

package/packages/server/bin/claude-workbench-server.js

@@ -41,6 +41,14 @@ app.server.listen(port, host, () => {
   warmFolderPicker({ title: '选择项目文件夹' }).catch(() => {});
 });
 
-function shutdown() { app.server.close(() => process.exit(0)); }
+let stopping = false;
+async function shutdown() {
+  if (stopping) return; stopping = true;
+  setTimeout(() => process.exit(1), 10000).unref();
+  try { await app.service.destroy(); }
+  catch { process.stderr.write('SHUTDOWN_FAILED: 客户端运行环境未能完整关闭。\n'); process.exitCode = 1; }
+  app.server.closeAllConnections?.();
+  app.server.close(() => process.exit(process.exitCode || 0));
+}
 process.on('SIGINT', shutdown);
 process.on('SIGTERM', shutdown);

package/packages/server/index.d.ts

@@ -11,7 +11,7 @@ export interface WorkbenchRunner {
   sendInput(sessionId: string, text: string, profile: Record<string, unknown>, options?: Record<string, unknown>): Promise<unknown>;
   listSupportedCommands?(sessionId: string, profile: Record<string, unknown>): Promise<SlashCommand[]>;
   resolvePermission(sessionId: string, requestId: string, decision: Record<string, unknown>): unknown;
-  abort(sessionId: string): void;
+  abort(sessionId: string, reason?: string): void;
   deleteSession(sessionId: string): unknown;
   findClaudeExecutableForSdk(): unknown;
 }

package/packages/server/index.js

@@ -30,6 +30,7 @@ function createWorkbenchServer(options = {}) {
   const apiPrefix = options.apiPrefix || DEFAULT_API_PREFIX;
   const testRoot = path.join(dataDir, 'test-workspaces');
   const projects = options.projects || new ProjectStore({ dataDir });
+  require('./lib/cli-session-recovery').recoverOwnedCliSessions({ dataDir, projects });
   const sessionArchive = options.sessionArchive || new SessionArchiveStore({ dataDir });
   const workspaces = {
     'test-workspace-a': path.join(testRoot, 'context-a'),
@@ -47,6 +48,8 @@ function createWorkbenchServer(options = {}) {
   const attachments = options.attachments || new AttachmentStore({ root: path.join(dataDir, 'attachments') });
   const contexts = options.contexts || new ContextResolver({ workspaces, createMissing: options.createMissingWorkspaces !== false });
   const claudeDriver = options.runner || loadLegacyRuntime('claude-cli-runner');
+  const knowledgeContextProvided = Boolean(options.knowledge || options.engineUrl || process.env.KB_KNOWLEDGE_ENGINE_URL);
+  claudeDriver.setKnowledgeContextProvided?.(knowledgeContextProvided);
   // Bridge capture scope: terminal sessions are exempt from Development
   // Conversation capture unless the 会话捕获 setting says otherwise. Applied to
   // the driver at boot and re-applied on every settings save.
@@ -62,9 +65,9 @@ function createWorkbenchServer(options = {}) {
     drivers: {
       'claude-code': claudeDriver,
       ...(options.drivers || {
-        codex: createCodexDriver(),
-        opencode: createOpenCodeDriver(),
-        zcode: createZCodeDriver(),
+        codex: createCodexDriver({ knowledgeContextProvided, conversationCaptureProvided: Boolean(conversationCapture), persistence: { dir: path.join(dataDir, 'cli-sessions') } }),
+        opencode: createOpenCodeDriver({ persistence: { dir: path.join(dataDir, 'cli-sessions') } }),
+        zcode: createZCodeDriver({ knowledgeContextProvided, conversationCaptureProvided: Boolean(conversationCapture), persistence: { dir: path.join(dataDir, 'cli-sessions') } }),
       }),
     },
   });
@@ -136,7 +139,7 @@ function createWorkbenchServer(options = {}) {
     res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });
     res.end(JSON.stringify({ ok: false, error: 'not found' }));
   });
-  server.on('close', () => service.destroy());
+  server.on('close', () => { Promise.resolve(service.destroy()).catch(error => diagnostics.error('agent.shutdown.failed', '客户端运行环境关闭失败。', { phase: 'shutdown', error: { code: error.code || 'SHUTDOWN_FAILED', message: error.message } })); });
   return { server, service, profiles, contexts, attachments, projects, sessionArchive, registry, agentDiscovery, apiPrefix, dataDir };
 }
 

package/packages/server/lib/agent-registry.js

@@ -46,6 +46,9 @@ class AgentRegistry {
   asRunner() {
     const registry = this;
     return {
+      async destroy() {
+        await Promise.all([...registry.drivers.values()].map(driver => typeof driver.destroy === 'function' ? driver.destroy() : undefined));
+      },
       startChatSession(args = {}) {
         const agentId = normalizeAgentId(args.agentId);
         const driver = registry.driverFor(agentId);
@@ -82,7 +85,7 @@ class AgentRegistry {
         return session;
       },
       resolvePermission(id, requestId, decision) { return registry._route(id).resolvePermission(id, requestId, decision); },
-      abort(id) { return registry._route(id).abort(id); },
+      abort(id, reason) { return registry._route(id).abort(id, reason); },
       deleteSession(id) { return registry._route(id).deleteSession(id); },
       listSupportedCommands(id, profile) { return registry._route(id).listSupportedCommands(id, profile); },
       findClaudeExecutableForSdk() {

package/packages/server/lib/bridges/opencode-server-bridge.js

@@ -86,6 +86,7 @@ function createOpenCodeServerBridge(config = {}) {
   let generation = 0; // bumped on every successful (re)launch
   let bootPromise = null;
   let bootSettle = null; // { resolve, reject } of the in-flight launch
+  let healthAbort = null;
   let restartTimer = null;
   let idleTimer = null;
   let restartsUsed = 0;
@@ -296,21 +297,34 @@ function createOpenCodeServerBridge(config = {}) {
   }
 
   async function waitForHealth(deadline) {
-    while (Date.now() < deadline) {
-      if (!child) throw bridgeError('opencode serve child exited during startup', 503, 'BRIDGE_SPAWN_FAILED');
-      try {
-        const response = await fetchFn(`${base()}/global/health`);
-        if (response.ok) {
-          const parsed = await response.json().catch(() => null);
-          if (!parsed || parsed.healthy !== true) throw new Error('health endpoint reported unhealthy');
-          return parsed;
+    const controller = new AbortController();
+    healthAbort = controller;
+    // A loop deadline alone cannot bound a connection stalled at headers or
+    // JSON body. The same budget must cancel the in-flight health request.
+    const timer = setTimeout(() => controller.abort(), Math.max(0, deadline - Date.now()));
+    try {
+      while (Date.now() < deadline && !controller.signal.aborted) {
+        if (!child) throw bridgeError('opencode serve child exited during startup', 503, 'BRIDGE_SPAWN_FAILED');
+        try {
+          const response = await fetchFn(`${base()}/global/health`, { signal: controller.signal });
+          if (response.ok) {
+            const parsed = await response.json().catch(() => null);
+            if (!parsed || parsed.healthy !== true) throw new Error('health endpoint reported unhealthy');
+            return parsed;
+          }
+          await response.body?.cancel?.();
+        } catch (error) {
+          if (closed) throw bridgeError('opencode serve bridge is closed', 503, 'BRIDGE_CLOSED');
+          if (!child) throw bridgeError('opencode serve child exited during startup', 503, 'BRIDGE_SPAWN_FAILED', { cause: error });
         }
-      } catch (error) {
-        if (!child) throw bridgeError('opencode serve child exited during startup', 503, 'BRIDGE_SPAWN_FAILED', { cause: error });
+        if (!controller.signal.aborted) await new Promise(resolve => setTimeout(resolve, Math.min(100, Math.max(0, deadline - Date.now()))));
       }
-      await new Promise(resolve => setTimeout(resolve, 100));
+      throw bridgeError(`opencode serve did not become healthy within ${opts.healthTimeoutMs}ms`, 504, 'BRIDGE_HEALTH_TIMEOUT');
+    } finally {
+      clearTimeout(timer);
+      controller.abort();
+      if (healthAbort === controller) healthAbort = null;
     }
-    throw bridgeError(`opencode serve did not become healthy within ${opts.healthTimeoutMs}ms`, 504, 'BRIDGE_HEALTH_TIMEOUT');
   }
 
   function wire(childInstance) {
@@ -441,7 +455,7 @@ function createOpenCodeServerBridge(config = {}) {
         intentionalStop = true;
         stopSse();
         killChild();
-        state = 'idle';
+        state = closed ? 'closed' : 'idle';
         port = null;
       });
     }));
@@ -462,6 +476,7 @@ function createOpenCodeServerBridge(config = {}) {
     clearTimeout(restartTimer);
     clearTimeout(idleTimer);
     intentionalStop = true;
+    healthAbort?.abort();
     stopSse();
     killChild();
     if (bootSettle) {

package/packages/server/lib/cli-session-recovery.js

@@ -0,0 +1,28 @@
+'use strict';
+const fs = require('node:fs');
+const path = require('node:path');
+const os = require('node:os');
+const SCHEMAS = new Set(['cli-json-runner-session/v1', 'codex-appserver-session/v1', 'opencode-serve-session/v1', 'zcode-appserver-session/v1']);
+
+function recoverOwnedCliSessions({ dataDir, projects, sourceDir = path.join(os.homedir(), '.agent-terminal/cli-sessions') }) {
+  const targetDir = path.join(dataDir, 'cli-sessions');
+  if (path.resolve(sourceDir) === path.resolve(targetDir) || !fs.existsSync(sourceDir)) return;
+  const owners = new Map(projects.list().map(project => [project.id, path.resolve(project.rootPath)]));
+  // Earlier v5 wiring put CLI records in the standalone directory. Preserve
+  // only records whose project ID AND code directory belong to this product.
+  for (const name of fs.readdirSync(sourceDir)) {
+    if (!/^[\w.-]+\.json$/.test(name)) continue;
+    const source = path.join(sourceDir, name); const target = path.join(targetDir, name);
+    let record;
+    try {
+      const stat = fs.lstatSync(source);
+      if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 8 * 1024 * 1024 || fs.existsSync(target)) continue;
+      record = JSON.parse(fs.readFileSync(source, 'utf8'));
+    } catch { continue; }
+    if (!SCHEMAS.has(record.schema) || !owners.has(record.projectSlug) || typeof record.projectPath !== 'string' || path.resolve(record.projectPath) !== owners.get(record.projectSlug) || `${record.sessionId}.json` !== name) continue;
+    fs.mkdirSync(targetDir, { recursive: true });
+    try { fs.copyFileSync(source, target, fs.constants.COPYFILE_EXCL); }
+    catch (error) { if (error.code !== 'EEXIST') throw error; }
+  }
+}
+module.exports = { recoverOwnedCliSessions };

package/packages/server/lib/drivers/cli-json-runner.js

@@ -292,16 +292,7 @@ function createCliJsonRunner(config) {
       try {
         fs.mkdirSync(path.dirname(file), { recursive: true });
         fs.writeFileSync(tmp, payload, 'utf8');
-        try {
-          fs.renameSync(tmp, file); // same-volume atomic replace
-        } catch {
-          // Windows can refuse to replace a destination an AV scanner or
-          // indexer still holds open: drop the old copy and retry the move.
-          // The temp file always carries the complete new version, so the
-          // destination is only ever missing for one rename call.
-          try { fs.unlinkSync(file); } catch { /* nothing to drop */ }
-          fs.renameSync(tmp, file);
-        }
+        fs.renameSync(tmp, file); // failed replacement keeps the old history
         persistFailures = 0;
         if (diskIndex) diskIndex.set(session.sessionId, { file, summary: summary(session) });
         return;
@@ -619,7 +610,7 @@ function createCliJsonRunner(config) {
       return summary(session);
     },
 
-    abort(id) {
+    abort(id, reason) {
       const session = resolveSession(id);
       if (!session) return;
       // A user-initiated kill is not a failure: the nonzero exit code it
@@ -628,7 +619,7 @@ function createCliJsonRunner(config) {
       killChild(session);
       if (!['idle', 'ended'].includes(session.state)) {
         session.state = 'aborted';
-        emit(session, { type: 'claude/aborted' });
+        emit(session, { type: 'claude/aborted', reason: reason || 'user-abort' });
         setState(session, 'idle');
       }
       flushPersist(session);

package/packages/server/lib/drivers/codex-driver.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const crypto = require('crypto');
+const { writeJson } = require('../json-file');
 const { createCliJsonRunner, resolveCliInvocation } = require('./cli-json-runner');
 const { createAppServerBridge } = require('../bridges/app-server-bridge');
 const {
@@ -74,7 +75,7 @@ function createCliCodexRunner(options = {}) {
     sandboxFor(permissionMode) { return SANDBOX_FOR_PERMISSION[permissionMode] || 'read-only'; },
 
     envFor(profile) {
-      return isInjected(profile) ? { [PROVIDER_KEY_ENV]: profile.apiKey } : {};
+      return { ...(isInjected(profile) ? { [PROVIDER_KEY_ENV]: profile.apiKey } : {}), ...ownedContextEnvironment(options) };
     },
 
     spawnArgs({ projectPath, model, sandbox, threadId, profile, imagePaths, effort }) {
@@ -122,6 +123,10 @@ function injectedProviderArgs(profile) {
   return args;
 }
 
+function ownedContextEnvironment(options) {
+  return { ...(options.knowledgeContextProvided ? { KB_KNOWLEDGE_CONTEXT: '0' } : {}), ...(options.conversationCaptureProvided ? { AI_CODING_EVENT_BRIDGE_CAPTURE: '0' } : {}) };
+}
+
 function parseCodexLine(event, session, helpers) {
   const out = [];
   const type = event && event.type;
@@ -335,8 +340,7 @@ function createAppServerCodexDriver(options = {}) {
     if (!appServerPersist.enabled) return;
     try {
       const file = appServerRecordFile(session.sessionId);
-      fs.mkdirSync(path.dirname(file), { recursive: true });
-      fs.writeFileSync(file, `${JSON.stringify({
+      writeJson(file, {
         schema: APP_SERVER_PERSIST_SCHEMA,
         agentId: 'codex',
         transport: 'app-server',
@@ -360,7 +364,7 @@ function createAppServerCodexDriver(options = {}) {
         peakTurnTokens: session.peakTurnTokens || 0,
         events: session.outputBuffer.slice(-MAX_APP_SERVER_PERSISTED_EVENTS),
         updatedAt: new Date().toISOString(),
-      })}\n`, 'utf8');
+      });
       if (appServerDiskIndex) appServerDiskIndex.set(session.sessionId, { file: appServerRecordFile(session.sessionId), summary: summary(session) });
     } catch {
       // Read-only home or full disk degrades to memory-only behavior.
@@ -690,9 +694,9 @@ function createAppServerCodexDriver(options = {}) {
       return summary(session);
     },
 
-    abort(id) {
+    abort(id, reason) {
       const session = sessions.get(id);
-      if (!session) return cliRunner.abort(id); // disk-restored sessions restore as idle
+      if (!session) return cliRunner.abort(id, reason); // disk-restored sessions restore as idle
       session.abortedByUser = true;
       denyPendingApproval(session, 'aborted');
       const currentTurn = session.currentTurn;
@@ -704,10 +708,10 @@ function createAppServerCodexDriver(options = {}) {
         bridge.request('turn/interrupt', { threadId: session.threadId, turnId: currentTurn.turnId }, { timeoutMs: 5000 })
           .catch(() => recycleBridge('interrupt failed'));
       }
-      if (session.cliMirrorId) cliRunner.abort(session.cliMirrorId);
+      if (session.cliMirrorId) cliRunner.abort(session.cliMirrorId, reason);
       if (!['idle', 'ended'].includes(session.state)) {
         session.state = 'aborted';
-        emit(session, { type: 'claude/aborted' });
+        emit(session, { type: 'claude/aborted', reason: reason || 'user-abort' });
         setState(session, 'idle');
       }
       if (!session.cliMirrorId) persistAppServerSession(session);
@@ -745,12 +749,12 @@ function createAppServerCodexDriver(options = {}) {
   // -- bridge lifecycle ----------------------------------------------------
 
   function bridgeSpecFor(profile) {
-    if (!isInjected(profile)) return { key: 'agent-owned', args: ['app-server'], env: {} };
+    if (!isInjected(profile)) return { key: 'agent-owned', args: ['app-server'], env: ownedContextEnvironment(options) };
     const providerArgs = injectedProviderArgs(profile); // throws without a base URL
     return {
       key: `injected:${resolveOpenAIBaseUrl(profile)}`,
       args: ['app-server', ...providerArgs],
-      env: { [PROVIDER_KEY_ENV]: profile.apiKey },
+      env: { [PROVIDER_KEY_ENV]: profile.apiKey, ...ownedContextEnvironment(options) },
     };
   }
 

package/packages/server/lib/drivers/opencode-driver.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const { writeJson } = require('../json-file');
 const os = require('os');
 const path = require('path');
 const crypto = require('crypto');
@@ -249,8 +250,7 @@ function createServeOpenCodeDriver(options = {}) {
     if (!persist.enabled) return;
     try {
       const file = serveRecordFile(session.sessionId);
-      fs.mkdirSync(path.dirname(file), { recursive: true });
-      fs.writeFileSync(file, `${JSON.stringify({
+      writeJson(file, {
         schema: SERVE_PERSIST_SCHEMA,
         agentId: 'opencode',
         transport: 'serve',
@@ -275,7 +275,7 @@ function createServeOpenCodeDriver(options = {}) {
         peakTurnTokens: session.peakTurnTokens || 0,
         events: session.outputBuffer.slice(-MAX_SERVE_PERSISTED_EVENTS),
         updatedAt: new Date().toISOString(),
-      })}\n`, 'utf8');
+      });
       if (serveDiskIndex) serveDiskIndex.set(session.sessionId, { file: serveRecordFile(session.sessionId), summary: summary(session) });
     } catch {
       // Read-only home or full disk degrades to memory-only behavior.
@@ -493,6 +493,7 @@ function createServeOpenCodeDriver(options = {}) {
       session.lastResult = '';
       session.currentTurn = {
         assistantMessageID: null,
+        assistantMessageIDs: new Set(),
         userMessageIDs: new Set(), // echoed prompts never stream as output
         parts: new Map(), // partID -> tracking state
         sawEvent: false,
@@ -570,9 +571,9 @@ function createServeOpenCodeDriver(options = {}) {
       return summary(session);
     },
 
-    abort(id) {
+    abort(id, reason) {
       const session = sessions.get(id) || restoreServeSession(id);
-      if (!session) return cliRunner.abort(id);
+      if (!session) return cliRunner.abort(id, reason);
       session.abortedByUser = true;
       if (mode === 'serve' && session.currentTurn && session.opencodeSessionId && bridge && bridge.state === 'ready') {
         // Preferred path: per-session abort on the shared serve instance
@@ -582,13 +583,13 @@ function createServeOpenCodeDriver(options = {}) {
       }
       if (session.currentTurn) {
         session.state = 'aborted';
-        emit(session, { type: 'claude/aborted' });
+        emit(session, { type: 'claude/aborted', reason: reason || 'user-abort' });
         finishServeTurn(session, {});
       }
-      if (session.cliMirrorId) cliRunner.abort(session.cliMirrorId);
+      if (session.cliMirrorId) cliRunner.abort(session.cliMirrorId, reason);
       if (!['idle', 'ended'].includes(session.state)) {
         session.state = 'aborted';
-        emit(session, { type: 'claude/aborted' });
+        emit(session, { type: 'claude/aborted', reason: reason || 'user-abort' });
         setState(session, 'idle');
       }
       if (!session.cliMirrorId) persistServeSession(session);
@@ -849,8 +850,11 @@ function createServeOpenCodeDriver(options = {}) {
       return;
     }
     if (info.role !== 'assistant') return;
+    const turn = session.currentTurn;
+    if (info.id && !turn.assistantMessageIDs.has(info.id) && info.time?.created && info.time.created < turn.startedAt - 5000) return;
     markActivity(session);
-    if (!session.currentTurn.assistantMessageID && info.id) session.currentTurn.assistantMessageID = info.id;
+    // Tool rounds and the final answer have distinct assistant message IDs.
+    if (info.id) { turn.assistantMessageIDs.add(info.id); turn.assistantMessageID = info.id; }
     // Completed assistant messages carry the final token totals; they back
     // up the per-step-finish usage when a turn had no step-finish parts.
     if (info.time && info.time.completed && info.tokens && info.tokens.total != null) {
@@ -863,6 +867,7 @@ function createServeOpenCodeDriver(options = {}) {
   // the assistant message this turn belongs to.
   function partBelongsToTurn(turn, messageID) {
     if (messageID && turn.userMessageIDs.has(messageID)) return false;
+    if (messageID && turn.assistantMessageIDs.has(messageID)) return true;
     if (turn.assistantMessageID && messageID && messageID !== turn.assistantMessageID) return false;
     return true;
   }
@@ -872,6 +877,7 @@ function createServeOpenCodeDriver(options = {}) {
     if (!partBelongsToTurn(session.currentTurn, part.messageID)) return;
     if (!session.currentTurn.assistantMessageID && part.messageID) {
       session.currentTurn.assistantMessageID = part.messageID;
+      session.currentTurn.assistantMessageIDs.add(part.messageID);
     }
     markActivity(session);
     if (part.type === 'step-start') {
@@ -961,7 +967,7 @@ function createServeOpenCodeDriver(options = {}) {
     const turn = session.currentTurn;
     if (!turn || field !== 'text' || !partID) return;
     if (!partBelongsToTurn(turn, messageID)) return;
-    if (!turn.assistantMessageID && messageID) turn.assistantMessageID = messageID;
+    if (!turn.assistantMessageID && messageID) { turn.assistantMessageID = messageID; turn.assistantMessageIDs.add(messageID); }
     markActivity(session);
     const tracker = partTracker(session, partID);
     if (!tracker) return;