lark-remote 0.5.12 → 0.5.14

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,19 @@ 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(),
+                        }
+                        : this.turnDiffEvent({
+                            threadId: params?.threadId ?? this.threadId,
+                            turnId: params?.turn?.id ?? this.turnId,
+                        }, { text, itemId: item.id, complete: true }));
                 }
             }
             else if (item.type === 'plan') {
@@ -158,15 +164,10 @@ export class CodexAppServerTranslator {
                 const planText = item.text ?? '';
                 if (planText && this.planByItem.get(item.id) !== planText) {
                     this.planByItem.set(item.id, planText);
-                    events.push({
-                        type: 'turn_diff',
-                        plan: planText,
-                        itemId: item.id,
-                        complete: true,
+                    events.push(this.turnDiffEvent({
                         threadId: params?.threadId ?? this.threadId,
                         turnId: params?.turn?.id ?? this.turnId,
-                        timestamp: this.now(),
-                    });
+                    }, { plan: planText, itemId: item.id, complete: true }));
                 }
             }
         }
@@ -228,6 +229,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,30 +251,28 @@ export class CodexAppServerTranslator {
         const prev = this.textByItem.get(params.itemId) ?? '';
         const next = prev + params.delta;
         this.textByItem.set(params.itemId, next);
-        return [
-            {
-                type: 'turn_diff',
-                text: next,
-                itemId: params.itemId,
-                threadId: params.threadId,
-                turnId: params.turnId,
-                timestamp: this.now(),
-            },
-        ];
+        if (this.finalTextItems.has(params.itemId)) {
+            return [
+                {
+                    type: 'final_answer',
+                    text: next,
+                    itemId: params.itemId,
+                    complete: false,
+                    timestamp: this.now(),
+                },
+            ];
+        }
+        return [this.turnDiffEvent(params, { text: next, itemId: params.itemId })];
     }
     handleReasoningDelta(params) {
         // summaryTextDelta 流的是摘要文本；与 content 段落分开累积，避免段落交错。
         const entry = this.reasoningEntry(params.itemId);
         entry.summary += params.delta;
         return [
-            {
-                type: 'turn_diff',
+            this.turnDiffEvent(params, {
                 reasoning: this.reasoningSnapshotFor(entry),
                 itemId: params.itemId,
-                threadId: params.threadId,
-                turnId: params.turnId,
-                timestamp: this.now(),
-            },
+            }),
         ];
     }
     handleReasoningPartAdded() {
@@ -287,15 +287,11 @@ export class CodexAppServerTranslator {
             // 权威文件变更（含聚合后的 diff）；以快照语义替换本 item 的变更列表。
             this.fileChangeItems.set(item.id, item.changes);
             return [
-                {
-                    type: 'turn_diff',
+                this.turnDiffEvent(params, {
                     fileChanges: normalizeFileChanges(item.changes),
                     itemId: item.id,
                     complete: true,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
+                }),
             ];
         }
         if (item.type === 'reasoning') {
@@ -307,15 +303,11 @@ export class CodexAppServerTranslator {
                 entry.content = new Map(content.map((c, i) => [i, c]));
                 entry.summary = summary.join('\n');
                 return [
-                    {
-                        type: 'turn_diff',
+                    this.turnDiffEvent(params, {
                         reasoning: this.reasoningSnapshotFor(entry),
                         itemId: item.id,
                         complete: true,
-                        threadId: params.threadId,
-                        turnId: params.turnId,
-                        timestamp: this.now(),
-                    },
+                    }),
                 ];
             }
         }
@@ -335,17 +327,13 @@ export class CodexAppServerTranslator {
             const meta = this.toolItemMeta.get(item.id);
             this.toolItemMeta.delete(item.id);
             return [
-                {
-                    type: 'turn_diff',
+                this.turnDiffEvent(params, {
                     toolOutput: authoritative,
                     ...meta,
                     itemId: item.id,
                     complete: true,
                     toolStatus: commandExecutionStatusToToolStatus(item.status),
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
+                }),
             ];
         }
         if (item.type === 'agentMessage') {
@@ -358,16 +346,25 @@ 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',
+                    this.turnDiffEvent(params, {
                         text: finalText,
                         itemId: item.id,
                         complete: true,
-                        threadId: params.threadId,
-                        turnId: params.turnId,
-                        timestamp: this.now(),
-                    },
+                    }),
                 ];
             }
         }
