lark-remote 0.5.10 → 0.5.13

package/dist/router/paging.d.ts

@@ -0,0 +1,13 @@
+export declare function pageInfo(totalCount: number, offset: number, pageSize: number): {
+    totalPages: number;
+    safeOffset: number;
+    currentPage: number;
+};
+export declare function pageSlice<T>(items: readonly T[], offset: number, pageSize: number): {
+    totalCount: number;
+    totalPages: number;
+    safeOffset: number;
+    currentPage: number;
+    pageItems: T[];
+    hasPagination: boolean;
+};

package/dist/router/paging.js

@@ -0,0 +1,20 @@
+import { clampInt } from '../common/clamp.js';
+export function pageInfo(totalCount, offset, pageSize) {
+    const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));
+    const maxOffset = Math.max(0, (totalPages - 1) * pageSize);
+    const safeOffset = clampInt(offset, 0, maxOffset);
+    const currentPage = Math.floor(safeOffset / pageSize) + 1;
+    return { totalPages, safeOffset, currentPage };
+}
+export function pageSlice(items, offset, pageSize) {
+    const { totalPages, safeOffset, currentPage } = pageInfo(items.length, offset, pageSize);
+    return {
+        totalCount: items.length,
+        totalPages,
+        safeOffset,
+        currentPage,
+        pageItems: items.slice(safeOffset, safeOffset + pageSize),
+        hasPagination: items.length > pageSize,
+    };
+}
+//# sourceMappingURL=paging.js.map

package/dist/router/path-validation.d.ts

@@ -0,0 +1,27 @@
+import fs from 'node:fs';
+export type PathKind = 'directory' | 'file' | 'missing' | 'unreadable';
+export type StatResolution = {
+    ok: true;
+    stat: fs.Stats;
+} | {
+    ok: false;
+    reason: 'missing' | 'unreadable';
+};
+export type DirectoryResolution = {
+    ok: true;
+    canonical: string;
+} | {
+    ok: false;
+    reason: 'missing' | 'not_directory' | 'unreadable';
+};
+/**
+ * Inspect a path without a preceding existsSync call.
+ *
+ * stat already distinguishes missing paths from files/directories and closes
+ * the exists→stat race. Permission and other IO failures stay distinguishable
+ * from a normal missing path so callers can keep their user-facing messages.
+ */
+export declare function statPath(target: string): StatResolution;
+export declare function inspectPath(target: string): PathKind;
+export declare function resolveDirectory(target: string): DirectoryResolution;
+export declare function isDirectorySafe(target: string): boolean;

package/dist/router/path-validation.js

@@ -0,0 +1,45 @@
+import fs from 'node:fs';
+/**
+ * Inspect a path without a preceding existsSync call.
+ *
+ * stat already distinguishes missing paths from files/directories and closes
+ * the exists→stat race. Permission and other IO failures stay distinguishable
+ * from a normal missing path so callers can keep their user-facing messages.
+ */
+export function statPath(target) {
+    try {
+        return { ok: true, stat: fs.statSync(target) };
+    }
+    catch (err) {
+        const code = err.code;
+        return {
+            ok: false,
+            reason: code === 'ENOENT' || code === 'ENOTDIR' ? 'missing' : 'unreadable',
+        };
+    }
+}
+export function inspectPath(target) {
+    const resolution = statPath(target);
+    if (!resolution.ok)
+        return resolution.reason;
+    return resolution.stat.isDirectory() ? 'directory' : 'file';
+}
+export function resolveDirectory(target) {
+    const kind = inspectPath(target);
+    if (kind === 'missing')
+        return { ok: false, reason: 'missing' };
+    if (kind === 'unreadable')
+        return { ok: false, reason: 'unreadable' };
+    if (kind === 'file')
+        return { ok: false, reason: 'not_directory' };
+    try {
+        return { ok: true, canonical: fs.realpathSync(target) };
+    }
+    catch {
+        return { ok: false, reason: 'unreadable' };
+    }
+}
+export function isDirectorySafe(target) {
+    return inspectPath(target) === 'directory';
+}
+//# sourceMappingURL=path-validation.js.map

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

