lark-remote 0.1.12 → 0.2.0

package/dist/runner/kimi/acp/runner.d.ts

@@ -6,15 +6,23 @@
  * → synthetic init → session/prompt → consume session/update notifications
  * until prompt settles → result event.
  *
- * Structurally aligned with codex AppServerRunner (design doc §3.1) via the
- * shared ConnectionBasedRunner base: same notification queue + waitResolve
- * pattern, same forceFinish/stopRequested semantics, same turn idle timeout,
- * same ConnectionLostError retry.
+ * Turn/connection/compact/approval orchestration lives in BaseAcpRunner.
+ * Kimi-specific parts:
+ * - compaction is a BACKGROUND task: after the compact prompt settles, poll
+ *   wire.jsonl for a NEW terminal compaction record (§5.2, never fake success)
+ * - terminal/* reverse RPC: kimi delegates Bash execution to the client —
+ *   this runner spawns one-shot local bash processes (handleTerminalRequest)
+ * - terminal-backed Bash tool notifications are filtered (bashToolCallIds) so
+ *   the run card doesn't get duplicate output-less Bash panels
+ * - AskUserQuestion flows through elicitation forms + a request_permission
+ *   question bridge (buildQuestionResponse)
  */
-import type { AgentKind, AgentSessionReader, AgentEvent, AgentStatusInfo, SpawnOptions } from '../../types.js';
-import { JsonRpcClient as KimiAcpClient } from '../../common/jsonrpc/client.js';
-import { type AcpTranslatorEvent } from './translator.js';
-import { ConnectionBasedRunner } from '../../common/connection-based-runner.js';
+import type { AgentKind, AgentSessionReader, AgentStatusInfo, SpawnOptions } from '../../types.js';
+import { JsonRpcClient } from '../../common/jsonrpc/client.js';
+import { KimiAcpTranslator } from './translator.js';
+import { type SessionPromptResult } from '../../common/acp/protocol-types.js';
+import { type AcpPendingApproval } from '../../common/acp/protocol-helpers.js';
+import { BaseAcpRunner } from '../../common/acp/base-acp-runner.js';
 export interface KimiAcpRunnerOptions {
     kind: AgentKind;
     sessionReader: AgentSessionReader;
@@ -30,22 +38,24 @@ export interface KimiAcpRunnerOptions {
     idleTtlMs?: number;
     /** How long to wait for turn output before failing. Defaults to 10 min. */
     turnIdleTimeoutMs?: number;
-    /** R2: how long to poll wire.jsonl for the compaction record after the
-     *  /compact prompt settles. Defaults to 30s; WARN (not fail) on timeout. */
-    compactPollTimeoutMs?: number;
+    /** §5.2: compaction 等待的沉默超时——距上次观察到任何新 compaction 记录
+     *  （begin/terminal）超过该时长仍未终态才放弃（outcome unknown，卡片 error，
+     *  不再「超时=成功」）。默认 10 分钟（对齐 turnIdleTimeoutMs）。压缩是完整
+     *  LLM 请求（引擎带重试），时长无上限，旧的固定 30s 轮询超时已删除。 */
+    compactIdleTimeoutMs?: number;
     model?: string;
     /** Kimi permission mode (user-facing: manual/auto/yolo). */
     permissionMode?: 'manual' | 'auto' | 'yolo';
 }
-export declare class KimiAcpRunner extends ConnectionBasedRunner<KimiAcpClient, AcpTranslatorEvent> {
-    private connectionManager;
-    private currentTranslator;
-    private activeSessionId;
-    private model?;
+export declare class KimiAcpRunner extends BaseAcpRunner<KimiAcpTranslator> {
     private permissionMode;
-    private readonly compactPollTimeoutMs;
-    /** Pending approval requests: requestId → kind + view + options. */
-    private pendingApprovals;
+    private readonly compactIdleTimeoutMs;
+    /**
+     * §5.2 compaction baseline: wire.jsonl records sampled by compactBaseline()
+     * BEFORE the compact prompt fires (reset per compact run). onCompactPromptFired
+     * derives both the terminal-count baseline and the total-count probe from it.
+     */
+    private compactBaselineRecords;
     /** 存活 terminal（kimi 把 Bash 执行下放客户端）：terminalId → 本地句柄。 */
     private terminals;
     /** terminalId 自增序号（term-1, term-2, …）。 */
@@ -61,32 +71,29 @@ export declare class KimiAcpRunner extends ConnectionBasedRunner<KimiAcpClient,
     /** 当前 run 的 session cwd（terminal/create 未给 cwd 时回退用）。 */
     private activeCwd;
     private readonly processStopper;
-    /** Tracker for the in-flight prompt request — needed for cancellation. */
-    private promptSettled;
     constructor(opts: KimiAcpRunnerOptions);
     protected get logTag(): string;
     protected get turnTimeoutErrorMessage(): string;
     protected get turnInterruptedErrorMessage(): string;
-    protected currentSessionId(): string | null;
+    protected get connectionClosedMessage(): string;
     protected shouldDeferStop(): boolean;
-    protected cancelCurrentTurn(): Promise<void>;
-    protected clearTurnState(): void;
-    protected releaseConnection(cwd: string): Promise<void>;
-    protected notifyIdle(cwd: string): void;
-    protected disposeConnections(): Promise<void>;
+    protected createTranslator(): KimiAcpTranslator;
+    protected applyTurnSettings(client: JsonRpcClient, sessionId: string): Promise<void>;
     /**
-     * Run a compact operation on the current session.
-     *
-     * Design doc §6.1: acquire → session/resume → session/prompt with "/compact"
-     * text (builtin slash command, host intercepts) → consume notifications until
-     * prompt settles.
+     * §5.2: compaction is a BACKGROUND task — the prompt settles before the
+     * wire.jsonl terminal record lands. Baselines are captured BEFORE the
+     * compact prompt fires (see compactBaseline override — a begin record
+     * landing after the fire must count as new activity, not baseline), then
+     * wait for a NEW terminal (complete/apply → completed; cancel → cancelled)
+     * before producing the result. There is NO total timeout — silence beyond
+     * compactIdleTimeoutMs yields 'unknown' (never a fake success). Keeps the
+     * connection alive while the background compaction finishes — otherwise
+     * dispose/exit kills it and the record never lands (S5/S6 打回复现 /
+     * 2026-08-31 事故).
      */
-    runCompact(_message: string, opts: SpawnOptions): AsyncGenerator<AgentEvent>;
-    /**
-     * Respond to an approval server request. `response` is the bridge
-     * ApprovalAction (`{ action: 'accept' | 'decline' | 'cancel' }`).
-     */
-    respondApproval(requestId: number | string, response: unknown): Promise<void>;
+    protected compactBaseline(sessionId: string, opts: SpawnOptions): number;
+    protected onCompactPromptFired(promptPromise: Promise<SessionPromptResult>, translator: KimiAcpTranslator, sessionId: string, opts: SpawnOptions, baselineTotalCount: number): void;
+    protected buildApprovalOutcome(action: string, pending: AcpPendingApproval, response: unknown): unknown;
     getStatusInfo(): AgentStatusInfo;
     /**
      * Hot-apply a permission-mode change to the live ACP session (§P5).
@@ -101,22 +108,21 @@ export declare class KimiAcpRunner extends ConnectionBasedRunner<KimiAcpClient,
         permissionMode?: 'manual' | 'auto' | 'yolo';
     }): Promise<void>;
     /**
-     * Acquire the connection and set up the turn:
-     * session/new (new session) or session/resume (existing sessionId)
-     * → set permission mode if needed → session/prompt.
-     */
-    protected setupTurn(message: string, opts: SpawnOptions): Promise<void>;
-    /**
-     * R2: poll wire.jsonl until a NEW compaction record
-     * (context.apply_compaction / full_compaction.complete) appears.
+     * §5.2: 等 wire.jsonl 出现 NEW 压缩终态记录，返回判别结果而非 void。
      *
-     * The /compact prompt settles before the background compaction lands its
-     * record; returning early would let the caller dispose the connection and
-     * kill the background job. Timeout is WARN-only (the compact may have been
-     * a no-op) — never fails the turn. Aborts early on stop/forceFinish.
+     * 压缩是完整 LLM 请求（引擎 ≤5 次重试 + overflow 收缩重试），时长无上限；
+     * 旧「固定 30s 超时 = 成功」已删除。出口：
+     *   completed — 观察到 full_compaction.complete / context.apply_compaction；
+     *   cancelled — 观察到 full_compaction.cancel（API 失败/abort 与用户取消共用，
+     *               绝不当成功）；
+     *   stopped   — 等待中 stop()/forceFinish（consumeTurn 产 interrupted 兜底）；
+     *   unknown   — 距上次观察到任何新 compaction 记录（begin/terminal）超过
+     *               compactIdleTimeoutMs（沉默超时，压缩可能仍在后台进行）。
+     * 观察到新记录即重置沉默时钟，并顺带重置 turn idle 时钟（lastEventAt +
+     * wakeWaiters），避免数分钟的压缩被 consumeTurn 滚动空闲看门狗误杀。
      */
-    private waitForCompactionRecord;
-    private handleNotification;
+    private waitForCompactionTerminal;
+    protected handleNotification(method: string, params: unknown): void;
     /**
      * Filter kimi's own Bash tool notifications so the run card doesn't get a
      * duplicate, output-less Bash panel alongside the runner-produced one.
@@ -128,7 +134,7 @@ export declare class KimiAcpRunner extends ConnectionBasedRunner<KimiAcpClient,
      * Returns true when the notification should be swallowed.
      */
     private filterBashNotifications;
-    private handleServerRequest;
+    protected handleServerRequest(id: number | string, method: string, params: unknown): void;
     /**
      * Handle a kimi terminal/* reverse RPC by spawning a one-shot local process.
      *
@@ -154,4 +160,8 @@ export declare class KimiAcpRunner extends ConnectionBasedRunner<KimiAcpClient,
     private handleTerminalRelease;
     /** Kill every live terminal (dispose/connection-close 清理钩子)。 */
     private cleanupTerminals;
+    protected onConnectionAcquired(opts: SpawnOptions): void;
+    protected onConnectionClosed(): void;
+    protected onClearTurnState(): void;
+    protected beforeDisposeConnections(): Promise<void>;
 }