lark-remote 0.5.12 → 0.5.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (172) hide show
  1. package/CHANGELOG.md +28 -2
  2. package/README.en.md +1 -14
  3. package/README.md +1 -14
  4. package/dist/agent-kinds.d.ts +27 -0
  5. package/dist/agent-kinds.js +38 -0
  6. package/dist/bridge/approval-actions.d.ts +95 -0
  7. package/dist/bridge/approval-actions.js +104 -0
  8. package/dist/bridge/approval-coordinator.d.ts +1 -0
  9. package/dist/bridge/approval-coordinator.js +12 -24
  10. package/dist/bridge/final-usage.d.ts +8 -17
  11. package/dist/bridge/final-usage.js +1 -18
  12. package/dist/bridge/index.d.ts +52 -38
  13. package/dist/bridge/index.js +255 -433
  14. package/dist/bridge/queue-manager.d.ts +25 -1
  15. package/dist/bridge/queue-manager.js +179 -160
  16. package/dist/bridge/run-approval.d.ts +16 -0
  17. package/dist/bridge/run-approval.js +41 -0
  18. package/dist/bridge/run-usage.d.ts +32 -0
  19. package/dist/bridge/run-usage.js +87 -0
  20. package/dist/bridge/session-writeback.d.ts +19 -0
  21. package/dist/bridge/session-writeback.js +36 -0
  22. package/dist/card/approval-render.d.ts +3 -2
  23. package/dist/card/approval-render.js +3 -2
  24. package/dist/card/bash-card-session.js +2 -5
  25. package/dist/{router → card}/card-helpers.d.ts +7 -7
  26. package/dist/{router → card}/card-helpers.js +8 -8
  27. package/dist/card/card-session.d.ts +6 -2
  28. package/dist/card/card-session.js +28 -28
  29. package/dist/card/card-shared.d.ts +4 -4
  30. package/dist/card/card-shared.js +4 -10
  31. package/dist/card/collapsible.js +3 -2
  32. package/dist/card/final-answer-overflow.d.ts +1 -0
  33. package/dist/card/final-answer-overflow.js +46 -0
  34. package/dist/card/run-card-session.d.ts +2 -2
  35. package/dist/card/run-card-session.js +4 -9
  36. package/dist/card/run-renderer.d.ts +14 -0
  37. package/dist/card/run-renderer.js +126 -23
  38. package/dist/card/run-state.d.ts +40 -51
  39. package/dist/card/run-state.js +96 -34
  40. package/dist/card/usage-format.d.ts +30 -0
  41. package/dist/{router → card}/usage-format.js +3 -10
  42. package/dist/clone.js +6 -1
  43. package/dist/config/codex-config.js +4 -4
  44. package/dist/config/index.d.ts +18 -20
  45. package/dist/config/index.js +6 -20
  46. package/dist/config/pi-config.js +6 -4
  47. package/dist/connector/index.d.ts +2 -4
  48. package/dist/connector/index.js +7 -11
  49. package/dist/{runner/dsh → dsh}/auth.js +3 -4
  50. package/dist/dsh/home.d.ts +2 -0
  51. package/dist/dsh/home.js +8 -0
  52. package/dist/dsh/protocol.d.ts +9 -0
  53. package/dist/dsh/protocol.js +61 -0
  54. package/dist/inbound/turn-assembler.js +6 -0
  55. package/dist/index.js +25 -414
  56. package/dist/message-handlers.d.ts +26 -0
  57. package/dist/message-handlers.js +275 -0
  58. package/dist/model-catalog.d.ts +14 -0
  59. package/dist/model-catalog.js +25 -0
  60. package/dist/platform/path.d.ts +9 -0
  61. package/dist/platform/path.js +18 -0
  62. package/dist/router/active-run-usage.d.ts +4 -0
  63. package/dist/router/active-run-usage.js +12 -0
  64. package/dist/router/card-action-payload.d.ts +1 -1
  65. package/dist/router/card-action-payload.js +1 -1
  66. package/dist/router/commands/ls.d.ts +9 -0
  67. package/dist/router/commands/ls.js +243 -0
  68. package/dist/router/commands/order.d.ts +12 -0
  69. package/dist/router/commands/order.js +178 -0
  70. package/dist/router/commands/resume.d.ts +48 -0
  71. package/dist/router/commands/resume.js +246 -0
  72. package/dist/router/commands/ws.d.ts +15 -0
  73. package/dist/router/commands/ws.js +189 -0
  74. package/dist/router/config/claude.js +5 -4
  75. package/dist/router/config/codex.js +2 -6
  76. package/dist/router/config/common/render.d.ts +5 -1
  77. package/dist/router/config/common/render.js +6 -13
  78. package/dist/router/config/common/turn-idle.d.ts +2 -0
  79. package/dist/router/config/common/turn-idle.js +9 -0
  80. package/dist/router/config/dsh.d.ts +1 -1
  81. package/dist/router/config/index.d.ts +1 -1
  82. package/dist/router/config/kimi.js +2 -6
  83. package/dist/router/config/opencode.js +2 -6
  84. package/dist/router/config/types.d.ts +11 -3
  85. package/dist/router/index.d.ts +55 -33
  86. package/dist/router/index.js +233 -1376
  87. package/dist/router/paging.d.ts +13 -0
  88. package/dist/router/paging.js +20 -0
  89. package/dist/router/path-validation.d.ts +27 -0
  90. package/dist/router/path-validation.js +45 -0
  91. package/dist/runner/agent-choices-common.d.ts +1 -1
  92. package/dist/runner/claude/runner.d.ts +23 -6
  93. package/dist/runner/claude/runner.js +6 -20
  94. package/dist/runner/claude/session.js +1 -1
  95. package/dist/runner/codex/app-server/runner.d.ts +3 -1
  96. package/dist/runner/codex/app-server/translator.d.ts +13 -0
  97. package/dist/runner/codex/app-server/translator.js +114 -151
  98. package/dist/runner/common/acp/base-acp-runner.d.ts +3 -1
  99. package/dist/runner/common/acp/base-translator.d.ts +3 -8
  100. package/dist/runner/common/acp/base-translator.js +16 -7
  101. package/dist/runner/common/connection-based-runner.d.ts +3 -1
  102. package/dist/runner/common/jsonrpc/transport.js +17 -7
  103. package/dist/runner/common/spawning-runner.js +10 -4
  104. package/dist/runner/common/turn-started.d.ts +2 -0
  105. package/dist/runner/common/turn-started.js +10 -0
  106. package/dist/runner/dsh/client.d.ts +2 -10
  107. package/dist/runner/dsh/client.js +13 -220
  108. package/dist/runner/dsh/daemon.d.ts +0 -2
  109. package/dist/runner/dsh/daemon.js +9 -7
  110. package/dist/runner/dsh/errors.d.ts +5 -0
  111. package/dist/runner/dsh/errors.js +11 -0
  112. package/dist/runner/dsh/exit-cancel.d.ts +0 -2
  113. package/dist/runner/dsh/exit-cancel.js +2 -2
  114. package/dist/runner/dsh/inflight.d.ts +0 -2
  115. package/dist/runner/dsh/inflight.js +1 -1
  116. package/dist/runner/dsh/mux-stream.d.ts +26 -0
  117. package/dist/runner/dsh/mux-stream.js +176 -0
  118. package/dist/runner/dsh/runner.d.ts +21 -1
  119. package/dist/runner/dsh/runner.js +76 -73
  120. package/dist/runner/dsh/translator.d.ts +1 -11
  121. package/dist/runner/dsh/translator.js +1 -1
  122. package/dist/runner/index.d.ts +1 -1
  123. package/dist/runner/kimi/acp/runner.d.ts +22 -1
  124. package/dist/runner/kimi/acp/runner.js +83 -60
  125. package/dist/runner/kimi/acp/translator.js +1 -12
  126. package/dist/runner/opencode/acp/error-monitor.d.ts +11 -0
  127. package/dist/runner/opencode/acp/error-monitor.js +31 -2
  128. package/dist/runner/opencode/acp/runner.d.ts +3 -1
  129. package/dist/runner/opencode/acp/translator.js +1 -12
  130. package/dist/runner/pi/rpc/runner.d.ts +2 -1
  131. package/dist/runner/pi/rpc/translator.d.ts +2 -8
  132. package/dist/runner/pi/rpc/translator.js +2 -7
  133. package/dist/runner/probe.d.ts +1 -1
  134. package/dist/runner/probe.js +10 -9
  135. package/dist/runner/registry.d.ts +2 -20
  136. package/dist/runner/registry.js +0 -32
  137. package/dist/runner/types.d.ts +37 -155
  138. package/dist/runner/types.js +4 -24
  139. package/dist/session/claude/session-index.d.ts +11 -4
  140. package/dist/session/claude/session-index.js +34 -10
  141. package/dist/session/claude/session-reader.d.ts +1 -1
  142. package/dist/session/claude/sessions.d.ts +2 -2
  143. package/dist/session/claude/sessions.js +41 -26
  144. package/dist/session/codex/rollout-reader.d.ts +1 -1
  145. package/dist/session/codex/rollout-reader.js +14 -13
  146. package/dist/session/codex/sessions.d.ts +1 -1
  147. package/dist/session/codex/sessions.js +4 -2
  148. package/dist/session/common/jsonl.js +7 -1
  149. package/dist/session/common/pagination.d.ts +2 -0
  150. package/dist/session/common/pagination.js +1 -1
  151. package/dist/session/common/recency.d.ts +6 -0
  152. package/dist/session/common/recency.js +7 -5
  153. package/dist/session/common/two-pass.d.ts +1 -1
  154. package/dist/session/common/usage-accumulator.d.ts +1 -1
  155. package/dist/session/dsh/sessions.d.ts +1 -1
  156. package/dist/session/dsh/sessions.js +37 -12
  157. package/dist/session/kimi/sessions.d.ts +1 -1
  158. package/dist/session/kimi/sessions.js +37 -10
  159. package/dist/session/opencode/sessions.d.ts +1 -1
  160. package/dist/session/opencode/sessions.js +53 -48
  161. package/dist/session/pi/sessions.d.ts +1 -1
  162. package/dist/session/pi/sessions.js +23 -9
  163. package/dist/session/registry.d.ts +2 -1
  164. package/dist/session/session-store.d.ts +1 -2
  165. package/dist/session/session-store.js +14 -7
  166. package/dist/session-contract.d.ts +178 -0
  167. package/dist/session-contract.js +9 -0
  168. package/package.json +1 -1
  169. package/dist/router/usage-format.d.ts +0 -60
  170. /package/dist/{runner/dsh → dsh}/auth.d.ts +0 -0
  171. /package/dist/{runner/dsh → dsh}/types.d.ts +0 -0
  172. /package/dist/{runner/dsh → dsh}/types.js +0 -0