@@ -376,15 +373,11 @@ export class CodexAppServerTranslator {
             if (text) {
                 this.planByItem.set(item.id, text);
                 return [
-                    {
-                        type: 'turn_diff',
+                    this.turnDiffEvent(params, {
                         plan: text,
                         itemId: item.id,
                         complete: true,
-                        threadId: params.threadId,
-                        turnId: params.turnId,
-                        timestamp: this.now(),
-                    },
+                    }),
                 ];
             }
         }
@@ -396,16 +389,12 @@ export class CodexAppServerTranslator {
             this.toolItemMeta.delete(item.id);
             this.startedToolItems.delete(item.id);
             return [
-                {
-                    type: 'turn_diff',
+                this.turnDiffEvent(params, {
                     toolOutput: this.toolOutputByItem.get(item.id) ?? '',
                     ...meta,
                     itemId: item.id,
                     complete: true,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
+                }),
             ];
         }
         return [];
@@ -416,14 +405,10 @@ export class CodexAppServerTranslator {
         const prev = entry.content.get(index) ?? '';
         entry.content.set(index, prev + params.delta);
         return [
-            {
-                type: 'turn_diff',
+            this.turnDiffEvent(params, {
                 reasoning: this.reasoningSnapshotFor(entry),
                 itemId: params.itemId,
-                threadId: params.threadId,
-                turnId: params.turnId,
-                timestamp: this.now(),
-            },
+            }),
         ];
     }
     handleCommandOutputDelta(params) {
@@ -431,15 +416,11 @@ export class CodexAppServerTranslator {
         const next = prev + params.delta;
         this.toolOutputByItem.set(params.itemId, next);
         return [
-            {
-                type: 'turn_diff',
+            this.turnDiffEvent(params, {
                 toolOutput: next,
                 ...this.toolItemMeta.get(params.itemId),
                 itemId: params.itemId,
-                threadId: params.threadId,
-                turnId: params.turnId,
-                timestamp: this.now(),
-            },
+            }),
         ];
     }
     handlePlanUpdated(params) {
@@ -449,14 +430,10 @@ export class CodexAppServerTranslator {
         const next = prev + params.delta;
         this.planByItem.set(params.itemId, next);
         return [
-            {
-                type: 'turn_diff',
+            this.turnDiffEvent(params, {
                 plan: next,
                 itemId: params.itemId,
-                threadId: params.threadId,
-                turnId: params.turnId,
-                timestamp: this.now(),
-            },
+            }),
         ];
     }
     handleTokenUsageUpdated(params) {
@@ -635,6 +612,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);
@@ -649,112 +646,78 @@ export class CodexAppServerTranslator {
                             view: { ...pending.view, fileChanges },
                             timestamp: new Date().toISOString(),
                         },
-                        {
-                            type: 'turn_diff',
+                        this.turnDiffEvent(params, {
                             fileChanges,
                             itemId: item.id,
-                            threadId: params.threadId,
-                            turnId: params.turnId,
-                            timestamp: this.now(),
-                        },
+                        }),
                     ];
                 }
             }
             return [
-                {
-                    type: 'turn_diff',
+                this.turnDiffEvent(params, {
                     fileChanges: normalizeFileChanges(item.changes),
                     itemId: item.id,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
+                }),
             ];
         }
         if (item.type === 'commandExecution') {
             // item/started 锚定工具块位置（真实时序）：命令开始时即创建工具块，
             // 而不是等到首个输出 delta——否则后续 reasoning item 会插到 command 之前。
-            this.startedToolItems.add(item.id);
-            // 信息保真 记录工具身份，随 turn_diff 透传（run-state 首见时写入）。
-            this.toolItemMeta.set(item.id, {
+            return this.beginToolItem(item.id, params, {
                 toolName: 'Bash',
                 toolInput: { command: item.command, ...(item.cwd ? { cwd: item.cwd } : {}) },
                 toolHint: 'shell',
             });
-            return [
-                {
-                    type: 'turn_diff',
-                    toolOutput: '',
-                    ...this.toolItemMeta.get(item.id),
-                    itemId: item.id,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
-            ];
         }
         if (item.type === 'webSearch') {
-            this.startedToolItems.add(item.id);
-            this.toolItemMeta.set(item.id, {
+            return this.beginToolItem(item.id, params, {
                 toolName: 'WebSearch',
                 toolInput: { query: item.query },
                 toolHint: 'web',
             });
-            return [
-                {
-                    type: 'turn_diff',
-                    toolOutput: '',
-                    ...this.toolItemMeta.get(item.id),
-                    itemId: item.id,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
-            ];
         }
         if (item.type === 'mcpToolCall') {
             // ThreadItem union 含 catch-all 成员，判别收窄会与泛型成员并集；
             // 显式断言到具体 interface（字段名已经 v2 schema 确认）。
             const mcpItem = item;
-            this.startedToolItems.add(item.id);
-            this.toolItemMeta.set(item.id, {
+            return this.beginToolItem(item.id, params, {
                 toolName: `mcp__${mcpItem.server}__${mcpItem.tool}`,
                 toolInput: mcpItem.arguments ?? {},
                 toolHint: 'search',
             });
-            return [
-                {
-                    type: 'turn_diff',
-                    toolOutput: '',
-                    ...this.toolItemMeta.get(item.id),
-                    itemId: item.id,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
-            ];
         }
         if (item.type === 'dynamicToolCall') {
             const dynItem = item;
-            this.startedToolItems.add(item.id);
-            this.toolItemMeta.set(item.id, {
+            return this.beginToolItem(item.id, params, {
                 toolName: dynItem.tool,
                 toolInput: dynItem.arguments ?? {},
             });
-            return [
-                {
-                    type: 'turn_diff',
-                    toolOutput: '',
-                    ...this.toolItemMeta.get(item.id),
-                    itemId: item.id,
-                    threadId: params.threadId,
-                    turnId: params.turnId,
-                    timestamp: this.now(),
-                },
-            ];
         }
         return [];
     }
+    /**
+     * turn_diff 的统一信封：`type` + threadId/turnId/timestamp 三个公共字段在此
+     * 一次装配（十余个构造点原本各抄一遍，还得挂 `as TurnDiffEvent`）。
+     */
+    turnDiffEvent(ids, fields) {
+        return {
+            type: 'turn_diff',
+            ...fields,
+            threadId: ids.threadId,
+            turnId: ids.turnId,
+            timestamp: this.now(),
+        };
+    }
+    /**
+     * 工具型 item 的 started 处理（commandExecution / webSearch / mcpToolCall /
+     * dynamicToolCall 四个分支同形）：登记「已开始」锚点 + 记录工具身份 meta，
+     * 再发一帧空的 turn_diff 把工具块按真实时序插进卡片。
+     */
+    beginToolItem(itemId, params, meta) {
+        this.startedToolItems.add(itemId);
+        this.toolItemMeta.set(itemId, meta);
+        return [this.turnDiffEvent(params, { toolOutput: '', ...meta, itemId })];
+    }
     handlePermissionsApproval(requestId, params) {
         const permItems = this.buildPermissionItems(params.permissions);
         const view = {

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

@@ -18,7 +18,9 @@
  *     Bash notifications and serves terminal/* reverse RPC; opencode is plain
  *   - getStatusInfo / updateApprovalMode: agent-specific extras & mode vocab
  */
-import type { AgentEvent, AgentKind, AgentSessionReader, SpawnOptions } from '../../types.js';
+import type { AgentKind } from '../../../agent-kinds.js';
+import type { AgentSessionReader } from '../../../session-contract.js';
+import type { AgentEvent, SpawnOptions } from '../../types.js';
 import { ConnectionManager } from '../jsonrpc/connection-manager.js';
 import { JsonRpcClient } from '../jsonrpc/client.js';
 import { type SessionNewResult, type SessionResumeResult, type SessionPromptResult, type RequestPermissionParams } from './protocol-types.js';

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

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.

package/dist/runner/common/connection-based-runner.d.ts

@@ -14,7 +14,9 @@
  * handleNotification/handleServerRequest, respondApproval, pendingApprovals,
  * updateApprovalMode, getStatusInfo) and provide the small abstract hooks below.
  */
-import type { AgentKind, AgentSessionReader, AgentEvent, AgentRunner, AgentStatusInfo, SpawnOptions } from '../types.js';
+import type { AgentKind } from '../../agent-kinds.js';
+import type { AgentSessionReader } from '../../session-contract.js';
+import type { AgentEvent, AgentRunner, AgentStatusInfo, SpawnOptions } from '../types.js';
 import type { AgentStopper } from '../../platform/agent-stopper.js';
 export declare abstract class ConnectionBasedRunner<TClient, TEvent = AgentEvent> implements AgentRunner {
     readonly kind: AgentKind;

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

@@ -12,6 +12,10 @@ import { binaryName } from '../../../platform/identity.js';
 import { createTerminator } from '../../../platform/terminator.js';
 import { agentStopperRegistry, } from '../../../platform/agent-stopper.js';
 import { getLogger } from '../../../logger/index.js';
+/** 日志用的错误摘要（onClose 的 reason 仍是稳定分类码）。 */
+function describeErr(err) {
+    return err instanceof Error ? err.message : String(err);
+}
 /** Max bytes for a single line before we disconnect (10MB). */
 const MAX_LINE_BYTES = 10 * 1024 * 1024;
 /** Max bytes retained from stderr for diagnostics (64KB). */
@@ -205,8 +209,8 @@ export class JsonlRpcTransport {
             this.writeQueue.push(Buffer.from(JSON.stringify(msg) + '\n', 'utf8'));
             this.flush();
         }
-        catch {
-            this.handleClose('epipe');
+        catch (err) {
+            this.handleClose('epipe', describeErr(err));
         }
     }
     /** Send queued lines to stdin, pausing on backpressure until drain. */
@@ -229,7 +233,7 @@ export class JsonlRpcTransport {
             try {
                 const ok = stdin.write(chunk, (err) => {
                     if (err) {
-                        this.handleClose('epipe');
+                        this.handleClose('epipe', describeErr(err));
                     }
                 });
                 if (!ok) {
@@ -240,8 +244,8 @@ export class JsonlRpcTransport {
                     next();
                 }
             }
-            catch {
-                this.handleClose('epipe');
+            catch (err) {
+                this.handleClose('epipe', describeErr(err));
             }
         };
         next();
@@ -288,10 +292,11 @@ export class JsonlRpcTransport {
         this.registration = null;
         this.stoppers.unregister(this.agent, reg.pid, reg.stopper);
     }
-    handleClose(reason) {
+    handleClose(reason, detail) {
         if (this._closed)
             return;
         this._closed = true;
+        const dropped = this.writeQueue.length;
         this.writeQueue = [];
         // Remove the exit listener to avoid double-firing
         if (this.proc) {
@@ -319,7 +324,12 @@ export class JsonlRpcTransport {
         // 统一关闭出口：EPIPE/超长行/进程 error 都必须通知上层（connection-manager
         // 靠 onClose 删除 slot、client 靠它 failPending），否则 slot 悬挂死连接。
         this.events?.onClose(reason);
-        getLogger().info(`[jsonrpc-transport] closed: ${reason}`);
+        // reason 是给上层的稳定分类码；原始 err 与被丢弃的排队条数只进日志，
+        // 否则「stdin 写失败」到底写了什么、丢了什么都查不出来。
+        const suffix = [detail, dropped > 0 ? `${dropped} queued message(s) dropped` : undefined]
+            .filter(Boolean)
+            .join('; ');
+        getLogger().info(`[jsonrpc-transport] closed: ${reason}${suffix ? ` (${suffix})` : ''}`);
     }
 }
 //# sourceMappingURL=transport.js.map

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