lark-remote 0.5.6 → 0.5.8

package/dist/runner/dsh/translator.js

@@ -12,7 +12,7 @@
  *       completed → success; aborted/interrupted → interrupted;
  *       blocked/error/max-tokens → error (errorMessage carries the reason)
  *
- * Token accounting (ccusage 口径, AGENTS.md §9.21): DSH emits ONE usage per model
+ * Token accounting (ccusage 口径): DSH emits ONE usage per model
  * call (per step) — a tool-looping turn has several `assistant/message` events.
  * The result event therefore carries **the sum of the turn's samplings**, not the
  * last one (codex `token_count` has the same shape). `lastUsage` is kept only as
@@ -118,6 +118,48 @@ export class DshTranslator {
                 }
                 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 [
+                    {
+                        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(),
+                    },
+                ];
+            }
             case 'turn/end': {
                 const turnReason = ev.data.reason;
                 const reason = turnReason?.kind;
@@ -153,6 +195,66 @@ export class DshTranslator {
         }
     }
 }
+/**
+ * Parse a `tool/call.arguments` payload (a JSON string on the wire) into the
+ * object shape the card renderer consumes. Non-JSON arguments (a truncated or
+ * provider-mangled payload) are kept verbatim so the header can still show
+ * something instead of silently rendering an empty summary.
+ */
+function parseToolArguments(raw) {
+    if (typeof raw !== 'string')
+        return raw ?? {};
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return {};
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return trimmed;
+    }
+}
+/**
+ * Flatten a `tool/result.message.content` block list into display text.
+ *
+ * DSH content is a block array (`{type:'text',text}` / `{type:'image',...}`),
+ * the same shape the LLM sees. Images collapse to a marker: the card cannot
+ * render them and the raw base64 would blow the byte budget.
+ */
+function toolResultText(content, error) {
+    const err = error;
+    const errorHint = typeof err?.message === 'string' ? err.message : '';
+    if (content == null)
+        return errorHint;
+    if (typeof content === 'string')
+        return content;
+    if (Array.isArray(content)) {
+        const parts = [];
+        for (const block of content) {
+            if (typeof block === 'string') {
+                parts.push(block);
+                continue;
+            }
+            if (!block || typeof block !== 'object')
+                continue;
+            const rec = block;
+            if (typeof rec.text === 'string') {
+                parts.push(rec.text);
+            }
+            else if (rec.type === 'image') {
+                parts.push('[image]');
+            }
+        }
+        const text = parts.join('\n');
+        return text || errorHint;
+    }
+    try {
+        return JSON.stringify(content);
+    }
+    catch {
+        return String(content);
+    }
+}
 /** Map DSH TokenUsage → ResultEvent.usage (cacheWrite = cache creation). */
 export function mapUsage(u) {
     return mapAggregatedUsage({

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

@@ -60,6 +60,27 @@ export interface DshSessionSummary {
 export interface DshSessionListValue {
     items: DshSessionSummary[];
 }
+/**
+ * One pending inbox occurrence from the `inbox` projection.
+ *
+ * DSH 在 prompt 被受理但还没被 turn 取走时，把它记录成 `inbox.next-turn[]`
+ * 的一项；`source.rpcId` 回显 `session/prompt` 的 requestId，因此调用方可以
+ * 精确找到“我这条还没开始的消息”。`session/updateQueue` 用 `id` 删除它。
+ */
+export interface DshInboxItem {
+    id: string;
+    source?: {
+        kind?: string;
+        rpcId?: string;
+    };
+}
+/** `session/projections` → value（只声明本仓库用到的部分）。 */
+export interface DshProjectionSnapshot {
+    asOfSeq?: number;
+    values: Record<string, unknown>;
+}
+/** Whether the host currently has a turn open for a session. */
+export type DshOpenTurnState = 'open' | 'closed' | 'unknown';
 /** session/page → value.records[]. */
 export interface DshPageRecord {
     event: DshSessionEvent;
@@ -309,3 +330,42 @@ export type DshStreamItem = {
     callId?: string;
     reason?: string;
 };
+/**
+ * One finished projection value from the Host-wide `session/control` stream.
+ *
+ * DSH 的 `session/control` 是唯一的"服务端变一次推一次"通道：连接先收到一份
+ * baseline（覆盖当前所有活跃 session 的全部投影值），之后每个投影变化推一帧
+ * `{type:'projection', sessionId, key, value, seq}`。调用方按 sessionId 过滤。
+ */
+export interface DshProjectionItem {
+    kind: 'projection';
+    sessionId: string;
+    key: string;
+    value: unknown;
+}
+/** `contextPressure` 投影（只声明本仓库消费的字段）。 */
+export interface DshContextPressure {
+    /** 上一次采样实际占用的 token。 */
+    pressureTokens?: number;
+    /** 下一次请求的预估占用（官方 UI 优先用它算百分比）。 */
+    projectedTokens?: number;
+    /** 当前模型上下文窗口。 */
+    contextWindow?: number;
+}
+/** `sessionStats` 投影（只声明本仓库消费的字段）。 */
+export interface DshSessionStats {
+    turns?: number;
+    steps?: number;
+    toolMs?: number;
+}
+/** One background job row from the `job/list` stream (fields lark-remote consumes). */
+export interface DshJobView {
+    id: string;
+    kind?: string;
+    label?: string;
+    status?: 'running' | 'stopping' | 'completed' | 'killed' | 'failed';
+    progress?: string;
+    detail?: string;
+    startedAt?: number;
+    finishedAt?: number;
+}

package/dist/runner/types.d.ts

@@ -325,6 +325,45 @@ export interface SessionInfoEvent {
     mode?: string;
     timestamp?: string;
 }
+/**
+ * 运行期状态投影（上下文水位 / 会话累计统计）。
+ *
+ * 不是内容块：卡片把它渲染在状态行（statusRow），不进内容流，因此不参与
+ * blocks 分组与 MAX_BLOCKS 裁剪。字段缺省表示该维度本次未变。
+ *
+ * 数据源是 agent 服务端自己算好的投影（DSH `session/control` 的
+ * contextPressure / sessionStats），bridge 不重算口径——百分比只在两端都
+ * 有值时才渲染。
+ */
+export interface RunStatusEvent {
+    type: 'run_status';
+    /** 已投影 token（官方口径 projectedTokens ?? pressureTokens）。 */
+    contextUsed?: number;
+    /** 上下文窗口上限（contextWindow）。 */
+    contextLimit?: number;
+    /** 会话累计步骤数（sessionStats.steps）。 */
+    steps?: number;
+    /** 会话累计工具耗时（毫秒，sessionStats.toolMs）。 */
+    toolMs?: number;
+    timestamp?: string;
+}
+/**
+ * 运行结束后仍在后台运行的任务（终态卡展示 + 逐个停止入口）。
+ *
+ * 为什么必须出现在 run 卡片上：后台任务的生命周期跨 turn（`bash
+ * run_in_background` 起的东西能活过 run 结束），卡片收尾时如果不说，用户就
+ * 以为这一轮真的结束了——机器上却还在跑。
+ */
+export interface BackgroundJobsEvent {
+    type: 'background_jobs';
+    jobs: Array<{
+        id: string;
+        label: string;
+        status?: string;
+        progress?: string;
+    }>;
+    timestamp?: string;
+}
 /** File change event — for agents that report file modifications (e.g. Codex). */
 export interface FileChangeEvent {
     type: 'file_change';
@@ -392,7 +431,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;
+export type AgentEvent = SystemInitEvent | SystemCompactEvent | ApprovalRequestedEvent | ApprovalResolvedEvent | ApprovalViewUpdatedEvent | ApprovalExpiredEvent | AssistantEvent | UserEvent | ResultEvent | PlanEvent | FileChangeEvent | TurnStartedEvent | TurnDiffEvent | NoticeEvent | SessionInfoEvent | RunStatusEvent | BackgroundJobsEvent;
 export interface SpawnOptions {
     cwd: string;
     sessionId?: string;
@@ -402,6 +441,29 @@ export interface SpawnOptions {
     reasoningEffort?: string;
     settings?: string;
 }
+/**
+ * What a stop request actually achieved.
+ *
+ * Local-process runners (`claude`/`codex`/…) can answer this from the kill
+ * itself and keep returning `void`. DSH turns live in the shared Web Host, so
+ * its stop is a session-scoped request: the outcome is the only way callers can
+ * tell "the turn is gone" apart from "we asked, but it is still running".
+ *
+ * - `withdrawn`   — the prompt had not started yet and was removed from the
+ *                   host's inbox; no turn was cancelled.
+ * - `cancelled`   — the active turn (or maintenance job) was cancelled and the
+ *                   host reported the session idle.
+ * - `unconfirmed` — the cancel was rejected/lost, or the session still reports
+ *                   an open turn afterwards. A turn may still be running.
+ * - `noop`        — there was no session to stop (e.g. stop during setup).
+ */
+export type StopStatus = 'withdrawn' | 'cancelled' | 'unconfirmed' | 'noop';
+export interface StopOutcome {
+    status: StopStatus;
+    sessionId?: string;
+    /** Human-readable reason for `unconfirmed` (logged, not shown verbatim). */
+    detail?: string;
+}
 /**
  * Seam (§3): the contract any agent runner (claude/codex/opencode/pi/kimi/dsh)
  * must satisfy for the router/bridge.
@@ -417,10 +479,14 @@ export interface Runner {
      * Stop the running process. SIGTERM → grace → SIGKILL on the per-workspace
      * proc. `immediate: true` skips the grace period and SIGKILLs directly
      * (used by user-initiated `/stop`).
+     *
+     * Runners whose work is remote (DSH) return a {@link StopOutcome} instead of
+     * `void` so callers can tell a confirmed stop from a best-effort request;
+     * process runners keep returning `void`.
      */
     stop(opts?: {
         immediate?: boolean;
-    }): Promise<void>;
+    }): Promise<void | StopOutcome>;
     killOrphan(): void;
     registerExitHandlers(): void;
     /**
@@ -441,6 +507,8 @@ export interface Runner {
  */
 export declare const AGENT_KINDS: readonly ["claude", "codex", "opencode", "pi", "kimi", "dsh"];
 export type AgentKind = (typeof AGENT_KINDS)[number];
+/** 用户可见 agent 显示名单源：启动注册与无 registry 的回退路径共用。 */
+export declare const AGENT_DISPLAY_NAMES: Record<AgentKind, string>;
 /**
  * Compact 能力声明（运行时门控的能力清单，编译期强制完整）。
  *
@@ -463,11 +531,36 @@ export interface AgentSession {
     mtime: number;
     /** DSH：session 创建时固定的 preset；其他 agent 无此概念（undefined）。 */
     agentPreset?: string;
+    /**
+     * 服务端投影已有的会话标题（DSH `projections.values.title`）。
+     *
+     * 与 `summary` 的区别：`summary` 是「首条用户输入」的兜底口径（claude /
+     * codex / pi / kimi 无标题字段），`title` 是 agent 自己起的标题。列表卡
+     * 用它决定标签文案（标题 / 会话摘要），缺省时回退 `summary`。
+     */
+    title?: string;
+    /**
+     * 最后一轮用户输入（服务端投影，单行预览）。
+     *
+     * 只给「列表响应里已顺带返回」的 reader 用（DSH 的 `turnOutline` 末条），
+     * 目的是让列表卡不必为每行做一次全量内容读取。
+     */
+    lastUserMessage?: string;
+    /** 最后一轮助手输出（服务端投影已截断，单行预览）。 */
+    lastAssistantMessage?: string;
 }
 /** A single renderable event from session history. */
 export interface AgentSessionContentEvent {
     type: string;
+    /** 正文（展开后的面板内容）。 */
     content: string;
+    /**
+     * 面板标题（可选，覆盖 reader 的默认标签）。
+     *
+     * 折叠面板默认只显示标题：工具调用这种"标题即全部信息"的事件必须把
+     * `bash — npm test` 这类摘要放进标题，否则折叠态只剩 `🔧 工具调用`。
+     */
+    title?: string;
     timestamp?: string;
 }
 export interface AgentSessionUsage {

package/dist/runner/types.js

@@ -16,6 +16,15 @@
  * 新增 agent 只改这里。
  */
 export const AGENT_KINDS = ['claude', 'codex', 'opencode', 'pi', 'kimi', 'dsh'];
+/** 用户可见 agent 显示名单源：启动注册与无 registry 的回退路径共用。 */
+export const AGENT_DISPLAY_NAMES = {
+    claude: 'Claude',
+    codex: 'Codex',
+    opencode: 'Opencode',
+    pi: 'Pi',
+    kimi: 'Kimi',
+    dsh: 'DSH',
+};
 /**
  * Compact 能力声明（运行时门控的能力清单，编译期强制完整）。
  *

package/dist/session/claude/session-index.d.ts

@@ -74,10 +74,6 @@ export declare class SessionIndex {
     private readonly byCwd;
     private lastRefreshAt;
     private built;
-    /** Test-only: count of parseSessionJsonl calls since creation */
-    parseCount: number;
-    /** Test-only: count of directory scan operations */
-    scanCount: number;
     constructor(projectsDir: string, opts?: SessionIndexOptions);
     /** Whether a full scan has ever completed successfully (readdir succeeded). */
     get isBuilt(): boolean;

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

@@ -146,10 +146,6 @@ export class SessionIndex {
     byCwd = new Map();
     lastRefreshAt = 0;
     built = false;
-    /** Test-only: count of parseSessionJsonl calls since creation */
-    parseCount = 0;
-    /** Test-only: count of directory scan operations */
-    scanCount = 0;
     constructor(projectsDir, opts = {}) {
         this.projectsDir = projectsDir;
         this.refreshIntervalMs = opts.refreshIntervalMs ?? 5000;
@@ -161,7 +157,6 @@ export class SessionIndex {
     }
     // ── Build (initial full scan) ───────────────────────────
     build() {
-        this.scanCount++;
         this.fullScan();
         this.lastRefreshAt = Date.now();
     }
@@ -171,7 +166,6 @@ export class SessionIndex {
         if (now - this.lastRefreshAt < this.refreshIntervalMs) {
             return; // throttled
         }
-        this.scanCount++;
         this.fullScan();
         this.lastRefreshAt = now;
     }
@@ -232,7 +226,6 @@ export class SessionIndex {
             }
             // Fingerprint changed → re-parse this single file
             const parsed = parseSessionJsonl(p);
-            this.parseCount++;
             try {
                 const st = fs.statSync(p, { bigint: true });
                 const updated = {
@@ -303,7 +296,6 @@ export class SessionIndex {
                 // Concurrent-write guard: stat before and after parse, compare fingerprints
                 const fpBefore = fp;
                 const parsed = parseSessionJsonl(fullPath);
-                this.parseCount++;
                 const fpAfter = buildFingerprint(fullPath);
                 if (fpBefore !== fpAfter) {
                     // File was modified during parse → skip this round, retry next refresh

package/dist/session/claude/sessions.js

@@ -15,8 +15,8 @@ import { SessionIndex, extractText, isTaskNotificationText, CLAUDE_MAPPING, } fr
  * win32 上 `\` 同样是分隔符、`:` 是非法文件名字符，一并归一为 `-`
  * （`C:\Users\x\proj` -> `C--Users-x-proj`）；见 encodeProjectDirName。
  *
- * Note: this encoding is LOSSY (`disk_d/foo` and `disk-d/foo` both encode to
- * `disk-d-foo`). It is only safe to use the result to **locate** files; never
+ * Note: this encoding is LOSSY (`my_data/foo` and `my-data/foo` both encode to
+ * `my-data-foo`). It is only safe to use the result to **locate** files; never
  * to **decode** a directory name back to a cwd. The cwd must always be read
  * from the JSONL content (regression 2026-06-21 /resume & /cd 路径错乱).
  */