lark-remote 0.5.17 → 0.5.19

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

@@ -18,7 +18,7 @@
  * back to the Web UI prompt.
  */
 import type { AgentSessionReader } from '../../session-contract.js';
-import type { AgentEvent, AgentStatusInfo, SpawnOptions, StopOutcome } from '../types.js';
+import type { AgentEvent, AgentStatusInfo, BackgroundJobRoster, SpawnOptions, StopOutcome } from '../types.js';
 import type { AgentRunner } from '../types.js';
 import { DshClient, type WebSocketFactory } from './client.js';
 import type { DshDaemon } from './daemon.js';
@@ -169,6 +169,13 @@ export declare class DshRunner implements AgentRunner {
      * 任务列表不等于有任务在跑。
      */
     private collectBackgroundJobs;
+    /**
+     * 订阅本 session 的后台任务名单（跨 turn 生命周期）。
+     *
+     * 卡片收尾后仍要靠它把「任务结束了」推给用户：run 的事件流在 result 就关了，
+     * 而后台任务可能再跑半小时。名单是整份替换，消费方自己做 diff。
+     */
+    watchJobs(sessionId: string, signal: AbortSignal): AsyncGenerator<ReadonlyArray<BackgroundJobRoster>>;
     /** Kill one background job of this runner's session (card button path). */
     killJob(sessionId: string, jobId: string): Promise<boolean>;
     /** Apply the configured permission preset once per session, before prompt. */

package/dist/runner/dsh/runner.js

@@ -796,6 +796,22 @@ export class DshRunner {
             },
         ];
     }
