lark-remote 0.5.12 → 0.5.13

package/dist/runner/dsh/errors.d.ts

@@ -0,0 +1,5 @@
+export declare class DshError extends Error {
+    readonly code: string;
+    readonly details: Record<string, unknown>;
+    constructor(code: string, message: string, details?: Record<string, unknown>);
+}

package/dist/runner/dsh/errors.js

@@ -0,0 +1,11 @@
+export class DshError extends Error {
+    code;
+    details;
+    constructor(code, message, details = {}) {
+        super(message);
+        this.name = 'DshError';
+        this.code = code;
+        this.details = details;
+    }
+}
+//# sourceMappingURL=errors.js.map

package/dist/runner/dsh/exit-cancel.d.ts

@@ -12,8 +12,6 @@
  * curl transport the session reader already uses: bounded by `timeoutMs` and
  * never throws.
  */
-/** Upper bound on the exit-path cancel:退出不能被一个卡住的 host 拖住。 */
-export declare const EXIT_CANCEL_TIMEOUT_MS = 2000;
 export interface SyncCancelOptions {
     baseUrl: string;
     sessionId: string;

package/dist/runner/dsh/exit-cancel.js

@@ -20,7 +20,7 @@ import { isWin32 } from '../../platform/select.js';
 import { spawnProcessSync } from '../../platform/spawn.js';
 import { DSH_COOKIE_LIFETIME_MS, mintDshBrowserCookie, readDshBrowserSecretSync, resolveDshCredentialsFile, } from './auth.js';
 /** Upper bound on the exit-path cancel:退出不能被一个卡住的 host 拖住。 */
-export const EXIT_CANCEL_TIMEOUT_MS = 2_000;
+const EXIT_CANCEL_TIMEOUT_MS = 2_000;
 /**
  * Fire one `session/cancel` synchronously. Never throws: a failed cancel must
  * not block the exit path or mask the real exit reason.

package/dist/runner/dsh/home.d.ts

@@ -0,0 +1,2 @@
+/** Resolve the same DSH home DSH itself uses: configured, env, then ~/.dsh. */
+export declare function resolveDshHome(configured?: string, env?: NodeJS.ProcessEnv): string;

package/dist/runner/dsh/home.js

@@ -0,0 +1,8 @@
+import os from 'node:os';
+import path from 'node:path';
+/** Resolve the same DSH home DSH itself uses: configured, env, then ~/.dsh. */
+export function resolveDshHome(configured, env = process.env) {
+    const value = configured?.trim() || env.DSH_HOME?.trim();
+    return path.resolve(value && value.length > 0 ? value : path.join(os.homedir(), '.dsh'));
+}
+//# sourceMappingURL=home.js.map

package/dist/runner/dsh/inflight.d.ts

@@ -58,5 +58,3 @@ export interface DshInflightReconcileResult {
  * entries are left in the file so a later startup can retry.
  */
 export declare function reconcileInflightDshRuns(opts: DshInflightReconcileOptions): Promise<DshInflightReconcileResult>;
-/** One short owner-facing notice; session ids are truncated, not paths. */
-export declare function formatInflightWarning(entries: DshInflightEntry[]): string;

package/dist/runner/dsh/inflight.js

@@ -126,7 +126,7 @@ export async function reconcileInflightDshRuns(opts) {
     return { removed, open: open.length, skipped: false };
 }
 /** One short owner-facing notice; session ids are truncated, not paths. */
-export function formatInflightWarning(entries) {
+function formatInflightWarning(entries) {
     const lines = entries.slice(0, 3).map((entry) => {
         const id = entry.sessionId.length > 8 ? entry.sessionId.slice(0, 8) : entry.sessionId;
         return `- session ${id}（${entry.cwd ?? '未知目录'}）`;

package/dist/runner/dsh/mux-stream.d.ts

@@ -0,0 +1,26 @@
+interface MuxSocket {
+    onopen: ((event: unknown) => void) | null;
+    onmessage: ((event: {
+        data: unknown;
+    }) => void) | null;
+    onerror: ((event: unknown) => void) | null;
+    onclose: ((event: unknown) => void) | null;
+    onunexpectedresponse?: ((event: {
+        statusCode?: number;
+    }) => void) | null;
+    send(data: string): void;
+    close(): void;
+}
+export interface OpenMuxStreamOptions {
+    baseUrl: string;
+    endpoint: string;
+    payload: unknown;
+    signal: AbortSignal;
+    requestTimeoutMs: number;
+    authCookie(): Promise<string | undefined>;
+    webSocketFactory(url: string, options?: {
+        headers?: Record<string, string>;
+    }): MuxSocket;
+}
+export declare function openMuxStream(opts: OpenMuxStreamOptions): AsyncGenerator<unknown>;
+export {};

package/dist/runner/dsh/mux-stream.js

@@ -0,0 +1,157 @@
+import { getLogger } from '../../logger/index.js';
+import { DshError } from './errors.js';
+export async function* openMuxStream(opts) {
+    const cookie = await opts.authCookie();
+    const socket = opts.webSocketFactory(`${opts.baseUrl.replace(/^http/, 'ws')}/api/remote.mux`, cookie ? { headers: { cookie } } : undefined);
+    const streamId = `lr-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+    const queue = [];
+    let waiter = null;
+    let ended = false;
+    let failure;
+    let opened = false;
+    const settle = (frame) => {
+        if (waiter) {
+            const resolve = waiter;
+            waiter = null;
+            resolve(frame);
+            return;
+        }
+        if (frame)
+            queue.push(frame);
+        else
+            ended = true;
+    };
+    const connectTimer = setTimeout(() => {
+        if (opened || ended)
+            return;
+        failure = new DshError('transport', 'DSH remote mux WebSocket connect timeout');
+        ended = true;
+        settle(undefined);
+        try {
+            socket.close();
+        }
+        catch {
+            /* ignore close error */
+        }
+    }, opts.requestTimeoutMs);
+    connectTimer.unref?.();
+    socket.onopen = () => {
+        opened = true;
+        clearTimeout(connectTimer);
+        if (ended)
+            return;
+        try {
+            socket.send(JSON.stringify({
+                type: 'open',
+                streamId,
+                endpoint: opts.endpoint,
+                payload: opts.payload,
+            }));
+        }
+        catch (err) {
+            failure = new DshError('transport', `DSH remote mux send error: ${err.message}`);
+            ended = true;
+            settle(undefined);
+        }
+    };
+    socket.onmessage = (event) => {
+        if (ended)
+            return;
+        const text = typeof event.data === 'string'
+            ? event.data
+            : Buffer.isBuffer(event.data)
+                ? event.data.toString('utf8')
+                : String(event.data);
+        let message;
+        try {
+            message = JSON.parse(text);
+        }
+        catch {
+            getLogger().warn('[dsh] dropped malformed remote mux frame');
+            return;
+        }
+        if (message.streamId !== streamId)
+            return;
+        if (message.type === 'item' && message.value) {
+            settle(message.value);
+            return;
+        }
+        if (message.type === 'end') {
+            ended = true;
+            settle(undefined);
+            return;
+        }
+        if (message.type === 'error') {
+            failure = new DshError(message.error?.code ?? 'stream', message.error?.message ?? 'DSH remote stream failed', message.error?.details ?? {});
+            ended = true;
+            settle(undefined);
+        }
+    };
+    socket.onerror = () => {
+        if (ended)
+            return;
+        failure = new DshError('transport', 'DSH remote mux WebSocket error');
+        ended = true;
+        settle(undefined);
+    };
+    socket.onunexpectedresponse = (event) => {
+        if (ended)
+            return;
+        const status = event.statusCode;
+        failure = new DshError('http', `DSH remote mux WebSocket HTTP ${status === undefined ? 'error' : status}`, status === undefined ? {} : { status });
+        ended = true;
+        settle(undefined);
+    };
+    socket.onclose = () => {
+        if (ended)
+            return;
+        ended = true;
+        settle(undefined);
+    };
+    const onAbort = () => {
+        if (ended)
+            return;
+        ended = true;
+        settle(undefined);
+        try {
+            socket.close();
+        }
+        catch {
+            /* ignore close error */
+        }
+    };
+    opts.signal.addEventListener('abort', onAbort, { once: true });
+    const next = () => new Promise((resolve) => {
+        if (queue.length > 0) {
+            resolve(queue.shift());
+            return;
+        }
+        if (ended) {
+            resolve(undefined);
+            return;
+        }
+        waiter = resolve;
+    });
+    try {
+        while (!opts.signal.aborted) {
+            const frame = await next();
+            if (frame === undefined) {
+                if (failure && !opts.signal.aborted)
+                    throw failure;
+                return;
+            }
+            yield frame;
+        }
+    }
+    finally {
+        clearTimeout(connectTimer);
+        opts.signal.removeEventListener('abort', onAbort);
+        try {
+            socket.close();
+        }
+        catch {
+            /* ignore close error */
+        }
+    }
+}
+//# sourceMappingURL=mux-stream.js.map

package/dist/runner/dsh/translator.d.ts

@@ -25,13 +25,6 @@
  */
 import type { AgentEvent, ResultEvent } from '../types.js';
 import type { DshAssistantStreamFrame, DshSessionEvent, DshTokenUsage } from './types.js';
-/** 本 turn 各采样用量之和（input 是非缓存输入，与 ccusage/ResultEvent 口径一致）。 */
-interface UsageTotals {
-    input: number;
-    output: number;
-    cacheRead: number;
-    cacheWrite: number;
-}
 export declare class DshTranslator {
     /** 本 turn 累计用量：DSH 每次模型调用（step）一条 usage，工具往返 = 多条。 */
     private turnUsage;
@@ -63,6 +56,3 @@ export declare class DshTranslator {
 }
 /** Map DSH TokenUsage → ResultEvent.usage (cacheWrite = cache creation). */
 export declare function mapUsage(u: DshTokenUsage): NonNullable<ResultEvent['usage']>;
-/** Map a turn's summed usage → ResultEvent.usage (cacheWrite = cache creation). */
-export declare function mapAggregatedUsage(t: UsageTotals): NonNullable<ResultEvent['usage']>;
-export {};

package/dist/runner/dsh/translator.js

@@ -265,7 +265,7 @@ export function mapUsage(u) {
     });
 }
 /** Map a turn's summed usage → ResultEvent.usage (cacheWrite = cache creation). */
-export function mapAggregatedUsage(t) {
+function mapAggregatedUsage(t) {
     return {
         input_tokens: t.input,
         output_tokens: t.output,

package/dist/runner/index.d.ts

@@ -15,6 +15,6 @@ export { KimiAcpRunner } from './kimi/index.js';
 export { DshRunner } from './dsh/index.js';
 export { BashProcessRunner, type BashRunner } from './bash/index.js';
 export { AgentRegistry } from './registry.js';
-export type { ResultEvent, PlanEvent, FileChangeEvent, AgentEvent, Runner, RunnerLifetime, AgentKind, AgentSession, AgentSessionContentEvent, AgentSessionUsage, SessionContent, SessionSummary, AgentSessionReader, AgentRunner, TurnStartedEvent, TurnDiffEvent, NoticeEvent, SessionInfoEvent, ToolHint, ApprovalView, ApprovalRequestedEvent, ApprovalResolvedEvent, GoalView, GoalStateEvent, } from './types.js';
+export type { ResultEvent, PlanEvent, FileChangeEvent, AgentEvent, Runner, RunnerLifetime, AgentKind, AgentSession, AgentSessionContentEvent, AgentSessionUsage, SessionContent, SessionSummary, AgentSessionReader, AgentRunner, TurnStartedEvent, TurnDiffEvent, FinalAnswerEvent, NoticeEvent, SessionInfoEvent, ToolHint, ApprovalView, ApprovalRequestedEvent, ApprovalResolvedEvent, GoalView, GoalStateEvent, } from './types.js';
 export { resolveAgentChoices } from './resolve-agent-choices.js';
 export { syncAgentChoices } from './sync-agent-choices.js';

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

@@ -159,18 +159,7 @@ export class KimiAcpTranslator extends BaseAcpTranslator {
             // 才提供「本会话总是允许」（acceptForSession）；否则与旧行为一致。
             availableDecisions: deriveAcpAvailableDecisions(params.options ?? []),
         };
-        return [
-            {
-                type: 'approval_requested',
-                requestId,
-                kind: 'command',
-                threadId: params.sessionId,
-                turnId: '',
-                itemId: '',
-                view,
-                timestamp: new Date().toISOString(),
-            },
-        ];
+        return this.approvalRequestedEvents(requestId, params.sessionId, view);
     }
     handleOtherServerRequest(requestId, method, params) {
         if (method !== ServerRequestMethod.ELICITATION_CREATE) {

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

@@ -189,18 +189,7 @@ export class OpencodeAcpTranslator extends BaseAcpTranslator {
             // 才提供「本会话总是允许」（acceptForSession）。
             availableDecisions: deriveAcpAvailableDecisions(params.options ?? []),
         };
-        return [
-            {
-                type: 'approval_requested',
-                requestId,
-                kind: 'command',
-                threadId: params.sessionId,
-                turnId: '',
-                itemId: '',
-                view,
-                timestamp: new Date().toISOString(),
-            },
-        ];
+        return this.approvalRequestedEvents(requestId, params.sessionId, view);
     }
 }
 // =============================================================================

package/dist/runner/pi/rpc/translator.d.ts

@@ -10,15 +10,9 @@
  *     `result` from that response.
  *   - `agent_settled` is ignored for compaction turns (no double result).
  */
-import type { AgentEvent, ResultEvent } from '../../types.js';
+import type { AgentEvent, ResultEvent, TurnStartedEvent } from '../../types.js';
 import { type PiRpcEvent, type PiRpcResponse } from './protocol-types.js';
-export interface PiRpcTurnStartedEvent {
-    type: 'turn_started';
-    threadId: string;
-    turnId: string;
-    operationKind: 'turn' | 'compaction';
-    timestamp?: string;
-}
+export type PiRpcTurnStartedEvent = TurnStartedEvent;
 export type PiRpcTranslatorEvent = AgentEvent | PiRpcTurnStartedEvent;
 export declare class PiRpcTranslator {
     private content;

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

@@ -10,6 +10,7 @@
  *     `result` from that response.
  *   - `agent_settled` is ignored for compaction turns (no double result).
  */
+import { makeTurnStartedEvent } from '../../common/turn-started.js';
 export class PiRpcTranslator {
     content = [];
     currentContentIndex = -1;
@@ -135,13 +136,7 @@ export class PiRpcTranslator {
     /** Self-produced turn_started (no wire equivalent). */
     produceTurnStarted(sessionId, turnId) {
         this.sessionId = sessionId;
-        return {
-            type: 'turn_started',
-            threadId: sessionId,
-            turnId,
-            operationKind: this.operationKind === 'compact' ? 'compaction' : 'turn',
-            timestamp: new Date().toISOString(),
-        };
+        return makeTurnStartedEvent(sessionId, turnId, this.operationKind);
     }
     /** Result for a completed normal turn (agent_settled). */
     produceResultFromSettled() {

package/dist/runner/registry.d.ts

@@ -14,28 +14,9 @@ import type { AgentKind, Runner } from './index.js';
  */
 export declare class AgentRegistry {
     private readonly factories;
-    private readonly displayNames;
     /** Container for runtime config updates (pi provider dynamic reload). */
     private configContainer?;
     register(kind: AgentKind, factory: (cwd: string) => Runner): void;
-    /**
-     * 注册 agent 的显示名。应在 register(kind, factory) 后调用。
-     * 用于 agentDisplayName 等全局查询，实现单点真相。
-     */
-    registerDisplayName(kind: AgentKind, displayName: string): void;
-    /**
-     * 获取 agent 显示名。未注册时返回原始 kind。
-     */
-    getDisplayName(kind: AgentKind): string;
-    /**
-     * 设置全局 registry 实例，供 agentDisplayName 等全局函数使用。
-     * 在 index.ts 初始化所有 agents 后调用。
-     */
-    static setGlobalInstance(reg: AgentRegistry | undefined): void;
-    /**
-     * 获取全局 registry 实例。
-     */
-    static getGlobalInstance(): AgentRegistry | undefined;
     /**
      * Set config container reference. Call after bridge config is updated.
      * Factory functions can read latest config from here.

package/dist/runner/registry.js

@@ -1,8 +1,3 @@
-/**
- * 单例 registry 实例，供 agentDisplayName 等全局查询使用。
- * 在 index.ts 初始化后设置。
- */
-let globalRegistry;
 /**
  * Registry of agent factories, keyed by `AgentKind`. `index.ts` registers one
  * factory per available agent at startup; `Bridge.getRunner(cwd)` looks
@@ -18,38 +13,11 @@ let globalRegistry;
  */
 export class AgentRegistry {
     factories = new Map();
-    displayNames = new Map();
     /** Container for runtime config updates (pi provider dynamic reload). */
     configContainer;
     register(kind, factory) {
         this.factories.set(kind, factory);
     }
-    /**
-     * 注册 agent 的显示名。应在 register(kind, factory) 后调用。
-     * 用于 agentDisplayName 等全局查询，实现单点真相。
-     */
-    registerDisplayName(kind, displayName) {
-        this.displayNames.set(kind, displayName);
-    }
-    /**
-     * 获取 agent 显示名。未注册时返回原始 kind。
-     */
-    getDisplayName(kind) {
-        return this.displayNames.get(kind) ?? kind;
-    }
-    /**
-     * 设置全局 registry 实例，供 agentDisplayName 等全局函数使用。
-     * 在 index.ts 初始化所有 agents 后调用。
-     */
-    static setGlobalInstance(reg) {
-        globalRegistry = reg;
-    }
-    /**
-     * 获取全局 registry 实例。
-     */
-    static getGlobalInstance() {
-        return globalRegistry;
-    }
     /**
      * Set config container reference. Call after bridge config is updated.
      * Factory functions can read latest config from here.

package/dist/runner/types.d.ts

@@ -263,6 +263,22 @@ export interface AssistantEvent {
         content: AssistantContent[];
     };
 }
+/**
+ * Authoritative final answer from an agent protocol.
+ *
+ * This is deliberately separate from ordinary assistant text: progress
+ * narration and tool-loop messages have lower display priority than the answer
+ * the user actually asked for. Agents without an explicit protocol marker
+ * promote their last text block when the turn finishes.
+ */
+export interface FinalAnswerEvent {
+    type: 'final_answer';
+    text: string;
+    /** Source item id, used to remove the streamed progress copy of the answer. */
+    itemId?: string;
+    complete?: boolean;
+    timestamp?: string;
+}
 export interface UserEvent {
     type: 'user';
     timestamp?: string;
@@ -470,7 +486,7 @@ export interface TurnDiffEvent {
 export type RunnerLifetime = 'turn' | 'workspace';
 /** 工具渲染 hint：runner 自愿声明，渲染层只消费不推断。 */
 export type ToolHint = 'shell' | 'file' | 'search' | 'web' | 'patch';
-export type AgentEvent = SystemInitEvent | SystemCompactEvent | ApprovalRequestedEvent | ApprovalResolvedEvent | ApprovalViewUpdatedEvent | ApprovalExpiredEvent | AssistantEvent | UserEvent | ResultEvent | PlanEvent | FileChangeEvent | TurnStartedEvent | TurnDiffEvent | NoticeEvent | SessionInfoEvent | RunStatusEvent | BackgroundJobsEvent | GoalStateEvent;
+export type AgentEvent = SystemInitEvent | SystemCompactEvent | ApprovalRequestedEvent | ApprovalResolvedEvent | ApprovalViewUpdatedEvent | ApprovalExpiredEvent | AssistantEvent | FinalAnswerEvent | UserEvent | ResultEvent | PlanEvent | FileChangeEvent | TurnStartedEvent | TurnDiffEvent | NoticeEvent | SessionInfoEvent | RunStatusEvent | BackgroundJobsEvent | GoalStateEvent;
 export interface SpawnOptions {
     cwd: string;
     sessionId?: string;

package/dist/session/claude/session-index.js

@@ -277,14 +277,16 @@ export class SessionIndex {
                 if (!st.isDirectory())
                     continue;
             }
-            catch {
+            catch (err) {
+                getLogger().debug(`[session-index] skipped unreadable project dir ${subdir}: ${err?.message ?? String(err)}`);
                 continue;
             }
             let files;
             try {
                 files = fs.readdirSync(subdir).filter((f) => f.endsWith('.jsonl'));
             }
-            catch {
+            catch (err) {
+                getLogger().debug(`[session-index] skipped unreadable project subdir ${subdir}: ${err?.message ?? String(err)}`);
                 continue;
             }
             for (const f of files) {

package/dist/session/kimi/sessions.js

@@ -215,8 +215,8 @@ export class KimiSessionReader {
                         state = JSON.parse(fs.readFileSync(statePath, 'utf-8'));
                         stateParsed = true;
                     }
-                    catch {
-                        // Corrupt state.json — cannot determine cwd → skip below
+                    catch (err) {
+                        getLogger().debug(`[kimi-session-reader] corrupt state.json skipped session=${entry.sessionId}: ${err?.message ?? String(err)}`);
                     }
                 }
                 // Index workDir is v1-only; v2 sessions may have empty/missing workDir.

package/dist/session/opencode/sessions.js

@@ -510,7 +510,8 @@ export class OpencodeSessionReader {
             // Check if updated within STALE_MS
             return !isStale(entry.updated);
         }
-        catch {
+        catch (err) {
+            getLogger().debug(`[opencode-session-reader] isSessionActive failed session=${sessionId}: ${err?.message ?? String(err)}`);
             return false;
         }
     }

package/dist/session/pi/sessions.js

@@ -10,6 +10,7 @@ import { encodeProjectDirName, samePath } from '../../platform/path.js';
 import { paginate } from '../common/pagination.js';
 import { sortByRecencyDesc } from '../common/recency.js';
 import { TtlCache } from '../../common/ttl-cache.js';
+import { getLogger } from '../../logger/index.js';
 function defaultPiDir() {
     return path.join(os.homedir(), '.pi', 'agent');
 }
@@ -356,8 +357,8 @@ export class PiSessionReader {
                     mtime: st.mtimeMs,
                 });
             }
-            catch {
-                // skip
+            catch (err) {
+                getLogger().debug(`[pi-session-reader] skipped ${full}: ${err?.message ?? String(err)}`);
             }
         }
         // Same-mtime ties: secondary key keeps the full order deterministic.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "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",