@myagentroam/node 0.1.3 → 0.1.4
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/claude-agent-sdk.d.ts +1 -15
- package/dist/claude-agent-sdk.js +9 -77
- package/dist/claude-agent-sdk.js.map +1 -1
- package/dist/codex-app-server.d.ts +4 -0
- package/dist/codex-app-server.js +18 -4
- package/dist/codex-app-server.js.map +1 -1
- package/dist/connector/node-connector-options.d.ts +23 -0
- package/dist/connector/node-connector-options.js +2 -0
- package/dist/connector/node-connector-options.js.map +1 -0
- package/dist/connector/node-operation-router.d.ts +9 -0
- package/dist/connector/node-operation-router.js +23 -0
- package/dist/connector/node-operation-router.js.map +1 -0
- package/dist/connector.d.ts +59 -356
- package/dist/connector.js +611 -6175
- package/dist/connector.js.map +1 -1
- package/dist/control-outbound-scheduler.d.ts +26 -0
- package/dist/control-outbound-scheduler.js +122 -0
- package/dist/control-outbound-scheduler.js.map +1 -0
- package/dist/database.js +1 -1
- package/dist/database.js.map +1 -1
- package/dist/native-jsonl-reader.d.ts +14 -0
- package/dist/native-jsonl-reader.js +98 -0
- package/dist/native-jsonl-reader.js.map +1 -0
- package/dist/native-session-history.d.ts +22 -3
- package/dist/native-session-history.js +275 -156
- package/dist/native-session-history.js.map +1 -1
- package/dist/runner/abstract-runner.d.ts +148 -0
- package/dist/runner/abstract-runner.js +139 -0
- package/dist/runner/abstract-runner.js.map +1 -0
- package/dist/runner/claude/managed-run-controller.d.ts +52 -0
- package/dist/runner/claude/managed-run-controller.js +307 -0
- package/dist/runner/claude/managed-run-controller.js.map +1 -0
- package/dist/runner/claude-code-runner.d.ts +68 -0
- package/dist/runner/claude-code-runner.js +268 -0
- package/dist/runner/claude-code-runner.js.map +1 -0
- package/dist/runner/codex/conversation-parser.d.ts +61 -0
- package/dist/runner/codex/conversation-parser.js +676 -0
- package/dist/runner/codex/conversation-parser.js.map +1 -0
- package/dist/runner/codex/managed-run-controller.d.ts +79 -0
- package/dist/runner/codex/managed-run-controller.js +379 -0
- package/dist/runner/codex/managed-run-controller.js.map +1 -0
- package/dist/runner/codex-runner.d.ts +81 -0
- package/dist/runner/codex-runner.js +342 -0
- package/dist/runner/codex-runner.js.map +1 -0
- package/dist/runner/fake-test-runner.d.ts +26 -0
- package/dist/runner/fake-test-runner.js +48 -0
- package/dist/runner/fake-test-runner.js.map +1 -0
- package/dist/runner/runner-registry.d.ts +17 -0
- package/dist/runner/runner-registry.js +66 -0
- package/dist/runner/runner-registry.js.map +1 -0
- package/dist/runner-usage.d.ts +2 -2
- package/dist/runner-usage.js +3 -5
- package/dist/runner-usage.js.map +1 -1
- package/dist/runtime-state.js +6 -5
- package/dist/runtime-state.js.map +1 -1
- package/dist/service/attachment-domain-state.d.ts +5 -0
- package/dist/service/attachment-domain-state.js +6 -0
- package/dist/service/attachment-domain-state.js.map +1 -0
- package/dist/service/conversation-history-service.d.ts +34 -0
- package/dist/service/conversation-history-service.js +159 -0
- package/dist/service/conversation-history-service.js.map +1 -0
- package/dist/service/external-session-resume-service.d.ts +32 -0
- package/dist/service/external-session-resume-service.js +99 -0
- package/dist/service/external-session-resume-service.js.map +1 -0
- package/dist/service/fake-managed-run-service.d.ts +29 -0
- package/dist/service/fake-managed-run-service.js +63 -0
- package/dist/service/fake-managed-run-service.js.map +1 -0
- package/dist/service/managed-runner-session-service.d.ts +10 -0
- package/dist/service/managed-runner-session-service.js +31 -0
- package/dist/service/managed-runner-session-service.js.map +1 -0
- package/dist/service/native-session-projection-service.d.ts +50 -0
- package/dist/service/native-session-projection-service.js +268 -0
- package/dist/service/native-session-projection-service.js.map +1 -0
- package/dist/service/native-session-watch-service.d.ts +37 -0
- package/dist/service/native-session-watch-service.js +151 -0
- package/dist/service/native-session-watch-service.js.map +1 -0
- package/dist/service/node-connection-lifecycle-service.d.ts +37 -0
- package/dist/service/node-connection-lifecycle-service.js +84 -0
- package/dist/service/node-connection-lifecycle-service.js.map +1 -0
- package/dist/service/node-control-channel.d.ts +32 -0
- package/dist/service/node-control-channel.js +84 -0
- package/dist/service/node-control-channel.js.map +1 -0
- package/dist/service/node-control-message-service.d.ts +28 -0
- package/dist/service/node-control-message-service.js +105 -0
- package/dist/service/node-control-message-service.js.map +1 -0
- package/dist/service/node-request-service.d.ts +14 -0
- package/dist/service/node-request-service.js +51 -0
- package/dist/service/node-request-service.js.map +1 -0
- package/dist/service/node-run-event-bridge.d.ts +38 -0
- package/dist/service/node-run-event-bridge.js +80 -0
- package/dist/service/node-run-event-bridge.js.map +1 -0
- package/dist/service/node-terminal-channel.d.ts +29 -0
- package/dist/service/node-terminal-channel.js +176 -0
- package/dist/service/node-terminal-channel.js.map +1 -0
- package/dist/service/node-workspace-coordinator.d.ts +32 -0
- package/dist/service/node-workspace-coordinator.js +81 -0
- package/dist/service/node-workspace-coordinator.js.map +1 -0
- package/dist/service/run-attachment-service.d.ts +37 -0
- package/dist/service/run-attachment-service.js +161 -0
- package/dist/service/run-attachment-service.js.map +1 -0
- package/dist/service/run-domain-state.d.ts +4 -0
- package/dist/service/run-domain-state.js +5 -0
- package/dist/service/run-domain-state.js.map +1 -0
- package/dist/service/run-event-service.d.ts +31 -0
- package/dist/service/run-event-service.js +103 -0
- package/dist/service/run-event-service.js.map +1 -0
- package/dist/service/run-workbench-service.d.ts +27 -0
- package/dist/service/run-workbench-service.js +114 -0
- package/dist/service/run-workbench-service.js.map +1 -0
- package/dist/service/runner-channel-message-service.d.ts +13 -0
- package/dist/service/runner-channel-message-service.js +21 -0
- package/dist/service/runner-channel-message-service.js.map +1 -0
- package/dist/service/runner-interaction-service.d.ts +40 -0
- package/dist/service/runner-interaction-service.js +245 -0
- package/dist/service/runner-interaction-service.js.map +1 -0
- package/dist/service/runner-service.d.ts +43 -0
- package/dist/service/runner-service.js +55 -0
- package/dist/service/runner-service.js.map +1 -0
- package/dist/service/session-catalog-service.d.ts +30 -0
- package/dist/service/session-catalog-service.js +145 -0
- package/dist/service/session-catalog-service.js.map +1 -0
- package/dist/service/session-command-service.d.ts +23 -0
- package/dist/service/session-command-service.js +70 -0
- package/dist/service/session-command-service.js.map +1 -0
- package/dist/service/session-context-service.d.ts +34 -0
- package/dist/service/session-context-service.js +88 -0
- package/dist/service/session-context-service.js.map +1 -0
- package/dist/service/session-domain-state.d.ts +8 -0
- package/dist/service/session-domain-state.js +9 -0
- package/dist/service/session-domain-state.js.map +1 -0
- package/dist/service/session-identity-service.d.ts +24 -0
- package/dist/service/session-identity-service.js +87 -0
- package/dist/service/session-identity-service.js.map +1 -0
- package/dist/service/session-lifecycle-service.d.ts +31 -0
- package/dist/service/session-lifecycle-service.js +236 -0
- package/dist/service/session-lifecycle-service.js.map +1 -0
- package/dist/service/session-message-service.d.ts +33 -0
- package/dist/service/session-message-service.js +158 -0
- package/dist/service/session-message-service.js.map +1 -0
- package/dist/service/session-presentation-service.d.ts +33 -0
- package/dist/service/session-presentation-service.js +37 -0
- package/dist/service/session-presentation-service.js.map +1 -0
- package/dist/service/session-query-service.d.ts +31 -0
- package/dist/service/session-query-service.js +78 -0
- package/dist/service/session-query-service.js.map +1 -0
- package/dist/service/terminal-relay-state.d.ts +6 -0
- package/dist/service/terminal-relay-state.js +4 -0
- package/dist/service/terminal-relay-state.js.map +1 -0
- package/dist/service/terminal-service.d.ts +12 -0
- package/dist/service/terminal-service.js +53 -0
- package/dist/service/terminal-service.js.map +1 -0
- package/dist/service/workbench-event-service.d.ts +21 -0
- package/dist/service/workbench-event-service.js +54 -0
- package/dist/service/workbench-event-service.js.map +1 -0
- package/dist/service/workbench-manifest-service.d.ts +88 -0
- package/dist/service/workbench-manifest-service.js +69 -0
- package/dist/service/workbench-manifest-service.js.map +1 -0
- package/dist/service/workspace-change-service.d.ts +9 -0
- package/dist/service/workspace-change-service.js +86 -0
- package/dist/service/workspace-change-service.js.map +1 -0
- package/dist/service/workspace-domain-state.d.ts +75 -0
- package/dist/service/workspace-domain-state.js +41 -0
- package/dist/service/workspace-domain-state.js.map +1 -0
- package/dist/service/workspace-file-service.d.ts +14 -0
- package/dist/service/workspace-file-service.js +77 -0
- package/dist/service/workspace-file-service.js.map +1 -0
- package/dist/service/workspace-queue-workbench-service.d.ts +55 -0
- package/dist/service/workspace-queue-workbench-service.js +227 -0
- package/dist/service/workspace-queue-workbench-service.js.map +1 -0
- package/dist/service/workspace-service.d.ts +15 -0
- package/dist/service/workspace-service.js +54 -0
- package/dist/service/workspace-service.js.map +1 -0
- package/dist/service/workspace-session-service.d.ts +23 -0
- package/dist/service/workspace-session-service.js +140 -0
- package/dist/service/workspace-session-service.js.map +1 -0
- package/dist/service/workspace-upload-service.d.ts +37 -0
- package/dist/service/workspace-upload-service.js +241 -0
- package/dist/service/workspace-upload-service.js.map +1 -0
- package/dist/service/workspace-watch-service.d.ts +18 -0
- package/dist/service/workspace-watch-service.js +121 -0
- package/dist/service/workspace-watch-service.js.map +1 -0
- package/dist/service/workspace-workbench-service.d.ts +38 -0
- package/dist/service/workspace-workbench-service.js +156 -0
- package/dist/service/workspace-workbench-service.js.map +1 -0
- package/dist/terminal.d.ts +1 -0
- package/dist/terminal.js +1 -1
- package/dist/terminal.js.map +1 -1
- package/dist/util/node-operation-parsers.d.ts +91 -0
- package/dist/util/node-operation-parsers.js +380 -0
- package/dist/util/node-operation-parsers.js.map +1 -0
- package/dist/util/runner-native-session-parsers.d.ts +72 -0
- package/dist/util/runner-native-session-parsers.js +337 -0
- package/dist/util/runner-native-session-parsers.js.map +1 -0
- package/dist/util/secret-environment.d.ts +1 -0
- package/dist/util/secret-environment.js +26 -0
- package/dist/util/secret-environment.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
export class SessionIdentityService {
|
|
2
|
+
options;
|
|
3
|
+
bootstrapIds = new Set();
|
|
4
|
+
waiters = new Map();
|
|
5
|
+
constructor(options) {
|
|
6
|
+
this.options = options;
|
|
7
|
+
}
|
|
8
|
+
markBootstrap(sessionId) {
|
|
9
|
+
this.bootstrapIds.add(sessionId);
|
|
10
|
+
}
|
|
11
|
+
promote(sessionId, nativeSessionId) {
|
|
12
|
+
const current = this.options.runtime.getAgentSession(sessionId);
|
|
13
|
+
this.options.runtime.promoteSessionIdentity(sessionId, nativeSessionId);
|
|
14
|
+
if (current !== undefined)
|
|
15
|
+
this.options.persist(current, nativeSessionId);
|
|
16
|
+
this.options.migrateCommands(sessionId, nativeSessionId);
|
|
17
|
+
this.options.migrateQueue(sessionId, nativeSessionId);
|
|
18
|
+
this.options.migrateRunnerState(sessionId, nativeSessionId);
|
|
19
|
+
this.bootstrapIds.delete(sessionId);
|
|
20
|
+
const waiter = this.waiters.get(sessionId);
|
|
21
|
+
if (waiter !== undefined) {
|
|
22
|
+
clearTimeout(waiter.timer);
|
|
23
|
+
this.waiters.delete(sessionId);
|
|
24
|
+
waiter.resolve(nativeSessionId);
|
|
25
|
+
}
|
|
26
|
+
const session = this.options.runtime.getAgentSession(nativeSessionId);
|
|
27
|
+
if (session === undefined)
|
|
28
|
+
return;
|
|
29
|
+
this.options.emitSession(session);
|
|
30
|
+
for (const run of this.options.runtime.listRunsForSession(nativeSessionId))
|
|
31
|
+
this.options.emitRun(run);
|
|
32
|
+
this.options.emitQueue(session.workspaceId, nativeSessionId);
|
|
33
|
+
for (const turn of this.options.runtime.listConversationTurns({ sessionId: nativeSessionId })
|
|
34
|
+
.turns)
|
|
35
|
+
if (turn.status !== 'QUEUED')
|
|
36
|
+
this.options.emitTurn(turn);
|
|
37
|
+
}
|
|
38
|
+
wait(bootstrapSessionId) {
|
|
39
|
+
const existing = this.waiters.get(bootstrapSessionId);
|
|
40
|
+
if (existing !== undefined)
|
|
41
|
+
return existing.promise;
|
|
42
|
+
let resolveIdentity;
|
|
43
|
+
let rejectIdentity;
|
|
44
|
+
const promise = new Promise((resolve, reject) => {
|
|
45
|
+
resolveIdentity = resolve;
|
|
46
|
+
rejectIdentity = reject;
|
|
47
|
+
});
|
|
48
|
+
const timer = setTimeout(() => {
|
|
49
|
+
this.waiters.delete(bootstrapSessionId);
|
|
50
|
+
rejectIdentity(new Error('SESSION_NATIVE_ID_TIMEOUT'));
|
|
51
|
+
}, 30_000);
|
|
52
|
+
timer.unref();
|
|
53
|
+
this.waiters.set(bootstrapSessionId, {
|
|
54
|
+
promise,
|
|
55
|
+
resolve: resolveIdentity,
|
|
56
|
+
reject: rejectIdentity,
|
|
57
|
+
timer
|
|
58
|
+
});
|
|
59
|
+
return promise;
|
|
60
|
+
}
|
|
61
|
+
reject(sessionId, code) {
|
|
62
|
+
const waiter = this.waiters.get(sessionId);
|
|
63
|
+
if (waiter === undefined)
|
|
64
|
+
return;
|
|
65
|
+
clearTimeout(waiter.timer);
|
|
66
|
+
this.waiters.delete(sessionId);
|
|
67
|
+
waiter.reject(new Error(code));
|
|
68
|
+
queueMicrotask(() => {
|
|
69
|
+
try {
|
|
70
|
+
this.options.runtime.removeAgentSession(sessionId);
|
|
71
|
+
this.bootstrapIds.delete(sessionId);
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
// Runner cleanup may still own the bootstrap Session.
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
dispose() {
|
|
79
|
+
for (const waiter of this.waiters.values()) {
|
|
80
|
+
clearTimeout(waiter.timer);
|
|
81
|
+
waiter.reject(new Error('NODE_STOPPED'));
|
|
82
|
+
}
|
|
83
|
+
this.waiters.clear();
|
|
84
|
+
this.bootstrapIds.clear();
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=session-identity-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-identity-service.js","sourceRoot":"","sources":["../../src/service/session-identity-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { NodeOperationHandler } from '../connector/node-operation-router.js';
|
|
2
|
+
import type { NodeAgentSession, NodeDatabase } from '../database.js';
|
|
3
|
+
import type { NodeRuntimeState } from '../runtime-state.js';
|
|
4
|
+
import type { RunnerRegistry } from '../runner/runner-registry.js';
|
|
5
|
+
import type { NativeSessionProjectionService } from './native-session-projection-service.js';
|
|
6
|
+
import type { SessionIdentityService } from './session-identity-service.js';
|
|
7
|
+
interface SessionLifecycleServiceOptions {
|
|
8
|
+
readonly database: () => NodeDatabase;
|
|
9
|
+
readonly runtime: NodeRuntimeState;
|
|
10
|
+
readonly runners: RunnerRegistry;
|
|
11
|
+
readonly projection: NativeSessionProjectionService;
|
|
12
|
+
readonly identity: SessionIdentityService;
|
|
13
|
+
readonly present: (session: NodeAgentSession) => unknown;
|
|
14
|
+
readonly emitSession: (session: NodeAgentSession) => void;
|
|
15
|
+
readonly execute: (operation: string, data: Record<string, unknown>) => Promise<unknown>;
|
|
16
|
+
readonly interceptedSessionId: (clientMessageId: string) => string | undefined;
|
|
17
|
+
}
|
|
18
|
+
export declare class SessionLifecycleService {
|
|
19
|
+
private readonly options;
|
|
20
|
+
private readonly starts;
|
|
21
|
+
constructor(options: SessionLifecycleServiceOptions);
|
|
22
|
+
operations(): Readonly<Record<string, NodeOperationHandler>>;
|
|
23
|
+
clear(): void;
|
|
24
|
+
private updateMetadata;
|
|
25
|
+
private movePin;
|
|
26
|
+
private create;
|
|
27
|
+
private updateConfiguration;
|
|
28
|
+
private start;
|
|
29
|
+
private startFresh;
|
|
30
|
+
}
|
|
31
|
+
export {};
|
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
import { validSessionOption, validSessionTitle } from '../util/node-operation-parsers.js';
|
|
2
|
+
import { isPlainRecord } from '../util/node-operation-parsers.js';
|
|
3
|
+
export class SessionLifecycleService {
|
|
4
|
+
options;
|
|
5
|
+
starts = new Map();
|
|
6
|
+
constructor(options) {
|
|
7
|
+
this.options = options;
|
|
8
|
+
}
|
|
9
|
+
operations() {
|
|
10
|
+
return {
|
|
11
|
+
'session.metadata.update': (data) => this.updateMetadata(record(data)),
|
|
12
|
+
'session.pin.move': (data) => this.movePin(record(data)),
|
|
13
|
+
'session.create': (data) => this.create(record(data)),
|
|
14
|
+
'session.start': (data) => this.start(record(data)),
|
|
15
|
+
'session.config.update': (data) => this.updateConfiguration(record(data))
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
clear() {
|
|
19
|
+
this.starts.clear();
|
|
20
|
+
}
|
|
21
|
+
async updateMetadata(input) {
|
|
22
|
+
if (typeof input.sessionId !== 'string' ||
|
|
23
|
+
(input.customTitle !== undefined &&
|
|
24
|
+
input.customTitle !== null &&
|
|
25
|
+
typeof input.customTitle !== 'string') ||
|
|
26
|
+
(input.pinned !== undefined && typeof input.pinned !== 'boolean'))
|
|
27
|
+
throw new Error('SESSION_INVALID');
|
|
28
|
+
if (input.customTitle === null || input.customTitle?.trim().length === 0)
|
|
29
|
+
throw new Error('SESSION_TITLE_REQUIRED');
|
|
30
|
+
if (input.customTitle !== undefined && input.customTitle.trim().length > 160)
|
|
31
|
+
throw new Error('SESSION_TITLE_INVALID');
|
|
32
|
+
const current = this.options.runtime.getAgentSession(input.sessionId) ??
|
|
33
|
+
(await this.options.projection.createMetadataProjection(input.sessionId));
|
|
34
|
+
if (current === undefined)
|
|
35
|
+
throw new Error('SESSION_NOT_FOUND');
|
|
36
|
+
const nativeCodexRename = this.options.runners.require(current.runner).usesRunnerTitleForRename() &&
|
|
37
|
+
current.externalSessionId !== null &&
|
|
38
|
+
input.customTitle !== undefined;
|
|
39
|
+
await this.options.projection.rename(current, {
|
|
40
|
+
...(input.customTitle === undefined ? {} : { title: input.customTitle }),
|
|
41
|
+
...(input.pinned === undefined ? {} : { pinned: input.pinned })
|
|
42
|
+
});
|
|
43
|
+
const metadataTitle = nativeCodexRename ? null : input.customTitle;
|
|
44
|
+
const updated = this.options.runtime.updateSessionMetadata({
|
|
45
|
+
sessionId: current.id,
|
|
46
|
+
...(metadataTitle === undefined ? {} : { customTitle: metadataTitle }),
|
|
47
|
+
...(input.pinned === undefined ? {} : { pinned: input.pinned })
|
|
48
|
+
});
|
|
49
|
+
return {
|
|
50
|
+
session: this.options.present(nativeCodexRename
|
|
51
|
+
? this.options.runtime.setRunnerTitleFromNative(updated.id, input.customTitle ?? '')
|
|
52
|
+
: updated)
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
movePin(input) {
|
|
56
|
+
if (typeof input.sessionId !== 'string' ||
|
|
57
|
+
(input.direction !== 'up' && input.direction !== 'down'))
|
|
58
|
+
throw new Error('SESSION_PIN_MOVE_INVALID');
|
|
59
|
+
this.options.database().movePinnedSession(input.sessionId, input.direction);
|
|
60
|
+
return { moved: true };
|
|
61
|
+
}
|
|
62
|
+
create(input) {
|
|
63
|
+
const runner = this.options.runners.product(input.runner);
|
|
64
|
+
if (typeof input.workspaceId !== 'string' ||
|
|
65
|
+
runner === undefined ||
|
|
66
|
+
typeof input.cwd !== 'string' ||
|
|
67
|
+
input.cwd.length === 0 ||
|
|
68
|
+
(input.externalSessionId !== undefined && typeof input.externalSessionId !== 'string') ||
|
|
69
|
+
!validSessionTitle(input.title) ||
|
|
70
|
+
!validSessionOption(input.model) ||
|
|
71
|
+
!validSessionOption(input.effort) ||
|
|
72
|
+
!validSessionOption(input.access))
|
|
73
|
+
throw new Error('SESSION_INVALID');
|
|
74
|
+
const database = this.options.database();
|
|
75
|
+
const saved = database
|
|
76
|
+
.getRunnerDefaults()
|
|
77
|
+
.find((value) => value.runner === runner.name && this.options.runners.supportsConfiguration(value));
|
|
78
|
+
const fallback = runner.defaultConfiguration();
|
|
79
|
+
const configuration = {
|
|
80
|
+
runner: runner.name,
|
|
81
|
+
model: typeof input.model === 'string' ? input.model : (saved?.model ?? fallback.model),
|
|
82
|
+
effort: typeof input.effort === 'string' ? input.effort : (saved?.effort ?? fallback.effort),
|
|
83
|
+
access: typeof input.access === 'string' ? input.access : (saved?.access ?? fallback.access)
|
|
84
|
+
};
|
|
85
|
+
if (!this.options.runners.supportsConfiguration(configuration))
|
|
86
|
+
throw new Error('RUNNER_CONFIGURATION_UNSUPPORTED');
|
|
87
|
+
const session = this.options.runtime.createAgentSession({
|
|
88
|
+
workspaceId: input.workspaceId,
|
|
89
|
+
runner: runner.name,
|
|
90
|
+
cwd: input.cwd,
|
|
91
|
+
...(typeof input.externalSessionId === 'string'
|
|
92
|
+
? { externalSessionId: input.externalSessionId }
|
|
93
|
+
: {}),
|
|
94
|
+
model: configuration.model,
|
|
95
|
+
effort: configuration.effort,
|
|
96
|
+
access: configuration.access,
|
|
97
|
+
...(typeof input.title === 'string' ? { title: input.title } : {})
|
|
98
|
+
});
|
|
99
|
+
if (input.bootstrapOnly === true)
|
|
100
|
+
this.options.identity.markBootstrap(session.id);
|
|
101
|
+
database.saveRunnerDefaults(configuration);
|
|
102
|
+
if (input.bootstrapOnly !== true)
|
|
103
|
+
this.options.emitSession(session);
|
|
104
|
+
return { session: this.options.present(session) };
|
|
105
|
+
}
|
|
106
|
+
async updateConfiguration(input) {
|
|
107
|
+
if (typeof input.sessionId !== 'string' ||
|
|
108
|
+
typeof input.model !== 'string' ||
|
|
109
|
+
typeof input.effort !== 'string' ||
|
|
110
|
+
typeof input.access !== 'string')
|
|
111
|
+
throw new Error('SESSION_INVALID');
|
|
112
|
+
const current = this.options.runtime.getAgentSession(input.sessionId) ??
|
|
113
|
+
(await this.options.projection.createMetadataProjection(input.sessionId));
|
|
114
|
+
if (current === undefined)
|
|
115
|
+
throw new Error('SESSION_NOT_FOUND');
|
|
116
|
+
const configuration = {
|
|
117
|
+
runner: current.runner,
|
|
118
|
+
model: input.model,
|
|
119
|
+
effort: input.effort,
|
|
120
|
+
access: input.access
|
|
121
|
+
};
|
|
122
|
+
if (!this.options.runners.supportsConfiguration(configuration))
|
|
123
|
+
throw new Error('RUNNER_CONFIGURATION_UNSUPPORTED');
|
|
124
|
+
const session = this.options.runtime.updateAgentSessionConfiguration({
|
|
125
|
+
sessionId: current.id,
|
|
126
|
+
model: input.model,
|
|
127
|
+
effort: input.effort,
|
|
128
|
+
access: input.access
|
|
129
|
+
});
|
|
130
|
+
if (session.externalSessionId !== null)
|
|
131
|
+
this.options.database().saveNativeSessionMetadata({
|
|
132
|
+
runner: session.runner,
|
|
133
|
+
externalSessionId: session.externalSessionId,
|
|
134
|
+
workspaceId: session.workspaceId,
|
|
135
|
+
model: session.model,
|
|
136
|
+
effort: session.effort,
|
|
137
|
+
access: session.access
|
|
138
|
+
});
|
|
139
|
+
this.options.emitSession(session);
|
|
140
|
+
return { session: this.options.present(session) };
|
|
141
|
+
}
|
|
142
|
+
async start(input) {
|
|
143
|
+
if (typeof input.clientMessageId !== 'string' ||
|
|
144
|
+
input.clientMessageId.length === 0 ||
|
|
145
|
+
typeof input.content !== 'string' ||
|
|
146
|
+
input.content.length === 0)
|
|
147
|
+
throw new Error('MESSAGE_INVALID');
|
|
148
|
+
if (input.deferredCommands !== undefined &&
|
|
149
|
+
(!Array.isArray(input.deferredCommands) ||
|
|
150
|
+
input.deferredCommands.some((value) => !isPlainRecord(value) ||
|
|
151
|
+
typeof value.commandId !== 'string' ||
|
|
152
|
+
typeof value.input !== 'string')))
|
|
153
|
+
throw new Error('RUNNER_COMMAND_INVALID');
|
|
154
|
+
const startKey = `${input.workspaceId}\u0000${input.runner}\u0000${input.clientMessageId}`;
|
|
155
|
+
const existing = this.starts.get(startKey);
|
|
156
|
+
if (existing !== undefined)
|
|
157
|
+
return existing;
|
|
158
|
+
const start = this.startFresh(input);
|
|
159
|
+
this.starts.set(startKey, start);
|
|
160
|
+
try {
|
|
161
|
+
const result = await start;
|
|
162
|
+
while (this.starts.size > 512) {
|
|
163
|
+
const oldest = this.starts.keys().next().value;
|
|
164
|
+
if (oldest === undefined || oldest === startKey)
|
|
165
|
+
break;
|
|
166
|
+
this.starts.delete(oldest);
|
|
167
|
+
}
|
|
168
|
+
return result;
|
|
169
|
+
}
|
|
170
|
+
catch (error) {
|
|
171
|
+
this.starts.delete(startKey);
|
|
172
|
+
throw error;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
async startFresh(input) {
|
|
176
|
+
const created = (await this.options.execute('session.create', {
|
|
177
|
+
...input,
|
|
178
|
+
bootstrapOnly: true
|
|
179
|
+
}));
|
|
180
|
+
const bootstrapId = created.session.id;
|
|
181
|
+
const identity = this.options.identity.wait(bootstrapId);
|
|
182
|
+
try {
|
|
183
|
+
if (Array.isArray(input.deferredCommands))
|
|
184
|
+
for (const value of input.deferredCommands)
|
|
185
|
+
if (isPlainRecord(value))
|
|
186
|
+
await this.options.execute('session.command.execute', {
|
|
187
|
+
sessionId: bootstrapId,
|
|
188
|
+
commandId: value.commandId,
|
|
189
|
+
input: value.input,
|
|
190
|
+
...(input.secretEnvironment === undefined
|
|
191
|
+
? {}
|
|
192
|
+
: { secretEnvironment: input.secretEnvironment })
|
|
193
|
+
});
|
|
194
|
+
const interceptedId = this.options.interceptedSessionId(input.clientMessageId);
|
|
195
|
+
const messageSessionId = interceptedId ?? bootstrapId;
|
|
196
|
+
if (interceptedId !== undefined)
|
|
197
|
+
this.options.identity.promote(bootstrapId, interceptedId);
|
|
198
|
+
const message = (await this.options.execute('session.message', {
|
|
199
|
+
sessionId: messageSessionId,
|
|
200
|
+
clientMessageId: input.clientMessageId,
|
|
201
|
+
content: input.content,
|
|
202
|
+
...(input.secretEnvironment === undefined
|
|
203
|
+
? {}
|
|
204
|
+
: { secretEnvironment: input.secretEnvironment }),
|
|
205
|
+
...(input.attachmentIds === undefined ? {} : { attachmentIds: input.attachmentIds })
|
|
206
|
+
}));
|
|
207
|
+
const nativeSessionId = await identity;
|
|
208
|
+
const session = this.options.runtime.getAgentSession(nativeSessionId);
|
|
209
|
+
const run = this.options.runtime.getRun(message.run.id);
|
|
210
|
+
if (session === undefined || run === undefined)
|
|
211
|
+
throw new Error('SESSION_START_FAILED');
|
|
212
|
+
return {
|
|
213
|
+
session: this.options.present(session),
|
|
214
|
+
run,
|
|
215
|
+
delivery: message.delivery,
|
|
216
|
+
idempotent: message.idempotent
|
|
217
|
+
};
|
|
218
|
+
}
|
|
219
|
+
catch (error) {
|
|
220
|
+
this.options.identity.reject(bootstrapId, 'SESSION_START_FAILED');
|
|
221
|
+
const promotedSessionId = await identity.catch(() => undefined);
|
|
222
|
+
if (promotedSessionId !== undefined)
|
|
223
|
+
try {
|
|
224
|
+
this.options.runtime.removeAgentSession(promotedSessionId);
|
|
225
|
+
}
|
|
226
|
+
catch {
|
|
227
|
+
// A started Run owns the promoted Session and finishes normally.
|
|
228
|
+
}
|
|
229
|
+
throw error;
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
function record(data) {
|
|
234
|
+
return data !== null && typeof data === 'object' ? data : {};
|
|
235
|
+
}
|
|
236
|
+
//# sourceMappingURL=session-lifecycle-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-lifecycle-service.js","sourceRoot":"","sources":["../../src/service/session-lifecycle-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAgBlE,MAAM,OAAO,uBAAuB;IAGL;IAFZ,MAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE9D,YAA6B,OAAuC;QAAvC,YAAO,GAAP,OAAO,CAAgC;IAAG,CAAC;IAExE,UAAU;QACR,OAAO;YACL,yBAAyB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtE,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxD,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrD,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnD,uBAAuB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC1E,CAAC;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAA8B;QACzD,IACE,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;YACnC,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS;gBAC9B,KAAK,CAAC,WAAW,KAAK,IAAI;gBAC1B,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC;YACxC,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC;YAEjE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;YACtE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,GAAG;YAC1E,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC;YACrD,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAChE,MAAM,iBAAiB,GACrB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,wBAAwB,EAAE;YACvE,OAAO,CAAC,iBAAiB,KAAK,IAAI;YAClC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC;QAClC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE;YAC5C,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAqB,EAAE,CAAC;YAClF,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAiB,EAAE,CAAC;SAC3E,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACzD,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;YACtE,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAiB,EAAE,CAAC;SAC3E,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAC3B,iBAAiB;gBACf,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC;gBACpF,CAAC,CAAC,OAAO,CACZ;SACF,CAAC;IACJ,CAAC;IAEO,OAAO,CAAC,KAA8B;QAC5C,IACE,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;YACnC,CAAC,KAAK,CAAC,SAAS,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,MAAM,CAAC;YAExD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAC5E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAEO,MAAM,CAAC,KAA8B;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1D,IACE,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;YACrC,MAAM,KAAK,SAAS;YACpB,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ;YAC7B,KAAK,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC;YACtB,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,iBAAiB,KAAK,QAAQ,CAAC;YACtF,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC;YAChC,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC;YACjC,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC;YAEjC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,QAAQ;aACnB,iBAAiB,EAAE;aACnB,IAAI,CACH,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAC7F,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC/C,MAAM,aAAa,GAA+B;YAChD,MAAM,EAAE,MAAM,CAAC,IAAI;YACnB,KAAK,EAAE,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC;YACvF,MAAM,EAAE,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;YAC5F,MAAM,EAAE,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;SAC7F,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC;YACtD,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,MAAM,EAAE,MAAM,CAAC,IAAI;YACnB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,GAAG,CAAC,OAAO,KAAK,CAAC,iBAAiB,KAAK,QAAQ;gBAC7C,CAAC,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC;YACP,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,GAAG,CAAC,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,aAAa,KAAK,IAAI;YAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,aAAa,KAAK,IAAI;YAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACpE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IACpD,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,KAA8B;QAC9D,IACE,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;YACnC,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;YAC/B,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;YAChC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;YAEhC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC;YACrD,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAChE,MAAM,aAAa,GAA+B;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC;YACnE,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,iBAAiB,KAAK,IAAI;YACpC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,yBAAyB,CAAC;gBAChD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;QACL,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IACpD,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,KAA8B;QAChD,IACE,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ;YACzC,KAAK,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC;YAClC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;YACjC,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAE1B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,IACE,KAAK,CAAC,gBAAgB,KAAK,SAAS;YACpC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;gBACrC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CACzB,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,aAAa,CAAC,KAAK,CAAC;oBACrB,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;oBACnC,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAClC,CAAC;YAEJ,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,WAAW,SAAS,KAAK,CAAC,MAAM,SAAS,KAAK,CAAC,eAAe,EAAE,CAAC;QAC3F,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAC;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAA2B,CAAC;gBACrE,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ;oBAAE,MAAM;gBACvD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAA8B;QACrD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE;YAC5D,GAAG,KAAK;YACR,aAAa,EAAE,IAAI;SACpB,CAAC,CAA2C,CAAC;QAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzD,IAAI,CAAC;YACH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;gBACvC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,gBAAgB;oBACxC,IAAI,aAAa,CAAC,KAAK,CAAC;wBACtB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,yBAAyB,EAAE;4BACpD,SAAS,EAAE,WAAW;4BACtB,SAAS,EAAE,KAAK,CAAC,SAAS;4BAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,GAAG,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS;gCACvC,CAAC,CAAC,EAAE;gCACJ,CAAC,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC;yBACpD,CAAC,CAAC;YACT,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,eAAyB,CAAC,CAAC;YACzF,MAAM,gBAAgB,GAAG,aAAa,IAAI,WAAW,CAAC;YACtD,IAAI,aAAa,KAAK,SAAS;gBAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;YAC3F,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE;gBAC7D,SAAS,EAAE,gBAAgB;gBAC3B,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,CAAC,KAAK,CAAC,iBAAiB,KAAK,SAAS;oBACvC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC;gBACnD,GAAG,CAAC,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC;aACrF,CAAC,CAID,CAAC;YACF,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;YACtE,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACxD,IAAI,OAAO,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACxF,OAAO;gBACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;gBACtC,GAAG;gBACH,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;YAClE,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAChE,IAAI,iBAAiB,KAAK,SAAS;gBACjC,IAAI,CAAC;oBACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;gBAC7D,CAAC;gBAAC,MAAM,CAAC;oBACP,iEAAiE;gBACnE,CAAC;YACH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAED,SAAS,MAAM,CAAC,IAAa;IAC3B,OAAO,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAE,IAAgC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5F,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { NodeOperationHandler } from '../connector/node-operation-router.js';
|
|
2
|
+
import type { NodeAgentSession } from '../database.js';
|
|
3
|
+
import type { NodeRuntimeState } from '../runtime-state.js';
|
|
4
|
+
import type { CommandStateStore } from '../runner-command-engine.js';
|
|
5
|
+
import type { RunnerRegistry } from '../runner/runner-registry.js';
|
|
6
|
+
import type { WorkspaceUploadService } from './workspace-upload-service.js';
|
|
7
|
+
import type { RunnerImageAttachment, RunAttachmentService } from './run-attachment-service.js';
|
|
8
|
+
import type { RunnerInteractionService } from './runner-interaction-service.js';
|
|
9
|
+
import type { WorkspaceQueueWorkbenchService } from './workspace-queue-workbench-service.js';
|
|
10
|
+
interface SessionMessageServiceOptions {
|
|
11
|
+
readonly runtime: NodeRuntimeState;
|
|
12
|
+
readonly uploads: WorkspaceUploadService;
|
|
13
|
+
readonly attachments: RunAttachmentService;
|
|
14
|
+
readonly commands: CommandStateStore;
|
|
15
|
+
readonly queue: WorkspaceQueueWorkbenchService<RunnerImageAttachment>;
|
|
16
|
+
readonly interaction: RunnerInteractionService;
|
|
17
|
+
readonly runners: RunnerRegistry;
|
|
18
|
+
readonly resolve: (sessionId: string) => Promise<NodeAgentSession>;
|
|
19
|
+
readonly present: (session: NodeAgentSession) => unknown;
|
|
20
|
+
readonly emitSession: (session: NodeAgentSession) => void;
|
|
21
|
+
readonly emitQueue: (workspaceId: string, sessionId: string) => void;
|
|
22
|
+
readonly channelToken: (sessionId: string) => string | undefined;
|
|
23
|
+
}
|
|
24
|
+
export declare class SessionMessageService {
|
|
25
|
+
private readonly options;
|
|
26
|
+
constructor(options: SessionMessageServiceOptions);
|
|
27
|
+
operations(): Readonly<Record<string, NodeOperationHandler>>;
|
|
28
|
+
private message;
|
|
29
|
+
private persistAttachments;
|
|
30
|
+
private channelMessage;
|
|
31
|
+
private channelToken;
|
|
32
|
+
}
|
|
33
|
+
export {};
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
import { isImageAttachment, isRunnerImageAttachment, parseComposerAttachmentIds, parseMessageAttachments, sessionTitleFromFirstMessage, withNonImageAttachmentPrompt } from '../util/node-operation-parsers.js';
|
|
2
|
+
import { parseSecretEnvironment } from '../util/secret-environment.js';
|
|
3
|
+
export class SessionMessageService {
|
|
4
|
+
options;
|
|
5
|
+
constructor(options) {
|
|
6
|
+
this.options = options;
|
|
7
|
+
}
|
|
8
|
+
operations() {
|
|
9
|
+
return {
|
|
10
|
+
'session.message': (data) => this.message(record(data)),
|
|
11
|
+
'session.channel.message': (data) => this.channelMessage(record(data)),
|
|
12
|
+
'session.channel.token': (data) => this.channelToken(record(data))
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
async message(input) {
|
|
16
|
+
if (typeof input.sessionId !== 'string' ||
|
|
17
|
+
typeof input.clientMessageId !== 'string' ||
|
|
18
|
+
input.clientMessageId.length === 0 ||
|
|
19
|
+
typeof input.content !== 'string' ||
|
|
20
|
+
input.content.length === 0)
|
|
21
|
+
throw new Error('MESSAGE_INVALID');
|
|
22
|
+
const inlineAttachments = parseMessageAttachments(input.attachments);
|
|
23
|
+
const secretEnvironment = parseSecretEnvironment(input.secretEnvironment);
|
|
24
|
+
const attachmentIds = parseComposerAttachmentIds(input.attachmentIds);
|
|
25
|
+
if (inlineAttachments.length > 0 && attachmentIds.length > 0)
|
|
26
|
+
throw new Error('MESSAGE_ATTACHMENTS_INVALID');
|
|
27
|
+
const session = this.options.runtime.setTemporaryTitleIfMissing((await this.options.resolve(input.sessionId)).id, sessionTitleFromFirstMessage(input.content));
|
|
28
|
+
this.options.emitSession(session);
|
|
29
|
+
const intent = input.deliveryIntent;
|
|
30
|
+
if (intent !== undefined &&
|
|
31
|
+
intent !== 'SEND' &&
|
|
32
|
+
intent !== 'QUEUE' &&
|
|
33
|
+
intent !== 'REPLACE_CURRENT')
|
|
34
|
+
throw new Error('MESSAGE_INVALID');
|
|
35
|
+
const existing = this.options.runtime.findMessageRun(session.id, input.clientMessageId);
|
|
36
|
+
if (existing !== undefined)
|
|
37
|
+
return {
|
|
38
|
+
session: this.options.present(session),
|
|
39
|
+
run: existing,
|
|
40
|
+
delivery: this.options.runtime.isQueuedRun(existing.id) ? 'QUEUED' : 'STARTED',
|
|
41
|
+
idempotent: true
|
|
42
|
+
};
|
|
43
|
+
const uploaded = await this.options.uploads.resolve(session.workspaceId, attachmentIds);
|
|
44
|
+
const attachments = attachmentIds.length === 0
|
|
45
|
+
? inlineAttachments
|
|
46
|
+
: uploaded.map((attachment) => attachment.attachment);
|
|
47
|
+
const imageAttachments = attachments.filter(isImageAttachment);
|
|
48
|
+
const runnerImageAttachments = attachments.filter(isRunnerImageAttachment);
|
|
49
|
+
const active = this.options.runtime
|
|
50
|
+
.listRunsForSession(session.id)
|
|
51
|
+
.find((run) => run.status === 'STARTING' || run.status === 'RUNNING');
|
|
52
|
+
const replaceCurrentRun = intent === 'REPLACE_CURRENT' ? active : undefined;
|
|
53
|
+
const queueWasPaused = this.options.runtime.sessionQueue(session.id).paused;
|
|
54
|
+
const queuedBeforeCreate = this.options.runtime.hasActiveSessionLease(session.id) || intent === 'QUEUE';
|
|
55
|
+
const created = this.options.runtime.createMessageRun({
|
|
56
|
+
sessionId: session.id,
|
|
57
|
+
clientMessageId: input.clientMessageId,
|
|
58
|
+
content: input.content,
|
|
59
|
+
...(attachments.length === 0 ? {} : { attachments })
|
|
60
|
+
});
|
|
61
|
+
if (!created.created)
|
|
62
|
+
return {
|
|
63
|
+
session: this.options.present(session),
|
|
64
|
+
run: created.run,
|
|
65
|
+
delivery: this.options.runtime.isQueuedRun(created.run.id) ? 'QUEUED' : 'STARTED',
|
|
66
|
+
idempotent: true
|
|
67
|
+
};
|
|
68
|
+
this.options.attachments.cache(created.run.id, imageAttachments);
|
|
69
|
+
let attachmentPaths;
|
|
70
|
+
try {
|
|
71
|
+
attachmentPaths = await this.persistAttachments(session, created.run.id, attachmentIds, attachments, uploaded);
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
this.options.runtime.deleteQueuedRun(created.run.id);
|
|
75
|
+
this.options.attachments.clear(created.run.id);
|
|
76
|
+
throw error;
|
|
77
|
+
}
|
|
78
|
+
const runnerInput = withNonImageAttachmentPrompt(input.content, attachmentPaths);
|
|
79
|
+
this.options.runtime.updateQueuedMessage(created.run.id, runnerInput);
|
|
80
|
+
const planActive = this.options.commands
|
|
81
|
+
.list(session.id)
|
|
82
|
+
.some((state) => state.commandId === 'plan');
|
|
83
|
+
this.options.queue.remember({
|
|
84
|
+
runId: created.run.id,
|
|
85
|
+
sessionId: created.run.sessionId,
|
|
86
|
+
workspaceId: created.run.workspaceId,
|
|
87
|
+
runner: created.run.runner,
|
|
88
|
+
input: this.options.runners
|
|
89
|
+
.require(created.run.runner)
|
|
90
|
+
.prepareMessageInput(runnerInput, planActive ? 'plan' : 'default'),
|
|
91
|
+
attachments: runnerImageAttachments,
|
|
92
|
+
attachmentPaths,
|
|
93
|
+
cwd: session.cwd,
|
|
94
|
+
externalSessionId: session.externalSessionId,
|
|
95
|
+
model: session.model,
|
|
96
|
+
effort: session.effort,
|
|
97
|
+
access: session.access,
|
|
98
|
+
collaborationMode: planActive ? 'plan' : 'default',
|
|
99
|
+
secretEnvironment,
|
|
100
|
+
...(this.options.runners.require(created.run.runner).serviceTier() === 'fast'
|
|
101
|
+
? { serviceTier: 'fast' }
|
|
102
|
+
: {})
|
|
103
|
+
});
|
|
104
|
+
if (queueWasPaused && active === undefined && intent !== 'QUEUE')
|
|
105
|
+
this.options.runtime.prioritizeQueuedRun(created.run.id);
|
|
106
|
+
if (!queueWasPaused || intent !== 'QUEUE')
|
|
107
|
+
this.options.runtime.resumeSessionQueue(session.id);
|
|
108
|
+
this.options.emitQueue(session.workspaceId, session.id);
|
|
109
|
+
if (replaceCurrentRun !== undefined)
|
|
110
|
+
this.options.queue.replace(created.run.id, replaceCurrentRun.id);
|
|
111
|
+
else if (intent !== 'QUEUE' || !queuedBeforeCreate)
|
|
112
|
+
this.options.queue.schedule(session.id);
|
|
113
|
+
return {
|
|
114
|
+
session: this.options.present(session),
|
|
115
|
+
run: created.run,
|
|
116
|
+
delivery: replaceCurrentRun !== undefined ? 'RESTARTING' : queuedBeforeCreate ? 'QUEUED' : 'STARTED',
|
|
117
|
+
idempotent: false
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
async persistAttachments(session, runId, attachmentIds, attachments, uploaded) {
|
|
121
|
+
return [
|
|
122
|
+
...uploaded
|
|
123
|
+
.filter(({ attachment }) => !isRunnerImageAttachment(attachment))
|
|
124
|
+
.map(({ path }) => path),
|
|
125
|
+
...(await this.options.attachments.persistFiles(session.cwd, runId, attachmentIds.length === 0
|
|
126
|
+
? attachments.filter((attachment) => !isRunnerImageAttachment(attachment))
|
|
127
|
+
: []))
|
|
128
|
+
];
|
|
129
|
+
}
|
|
130
|
+
channelMessage(input) {
|
|
131
|
+
if (typeof input.sessionId !== 'string' ||
|
|
132
|
+
typeof input.token !== 'string' ||
|
|
133
|
+
typeof input.clientMessageId !== 'string' ||
|
|
134
|
+
typeof input.content !== 'string' ||
|
|
135
|
+
input.content.length === 0)
|
|
136
|
+
throw new Error('MESSAGE_INVALID');
|
|
137
|
+
const session = this.options.runtime.getAgentSession(input.sessionId);
|
|
138
|
+
if (session === undefined || session.channelToken !== input.token)
|
|
139
|
+
throw new Error('SESSION_CHANNEL_UNAVAILABLE');
|
|
140
|
+
return {
|
|
141
|
+
delivery: this.options.interaction.deliverChannel(session.runner, input.sessionId, input.clientMessageId, 'admin', input.token, input.content)
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
channelToken(input) {
|
|
145
|
+
if (typeof input.sessionId !== 'string')
|
|
146
|
+
throw new Error('SESSION_INVALID');
|
|
147
|
+
const token = this.options.channelToken(input.sessionId);
|
|
148
|
+
if (token === undefined)
|
|
149
|
+
throw new Error('SESSION_CHANNEL_UNAVAILABLE');
|
|
150
|
+
return { token };
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
function record(value) {
|
|
154
|
+
if (value === null || typeof value !== 'object' || Array.isArray(value))
|
|
155
|
+
return {};
|
|
156
|
+
return value;
|
|
157
|
+
}
|
|
158
|
+
//# sourceMappingURL=session-message-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-message-service.js","sourceRoot":"","sources":["../../src/service/session-message-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { NodeCapabilities, SessionActivityState, RunnerCommandState } from '@myagentroam/protocol';
|
|
2
|
+
import type { CodexSessionControl } from '../codex-app-server.js';
|
|
3
|
+
import type { NodeAgentSession, NodeDatabase } from '../database.js';
|
|
4
|
+
import type { NodeRuntimeState } from '../runtime-state.js';
|
|
5
|
+
import type { CommandStateStore } from '../runner-command-engine.js';
|
|
6
|
+
import type { RunnerRegistry } from '../runner/runner-registry.js';
|
|
7
|
+
export type PresentedSession = NodeAgentSession & {
|
|
8
|
+
readonly control: CodexSessionControl;
|
|
9
|
+
readonly activity: SessionActivityState;
|
|
10
|
+
readonly runtime: {
|
|
11
|
+
readonly level: CodexSessionControl['level'];
|
|
12
|
+
readonly capabilities: readonly string[];
|
|
13
|
+
readonly reasonCode: string | null;
|
|
14
|
+
};
|
|
15
|
+
readonly commandStates: readonly RunnerCommandState[];
|
|
16
|
+
};
|
|
17
|
+
interface SessionPresentationServiceOptions {
|
|
18
|
+
readonly database: () => NodeDatabase | undefined;
|
|
19
|
+
readonly runtime: NodeRuntimeState;
|
|
20
|
+
readonly commands: CommandStateStore;
|
|
21
|
+
readonly runners: RunnerRegistry;
|
|
22
|
+
readonly capabilities: () => NodeCapabilities;
|
|
23
|
+
readonly hasManagedActiveRun: (session: NodeAgentSession) => boolean;
|
|
24
|
+
readonly externalActivity: (sessionId: string) => SessionActivityState | undefined;
|
|
25
|
+
readonly projectionForNative: (session: NodeAgentSession) => NodeAgentSession | undefined;
|
|
26
|
+
}
|
|
27
|
+
export declare class SessionPresentationService {
|
|
28
|
+
private readonly options;
|
|
29
|
+
constructor(options: SessionPresentationServiceOptions);
|
|
30
|
+
present(session: NodeAgentSession): PresentedSession;
|
|
31
|
+
presentDiscovered(sessions: readonly NodeAgentSession[]): readonly PresentedSession[];
|
|
32
|
+
}
|
|
33
|
+
export {};
|