lark-remote 0.4.3 → 0.4.5

package/dist/router/index.js

@@ -10,11 +10,14 @@ import { resolveAlias } from '../order/alias-resolve.js';
 import { diffConfig, setNestedValue } from './config-diff.js';
 import { getLogger } from '../logger/index.js';
 import { stripPlaceholders } from '../inbound/placeholder.js';
-import { activeRunUsage, clampInt } from './utils.js';
+import { clampInt } from '../common/clamp.js';
+import { activeRunUsage } from './usage-format.js';
 import { markdownDiv, buildSessionHistoryCard, paginationBar, searchBar, parseJumpOffset, SEARCH_INPUT_NAME, PAGE_JUMP_INVALID_HINT, } from './card-helpers.js';
 import { MAX_FILE_UPLOAD_SIZE } from '../connector/file-limits.js';
+import { newSessionButton, resumeCompactButton, agentDisplayName } from '../card/card-shared.js';
+import { displayName } from '../platform/path.js';
 import { atomicWrite } from '../persistence/atomic-write.js';
-import { checkLatestVersion as defaultCheckLatestVersion, isNewer as defaultIsNewer, runInstallLatest as defaultRunInstallLatest, } from '../update/index.js';
+import { checkLatestVersion as defaultCheckLatestVersion, compareVersions as defaultCompareVersions, runInstallLatest as defaultRunInstallLatest, } from '../update/index.js';
 /** Config card builder - delegates to per-agent builders */
 import { getConfigBuilder, listRegisteredAgents, sortAgentsForDisplay } from './config/index.js';
 import { probeAllAgents, getCachedAvailability } from '../runner/probe.js';
@@ -128,8 +131,6 @@ const RESUME_CONTENT_PREFETCH = 5;
  * `New Session`、空串），都不是真实输入，不得渲染成行标题。
  */
 const RESUME_SUMMARY_PLACEHOLDERS = new Set(['', '(no user message)', '(无摘要)', 'New Session']);