@@ -19,8 +19,9 @@
19
19
  * `sessionEvents()` adds per-session filtering, reconnect + follow-snapshot
20
20
  * replay, and seq-based dedup.
21
21
  */
22
- import type { DshApprovalStreamItem, DshCommandResult, DshModelCatalogValue, DshModelSelection, DshOpenTurnState, DshPermissionCatalogValue, DshJobView, DshPresetListValue, DshProjectionItem, DshProjectionSnapshot, DshQuestion, DshRemoteEventOutcome, DshSessionPageValue, DshStreamItem, DshTokenUsage } from './types.js';
22
+ import type { DshApprovalStreamItem, DshCommandResult, DshModelCatalogValue, DshModelSelection, DshOpenTurnState, DshPermissionCatalogValue, DshJobView, DshPresetListValue, DshProjectionItem, DshProjectionSnapshot, DshQuestion, DshRemoteEventOutcome, DshSessionPageValue, DshStreamItem, DshTokenUsage } from '../../dsh/types.js';
23
23
  import type { GoalView } from '../types.js';
24
+ export { DshError } from './errors.js';
24
25
  interface WebSocketMessageEvent {
25
26
  data: unknown;
26
27
  }
@@ -40,11 +41,6 @@ export interface WebSocketLike {
40
41
  close(): void;
41
42
  }
