lark-remote 0.2.2 → 0.4.0

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

@@ -11,6 +11,36 @@ const KIND_TO_TOOL = {
     search: 'Grep',
     fetch: 'WebFetch',
 };
+/**
+ * Join the text payloads of a tool_call(/_update) content array
+ * (`[{type:'content', content:{type:'text', text}}]` entries). Returns
+ * undefined when no text entry exists (diff/terminal-only content).
+ */
+function extractToolCallContentText(content) {
+    if (!Array.isArray(content))
+        return undefined;
+    let text = '';
+    let found = false;
+    for (const entry of content) {
+        const e = entry;
+        if (e?.type === 'content' && e.content?.type === 'text' && typeof e.content.text === 'string') {
+            text += e.content.text;
+            found = true;
+        }
+    }
+    return found ? text : undefined;
+}
+/** Best-effort stringify for tracked rawInput objects (never throws). */
+function stringifyUnknown(value) {
+    if (typeof value === 'string')
+        return value;
+    try {
+        return JSON.stringify(value) ?? String(value);
+    }
+    catch {
+        return String(value);
+    }
+}
 // =============================================================================
 // Translator base class
 // =============================================================================
@@ -25,6 +55,16 @@ export class BaseAcpTranslator {
     liveCostUsd;
     /** Current turn id, set by produceTurnStarted. */
     currentTurnId = '';
+    /**
+     * Latest streaming-args text per tool call (keyed by wire toolCallId).
+     * kimi ACP sends the permission request BEFORE tool.call.started (verified
+     * live against kimi 0.42.0, 2026-09-13): the request_permission toolCall
+     * carries only title + a truncated summary in content, NO rawInput — the
+     * full args only ever reach the client as accumulated text in the
+     * tool_call/tool_call_update streaming deltas. Tracking them here lets the
+     * approval handler correlate by toolCallId and recover the real command.
+     */
+    toolCallArgsByCallId = new Map();
     /**
      * Handle a notification from the ACP server and return translated events.
      * Wire envelope: {sessionId, update: {sessionUpdate: '<kind>', ...}} — the
@@ -191,6 +231,13 @@ export class BaseAcpTranslator {
                 // Keep raw string as-is
             }
         }
+        const argsText = extractToolCallContentText(event.content);
+        if (argsText !== undefined) {
+            this.trackToolCallArgs(event.toolCallId, argsText);
+        }
+        else if (event.rawInput !== undefined && event.rawInput !== null) {
+            this.trackToolCallArgs(event.toolCallId, stringifyUnknown(event.rawInput));
+        }
         const mapped = event.kind ? KIND_TO_TOOL[event.kind] : undefined;
         const name = mapped ?? event.title;
         const summary = mapped && event.title && event.title !== name ? event.title : undefined;
@@ -218,6 +265,22 @@ export class BaseAcpTranslator {
     handleToolCallUpdate(event, _sessionId) {
         const isError = event.status === 'failed';
         const content = this.extractToolResultContent(event);
+        // Terminal updates end the args-streaming phase — drop the tracked entry.
+        // In-progress delta text is cumulative (events-map.ts
+        // toolCallDeltaToSessionUpdate: content.text = accumulator.args), so the
+        // latest text replaces the previous one rather than appending.
+        if (event.status === 'completed' || event.status === 'failed') {
+            this.toolCallArgsByCallId.delete(event.toolCallId);
+        }
+        else {
+            const argsText = extractToolCallContentText(event.content);
+            if (argsText !== undefined) {
+                this.trackToolCallArgs(event.toolCallId, argsText);
+            }
+            else if (event.rawInput !== undefined && event.rawInput !== null) {
+                this.trackToolCallArgs(event.toolCallId, stringifyUnknown(event.rawInput));
+            }
+        }
         return [
             {
                 type: 'user',
@@ -235,6 +298,25 @@ export class BaseAcpTranslator {
             },
         ];
     }
+    /**
+     * Latest tracked streaming-args text for a tool call (undefined when never
+     * seen or already terminated). Approval handlers correlate
+     * request_permission's toolCall.toolCallId against this to recover the real
+     * command (see toolCallArgsByCallId).
+     */
+    getTrackedToolCallArgs(toolCallId) {
+        return this.toolCallArgsByCallId.get(toolCallId);
+    }
+    /** Record latest args text, bounded so a long session cannot grow it forever. */
+    trackToolCallArgs(toolCallId, argsText) {
+        this.toolCallArgsByCallId.delete(toolCallId);
+        this.toolCallArgsByCallId.set(toolCallId, argsText);
+        if (this.toolCallArgsByCallId.size > 100) {
+            const oldest = this.toolCallArgsByCallId.keys().next().value;
+            if (oldest !== undefined)
+                this.toolCallArgsByCallId.delete(oldest);
+        }
+    }
     /**
      * tool_result content extraction. Default: rawOutput passthrough (kimi
      * semantics). opencode overrides — its rawOutput is an OBJECT

package/dist/runner/common/acp/protocol-types.d.ts

@@ -22,6 +22,9 @@
  *    以 `turn_diff` 快照发出——禁止把 delta 直接当快照或把全文当增量重复追加。
  * 4. `tool_call` 事件可能**没有 rawInput**（工具 lazy-create，参数在后续
  *    tool_call_update 才补齐）；translator 必须归一化为 `{}`，不得因缺失崩溃。
+ * 5. `session/request_permission` 的 toolCall **不一定带 rawInput**（kimi 实测：
+ *    审批门先于 tool.call.started，只有 title + content 截断摘要）；完整命令
+ *    需按 toolCallId 关联审批前的流式 args 文本恢复（BaseAcpTranslator 追踪）。
  */
 export type { JsonRpcRequest, JsonRpcNotification, JsonRpcSuccessResponse, JsonRpcErrorResponse, } from '../jsonrpc/types.js';
 /** Standard JSON-RPC error codes. */
@@ -226,9 +229,20 @@ export interface PermissionOption {
 }
 export interface RequestPermissionParams {
     sessionId: string;
+    /**
+     * Approval target. Divergence by server (2026-09-13 live probes):
+     *  - kimi 0.42: {toolCallId, title: toolName, content: [truncated summary
+     *    text]} — NO rawInput; the approval gate fires BEFORE tool.call.started,
+     *    so the full args only exist in the pre-approval tool_call/_update
+     *    streaming deltas (correlate by toolCallId, see BaseAcpTranslator).
+     *  - opencode: {toolCallId, title: full command for bash/shell, rawInput:
+     *    full input object} — title/rawInput are directly usable.
+     */
     toolCall?: {
-        title: string;
-        rawInput: string;
+        toolCallId?: string;
+        title?: string;
+        rawInput?: unknown;
+        content?: unknown[];
         [key: string]: unknown;
     };
     options: PermissionOption[];

package/dist/runner/common/acp/protocol-types.js

@@ -22,6 +22,9 @@
  *    以 `turn_diff` 快照发出——禁止把 delta 直接当快照或把全文当增量重复追加。
  * 4. `tool_call` 事件可能**没有 rawInput**（工具 lazy-create，参数在后续
  *    tool_call_update 才补齐）；translator 必须归一化为 `{}`，不得因缺失崩溃。
+ * 5. `session/request_permission` 的 toolCall **不一定带 rawInput**（kimi 实测：
+ *    审批门先于 tool.call.started，只有 title + content 截断摘要）；完整命令
+ *    需按 toolCallId 关联审批前的流式 args 文本恢复（BaseAcpTranslator 追踪）。
  */
 /** Standard JSON-RPC error codes. */
 export const RpcErrorCode = {

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

@@ -120,13 +120,31 @@ export class KimiAcpTranslator extends BaseAcpTranslator {
             getLogger().info(`[kimi-acp-translator] permission request without toolCall, auto-responding cancelled (requestId=${requestId})`);
             return [];
         }
+        // 命令恢复（2026-09-13 对 kimi 0.42.0 实测）：审批门在 tool.call.started
+        // 之前触发，request_permission 的 toolCall 只有 title（"Bash"）+ content
+        // 里一句截断摘要（"Requesting approval to Running: <cmd>…"），无 rawInput；
+        // 完整命令只从审批前的 tool_call/tool_call_update 流式 args 累积文本拿到
+        // （基类按 toolCallId 追踪）。解析顺序：流式 args JSON 的 command 字段 →
+        // title；流式缺失时退回 content 摘要放进 reason（旧版 kimi 不推 delta）。
+        const tracked = typeof toolCall.toolCallId === 'string'
+            ? this.getTrackedToolCallArgs(toolCall.toolCallId)
+            : undefined;
+        const argsCommand = tracked ? extractCommandFromArgsText(tracked) : undefined;
+        const rawInput = typeof toolCall.rawInput === 'string' && toolCall.rawInput.length > 0
+            ? toolCall.rawInput
+            : undefined;
+        const summary = extractPermissionSummaryText(toolCall.content);
         const view = {
             requestId,
             kind: 'command',
-            command: params.toolCall?.title ?? undefined,
-            reason: params.toolCall?.rawInput
-                ? truncateWithEllipsis(params.toolCall.rawInput, 200)
-                : undefined,
+            command: argsCommand ?? toolCall.title ?? undefined,
+            reason: argsCommand
+                ? undefined
+                : rawInput
+                    ? truncateWithEllipsis(rawInput, 200)
+                    : summary
+                        ? truncateWithEllipsis(summary, 200)
+                        : undefined,
             // §P4: 从服务端 options kind 派生——带 approve_always（或 allow_always）
             // 才提供「本会话总是允许」（acceptForSession）；否则与旧行为一致。
             availableDecisions: deriveAcpAvailableDecisions(params.options ?? []),
@@ -244,4 +262,42 @@ function extractQuestionText(toolCall) {
     }
     return toolCall?.title?.trim() || '请选择';
 }
+/**
+ * 从流式累积的 args 文本恢复命令：完整 JSON 且含 string command 字段时取该
+ * 字段；否则（非 Bash 工具 / 防御性半截 JSON）返回原文。
+ */
+function extractCommandFromArgsText(argsText) {
+    try {
+        const parsed = JSON.parse(argsText);
+        if (parsed && typeof parsed === 'object') {
+            const command = parsed.command;
+            if (typeof command === 'string' && command.length > 0)
+                return command;
+        }
+    }
+    catch {
+        // 半截 JSON（审批正常在 args 流式完成后才到，此处纯防御）——用原文。
+    }
+    return argsText;
+}
+/**
+ * request_permission toolCall.content 里的摘要文本（kimi 0.42：
+ * "Requesting approval to Running: <cmd>…"，约 64 字符截断）。无文本返回
+ * undefined。
+ */
+function extractPermissionSummaryText(content) {
+    if (!Array.isArray(content))
+        return undefined;
+    let text = '';
+    let found = false;
+    for (const block of content) {
+        const t = block?.content
+            ?.text;
+        if (typeof t === 'string' && t.length > 0) {
+            text += t;
+            found = true;
+        }
+    }
+    return found ? text : undefined;
+}
 //# sourceMappingURL=translator.js.map

package/dist/session/session-store.d.ts

@@ -14,7 +14,7 @@ interface SessionEntry {
 /**
  * Per-user session store. Persists cwd + per-agent sessions to disk so that
  * the last workspace AND the last-used sessionId per agent are restored after
- * a bridge restart.
+ * a lark-remote restart.
  *
  * Persistence strategy:
  * - Persists `cwd`, `sessions` (per-agent sessionId), `previousSessions`

package/dist/session/session-store.js

@@ -4,7 +4,7 @@ import { atomicWriteJson } from '../persistence/atomic-write.js';
 /**
  * Per-user session store. Persists cwd + per-agent sessions to disk so that
  * the last workspace AND the last-used sessionId per agent are restored after
- * a bridge restart.
+ * a lark-remote restart.
  *
  * Persistence strategy:
  * - Persists `cwd`, `sessions` (per-agent sessionId), `previousSessions`

package/dist/workspace/index.d.ts

@@ -9,7 +9,7 @@ export interface WorkspaceEntry {
  *
  * Atomic write (§9.10): writes a temp file then `fs.rename` so a crash
  * mid-write cannot leave a truncated JSON file. On load, a corrupt file
- * is treated as empty (with a warning) so the bridge can still start.
+ * is treated as empty (with a warning) so the lark-remote can still start.
  *
  * lastUsedAt 语义（2026-08-19 语义对齐）：保存（save）与使用（use/touch）
  * 都会把时间戳更新为当前时间。save 内部调用 touch，保证「最近使用」排序

package/dist/workspace/index.js

@@ -8,7 +8,7 @@ import { getLogger } from '../logger/index.js';
  *
  * Atomic write (§9.10): writes a temp file then `fs.rename` so a crash
  * mid-write cannot leave a truncated JSON file. On load, a corrupt file
- * is treated as empty (with a warning) so the bridge can still start.
+ * is treated as empty (with a warning) so the lark-remote can still start.
  *
  * lastUsedAt 语义（2026-08-19 语义对齐）：保存（save）与使用（use/touch）
  * 都会把时间戳更新为当前时间。save 内部调用 touch，保证「最近使用」排序

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "description": "Feishu (Lark) private-chat bridge to local coding agents — Claude Code / Codex / opencode / pi / kimi, with live-streaming CardKit 2.0 cards",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -58,7 +58,7 @@
     "test:opencode-full": "vitest run --project agent-opencode --project infra-runner --project infra-session",
     "test:pi-full": "vitest run --project agent-pi --project infra-runner --project infra-session",
     "test:kimi-full": "vitest run --project agent-kimi --project infra-runner --project infra-session",
-    "test:live": "vitest run --project live",
+    "test:live": "node node_modules/vitest/vitest.mjs run --project live",
     "prepublishOnly": "npm run typecheck && vitest run && npm run build",
     "prepack": "node -e \"const fs=require('fs');if(!fs.existsSync('dist/cli.js')){console.error('dist/ missing — run bun run build first');process.exit(1)}\""
   },