+    /**
+     * 订阅本 session 的后台任务名单（跨 turn 生命周期）。
+     *
+     * 卡片收尾后仍要靠它把「任务结束了」推给用户：run 的事件流在 result 就关了，
+     * 而后台任务可能再跑半小时。名单是整份替换，消费方自己做 diff。
+     */
+    async *watchJobs(sessionId, signal) {
+        for await (const rows of this.client.watchJobs(sessionId, signal)) {
+            yield rows.map((job) => ({
+                id: job.id,
+                label: job.label ?? job.id,
+                ...(job.status === undefined ? {} : { status: job.status }),
+                ...(job.progress === undefined ? {} : { progress: job.progress }),
+            }));
+        }
+    }
     /** Kill one background job of this runner's session (card button path). */
     async killJob(sessionId, jobId) {
         return await this.client.jobKill(sessionId, jobId);

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

@@ -36,6 +36,14 @@ export declare class DshTranslator {
     private hasStreamUsage;
     /** 当前 attempt 的 id（start 帧携带，chunk 帧也带；断开重连重放时不变）。 */
     private attemptId;
+    /**
+     * 本 turn 末条 durable assistant 消息的正文（**完整**、未截断）。
+     *
+     * live chunk 是逐 delta 拼接、会被状态层的 MAX_TEXT_CHARS 窗口截断；
+     * durable `assistant/message` 一次就到齐全文。收 turn 时把它挂在 result 上，
+     * 卡片才能渲染完整回答（2026-11-01 输出块被截断缺陷）。
+     */
+    private lastMessageText?;
     /** Translate one live assistant-stream chunk into AgentEvents. */
     streamFrameToAgentEvents(frame: DshAssistantStreamFrame, _sessionId: string): AgentEvent[];
     /**

package/dist/runner/dsh/translator.js

@@ -34,6 +34,14 @@ export class DshTranslator {
     hasStreamUsage = false;
     /** 当前 attempt 的 id（start 帧携带，chunk 帧也带；断开重连重放时不变）。 */
     attemptId = '0';
+    /**
+     * 本 turn 末条 durable assistant 消息的正文（**完整**、未截断）。
+     *
+     * live chunk 是逐 delta 拼接、会被状态层的 MAX_TEXT_CHARS 窗口截断；
+     * durable `assistant/message` 一次就到齐全文。收 turn 时把它挂在 result 上，
+     * 卡片才能渲染完整回答（2026-11-01 输出块被截断缺陷）。
+     */
+    lastMessageText;
     /** Translate one live assistant-stream chunk into AgentEvents. */
     streamFrameToAgentEvents(frame, _sessionId) {
         if (frame.type === 'start') {
@@ -116,6 +124,10 @@ export class DshTranslator {
                 if (raw && typeof raw === 'object') {
                     this.recordMessageUsage(raw);
                 }
+                // 每条 durable 消息都带完整正文；记最后一条非空的就是本轮回答。
+                const text = messageText(ev.data.message);
+                if (text.trim())
+                    this.lastMessageText = text;
                 return [];
             }
             case 'tool/call': {
@@ -188,6 +200,9 @@ export class DshTranslator {
                         ? `turn ended with reason: ${reason}: ${detail}`
                         : `turn ended with reason: ${reason}`;
                 }
+                if (this.lastMessageText) {
+                    result.finalAnswerText = this.lastMessageText;
+                }
                 return [result];
             }
             default:
@@ -214,6 +229,27 @@ function parseToolArguments(raw) {
         return trimmed;
     }
 }
+/**
+ * 取 `assistant/message.message.content` 里的正文（type==='text' 的块）。
+ *
+ * 只收 text 块：reasoning 走独立面板（且另有 4000 字符窗口），tool-call 由
+ * `tool/call` 事件承载。块之间直接拼接、不插分隔符——同一条消息里的多个 text
+ * 块本来就是一段连续回答。
+ */
+function messageText(message) {
+    const content = message?.content;
+    if (!Array.isArray(content))
+        return '';
+    const parts = [];
+    for (const block of content) {
+        if (!block || typeof block !== 'object')
+            continue;
+        const rec = block;
+        if (rec.type === 'text' && typeof rec.text === 'string')
+            parts.push(rec.text);
+    }
+    return parts.join('');
+}
 /**
  * Flatten a `tool/result.message.content` block list into display text.
  *

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, AgentRunner, TurnStartedEvent, TurnDiffEvent, FinalAnswerEvent, NoticeEvent, SessionInfoEvent, ToolHint, ApprovalView, ApprovalRequestedEvent, ApprovalResolvedEvent, GoalView, GoalStateEvent, } from './types.js';
+export type { ResultEvent, PlanEvent, FileChangeEvent, AgentEvent, Runner, RunnerLifetime, AgentRunner, TurnStartedEvent, TurnDiffEvent, FinalAnswerEvent, NoticeEvent, SessionInfoEvent, ToolHint, ApprovalView, ApprovalRequestedEvent, ApprovalResolvedEvent, BackgroundJobRoster, BackgroundJobsEvent, GoalView, GoalStateEvent, } from './types.js';
 export { resolveAgentChoices } from './resolve-agent-choices.js';
 export { syncAgentChoices } from './sync-agent-choices.js';

package/dist/runner/types.d.ts

@@ -294,6 +294,17 @@ export interface ResultEvent {
     subtype: 'success' | 'error' | 'interrupted';
     session_id: string;
     timestamp?: string;
+    /**
+     * 本 run 的权威最终回答全文（runner 手里有一份完整文本时才填）。
+     *
+     * 为什么必须由 runner 带过来：状态层对进度正文有 `MAX_TEXT_CHARS`（12000
+     * 字符）存储窗口，最终回答超过窗口时 blocks 里只剩尾部 + `…（前 N 字符已
+     * 省略）` 标记——渲染层再怎么「回答优先」也找不回被丢掉的头部。runner 在
+     * 收 turn 时拿到的是**完整** assistant 文本（一条消息，不是逐 delta 拼接），
+     * 把它挂在 result 上，`promoteFinalAnswer` 用它建立 finalAnswer，回答因此
+     * 不再被进度窗口截断（2026-11-01 卡片输出块被截断缺陷）。
+     */
+    finalAnswerText?: string;
     usage?: {
         /** Non-cached input tokens. For codex this is raw `input_tokens` minus
          *  `cached_input_tokens`; for pi/claude/opencode the raw value is already
@@ -405,6 +416,20 @@ export interface GoalStateEvent {
     known: boolean;
     timestamp?: string;
 }
+/**
+ * 后台任务名单里的一行（宿主侧权威数据）。
+ *
+ * `status` 保留宿主原词（running / stopping / completed / failed …）——各
+ * agent 的终态词表不同，桥侧只按「是不是 running/stopping」二分，不在这里
+ * 维护一份会漂移的枚举。桥侧自己产出的 `ended` / `unknown` 见
+ * `BackgroundJobStatus`（card/run-state）。
+ */
+export interface BackgroundJobRoster {
+    id: string;
+    label: string;
+    status?: string;
+    progress?: string;
+}
 /**
  * 运行结束后仍在后台运行的任务（终态卡展示 + 逐个停止入口）。
  *
@@ -414,12 +439,7 @@ export interface GoalStateEvent {
  */
 export interface BackgroundJobsEvent {
     type: 'background_jobs';
-    jobs: Array<{
-        id: string;
-        label: string;
-        status?: string;
-        progress?: string;
-    }>;
+    jobs: BackgroundJobRoster[];
     timestamp?: string;
 }
 /** File change event — for agents that report file modifications (e.g. Codex). */
@@ -600,6 +620,14 @@ export interface AgentRunner extends Runner {
      * agent 实现；调用方按能力存在与否门控。
      */
     killJob?(sessionId: string, jobId: string): Promise<boolean>;
+    /**
+     * 订阅一个 session 的后台任务名单（整份替换），直到 `signal` abort 或宿主
+     * 关闭流。只有支持后台任务的 agent 实现；调用方按能力存在与否门控。
+     *
+     * 必须在 run 结束之后仍然可用：后台任务的生命周期跨 turn，收尾那一刻的快照
+     * 只能画一张会过期的卡。
+     */
+    watchJobs?(sessionId: string, signal: AbortSignal): AsyncIterable<ReadonlyArray<BackgroundJobRoster>>;
     /**
      * 热更审批模式/权限预设（config.save 后推给在跑的 runner，不必重启会话）。
      * 各家 settings 词表不同（codex: approvalPolicy/sandbox；kimi: permissionMode；

package/dist/session/dsh/sessions.d.ts

@@ -7,8 +7,8 @@
  * — a synchronous HTTP round-trip to the local DSH host. This keeps the
  * router/bridge interface contract intact without touching any upstream logic.
  *
- * listSessions: session/list → filter by cwd → sort by updatedAt desc → local
- *   pagination (DSH v1 has no cursor pagination).
+ * listSessions: session/list → 排除 subagent 派生会话 → filter by cwd → sort by
+ *   updatedAt desc → local pagination (DSH v1 has no cursor pagination).
  * readSessionContent: session/projections → session/page → map SessionEvents +
  *   session-wide usage accumulation (assistant/message.usage)；本 run 的 flow
  *   字段 = 末个 turn（turn/start–turn/end）内所有采样之和，与 codex 同口径。
@@ -77,6 +77,11 @@ export declare class DshSessionReader implements AgentSessionReader {
      * Find the session row in `session/list` that matches BOTH id and cwd.
      * Returns undefined when the id belongs to another workspace (or is unknown) —
      * every caller treats that as "not usable here".
+     *
+     * subagent 派生会话也排除：它的 id + cwd 都能命中，但只能按
+     * `{kind:'subagent', parentSessionId, childSessionId}` 寻址，按顶层会话读会被
+     * 服务端拒绝（session/agent-busy）。在这里统一 fail-closed，比让每个调用方
+     * 各自吃一次拒绝异常更省事（那异常会被 catch 成空事件列表 = 一张空卡）。
      */
     private resolveSession;
     /** `session/page` needs an inclusive cursor; projections carry the watermark. */

package/dist/session/dsh/sessions.js

@@ -7,8 +7,8 @@
  * — a synchronous HTTP round-trip to the local DSH host. This keeps the
  * router/bridge interface contract intact without touching any upstream logic.
  *
- * listSessions: session/list → filter by cwd → sort by updatedAt desc → local
- *   pagination (DSH v1 has no cursor pagination).
+ * listSessions: session/list → 排除 subagent 派生会话 → filter by cwd → sort by
+ *   updatedAt desc → local pagination (DSH v1 has no cursor pagination).
  * readSessionContent: session/projections → session/page → map SessionEvents +
  *   session-wide usage accumulation (assistant/message.usage)；本 run 的 flow
  *   字段 = 末个 turn（turn/start–turn/end）内所有采样之和，与 codex 同口径。
@@ -198,6 +198,7 @@ export class DshSessionReader {
             const value = this.unary('session/list', {});
             const items = value.items ?? [];
             const filtered = items
+                .filter((i) => !isSubagentSession(i))
                 .filter((i) => i.cwd !== undefined && samePath(i.cwd, cwd))
                 .map((i) => ({
                 sessionId: String(i.sessionId),
@@ -374,10 +375,18 @@ export class DshSessionReader {
      * Find the session row in `session/list` that matches BOTH id and cwd.
      * Returns undefined when the id belongs to another workspace (or is unknown) —
      * every caller treats that as "not usable here".
+     *
+     * subagent 派生会话也排除：它的 id + cwd 都能命中，但只能按
+     * `{kind:'subagent', parentSessionId, childSessionId}` 寻址，按顶层会话读会被
+     * 服务端拒绝（session/agent-busy）。在这里统一 fail-closed，比让每个调用方
+     * 各自吃一次拒绝异常更省事（那异常会被 catch 成空事件列表 = 一张空卡）。
      */
     resolveSession(sessionId, cwd) {
         const value = this.unary('session/list', {});
-        return (value.items ?? []).find((i) => String(i.sessionId) === sessionId && i.cwd !== undefined && samePath(i.cwd, cwd));
+        return (value.items ?? []).find((i) => !isSubagentSession(i) &&
+            String(i.sessionId) === sessionId &&
+            i.cwd !== undefined &&
+            samePath(i.cwd, cwd));
     }
     /** `session/page` needs an inclusive cursor; projections carry the watermark. */
     resolveThroughSeq(sessionId, known) {
@@ -387,6 +396,18 @@ export class DshSessionReader {
         return typeof known.projections?.asOfSeq === 'number' ? known.projections.asOfSeq : -1;
     }
 }
+/**
+ * subagent 派生会话判定（DSH 0.2.x 起与顶层会话并列在 `session/list` 里）。
+ *
+ * 只认 `origin === 'subagent'`，别用更"顺手"的两个信号：
+ * - **id 前缀**：顶层是 `session-<uuid>`、subagent 是裸 `<uuid>`，但 v0 老会话
+ *   也是裸 uuid 且能正常读（`delegationDepth: 0`、无 `origin`）；
+ * - **`parentSessionId` 非空**：fork 与 `session-btw-*` 旁支同样带 parent，却是
+ *   可恢复的顶层会话。
+ */
+function isSubagentSession(item) {
+    return item.origin === 'subagent';
+}
 /** Preset moved from the summary top level to projections in DSH 0.2.x. */
 function sessionPreset(item) {
     const preset = item.projections?.values?.agentPreset ?? item.agentPreset;

package/package.json

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

package/dist/card/final-answer-overflow.d.ts

@@ -1 +0,0 @@
-export declare function splitFinalAnswer(text: string, maxBytes?: number): string[];

package/dist/card/final-answer-overflow.js

@@ -1,46 +0,0 @@
-/**
- * Split an authoritative final answer into plain-text messages without losing
- * any content. Feishu cards have a hard size budget; a long answer must spill
- * rather than being silently truncated inside the progress card.
- */
-const FINAL_ANSWER_CHUNK_BYTES = 20_000;
-export function splitFinalAnswer(text, maxBytes = FINAL_ANSWER_CHUNK_BYTES) {
-    if (!text || maxBytes <= 0)
-        return text ? [text] : [];
-    const chunks = [];
-    let rest = text;
-    let remainingBytes = Buffer.byteLength(rest, 'utf8');
-    while (remainingBytes > maxBytes) {
-        let bytes = 0;
-        let end = 0;
-        let lastNewline = 0;
-        for (const char of rest) {
-            const charBytes = Buffer.byteLength(char, 'utf8');
-            if (bytes + charBytes > maxBytes)
-                break;
-            bytes += charBytes;
-            end += char.length;
-            if (char === '\n')
-                lastNewline = end;
-        }
-        if (end === 0) {
-            // A caller can choose a byte limit smaller than one codepoint. Keep one
-            // codepoint per chunk rather than looping forever with a zero-length cut.
-            const first = Array.from(rest)[0];
-            chunks.push(first);
-            rest = rest.slice(first.length);
-            remainingBytes -= Buffer.byteLength(first, 'utf8');
-            continue;
-        }
-        // Prefer a paragraph/line boundary when it does not waste most of a chunk.
-        const cut = lastNewline > 0 && lastNewline >= Math.floor(end * 0.6) ? lastNewline : end;
-        const chunk = rest.slice(0, cut);
-        chunks.push(chunk);
-        rest = rest.slice(cut);
-        remainingBytes -= Buffer.byteLength(chunk, 'utf8');
-    }
-    if (rest)
-        chunks.push(rest);
-    return chunks;
-}
-//# sourceMappingURL=final-answer-overflow.js.map