lark-remote 0.5.19 → 0.5.21

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

@@ -5,8 +5,8 @@
  * `dsh web` host (`DshDaemon`). So the usual "kill my spawned child" exit
  * cleanup does nothing for it, and a bridge that exits mid-turn leaves the
  * turn running with no subscriber — an orphan turn that keeps consuming tokens
- * and mutating the workspace invisibly (2026-10-19: one ran 2h21m / 345 steps
- * after its bridge died).
+ * and mutating the workspace invisibly, potentially for hours after the bridge
+ * died.
  *
  * `process.on('exit')` cannot await, so this path uses the same synchronous
  * curl transport the session reader already uses: bounded by `timeoutMs` and

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

@@ -5,8 +5,8 @@
  * `dsh web` host (`DshDaemon`). So the usual "kill my spawned child" exit
  * cleanup does nothing for it, and a bridge that exits mid-turn leaves the
  * turn running with no subscriber — an orphan turn that keeps consuming tokens
- * and mutating the workspace invisibly (2026-10-19: one ran 2h21m / 345 steps
- * after its bridge died).
+ * and mutating the workspace invisibly, potentially for hours after the bridge
+ * died.
  *
  * `process.on('exit')` cannot await, so this path uses the same synchronous
  * curl transport the session reader already uses: bounded by `timeoutMs` and

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

@@ -3,7 +3,7 @@
  *
  * A DSH turn runs inside the shared `dsh web` host, not in a child process. If
  * the bridge dies (SIGKILL, crash) the turn keeps running with no subscriber —
- * the 2026-10-19 incident ran 2h21m / 345 steps after its bridge exited. The
+ * one orphaned turn kept going for hours after its bridge exited. The
  * runner writes one entry when it submits a prompt and removes it once the run
  * (or a verified stop) accounts for that prompt; the next startup reconciles
  * anything left behind:

package/dist/runner/dsh/inflight.js

@@ -3,7 +3,7 @@
  *
  * A DSH turn runs inside the shared `dsh web` host, not in a child process. If
  * the bridge dies (SIGKILL, crash) the turn keeps running with no subscriber —
- * the 2026-10-19 incident ran 2h21m / 345 steps after its bridge exited. The
+ * one orphaned turn kept going for hours after its bridge exited. The
  * runner writes one entry when it submits a prompt and removes it once the run
  * (or a verified stop) accounts for that prompt; the next startup reconciles
  * anything left behind:

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

@@ -1,5 +1,28 @@
 import { getLogger } from '../../logger/index.js';
 import { DshError } from './errors.js';
+function nonEmptyString(value) {
+    return typeof value === 'string' && value ? value : undefined;
+}
+// 模块级命名提取器：顺序即优先级，先命中先返回。抽到模块顶层后
+// describeSocketError 只剩「校验 + 遍历」，决策点集中在独立的纯函数里。
+function messageDetail(e) {
+    return nonEmptyString(e.message);
+}
+function errorObjectDetail(e) {
+    return e.error instanceof Error ? nonEmptyString(e.error.message) : undefined;
+}
+function errorStringDetail(e) {
+    return nonEmptyString(e.error);
+}
+function typeDetail(e) {
+    return nonEmptyString(e.type);
+}
+const SOCKET_ERROR_DETAIL_EXTRACTORS = [
+    messageDetail,
+    errorObjectDetail,
+    errorStringDetail,
+    typeDetail,
+];
 /**
  * onerror 的事件对象在 ws 实现之间形态不一（{message} / {error} / {type}）。
  * 尽力取出可读描述；取不到就不追加，别拿 '[object Object]' 充数。
@@ -8,14 +31,11 @@ function describeSocketError(event) {
     if (!event || typeof event !== 'object')
         return undefined;
     const e = event;
-    if (typeof e.message === 'string' && e.message)
-        return e.message;
-    if (e.error instanceof Error && e.error.message)
-        return e.error.message;
-    if (typeof e.error === 'string' && e.error)
-        return e.error;
-    if (typeof e.type === 'string' && e.type)
-        return e.type;
+    for (const extract of SOCKET_ERROR_DETAIL_EXTRACTORS) {
+        const detail = extract(e);
+        if (detail)
+            return detail;
+    }
     return undefined;
 }
 export async function* openMuxStream(opts) {

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

@@ -21,6 +21,7 @@ import type { AgentSessionReader } from '../../session-contract.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 { DshApprovalTracker } from './approval.js';
 import type { DshDaemon } from './daemon.js';
 export interface DshRunnerOptions {
     kind: 'dsh';
@@ -110,7 +111,7 @@ export declare class DshRunner implements AgentRunner {
     /** 已对齐权限预设的 session；同一 session 只执行一次 `/permission`。 */
     private readonly permissionAlignedSessions;
     /** `$events` approval waterfall state for the current run. */
