@moxt-ai/mobius 0.0.305 → 0.0.307
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/acp/adapter/adapter-registry.d.ts +10 -0
- package/dist/acp/adapter/adapter-registry.d.ts.map +1 -0
- package/dist/acp/adapter/adapter-registry.js +24 -0
- package/dist/acp/adapter/adapter-registry.js.map +1 -0
- package/dist/acp/adapter/agent-initialization.d.ts +27 -0
- package/dist/acp/adapter/agent-initialization.d.ts.map +1 -0
- package/dist/acp/adapter/agent-initialization.js +55 -0
- package/dist/acp/adapter/agent-initialization.js.map +1 -0
- package/dist/acp/adapter/claude/adapter.d.ts +32 -2
- package/dist/acp/adapter/claude/adapter.d.ts.map +1 -1
- package/dist/acp/adapter/claude/adapter.js +13 -1
- package/dist/acp/adapter/claude/adapter.js.map +1 -1
- package/dist/acp/adapter/codex/adapter.d.ts +32 -2
- package/dist/acp/adapter/codex/adapter.d.ts.map +1 -1
- package/dist/acp/adapter/codex/adapter.js +25 -3
- package/dist/acp/adapter/codex/adapter.js.map +1 -1
- package/dist/acp/adapter/pi/adapter.d.ts +32 -2
- package/dist/acp/adapter/pi/adapter.d.ts.map +1 -1
- package/dist/acp/adapter/pi/adapter.js +13 -1
- package/dist/acp/adapter/pi/adapter.js.map +1 -1
- package/dist/acp/adapter/preview-event-cache.d.ts +8 -0
- package/dist/acp/adapter/preview-event-cache.d.ts.map +1 -0
- package/dist/acp/adapter/preview-event-cache.js +37 -0
- package/dist/acp/adapter/preview-event-cache.js.map +1 -0
- package/dist/acp/adapter/query-processes.d.ts +18 -0
- package/dist/acp/adapter/query-processes.d.ts.map +1 -0
- package/dist/{session/process/agent-query-processes.js → acp/adapter/query-processes.js} +28 -32
- package/dist/acp/adapter/query-processes.js.map +1 -0
- package/dist/acp/adapter/query-session.d.ts +16 -0
- package/dist/acp/adapter/query-session.d.ts.map +1 -0
- package/dist/acp/adapter/query-session.js +89 -0
- package/dist/acp/adapter/query-session.js.map +1 -0
- package/dist/acp/adapter/registry.d.ts +1 -1
- package/dist/acp/adapter/registry.d.ts.map +1 -1
- package/dist/acp/adapter/registry.js +6 -6
- package/dist/acp/adapter/registry.js.map +1 -1
- package/dist/acp/adapter/session-events.d.ts +79 -0
- package/dist/acp/adapter/session-events.d.ts.map +1 -0
- package/dist/acp/adapter/session-events.js +149 -0
- package/dist/acp/adapter/session-events.js.map +1 -0
- package/dist/acp/content/content-externalizer.d.ts.map +1 -1
- package/dist/acp/content/content-externalizer.js +31 -1
- package/dist/acp/content/content-externalizer.js.map +1 -1
- package/dist/acp/native-history/preview-contract.d.ts +21 -22
- package/dist/acp/native-history/preview-contract.d.ts.map +1 -1
- package/dist/agent/runtime-agents.d.ts +12 -0
- package/dist/agent/runtime-agents.d.ts.map +1 -0
- package/dist/agent/runtime-agents.js +19 -0
- package/dist/agent/runtime-agents.js.map +1 -0
- package/dist/cli.js +9626 -9125
- package/dist/cli.js.map +4 -4
- package/dist/runtime/command/agent-settings-discovery.d.ts +2 -0
- package/dist/runtime/command/agent-settings-discovery.d.ts.map +1 -1
- package/dist/runtime/command/agent-settings-discovery.js +1 -2
- package/dist/runtime/command/agent-settings-discovery.js.map +1 -1
- package/dist/runtime/command/context.d.ts +2 -0
- package/dist/runtime/command/context.d.ts.map +1 -1
- package/dist/runtime/command/registry/agent-settings.d.ts.map +1 -1
- package/dist/runtime/command/registry/agent-settings.js +1 -0
- package/dist/runtime/command/registry/agent-settings.js.map +1 -1
- package/dist/runtime/command/registry/history.d.ts +3 -2
- package/dist/runtime/command/registry/history.d.ts.map +1 -1
- package/dist/runtime/command/registry/history.js +6 -7
- package/dist/runtime/command/registry/history.js.map +1 -1
- package/dist/runtime/command/registry/prompt.d.ts.map +1 -1
- package/dist/runtime/command/registry/prompt.js +1 -2
- package/dist/runtime/command/registry/prompt.js.map +1 -1
- package/dist/runtime/command/registry/session.d.ts +5 -4
- package/dist/runtime/command/registry/session.d.ts.map +1 -1
- package/dist/runtime/command/registry/session.js +16 -18
- package/dist/runtime/command/registry/session.js.map +1 -1
- package/dist/runtime/config.d.ts +3 -1
- package/dist/runtime/config.d.ts.map +1 -1
- package/dist/runtime/config.js +4 -1
- package/dist/runtime/config.js.map +1 -1
- package/dist/runtime/relay/connect.d.ts +6 -1
- package/dist/runtime/relay/connect.d.ts.map +1 -1
- package/dist/runtime/relay/connect.js +20 -2
- package/dist/runtime/relay/connect.js.map +1 -1
- package/dist/runtime/relay/run-relay-connection.d.ts +3 -1
- package/dist/runtime/relay/run-relay-connection.d.ts.map +1 -1
- package/dist/runtime/relay/run-relay-connection.js +5 -2
- package/dist/runtime/relay/run-relay-connection.js.map +1 -1
- package/dist/runtime/relay/session-event-publisher.d.ts.map +1 -1
- package/dist/runtime/relay/session-event-publisher.js +37 -2
- package/dist/runtime/relay/session-event-publisher.js.map +1 -1
- package/dist/runtime/run.d.ts.map +1 -1
- package/dist/runtime/run.js +16 -26
- package/dist/runtime/run.js.map +1 -1
- package/dist/runtime.js +6788 -6343
- package/dist/runtime.js.map +4 -4
- package/dist/session/api/session-api.d.ts +8 -2
- package/dist/session/api/session-api.d.ts.map +1 -1
- package/dist/session/api/session-api.js.map +1 -1
- package/dist/session/api/session-layer.d.ts +2 -3
- package/dist/session/api/session-layer.d.ts.map +1 -1
- package/dist/session/api/session-layer.js +2 -17
- package/dist/session/api/session-layer.js.map +1 -1
- package/dist/session/history/session-event-history-projection.d.ts.map +1 -1
- package/dist/session/history/session-event-history-projection.js +11 -1
- package/dist/session/history/session-event-history-projection.js.map +1 -1
- package/dist/session/history/session-history.d.ts +1 -2
- package/dist/session/history/session-history.d.ts.map +1 -1
- package/dist/session/history/session-history.js +1 -1
- package/dist/session/history/session-history.js.map +1 -1
- package/dist/session/live/agent-session.d.ts +6 -13
- package/dist/session/live/agent-session.d.ts.map +1 -1
- package/dist/session/live/agent-session.js +94 -165
- package/dist/session/live/agent-session.js.map +1 -1
- package/dist/session/manager/session-manager.d.ts +5 -8
- package/dist/session/manager/session-manager.d.ts.map +1 -1
- package/dist/session/manager/session-manager.js +14 -26
- package/dist/session/manager/session-manager.js.map +1 -1
- package/dist/session/native/native-session-browser.js +7 -7
- package/dist/session/native/native-session-browser.js.map +1 -1
- package/dist/session/process/agent-process-pool.d.ts +12 -10
- package/dist/session/process/agent-process-pool.d.ts.map +1 -1
- package/dist/session/process/agent-process-pool.js +15 -4
- package/dist/session/process/agent-process-pool.js.map +1 -1
- package/dist/session/process/retained-agent-processes.d.ts +11 -12
- package/dist/session/process/retained-agent-processes.d.ts.map +1 -1
- package/dist/session/process/retained-agent-processes.js.map +1 -1
- package/dist/session/prompt/apply-session-configuration.d.ts +2 -1
- package/dist/session/prompt/apply-session-configuration.d.ts.map +1 -1
- package/dist/session/prompt/apply-session-configuration.js +4 -3
- package/dist/session/prompt/apply-session-configuration.js.map +1 -1
- package/dist/session/prompt/execute-prompt.d.ts.map +1 -1
- package/dist/session/prompt/execute-prompt.js +5 -2
- package/dist/session/prompt/execute-prompt.js.map +1 -1
- package/dist/session/settings/discover-agent-settings.d.ts.map +1 -1
- package/dist/session/settings/discover-agent-settings.js +6 -3
- package/dist/session/settings/discover-agent-settings.js.map +1 -1
- package/dist/session/workspace/resolve-session-directories.d.ts +2 -1
- package/dist/session/workspace/resolve-session-directories.d.ts.map +1 -1
- package/dist/session/workspace/resolve-session-directories.js +6 -3
- package/dist/session/workspace/resolve-session-directories.js.map +1 -1
- package/dist/session/workspace/workspace-directory.d.ts +4 -0
- package/dist/session/workspace/workspace-directory.d.ts.map +1 -1
- package/dist/session/workspace/workspace-directory.js +4 -0
- package/dist/session/workspace/workspace-directory.js.map +1 -1
- package/dist/storage/session/temporary-session-event-cache.d.ts +7 -0
- package/dist/storage/session/temporary-session-event-cache.d.ts.map +1 -0
- package/dist/storage/session/temporary-session-event-cache.js +21 -0
- package/dist/storage/session/temporary-session-event-cache.js.map +1 -0
- package/dist/util/run-cleanup.d.ts +3 -0
- package/dist/util/run-cleanup.d.ts.map +1 -0
- package/dist/util/run-cleanup.js +14 -0
- package/dist/util/run-cleanup.js.map +1 -0
- package/package.json +2 -2
- package/dist/session/process/agent-query-processes.d.ts +0 -16
- package/dist/session/process/agent-query-processes.d.ts.map +0 -1
- package/dist/session/process/agent-query-processes.js.map +0 -1
|
@@ -20,13 +20,30 @@ class RelayConnectionError extends Error {
|
|
|
20
20
|
export function connectRelay(url, signal) {
|
|
21
21
|
signal.throwIfAborted();
|
|
22
22
|
return new Promise((resolve, reject) => {
|
|
23
|
+
let dispatchController;
|
|
24
|
+
const dispatcher = environmentProxyDispatcher.compose((dispatch) => (options, handler) => {
|
|
25
|
+
const trackedHandler = Object.create(handler);
|
|
26
|
+
trackedHandler.onRequestStart = (controller, context) => {
|
|
27
|
+
dispatchController = controller;
|
|
28
|
+
handler.onRequestStart?.(controller, context);
|
|
29
|
+
};
|
|
30
|
+
return dispatch(options, trackedHandler);
|
|
31
|
+
});
|
|
23
32
|
const endpoint = new URL(url);
|
|
24
33
|
const headers = relayAuthorization(endpoint);
|
|
25
34
|
endpoint.searchParams.delete("token");
|
|
26
35
|
const socket = new WebSocket(endpoint, {
|
|
27
|
-
dispatcher
|
|
36
|
+
dispatcher,
|
|
28
37
|
headers,
|
|
29
38
|
});
|
|
39
|
+
let released = false;
|
|
40
|
+
const release = (reason) => {
|
|
41
|
+
if (released) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
released = true;
|
|
45
|
+
dispatchController?.abort(reason);
|
|
46
|
+
};
|
|
30
47
|
let finished = false;
|
|
31
48
|
const timeout = setTimeout(onTimeout, CONNECTION_TIMEOUT_MILLISECONDS);
|
|
32
49
|
const cleanup = () => {
|
|
@@ -43,6 +60,7 @@ export function connectRelay(url, signal) {
|
|
|
43
60
|
finished = true;
|
|
44
61
|
cleanup();
|
|
45
62
|
socket.close();
|
|
63
|
+
release(error);
|
|
46
64
|
reject(error);
|
|
47
65
|
};
|
|
48
66
|
const onAbort = () => {
|
|
@@ -70,7 +88,7 @@ export function connectRelay(url, signal) {
|
|
|
70
88
|
}
|
|
71
89
|
finished = true;
|
|
72
90
|
cleanup();
|
|
73
|
-
resolve(socket);
|
|
91
|
+
resolve({ release, socket });
|
|
74
92
|
};
|
|
75
93
|
function onTimeout() {
|
|
76
94
|
fail(new RelayConnectionError("relay_connection_timeout", "Relay connection timed out", {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/runtime/relay/connect.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/runtime/relay/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAE7F,qGAAqG;AACrG,0GAA0G;AAC1G,0GAA0G;AAC1G,kEAAkE;AAClE,MAAM,+BAA+B,GAAG,MAAM,CAAC;AAQ/C,MAAM,oBAAqB,SAAQ,KAAK;IAC3B,IAAI,CAAS;IACb,iBAAiB,CAAmC;IAE7D,YACI,IAAY,EACZ,OAAe,EACf,iBAAiB,GAAqC,EAAE,EACxD,OAAO,GAAiB,EAAE;QAE1B,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACvC,CAAC;CACJ;AAED,MAAM,UAAU,YAAY,CAAC,GAAQ,EAAE,MAAmB;IACtD,MAAM,CAAC,cAAc,EAAE,CAAC;IAExB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,kBAA6D,CAAC;QAClE,MAAM,UAAU,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACrF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAA+B,CAAC;YAC5E,cAAc,CAAC,cAAc,GAAG,CAAC,UAAU,EAAE,OAAO,EAAQ,EAAE;gBAC1D,kBAAkB,GAAG,UAAU,CAAC;gBAChC,OAAO,CAAC,cAAc,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC,CAAC;YACF,OAAO,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7C,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE;YACnC,UAAU;YACV,OAAO;SACV,CAAC,CAAC;QACH,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,OAAO,GAAG,CAAC,MAAa,EAAQ,EAAE;YACpC,IAAI,QAAQ,EAAE,CAAC;gBACX,OAAO;YACX,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,kBAAkB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC,CAAC;QACF,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,EAAE,+BAA+B,CAAC,CAAC;QAEvE,MAAM,OAAO,GAAG,GAAS,EAAE;YACvB,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC,CAAC;QACF,MAAM,IAAI,GAAG,CAAC,KAAY,EAAQ,EAAE;YAChC,IAAI,QAAQ,EAAE,CAAC;gBACX,OAAO;YACX,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,GAAS,EAAE;YACvB,IAAI,CACA,IAAI,oBAAoB,CACpB,4BAA4B,EAC5B,gCAAgC,EAChC;gBACI,YAAY,EAAE,WAAW;aAC5B,EACD,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAC3B,CACJ,CAAC;QACN,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,KAAiB,EAAQ,EAAE;YACxC,IAAI,wBAAwB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrD,IAAI,CAAC,IAAI,wBAAwB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC7D,OAAO;YACX,CAAC;YACD,IAAI,CACA,IAAI,oBAAoB,CAAC,yBAAyB,EAAE,6CAA6C,EAAE;gBAC/F,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAChC,WAAW,EAAE,KAAK,CAAC,MAAM;aAC5B,CAAC,CACL,CAAC;QACN,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACnC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,CACA,IAAI,oBAAoB,CACpB,yBAAyB,EACzB,yBAAyB,EACzB,EAAE,EACF,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,EAAE,CAC5B,CACJ,CAAC;QACN,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,GAAS,EAAE;YACtB,IAAI,QAAQ,EAAE,CAAC;gBACX,OAAO;YACX,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACjC,CAAC,CAAC;QACF,SAAS,SAAS;YACd,IAAI,CACA,IAAI,oBAAoB,CAAC,0BAA0B,EAAE,4BAA4B,EAAE;gBAC/E,mBAAmB,EAAE,+BAA+B,CAAC,QAAQ,EAAE;aAClE,CAAC,CACL,CAAC;QACN,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAExD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type RuntimeUpgradeResult } from "@moxt-ai/mobius-sdk/protocol";
|
|
2
|
+
import type { ResolveAgent } from "../../session/api/session-api.ts";
|
|
2
3
|
import type { ExternalContentStore } from "../../session/content/external-content-store.ts";
|
|
3
4
|
import type { SessionManager } from "../../session/manager/session-manager.ts";
|
|
4
5
|
import type { NativeSessionService } from "../../session/native/native-session-browser.ts";
|
|
@@ -11,6 +12,7 @@ import type { RuntimeConfig } from "../config.ts";
|
|
|
11
12
|
import type { RelayConnectionDiagnostics } from "./diagnostics.ts";
|
|
12
13
|
import type { RuntimeSessionEventPublisher } from "./session-event-publisher.ts";
|
|
13
14
|
export interface RelayConnectionOptions {
|
|
15
|
+
readonly resolveAgent: ResolveAgent;
|
|
14
16
|
readonly config: RuntimeConfig;
|
|
15
17
|
/** Reports a finished daemon upgrade to the relay. The daemon worker supplies it. */
|
|
16
18
|
readonly reportUpgradeAvailability: (send: (result: RuntimeUpgradeResult) => void, signal: AbortSignal) => Promise<void>;
|
|
@@ -28,5 +30,5 @@ export interface RelayConnectionOptions {
|
|
|
28
30
|
readonly signal: AbortSignal;
|
|
29
31
|
readonly timer: Timer;
|
|
30
32
|
}
|
|
31
|
-
export declare function runRelayConnection({ config, reportUpgradeAvailability, directories, sessionTurns, nativeSessions, operations, publisher, eventProjection, externalContent, sessions, connectionEpoch, diagnostics, onConnected, signal, timer, }: RelayConnectionOptions): Promise<void>;
|
|
33
|
+
export declare function runRelayConnection({ resolveAgent, config, reportUpgradeAvailability, directories, sessionTurns, nativeSessions, operations, publisher, eventProjection, externalContent, sessions, connectionEpoch, diagnostics, onConnected, signal, timer, }: RelayConnectionOptions): Promise<void>;
|
|
32
34
|
//# sourceMappingURL=run-relay-connection.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-relay-connection.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,oBAAoB,EAG5B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAiEjF,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,qFAAqF;IACrF,QAAQ,CAAC,yBAAyB,EAAE,CAChC,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAC5C,MAAM,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,4BAA4B,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACzB;AAED,wBAAsB,kBAAkB,CAAC,EACrC,MAAM,EACN,yBAAyB,EACzB,WAAW,EACX,YAAY,EACZ,cAAc,EACd,UAAU,EACV,SAAS,EACT,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,WAAW,EACX,WAAW,EACX,MAAM,EACN,KAAK,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"run-relay-connection.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,oBAAoB,EAG5B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAGnE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAiEjF,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,qFAAqF;IACrF,QAAQ,CAAC,yBAAyB,EAAE,CAChC,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAC5C,MAAM,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,4BAA4B,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACzB;AAED,wBAAsB,kBAAkB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,yBAAyB,EACzB,WAAW,EACX,YAAY,EACZ,cAAc,EACd,UAAU,EACV,SAAS,EACT,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,WAAW,EACX,WAAW,EACX,MAAM,EACN,KAAK,GACR,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoMxC"}
|
|
@@ -59,13 +59,15 @@ function rejectUnsupportedCommand(socket, correlation, rejection) {
|
|
|
59
59
|
sessionId: correlation.sessionId,
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
|
-
export async function runRelayConnection({ config, reportUpgradeAvailability, directories, sessionTurns, nativeSessions, operations, publisher, eventProjection, externalContent, sessions, connectionEpoch, diagnostics, onConnected, signal, timer, }) {
|
|
62
|
+
export async function runRelayConnection({ resolveAgent, config, reportUpgradeAvailability, directories, sessionTurns, nativeSessions, operations, publisher, eventProjection, externalContent, sessions, connectionEpoch, diagnostics, onConnected, signal, timer, }) {
|
|
63
63
|
const relayUrl = new URL(config.relayUrl);
|
|
64
64
|
relayUrl.searchParams.set("liveness", "1");
|
|
65
|
-
const
|
|
65
|
+
const relay = await connectRelay(relayUrl, signal);
|
|
66
|
+
const { socket } = relay;
|
|
66
67
|
diagnostics.connectionOpened(connectionEpoch);
|
|
67
68
|
const connectionController = new AbortController();
|
|
68
69
|
const commands = createRuntimeCommandDispatcher({
|
|
70
|
+
resolveAgent,
|
|
69
71
|
config,
|
|
70
72
|
directories,
|
|
71
73
|
sessions,
|
|
@@ -229,6 +231,7 @@ export async function runRelayConnection({ config, reportUpgradeAvailability, di
|
|
|
229
231
|
finally {
|
|
230
232
|
connectionController.abort();
|
|
231
233
|
await commands.settle();
|
|
234
|
+
relay.release(new Error("Relay connection released"));
|
|
232
235
|
}
|
|
233
236
|
}
|
|
234
237
|
//# sourceMappingURL=run-relay-connection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-relay-connection.js","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,4BAA4B,EAC5B,YAAY,EACZ,0BAA0B,EAC1B,2BAA2B,EAE3B,6BAA6B,EAC7B,mCAAmC,GACtC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAqB,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"run-relay-connection.js","sourceRoot":"","sources":["../../../src/runtime/relay/run-relay-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-event-publisher.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/session-event-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACrB,KAAK,yBAAyB,EACjC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAiB,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAShE,eAAO,MAAM,uCAAuC,MAAM,CAAC;AAY3D,+FAA+F;AAC/F,qBAAa,4BAA6B,YAAW,gBAAgB;;
|
|
1
|
+
{"version":3,"file":"session-event-publisher.d.ts","sourceRoot":"","sources":["../../../src/runtime/relay/session-event-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACrB,KAAK,yBAAyB,EACjC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,KAAK,EAAiB,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAShE,eAAO,MAAM,uCAAuC,MAAM,CAAC;AAY3D,+FAA+F;AAC/F,qBAAa,4BAA6B,YAAW,gBAAgB;;IASjE,YAAY,KAAK,EAAE,KAAK,EAEvB;IAED,QAAQ,CAAC,OAAO,WAAY,SAAS,KAAG,IAAI,CAO1C;IAEF,QAAQ,CAAC,UAAU,WAAY,SAAS,KAAG,IAAI,CAK7C;IAEF,QAAQ,CAAC,KAAK,QAAO,IAAI,CAMvB;IAEF,QAAQ,CAAC,KAAK,QAAO,IAAI,CAIvB;IAEF,QAAQ,CAAC,uBAAuB,cAAe,MAAM,aAAa,MAAM,QAAQ,MAAM,WAAW,MAAM,KAAG,IAAI,CAE5G;IACF,QAAQ,CAAC,aAAa,UAAW,yBAAyB,KAAG,IAAI,CAAsB;IACvF,QAAQ,CAAC,WAAW,UAAW,uBAAuB,KAAG,IAAI,CAAsB;IACnF,QAAQ,CAAC,aAAa,UAAW,uBAAuB,KAAG,IAAI,CAG7D;IAoBF,QAAQ,CAAC,OAAO,UAAW,gBAAgB,KAAG,IAAI,CA0DhD;IAkCF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAG1B;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CA2B1B;CACL"}
|
|
@@ -11,6 +11,7 @@ export const SESSION_EVENT_BATCH_WINDOW_MILLISECONDS = 100;
|
|
|
11
11
|
/** Keeps unsent output in bounded memory across reconnects. Sent events are never replayed. */
|
|
12
12
|
export class RuntimeSessionEventPublisher {
|
|
13
13
|
#pending = [];
|
|
14
|
+
#awaitingFirstAnswer = new Map();
|
|
14
15
|
#pendingBytes = 0;
|
|
15
16
|
#overflowReported = false;
|
|
16
17
|
#pendingTask = null;
|
|
@@ -38,6 +39,7 @@ export class RuntimeSessionEventPublisher {
|
|
|
38
39
|
this.cancelFlush();
|
|
39
40
|
this.#pending.length = 0;
|
|
40
41
|
this.#pendingBytes = 0;
|
|
42
|
+
this.#awaitingFirstAnswer.clear();
|
|
41
43
|
};
|
|
42
44
|
flush = () => {
|
|
43
45
|
if (this.#connection.kind === "connected") {
|
|
@@ -49,7 +51,10 @@ export class RuntimeSessionEventPublisher {
|
|
|
49
51
|
};
|
|
50
52
|
publishStatus = (event) => this.#send(event);
|
|
51
53
|
publishInfo = (event) => this.#send(event);
|
|
52
|
-
publishClosed = (event) =>
|
|
54
|
+
publishClosed = (event) => {
|
|
55
|
+
this.#awaitingFirstAnswer.delete(event.sessionId);
|
|
56
|
+
this.#send(event);
|
|
57
|
+
};
|
|
53
58
|
#send = (message) => {
|
|
54
59
|
const connection = this.#connection;
|
|
55
60
|
if (connection.kind !== "connected" || connection.socket.readyState !== WebSocket.OPEN) {
|
|
@@ -106,12 +111,14 @@ export class RuntimeSessionEventPublisher {
|
|
|
106
111
|
batch.events.push(event);
|
|
107
112
|
batch.bytes += bytes;
|
|
108
113
|
this.#pendingBytes += additionalBytes;
|
|
114
|
+
const firstAnswer = this.#consumeFirstAnswer(event);
|
|
109
115
|
const connection = this.#connection;
|
|
110
116
|
if (connection.kind !== "connected" || connection.socket.readyState !== WebSocket.OPEN) {
|
|
111
117
|
return;
|
|
112
118
|
}
|
|
113
119
|
const socket = connection.socket;
|
|
114
|
-
if (
|
|
120
|
+
if (firstAnswer ||
|
|
121
|
+
this.#pending.length > 1 ||
|
|
115
122
|
batch.events.length >= SESSION_EVENT_BATCH_MAX_SIZE ||
|
|
116
123
|
batch.bytes >= MAX_EVENT_BATCH_BYTES) {
|
|
117
124
|
this.flushEvents(socket);
|
|
@@ -119,6 +126,34 @@ export class RuntimeSessionEventPublisher {
|
|
|
119
126
|
}
|
|
120
127
|
this.#pendingTask ??= this.#timer.schedule(() => this.flushEvents(socket), SESSION_EVENT_BATCH_WINDOW_MILLISECONDS);
|
|
121
128
|
};
|
|
129
|
+
#consumeFirstAnswer = (event) => {
|
|
130
|
+
if (event.type === "lifecycle-metadata") {
|
|
131
|
+
const payload = event.payload;
|
|
132
|
+
if (payload.kind === "prompt.started") {
|
|
133
|
+
this.#awaitingFirstAnswer.set(event.sessionId, {
|
|
134
|
+
commandId: payload.commandId,
|
|
135
|
+
generationId: event.sessionGenerationId,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
else if ((payload.kind === "prompt.completed" ||
|
|
139
|
+
payload.kind === "prompt.failed" ||
|
|
140
|
+
payload.kind === "prompt.failed-before-start") &&
|
|
141
|
+
this.#awaitingFirstAnswer.get(event.sessionId)?.commandId === payload.commandId &&
|
|
142
|
+
this.#awaitingFirstAnswer.get(event.sessionId)?.generationId === event.sessionGenerationId) {
|
|
143
|
+
this.#awaitingFirstAnswer.delete(event.sessionId);
|
|
144
|
+
}
|
|
145
|
+
return false;
|
|
146
|
+
}
|
|
147
|
+
if (event.type !== "acp" ||
|
|
148
|
+
event.payload.sessionUpdate !== "agent_message_chunk" ||
|
|
149
|
+
event.payload.content.type !== "text" ||
|
|
150
|
+
event.payload.content.text.length === 0 ||
|
|
151
|
+
this.#awaitingFirstAnswer.get(event.sessionId)?.generationId !== event.sessionGenerationId) {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
this.#awaitingFirstAnswer.delete(event.sessionId);
|
|
155
|
+
return true;
|
|
156
|
+
};
|
|
122
157
|
cancelFlush = () => {
|
|
123
158
|
this.#pendingTask?.cancel();
|
|
124
159
|
this.#pendingTask = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-event-publisher.js","sourceRoot":"","sources":["../../../src/runtime/relay/session-event-publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,4BAA4B,EAC5B,4BAA4B,EAC5B,kBAAkB,GAKrB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAInC,MAAM,kBAAkB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAC5C,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAC3C,MAAM,qBAAqB,GAAG,IAAI,GAAG,IAAI,CAAC;AAC1C,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AACxC,0FAA0F;AAC1F,MAAM,6BAA6B,GAAG,IAAI,CAAC;AAC3C,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;AACzG,MAAM,CAAC,MAAM,uCAAuC,GAAG,GAAG,CAAC;AAY3D,+FAA+F;AAC/F,MAAM,OAAO,4BAA4B;IAC5B,QAAQ,GAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"session-event-publisher.js","sourceRoot":"","sources":["../../../src/runtime/relay/session-event-publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/runtime/run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/runtime/run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAKzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAyDjD,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,YAAY,CAAC,EAAE,mBAAmB,CAAC;IAC5C,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,cAAc,KAAK,IAAI,CAAC;IAC1E,qFAAqF;IACrF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACjC,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAC5C,MAAM,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,wBAAsB,UAAU,CAC5B,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,WAAW,EACzB,KAAK,GAAE,KAAmB,EAC1B,OAAO,GAAE,iBAAsB,GAChC,OAAO,CAAC,IAAI,CAAC,CA0If"}
|
package/dist/runtime/run.js
CHANGED
|
@@ -51,7 +51,11 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
|
|
|
51
51
|
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
52
52
|
});
|
|
53
53
|
import { styleText } from "node:util";
|
|
54
|
+
import { createRuntimeAdapterRegistry } from "../agent/runtime-agents.js";
|
|
54
55
|
import { buildSessionLayer } from "../session/api/session-layer.js";
|
|
56
|
+
import { LocalExternalContentStore } from "../session/content/external-content-store.js";
|
|
57
|
+
import { AgentProcessPool, resolveMaxAcpProcesses } from "../session/process/agent-process-pool.js";
|
|
58
|
+
import { runCleanup } from "../util/run-cleanup.js";
|
|
55
59
|
import { systemTimer } from "../util/timer.js";
|
|
56
60
|
import { publishAgentCatalog } from "./catalog/publish-agent-catalog.js";
|
|
57
61
|
import { resolveCatalogAgent } from "./catalog/resolve-catalog-agent.js";
|
|
@@ -113,22 +117,27 @@ export async function runRuntime(config, parentSignal, timer = systemTimer, opti
|
|
|
113
117
|
: { processLogsDirectory: options.processLogsDirectory }),
|
|
114
118
|
}));
|
|
115
119
|
const publisher = new RuntimeSessionEventPublisher(timer);
|
|
120
|
+
// Dispose media only after session and adapter operations have drained.
|
|
121
|
+
const externalContent = __addDisposableResource(env_1, new LocalExternalContentStore(stateDirectory), true);
|
|
122
|
+
const processes = new AgentProcessPool(resolveMaxAcpProcesses(config.localContext.environment) ?? undefined, timer);
|
|
123
|
+
const adapters = createRuntimeAdapterRegistry(config.adapters, processes, (sessionId, content, contentSignal) => externalContent.put({ ...content, sessionId, signal: contentSignal }));
|
|
124
|
+
const resolveAgent = async (agentId, resolveSignal) => {
|
|
125
|
+
const agent = await resolveCatalogAgent(config, agentId, resolveSignal);
|
|
126
|
+
return { agent, adapter: adapters.resolve(agent) };
|
|
127
|
+
};
|
|
116
128
|
const layer = buildSessionLayer({
|
|
129
|
+
processes,
|
|
117
130
|
...(options.turnActivity === undefined ? {} : { turnActivity: options.turnActivity }),
|
|
118
131
|
bindingId: config.bindingId,
|
|
119
132
|
channelId: config.channelId,
|
|
120
133
|
defaultWorkspace: config.defaultWorkspace,
|
|
121
|
-
|
|
122
|
-
resolveAgent: (agentId, resolveSignal) => resolveCatalogAgent(config, agentId, resolveSignal),
|
|
134
|
+
resolveAgent,
|
|
123
135
|
sink: publisher,
|
|
124
136
|
stateDirectory: config.localContext.stateDirectory,
|
|
125
137
|
timer,
|
|
126
138
|
onExecutionCountChange: options.onExecutionCountChange ?? (() => undefined),
|
|
127
139
|
});
|
|
128
140
|
const { activeSessions, directories, eventProjection, manager: agentRuntime, nativeSessions, operations, sessionStore, } = layer;
|
|
129
|
-
// The media cache is owned by this scope: when runRuntime returns, its cleanup
|
|
130
|
-
// timer stops and its private directory is removed, after the other resources settle.
|
|
131
|
-
const externalContent = __addDisposableResource(env_1, layer.externalContent, true);
|
|
132
141
|
let connectionEpoch = 0;
|
|
133
142
|
let connectionAnnounced = false;
|
|
134
143
|
let catalogPublished = false;
|
|
@@ -170,6 +179,7 @@ export async function runRuntime(config, parentSignal, timer = systemTimer, opti
|
|
|
170
179
|
try {
|
|
171
180
|
await runRelayConnection({
|
|
172
181
|
config,
|
|
182
|
+
resolveAgent,
|
|
173
183
|
directories,
|
|
174
184
|
sessions: agentRuntime,
|
|
175
185
|
nativeSessions,
|
|
@@ -209,27 +219,7 @@ export async function runRuntime(config, parentSignal, timer = systemTimer, opti
|
|
|
209
219
|
shutdown.abort();
|
|
210
220
|
operations.beginShutdown();
|
|
211
221
|
await activeSessions.close();
|
|
212
|
-
|
|
213
|
-
await catalogPublication;
|
|
214
|
-
}
|
|
215
|
-
finally {
|
|
216
|
-
try {
|
|
217
|
-
await agentRuntime.close();
|
|
218
|
-
}
|
|
219
|
-
finally {
|
|
220
|
-
try {
|
|
221
|
-
sessionStore.close();
|
|
222
|
-
}
|
|
223
|
-
finally {
|
|
224
|
-
try {
|
|
225
|
-
publisher.close();
|
|
226
|
-
}
|
|
227
|
-
finally {
|
|
228
|
-
operations.close();
|
|
229
|
-
}
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
}
|
|
222
|
+
await runCleanup(() => catalogPublication, () => agentRuntime.close(), () => adapters.close(), () => sessionStore.close(), () => publisher.close(), () => operations.close());
|
|
233
223
|
}
|
|
234
224
|
}
|
|
235
225
|
catch (e_1) {
|
package/dist/runtime/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/runtime/run.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/runtime/run.ts"],"names":[],"mappings":"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"}
|