@@ -3,10 +3,9 @@ import { type AgentEvent, type SpawnOptions, type AgentSessionReader, type Agent
  * Claude Agent Runner（长驻交互模式）。
  *
  * 权限模式（permissionMode）在 spawn 时经 --permission-mode 生效：
- * - 默认 bypassPermissions：claude 内部自动放行，无 control_request → 行为与
- *   旧版完全一致（无审批卡）；
- * - 配置为 default/acceptEdits/manual/plan 等：工具调用经 control_request
- *   上抛 → bridge ApprovalCoordinator → run 卡审批区。
+ * - 默认 auto：低风险操作自动放行，高风险操作的 control_request 上抛 →
+ *   bridge ApprovalCoordinator → run 卡审批区；
+ * - bypassPermissions：claude 内部全部放行，无 control_request（无审批卡）。
  */
 export declare class ClaudeRunner implements AgentRunner {
     readonly kind: "claude";

package/dist/runner/claude/runner.js

@@ -24,10 +24,9 @@ const COMPACT_COMMAND = '/compact';
  * Claude Agent Runner（长驻交互模式）。
  *
  * 权限模式（permissionMode）在 spawn 时经 --permission-mode 生效：
- * - 默认 bypassPermissions：claude 内部自动放行，无 control_request → 行为与
- *   旧版完全一致（无审批卡）；
- * - 配置为 default/acceptEdits/manual/plan 等：工具调用经 control_request
- *   上抛 → bridge ApprovalCoordinator → run 卡审批区。
+ * - 默认 auto：低风险操作自动放行，高风险操作的 control_request 上抛 →
+ *   bridge ApprovalCoordinator → run 卡审批区；
+ * - bypassPermissions：claude 内部全部放行，无 control_request（无审批卡）。
  */
 export class ClaudeRunner {
     kind = 'claude';
@@ -40,7 +39,7 @@ export class ClaudeRunner {
     constructor(opts) {
         this.defaultModel = opts.model ?? 'claude-opus-4-8';
         this.defaultEffort = opts.effort ?? 'medium';
-        this.permissionMode = opts.permissionMode ?? 'bypassPermissions';
+        this.permissionMode = opts.permissionMode ?? 'auto';
         this.sessionReader = opts.sessionReader ?? new ClaudeSessionReader();
         this.session = new ClaudeSession({
             pidDir: opts.pidDir,

package/dist/runner/claude/session.js

@@ -100,7 +100,7 @@ export class ClaudeSession extends SpawningRunner {
             agent: 'claude',
         });
         this.binary = 'claude';
-        this.permissionMode = opts.permissionMode ?? 'bypassPermissions';
+        this.permissionMode = opts.permissionMode ?? 'auto';
         this.settings = opts.settings;
         this.defaultEffort = opts.effort;
         this.idleTtlMs = opts.idleTtlMs ?? DEFAULT_IDLE_TTL_MS;

package/dist/runner/codex/app-server/runner.js

@@ -175,6 +175,11 @@ export class CodexAppServerRunner extends ConnectionBasedRunner {
         this.currentTranslator = null;
         this.activeThreadId = null;
         this.foreignThreadIds.clear();
+        // pendingApprovals 必须随轮次清理（与 base-acp-runner 同口径）：连接长驻，
+        // 服务端请求 id 在 respawn 后会从小数字重新计数——留着旧条目等于让下一轮
+        // 迟到的卡片点击把载荷回给无关的新请求（coordinator 的超时 cancel 也可能
+        // 落在新一轮的连接上）。
+        this.pendingApprovals.clear();
     }
     async releaseConnection(cwd) {
         await this.connectionManager.release(cwd);
@@ -394,6 +399,13 @@ export class CodexAppServerRunner extends ConnectionBasedRunner {
             this.noteForeignThread(params);
             return;
         }
+        if (method === NotificationMethod.SERVER_REQUEST_RESOLVED) {
+            // 审批被外部结算（Web UI 先答 / 服务端自动放行）时同步摘除 runner 侧
+            // 条目——否则迟到的卡片点击会向已结算的 requestId 回信（服务端报错）。
+            const requestId = params?.requestId;
+            if (requestId !== undefined)
+                this.pendingApprovals.delete(requestId);
+        }
         const events = this.currentTranslator?.handleNotification(method, params) ?? [];
         this.pushEvents(events);
     }

package/dist/runner/codex/app-server/translator.d.ts

@@ -17,6 +17,8 @@ export declare class CodexAppServerTranslator {
     private turnStatus;
     /** Full agentMessage text per item id (item-scoped snapshot). */
     private textByItem;
+    /** agentMessage item ids whose protocol phase is `final_answer`. */
+    private finalTextItems;
     /**
      * Reasoning content per item id: paragraphs keyed by `contentIndex`
      * (textDelta) plus the summary stream (summaryTextDelta). Each reasoning

package/dist/runner/codex/app-server/translator.js

@@ -18,6 +18,8 @@ export class CodexAppServerTranslator {
     turnStatus = 'pending';
     /** Full agentMessage text per item id (item-scoped snapshot). */
     textByItem = new Map();
+    /** agentMessage item ids whose protocol phase is `final_answer`. */
+    finalTextItems = new Set();
     /**
      * Reasoning content per item id: paragraphs keyed by `contentIndex`
      * (textDelta) plus the summary stream (summaryTextDelta). Each reasoning
@@ -141,15 +143,24 @@ export class CodexAppServerTranslator {
                 const text = item.text ?? '';
                 if (text && this.textByItem.get(item.id) !== text) {
                     this.textByItem.set(item.id, text);
-                    events.push({
-                        type: 'turn_diff',
-                        text,
-                        itemId: item.id,
-                        complete: true,
-                        threadId: params?.threadId ?? this.threadId,
-                        turnId: params?.turn?.id ?? this.turnId,
-                        timestamp: this.now(),
-                    });
+                    const final = item.phase === 'final_answer';
+                    events.push(final
+                        ? {
+                            type: 'final_answer',
+                            text,
+                            itemId: item.id,
+                            complete: true,
+                            timestamp: this.now(),
+                        }
+                        : {
+                            type: 'turn_diff',
+                            text,
+                            itemId: item.id,
+                            complete: true,
+                            threadId: params?.threadId ?? this.threadId,
+                            turnId: params?.turn?.id ?? this.turnId,
+                            timestamp: this.now(),
+                        });
                 }
             }
             else if (item.type === 'plan') {
@@ -228,6 +239,7 @@ export class CodexAppServerTranslator {
         // 的 turnId 闸门挡掉。
         this.usage = { inputTokens: 0, outputTokens: 0 };
         this.textByItem.clear();
+        this.finalTextItems.clear();
         this.reasoningByItem.clear();
         this.toolOutputByItem.clear();
         this.toolItemMeta.clear();
@@ -249,6 +261,17 @@ export class CodexAppServerTranslator {
         const prev = this.textByItem.get(params.itemId) ?? '';
         const next = prev + params.delta;
         this.textByItem.set(params.itemId, next);
+        if (this.finalTextItems.has(params.itemId)) {
+            return [
+                {
+                    type: 'final_answer',
+                    text: next,
+                    itemId: params.itemId,
+                    complete: false,
+                    timestamp: this.now(),
+                },
+            ];
+        }
         return [
             {
                 type: 'turn_diff',
@@ -358,6 +381,19 @@ export class CodexAppServerTranslator {
             if (text || accumulated) {
                 const finalText = text || accumulated;
                 this.textByItem.set(item.id, finalText);
+                if (item.phase === 'final_answer' ||
+                    this.finalTextItems.has(item.id)) {
+                    this.finalTextItems.delete(item.id);
+                    return [
+                        {
+                            type: 'final_answer',
+                            text: finalText,
+                            itemId: item.id,
+                            complete: true,
+                            timestamp: this.now(),
+                        },
+                    ];
+                }
                 return [
                     {
                         type: 'turn_diff',
@@ -635,6 +671,26 @@ export class CodexAppServerTranslator {
     }
     handleItemStarted(params) {
         const item = params.item;
+        if (item.type === 'agentMessage') {
+            const phase = item.phase;
+            if (phase === 'final_answer') {
+                this.finalTextItems.add(item.id);
+                const text = item.text ?? '';
+                if (text) {
+                    this.textByItem.set(item.id, text);
+                    return [
+                        {
+                            type: 'final_answer',
+                            text,
+                            itemId: item.id,
+                            complete: false,
+                            timestamp: this.now(),
+                        },
+                    ];
+                }
+            }
+            return [];
+        }
         if (item.type === 'fileChange' && Array.isArray(item.changes)) {
             this.fileChangeItems.set(item.id, item.changes);
             const pending = this.pendingFileApprovalByItemId.get(item.id);

package/dist/runner/common/acp/base-translator.d.ts

@@ -19,16 +19,10 @@
  *   buildToolUseUpdate                                — tool_use patch from tool_call_update
  *   onUsageSample                                     — extra usage bookkeeping (opencode: cost)
  */
-import type { AgentEvent, ApprovalRequestedEvent, ResultEvent } from '../../types.js';
+import type { AgentEvent, ApprovalRequestedEvent, ApprovalView, ResultEvent, TurnStartedEvent } from '../../types.js';
 import { type AgentMessageChunkEvent, type AgentThoughtChunkEvent, type ToolCallEvent, type ToolCallUpdateEvent, type UsageUpdateEvent, type RequestPermissionParams, type AcpPlanEvent } from './protocol-types.js';
 /** Self-produced turn_started event (no wire equivalent — produced on prompt start). */
-export interface AcpTurnStartedEvent {
-    type: 'turn_started';
-    threadId: string;
-    turnId: string;
-    operationKind: 'turn' | 'compaction';
-    timestamp?: string;
-}
+export type AcpTurnStartedEvent = TurnStartedEvent;
 /**
  * Live usage snapshot from usage_update. The ACP wire carries context
  * occupancy (`used`) and the model context window (`size`) — there is NO
@@ -96,6 +90,7 @@ export declare abstract class BaseAcpTranslator {
      * is sent (no wire notification for this — self-produced).
      */
     produceTurnStarted(sessionId: string, turnId: string): AcpTurnStartedEvent;
+    protected approvalRequestedEvents(requestId: number | string, sessionId: string, view: ApprovalView): ApprovalRequestedEvent[];
     /**
      * Translate a prompt response into a result event.
      * stopReason: end_turn → success; cancelled → interrupted (independent
@@ -132,6 +127,10 @@ export declare abstract class BaseAcpTranslator {
     protected handleToolCall(event: ToolCallEvent, _sessionId: string): AcpTranslatorEvent[];
     /**
      * tool_call_update → user/tool_result. status:'failed' → is_error:true.
+     *
+     * 终态（completed/failed）产出 tool_result；非终态的 tool_result 由
+     * {@link emitToolResultForNonTerminalUpdate} 裁定（reducer 见到 tool_result
+     * 即置 status:'ok'——无内容的非终态 tool_result 会把运行中的工具提前翻成 ✅）。
      */
     protected handleToolCallUpdate(event: ToolCallUpdateEvent, _sessionId: string): AcpTranslatorEvent[];
     /**
@@ -183,6 +182,14 @@ export declare abstract class BaseAcpTranslator {
      * ({output} / {error}).
      */
     protected extractToolResultContent(event: ToolCallUpdateEvent): unknown;
+    /**
+     * 非终态 tool_call_update 是否附带 tool_result。默认 true（opencode seam
+     * 契约：in-progress 的输出快照随 tool_result 进面板）。kimi 覆写为
+     * 「有内容才发」——它的 in-progress 只带流式 args，空 tool_result 会让
+     * reducer 把运行中的工具提前置 ✅ + 空输出（终态丢失时面板停在错误的
+     * 「已完成」）。
+     */
+    protected emitToolResultForNonTerminalUpdate(content: unknown): boolean;
     /**
      * usage_update → context occupancy bookkeeping. The wire shape is
      * {used, size} (+ opencode: cost:{amount}) — context occupancy, not

package/dist/runner/common/acp/base-translator.js

@@ -1,3 +1,4 @@
+import { makeTurnStartedEvent } from '../turn-started.js';
 import { NotificationMethod, ServerRequestMethod, SessionEventType, } from './protocol-types.js';
 /**
  * ACP tool kind → 常用工具名映射（信息保真，数据驱动无 agent 分支）。
@@ -145,13 +146,21 @@ export class BaseAcpTranslator {
      */
     produceTurnStarted(sessionId, turnId) {
         this.currentTurnId = turnId;
-        return {
-            type: 'turn_started',
-            threadId: sessionId,
-            turnId,
-            operationKind: this.operationKind === 'compact' ? 'compaction' : 'turn',
-            timestamp: new Date().toISOString(),
-        };
+        return makeTurnStartedEvent(sessionId, turnId, this.operationKind);
+    }
+    approvalRequestedEvents(requestId, sessionId, view) {
+        return [
+            {
+                type: 'approval_requested',
+                requestId,
+                kind: 'command',
+                threadId: sessionId,
+                turnId: '',
+                itemId: '',
+                view,
+                timestamp: new Date().toISOString(),
+            },
+        ];
     }
     /**
      * Translate a prompt response into a result event.
@@ -269,6 +278,10 @@ export class BaseAcpTranslator {
     }
     /**
      * tool_call_update → user/tool_result. status:'failed' → is_error:true.
+     *
+     * 终态（completed/failed）产出 tool_result；非终态的 tool_result 由
+     * {@link emitToolResultForNonTerminalUpdate} 裁定（reducer 见到 tool_result
+     * 即置 status:'ok'——无内容的非终态 tool_result 会把运行中的工具提前翻成 ✅）。
      */
     handleToolCallUpdate(event, _sessionId) {
         const isError = event.status === 'failed';
@@ -293,6 +306,13 @@ export class BaseAcpTranslator {
             else if (event.rawInput !== undefined && event.rawInput !== null) {
                 this.trackToolCallArgs(event.toolCallId, stringifyUnknown(event.rawInput));
             }
+            // 非终态是否发 tool_result 由子类裁定（emitToolResultForNonTerminalUpdate）：
+            // opencode 的 in-progress 带输出快照，seam 契约钉死「patch + tool_result」
+            // 都要发（面板在工具运行时显示部分输出）；kimi 的 in-progress 只带流式
+            // args，空 tool_result 会让 reducer 把运行中的工具提前置 ✅ + 空输出。
+            if (!this.emitToolResultForNonTerminalUpdate(content)) {
+                return useUpdate ? [useUpdate] : [];
+            }
         }
         const events = [];
         if (useUpdate)
@@ -390,6 +410,17 @@ export class BaseAcpTranslator {
     extractToolResultContent(event) {
         return event.rawOutput ?? '';
     }
+    /**
+     * 非终态 tool_call_update 是否附带 tool_result。默认 true（opencode seam
+     * 契约：in-progress 的输出快照随 tool_result 进面板）。kimi 覆写为
+     * 「有内容才发」——它的 in-progress 只带流式 args，空 tool_result 会让
+     * reducer 把运行中的工具提前置 ✅ + 空输出（终态丢失时面板停在错误的
+     * 「已完成」）。
+     */
+    emitToolResultForNonTerminalUpdate(content) {
+        void content;
+        return true;
+    }
     /**
      * usage_update → context occupancy bookkeeping. The wire shape is
      * {used, size} (+ opencode: cost:{amount}) — context occupancy, not

package/dist/runner/common/jsonl-stream.js

@@ -1,4 +1,5 @@
 import { getLogger } from '../../logger/index.js';
+import { StringDecoder } from 'node:string_decoder';
 /**
  * Parse JSONL (newline-delimited JSON) from a readable stream.
  *
@@ -30,6 +31,8 @@ export function createJSONLStream(stdout, options) {
     // and push complete lines; the residual tail stays as array fragments until
     // the next newline or stream end. Net allocation: O(n) instead of O(n²).
     const partialFragments = [];
+    // 跨 chunk 多字节字符的边界安全解码器（见 stdout 'data' 处理）。
+    const decoder = new StringDecoder('utf8');
     // accumulated byte length of partialFragments. Backpressure (above)
     // only counts COMPLETE lines in lineQueue; a never-newline stream (malformed
     // output, binary garbage) accumulates fragments without ever completing a
@@ -60,6 +63,11 @@ export function createJSONLStream(stdout, options) {
     // Flush any trailing partial line and mark the stream finished. Shared by the
     // 'end'/'close'/'error' handlers so flush logic lives in one place (nit).
     function flushAndFinish() {
+        // decoder.end() 吐出被 chunk 边界切开的最后一个多字节字符的残余字节
+        //（无残尾时返回空串）：不加这句，末尾被切开的字符会凭空丢失。
+        const tail = decoder.end();
+        if (tail)
+            partialFragments.push(tail);
         if (partialFragments.length > 0) {
             const trimmed = partialFragments.join('').trim();
             if (trimmed)
@@ -109,7 +117,10 @@ export function createJSONLStream(stdout, options) {
         }
     }
     stdout.on('data', (chunk) => {
-        const text = chunk.toString('utf-8');
+        // StringDecoder 按字节边界解码：多字节字符（中文/emoji）被 chunk 边界
+        // 切开时，裸 toString 会产出不可逆的 U+FFFD（同族修复见
+        // jsonrpc/transport.ts，claude 的中文输出走本流）。
+        const text = decoder.write(chunk);
         // split on newlines. The first segment continues the pending partial
         // line (joined with accumulated fragments — one join per chunk, not per
         // byte); subsequent segments are complete lines. The last segment is the

package/dist/runner/common/jsonrpc/connection-manager.js

@@ -84,7 +84,17 @@ export class ConnectionManager {
             if (existing) {
                 // If a create is in flight, wait for it
                 if (existing.createPromise) {
-                    return existing.createPromise;
+                    const client = await existing.createPromise;
+                    // 快速路径复核（与下方建槽方的竞态复核对称）：await 期间槽位被
+                    // release()/disposeAll() 删掉时，建槽方会 dispose 该连接并重试——
+                    // 直接返回会把「已被建槽方 dispose 的连接」交给本调用方（表现为
+                    // setupTurn 抛 ConnectionLostError 走 respawn-retry 自愈）。槽位
+                    // 不再持有该 client 时与本轮创建同路：重试。
+                    const current = this.slots.get(cwd);
+                    if (current && current.client === client) {
+                        return client;
+                    }
+                    continue;
                 }
                 // Reuse when the (session-aware) reuse predicate holds — e.g. the client
                 // is ready and its transport is alive (default), or it is bound to the

package/dist/runner/common/jsonrpc/transport.d.ts

@@ -54,7 +54,8 @@ export declare class JsonlRpcTransport {
     get closed(): boolean;
     /**
      * Spawn the child process and start reading its stdout.
-     * Returns when the process closes (or immediately if spawn fails).
+     * Resolves once the process has spawned and listeners are wired — it does
+     * NOT wait for the process to close（关闭经 events.onClose 上报）。
      */
     start(events: TransportEvents): Promise<void>;
     /**

package/dist/runner/common/jsonrpc/transport.js

@@ -62,7 +62,8 @@ export class JsonlRpcTransport {
     }
     /**
      * Spawn the child process and start reading its stdout.
-     * Returns when the process closes (or immediately if spawn fails).
+     * Resolves once the process has spawned and listeners are wired — it does
+     * NOT wait for the process to close（关闭经 events.onClose 上报）。
      */
     async start(events) {
         this.events = events;
@@ -121,6 +122,11 @@ export class JsonlRpcTransport {
         const decoder = new StringDecoder('utf8');
         let remainder = '';
         proc.stdout?.on('data', (chunk) => {
+            // handleClose（超长行/EPIPE/进程 error）判死通道后不再分发：子进程被
+            // terminator 停止前还会吐几帧，把这些帧交给 onMessage 等于向已判死的
+            // run 注入事件。
+            if (this._closed)
+                return;
             remainder += decoder.write(chunk);
             const lines = remainder.split('\n');
             // Lines except the last (incomplete) one

package/dist/runner/common/spawning-runner.js

@@ -374,13 +374,19 @@ export class SpawningRunner {
             try {
                 process.kill(-pid, 'SIGTERM');
             }
-            catch {
-                // process may have exited
+            catch (err) {
+                const code = err.code;
+                if (code === 'ESRCH') {
+                    getLogger().debug(`[${this.logTag}] orphan process group ${-pid} already exited`);
+                }
+                else {
+                    getLogger().warn(`[${this.logTag}] killOrphan failed to signal process group ${-pid}: ${err?.message ?? String(err)}`);
+                }
             }
             bestEffortUnlink(this.pidFilePath);
         }
-        catch {
-            // ignore
+        catch (err) {
+            getLogger().warn(`[${this.logTag}] killOrphan failed for ${this.pidFilePath}: ${err?.message ?? String(err)}`);
         }
     }
     /**

package/dist/runner/common/turn-started.d.ts

@@ -0,0 +1,2 @@
+import type { TurnStartedEvent } from '../types.js';
+export declare function makeTurnStartedEvent(sessionId: string, turnId: string, operationKind: 'turn' | 'compact'): TurnStartedEvent;

package/dist/runner/common/turn-started.js

@@ -0,0 +1,10 @@
+export function makeTurnStartedEvent(sessionId, turnId, operationKind) {
+    return {
+        type: 'turn_started',
+        threadId: sessionId,
+        turnId,
+        operationKind: operationKind === 'compact' ? 'compaction' : 'turn',
+        timestamp: new Date().toISOString(),
+    };
+}
+//# sourceMappingURL=turn-started.js.map

package/dist/runner/dsh/approval.js

@@ -8,6 +8,7 @@
  * `callId`, with an order-independent pairing so either transport may arrive
  * first.
  */
+import { getLogger } from '../../logger/index.js';
 export class DshApprovalTracker {
     audits = new Map();
     waterfallByCallId = new Map();
@@ -22,8 +23,17 @@ export class DshApprovalTracker {
         this.audits.set(audit.approvalId, audit);
         if (audit.callId) {
             const waterfall = this.waterfallByCallId.get(audit.callId);
-            if (waterfall)
-                return this.bind(audit, waterfall);
+            if (waterfall) {
+                const boundTo = this.approvalIdByEventId.get(waterfall.eventId);
+                if (!boundTo || boundTo === audit.approvalId) {
+                    return this.bind(audit, waterfall);
+                }
+                // 该 waterfall 已被兜底配对绑给另一张卡（「无 callId 的 audit 先到 +
+                // waterfall 先到」的乱序组合，见 onWaterfall 的 toolName 启发式）：
+                // 不再二次绑定——两张卡指向同一可答 waterfall 时，先答的生效、
+                // 后答的服务端报错；单卡可答严格好于双卡可答。
+                getLogger().debug(`[dsh] waterfall already bound to ${boundTo}; skip rebind for ${audit.approvalId}`);
+            }
         }
         return undefined;
     }
@@ -86,8 +96,11 @@ export class DshApprovalTracker {
                     this.waterfallByCallId.delete(binding.waterfall.callId);
                 }
             }
-            this.resolveWaiters(approvalId, undefined);
         }
+        // 无论有无 binding 都要唤醒 waiter：approval/decided 落在「audit 已到、
+        // waterfall 未到」的窗口时，waitForBinding 的点击会白等满超时才收到
+        // 「审批通道尚未就绪」——而该审批实际上已被外部决策结束。
+        this.resolveWaiters(approvalId, undefined);
         return binding;
     }
     /** Mark a waterfall cancelled by the Host (another client answered it). */

package/dist/runner/dsh/auth.js

@@ -10,10 +10,10 @@
  */
 import { createHash, createHmac } from 'node:crypto';
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
 import YAML from 'yaml';
 import { isWin32 } from '../../platform/select.js';
+import { resolveDshHome } from './home.js';
 /** Credential record that owns the browser-cookie signing secret. */
 export const DSH_BROWSER_CREDENTIAL_KEY = 'client-connection/browser-session';
 /** Short lifetime keeps every request safely inside DSH's configurable max age. */
@@ -29,8 +29,7 @@ function isRecord(value) {
  * file matches the `DSH_HOME` lark-remote passes to a process it starts.
  */
 export function resolveDshCredentialsFile(env = process.env, configuredHome) {
-    const home = configuredHome?.trim() || env.DSH_HOME?.trim();
-    return path.join(home && home.length > 0 ? home : path.join(os.homedir(), '.dsh'), '.credentials.yaml');
+    return path.join(resolveDshHome(configuredHome, env), '.credentials.yaml');
 }
 /** Whether a filesystem error means the credentials file is absent. */
 export function isDshCredentialsNotFound(error) {