-    private readonly approvalTracker;
+    readonly approvalTracker: DshApprovalTracker;
     /**
      * eventId → 待回答的 DSH `ask_user_question` waterfall。
      *
@@ -155,12 +156,51 @@ export declare class DshRunner implements AgentRunner {
      */
     private submitPrompt;
     run(message: string, opts: SpawnOptions): AsyncGenerator<AgentEvent>;
+    /**
+     * 准备一个 turn（run() 的准备阶段）：模型对齐 + 权限预设对齐 + goal seed 探测。
+     *
+     * 红线（逐条保留）：
+     * - 对齐失败 fail closed：显式配置 provider 时 selectModel 失败必须 throw
+     *   （静默回退到其他 provider 会让用户以为切换成功，实际模型与账单都错）；
+     *   权限预设失败由 alignPermissionPreset throw（用户明确选了安全策略，不能在
+     *   错误的权限下继续跑 prompt）。
+     * - 准备期间被 stop（abort）→ 返回 { ok:false }，由调用方 yield interrupted
+     *   result 收尾。
+     * - goal seed 只探测不推断：读不到按 unknown 上报，不冒充「没有 goal」。
+     */
+    private prepareTurn;
     /**
      * Consume one turn from both transports. `session/follow` owns transcript
      * events; `$events` owns the answerable approval waterfall. The merged
      * stream keeps either transport from starving the other.
+     *
+     * 事件源分派：projection（goal + 状态条）→ handleProjectionItem；
+     * $events waterfall（审批/提问）→ handleApprovalWaterfallItem；
+     * assistant-stream 直转发（translator 持有本 turn 的 usage 累计状态）；
+     * session/follow 事件 → handleSessionEvent（含 result 收尾的 jobs + goal 复核）。
      */
     private runTurn;
+    /**
+     * 事件源 handler：Host-wide 投影（goal + 状态条）。
+     * 返回要回放的事件（可能为空——未变化/非本 session 的帧不产事件）。
+     */
+    private handleProjectionItem;
+    /**
+     * 事件源 handler：$events 审批/提问 waterfall（channel 状态、审批 waterfall
+     * 登记、提问卡、cancel 回流、审批卡）。
+     * 返回要回放的事件；channel 状态类帧（ready/unavailable/request）只改内部
+     * 状态、不产事件。
+     */
+    private handleApprovalWaterfallItem;
+    /**
+     * 事件源 handler：`session/follow` 会话事件。
+     * - goal/change：权威变更，不等投影直接更新；
+     * - tool/call：先记账（审批卡命令展示用）再落入 translator（卡片工具行来源）；
+     * - approval/decided：审批回流，清审批卡；
+     * - 其余事件经 translator 翻译；result 事件先做收尾（后台任务名单 + goal
+     *   复核）再随 result 一起返回。
+     */
+    private handleSessionEvent;
     /**
      * 收尾时仍在跑的后台任务。
      *
@@ -168,7 +208,7 @@ export declare class DshRunner implements AgentRunner {
      * 现，卡片列出来只会误导"还没跑完"。`job/list` 拿不到时返回空数组——没有
      * 任务列表不等于有任务在跑。
      */
-    private collectBackgroundJobs;
+    collectBackgroundJobs(sessionId: string, signal: AbortSignal): Promise<AgentEvent[]>;
     /**
      * 订阅本 session 的后台任务名单（跨 turn 生命周期）。
      *
@@ -204,7 +244,7 @@ export declare class DshRunner implements AgentRunner {
      * the Other input, multi-select submit and skip from this view alone.
      */
     private buildQuestionRequested;
-    private approvalResolved;
+    approvalResolved(requestId: string): AgentEvent;
     private approvalFallbackText;
     /**
      * Compact the session through DSH's `/compact` command.
@@ -279,7 +319,7 @@ export declare class DshRunner implements AgentRunner {
      *
      * turn 跑在常驻共享的 `dsh web` host 里，不在本进程的子进程树上；所以
      * "杀自己的子进程"这套退出清理对它无效，桥接一退出，turn 继续无人接收地跑
-     * （2026-10-19 实测：一个孤儿 turn 在桥接死后又跑了 2h21m / 345 个 step）。
+     * （孤儿 turn 在桥接死后可能再跑数小时）。
      * 这里复用进程级退出分发器，用同步 curl 发一次 `session/cancel`。
      */
     registerExitHandlers(): void;