42
43
  export type WebSocketFactory = (url: string, options?: WebSocketOptions) => WebSocketLike;
43
- export declare class DshError extends Error {
44
- readonly code: string;
45
- readonly details: Record<string, unknown>;
46
- constructor(code: string, message: string, details?: Record<string, unknown>);
47
- }
48
44
  export interface DshClientOptions {
49
45
  /** Configured DSH home; selects `.credentials.yaml` when no explicit file is given. */
50
46
  dshHome?: string;
@@ -76,9 +72,6 @@ export interface DshClientOptions {
76
72
  */
77
73
  requestTimeoutMs?: number;
78
74
  }
79
- /** Extract the `token` query parameter from a pasted `dsh web` URL. */
80
- export declare function extractDshToken(raw: string | undefined): string;
81
- export declare function dshArgs(method: string, payload: unknown): Record<string, unknown>;
82
75
  export declare class DshClient {
83
76
  readonly baseUrl: string;
84
77
  private readonly token;
@@ -372,4 +365,3 @@ export declare function dshQuestionsOf(request: Record<string, unknown>): DshQue
372
365
  * silently on the server side.
373
366
  */
374
367
  export declare function isTimedQuestionRequest(request: Record<string, unknown>): boolean;
375
- export {};
@@ -21,10 +21,14 @@
21
21
  */
22
22
  import { randomUUID } from 'node:crypto';
23
23
  import WebSocket from 'ws';
24
+ import { dshArgs, extractDshToken } from '../../dsh/protocol.js';
24
25
  import { getLogger } from '../../logger/index.js';
25
- import { DSH_COOKIE_LIFETIME_MS, isDshCredentialsNotFound, mintDshBrowserCookie, readDshBrowserSecret, resolveDshCredentialsFile, } from './auth.js';
26
+ import { DSH_COOKIE_LIFETIME_MS, isDshCredentialsNotFound, mintDshBrowserCookie, readDshBrowserSecret, resolveDshCredentialsFile, } from '../../dsh/auth.js';
26
27
  import { DEFAULT_REQUEST_TIMEOUT_MS } from '../common/defaults.js';
27
28
  import { goalFromProjection } from './goal-view.js';
29
+ import { DshError } from './errors.js';
30
+ import { openMuxStream } from './mux-stream.js';
31
+ export { DshError } from './errors.js';
28
32
  function defaultWebSocketFactory(url, options) {
29
33
  const socket = new WebSocket(url, {
30
34
  ...(options?.headers ? { headers: options.headers } : {}),
@@ -35,16 +39,6 @@ function defaultWebSocketFactory(url, options) {
35
39
  });
36
40
  return socket;
37
41
  }
38
- export class DshError extends Error {
39
- code;
40
- details;
41
- constructor(code, message, details = {}) {
42
- super(message);
43
- this.name = 'DshError';
44
- this.code = code;
45
- this.details = details;
46
- }
47
- }
48
42
  function isDshAuthError(error) {
49
43
  return (error instanceof DshError &&
50
44
  error.code === 'http' &&
@@ -118,60 +112,6 @@ function inboxItemsOf(values) {
118
112
  }
119
113
  return out;
120
114
  }
121
- /** Extract the `token` query parameter from a pasted `dsh web` URL. */
122
- export function extractDshToken(raw) {
123
- const value = (raw ?? '').trim();
124
- if (!value)
125
- return '';
126
- if (!value.includes('token=') && !value.includes('://'))
127
- return value;
128
- try {
129
- const url = new URL(value.startsWith('?') ? `http://dsh.invalid/${value}` : value);
130
- const token = url.searchParams.get('token');
131
- if (token)
132
- return token;
133
- // 带 scheme 却没有 token 参数的输入是误贴的 host URL(如
134
- // `http://127.0.0.1:3080`):整串不是合法 token,参与握手只会得到
135
- // 指向性缺失的 401。返回空串让上游走「token 缺失」的诊断路径。
136
- if (value.includes('://'))
137
- return '';
138
- return value;
139
- }
140
- catch {
141
- return value;
142
- }
143
- }
144
- /**
145
- * Remote methods take named parameters. Most session methods call their single
146
- * argument `request`; `session/list` reserves `_request`; catalog methods take
147
- * no arguments. `commands/*` address the receiving agent by its wire field
148
- * `agentId`, so their payload is already in wire shape (pass-through).
149
- * The gateway rejects any other `args` shape.
150
- */
151
- const DSH_ARGS_KEY = {
152
- 'session/list': '_request',
153
- 'session/create': 'request',
154
- 'session/prompt': 'request',
155
- 'session/cancel': 'request',
156
- 'session/selectModel': 'request',
157
- 'session/projections': 'request',
158
- 'session/page': 'request',
159
- 'session/follow': 'request',
160
- 'session/updateQueue': 'request',
161
- 'job/list': 'request',
162
- 'job/kill': 'request',
163
- 'session/modelCatalog': null,
164
- 'agentPresets/list': null,
165
- 'permissionPresets/catalog': null,
166
- };
167
- export function dshArgs(method, payload) {
168
- const key = DSH_ARGS_KEY[method];
169
- if (key === null)
170
- return {};
171
- if (key === undefined)
172
- return payload;
173
- return { [key]: payload };
174
- }
175
115
  export class DshClient {
176
116
  baseUrl;
177
117
  token;
@@ -602,162 +542,15 @@ export class DshClient {
602
542
  * close, error, or `signal` abort.
603
543
  */
604
544
  async *muxStream(endpoint, payload, signal) {
605
- const cookie = await this.authCookie();
606
- const socket = this.webSocketImpl(`${this.baseUrl.replace(/^http/, 'ws')}/api/remote.mux`, cookie ? { headers: { cookie } } : undefined);
607
- const streamId = `lr-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
608
- const queue = [];
609
- let waiter = null;
610
- let ended = false;
611
- let failure;
612
- let opened = false;
613
- const settle = (frame) => {
614
- if (waiter) {
615
- const resolve = waiter;
616
- waiter = null;
617
- resolve(frame);
618
- return;
619
- }
620
- if (frame)
621
- queue.push(frame);
622
- else
623
- ended = true;
624
- };
625
- // 建连/首帧超时:服务器接受 TCP 但不完成 WS 握手时 onopen/onerror/onclose
626
- // 都不触发,generator 会永远停在 await next()——unary 挂起有 60s 预算与
627
- // 回归测试(test_anchor_dsh_stop_with_hung_unary_releases_run),mux 的
628
- // 同型问题此前只能靠 idle 看门狗兜底。超时按传输错误走既有重连路径。
629
- const connectTimer = setTimeout(() => {
630
- if (opened || ended)
631
- return;
632
- failure = new DshError('transport', 'DSH remote mux WebSocket connect timeout');
633
- ended = true;
634
- settle(undefined);
635
- try {
636
- socket.close();
637
- }
638
- catch {
639
- /* ignore close error */
640
- }
641
- }, this.requestTimeoutMs);
642
- connectTimer.unref?.();
643
- socket.onopen = () => {
644
- opened = true;
645
- clearTimeout(connectTimer);
646
- if (ended)
647
- return;
648
- try {
649
- socket.send(JSON.stringify({
650
- type: 'open',
651
- streamId,
652
- endpoint,
653
- payload,
654
- }));
655
- }
656
- catch (err) {
657
- failure = new DshError('transport', `DSH remote mux send error: ${err.message}`);
658
- ended = true;
659
- settle(undefined);
660
- }
661
- };
662
- socket.onmessage = (event) => {
663
- if (ended)
664
- return;
665
- const text = typeof event.data === 'string'
666
- ? event.data
667
- : Buffer.isBuffer(event.data)
668
- ? event.data.toString('utf8')
669
- : String(event.data);
670
- let message;
671
- try {
672
- message = JSON.parse(text);
673
- }
674
- catch {
675
- getLogger().warn('[dsh] dropped malformed remote mux frame');
676
- return;
677
- }
678
- if (message.streamId !== streamId)
679
- return;
680
- if (message.type === 'item' && message.value) {
681
- settle(message.value);
682
- return;
683
- }
684
- if (message.type === 'end') {
685
- ended = true;
686
- settle(undefined);
687
- return;
688
- }
689
- if (message.type === 'error') {
690
- failure = new DshError(message.error?.code ?? 'stream', message.error?.message ?? 'DSH remote stream failed', message.error?.details ?? {});
691
- ended = true;
692
- settle(undefined);
693
- }
694
- };
695
- socket.onerror = () => {
696
- if (ended)
697
- return;
698
- failure = new DshError('transport', 'DSH remote mux WebSocket error');
699
- ended = true;
700
- settle(undefined);
701
- };
702
- socket.onunexpectedresponse = (event) => {
703
- if (ended)
704
- return;
705
- const status = event.statusCode;
706
- failure = new DshError('http', `DSH remote mux WebSocket HTTP ${status === undefined ? 'error' : status}`, status === undefined ? {} : { status });
707
- ended = true;
708
- settle(undefined);
709
- };
710
- socket.onclose = () => {
711
- if (ended)
712
- return;
713
- ended = true;
714
- settle(undefined);
715
- };
716
- const onAbort = () => {
717
- if (ended)
718
- return;
719
- ended = true;
720
- settle(undefined);
721
- try {
722
- socket.close();
723
- }
724
- catch {
725
- /* ignore close error */
726
- }
727
- };
728
- signal.addEventListener('abort', onAbort, { once: true });
729
- const next = () => new Promise((resolve) => {
730
- if (queue.length > 0) {
731
- resolve(queue.shift());
732
- return;
733
- }
734
- if (ended) {
735
- resolve(undefined);
736
- return;
737
- }
738
- waiter = resolve;
545
+ yield* openMuxStream({
546
+ baseUrl: this.baseUrl,
547
+ endpoint,
548
+ payload,
549
+ signal,
550
+ requestTimeoutMs: this.requestTimeoutMs,
551
+ authCookie: () => this.authCookie(),
552
+ webSocketFactory: this.webSocketImpl,
739
553
  });
740
- try {
741
- while (!signal.aborted) {
742
- const frame = await next();
743
- if (frame === undefined) {
744
- if (failure && !signal.aborted)
745
- throw failure;
746
- return;
747
- }
748
- yield frame;
749
- }
750
- }
751
- finally {
752
- clearTimeout(connectTimer);
753
- signal.removeEventListener('abort', onAbort);
754
- try {
755
- socket.close();
756
- }
757
- catch {
758
- /* ignore close error */
759
- }
760
- }
761
554
  }
762
555
  /** One logical `session/follow` stream. */
763
556
  async *followStream(sessionId, signal) {
@@ -28,8 +28,6 @@ interface SpawnedDaemon {
28
28
  failure(): Error | undefined;
29
29
  exited(): boolean;
30
30
  }
31
- /** Resolve the same Harness home DSH resolves: configured, env, then ~/.dsh. */
32
- export declare function resolveDshHome(configured?: string, env?: NodeJS.ProcessEnv): string;
33
31
  /** True only for the loopback HTTP address this process may start and probe. */
34
32
  export declare function isLoopbackHttpUrl(value: string): boolean;
35
33
  /**
@@ -12,10 +12,11 @@
12
12
  */
13
13
  import fs from 'node:fs';
14
14
  import fsp from 'node:fs/promises';
15
- import os from 'node:os';
16
15
  import path from 'node:path';
17
16
  import { DEFAULT_DSH_HOST } from '../../config/index.js';
18
17
  import { mergeProcessEnv, spawnProcess } from '../../platform/spawn.js';
18
+ import { getLogger } from '../../logger/index.js';
19
+ import { resolveDshHome } from '../../dsh/home.js';
19
20
  const DEFAULT_START_TIMEOUT_MS = 30_000;
20
21
  const READY_POLL_MS = 100;
21
22
  /** User-facing daemon failure; the bridge renders `message` in the chat card. */
@@ -30,11 +31,6 @@ export class DshDaemonError extends Error {
30
31
  function stripTrailingSlash(value) {
31
32
  return value.replace(/\/+$/, '');
32
33
  }
33
- /** Resolve the same Harness home DSH resolves: configured, env, then ~/.dsh. */
34
- export function resolveDshHome(configured, env = process.env) {
35
- const value = configured?.trim() || env.DSH_HOME?.trim();
36
- return path.resolve(value && value.length > 0 ? value : path.join(os.homedir(), '.dsh'));
37
- }
38
34
  /** True only for the loopback HTTP address this process may start and probe. */
39
35
  export function isLoopbackHttpUrl(value) {
40
36
  try {
@@ -179,7 +175,13 @@ export class DshDaemon {
179
175
  const stats = await fsp.stat(lockDir);
180
176
  return Date.now() - stats.mtimeMs > this.startTimeoutMs() * 2;
181
177
  }
182
- catch {
178
+ catch (err) {
179
+ // ENOENT = 锁目录刚被持有者清掉(正常,等下一轮重查)。
180
+ // 其余(EACCES/EPERM…)= 无法判断是否陈旧:保守判「不陈旧」继续等,
181
+ // 但必须留痕,否则超时文案会误报成「等待其他 lark-remote」。
182
+ if (err.code !== 'ENOENT') {
183
+ getLogger().warn(`[dsh] cannot stat start lock ${lockDir}: ${err?.message ?? String(err)}`);
184
+ }
183
185
  return false;
184
186
  }
185
187
  }
@@ -0,0 +1,5 @@
1
+ export declare class DshError extends Error {
2
+ readonly code: string;
3
+ readonly details: Record<string, unknown>;
4
+ constructor(code: string, message: string, details?: Record<string, unknown>);
5
+ }
@@ -0,0 +1,11 @@
1
+ export class DshError extends Error {
2
+ code;
3
+ details;
4
+ constructor(code, message, details = {}) {
5
+ super(message);
6
+ this.name = 'DshError';
7
+ this.code = code;
8
+ this.details = details;
9
+ }
10
+ }
11
+ //# sourceMappingURL=errors.js.map
@@ -12,8 +12,6 @@
12
12
  * curl transport the session reader already uses: bounded by `timeoutMs` and
13
13
  * never throws.
14
14
  */
15
- /** Upper bound on the exit-path cancel:退出不能被一个卡住的 host 拖住。 */
16
- export declare const EXIT_CANCEL_TIMEOUT_MS = 2000;
17
15
  export interface SyncCancelOptions {
18
16
  baseUrl: string;
19
17
  sessionId: string;
@@ -18,9 +18,9 @@ import path from 'node:path';
18
18
  import { getLogger } from '../../logger/index.js';
19
19
  import { isWin32 } from '../../platform/select.js';
20
20
  import { spawnProcessSync } from '../../platform/spawn.js';
21
- import { DSH_COOKIE_LIFETIME_MS, mintDshBrowserCookie, readDshBrowserSecretSync, resolveDshCredentialsFile, } from './auth.js';
21
+ import { DSH_COOKIE_LIFETIME_MS, mintDshBrowserCookie, readDshBrowserSecretSync, resolveDshCredentialsFile, } from '../../dsh/auth.js';
22
22
  /** Upper bound on the exit-path cancel:退出不能被一个卡住的 host 拖住。 */
23
- export const EXIT_CANCEL_TIMEOUT_MS = 2_000;
23
+ const EXIT_CANCEL_TIMEOUT_MS = 2_000;
24
24
  /**
25
25
  * Fire one `session/cancel` synchronously. Never throws: a failed cancel must
26
26
  * not block the exit path or mask the real exit reason.
@@ -58,5 +58,3 @@ export interface DshInflightReconcileResult {
58
58
  * entries are left in the file so a later startup can retry.
59
59
  */
60
60
  export declare function reconcileInflightDshRuns(opts: DshInflightReconcileOptions): Promise<DshInflightReconcileResult>;
61
- /** One short owner-facing notice; session ids are truncated, not paths. */
62
- export declare function formatInflightWarning(entries: DshInflightEntry[]): string;
@@ -126,7 +126,7 @@ export async function reconcileInflightDshRuns(opts) {
126
126
  return { removed, open: open.length, skipped: false };
127
127
  }
128
128
  /** One short owner-facing notice; session ids are truncated, not paths. */
129
- export function formatInflightWarning(entries) {
129
+ function formatInflightWarning(entries) {
130
130
  const lines = entries.slice(0, 3).map((entry) => {
131
131
  const id = entry.sessionId.length > 8 ? entry.sessionId.slice(0, 8) : entry.sessionId;
132
132
  return `- session ${id}(${entry.cwd ?? '未知目录'})`;
@@ -0,0 +1,26 @@
1
+ interface MuxSocket {
2
+ onopen: ((event: unknown) => void) | null;
3
+ onmessage: ((event: {
4
+ data: unknown;
5
+ }) => void) | null;
6
+ onerror: ((event: unknown) => void) | null;
7
+ onclose: ((event: unknown) => void) | null;
8
+ onunexpectedresponse?: ((event: {
9
+ statusCode?: number;
10
+ }) => void) | null;
11
+ send(data: string): void;
12
+ close(): void;
13
+ }
14
+ export interface OpenMuxStreamOptions {
15
+ baseUrl: string;
16
+ endpoint: string;
17
+ payload: unknown;
18
+ signal: AbortSignal;
19
+ requestTimeoutMs: number;
20
+ authCookie(): Promise<string | undefined>;
21
+ webSocketFactory(url: string, options?: {
22
+ headers?: Record<string, string>;
23
+ }): MuxSocket;
24
+ }
25
+ export declare function openMuxStream(opts: OpenMuxStreamOptions): AsyncGenerator<unknown>;
26
+ export {};
@@ -0,0 +1,176 @@
1
+ import { getLogger } from '../../logger/index.js';
2
+ import { DshError } from './errors.js';
3
+ /**
4
+ * onerror 的事件对象在 ws 实现之间形态不一({message} / {error} / {type})。
5
+ * 尽力取出可读描述;取不到就不追加,别拿 '[object Object]' 充数。
6
+ */
7
+ function describeSocketError(event) {
8
+ if (!event || typeof event !== 'object')
9
+ return undefined;
10
+ const e = event;
11
+ if (typeof e.message === 'string' && e.message)
12
+ return e.message;
13
+ if (e.error instanceof Error && e.error.message)
14
+ return e.error.message;
15
+ if (typeof e.error === 'string' && e.error)
16
+ return e.error;
17
+ if (typeof e.type === 'string' && e.type)
18
+ return e.type;
19
+ return undefined;
20
+ }
21
+ export async function* openMuxStream(opts) {
22
+ const cookie = await opts.authCookie();
23
+ const socket = opts.webSocketFactory(`${opts.baseUrl.replace(/^http/, 'ws')}/api/remote.mux`, cookie ? { headers: { cookie } } : undefined);
24
+ const streamId = `lr-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
25
+ const queue = [];
26
+ let waiter = null;
27
+ let ended = false;
28
+ let failure;
29
+ let opened = false;
30
+ const settle = (frame) => {
31
+ if (waiter) {
32
+ const resolve = waiter;
33
+ waiter = null;
34
+ resolve(frame);
35
+ return;
36
+ }
37
+ if (frame)
38
+ queue.push(frame);
39
+ else
40
+ ended = true;
41
+ };
42
+ const connectTimer = setTimeout(() => {
43
+ if (opened || ended)
44
+ return;
45
+ failure = new DshError('transport', 'DSH remote mux WebSocket connect timeout');
46
+ ended = true;
47
+ settle(undefined);
48
+ try {
49
+ socket.close();
50
+ }
51
+ catch {
52
+ /* ignore close error */
53
+ }
54
+ }, opts.requestTimeoutMs);
55
+ connectTimer.unref?.();
56
+ socket.onopen = () => {
57
+ opened = true;
58
+ clearTimeout(connectTimer);
59
+ if (ended)
60
+ return;
61
+ try {
62
+ socket.send(JSON.stringify({
63
+ type: 'open',
64
+ streamId,
65
+ endpoint: opts.endpoint,
66
+ payload: opts.payload,
67
+ }));
68
+ }
69
+ catch (err) {
70
+ failure = new DshError('transport', `DSH remote mux send error: ${err.message}`);
71
+ ended = true;
72
+ settle(undefined);
73
+ }
74
+ };
75
+ socket.onmessage = (event) => {
76
+ if (ended)
77
+ return;
78
+ const text = typeof event.data === 'string'
79
+ ? event.data
80
+ : Buffer.isBuffer(event.data)
81
+ ? event.data.toString('utf8')
82
+ : String(event.data);
83
+ let message;
84
+ try {
85
+ message = JSON.parse(text);
86
+ }
87
+ catch {
88
+ getLogger().warn('[dsh] dropped malformed remote mux frame');
89
+ return;
90
+ }
91
+ if (message.streamId !== streamId)
92
+ return;
93
+ if (message.type === 'item' && message.value) {
94
+ settle(message.value);
95
+ return;
96
+ }
97
+ if (message.type === 'end') {
98
+ ended = true;
99
+ settle(undefined);
100
+ return;
101
+ }
102
+ if (message.type === 'error') {
103
+ failure = new DshError(message.error?.code ?? 'stream', message.error?.message ?? 'DSH remote stream failed', message.error?.details ?? {});
104
+ ended = true;
105
+ settle(undefined);
106
+ }
107
+ };
108
+ socket.onerror = (event) => {
109
+ if (ended)
110
+ return;
111
+ const detail = describeSocketError(event);
112
+ failure = new DshError('transport', `DSH remote mux WebSocket error${detail ? `: ${detail}` : ''}`);
113
+ ended = true;
114
+ settle(undefined);
115
+ };
116
+ socket.onunexpectedresponse = (event) => {
117
+ if (ended)
118
+ return;
119
+ const status = event.statusCode;
120
+ failure = new DshError('http', `DSH remote mux WebSocket HTTP ${status === undefined ? 'error' : status}`, status === undefined ? {} : { status });
121
+ ended = true;
122
+ settle(undefined);
123
+ };
124
+ socket.onclose = () => {
125
+ if (ended)
126
+ return;
127
+ ended = true;
128
+ settle(undefined);
129
+ };
130
+ const onAbort = () => {
131
+ if (ended)
132
+ return;
133
+ ended = true;
134
+ settle(undefined);
135
+ try {
136
+ socket.close();
137
+ }
138
+ catch {
139
+ /* ignore close error */
140
+ }
141
+ };
142
+ opts.signal.addEventListener('abort', onAbort, { once: true });
143
+ const next = () => new Promise((resolve) => {
144
+ if (queue.length > 0) {
145
+ resolve(queue.shift());
146
+ return;
147
+ }
148
+ if (ended) {
149
+ resolve(undefined);
150
+ return;
151
+ }
152
+ waiter = resolve;
153
+ });
154
+ try {
155
+ while (!opts.signal.aborted) {
156
+ const frame = await next();
157
+ if (frame === undefined) {
158
+ if (failure && !opts.signal.aborted)
159
+ throw failure;
160
+ return;
161
+ }
162
+ yield frame;
163
+ }
164
+ }
165
+ finally {
166
+ clearTimeout(connectTimer);
167
+ opts.signal.removeEventListener('abort', onAbort);
168
+ try {
169
+ socket.close();
170
+ }
171
+ catch {
172
+ /* ignore close error */
173
+ }
174
+ }
175
+ }
176
+ //# sourceMappingURL=mux-stream.js.map
@@ -17,7 +17,8 @@
17
17
  * approval on the same card. If `$events` is unavailable, the runner falls
18
18
  * back to the Web UI prompt.
19
19
  */
20
- import type { AgentEvent, AgentSessionReader, AgentStatusInfo, SpawnOptions, StopOutcome } from '../types.js';
20
+ import type { AgentSessionReader } from '../../session-contract.js';
21
+ import type { AgentEvent, AgentStatusInfo, SpawnOptions, StopOutcome } from '../types.js';
21
22
  import type { AgentRunner } from '../types.js';
22
23
  import { DshClient, type WebSocketFactory } from './client.js';
23
24
  import type { DshDaemon } from './daemon.js';
@@ -134,6 +135,25 @@ export declare class DshRunner implements AgentRunner {
134
135
  * the live catalog for that provider's default (or first) model.
135
136
  */
136
137
  private resolveModelSelection;
138
+ /**
139
+ * 新建 DSH session 并取回 sessionId;run 在挂起期间被 stop 时返回 undefined。
140
+ *
141
+ * 红线:不把 run 的 abort signal 直接交给 create —— abort 掉请求会丢掉刚创建的
142
+ * sessionId,服务端若已完成创建就留下一个无法 cancel 的孤儿 session。改为 abort
143
+ * 时立即放行 run(队列不被挂起),create 后台落定后再补 cancel。
144
+ */
145
+ private acquireSessionId;
146
+ /**
147
+ * 把本轮消息交给 DSH 的排队收件箱,返回本轮的身份与起始水位。
148
+ *
149
+ * 三条不变量(都关系到「迟到/抢先的 stop 能否被正确撤销」):
150
+ * - 起始水位取 prompt **之前**的 latestEventSeq:session/page 返回整个会话,
151
+ * 从 0 开始会把首轮已完成 turn 在每次后续消息时重放一遍。
152
+ * - 身份(requestId)在请求发出**之前**就公布:stop 可能落在 session/prompt 的
153
+ * 在途窗口里,那时它必须知道宿主受理后该撤销哪个收件项。
154
+ * - `promptAdmitted` 只在宿主接受后置真:撤销路径据此区分「还没进去」与「已排队」。
155
+ */
156
+ private submitPrompt;
137
157
  run(message: string, opts: SpawnOptions): AsyncGenerator<AgentEvent>;
138
158
  /**
139
159
  * Consume one turn from both transports. `session/follow` owns transcript