@yu_robotics/remote-cli 1.6.253 → 1.6.259
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.
- package/dist/client/MessageHandler.d.ts +5 -12
- package/dist/client/MessageHandler.d.ts.map +1 -1
- package/dist/client/MessageHandler.js +53 -252
- package/dist/client/MessageHandler.js.map +1 -1
- package/dist/client/WebSocketClient.d.ts +0 -3
- package/dist/client/WebSocketClient.d.ts.map +1 -1
- package/dist/client/WebSocketClient.js +1 -3
- package/dist/client/WebSocketClient.js.map +1 -1
- package/dist/commands/start.d.ts +0 -5
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +0 -28
- package/dist/commands/start.js.map +1 -1
- package/dist/executor/AcpExecutor.d.ts.map +1 -1
- package/dist/executor/AcpExecutor.js.map +1 -1
- package/dist/executor/AgyExecutor.d.ts +4 -11
- package/dist/executor/AgyExecutor.d.ts.map +1 -1
- package/dist/executor/AgyExecutor.js +71 -101
- package/dist/executor/AgyExecutor.js.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.d.ts +3 -7
- package/dist/executor/ClaudePersistentExecutor.d.ts.map +1 -1
- package/dist/executor/ClaudePersistentExecutor.js +14 -224
- package/dist/executor/ClaudePersistentExecutor.js.map +1 -1
- package/dist/executor/DshExecutor.d.ts +7 -14
- package/dist/executor/DshExecutor.d.ts.map +1 -1
- package/dist/executor/DshExecutor.js +48 -50
- package/dist/executor/DshExecutor.js.map +1 -1
- package/dist/executor/IExecutor.d.ts +3 -3
- package/dist/executor/IExecutor.d.ts.map +1 -1
- package/dist/executor/acp/AcpClient.d.ts +15 -1
- package/dist/executor/acp/AcpClient.d.ts.map +1 -1
- package/dist/executor/acp/AcpClient.js +85 -7
- package/dist/executor/acp/AcpClient.js.map +1 -1
- package/dist/executor/agy/AgyAcpDiagnostics.d.ts +8 -0
- package/dist/executor/agy/AgyAcpDiagnostics.d.ts.map +1 -0
- package/dist/executor/agy/AgyAcpDiagnostics.js +45 -0
- package/dist/executor/agy/AgyAcpDiagnostics.js.map +1 -0
- package/dist/executor/agy/AgyAcpRuntime.d.ts +9 -16
- package/dist/executor/agy/AgyAcpRuntime.d.ts.map +1 -1
- package/dist/executor/agy/AgyAcpRuntime.js +67 -151
- package/dist/executor/agy/AgyAcpRuntime.js.map +1 -1
- package/dist/executor/agy/AgySessionSelection.d.ts +7 -0
- package/dist/executor/agy/AgySessionSelection.d.ts.map +1 -0
- package/dist/executor/agy/AgySessionSelection.js +60 -0
- package/dist/executor/agy/AgySessionSelection.js.map +1 -0
- package/dist/executor/agy/AgySessionSettings.d.ts +13 -0
- package/dist/executor/agy/AgySessionSettings.d.ts.map +1 -0
- package/dist/executor/agy/AgySessionSettings.js +60 -0
- package/dist/executor/agy/AgySessionSettings.js.map +1 -0
- package/dist/executor/dsh/DshAcpClient.d.ts +1 -1
- package/dist/executor/dsh/DshAcpClient.d.ts.map +1 -1
- package/dist/executor/dsh/DshAcpClient.js +3 -1
- package/dist/executor/dsh/DshAcpClient.js.map +1 -1
- package/dist/executor/index.d.ts +1 -0
- package/dist/executor/index.d.ts.map +1 -1
- package/dist/executor/index.js +1 -0
- package/dist/executor/index.js.map +1 -1
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/maintenance/release-notes.json +1 -1
- package/dist/scheduling/ScheduleCapabilities.d.ts +2 -2
- package/dist/scheduling/ScheduleCapabilities.js +4 -4
- package/dist/scheduling/ScheduleCapabilities.js.map +1 -1
- package/dist/scheduling/SchedulePurgeVerification.js +1 -1
- package/dist/scheduling/SchedulePurgeVerification.js.map +1 -1
- package/dist/scheduling/ScheduleService.d.ts +10 -44
- package/dist/scheduling/ScheduleService.d.ts.map +1 -1
- package/dist/scheduling/ScheduleService.js +164 -715
- package/dist/scheduling/ScheduleService.js.map +1 -1
- package/dist/scheduling/agy/AgySessionSchedules.d.ts +5 -5
- package/dist/scheduling/agy/AgySessionSchedules.d.ts.map +1 -1
- package/dist/scheduling/agy/AgySessionSchedules.js +20 -17
- package/dist/scheduling/agy/AgySessionSchedules.js.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts +2 -6
- package/dist/scheduling/claude/ClaudeScheduleOwnership.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js +12 -67
- package/dist/scheduling/claude/ClaudeScheduleOwnership.js.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts +4 -26
- package/dist/scheduling/claude/ClaudeSessionSchedules.d.ts.map +1 -1
- package/dist/scheduling/claude/ClaudeSessionSchedules.js +22 -145
- package/dist/scheduling/claude/ClaudeSessionSchedules.js.map +1 -1
- package/dist/scheduling/dsh/ScheduledSessionGuard.d.ts +12 -0
- package/dist/scheduling/dsh/ScheduledSessionGuard.d.ts.map +1 -0
- package/dist/scheduling/dsh/ScheduledSessionGuard.js +96 -0
- package/dist/scheduling/dsh/ScheduledSessionGuard.js.map +1 -0
- package/dist/scheduling/dsh/SessionScheduleBridge.d.ts.map +1 -1
- package/dist/scheduling/dsh/SessionScheduleBridge.js +0 -25
- package/dist/scheduling/dsh/SessionScheduleBridge.js.map +1 -1
- package/dist/scheduling/dsh/SessionScheduleClient.d.ts.map +1 -1
- package/dist/scheduling/dsh/SessionScheduleClient.js +0 -8
- package/dist/scheduling/dsh/SessionScheduleClient.js.map +1 -1
- package/dist/scheduling/dsh/sessionLaunch.js +1 -1
- package/dist/scheduling/dsh/sessionLaunch.js.map +1 -1
- package/dist/scheduling/types.d.ts +26 -77
- package/dist/scheduling/types.d.ts.map +1 -1
- package/dist/scheduling/types.js +1 -10
- package/dist/scheduling/types.js.map +1 -1
- package/dist/service/ServiceManager.js +1 -1
- package/dist/thread/ThreadExecutorPool.d.ts +4 -1
- package/dist/thread/ThreadExecutorPool.d.ts.map +1 -1
- package/dist/thread/ThreadExecutorPool.js +6 -3
- package/dist/thread/ThreadExecutorPool.js.map +1 -1
- package/dist/thread/ThreadManager.d.ts.map +1 -1
- package/dist/thread/ThreadManager.js +23 -2
- package/dist/thread/ThreadManager.js.map +1 -1
- package/native/prebuilds/darwin-arm64/managed_native.node +0 -0
- package/native/prebuilds/darwin-arm64/manifest.json +1 -1
- package/native/prebuilds/darwin-x64/managed_native.node +0 -0
- package/native/prebuilds/darwin-x64/manifest.json +1 -1
- package/native/prebuilds/win32-arm64/managed_native.node +0 -0
- package/native/prebuilds/win32-arm64/manifest.json +1 -1
- package/native/prebuilds/win32-x64/managed_native.node +0 -0
- package/native/prebuilds/win32-x64/manifest.json +1 -1
- package/package.json +1 -1
- package/dist/scheduling/agy/AgyCheckpoint.d.ts +0 -35
- package/dist/scheduling/agy/AgyCheckpoint.d.ts.map +0 -1
- package/dist/scheduling/agy/AgyCheckpoint.js +0 -160
- package/dist/scheduling/agy/AgyCheckpoint.js.map +0 -1
- package/dist/service/SessionHostSupervisor.d.ts +0 -63
- package/dist/service/SessionHostSupervisor.d.ts.map +0 -1
- package/dist/service/SessionHostSupervisor.js +0 -323
- package/dist/service/SessionHostSupervisor.js.map +0 -1
- package/dist/sessionHost/HostClient.d.ts +0 -49
- package/dist/sessionHost/HostClient.d.ts.map +0 -1
- package/dist/sessionHost/HostClient.js +0 -101
- package/dist/sessionHost/HostClient.js.map +0 -1
- package/dist/sessionHost/HostProtocol.d.ts +0 -65
- package/dist/sessionHost/HostProtocol.d.ts.map +0 -1
- package/dist/sessionHost/HostProtocol.js +0 -78
- package/dist/sessionHost/HostProtocol.js.map +0 -1
- package/dist/sessionHost/HostServer.d.ts +0 -52
- package/dist/sessionHost/HostServer.d.ts.map +0 -1
- package/dist/sessionHost/HostServer.js +0 -413
- package/dist/sessionHost/HostServer.js.map +0 -1
- package/dist/sessionHost/HostStore.d.ts +0 -43
- package/dist/sessionHost/HostStore.d.ts.map +0 -1
- package/dist/sessionHost/HostStore.js +0 -206
- package/dist/sessionHost/HostStore.js.map +0 -1
- package/dist/sessionHost/RetainedFrontend.d.ts +0 -63
- package/dist/sessionHost/RetainedFrontend.d.ts.map +0 -1
- package/dist/sessionHost/RetainedFrontend.js +0 -244
- package/dist/sessionHost/RetainedFrontend.js.map +0 -1
- package/dist/sessionHost/RetainedHostLauncher.d.ts +0 -25
- package/dist/sessionHost/RetainedHostLauncher.d.ts.map +0 -1
- package/dist/sessionHost/RetainedHostLauncher.js +0 -132
- package/dist/sessionHost/RetainedHostLauncher.js.map +0 -1
- package/dist/sessionHost/RetainedRuntime.d.ts +0 -62
- package/dist/sessionHost/RetainedRuntime.d.ts.map +0 -1
- package/dist/sessionHost/RetainedRuntime.js +0 -478
- package/dist/sessionHost/RetainedRuntime.js.map +0 -1
- package/dist/sessionHost/RuntimeJournal.d.ts +0 -47
- package/dist/sessionHost/RuntimeJournal.d.ts.map +0 -1
- package/dist/sessionHost/RuntimeJournal.js +0 -103
- package/dist/sessionHost/RuntimeJournal.js.map +0 -1
- package/dist/sessionHost/entry.d.ts +0 -13
- package/dist/sessionHost/entry.d.ts.map +0 -1
- package/dist/sessionHost/entry.js +0 -107
- package/dist/sessionHost/entry.js.map +0 -1
- package/dist/update/PinnedHostBundle.d.ts +0 -49
- package/dist/update/PinnedHostBundle.d.ts.map +0 -1
- package/dist/update/PinnedHostBundle.js +0 -309
- package/dist/update/PinnedHostBundle.js.map +0 -1
|
@@ -2,7 +2,7 @@ import { DirectoryGuard } from '../security/DirectoryGuard';
|
|
|
2
2
|
import { AcpExecutor } from './AcpExecutor';
|
|
3
3
|
import type { AcpEventCallbacks, AcpTransport } from './acp/AcpClient';
|
|
4
4
|
import type { ExecuteOptions, ExecuteResult, ExecutorContextUsage, ExecutorModelInfo } from './IExecutor';
|
|
5
|
-
import type
|
|
5
|
+
import { type NativeScheduleCleanup } from '../scheduling/types';
|
|
6
6
|
export interface DshExecutorOptions {
|
|
7
7
|
model?: string;
|
|
8
8
|
effort?: string;
|
|
@@ -14,30 +14,23 @@ export interface DshExecutorOptions {
|
|
|
14
14
|
/** Produced by dshHistoryPatch for a durably recorded, newly owned scope. */
|
|
15
15
|
managedHistoryPatch?: string;
|
|
16
16
|
sessionBaseDir?: string;
|
|
17
|
+
scheduleCatalog?: string;
|
|
17
18
|
clientFactory?: (callbacks: AcpEventCallbacks, cwd: string) => AcpTransport;
|
|
18
19
|
accountUsageQuery?: (command: string, cwd: string) => Promise<string | null>;
|
|
19
20
|
}
|
|
20
21
|
/** DSH-specific compatibility policy; other ACP executors keep their existing defaults. */
|
|
21
22
|
export declare class DshExecutor extends AcpExecutor {
|
|
22
|
-
readonly nativeScheduleRecovery?: NativeScheduleRecovery;
|
|
23
|
-
private scheduleHandoff;
|
|
24
23
|
private readonly state;
|
|
25
24
|
private readonly handoffFile;
|
|
26
25
|
private readonly dshCommand;
|
|
27
26
|
private readonly accountUsageQuery;
|
|
27
|
+
private readonly scheduleThreadId;
|
|
28
|
+
private readonly scheduledSessionGuard;
|
|
28
29
|
constructor(guard: DirectoryGuard, options?: DshExecutorOptions);
|
|
29
30
|
execute(prompt: string, options?: ExecuteOptions): Promise<ExecuteResult>;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
recoveryIdentity: string;
|
|
34
|
-
nativeId: string;
|
|
35
|
-
onceDefinitionAlreadyAbsent?: true;
|
|
36
|
-
cancellationKeepsRunning?: boolean;
|
|
37
|
-
retirementConfirmed?: boolean;
|
|
38
|
-
list(): Promise<boolean>;
|
|
39
|
-
cancel(): Promise<void>;
|
|
40
|
-
stop(): Promise<void>;
|
|
31
|
+
readonly nativeScheduleCleanup: NativeScheduleCleanup;
|
|
32
|
+
createNativeSchedule(input: import('../scheduling/types').NativeScheduleInput, onEvent: (event: import('../scheduling/types').NativeScheduleEvent) => void | Promise<void>, isOwnerCurrent?: () => boolean): Promise<import("../scheduling/types").NativeScheduleHandle & {
|
|
33
|
+
cleanupIdentity: string;
|
|
41
34
|
}>;
|
|
42
35
|
isBusy(): boolean;
|
|
43
36
|
getContextUsage(): ExecutorContextUsage | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DshExecutor.d.ts","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"DshExecutor.d.ts","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAK1G,OAAO,EAAkC,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAGjG,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,6EAA6E;IAC7E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,KAAK,YAAY,CAAC;IAC5E,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC9E;AAcD,2FAA2F;AAC3F,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAW;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuD;IACzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;gBAElD,KAAK,EAAE,cAAc,EAAE,OAAO,GAAE,kBAAuB;IA8GnE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC;IAO7E,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAInD;IAEI,oBAAoB,CAAC,KAAK,EAAE,OAAO,qBAAqB,EAAE,mBAAmB,EACjF,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,qBAAqB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,cAAc,GAAE,MAAM,OAAoB;;;IA2BzI,MAAM,IAAI,OAAO;IACjB,eAAe,IAAI,oBAAoB,GAAG,IAAI;IAC9C,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAInC,UAAU,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAShD,YAAY,IAAI,IAAI;IASd,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IA6BjF,mFAAmF;IAC7E,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKlD,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAKzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B"}
|
|
@@ -14,15 +14,17 @@ const compactHandoff_1 = require("./compactHandoff");
|
|
|
14
14
|
const DshAcpClient_1 = require("./dsh/DshAcpClient");
|
|
15
15
|
const DshAccountUsage_1 = require("./dsh/DshAccountUsage");
|
|
16
16
|
const DshManagedHistory_1 = require("../delegation/DshManagedHistory");
|
|
17
|
+
const types_1 = require("../scheduling/types");
|
|
18
|
+
const ScheduledSessionGuard_1 = require("../scheduling/dsh/ScheduledSessionGuard");
|
|
17
19
|
const COMPACT_CONTEXT_UNAVAILABLE = 'The saved DSH context cannot be resumed over ACP. No compact summary was created. Send a normal task to start fresh, or use /clear.';
|
|
18
20
|
/** DSH-specific compatibility policy; other ACP executors keep their existing defaults. */
|
|
19
21
|
class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
20
|
-
nativeScheduleRecovery;
|
|
21
|
-
scheduleHandoff = false;
|
|
22
22
|
state;
|
|
23
23
|
handoffFile;
|
|
24
24
|
dshCommand;
|
|
25
25
|
accountUsageQuery;
|
|
26
|
+
scheduleThreadId;
|
|
27
|
+
scheduledSessionGuard;
|
|
26
28
|
constructor(guard, options = {}) {
|
|
27
29
|
if (options.managedHistoryPatch && !options.delegationWorker)
|
|
28
30
|
throw new Error('DSH owned history requires a managed worker');
|
|
@@ -39,9 +41,15 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
39
41
|
fs_1.default.rmSync(handoffFile, { force: true });
|
|
40
42
|
state.handoff = undefined;
|
|
41
43
|
};
|
|
44
|
+
let assertResume;
|
|
42
45
|
super(guard, {
|
|
43
46
|
...options,
|
|
44
|
-
prepareNativeSession:
|
|
47
|
+
prepareNativeSession: async (cwd) => {
|
|
48
|
+
if (history)
|
|
49
|
+
await history.prepare(cwd);
|
|
50
|
+
else
|
|
51
|
+
assertResume?.();
|
|
52
|
+
},
|
|
45
53
|
nativeSessionCapture: history ? session => history.capture(session.sessionId) : undefined,
|
|
46
54
|
acpCommand: options.dshCommand ?? 'dsh', acpArgs: ['acp'],
|
|
47
55
|
backendLabel: 'DeepSeek Harness', sessionNamespace: 'dsh-sessions',
|
|
@@ -110,32 +118,14 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
110
118
|
};
|
|
111
119
|
},
|
|
112
120
|
});
|
|
121
|
+
this.scheduleThreadId = options.threadId ?? 'default';
|
|
122
|
+
this.scheduledSessionGuard = new ScheduledSessionGuard_1.ScheduledSessionGuard(directory, options.threadId ?? 'default', options.scheduleCatalog);
|
|
123
|
+
assertResume = () => { const session = this.getSessionId(); if (session && !options.delegationWorker)
|
|
124
|
+
this.scheduledSessionGuard.assertResume(session); };
|
|
113
125
|
this.state = state;
|
|
114
126
|
this.handoffFile = handoffFile;
|
|
115
127
|
this.dshCommand = options.dshCommand ?? 'dsh';
|
|
116
128
|
this.accountUsageQuery = options.accountUsageQuery ?? DshAccountUsage_1.queryDshAccountUsage;
|
|
117
|
-
if (!options.delegationWorker)
|
|
118
|
-
this.nativeScheduleRecovery = {
|
|
119
|
-
provider: 'dsh-session-orderly-v1', strategy: 'reconstruct', orderlyOnly: true,
|
|
120
|
-
describe: input => JSON.stringify({ sessionId: this.getSessionId(), cwd: input.cwd, threadId: options.threadId ?? 'default' }),
|
|
121
|
-
finishRestart: async () => {
|
|
122
|
-
this.scheduleHandoff = true;
|
|
123
|
-
await this.stopSchedulingSession();
|
|
124
|
-
this.scheduleHandoff = false;
|
|
125
|
-
},
|
|
126
|
-
reconcile: async (record, context, emit) => {
|
|
127
|
-
const identity = JSON.parse(record.recovery.identity);
|
|
128
|
-
if (record.recovery?.handoff !== 'clean' || !context.isCurrent() || context.signal.aborted
|
|
129
|
-
|| typeof identity.sessionId !== 'string' || !identity.sessionId
|
|
130
|
-
|| identity.sessionId !== this.getSessionId() || identity.cwd !== this.getCurrentWorkingDirectory()
|
|
131
|
-
|| identity.threadId !== (options.threadId ?? 'default'))
|
|
132
|
-
throw new Error('Original DSH session or clean shutdown evidence is unavailable.');
|
|
133
|
-
const handle = await this.createNativeSchedule({ id: record.id, backend: record.backend, threadId: record.threadId,
|
|
134
|
-
cwd: record.cwd, prompt: record.prompt, rule: record.rule, ...record.execution }, emit, context.isCurrent);
|
|
135
|
-
this.scheduleHandoff = false;
|
|
136
|
-
return handle;
|
|
137
|
-
},
|
|
138
|
-
};
|
|
139
129
|
try {
|
|
140
130
|
const stat = fs_1.default.lstatSync(handoffFile);
|
|
141
131
|
if (!stat.isFile() || stat.isSymbolicLink() || stat.size > 300_000)
|
|
@@ -156,8 +146,6 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
156
146
|
}
|
|
157
147
|
}
|
|
158
148
|
execute(prompt, options = {}) {
|
|
159
|
-
if (this.scheduleHandoff)
|
|
160
|
-
return Promise.resolve({ success: false, error: 'Native schedule handoff is pending. Retry after recovery.' });
|
|
161
149
|
if (this.state.compacting)
|
|
162
150
|
return Promise.resolve({ success: false, error: 'DSH is compacting. Try again after it finishes.' });
|
|
163
151
|
if (/^\s*\/[a-z][\w-]*(?:\s|$)/i.test(prompt))
|
|
@@ -165,28 +153,41 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
165
153
|
error: 'DSH ACP does not expose interactive slash commands. Use remote-cli built-ins or describe the task in plain text.' });
|
|
166
154
|
return super.execute(prompt, options);
|
|
167
155
|
}
|
|
156
|
+
nativeScheduleCleanup = {
|
|
157
|
+
provider: 'dsh-session-orderly-v1', strategy: 'reconstruct',
|
|
158
|
+
// Legacy discriminators identify deletion provenance, never restoration.
|
|
159
|
+
describe: (input, owner) => JSON.stringify({ sessionId: this.getSessionId(), cwd: input.cwd, threadId: owner.threadId }),
|
|
160
|
+
};
|
|
168
161
|
async createNativeSchedule(input, onEvent, isOwnerCurrent = () => true) {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
162
|
+
const { client, sessionId } = await (async () => {
|
|
163
|
+
try {
|
|
164
|
+
if (!isOwnerCurrent() || input.cwd !== this.getCurrentWorkingDirectory())
|
|
165
|
+
throw new Error('Native scheduling context changed.');
|
|
166
|
+
const previous = this.getSessionId();
|
|
167
|
+
const session = await this.schedulingSession();
|
|
168
|
+
if (!isOwnerCurrent() || input.cwd !== this.getCurrentWorkingDirectory())
|
|
169
|
+
throw new Error('Native scheduling context changed.');
|
|
170
|
+
if (previous && session.sessionId !== previous)
|
|
171
|
+
throw new Error('The original DSH conversation could not be resumed. No schedule was created.');
|
|
172
|
+
if (!session.client.createNativeSchedule)
|
|
173
|
+
throw new Error('This DSH transport does not support foreground-session scheduling.');
|
|
174
|
+
return session;
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
// Session acquisition cannot create a schedule. Compact only this fresh
|
|
178
|
+
// refusal; existing markers and ambiguous native CREATE evidence remain.
|
|
179
|
+
throw new types_1.NativeScheduleNotAdmittedError(error instanceof Error ? error.message : String(error));
|
|
180
|
+
}
|
|
181
|
+
})();
|
|
182
|
+
// Write refusal evidence before the first possible native mutation, including ambiguous CREATE failure.
|
|
183
|
+
this.scheduledSessionGuard.mark(sessionId);
|
|
184
|
+
const cleanupIdentity = JSON.stringify({ sessionId, cwd: input.cwd, threadId: input.threadId ?? this.scheduleThreadId });
|
|
185
|
+
await onEvent({ type: 'attributed', cleanupIdentity });
|
|
186
|
+
if (!isOwnerCurrent() || input.cwd !== this.getCurrentWorkingDirectory() || sessionId !== this.getSessionId()) {
|
|
176
187
|
throw new Error('Native scheduling context changed.');
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
throw new Error('This DSH transport does not support foreground-session scheduling.');
|
|
181
|
-
const handle = await client.createNativeSchedule(sessionId, input, onEvent);
|
|
182
|
-
return { ...handle,
|
|
183
|
-
get nativeDefinitionAbsent() { return handle.nativeDefinitionAbsent; },
|
|
184
|
-
recoveryIdentity: JSON.stringify({ sessionId, cwd: input.cwd, threadId: input.threadId ?? 'default' }),
|
|
185
|
-
...(handle.releaseForRestart ? { releaseForRestart: async () => {
|
|
186
|
-
this.scheduleHandoff = true;
|
|
187
|
-
return handle.releaseForRestart();
|
|
188
|
-
} } : {}),
|
|
189
|
-
};
|
|
188
|
+
}
|
|
189
|
+
const handle = await client.createNativeSchedule(sessionId, input, onEvent, isOwnerCurrent);
|
|
190
|
+
return Object.assign(handle, { cleanupIdentity });
|
|
190
191
|
}
|
|
191
192
|
isBusy() { return this.state?.compacting === true || super.isBusy(); }
|
|
192
193
|
getContextUsage() { return this.state.usage; }
|
|
@@ -194,8 +195,6 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
194
195
|
return this.accountUsageQuery(this.dshCommand, this.getCurrentWorkingDirectory());
|
|
195
196
|
}
|
|
196
197
|
async listModels() {
|
|
197
|
-
if (this.scheduleHandoff)
|
|
198
|
-
throw new Error('Native schedule handoff is pending.');
|
|
199
198
|
return (await super.listModels()).map(model => ({ ...model,
|
|
200
199
|
supportedReasoningEfforts: model.supportedReasoningEfforts?.map(value => value === '' ? 'auto' : value),
|
|
201
200
|
defaultReasoningEffort: undefined,
|
|
@@ -204,7 +203,6 @@ class DshExecutor extends AcpExecutor_1.AcpExecutor {
|
|
|
204
203
|
}));
|
|
205
204
|
}
|
|
206
205
|
resetContext() {
|
|
207
|
-
this.scheduleHandoff = false;
|
|
208
206
|
this.state.generation++;
|
|
209
207
|
fs_1.default.rmSync(this.handoffFile, { force: true });
|
|
210
208
|
this.state.handoff = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DshExecutor.js","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DshExecutor.js","sourceRoot":"","sources":["../../src/executor/DshExecutor.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAiE;AACjE,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AACxB,mCAAoC;AAEpC,+CAA4C;AAG5C,qDAAiF;AACjF,qDAAkD;AAClD,2DAA6D;AAC7D,uEAAoE;AACpE,+CAAiG;AACjG,mFAAgF;AA4BhF,MAAM,2BAA2B,GAAG,qIAAqI,CAAC;AAE1K,2FAA2F;AAC3F,MAAa,WAAY,SAAQ,yBAAW;IACzB,KAAK,CAAW;IAChB,WAAW,CAAS;IACpB,UAAU,CAAS;IACnB,iBAAiB,CAAuD;IACxE,gBAAgB,CAAS;IACzB,qBAAqB,CAAwB;IAE9D,YAAY,KAAqB,EAAE,UAA8B,EAAE;QACjE,IAAI,OAAO,CAAC,mBAAmB,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC7H,mFAAmF;QACnF,IAAI,OAAO,CAAC,uBAAuB;YAAE,KAAK,CAAC,uBAAuB,CAAC,OAAO,CAAC,uBAAuB,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACnH,MAAM,KAAK,GAAa,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;QAChH,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,IAAI,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;QACnG,MAAM,OAAO,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAA,sCAAqB,GAAE,IAAI,OAAO,CAAC,QAAQ;eAClF,6DAA6D,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB;YACvH,CAAC,CAAC,IAAI,qCAAiB,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,QAAQ,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxH,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,SAAS,eAAe,CAAC,CAAC;QAC1F,MAAM,YAAY,GAAG,GAAG,EAAE;YACxB,YAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;QAC5B,CAAC,CAAC;QACF,IAAI,YAAsC,CAAC;QAC3C,KAAK,CAAC,KAAK,EAAE;YACX,GAAG,OAAO;YACV,oBAAoB,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;gBAChC,IAAI,OAAO;oBAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;;oBACnC,YAAY,EAAE,EAAE,CAAC;YACxB,CAAC;YACD,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;YACzF,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC;YACzD,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,cAAc;YAClE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,EAAE;YACvD,cAAc,EAAE,uCAAuC;YACvD,WAAW,EAAE,SAAS,EAAE,4BAA4B,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI;YAClF,aAAa,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE;gBAChC,MAAM,OAAO,GAAsB,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE;wBACnE,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;+BACrE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;4BACzD,KAAK,CAAC,KAAK,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gCACpF,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;wBACtE,CAAC;oBACH,CAAC,EAAE,CAAC;gBACJ,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC;uBAClD,IAAI,2BAAY,CAAC,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,gBAAgB,EAAE,OAAO,EAAE,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBACrJ,OAAO;oBACL,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnH,UAAU,EAAE,KAAK,IAAI,EAAE;wBACrB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,UAAU,EAA0E,CAAC;wBACpH,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,KAAK,KAAK,IAAI,CAAC;wBAC7E,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;wBACnB,OAAO,MAAM,CAAC;oBAChB,CAAC;oBACD,UAAU,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;oBACtD,WAAW,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;wBAC7B,IAAI,CAAC;4BAAC,OAAO,MAAM,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;wBAAC,CAAC;wBACpD,OAAO,KAAK,EAAE,CAAC;4BACb,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;4BACvE,uFAAuF;4BACvF,IAAI,+DAA+D,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gCAClF,IAAI,KAAK,CAAC,UAAU;oCAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;gCACnE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;gCAC5B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;4BAC1F,CAAC;4BACD,IAAI,iEAAiE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gCACpF,MAAM,IAAI,KAAK,CAAC,mRAAmR,CAAC,CAAC;4BACvS,CAAC;4BACD,MAAM,KAAK,CAAC;wBACd,CAAC;oBACH,CAAC;oBACD,eAAe,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,EACpE,GAAG,KAAK,kBAAkB,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC9D,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;oBAChD,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC1C,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE;oBAClC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,WAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjF,GAAG,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,8BAA8B,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,8BAA+B,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1I,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;wBAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC;4BAClE,MAAM,IAAI,KAAK,CAAC,gGAAgG,CAAC,CAAC;wBACpH,CAAC;wBACD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;4BACzB,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,qIAAqI,EAAE,CAAC,CAAC;4BACvL,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;wBAC/B,CAAC;wBACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;wBAC9B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO;4BAC/C,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,sCAAqB,EAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;wBAC3F,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU;4BAAE,YAAY,EAAE,CAAC;wBAC7F,OAAO,MAAM,CAAC;oBAChB,CAAC;iBACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,IAAI,SAAS,CAAC;QACtD,IAAI,CAAC,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,IAAI,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QAC1H,YAAY,GAAG,GAAG,EAAE,GAAG,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAAE,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1J,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC;QAC9C,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,sCAAoB,CAAC;QAE3E,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,YAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC,IAAI,GAAG,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAChH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAY,CAAC;YAC1E,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM;mBACjF,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,0BAA0B,EAAE;mBAC/C,CAAC,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ,IAAI,KAAK,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE,CAAC;gBACnF,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;gBACtB,oEAAoE;gBACpE,IAAI,KAAK,CAAC,eAAe,KAAK,IAAI,CAAC,YAAY,EAAE;oBAAE,KAAK,CAAC,YAAY,EAAE,CAAC;YAC1E,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,UAA0B,EAAE;QAClD,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,iDAAiD,EAAE,CAAC,CAAC;QAChI,IAAI,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK;gBACpF,KAAK,EAAE,kHAAkH,EAAE,CAAC,CAAC;QAC/H,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAEQ,qBAAqB,GAA0B;QACtD,QAAQ,EAAE,wBAAwB,EAAE,QAAQ,EAAE,aAAa;QAC3D,yEAAyE;QACzE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;KACzH,CAAC;IAEF,KAAK,CAAC,oBAAoB,CAAC,KAAwD,EACjF,OAA2F,EAAE,iBAAgC,GAAG,EAAE,CAAC,IAAI;QACvI,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;YAC9C,IAAI,CAAC;gBACH,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,0BAA0B,EAAE;oBAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBAChI,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;gBACrC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC/C,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,0BAA0B,EAAE;oBAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBAChI,IAAI,QAAQ,IAAI,OAAO,CAAC,SAAS,KAAK,QAAQ;oBAAE,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;gBAChJ,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB;oBAAE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;gBAChI,OAAO,OAAO,CAAC;YACjB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,wEAAwE;gBACxE,yEAAyE;gBACzE,MAAM,IAAI,sCAA8B,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACnG,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,wGAAwG;QACxG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzH,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,cAAc,EAAE,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,0BAA0B,EAAE,IAAI,SAAS,KAAK,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YAC9G,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,oBAAqB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;QAC7F,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,KAAc,OAAO,IAAI,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/E,eAAe,KAAkC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,eAAe;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,CAAC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK;YACxD,yBAAyB,EAAE,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;YACvG,sBAAsB,EAAE,SAAS;YACjC,kFAAkF;YAClF,eAAe,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SAC1G,CAAC,CAAC,CAAC;IACN,CAAC;IAED,YAAY;QACV,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACxB,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QAClC,KAAK,CAAC,YAAY,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAc;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACnD,MAAM,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,0BAA0B,EAAE,KAAK,QAAQ,EAAE,CAAC;YACnD,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YACxB,YAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QACpC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAkC;QACtD,IAAI,IAAI,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC;QAC5F,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;QAC7F,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,2DAA2D,EAAE,CAAC;QACtH,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QACzC,IAAI,CAAC;YACH,QAAQ,EAAE,CAAC,uEAAuE,CAAC,CAAC;YACpF,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,uCAAsB,CAAC,CAAC;YAC3D,IAAI,UAAU,KAAK,IAAI,CAAC,KAAK,CAAC,UAAU;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sDAAsD,EAAE,CAAC;YACnI,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE;gBAAE,OAAO,EAAE,OAAO,EAAE,KAAK;oBACpE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,sEAAsE,EAAE,CAAC;YAClG,MAAM,OAAO,GAAY,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;gBACpE,GAAG,EAAE,IAAI,CAAC,0BAA0B,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACjF,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,IAAA,mBAAU,GAAE,MAAM,CAAC;YAC5D,IAAI,CAAC;gBACH,YAAE,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAClF,YAAE,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAC7C,CAAC;oBAAS,CAAC;gBAAC,YAAE,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YAC7B,KAAK,CAAC,YAAY,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;YACxB,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;YAC1B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,oHAAoH,EAAE,CAAC;QACzJ,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,kGAAkG,EAAE,CAAC;QACvI,CAAC;gBAAS,CAAC;YAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC;QAAC,CAAC;IAC9C,CAAC;IAED,mFAAmF;IACnF,KAAK,CAAC,gBAAgB,CAAC,SAAiB;QACtC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU;YAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;CACF;AA/OD,kCA+OC"}
|
|
@@ -129,7 +129,7 @@ export interface IExecutor {
|
|
|
129
129
|
/** Permit only an explicit retry of a settled-but-unconfirmed native setting. */
|
|
130
130
|
canRetrySettingsChange?(setting: 'model'): boolean;
|
|
131
131
|
abortStatusMessage?(): string | undefined;
|
|
132
|
-
/** Explicit context reset may stop
|
|
132
|
+
/** Explicit context reset may stop the native process, losing session-only schedules. */
|
|
133
133
|
stopForContextReset?(): Promise<void>;
|
|
134
134
|
destroy(): Promise<void> | void;
|
|
135
135
|
/** Transport-exit confirmation; insufficient by itself for disposable worker cleanup. */
|
|
@@ -146,8 +146,8 @@ export interface IExecutor {
|
|
|
146
146
|
consumeSessionResumeFailure?(): boolean;
|
|
147
147
|
/** Enable tools for future turns without changing the native conversation. */
|
|
148
148
|
configureDelegation?(connection?: DelegationConnection): Promise<void>;
|
|
149
|
-
/**
|
|
150
|
-
|
|
149
|
+
/** Exact retained cancellation only; never restores execution or starts a host. */
|
|
150
|
+
nativeScheduleCleanup?: import('../scheduling/types').NativeScheduleCleanup;
|
|
151
151
|
/** Native timing in the existing foreground conversation; never fork its history. */
|
|
152
152
|
createNativeSchedule?(input: import('../scheduling/types').NativeScheduleInput, onEvent: (event: import('../scheduling/types').NativeScheduleEvent) => void | Promise<void>, isOwnerCurrent?: () => boolean, canAdmitOccurrence?: () => boolean): Promise<import('../scheduling/types').NativeScheduleHandle>;
|
|
153
153
|
/** Bind a management operation to its authenticated owner; in-turn tools receive a native action. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IExecutor.d.ts","sourceRoot":"","sources":["../../src/executor/IExecutor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"IExecutor.d.ts","sourceRoot":"","sources":["../../src/executor/IExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACnM,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,MAAM,WAAW,cAAc;IAC7B;+FAC2F;IAC3F,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,MAAM,CAAC;IACrD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,0FAA0F;IAC1F,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,kGAAkG;IAClG,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACtD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IACtC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,gGAAgG;IAChG,kBAAkB,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAClE,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC;IAC9D,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACzE,4FAA4F;IAC5F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wFAAwF;IACxF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yCAAyC;IACzC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,GAAG,eAAe,GAAG,UAAU,CAAC;AAEjH,gFAAgF;AAChF,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,6EAA6E;AAC7E,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iEAAiE;IACjE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,qFAAqF;AACrF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,oFAAoF;AACpF,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;AAE3E,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IAExB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACzE,0BAA0B,IAAI,MAAM,CAAC;IACrC,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,mEAAmE;IACnE,MAAM,CAAC,IAAI,OAAO,CAAC;IACnB,4FAA4F;IAC5F,oBAAoB,CAAC,IAAI,OAAO,CAAC;IACjC,+FAA+F;IAC/F,4BAA4B,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,2BAA2B,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACvI,YAAY,IAAI,IAAI,CAAC;IACrB,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1B,+FAA+F;IAC/F,uBAAuB,CAAC,IAAI,OAAO,CAAC;IACpC,sBAAsB,CAAC,IAAI,OAAO,CAAC;IACnC,sFAAsF;IACtF,0BAA0B,CAAC,IAAI,OAAO,CAAC;IACvC,yFAAyF;IACzF,wBAAwB,CAAC,IAAI,OAAO,CAAC;IACrC,iFAAiF;IACjF,sBAAsB,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IACnD,kBAAkB,CAAC,IAAI,MAAM,GAAG,SAAS,CAAC;IAC1C,yFAAyF;IACzF,mBAAmB,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAChC,yFAAyF;IACzF,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B;;yGAEqG;IACrG,8BAA8B,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD;;;;OAIG;IACH,2BAA2B,CAAC,IAAI,OAAO,CAAC;IAGxC,8EAA8E;IAC9E,mBAAmB,CAAC,CAAC,UAAU,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,mFAAmF;IACnF,qBAAqB,CAAC,EAAE,OAAO,qBAAqB,EAAE,qBAAqB,CAAC;IAC5E,qFAAqF;IACrF,oBAAoB,CAAC,CAAC,KAAK,EAAE,OAAO,qBAAqB,EAAE,mBAAmB,EAC5E,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,qBAAqB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC,EAAE,MAAM,OAAO,EAC3H,kBAAkB,CAAC,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,qBAAqB,EAAE,oBAAoB,CAAC,CAAC;IACnG,qGAAqG;IACrG,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,EAC9D,GAAG,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpF,2BAA2B,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxH,iGAAiG;IACjG,uBAAuB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACnG,oBAAoB,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,qBAAqB,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACtG,yGAAyG;IACzG,qBAAqB,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,qBAAqB,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,OAAO,CAAC,IAAI,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;IACzC,WAAW,CAAC,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/F,SAAS,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,SAAS,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,aAAa,CAAC,IAAI,OAAO,CAAC;IAC1B,cAAc,CAAC,IAAI,OAAO,CAAC;IAC3B,SAAS,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,iBAAiB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC;IACvE,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,eAAe,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7E,iDAAiD;IACjD,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACrF,6DAA6D;IAC7D,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACpC,kEAAkE;IAClE,UAAU,CAAC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC5C,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC;IAClF,qFAAqF;IACrF,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7D,qFAAqF;IACrF,WAAW,CAAC,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC5C,qFAAqF;IACrF,SAAS,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACnD,gBAAgB,CAAC,IAAI,OAAO,CAAC;IAC7B,YAAY,CAAC,IAAI,MAAM,GAAG,IAAI,CAAC;IAC/B,0FAA0F;IAC1F,oBAAoB,CAAC,IAAI,yBAAyB,CAAC;IACnD,kFAAkF;IAClF,eAAe,CAAC,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,oBAAoB,GAAG,IAAI,CAAC;IACvF,uFAAuF;IACvF,eAAe,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IAE3D;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;OAEG;IACH,sBAAsB,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC;;;;OAIG;IACH,kBAAkB,CAAC,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC/E,wFAAwF;IACxF,mBAAmB,CAAC,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACtD;AAED,uFAAuF;AACvF,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,GAAG;IACpD,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC"}
|
|
@@ -22,14 +22,22 @@ export interface AcpEventCallbacks {
|
|
|
22
22
|
onUsage?: (update: Record<string, unknown>) => void;
|
|
23
23
|
onPermissionRequest?: (title: string, options: AcpPermissionOption[]) => Promise<number>;
|
|
24
24
|
}
|
|
25
|
+
/** Initial controls run before original-session admission. The setter is scoped
|
|
26
|
+
* to this allocation/load and expires when setup finishes or ownership changes. */
|
|
27
|
+
export type AcpSessionSetup = (session: AcpSessionResult, configure: (configId: string, value: string) => Promise<AcpSessionResult>) => Promise<void>;
|
|
25
28
|
export interface AcpTransport {
|
|
26
29
|
/** Process-local original-session admission identity. Never a resume or recovery
|
|
27
30
|
* receipt. Revoked before load/configuration/cancel/delete, including failures. */
|
|
28
31
|
sessionAdmission?(sessionId: string): object | undefined;
|
|
29
|
-
|
|
32
|
+
/** Allocation/load and admission-revoking controls change this local epoch. */
|
|
33
|
+
sessionLifecycle?(): object | undefined;
|
|
34
|
+
createNativeSchedule?(sessionId: string, input: import('../../scheduling/types').NativeScheduleInput, onEvent: (event: import('../../scheduling/types').NativeScheduleEvent) => void | Promise<void>, current?: () => boolean): Promise<import('../../scheduling/types').NativeScheduleHandle>;
|
|
30
35
|
initialize(): Promise<unknown>;
|
|
31
36
|
newSession(cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
32
37
|
loadSession(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
38
|
+
/** Optional initial-control transaction; ordinary transport signatures stay compatible. */
|
|
39
|
+
newSessionWithSetup?(cwd: string, mcpServers: AcpMcpServer[] | undefined, setup: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
40
|
+
loadSessionWithSetup?(sessionId: string, cwd: string, mcpServers: AcpMcpServer[] | undefined, setup: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
33
41
|
prompt(sessionId: string, blocks: AcpContentBlock[]): Promise<{
|
|
34
42
|
stopReason: string;
|
|
35
43
|
}>;
|
|
@@ -59,6 +67,8 @@ export declare class AcpClient implements AcpTransport {
|
|
|
59
67
|
private readonly rl;
|
|
60
68
|
private nextId;
|
|
61
69
|
private readonly sessionAdmissions;
|
|
70
|
+
private sessionEpoch;
|
|
71
|
+
private readonly sessionSetups;
|
|
62
72
|
private destroyed;
|
|
63
73
|
private closed;
|
|
64
74
|
private killTimer;
|
|
@@ -66,7 +76,10 @@ export declare class AcpClient implements AcpTransport {
|
|
|
66
76
|
constructor(command: string, args: string[], cwd: string, callbacks: AcpEventCallbacks, managedProcess?: boolean, launch?: AcpLaunchOptions);
|
|
67
77
|
initialize(): Promise<unknown>;
|
|
68
78
|
newSession(cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
79
|
+
newSessionWithSetup(cwd: string, mcpServers?: AcpMcpServer[], setup?: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
69
80
|
loadSession(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[]): Promise<AcpSessionResult>;
|
|
81
|
+
loadSessionWithSetup(sessionId: string, cwd: string, mcpServers?: AcpMcpServer[], setup?: AcpSessionSetup): Promise<AcpSessionResult>;
|
|
82
|
+
private prepareSession;
|
|
70
83
|
prompt(sessionId: string, blocks: AcpContentBlock[]): Promise<{
|
|
71
84
|
stopReason: string;
|
|
72
85
|
}>;
|
|
@@ -75,6 +88,7 @@ export declare class AcpClient implements AcpTransport {
|
|
|
75
88
|
sendCancel(sessionId: string): void;
|
|
76
89
|
destroy(): void;
|
|
77
90
|
sessionAdmission(sessionId: string): object | undefined;
|
|
91
|
+
sessionLifecycle(): object | undefined;
|
|
78
92
|
waitForExit(): Promise<void>;
|
|
79
93
|
waitForManagedProcessGroupExit(): Promise<void>;
|
|
80
94
|
private signalProcess;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcpClient.d.ts","sourceRoot":"","sources":["../../../src/executor/acp/AcpClient.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,eAAe,EAEf,sBAAsB,EAItB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAKpB,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACnD,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACrD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,KAAK,IAAI,CAAC;IAC3F,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACpD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1F;AAQD,MAAM,WAAW,YAAY;IAC3B;uFACmF;IACnF,gBAAgB,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IACzD,oBAAoB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,wBAAwB,EAAE,mBAAmB,EAClG,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,wBAAwB,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,OAAO,wBAAwB,EAAE,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AcpClient.d.ts","sourceRoot":"","sources":["../../../src/executor/acp/AcpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,8 @@ class AcpClient {
|
|
|
50
50
|
rl;
|
|
51
51
|
nextId = 1;
|
|
52
52
|
sessionAdmissions = new Map();
|
|
53
|
+
sessionEpoch = {};
|
|
54
|
+
sessionSetups = new Set();
|
|
53
55
|
destroyed = false;
|
|
54
56
|
closed = false;
|
|
55
57
|
killTimer = null;
|
|
@@ -83,6 +85,7 @@ class AcpClient {
|
|
|
83
85
|
this.rl.on('line', (line) => this.handleLine(line));
|
|
84
86
|
this.child.on('error', (error) => this.rejectAllPending(error));
|
|
85
87
|
this.child.on('close', (code, signal) => {
|
|
88
|
+
this.sessionEpoch = {};
|
|
86
89
|
this.closed = true;
|
|
87
90
|
this.clearKillTimer();
|
|
88
91
|
if (!this.destroyed) {
|
|
@@ -94,23 +97,94 @@ class AcpClient {
|
|
|
94
97
|
return this.sendRequest('initialize', { protocolVersion: 1, clientCapabilities: {} });
|
|
95
98
|
}
|
|
96
99
|
async newSession(cwd, mcpServers = []) {
|
|
100
|
+
return this.newSessionWithSetup(cwd, mcpServers);
|
|
101
|
+
}
|
|
102
|
+
async newSessionWithSetup(cwd, mcpServers = [], setup) {
|
|
97
103
|
for (const id of this.sessionAdmissions.keys())
|
|
98
104
|
this.sessionAdmissions.set(id, undefined);
|
|
99
|
-
|
|
100
|
-
if (typeof result.sessionId === 'string' && !this.sessionAdmissions.has(result.sessionId)
|
|
101
|
-
&& this.sessionAdmissions.size < 1000)
|
|
102
|
-
this.sessionAdmissions.set(result.sessionId, Object.freeze({}));
|
|
103
|
-
return result;
|
|
105
|
+
return this.prepareSession('session/new', { cwd, mcpServers }, setup);
|
|
104
106
|
}
|
|
105
107
|
async loadSession(sessionId, cwd, mcpServers = []) {
|
|
106
|
-
|
|
108
|
+
return this.loadSessionWithSetup(sessionId, cwd, mcpServers);
|
|
109
|
+
}
|
|
110
|
+
async loadSessionWithSetup(sessionId, cwd, mcpServers = [], setup) {
|
|
111
|
+
if (this.sessionAdmissions.has(sessionId) || this.sessionAdmissions.size < 1000)
|
|
107
112
|
this.sessionAdmissions.set(sessionId, undefined);
|
|
108
|
-
return this.
|
|
113
|
+
return this.prepareSession('session/load', { sessionId, cwd, mcpServers }, setup);
|
|
114
|
+
}
|
|
115
|
+
async prepareSession(method, params, setup) {
|
|
116
|
+
if (this.closed)
|
|
117
|
+
throw new Error('ACP process exited before initial session setup.');
|
|
118
|
+
const epoch = this.sessionEpoch = {};
|
|
119
|
+
const ticket = {};
|
|
120
|
+
if (setup)
|
|
121
|
+
this.sessionSetups.add(ticket);
|
|
122
|
+
let active = true;
|
|
123
|
+
let configuring = false;
|
|
124
|
+
let timer;
|
|
125
|
+
const current = () => {
|
|
126
|
+
if (!active || this.destroyed || this.closed || this.sessionEpoch !== epoch)
|
|
127
|
+
throw new Error('ACP initial session setup was invalidated.');
|
|
128
|
+
};
|
|
129
|
+
try {
|
|
130
|
+
current();
|
|
131
|
+
const result = await this.sendRequest(method, params);
|
|
132
|
+
const id = result?.sessionId;
|
|
133
|
+
const fresh = method === 'session/new' && typeof id === 'string' && id.length > 0
|
|
134
|
+
&& !this.sessionAdmissions.has(id) && this.sessionAdmissions.size < 1000;
|
|
135
|
+
// A stale or loaded identity can never become a later fresh allocation.
|
|
136
|
+
if (typeof id === 'string' && id.length > 0 && this.sessionAdmissions.size < 1000)
|
|
137
|
+
this.sessionAdmissions.set(id, undefined);
|
|
138
|
+
current();
|
|
139
|
+
if (setup) {
|
|
140
|
+
await Promise.race([
|
|
141
|
+
setup(result, async (configId, value) => {
|
|
142
|
+
current();
|
|
143
|
+
if (configuring)
|
|
144
|
+
throw new Error('ACP initial session controls must be sequential.');
|
|
145
|
+
if (typeof id !== 'string' || !id)
|
|
146
|
+
throw new Error('ACP initial session identity is missing.');
|
|
147
|
+
configuring = true;
|
|
148
|
+
try {
|
|
149
|
+
const configured = await this.sendRequest('session/set_config_option', { sessionId: id, configId, value });
|
|
150
|
+
current();
|
|
151
|
+
return configured;
|
|
152
|
+
}
|
|
153
|
+
finally {
|
|
154
|
+
configuring = false;
|
|
155
|
+
}
|
|
156
|
+
}),
|
|
157
|
+
new Promise((_, reject) => {
|
|
158
|
+
timer = setTimeout(() => {
|
|
159
|
+
active = false;
|
|
160
|
+
reject(new Error('ACP initial session setup timed out.'));
|
|
161
|
+
}, CONTROL_REQUEST_TIMEOUT_MS * 3);
|
|
162
|
+
}),
|
|
163
|
+
]);
|
|
164
|
+
}
|
|
165
|
+
current();
|
|
166
|
+
if (configuring)
|
|
167
|
+
throw new Error('ACP initial session controls are still pending.');
|
|
168
|
+
if (fresh)
|
|
169
|
+
this.sessionAdmissions.set(id, Object.freeze({}));
|
|
170
|
+
return result;
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
active = false;
|
|
174
|
+
if (timer)
|
|
175
|
+
clearTimeout(timer);
|
|
176
|
+
this.sessionSetups.delete(ticket);
|
|
177
|
+
}
|
|
109
178
|
}
|
|
110
179
|
async prompt(sessionId, blocks) {
|
|
180
|
+
if (this.sessionSetups.size) {
|
|
181
|
+
this.sessionEpoch = {};
|
|
182
|
+
throw new Error('ACP initial session setup is still pending.');
|
|
183
|
+
}
|
|
111
184
|
return this.sendRequest('session/prompt', { sessionId, prompt: blocks });
|
|
112
185
|
}
|
|
113
186
|
async setConfigOption(sessionId, configId, value) {
|
|
187
|
+
this.sessionEpoch = {};
|
|
114
188
|
if (this.sessionAdmissions.has(sessionId))
|
|
115
189
|
this.sessionAdmissions.set(sessionId, undefined);
|
|
116
190
|
return this.sendRequest('session/set_config_option', {
|
|
@@ -120,11 +194,13 @@ class AcpClient {
|
|
|
120
194
|
});
|
|
121
195
|
}
|
|
122
196
|
async deleteSession(sessionId) {
|
|
197
|
+
this.sessionEpoch = {};
|
|
123
198
|
if (this.sessionAdmissions.has(sessionId))
|
|
124
199
|
this.sessionAdmissions.set(sessionId, undefined);
|
|
125
200
|
await this.sendRequest('session/delete', { sessionId });
|
|
126
201
|
}
|
|
127
202
|
sendCancel(sessionId) {
|
|
203
|
+
this.sessionEpoch = {};
|
|
128
204
|
if (this.sessionAdmissions.has(sessionId))
|
|
129
205
|
this.sessionAdmissions.set(sessionId, undefined);
|
|
130
206
|
this.sendNotification('session/cancel', { sessionId });
|
|
@@ -133,6 +209,7 @@ class AcpClient {
|
|
|
133
209
|
if (this.destroyed)
|
|
134
210
|
return;
|
|
135
211
|
this.destroyed = true;
|
|
212
|
+
this.sessionEpoch = {};
|
|
136
213
|
this.rejectAllPending(new Error('ACP client destroyed'));
|
|
137
214
|
this.rl.close();
|
|
138
215
|
try {
|
|
@@ -151,6 +228,7 @@ class AcpClient {
|
|
|
151
228
|
sessionAdmission(sessionId) {
|
|
152
229
|
return this.closed || this.destroyed ? undefined : this.sessionAdmissions.get(sessionId);
|
|
153
230
|
}
|
|
231
|
+
sessionLifecycle() { return this.closed || this.destroyed ? undefined : this.sessionEpoch; }
|
|
154
232
|
waitForExit() { return this.exited; }
|
|
155
233
|
async waitForManagedProcessGroupExit() {
|
|
156
234
|
if (!this.workerGroupEnabled)
|