lark-remote 0.5.20 → 0.5.21

package/dist/runner/dsh/translator.js

@@ -23,191 +23,193 @@
  *   → ResultEvent.usage: input_tokens/output_tokens/cache_read_tokens/
  *     cache_creation_tokens (cacheWrite = cache creation) + total_tokens sum.
  */
-export class DshTranslator {
-    /** 本 turn 累计用量：DSH 每次模型调用（step）一条 usage，工具往返 = 多条。 */
-    turnUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-    /** 末次采样的 usage：上下文水位，或只有 live chunk 时的兜底值。 */
-    lastUsage;
-    /** 是否收到过 durable assistant/message.usage（唯一累加来源）。 */
-    hasMessageUsage = false;
-    /** 是否只收到过 live usage chunk（无 durable message usage 时的兜底）。 */
-    hasStreamUsage = false;
-    /** 当前 attempt 的 id（start 帧携带，chunk 帧也带；断开重连重放时不变）。 */
-    attemptId = '0';
-    /**
-     * 本 turn 末条 durable assistant 消息的正文（**完整**、未截断）。
-     *
-     * live chunk 是逐 delta 拼接、会被状态层的 MAX_TEXT_CHARS 窗口截断；
-     * durable `assistant/message` 一次就到齐全文。收 turn 时把它挂在 result 上，
-     * 卡片才能渲染完整回答。
-     */
-    lastMessageText;
-    /** Translate one live assistant-stream chunk into AgentEvents. */
-    streamFrameToAgentEvents(frame, _sessionId) {
-        if (frame.type === 'start') {
-            if (frame.attemptId)
-                this.attemptId = frame.attemptId;
-            return [];
-        }
-        if (frame.type !== 'chunk' || !frame.chunk)
-            return [];
-        return this.chunkToAgentEvents(frame.chunk, frame.time ?? Date.now(), frame.attemptId ?? this.attemptId);
-    }
-    /**
-     * Record durable per-step usage — the accumulation source. assistant/message
-     * carries exactly one usage per model call and is seq-deduped by the client,
-     * so summing it gives the turn total without double counting.
-     */
-    recordMessageUsage(usage) {
-        this.turnUsage.input += usage.inputTokens ?? 0;
-        this.turnUsage.output += usage.outputTokens ?? 0;
-        this.turnUsage.cacheRead += usage.cacheReadTokens ?? 0;
-        this.turnUsage.cacheWrite += usage.cacheWriteTokens ?? 0;
-        this.lastUsage = usage;
-        this.hasMessageUsage = true;
+function newTurnState() {
+    return {
+        turnUsage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+        hasMessageUsage: false,
+        hasStreamUsage: false,
+        attemptId: '0',
+    };
+}
+// --- 模块级状态操作原语 ---
+/**
+ * Record durable per-step usage — the accumulation source. assistant/message
+ * carries exactly one usage per model call and is seq-deduped by the client,
+ * so summing it gives the turn total without double counting.
+ */
+function recordMessageUsage(state, usage) {
+    state.turnUsage.input += usage.inputTokens ?? 0;
+    state.turnUsage.output += usage.outputTokens ?? 0;
+    state.turnUsage.cacheRead += usage.cacheReadTokens ?? 0;
+    state.turnUsage.cacheWrite += usage.cacheWriteTokens ?? 0;
+    state.lastUsage = usage;
+    state.hasMessageUsage = true;
+}
+/**
+ * Record a live usage chunk. Never summed: the same step also arrives as a
+ * durable assistant/message.usage, so summing both would double count. It only
+ * refreshes the watermark and covers a turn whose messages never persisted.
+ */
+function recordStreamUsage(state, usage) {
+    state.lastUsage = usage;
+    state.hasStreamUsage = true;
+}
+function chunkToAgentEvents(state, chunk, time, attemptId = '0') {
+    if (chunk.type === 'usage' && chunk.usage && typeof chunk.usage === 'object') {
+        recordStreamUsage(state, chunk.usage);
+        return [];
     }
-    /**
-     * Record a live usage chunk. Never summed: the same step also arrives as a
-     * durable assistant/message.usage, so summing both would double count. It only
-     * refreshes the watermark and covers a turn whose messages never persisted.
-     */
-    recordStreamUsage(usage) {
-        this.lastUsage = usage;
-        this.hasStreamUsage = true;
+    const ts = new Date(time).toISOString();
+    if (chunk.type === 'text-delta' && typeof chunk.text === 'string' && chunk.text) {
+        return [
+            {
+                type: 'assistant',
+                message: { content: [{ type: 'text', text: chunk.text }] },
+                timestamp: ts,
+            },
+        ];
     }
-    chunkToAgentEvents(chunk, time, attemptId = '0') {
-        if (chunk.type === 'usage' && chunk.usage && typeof chunk.usage === 'object') {
-            this.recordStreamUsage(chunk.usage);
-            return [];
-        }
-        const ts = new Date(time).toISOString();
-        if (chunk.type === 'text-delta' && typeof chunk.text === 'string' && chunk.text) {
-            return [
-                {
-                    type: 'assistant',
-                    message: { content: [{ type: 'text', text: chunk.text }] },
-                    timestamp: ts,
-                },
-            ];
-        }
-        if (chunk.type === 'reasoning-delta' && typeof chunk.text === 'string' && chunk.text) {
-            return [
-                {
-                    type: 'assistant',
-                    message: {
-                        content: [
-                            {
-                                type: 'thinking',
-                                thinking: chunk.text,
-                                // 同一 attempt 的同一 reasoning block：token delta 共享 itemId。
-                                itemId: `r:${attemptId}:${chunk.index}`,
-                            },
-                        ],
-                    },
-                    timestamp: ts,
+    if (chunk.type === 'reasoning-delta' && typeof chunk.text === 'string' && chunk.text) {
+        return [
+            {
+                type: 'assistant',
+                message: {
+                    content: [
+                        {
+                            type: 'thinking',
+                            thinking: chunk.text,
+                            // 同一 attempt 的同一 reasoning block：token delta 共享 itemId。
+                            itemId: `r:${attemptId}:${chunk.index}`,
+                        },
+                    ],
                 },
-            ];
-        }
+                timestamp: ts,
+            },
+        ];
+    }
+    return [];
+}
+/** Translate one live assistant-stream chunk into AgentEvents. */
+function translateStreamFrame(state, frame, _sessionId) {
+    if (frame.type === 'start') {
+        if (frame.attemptId)
+            state.attemptId = frame.attemptId;
         return [];
     }
-    /** Translate one session event into AgentEvents (may be empty). */
-    eventToAgentEvents(ev, sessionId) {
-        switch (ev.type) {
-            case 'assistant/chunk': {
-                const chunk = ev.data.chunk;
-                if (!chunk)
-                    return [];
-                return this.chunkToAgentEvents(chunk, ev.time);
-            }
-            case 'assistant/message': {
-                const raw = ev.data.usage;
-                if (raw && typeof raw === 'object') {
-                    this.recordMessageUsage(raw);
-                }
-                // 每条 durable 消息都带完整正文；记最后一条非空的就是本轮回答。
-                const text = messageText(ev.data.message);
-                if (text.trim())
-                    this.lastMessageText = text;
-                return [];
-            }
-            case 'tool/call': {
-                // DSH 把「模型发起调用」落成独立事件（name/arguments 是模型原始输出）。
-                // 这是卡片工具行的唯一来源：assistant/message 里只有完成后的正文块，
-                // 不含调用轨迹。
-                const call = ev.data;
-                const id = typeof call.callId === 'string' ? call.callId : '';
-                const name = typeof call.name === 'string' ? call.name : '';
-                if (!id || !name)
-                    return [];
-                return [
-                    {
-                        type: 'assistant',
-                        message: {
-                            content: [{ type: 'tool_use', id, name, input: parseToolArguments(call.arguments) }],
-                        },
-                        timestamp: new Date(ev.time).toISOString(),
-                    },
-                ];
-            }
-            case 'tool/result': {
-                const data = ev.data;
-                const msg = data.message;
-                const toolCallId = typeof msg?.toolCallId === 'string' ? msg.toolCallId : '';
-                if (!toolCallId)
-                    return [];
-                return [
+    if (frame.type !== 'chunk' || !frame.chunk)
+        return [];
+    return chunkToAgentEvents(state, frame.chunk, frame.time ?? Date.now(), frame.attemptId ?? state.attemptId);
+}
+function handleAssistantChunk(state, ev, _sessionId) {
+    const chunk = ev.data.chunk;
+    if (!chunk)
+        return [];
+    return chunkToAgentEvents(state, chunk, ev.time);
+}
+function handleAssistantMessage(state, ev, _sessionId) {
+    const raw = ev.data.usage;
+    if (raw && typeof raw === 'object') {
+        recordMessageUsage(state, raw);
+    }
+    // 每条 durable 消息都带完整正文；记最后一条非空的就是本轮回答。
+    const text = messageText(ev.data.message);
+    if (text.trim())
+        state.lastMessageText = text;
+    return [];
+}
+function handleToolCall(_state, ev, _sessionId) {
+    // DSH 把「模型发起调用」落成独立事件（name/arguments 是模型原始输出）。
+    // 这是卡片工具行的唯一来源：assistant/message 里只有完成后的正文块，
+    // 不含调用轨迹。
+    const call = ev.data;
+    const id = typeof call.callId === 'string' ? call.callId : '';
+    const name = typeof call.name === 'string' ? call.name : '';
+    if (!id || !name)
+        return [];
+    return [
+        {
+            type: 'assistant',
+            message: {
+                content: [{ type: 'tool_use', id, name, input: parseToolArguments(call.arguments) }],
+            },
+            timestamp: new Date(ev.time).toISOString(),
+        },
+    ];
+}
+function handleToolResult(_state, ev, _sessionId) {
+    const data = ev.data;
+    const msg = data.message;
+    const toolCallId = typeof msg?.toolCallId === 'string' ? msg.toolCallId : '';
+    if (!toolCallId)
+        return [];
+    return [
+        {
+            type: 'user',
+            message: {
+                content: [
                     {
-                        type: 'user',
-                        message: {
-                            content: [
-                                {
-                                    type: 'tool_result',
-                                    tool_use_id: toolCallId,
-                                    content: toolResultText(msg?.content, data.error),
-                                    is_error: msg?.isError === true,
-                                },
-                            ],
-                        },
-                        timestamp: new Date(ev.time).toISOString(),
+                        type: 'tool_result',
+                        tool_use_id: toolCallId,
+                        content: toolResultText(msg?.content, data.error),
+                        is_error: msg?.isError === true,
                     },
-                ];
-            }
-            case 'turn/end': {
-                const turnReason = ev.data.reason;
-                const reason = turnReason?.kind;
-                const subtype = reason === 'completed'
-                    ? 'success'
-                    : reason === 'aborted' || reason === 'interrupted' || reason === 'forked'
-                        ? 'interrupted'
-                        : 'error';
-                const result = {
-                    type: 'result',
-                    subtype,
-                    session_id: sessionId,
-                    timestamp: new Date(ev.time).toISOString(),
-                };
-                if (this.hasMessageUsage) {
-                    // 本 turn 各采样之和（多步工具往返 = 多条 assistant/message）。
-                    result.usage = mapAggregatedUsage(this.turnUsage);
-                }
-                else if (this.hasStreamUsage && this.lastUsage) {
-                    // 只有 live usage chunk（消息未落盘，如启动期中断）：退回末次采样。
-                    result.usage = mapUsage(this.lastUsage);
-                }
-                if (subtype === 'error') {
-                    const detail = turnReason?.error?.message;
-                    result.errorMessage = detail
-                        ? `turn ended with reason: ${reason}: ${detail}`
-                        : `turn ended with reason: ${reason}`;
-                }
-                if (this.lastMessageText) {
-                    result.finalAnswerText = this.lastMessageText;
-                }
-                return [result];
-            }
-            default:
-                return [];
-        }
+                ],
+            },
+            timestamp: new Date(ev.time).toISOString(),
+        },
+    ];
+}
+function handleTurnEnd(state, ev, sessionId) {
+    const turnReason = ev.data.reason;
+    const reason = turnReason?.kind;
+    const subtype = reason === 'completed'
+        ? 'success'
+        : reason === 'aborted' || reason === 'interrupted' || reason === 'forked'
+            ? 'interrupted'
+            : 'error';
+    const result = {
+        type: 'result',
+        subtype,
+        session_id: sessionId,
+        timestamp: new Date(ev.time).toISOString(),
+    };
+    if (state.hasMessageUsage) {
+        // 本 turn 各采样之和（多步工具往返 = 多条 assistant/message）。
+        result.usage = mapAggregatedUsage(state.turnUsage);
+    }
+    else if (state.hasStreamUsage && state.lastUsage) {
+        // 只有 live usage chunk（消息未落盘，如启动期中断）：退回末次采样。
+        result.usage = mapUsage(state.lastUsage);
+    }
+    if (subtype === 'error') {
+        const detail = turnReason?.error?.message;
+        result.errorMessage = detail
+            ? `turn ended with reason: ${reason}: ${detail}`
+            : `turn ended with reason: ${reason}`;
+    }
+    if (state.lastMessageText) {
+        result.finalAnswerText = state.lastMessageText;
+    }
+    return [result];
+}
+/** 事件类型 → handler。用 Map 而非对象字面量，避免 prototype 键命中。 */
+const SESSION_EVENT_HANDLERS = new Map([
+    ['assistant/chunk', handleAssistantChunk],
+    ['assistant/message', handleAssistantMessage],
+    ['tool/call', handleToolCall],
+    ['tool/result', handleToolResult],
+    ['turn/end', handleTurnEnd],
+]);
+export class DshTranslator {
+    state = newTurnState();
+    /** Translate one live assistant-stream chunk into AgentEvents. */
+    streamFrameToAgentEvents(frame, _sessionId) {
+        return translateStreamFrame(this.state, frame, _sessionId);
+    }
+    /** Translate one session event into AgentEvents (may be empty). */
+    eventToAgentEvents(ev, sessionId) {
+        const handler = SESSION_EVENT_HANDLERS.get(ev.type);
+        return handler ? handler(this.state, ev, sessionId) : [];
     }
 }
 /**

package/dist/runner/kimi/acp/runner.js

@@ -73,6 +73,85 @@ function toAcpMode(mode) {
             return 'yolo';
     }
 }
+// =============================================================================
+// buildQuestionResponse 的模块级命名 handler（闭包搬出，显式传状态）
+// =============================================================================
+function nonEmptyString(v) {
+    return typeof v === 'string' && v.length > 0;
+}
+/** 单题答案 → content[qN]（多选清洗空串、单选取首个）。 */
+function collectOneAnswer(q, i, byIndex, content) {
+    const value = byIndex[i];
+    if (value === undefined)
+        return;
+    if (q.multiSelect) {
+        const values = Array.isArray(value) ? value : [value];
+        const cleaned = values.filter(nonEmptyString);
+        if (cleaned.length > 0)
+            content[`q${i}`] = cleaned;
+    }
+    else {
+        const single = Array.isArray(value) ? value[0] : value;
+        if (typeof single === 'string' && single.length > 0)
+            content[`q${i}`] = single;
+    }
+}
+/** elicitation form：{问题文本: 值} → 按问题顺序展开的 q0..qn content。 */
+function elicitationContent(questions, answers) {
+    const byIndex = mapAnswersByIndex(questions, answers);
+    const content = {};
+    for (let i = 0; i < questions.length; i++) {
+        collectOneAnswer(questions[i], i, byIndex, content);
+    }
+    return content;
+}
+function elicitationResponse(action, pending, response) {
+    if (action === 'answer') {
+        const answers = response.answers;
+        const questions = pending.view.questions ?? [];
+        return { action: 'accept', content: elicitationContent(questions, answers ?? {}) };
+    }
+    if (action === 'decline')
+        return { action: 'decline' };
+    return { action: 'cancel' };
+}
+/** request_permission 兜底桥：按 label 回显 qN_opt_M optionId。 */
+function selectedOptionId(options, label) {
+    for (const opt of options) {
+        if (/^q\d+_opt_\d+$/.test(opt.optionId) && opt.name === label)
+            return opt.optionId;
+    }
+    return undefined;
+}
+/** request_permission 兜底桥：找 qN_skip optionId。 */
+function skipOptionId(options) {
+    for (const opt of options) {
+        if (/^q\d+_skip$/.test(opt.optionId))
+            return opt.optionId;
+    }
+    return undefined;
+}
+function cancelledOutcome() {
+    return { outcome: { outcome: 'cancelled' } };
+}
+function selectedOutcome(optionId) {
+    return { outcome: { outcome: 'selected', optionId } };
+}
+function permissionResponse(action, pending, response) {
+    if (action === 'answer') {
+        const answers = response.answers;
+        const first = pending.view.questions?.[0];
+        const value = first ? answers?.[first.question] : undefined;
+        const label = Array.isArray(value) ? value[0] : value;
+        const optionId = selectedOptionId(pending.options ?? [], label);
+        return optionId ? selectedOutcome(optionId) : cancelledOutcome();
+    }
+    if (action === 'decline') {
+        const skipId = skipOptionId(pending.options ?? []);
+        return skipId ? selectedOutcome(skipId) : cancelledOutcome();
+    }
+    return cancelledOutcome();
+}
 /**
  * AskUserQuestion 回编（kind === 'question'）：
  * - elicitation form：answer → {action:'accept', content:{q0..qn}}（多选数组/
@@ -84,51 +163,9 @@ function toAcpMode(mode) {
  */
 function buildQuestionResponse(action, pending, response) {
     if (pending.proto === 'elicitation') {
-        if (action === 'answer') {
-            const answers = response.answers;
-            const questions = pending.view.questions ?? [];
-            const byIndex = mapAnswersByIndex(questions, answers ?? {});
-            const content = {};
-            questions.forEach((q, i) => {
-                const value = byIndex[i];
-                if (value === undefined)
-                    return;
-                if (q.multiSelect) {
-                    const values = Array.isArray(value) ? value : [value];
-                    const cleaned = values.filter((v) => typeof v === 'string' && v.length > 0);
-                    if (cleaned.length > 0)
-                        content[`q${i}`] = cleaned;
-                }
-                else {
-                    const single = Array.isArray(value) ? value[0] : value;
-                    if (typeof single === 'string' && single.length > 0)
-                        content[`q${i}`] = single;
-                }
-            });
-            return { action: 'accept', content };
-        }
-        if (action === 'decline')
-            return { action: 'decline' };
-        return { action: 'cancel' };
-    }
-    // request_permission 兜底桥（单题单选）
-    if (action === 'answer') {
-        const answers = response.answers;
-        const first = pending.view.questions?.[0];
-        const value = first ? answers?.[first.question] : undefined;
-        const label = Array.isArray(value) ? value[0] : value;
-        const option = (pending.options ?? []).find((opt) => /^q\d+_opt_\d+$/.test(opt.optionId) && opt.name === label);
-        if (option)
-            return { outcome: { outcome: 'selected', optionId: option.optionId } };
-        return { outcome: { outcome: 'cancelled' } };
+        return elicitationResponse(action, pending, response);
     }
-    if (action === 'decline') {
-        const skip = (pending.options ?? []).find((opt) => /^q\d+_skip$/.test(opt.optionId));
-        if (skip)
-            return { outcome: { outcome: 'selected', optionId: skip.optionId } };
-        return { outcome: { outcome: 'cancelled' } };
-    }
-    return { outcome: { outcome: 'cancelled' } };
+    return permissionResponse(action, pending, response);
 }
 // =============================================================================
 // Runner

package/dist/runner/opencode/acp/error-monitor.js

@@ -24,7 +24,7 @@
  * 5xx/network errors retry in seconds and must be left to opencode's own
  * retry loop (the idle watchdog remains the fallback for silent hangs).
  */
-import { closeSync, openSync, readSync, statSync } from 'node:fs';
+import fs from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { getLogger } from '../../../logger/index.js';
@@ -88,7 +88,7 @@ export class OpencodeLogErrorMonitor {
     }
     currentSize() {
         try {
-            return statSync(this.logPath).size;
+            return fs.statSync(this.logPath).size;
         }
         catch (err) {
             this.noteIoError(err);
@@ -124,14 +124,14 @@ export class OpencodeLogErrorMonitor {
         if (size > this.offset) {
             let chunk;
             try {
-                const fd = openSync(this.logPath, 'r');
+                const fd = fs.openSync(this.logPath, 'r');
                 try {
                     const buf = Buffer.alloc(size - this.offset);
-                    readSync(fd, buf, 0, buf.length, this.offset);
+                    fs.readSync(fd, buf, 0, buf.length, this.offset);
                     chunk = buf.toString('utf8');
                 }
                 finally {
-                    closeSync(fd);
+                    fs.closeSync(fd);
                 }
             }
             catch (err) {

package/dist/runner/pi/rpc/client.js

@@ -10,7 +10,7 @@
  * Response correlation is by command id; every non-response line is forwarded
  * as an event to the active hooks (the runner's translator).
  */
-import { ConnectionLostError } from '../../common/jsonrpc/client.js';
+import { ConnectionLostError, disposeRpcClientInstance, rejectAllPending, } from '../../common/jsonrpc/client.js';
 export class PiRpcClient {
     transport;
     requestTimeoutMs;
@@ -78,13 +78,8 @@ export class PiRpcClient {
             return;
         this.transport.write({ ...command, id: `req_${this.nextId++}` });
     }
-    async dispose() {
-        if (this._disposed)
-            return;
-        this._disposed = true;
-        this._ready = false;
-        this.failPending(new ConnectionLostError('pi rpc client disposed'));
-        await this.transport.close();
+    dispose() {
+        return disposeRpcClientInstance(this, this.pending, () => this.transport.close(), 'pi rpc client disposed');
     }
     // =========================================================================
     // Internal
@@ -104,11 +99,7 @@ export class PiRpcClient {
         this.runHooks?.onEvent?.(message);
     }
     failPending(err) {
-        for (const [_id, pending] of this.pending) {
-            clearTimeout(pending.timer);
-            pending.reject(err);
-        }
-        this.pending.clear();
+        rejectAllPending(this.pending, err);
     }
 }
 //# sourceMappingURL=client.js.map