lark-remote 0.5.20 → 0.5.21

package/dist/runner/dsh/approval.js

@@ -9,6 +9,70 @@
  * first.
  */
 import { getLogger } from '../../logger/index.js';
+// --- 模块级命名函数：把状态显式传入，避免在方法内定义带决策点的闭包 ---
+// crapper 会把方法内部闭包的决策点计入外层方法；抽到模块顶层后
+// onWaterfall / waitForBinding 只剩选路。
+/** 重连重投：刷新已绑定 waterfall 的应答通道，不产新 binding。 */
+function refreshRedeliveredWaterfall(bindings, waterfallByCallId, approvalId, waterfall) {
+    const binding = bindings.get(approvalId);
+    if (!binding)
+        return;
+    binding.waterfall.clientId = waterfall.clientId;
+    if (waterfall.reason)
+        binding.waterfall.reason = waterfall.reason;
+    if (waterfall.callId)
+        waterfallByCallId.set(waterfall.callId, binding.waterfall);
+}
+/** 第一段：按 callId 精确匹配未绑定 audit。 */
+function auditWithCallId(audits, bindings, callId) {
+    for (const audit of audits) {
+        if (audit.callId === callId && !bindings.has(audit.approvalId))
+            return audit;
+    }
+    return undefined;
+}
+/** 第二段：无 callId 的 audit，按 toolName 兜底配对。 */
+function unboundAuditWithoutCallId(audits, bindings, toolName) {
+    for (const audit of audits) {
+        if (!audit.callId && !bindings.has(audit.approvalId) && audit.toolName === toolName) {
+            return audit;
+        }
+    }
+    return undefined;
+}
+/** 第三段：waterfall 无 callId 时，按 toolName 找最老未绑定 audit。 */
+function unboundAuditByToolName(audits, bindings, toolName) {
+    for (const audit of audits) {
+        if (!bindings.has(audit.approvalId) && audit.toolName === toolName)
+            return audit;
+    }
+    return undefined;
+}
+/** 按 waterfall 是否有 callId 选路，顺序与原实现三段 for 循环一致。 */
+function findPairableAudit(audits, bindings, waterfall) {
+    if (waterfall.callId) {
+        return (auditWithCallId(audits.values(), bindings, waterfall.callId) ??
+            unboundAuditWithoutCallId(audits.values(), bindings, waterfall.toolName));
+    }
+    return unboundAuditByToolName(audits.values(), bindings, waterfall.toolName);
+}
+/** 结束一次等待（幂等）：清 timer、摘监听、从 waiters 移除、resolve。 */
+function finishBindingWait(state, binding) {
+    if (state.settled)
+        return;
+    state.settled = true;
+    if (state.timer !== undefined)
+        clearTimeout(state.timer);
+    state.signal?.removeEventListener('abort', state.onAbort);
+    const set = state.waiters.get(state.approvalId);
+    set?.delete(state.finish);
+    if (set && set.size === 0)
+        state.waiters.delete(state.approvalId);
+    state.resolve(binding);
+}
+function abortBindingWait(state) {
+    finishBindingWait(state, undefined);
+}
 export class DshApprovalTracker {
     audits = new Map();
     waterfallByCallId = new Map();
@@ -43,45 +107,15 @@ export class DshApprovalTracker {
         if (existingApprovalId) {
             // A reconnect re-delivers the same pending event with a new Client
             // identity. Keep the card binding but refresh the answer channel.
-            const binding = this.bindings.get(existingApprovalId);
-            if (binding) {
-                binding.waterfall.clientId = waterfall.clientId;
-                if (waterfall.reason)
-                    binding.waterfall.reason = waterfall.reason;
-                if (waterfall.callId) {
-                    this.waterfallByCallId.set(waterfall.callId, binding.waterfall);
-                }
-            }
+            refreshRedeliveredWaterfall(this.bindings, this.waterfallByCallId, existingApprovalId, waterfall);
             return undefined;
         }
         if (waterfall.callId)
             this.waterfallByCallId.set(waterfall.callId, waterfall);
-        if (waterfall.callId) {
-            for (const audit of this.audits.values()) {
-                if (audit.callId === waterfall.callId && !this.bindings.has(audit.approvalId)) {
-                    return this.bind(audit, waterfall);
-                }
-            }
-            // Some approval types omit callId on the durable audit. Pair with the
-            // oldest unbound audit for the same tool before falling back to Web UI.
-            for (const audit of this.audits.values()) {
-                if (!audit.callId &&
-                    !this.bindings.has(audit.approvalId) &&
-                    audit.toolName === waterfall.toolName) {
-                    return this.bind(audit, waterfall);
-                }
-            }
-        }
-        // A missing callId is unusual but not fatal: pair with the oldest unbound
-        // audit for the same tool, preserving the audit id on the card.
-        if (!waterfall.callId) {
-            for (const audit of this.audits.values()) {
-                if (!this.bindings.has(audit.approvalId) && audit.toolName === waterfall.toolName) {
-                    return this.bind(audit, waterfall);
-                }
-            }
-        }
-        return undefined;
+        // Some approval types omit callId on the durable audit: pair with the
+        // oldest unbound audit for the same tool before falling back to Web UI.
+        const audit = findPairableAudit(this.audits, this.bindings, waterfall);
+        return audit ? this.bind(audit, waterfall) : undefined;
     }
     /** Mark an audit resolved (local response or an external decision). */
     onDecided(approvalId) {
@@ -125,24 +159,23 @@ export class DshApprovalTracker {
         if (signal?.aborted)
             return undefined;
         return new Promise((resolve) => {
-            let settled = false;
-            const finish = (binding) => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(timer);
-                signal?.removeEventListener('abort', onAbort);
-                const set = this.waiters.get(approvalId);
-                set?.delete(finish);
-                if (set && set.size === 0)
-                    this.waiters.delete(approvalId);
-                resolve(binding);
+            // 状态显式打包；finish/onAbort 用模块级函数 + bind 绑定状态，
+            // 不在方法内定义带决策点的闭包。
+            const state = {
+                settled: false,
+                onAbort: () => { },
+                approvalId,
+                waiters: this.waiters,
+                resolve,
+                signal,
+                finish: () => { },
             };
-            const onAbort = () => finish(undefined);
-            const timer = setTimeout(() => finish(undefined), timeoutMs);
-            signal?.addEventListener('abort', onAbort, { once: true });
+            state.finish = finishBindingWait.bind(null, state);
+            state.onAbort = abortBindingWait.bind(null, state);
+            state.timer = setTimeout(abortBindingWait.bind(null, state), timeoutMs);
+            signal?.addEventListener('abort', state.onAbort, { once: true });
             const set = this.waiters.get(approvalId) ?? new Set();
-            set.add(finish);
+            set.add(state.finish);
             this.waiters.set(approvalId, set);
         });
     }

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

@@ -19,7 +19,7 @@
  * `sessionEvents()` adds per-session filtering, reconnect + follow-snapshot
  * replay, and seq-based dedup.
  */
-import type { DshApprovalStreamItem, DshCommandResult, DshModelCatalogValue, DshModelSelection, DshOpenTurnState, DshPermissionCatalogValue, DshJobView, DshPresetListValue, DshProjectionItem, DshProjectionSnapshot, DshQuestion, DshRemoteEventOutcome, DshSessionPageValue, DshStreamItem } from '../../dsh/types.js';
+import type { DshApprovalStreamItem, DshCommandResult, DshFollowSnapshot, DshModelCatalogValue, DshModelSelection, DshOpenTurnState, DshPermissionCatalogValue, DshJobView, DshPresetListValue, DshProjectionItem, DshProjectionSnapshot, DshQuestion, DshRemoteEventOutcome, DshSessionEvent, DshSessionPageValue, DshStreamItem } from '../../dsh/types.js';
 import type { GoalView } from '../types.js';
 export { DshError } from './errors.js';
 interface WebSocketMessageEvent {
@@ -105,8 +105,11 @@ export declare class DshClient {
         signal?: AbortSignal;
         timeoutMs?: number;
     }): Promise<unknown>;
-    /** Distinguish "run stopped" (abort) from "server did not answer" (timeout). */
-    private abortError;
+    /** One unary POST attempt: obtain cookie, then post; both stages may ask to
+     *  retry once (401 → re-mint cookie); all other failures throw DshError. */
+    private attemptUnary;
+    private obtainUnaryCookie;
+    private postUnary;
     /** Create a session. Pass `agentPreset` to pin the session's preset (fixed at
      *  creation). */
     createSession(payload: {
@@ -157,8 +160,6 @@ export declare class DshClient {
         signal?: AbortSignal;
         timeoutMs?: number;
     }): Promise<void>;
-    /** Hand one waterfall delivery back with `next` (another answerer owns it). */
-    private delegateWaterfall;
     /**
      * Return the highest event `seq` currently persisted for the session.
      *
@@ -279,9 +280,6 @@ export declare class DshClient {
      * `next` so a different lark-remote workspace cannot park it.
      */
     approvalEvents(sessionId: string, signal: AbortSignal): AsyncGenerator<DshApprovalStreamItem>;
-    /** Translate one durable event into a stream item (approvals are surfaced
-     *  separately; everything else is forwarded to the runner). */
-    private eventItem;
     /**
      * Per-session subscription: yields session events, assistant stream chunks
      * and approval notices for `sessionId`, auto-reconnecting on stream
@@ -312,7 +310,7 @@ export declare class DshClient {
      * 返回 seq 升序的完整回放序列（回填 + 快照记录；与 lastSeq 重叠的条目
      * 由回放循环的 seq 去重兜住）。
      */
-    private replaySnapshotGap;
+    replaySnapshotGap(sessionId: string, signal: AbortSignal, lastSeq: number, frame: DshFollowSnapshot): Promise<DshSessionEvent[]>;
     /**
      * Host-wide live projection stream (`session/control`).
      *