-import { newSessionButton, resumeCompactButton, agentDisplayName } from '../card/card-shared.js';
-import { displayName } from '../platform/path.js';
 /**
  * Card-action commands that must run with enqueue({ immediate: true }).
  * These bypass the serial queue and execute immediately.
@@ -145,7 +146,7 @@ import { displayName } from '../platform/path.js';
  * stop        — interrupt current run
  * ls.file     — send file only
  * ws.page     — paginate /ws list only
- * ws.remove   — delete workspace alias only
+ * ws.remove   — delete cwd alias only
  * resume.use  — set sessionId + agent for correct reader routing
  * help.*      — read-only help commands
  * order.delete — delete order only
@@ -320,6 +321,24 @@ const IMMEDIATE_ACTION_CMDS = new Set([
     // coordinator 已删响应空转（线上复现：approval.respond 排队卡、审批永不生效）。
     ...APPROVAL_ACTION_CMDS,
 ]);
+/**
+ * 会话 / cwd / agent 变更类卡片动作（单源）。这些动作会改写 sessionStore 的
+ * sessionId / cwd / defaultAgent，必须与入站装配器的 700ms 静默窗口定序：
+ * 控制层（index.ts）在执行它们之前先 flush 该 user/chat 的装配窗口，保证窗口内
+ * 先到的文本消息在本动作之前 commit（绑定动作前的旧状态）。否则窗口内消息会
+ * 漂移到动作之后的新状态（2026-10-07 事故：输入「重新构建」后立即点「新会话」，
+ * 消息落到新会话）。
+ *
+ * 文本命令（/new、/cd、/resume、/config）已由 index.ts 命令分支先 flush，
+ * 不在此列——只有卡片动作绕过了该分支。
+ */
+export const SESSION_MUTATING_ACTION_CMDS = new Set([
+    'new-session',
+    'resume.use',
+    'ls.switch',
+    'ws.use',
+    'config.save',
+]);
 /** W2.8 单源：payload.offset → 钳位 offset（原先 9 处逐字副本）。 */
 function payloadOffset(value) {
     return Math.max(0, Math.trunc(Number(value.offset) || 0));
@@ -426,7 +445,7 @@ export class CommandRouter {
         this.cloneSession = opts.cloneSession;
         this.updateFns = {
             checkLatestVersion: opts.updateFns?.checkLatestVersion ?? defaultCheckLatestVersion,
-            isNewer: opts.updateFns?.isNewer ?? defaultIsNewer,
+            compareVersions: opts.updateFns?.compareVersions ?? defaultCompareVersions,
             runInstallLatest: opts.updateFns?.runInstallLatest ?? defaultRunInstallLatest,
         };
     }
@@ -447,7 +466,7 @@ export class CommandRouter {
     /**
      * Route a message: if it starts with /, handle as command; if it starts with !, execute as bash; otherwise forward to Claude.
      *
-     * 命令识别前置条件（2026-09-15 P0 修复）：
+     * 命令识别前置条件（2026-09-15 P0 修复，`inbound-unified-input-design.md` §5.6）：
      * 裸前缀判定会被结构占位符命中 —— SDK 把富文本里的图片渲染成 `![image](img_v3_…)`，
      * 首字符恰好是 `!`，整段用户消息被当 shell 命令执行（`executeBash "[image](img_v3_…"`）。
      * 因此命令前缀只在「调用方声明纯文本 + 剥离占位符后非空且无占位符 + 首字符是 / 或 !」
@@ -494,7 +513,7 @@ export class CommandRouter {
             await this.bridge.executeBash(cmd, ctx);
             return null;
         }
-        // Forward to Claude (P1-14: pass the enqueue-time workspace through so the
+        // Forward to Claude (P1-14: pass the enqueue-time cwd through so the
         // run uses the same cwd as the serial queue lane, even if /cd ran while
         // the message was queued)
         // 剥离占位符后再转发：agent 只该看到用户文本（附图已转成 attachments 块，
@@ -635,8 +654,8 @@ export class CommandRouter {
                 // 调 updateCardInPlace → Feishu API 乱序到达导致 toggle 卡死。
                 // 2026-07-18: 返回 enqueueConfigAction 的结果以支持 toast 响应
                 return this.enqueueConfigAction(value, ctx);
-            case 'codex.compact':
-                await this.bridge.handleCodexCompact(value, ctx);
+            case 'compact':
+                await this.bridge.handleCompactAction(value, ctx);
                 return;
             case 'resume.compact':
                 await this.bridge.handleResumeCompact(value, ctx);
@@ -672,13 +691,13 @@ export class CommandRouter {
      * Routes to the appropriate bridge method based on value.cmd.
      * Returns a toast response for immediate user feedback.
      */
-    /** queue.* 卡片动作通用守卫：workspace/messageId 缺失时回复错误并返回 null。 */
+    /** queue.* 卡片动作通用守卫：cwd/messageId 缺失时回复错误并返回 null。 */
     async queuePayloadOrReply(value, ctx) {
-        if (!value.workspace || !value.messageId) {
+        if (!value.cwd || !value.messageId) {
             await this.bridge.sendResult({ text: CARD_PAYLOAD_MISSING }, ctx);
             return null;
         }
-        return { workspace: value.workspace, messageId: value.messageId };
+        return { cwd: value.cwd, messageId: value.messageId };
     }
     /** 答案类操作的统一失败反馈：重复投递（同一 nonce 第二次点击）是已生效的
      *  中性事件，报 error 会误导（首次点击实际已成功）。 */
@@ -712,11 +731,11 @@ export class CommandRouter {
         const payload = await this.queuePayloadOrReply(value, ctx);
         if (!payload)
             return;
-        const { workspace, messageId } = payload;
-        const removed = this.bridge.removeFromQueue(workspace, messageId);
+        const { cwd, messageId } = payload;
+        const removed = this.bridge.removeFromQueue(cwd, messageId);
         if (removed) {
             // Update the queue card in-place to "cancelled" state
-            await this.bridge.updateQueueCardToCancelled(workspace, messageId);
+            await this.bridge.updateQueueCardToCancelled(cwd, messageId);
             // Send a brief confirmation (user can see the card has been updated)
             await this.bridge.sendResult({ text: '✅ 已从队列中撤销' }, ctx);
         }
@@ -732,11 +751,11 @@ export class CommandRouter {
         const payload = await this.queuePayloadOrReply(value, ctx);
         if (!payload)
             return;
-        const { workspace, messageId } = payload;
+        const { cwd, messageId } = payload;
         // 1. Check target exists BEFORE any await. The queue chain can advance
         // while later awaits (interruptCurrentRun / markQueueCardExecuting's card
         // send) are in flight, so the target must be read synchronously at entry.
-        const targetTask = this.bridge.getQueuedTask(workspace, messageId);
+        const targetTask = this.bridge.getQueuedTask(cwd, messageId);
         if (!targetTask) {
             // The target already began (or was cancelled) before this handler ran. We
             // must NOT claim the queue was cleared — nothing is removed in this branch
@@ -760,9 +779,9 @@ export class CommandRouter {
             const editedContent = targetTask.editedMessage;
             // D3/Step3: 替换闭包复用原任务的 binding（不重新快照）+ 恢复丢失的
             // cwdOverride（lane cwd 同源）。否则编辑后重新执行的 run 会丢 cwd 与绑定。
-            this.bridge.setTaskReplacement(workspace, messageId, async () => {
+            this.bridge.setTaskReplacement(cwd, messageId, async () => {
                 await this.handle(editedContent, ctx, {
-                    cwdOverride: workspace,
+                    cwdOverride: cwd,
                     binding: targetTask.binding,
                 });
             });
@@ -773,7 +792,7 @@ export class CommandRouter {
         const stopped = await this.bridge.interruptCurrentRun({
             userId: ctx.userId,
             chatId: ctx.chatId,
-            workspace,
+            cwd,
         });
         getLogger().info(`[router] queue.immediate: stopped=${stopped}`);
         // 3. Remove all tasks BEFORE this one (by position in the current queue).
@@ -781,7 +800,7 @@ export class CommandRouter {
         // advances concurrently): then it is already out of the snapshot and every
         // remaining queued task is BEHIND it — clearing must stop, not run off the
         // end and delete tasks queued after the target.
-        const tasks = this.bridge.getQueuedTasks(workspace);
+        const tasks = this.bridge.getQueuedTasks(cwd);
         const targetIdx = tasks.findIndex((t) => t.messageId === messageId);
         let removedCount = 0;
         const removedIds = [];
@@ -792,7 +811,7 @@ export class CommandRouter {
         // in flight.
         for (let i = 0; i < targetIdx; i++) {
             const task = tasks[i];
-            if (this.bridge.removeFromQueue(workspace, task.messageId)) {
+            if (this.bridge.removeFromQueue(cwd, task.messageId)) {
                 removedCount++;
                 removedIds.push(task.messageId);
             }
@@ -804,7 +823,7 @@ export class CommandRouter {
         // target are already gone, so any chain advance can only reach the target
         // itself — the card updates may safely run in the background.
         for (const removedId of removedIds) {
-            void this.bridge.updateQueueCardToCancelled(workspace, removedId);
+            void this.bridge.updateQueueCardToCancelled(cwd, removedId);
         }
         // 4. DO NOT remove the target task - keep it in queue to execute immediately
         // The queue will naturally execute it after the current task (which we just stopped)
@@ -812,13 +831,13 @@ export class CommandRouter {
         // re-registering over the same slot). Covers the user editing the message
         // again while interruptCurrentRun was awaiting; skipped automatically once
         // the task has begun, because getQueuedTask then returns undefined.
-        const latestTask = this.bridge.getQueuedTask(workspace, messageId);
+        const latestTask = this.bridge.getQueuedTask(cwd, messageId);
         if (latestTask?.editedMessage) {
             const editedContent = latestTask.editedMessage;
             // D3/Step3: 复用原任务 binding + 恢复 cwdOverride（同上）。
-            this.bridge.setTaskReplacement(workspace, messageId, async () => {
+            this.bridge.setTaskReplacement(cwd, messageId, async () => {
                 await this.handle(editedContent, ctx, {
-                    cwdOverride: workspace,
+                    cwdOverride: cwd,
                     binding: latestTask.binding,
                 });
             });
@@ -826,9 +845,9 @@ export class CommandRouter {
         // 4.5/6. The target must only be marked executing (and the toast may only
         // promise immediate execution) when it is really the next task after the
         // stop. While interruptCurrentRun was awaiting, a task ahead of the target
-        // may have begun and now occupy the workspace — the target is still queued
+        // may have begun and now occupy the cwd — the target is still queued
         // but is NOT next, so its card must stay queued and the toast must say so.
-        const targetStillQueued = this.bridge.getQueuedTask(workspace, messageId) !== undefined;
+        const targetStillQueued = this.bridge.getQueuedTask(cwd, messageId) !== undefined;
         if (!targetStillQueued) {
             // The target began or was cancelled while earlier awaits were in flight —
             // a success toast must never promise execution of a task that will not
@@ -847,14 +866,14 @@ export class CommandRouter {
             }
             return;
         }
-        const workspaceBusy = this.bridge.isBusyFor(workspace);
+        const workspaceBusy = this.bridge.isBusyFor(cwd);
         if (!workspaceBusy) {
             // Normal path: nothing new began during the stop, the target is next.
             // Mark its own card as executing now so buttons grey out immediately.
             // Done BEFORE any removal so getQueuedTask still returns the task with
             // its (possibly edited) messagePreview for the card. The queue callback's
             // later updateQueueCardToExecuting call becomes a no-op (idempotent).
-            await this.bridge.markQueueCardExecuting(workspace, messageId);
+            await this.bridge.markQueueCardExecuting(cwd, messageId);
             const stopPrefix = stopped ? '⚡ 已停止当前任务，' : '';
             await this.bridge.sendResult({ text: `${stopPrefix}清除了 ${removedCount} 条排队消息。您的消息将立即执行。` }, ctx);
         }
@@ -871,10 +890,10 @@ export class CommandRouter {
         const payload = await this.queuePayloadOrReply(value, ctx);
         if (!payload)
             return;
-        const { workspace, messageId } = payload;
+        const { cwd, messageId } = payload;
         const targetUserId = value.userId ?? ctx.userId;
-        const task = this.bridge.getQueuedTask(workspace, messageId);
-        const queueInfo = this.bridge.getQueueInfo(workspace);
+        const task = this.bridge.getQueuedTask(cwd, messageId);
+        const queueInfo = this.bridge.getQueueInfo(cwd);
         const activeRuns = this.bridge.getAllActiveRuns();
         // Build diagnostic info
         const now = new Date().toLocaleString('zh-CN');
@@ -907,7 +926,7 @@ export class CommandRouter {
                         tag: 'div',
                         text: {
                             tag: 'lark_md',
-                            content: `**消息信息**\n- 工作目录: \`${workspace}\`\n- 会话 ID: \`${sessionId ?? '(none)'}\`\n- 消息预览: ${task?.messagePreview ?? '(unknown)'}`,
+                            content: `**消息信息**\n- 工作目录: \`${cwd}\`\n- 会话 ID: \`${sessionId ?? '(none)'}\`\n- 消息预览: ${task?.messagePreview ?? '(unknown)'}`,
                         },
                     },
                     { tag: 'hr' },
@@ -943,9 +962,9 @@ export class CommandRouter {
         const payload = await this.queuePayloadOrReply(value, ctx);
         if (!payload)
             return;
-        const { workspace, messageId } = payload;
+        const { cwd, messageId } = payload;
         // Get current message preview
-        const task = this.bridge.getQueuedTask(workspace, messageId);
+        const task = this.bridge.getQueuedTask(cwd, messageId);
         if (!task) {
             await this.bridge.sendResult({ text: '⚠️ 该消息不在队列中（可能已开始执行）' }, ctx);
             return;
@@ -987,7 +1006,7 @@ export class CommandRouter {
                                         placeholder: { tag: 'plain_text', content: '输入新的消息内容...' },
                                         default_value: task.messagePreview,
                                         behaviors: [
-                                            { type: 'callback', value: { cmd: 'queue.input', workspace, messageId } },
+                                            { type: 'callback', value: { cmd: 'queue.input', cwd, messageId } },
                                         ],
                                     },
                                 ],
@@ -1013,7 +1032,7 @@ export class CommandRouter {
         const payload = await this.queuePayloadOrReply(value, ctx);
         if (!payload)
             return;
-        const { workspace, messageId } = payload;
+        const { cwd, messageId } = payload;
         if (!newMessage) {
             await this.bridge.sendResult({ text: '⚠️ 缺少新消息内容' }, ctx);
             return;
@@ -1031,7 +1050,7 @@ export class CommandRouter {
         // there is no interleaving window.
         //
         // D3/Step3：复用原任务 binding（不重新快照）+ 恢复 cwdOverride。
-        const inputTask = this.bridge.getQueuedTask(workspace, messageId);
+        const inputTask = this.bridge.getQueuedTask(cwd, messageId);
         if (!inputTask) {
             // Task already left the queue (began or was cancelled) before we could
             // register the replacement. Return a toast so the edit-form card gets
@@ -1040,8 +1059,8 @@ export class CommandRouter {
             // toast/card field).
             return { toast: { type: 'info', content: '任务已不在队列中（可能已开始执行或被撤销）' } };
         }
-        this.bridge.setTaskReplacement(workspace, messageId, async () => {
-            await this.handle(newMessage, ctx, { cwdOverride: workspace, binding: inputTask.binding });
+        this.bridge.setTaskReplacement(cwd, messageId, async () => {
+            await this.handle(newMessage, ctx, { cwdOverride: cwd, binding: inputTask.binding });
         });
         // Update the message preview (and editedMessage so handleQueueImmediate
         // re-enqueues the edited content instead of the stale original closure),
@@ -1054,7 +1073,7 @@ export class CommandRouter {
         // await here: even if the queue chain advances and the replacement is
         // consumed, the user-facing card update is best-effort (the executing card
         // is updated by updateQueueCardToExecuting instead).
-        const card = await this.bridge.updateMessagePreview(workspace, messageId, newMessage);
+        const card = await this.bridge.updateMessagePreview(cwd, messageId, newMessage);
         if (!card) {
             // Task left the queue during the await (began or cancelled). The
             // replacement was already consumed (begin path) or cleaned up
@@ -1576,7 +1595,7 @@ export class CommandRouter {
         });
     }
     /**
-     * Handle ws.use card action: switch to the workspace, then refresh the /ws
+     * Handle ws.use card action: switch to the cwd, then refresh the /ws
      * list card in place so "recent" sort order is immediately visible.
      *
      * Unlike the command-line `/ws use` (which returns text), the card action
@@ -1586,7 +1605,7 @@ export class CommandRouter {
     async handleWsUse(value, ctx) {
         const name = value.name ?? '';
         const useResult = this.cmdWs(['use', name], ctx);
-        // Error cases (workspace not found, path invalid, etc.): relay as error toast
+        // Error cases (cwd not found, path invalid, etc.): relay as error toast
         if (useResult.text && !useResult.text.includes('已切换')) {
             return { toast: { type: 'error', content: useResult.text } };
         }
@@ -1615,7 +1634,7 @@ export class CommandRouter {
         };
     }
     /**
-     * Handle ws.remove: remove the workspace alias and refresh the /ws list card
+     * Handle ws.remove: remove the cwd alias and refresh the /ws list card
      * in place (mirrors handleOrderDelete). Without this the stale alias would
      * remain visible on the card the user just clicked.
      */
@@ -2366,7 +2385,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
         catch (err) {
             return { text: `❌ 版本检查失败: ${err.message}` };
         }
-        if (!this.updateFns.isNewer(current, latest)) {
+        if (this.updateFns.compareVersions(current, latest) !== 1) {
             return { text: `✅ 已是最新版本 ${current}` };
         }
         if (checkOnly) {
@@ -2398,7 +2417,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
     }
     cmdNew(ctx) {
         // 只清 sessionId 保留 cwd — 否则 /new 之后 /resume 会提示"请先 /cd
-        // 设置工作目录"，但用户的 workspace 还在。2026-06-21 复盘：用户
+        // 设置工作目录"，但用户的 cwd 还在。2026-06-21 复盘：用户
         // /new → /resume 后被误导以为需要重新 /cd。
         const agentName = agentDisplayName(this.config.defaultAgent);
         this.sessionStore.clearSessionId(ctx.userId, this.config.defaultAgent, {
@@ -2667,7 +2686,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
      * @param offset  分页起点（条目数）
      * @param rootDir 浏览起点：卡片「返回」按钮回到这里。省略时默认 = 本次列出的
      *                目录（`/ls <dir>` 的起点即该目录），因此「返回」不会把用户
-     *                丢回 workspace cwd（用户明确反馈过）。
+     *                丢回 工作目录（用户明确反馈过）。
      * @param q       关键词筛选：只匹配**当前层**条目名（不递归），大小写不敏感。
      *                省略/空 = 无筛选。
      */
@@ -2709,7 +2728,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
         }
         // 浏览起点（「返回」按钮的目标）：`/ls <dir>` 的起点就是该目录本身，之后
         // 进入子目录/翻页/刷新时由卡片 payload 的 root 一路带过来。省略时 = 本次
-        // 列出的目录，因此「返回」永远不会把用户丢回 workspace cwd。
+        // 列出的目录，因此「返回」永远不会把用户丢回工作目录。
         const browseRoot = rootDir ? path.resolve(cwd, rootDir) : targetDir;
         try {
             const entries = fs.readdirSync(targetDir, { withFileTypes: true });
@@ -3025,7 +3044,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                 text: { tag: 'plain_text', content: '上级' },
                 type: 'default',
                 size: 'small',
-                // 浏览起点 = 文件所在目录：进入后「返回」回到这里，不回 workspace cwd
+                // 浏览起点 = 文件所在目录：进入后「返回」回到这里，不回 工作目录
                 behaviors: [
                     { type: 'callback', value: { cmd: 'ls.browse', path: parentDir, root: parentDir } },
                 ],
@@ -3145,7 +3164,7 @@ ${sessionCwdLine}${agentLines.map((l) => `- ${l}`).join('\n')}
                 // Pagination calculations (mirror cmdOrder): clamp stale/out-of-range
                 // offsets so prev/next always step by WS_PAGE_SIZE.
                 const { totalCount, totalPages, safeOffset, currentPage, pageItems: pageEntries, hasPagination, } = pageSlice(visible, offset, WS_PAGE_SIZE);
-                // Build body elements: current cwd + workspace list with dividers
+                // Build body elements: current cwd + cwd list with dividers
                 const bodyElements = [];
                 // Current working directory section
                 bodyElements.push({

package/dist/router/order-exec-dispatch.d.ts

@@ -1,11 +1,5 @@
 import type { CommandRouter } from './index.js';
-import type { Bridge } from '../bridge/index.js';
-/** Context shared by all card-action dispatch paths (file-local; callers pass it structurally). */
-interface DispatchContext {
-    userId: string;
-    chatId: string;
-    messageId: string;
-}
+import type { Bridge, CommandContext } from '../bridge/index.js';
 /**
  * Dispatch an `order.exec` card action as an equivalent queued user message
  * (Plan A): resolve the order text at the enqueue boundary, then enqueue it
@@ -23,8 +17,7 @@ interface DispatchContext {
 export declare function dispatchOrderExecForQueue(args: {
     router: CommandRouter;
     bridge: Bridge;
-    workspace: string;
+    cwd: string;
     orderId: string | undefined;
-    ctx: DispatchContext;
+    ctx: CommandContext;
 }): Promise<'enqueued' | 'missing-id' | 'not-found'>;
-export {};

package/dist/router/order-exec-dispatch.js

@@ -13,7 +13,7 @@
  * for the caller to log; performs its own error feedback via `bridge.sendResult`.
  */
 export async function dispatchOrderExecForQueue(args) {
-    const { router, bridge, workspace, orderId, ctx } = args;
+    const { router, bridge, cwd, orderId, ctx } = args;
     if (!orderId) {
         await bridge.sendResult({ text: '卡片 payload 缺少必要信息' }, ctx);
         return 'missing-id';
@@ -27,8 +27,8 @@ export async function dispatchOrderExecForQueue(args) {
     // 避免排队期间 /new、/config 改写 live 状态导致语义漂移。唯一捕获点
     // Bridge.currentBinding。
     const binding = bridge.currentBinding(ctx.userId);
-    bridge.enqueue(workspace, async () => {
-        await router.handle(resolved.orderText, ctx, { cwdOverride: workspace, binding });
+    bridge.enqueue(cwd, async () => {
+        await router.handle(resolved.orderText, ctx, { cwdOverride: cwd, binding });
     }, {
         taskMeta: {
             userId: ctx.userId,

package/dist/router/{utils.d.ts → usage-format.d.ts}

@@ -1,6 +1,6 @@
 /**
- * Pure utility functions extracted from router/index.ts.
- * Path-safety helpers, display formatting, and validation — no Router state.
+ * Format session/run usage stats (context, compact count, tokens, cost) into
+ * the display strings shown on cards. Pure — no Router state.
  */
 import type { ActiveRunSnapshot } from '../bridge/index.js';
 export interface SessionDisplayUsage {
@@ -12,8 +12,6 @@ export interface SessionDisplayUsage {
     cacheCreationTokens?: number;
 }
 export declare function activeRunUsage(activeRun: ActiveRunSnapshot | undefined): SessionDisplayUsage | undefined;
-/** Clamp `v` into [min, max]. */
-export declare function clampInt(v: number, min: number, max: number): number;
 /**
  * Format usage stats (context length, compact count, cache tokens) into a display string.
  * Each stat on its own line with blank lines between sections.

package/dist/router/{utils.js → usage-format.js}

@@ -1,6 +1,6 @@
 /**
- * Pure utility functions extracted from router/index.ts.
- * Path-safety helpers, display formatting, and validation — no Router state.
+ * Format session/run usage stats (context, compact count, tokens, cost) into
+ * the display strings shown on cards. Pure — no Router state.
  */
 export function activeRunUsage(activeRun) {
     if (!activeRun || activeRun.contextLength === undefined)
@@ -12,11 +12,6 @@ export function activeRunUsage(activeRun) {
         cacheCreationTokens: activeRun.cacheCreationTokens,
     };
 }
-// --- Extracted helpers for refactoring ---
-/** Clamp `v` into [min, max]. */
-export function clampInt(v, min, max) {
-    return Math.min(Math.max(v, min), max);
-}
 /**
  * Format number to human-readable unit string.
  * - >= 1M: one decimal, M suffix (e.g., 1200000 → 1.2M, 25000000 → 25M)
@@ -154,4 +149,4 @@ export function formatUsageStats(usage, options) {
     }
     return lines.join('\n');
 }
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=usage-format.js.map

package/dist/runner/claude/runner.d.ts

@@ -22,7 +22,7 @@ export declare class ClaudeRunner implements AgentRunner {
         settings?: string;
         stopGraceMs?: number;
         pidDir?: string;
-        workspace: string;
+        cwd: string;
         spawnHeartbeatMs?: number;
         sessionReader?: AgentSessionReader;
         /** Claude 权限模式（官方 --permission-mode 枚举；'default'=省略参数）。 */

package/dist/runner/claude/runner.js

@@ -44,12 +44,11 @@ export class ClaudeRunner {
         this.sessionReader = opts.sessionReader ?? new ClaudeSessionReader();
         this.session = new ClaudeSession({
             pidDir: opts.pidDir,
-            workspace: opts.workspace,
+            cwd: opts.cwd,
             stopGraceMs: opts.stopGraceMs,
             spawnHeartbeatMs: opts.spawnHeartbeatMs,
             permissionMode: this.permissionMode,
             settings: opts.settings,
-            model: this.defaultModel,
             effort: this.defaultEffort,
             idleTtlMs: opts.idleTtlMs,
         });

package/dist/runner/claude/session.d.ts

@@ -22,7 +22,7 @@
  * - result 事件 subtype 为 compact/compaction 是 turn 中途压缩，不是 turn 结束；
  *   其余 subtype（success/error/...）才是 turn 终态。
  *
- * 生命周期：一个 workspace 一个长驻进程（lifetime='workspace'）。每次
+ * 生命周期：一个 cwd 一个长驻进程（lifetime='workspace'）。每次
  * run(message) = 写一条 user 消息 + 消费 stdout 事件直到本 turn 的 result；
  * 进程在 turn 之间保持存活（stdin 不关闭），/stop / /new / /cd / 看门狗超时
  * 时经 Terminator 组杀，下条消息按 SessionStore 的 sessionId --resume。
@@ -31,13 +31,12 @@ import { SpawningRunner } from '../common/spawning-runner.js';
 import type { AgentEvent, SpawnOptions } from '../types.js';
 export interface ClaudeSessionOptions {
     pidDir?: string;
-    workspace: string;
+    cwd: string;
     stopGraceMs?: number;
     spawnHeartbeatMs?: number;
     /** Claude 权限模式（官方 --permission-mode 枚举；'default' 省略该参数）。 */
     permissionMode?: string;
     settings?: string;
-    model?: string;
     effort?: string;
     /** 会话级空闲回收 TTL（ms）：turn 之间无活动超过该窗口则停止进程。0=禁用。 */
     idleTtlMs?: number;
@@ -61,7 +60,6 @@ export interface PermissionResult {
 export declare class ClaudeSession extends SpawningRunner {
     private readonly permissionMode;
     private readonly settings?;
-    private readonly defaultModel?;
     private readonly defaultEffort?;
     private readonly idleTtlMs;
     /** 当前 turn 是否在途（防止并发 run 写乱 stdin）。 */

package/dist/runner/claude/session.js

@@ -22,16 +22,16 @@
  * - result 事件 subtype 为 compact/compaction 是 turn 中途压缩，不是 turn 结束；
  *   其余 subtype（success/error/...）才是 turn 终态。
  *
- * 生命周期：一个 workspace 一个长驻进程（lifetime='workspace'）。每次
+ * 生命周期：一个 cwd 一个长驻进程（lifetime='workspace'）。每次
  * run(message) = 写一条 user 消息 + 消费 stdout 事件直到本 turn 的 result；
  * 进程在 turn 之间保持存活（stdin 不关闭），/stop / /new / /cd / 看门狗超时
  * 时经 Terminator 组杀，下条消息按 SessionStore 的 sessionId --resume。
  */
 import { readFile } from 'node:fs/promises';
-import { silentlyUnlink } from '../../common/fs.js';
+import { bestEffortUnlink } from '../../common/fs.js';
 import { getLogger } from '../../logger/index.js';
 import { SpawningRunner } from '../common/spawning-runner.js';
-import { authErrorEvent, syntheticInitEvent } from '../common/runner-utils.js';
+import { setupErrorEvent, syntheticInitEvent } from '../common/synthetic-events.js';
 import { makeQuestionApprovalEvent } from '../question-common.js';
 /** 拒绝权限时的默认提示（进入 claude 上下文，中文用户可读）。 */
 const DENY_MESSAGE = '用户拒绝了此工具调用，请停止并等待用户指令。';
@@ -50,7 +50,6 @@ const COMPACTION_RESULT_SUBTYPES = new Set(['compact', 'compaction']);
 export class ClaudeSession extends SpawningRunner {
     permissionMode;
     settings;
-    defaultModel;
     defaultEffort;
     idleTtlMs;
     /** 当前 turn 是否在途（防止并发 run 写乱 stdin）。 */
@@ -92,7 +91,7 @@ export class ClaudeSession extends SpawningRunner {
     constructor(opts) {
         super({
             pidDir: opts.pidDir,
-            workspace: opts.workspace,
+            cwd: opts.cwd,
             stopGraceMs: opts.stopGraceMs,
             spawnHeartbeatMs: opts.spawnHeartbeatMs,
             pidFilePrefix: 'claude',
@@ -103,7 +102,6 @@ export class ClaudeSession extends SpawningRunner {
         this.binary = 'claude';
         this.permissionMode = opts.permissionMode ?? 'bypassPermissions';
         this.settings = opts.settings;
-        this.defaultModel = opts.model;
         this.defaultEffort = opts.effort;
         this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;
     }
@@ -141,7 +139,7 @@ export class ClaudeSession extends SpawningRunner {
                 // §9.22 守卫：错误 result 前必须补 synthetic init，否则 bridge 的
                 // pre-init result guard 与 run-state reducer 会静默丢弃错误信息。
                 yield syntheticInitEvent(opts.sessionId);
-                yield authErrorEvent(spawnError);
+                yield setupErrorEvent(spawnError);
                 return;
             }
             // turn 之间的 idle 噪音（如 prompt_suggestion）不属于本 turn，先清空。
@@ -372,7 +370,7 @@ export class ClaudeSession extends SpawningRunner {
                     // 进程自行结束（崩溃/上游退出）：注销协议停止通道，别把死 pid 的
                     // 条目留在注册表里等 pid 复用。
                     this.unregisterStopper();
-                    silentlyUnlink(this.pidFilePath);
+                    bestEffortUnlink(this.pidFilePath);
                     this.wakeWaiters();
                 }
             }
@@ -482,7 +480,7 @@ export class ClaudeSession extends SpawningRunner {
             this.idleTimer = null;
             if (this.turnActive || !this.isRunning)
                 return;
-            getLogger().info(`[${this.logTag}] idle timeout ${this.idleTtlMs}ms, stopping session workspace=${this.cwd}`);
+            getLogger().info(`[${this.logTag}] idle timeout ${this.idleTtlMs}ms, stopping session cwd=${this.cwd}`);
             void this.stop().catch((err) => {
                 getLogger().warn(`[${this.logTag}] idle stop failed: ${err.message}`);
             });

package/dist/runner/common/acp/{protocol-helpers.d.ts → acp-approval.d.ts}

@@ -1,18 +1,12 @@
 /**
- * Shared helper functions for the ACP protocol layer.
+ * ACP approval/permission mapping and lifecycle shared by the kimi and
+ * opencode ACP runners.
  *
  * Extracted from runner.ts and translator.ts to avoid duplication (G5).
  * Shape source: approval.ts:28-29 — optionId is opaque, echo back as-is.
  */
 import type { ApprovalView } from '../../types.js';
 import type { PermissionOption } from './protocol-types.js';
-/**
- * Find an option by matching its `kind` against a list of candidate values,
- * and return the `optionId` to echo back in the approval response.
- * ACP option kind values vary between kimi versions; this handles both
- * the documented names and the observed real names (§2.3).
- */
-export declare function findOptionIdByKind(options: PermissionOption[], candidateKinds: string[]): string | undefined;
 /** 各 ACP 服务端的 option kind 候选表（kimi/opencode 观测名不同，语义对齐）。 */
 export interface AcpApprovalKinds {
     accept: string[];