@moxt-ai/mobius 0.0.176 → 0.0.178
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/agent-connection.d.ts +1 -3
- package/dist/acp/agent-connection.d.ts.map +1 -1
- package/dist/acp/agent-connection.js +3 -4
- package/dist/acp/agent-connection.js.map +1 -1
- package/dist/acp/agent-runtime-manager.d.ts +2 -1
- package/dist/acp/agent-runtime-manager.d.ts.map +1 -1
- package/dist/acp/agent-runtime-manager.js +12 -9
- package/dist/acp/agent-runtime-manager.js.map +1 -1
- package/dist/acp/agent-session.d.ts +4 -3
- package/dist/acp/agent-session.d.ts.map +1 -1
- package/dist/acp/agent-session.js +54 -32
- package/dist/acp/agent-session.js.map +1 -1
- package/dist/acp/codex/agent.d.ts.map +1 -1
- package/dist/acp/codex/agent.js +1 -13
- package/dist/acp/codex/agent.js.map +1 -1
- package/dist/acp/session-contracts.d.ts +3 -1
- package/dist/acp/session-contracts.d.ts.map +1 -1
- package/dist/acp/session-contracts.js.map +1 -1
- package/dist/cli.js +241 -617
- package/dist/cli.js.map +4 -4
- package/dist/daemon-command-handler.d.ts +1 -3
- package/dist/daemon-command-handler.d.ts.map +1 -1
- package/dist/daemon-command-handler.js +11 -9
- package/dist/daemon-command-handler.js.map +1 -1
- package/dist/daemon-command-results.d.ts +2 -3
- package/dist/daemon-command-results.d.ts.map +1 -1
- package/dist/daemon-command-results.js +4 -12
- package/dist/daemon-command-results.js.map +1 -1
- package/dist/daemon-prompt-executor.d.ts +2 -6
- package/dist/daemon-prompt-executor.d.ts.map +1 -1
- package/dist/daemon-prompt-executor.js +20 -73
- package/dist/daemon-prompt-executor.js.map +1 -1
- package/dist/daemon-session-commands.d.ts +2 -3
- package/dist/daemon-session-commands.d.ts.map +1 -1
- package/dist/daemon-session-commands.js +3 -15
- package/dist/daemon-session-commands.js.map +1 -1
- package/dist/index.js +240 -616
- package/dist/index.js.map +4 -4
- package/dist/relay-connection/run-relay-connection.d.ts.map +1 -1
- package/dist/relay-connection/run-relay-connection.js +0 -1
- package/dist/relay-connection/run-relay-connection.js.map +1 -1
- package/dist/relay-connection/session-event-publisher.d.ts +7 -3
- package/dist/relay-connection/session-event-publisher.d.ts.map +1 -1
- package/dist/relay-connection/session-event-publisher.js +35 -27
- package/dist/relay-connection/session-event-publisher.js.map +1 -1
- package/dist/run-daemon.d.ts.map +1 -1
- package/dist/run-daemon.js +5 -6
- package/dist/run-daemon.js.map +1 -1
- package/dist/runtime.js +240 -616
- package/dist/runtime.js.map +4 -4
- package/dist/session-event-log-v2.d.ts +7 -5
- package/dist/session-event-log-v2.d.ts.map +1 -1
- package/dist/session-event-log-v2.js +83 -12
- package/dist/session-event-log-v2.js.map +1 -1
- package/package.json +1 -1
- package/dist/relay-connection/coalescing-agent-event-publisher.d.ts +0 -32
- package/dist/relay-connection/coalescing-agent-event-publisher.d.ts.map +0 -1
- package/dist/relay-connection/coalescing-agent-event-publisher.js +0 -116
- package/dist/relay-connection/coalescing-agent-event-publisher.js.map +0 -1
|
@@ -10,7 +10,6 @@ import type { ExternalContentStore } from "./external-content/local-external-con
|
|
|
10
10
|
import type { NativeSessionService } from "./native-sessions/service.ts";
|
|
11
11
|
import type { DaemonOperationState } from "./relay-connection/daemon-operation-state.ts";
|
|
12
12
|
import type { RelayConnectionDiagnostics } from "./relay-connection/diagnostics.ts";
|
|
13
|
-
import type { DaemonSessionEventPublisher } from "./relay-connection/session-event-publisher.ts";
|
|
14
13
|
import type { DaemonTimer } from "./relay-connection/timer.ts";
|
|
15
14
|
import type { DaemonSessionEventLogV2 } from "./session-event-log-v2.ts";
|
|
16
15
|
export interface DaemonCommandOptions {
|
|
@@ -21,7 +20,6 @@ export interface DaemonCommandOptions {
|
|
|
21
20
|
readonly installations: AgentInstallationManager;
|
|
22
21
|
readonly nativeSessions: NativeSessionService;
|
|
23
22
|
readonly operations: DaemonOperationState;
|
|
24
|
-
readonly publisher: DaemonSessionEventPublisher;
|
|
25
23
|
readonly eventLogV2: DaemonSessionEventLogV2;
|
|
26
24
|
readonly externalContent: ExternalContentStore;
|
|
27
25
|
readonly activeTurns: DaemonTurnRegistry;
|
|
@@ -31,7 +29,7 @@ export interface DaemonCommandOptions {
|
|
|
31
29
|
readonly runtimeSignal: AbortSignal;
|
|
32
30
|
readonly timer: DaemonTimer;
|
|
33
31
|
}
|
|
34
|
-
export declare function createDaemonCommandHandler({ config, directories, audit, sessions, installations, nativeSessions, operations,
|
|
32
|
+
export declare function createDaemonCommandHandler({ config, directories, audit, sessions, installations, nativeSessions, operations, eventLogV2, externalContent, activeTurns, diagnostics, socket, signal, runtimeSignal, timer, }: DaemonCommandOptions): {
|
|
35
33
|
readonly handle: (message: ServiceToDaemonMessage) => void;
|
|
36
34
|
readonly settle: () => Promise<void>;
|
|
37
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-command-handler.d.ts","sourceRoot":"","sources":["../src/daemon-command-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AA4BvE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAE/F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"daemon-command-handler.d.ts","sourceRoot":"","sources":["../src/daemon-command-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AA4BvE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAE/F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,wBAAwB,CAAC;IACjD,QAAQ,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAC9C,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;IAC7C,QAAQ,CAAC,eAAe,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC/B;AAED,wBAAgB,0BAA0B,CAAC,EACvC,MAAM,EACN,WAAW,EACX,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,UAAU,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACX,MAAM,EACN,MAAM,EACN,aAAa,EACb,KAAK,GACR,EAAE,oBAAoB,GAAG;IACtB,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC,CA2RA"}
|
|
@@ -7,7 +7,7 @@ import { executeSessionLiveHistoryV2PageLoad } from "./daemon-history-commands.j
|
|
|
7
7
|
import { executePrompt } from "./daemon-prompt-executor.js";
|
|
8
8
|
import { executeSessionConfigure, executeSessionPrepare, executeWorkspaceList } from "./daemon-session-commands.js";
|
|
9
9
|
import { createNativeSessionRequestHandler } from "./native-sessions/handle-native-requests.js";
|
|
10
|
-
export function createDaemonCommandHandler({ config, directories, audit, sessions, installations, nativeSessions, operations,
|
|
10
|
+
export function createDaemonCommandHandler({ config, directories, audit, sessions, installations, nativeSessions, operations, eventLogV2, externalContent, activeTurns, diagnostics, socket, signal, runtimeSignal, timer, }) {
|
|
11
11
|
const handleSettingsDiscovery = createAgentSettingsDiscoveryHandler({
|
|
12
12
|
config,
|
|
13
13
|
directories,
|
|
@@ -19,8 +19,9 @@ export function createDaemonCommandHandler({ config, directories, audit, session
|
|
|
19
19
|
timer,
|
|
20
20
|
});
|
|
21
21
|
const queueChanged = (sessionId) => {
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
void eventLogV2.queueChanged(sessionId).catch((error) => {
|
|
23
|
+
console.error("Could not record queue change", error);
|
|
24
|
+
});
|
|
24
25
|
};
|
|
25
26
|
const nativeRequestHandler = createNativeSessionRequestHandler({
|
|
26
27
|
audit,
|
|
@@ -73,7 +74,9 @@ export function createDaemonCommandHandler({ config, directories, audit, session
|
|
|
73
74
|
const cancellation = message;
|
|
74
75
|
const turn = activeTurns.get(cancellation.commandId);
|
|
75
76
|
if (turn === undefined || !turn.matches(cancellation)) {
|
|
76
|
-
settleAbandonedTurn(
|
|
77
|
+
void settleAbandonedTurn(eventLogV2, operations, audit, cancellation).catch((error) => {
|
|
78
|
+
console.error("Could not settle abandoned turn", error);
|
|
79
|
+
});
|
|
77
80
|
return;
|
|
78
81
|
}
|
|
79
82
|
const cancellationState = turn.requestCancellation();
|
|
@@ -108,12 +111,12 @@ export function createDaemonCommandHandler({ config, directories, audit, session
|
|
|
108
111
|
}
|
|
109
112
|
if (kind === SESSION_PREPARE_KIND) {
|
|
110
113
|
const command = message;
|
|
111
|
-
void executeSessionPrepare(
|
|
114
|
+
void executeSessionPrepare(socket, command, config, directories, audit, sessions, diagnostics, signal);
|
|
112
115
|
return;
|
|
113
116
|
}
|
|
114
117
|
if (kind === SESSION_CONFIGURE_KIND) {
|
|
115
118
|
const command = message;
|
|
116
|
-
void executeSessionConfigure(
|
|
119
|
+
void executeSessionConfigure(socket, command, config, directories, audit, sessions, signal);
|
|
117
120
|
return;
|
|
118
121
|
}
|
|
119
122
|
if (kind === SESSION_LIST_KIND) {
|
|
@@ -223,7 +226,6 @@ export function createDaemonCommandHandler({ config, directories, audit, session
|
|
|
223
226
|
eventLogV2.requested(command);
|
|
224
227
|
void executePrompt({
|
|
225
228
|
operations,
|
|
226
|
-
publisher,
|
|
227
229
|
eventLogV2,
|
|
228
230
|
command,
|
|
229
231
|
config,
|
|
@@ -240,9 +242,8 @@ export function createDaemonCommandHandler({ config, directories, audit, session
|
|
|
240
242
|
sessionId: command.sessionId,
|
|
241
243
|
});
|
|
242
244
|
}),
|
|
243
|
-
timer,
|
|
244
245
|
signal: turn.signal,
|
|
245
|
-
|
|
246
|
+
recordTurnEvent: turn.recordEvent,
|
|
246
247
|
recordSteeringPrompt: () => activeTurns.recordSteeringPrompt(command),
|
|
247
248
|
cancellationRequested: turn.cancellationRequested,
|
|
248
249
|
})
|
|
@@ -251,6 +252,7 @@ export function createDaemonCommandHandler({ config, directories, audit, session
|
|
|
251
252
|
})
|
|
252
253
|
.finally(() => {
|
|
253
254
|
activeTurns.finish(turn);
|
|
255
|
+
eventLogV2.publishTerminal(command.sessionId, command.commandId);
|
|
254
256
|
if (command.disposition === SessionPromptDisposition.Queue) {
|
|
255
257
|
queueChanged(command.sessionId);
|
|
256
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-command-handler.js","sourceRoot":"","sources":["../src/daemon-command-handler.ts"],"names":[],"mappings":"AACA,OAAO,EACH,yBAAyB,EACzB,0BAA0B,EAC1B,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,cAAc,EACd,0BAA0B,EAC1B,2BAA2B,EAC3B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EACtB,gCAAgC,EAChC,iBAAiB,EACjB,mBAAmB,EACnB,sCAAsC,EACtC,+BAA+B,EAC/B,oBAAoB,EACpB,+BAA+B,EAC/B,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAAE,mCAAmC,EAAE,MAAM,oDAAoD,CAAC;AAEzG,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,OAAO,EAAE,sBAAsB,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,mCAAmC,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpH,OAAO,EAAE,iCAAiC,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-command-handler.js","sourceRoot":"","sources":["../src/daemon-command-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,18 @@ import { WebSocket } from "undici";
|
|
|
3
3
|
import type { AuditStore } from "./audit/audit-store.ts";
|
|
4
4
|
import type { DurationMetric } from "./infra/operation-metrics.ts";
|
|
5
5
|
import type { DaemonOperationState } from "./relay-connection/daemon-operation-state.ts";
|
|
6
|
-
import type {
|
|
6
|
+
import type { DaemonSessionEventLogV2 } from "./session-event-log-v2.ts";
|
|
7
7
|
export interface DaemonTurnCommand {
|
|
8
8
|
readonly commandId: string;
|
|
9
9
|
readonly sessionId: string;
|
|
10
10
|
}
|
|
11
11
|
export declare function send(socket: WebSocket, message: DaemonToServiceMessage): void;
|
|
12
|
-
export declare function reportFailure(publisher: DaemonSessionEventPublisher, command: DaemonTurnCommand, code: string, message: string): void;
|
|
13
12
|
/**
|
|
14
13
|
* Settles a Turn claimed by this live Runtime when its active process can no longer execute.
|
|
15
14
|
* A lost connection can deliver cancellation after the process has stopped; the in-memory
|
|
16
15
|
* receipt identifies the Attempt that should be reported as failed.
|
|
17
16
|
*/
|
|
18
|
-
export declare function settleAbandonedTurn(
|
|
17
|
+
export declare function settleAbandonedTurn(eventLog: DaemonSessionEventLogV2, operations: DaemonOperationState, audit: AuditStore, cancellation: SessionCancelCommand): Promise<void>;
|
|
19
18
|
export declare function operationErrorCode(error: unknown): string;
|
|
20
19
|
export declare function operationErrorMessage(error: unknown): string;
|
|
21
20
|
export declare function agentSettingsFailureDetails(agentId: string, failure: unknown): Readonly<Record<string, string>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-command-results.d.ts","sourceRoot":"","sources":["../src/daemon-command-results.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,sBAAsB,
|
|
1
|
+
{"version":3,"file":"daemon-command-results.d.ts","sourceRoot":"","sources":["../src/daemon-command-results.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,sBAAsB,EAE3B,KAAK,oBAAoB,EAC5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEzE,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC9B;AAED,wBAAgB,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAK7E;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,uBAAuB,EACjC,UAAU,EAAE,oBAAoB,EAChC,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,GACnC,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUzD;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAU5D;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAY/G;AAED,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,cAAc,GAAE,SAAS,cAAc,EAAO,GAC/C,IAAI,CAYN"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { encodeDaemonToServiceMessage,
|
|
1
|
+
import { encodeDaemonToServiceMessage, } from "@moxt-ai/mobius-protocol";
|
|
2
2
|
import { WebSocket } from "undici";
|
|
3
3
|
import { AcpConfigurationValueUnavailableError, AcpExecutionError } from "./acp/agent-runtime-manager.js";
|
|
4
4
|
import { LocalAgentCatalogError } from "./agent-catalog/local-agent.js";
|
|
@@ -10,21 +10,12 @@ export function send(socket, message) {
|
|
|
10
10
|
}
|
|
11
11
|
socket.send(encodeDaemonToServiceMessage(message));
|
|
12
12
|
}
|
|
13
|
-
export function reportFailure(publisher, command, code, message) {
|
|
14
|
-
publisher.publish(command.sessionId, {
|
|
15
|
-
code,
|
|
16
|
-
commandId: command.commandId,
|
|
17
|
-
kind: SESSION_FAILED_KIND,
|
|
18
|
-
message,
|
|
19
|
-
sessionId: command.sessionId,
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
13
|
/**
|
|
23
14
|
* Settles a Turn claimed by this live Runtime when its active process can no longer execute.
|
|
24
15
|
* A lost connection can deliver cancellation after the process has stopped; the in-memory
|
|
25
16
|
* receipt identifies the Attempt that should be reported as failed.
|
|
26
17
|
*/
|
|
27
|
-
export function settleAbandonedTurn(
|
|
18
|
+
export async function settleAbandonedTurn(eventLog, operations, audit, cancellation) {
|
|
28
19
|
const attemptId = operations.findUnsettledAttemptId(cancellation.commandId, cancellation.sessionId);
|
|
29
20
|
if (attemptId === null) {
|
|
30
21
|
console.warn("Mobius daemon ignored cancellation for an inactive turn");
|
|
@@ -35,8 +26,9 @@ export function settleAbandonedTurn(publisher, operations, audit, cancellation)
|
|
|
35
26
|
event: "session_abandoned_turn_settled",
|
|
36
27
|
sessionId: cancellation.sessionId,
|
|
37
28
|
});
|
|
38
|
-
|
|
29
|
+
await eventLog.failed(cancellation.sessionId, cancellation.commandId, "agent_execution_abandoned", "The local Agent execution was abandoned before it completed");
|
|
39
30
|
operations.transitionExecution(cancellation.commandId, "failed");
|
|
31
|
+
eventLog.publishTerminal(cancellation.sessionId, cancellation.commandId);
|
|
40
32
|
}
|
|
41
33
|
export function operationErrorCode(error) {
|
|
42
34
|
if (error instanceof AcpExecutionError ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-command-results.js","sourceRoot":"","sources":["../src/daemon-command-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,4BAA4B,
|
|
1
|
+
{"version":3,"file":"daemon-command-results.js","sourceRoot":"","sources":["../src/daemon-command-results.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,9 @@ import type { AuditStore } from "./audit/audit-store.ts";
|
|
|
4
4
|
import type { WorkspaceDirectoryService } from "./authorization/workspace-directory.ts";
|
|
5
5
|
import type { DaemonConfig } from "./config.ts";
|
|
6
6
|
import type { DaemonOperationState } from "./relay-connection/daemon-operation-state.ts";
|
|
7
|
-
import type { DaemonSessionEventPublisher } from "./relay-connection/session-event-publisher.ts";
|
|
8
|
-
import type { DaemonTimer } from "./relay-connection/timer.ts";
|
|
9
7
|
import type { DaemonSessionEventLogV2 } from "./session-event-log-v2.ts";
|
|
10
8
|
export interface ExecutePromptOptions {
|
|
11
9
|
readonly operations: DaemonOperationState;
|
|
12
|
-
readonly publisher: DaemonSessionEventPublisher;
|
|
13
10
|
readonly eventLogV2: DaemonSessionEventLogV2;
|
|
14
11
|
readonly command: SessionPromptCommand;
|
|
15
12
|
readonly config: DaemonConfig;
|
|
@@ -29,9 +26,8 @@ export interface ExecutePromptOptions {
|
|
|
29
26
|
} | {
|
|
30
27
|
readonly kind: "queue-target-unavailable";
|
|
31
28
|
}>;
|
|
32
|
-
readonly timer: DaemonTimer;
|
|
33
29
|
readonly signal: AbortSignal;
|
|
34
|
-
readonly
|
|
30
|
+
readonly recordTurnEvent: (event: {
|
|
35
31
|
readonly kind: typeof AGENT_MESSAGE_DELTA_KIND;
|
|
36
32
|
readonly messageId: string;
|
|
37
33
|
readonly text: string;
|
|
@@ -41,5 +37,5 @@ export interface ExecutePromptOptions {
|
|
|
41
37
|
readonly recordSteeringPrompt: () => boolean;
|
|
42
38
|
readonly cancellationRequested: () => boolean;
|
|
43
39
|
}
|
|
44
|
-
export declare function executePrompt({ operations,
|
|
40
|
+
export declare function executePrompt({ operations, eventLogV2, command, config, directories, audit, sessions, attemptId, activateAttempt, waitForSessionAvailability, signal, recordTurnEvent, recordSteeringPrompt, cancellationRequested, }: ExecutePromptOptions): Promise<void>;
|
|
45
41
|
//# sourceMappingURL=daemon-prompt-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-prompt-executor.d.ts","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,wBAAwB,EAExB,KAAK,oBAAoB,
|
|
1
|
+
{"version":3,"file":"daemon-prompt-executor.d.ts","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,wBAAwB,EAExB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAE5B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAqB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAM7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAsBzE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KAAE,CAAC;IACjF,QAAQ,CAAC,0BAA0B,EAAE,CACjC,MAAM,EAAE,WAAW,KAClB,OAAO,CACN;QAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAC5D;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACzB;QAAE,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAA;KAAE,CAClD,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,CACtB,KAAK,EACC;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,wBAAwB,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACrG,OAAO,CAAC,oBAAoB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,wBAAwB,CAAA;KAAE,CAAC,KACtF,oBAAoB,CAAC;IAC1B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,OAAO,CAAC;IAC7C,QAAQ,CAAC,qBAAqB,EAAE,MAAM,OAAO,CAAC;CACjD;AAED,wBAAsB,aAAa,CAAC,EAChC,UAAU,EACV,UAAU,EACV,OAAO,EACP,MAAM,EACN,WAAW,EACX,KAAK,EACL,QAAQ,EACR,SAAS,EACT,eAAe,EACf,0BAA0B,EAC1B,MAAM,EACN,eAAe,EACf,oBAAoB,EACpB,qBAAqB,GACxB,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6JtC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { AGENT_ACTIVITY_KIND, AGENT_ACTIVITY_NARRATION_KIND, AGENT_MESSAGE_DELTA_KIND,
|
|
1
|
+
import { AGENT_ACTIVITY_KIND, AGENT_ACTIVITY_NARRATION_KIND, AGENT_MESSAGE_DELTA_KIND, SessionPromptDisposition, } from "@moxt-ai/mobius-protocol";
|
|
2
2
|
import { AcpExecutionError } from "./acp/agent-runtime-manager.js";
|
|
3
3
|
import { agentForSessionConfiguration, applyCompleteSessionConfiguration, assertAppliedSessionConfiguration, } from "./acp/session-config/apply-session-configuration.js";
|
|
4
4
|
import { resolveSessionDirectories } from "./authorization/resolve-session-directories.js";
|
|
5
|
-
import { operationErrorCode, operationErrorMessage
|
|
5
|
+
import { operationErrorCode, operationErrorMessage } from "./daemon-command-results.js";
|
|
6
6
|
import { resolvePromptArtifacts } from "./prompt-artifact-resolver.js";
|
|
7
|
-
import { CoalescingAgentEventPublisher } from "./relay-connection/coalescing-agent-event-publisher.js";
|
|
8
7
|
function daemonActivity(command, activity) {
|
|
9
8
|
return {
|
|
10
9
|
activityId: activity.activityId,
|
|
@@ -24,28 +23,7 @@ function daemonActivity(command, activity) {
|
|
|
24
23
|
toolKind: activity.toolKind,
|
|
25
24
|
};
|
|
26
25
|
}
|
|
27
|
-
export async function executePrompt({ operations,
|
|
28
|
-
const events = new CoalescingAgentEventPublisher(timer, (event) => {
|
|
29
|
-
if (event.kind === "text") {
|
|
30
|
-
publisher.publish(command.sessionId, recordLiveEvent({ kind: AGENT_MESSAGE_DELTA_KIND, messageId: event.messageId, text: event.text }));
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
if (event.kind === "narration") {
|
|
34
|
-
const recorded = {
|
|
35
|
-
activityId: event.increment.activityId,
|
|
36
|
-
activityType: event.increment.activityType,
|
|
37
|
-
commandId: command.commandId,
|
|
38
|
-
kind: AGENT_ACTIVITY_NARRATION_KIND,
|
|
39
|
-
sequence: event.increment.sequence,
|
|
40
|
-
sessionId: command.sessionId,
|
|
41
|
-
text: event.increment.text,
|
|
42
|
-
};
|
|
43
|
-
publisher.publish(command.sessionId, recordLiveEvent(recorded));
|
|
44
|
-
return;
|
|
45
|
-
}
|
|
46
|
-
const activity = daemonActivity(command, event.activity);
|
|
47
|
-
publisher.publish(command.sessionId, recordLiveEvent(activity));
|
|
48
|
-
});
|
|
26
|
+
export async function executePrompt({ operations, eventLogV2, command, config, directories, audit, sessions, attemptId, activateAttempt, waitForSessionAvailability, signal, recordTurnEvent, recordSteeringPrompt, cancellationRequested, }) {
|
|
49
27
|
try {
|
|
50
28
|
const resolved = await resolveSessionDirectories(directories, command.bindingId, command.directoryId, command.additionalDirectoryIds, signal);
|
|
51
29
|
const agent = config.catalog.find(command.agentId);
|
|
@@ -95,33 +73,6 @@ export async function executePrompt({ operations, publisher, eventLogV2, command
|
|
|
95
73
|
}
|
|
96
74
|
const stream = activateAttempt();
|
|
97
75
|
const lifecycleV2 = eventLogV2.started(command.sessionId, command.commandId, attemptId, stream.epoch);
|
|
98
|
-
if (!prepared.prompted) {
|
|
99
|
-
const listing = await directories.list(config.bindingId, command.directoryId, signal);
|
|
100
|
-
publisher.publish(command.sessionId, {
|
|
101
|
-
additionalDirectories: resolved.additionalDirectoryEntries,
|
|
102
|
-
agentId: command.agentId,
|
|
103
|
-
agentName: prepared.agentName,
|
|
104
|
-
agentVersion: prepared.agentVersion,
|
|
105
|
-
capabilities: prepared.capabilities,
|
|
106
|
-
commands: prepared.commands,
|
|
107
|
-
configOptions: prepared.configOptions,
|
|
108
|
-
directoryId: command.directoryId,
|
|
109
|
-
directoryLabel: listing.directoryLabel,
|
|
110
|
-
kind: SESSION_READY_KIND,
|
|
111
|
-
requestId: command.commandId,
|
|
112
|
-
restored: prepared.restored,
|
|
113
|
-
sessionId: command.sessionId,
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
publisher.publish(command.sessionId, {
|
|
117
|
-
commandId: command.commandId,
|
|
118
|
-
epoch: stream.epoch,
|
|
119
|
-
kind: SESSION_STARTED_KIND,
|
|
120
|
-
attemptId,
|
|
121
|
-
prompt: command.prompt,
|
|
122
|
-
sequence: stream.sequence,
|
|
123
|
-
sessionId: command.sessionId,
|
|
124
|
-
});
|
|
125
76
|
const attachments = await resolvePromptArtifacts(config, command, signal);
|
|
126
77
|
let stopReason;
|
|
127
78
|
if (availability.disposition === SessionPromptDisposition.Steer) {
|
|
@@ -149,9 +100,20 @@ export async function executePrompt({ operations, publisher, eventLogV2, command
|
|
|
149
100
|
disposition: availability.disposition,
|
|
150
101
|
images: attachments.images,
|
|
151
102
|
lifecycleV2,
|
|
152
|
-
onActivity:
|
|
153
|
-
|
|
154
|
-
|
|
103
|
+
onActivity: async (activity) => {
|
|
104
|
+
recordTurnEvent(daemonActivity(command, activity));
|
|
105
|
+
},
|
|
106
|
+
onNarration: async (increment) => {
|
|
107
|
+
recordTurnEvent({
|
|
108
|
+
...increment,
|
|
109
|
+
commandId: command.commandId,
|
|
110
|
+
sessionId: command.sessionId,
|
|
111
|
+
kind: AGENT_ACTIVITY_NARRATION_KIND,
|
|
112
|
+
});
|
|
113
|
+
},
|
|
114
|
+
onText: async (text, messageId) => {
|
|
115
|
+
recordTurnEvent({ kind: AGENT_MESSAGE_DELTA_KIND, text, messageId });
|
|
116
|
+
},
|
|
155
117
|
prompt: command.prompt,
|
|
156
118
|
resources: attachments.resources,
|
|
157
119
|
sessionId: command.sessionId,
|
|
@@ -160,14 +122,7 @@ export async function executePrompt({ operations, publisher, eventLogV2, command
|
|
|
160
122
|
});
|
|
161
123
|
stopReason = result.stopReason;
|
|
162
124
|
}
|
|
163
|
-
|
|
164
|
-
publisher.publish(command.sessionId, {
|
|
165
|
-
commandId: command.commandId,
|
|
166
|
-
kind: SESSION_COMPLETED_KIND,
|
|
167
|
-
sessionId: command.sessionId,
|
|
168
|
-
stopReason,
|
|
169
|
-
});
|
|
170
|
-
eventLogV2.completed(command.sessionId, command.commandId, stopReason);
|
|
125
|
+
await eventLogV2.completed(command.sessionId, command.commandId, stopReason);
|
|
171
126
|
operations.transitionExecution(command.commandId, stopReason === "cancelled" ? "cancelled" : "succeeded");
|
|
172
127
|
audit.record({
|
|
173
128
|
commandId: command.commandId,
|
|
@@ -176,15 +131,8 @@ export async function executePrompt({ operations, publisher, eventLogV2, command
|
|
|
176
131
|
});
|
|
177
132
|
}
|
|
178
133
|
catch (error) {
|
|
179
|
-
events.flush();
|
|
180
134
|
if (signal.aborted && cancellationRequested()) {
|
|
181
|
-
|
|
182
|
-
commandId: command.commandId,
|
|
183
|
-
kind: SESSION_COMPLETED_KIND,
|
|
184
|
-
sessionId: command.sessionId,
|
|
185
|
-
stopReason: "cancelled",
|
|
186
|
-
});
|
|
187
|
-
eventLogV2.completed(command.sessionId, command.commandId, "cancelled");
|
|
135
|
+
await eventLogV2.completed(command.sessionId, command.commandId, "cancelled");
|
|
188
136
|
operations.transitionExecution(command.commandId, "cancelled");
|
|
189
137
|
audit.record({
|
|
190
138
|
commandId: command.commandId,
|
|
@@ -203,8 +151,7 @@ export async function executePrompt({ operations, publisher, eventLogV2, command
|
|
|
203
151
|
const failureMessage = code === "session_operation_failed"
|
|
204
152
|
? "The local agent could not complete the request"
|
|
205
153
|
: operationErrorMessage(error);
|
|
206
|
-
eventLogV2.failed(command.sessionId, command.commandId, failureCode, failureMessage);
|
|
207
|
-
reportFailure(publisher, command, failureCode, failureMessage);
|
|
154
|
+
await eventLogV2.failed(command.sessionId, command.commandId, failureCode, failureMessage);
|
|
208
155
|
operations.transitionExecution(command.commandId, "failed");
|
|
209
156
|
console.error("Mobius daemon command failed", error);
|
|
210
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-prompt-executor.js","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,6BAA6B,EAC7B,wBAAwB,
|
|
1
|
+
{"version":3,"file":"daemon-prompt-executor.js","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,7 @@ import type { AuditStore } from "./audit/audit-store.ts";
|
|
|
5
5
|
import type { WorkspaceDirectoryService } from "./authorization/workspace-directory.ts";
|
|
6
6
|
import type { DaemonConfig } from "./config.ts";
|
|
7
7
|
import type { RelayConnectionDiagnostics } from "./relay-connection/diagnostics.ts";
|
|
8
|
-
import type { DaemonSessionEventPublisher } from "./relay-connection/session-event-publisher.ts";
|
|
9
8
|
export declare function executeWorkspaceList(socket: WebSocket, command: WorkspaceListCommand, directories: WorkspaceDirectoryService, audit: AuditStore, signal: AbortSignal): Promise<void>;
|
|
10
|
-
export declare function executeSessionPrepare(
|
|
11
|
-
export declare function executeSessionConfigure(
|
|
9
|
+
export declare function executeSessionPrepare(socket: WebSocket, command: SessionPrepareCommand, config: DaemonConfig, directories: WorkspaceDirectoryService, audit: AuditStore, sessions: AgentRuntimeManager, diagnostics: RelayConnectionDiagnostics, signal: AbortSignal): Promise<void>;
|
|
10
|
+
export declare function executeSessionConfigure(socket: WebSocket, command: SessionConfigureCommand, config: DaemonConfig, directories: WorkspaceDirectoryService, audit: AuditStore, sessions: AgentRuntimeManager, signal: AbortSignal): Promise<void>;
|
|
12
11
|
//# sourceMappingURL=daemon-session-commands.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-session-commands.d.ts","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,uBAAuB,EACvB,qBAAqB,EAErB,oBAAoB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,
|
|
1
|
+
{"version":3,"file":"daemon-session-commands.d.ts","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,uBAAuB,EACvB,qBAAqB,EAErB,oBAAoB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,oBAAoB,EAC7B,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAsB,qBAAqB,CACvC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAuGf;AAED,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,uBAAuB,EAChC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAsCf"}
|
|
@@ -23,7 +23,7 @@ export async function executeWorkspaceList(socket, command, directories, audit,
|
|
|
23
23
|
reportOperationFailure(socket, command.requestId, "", error);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
export async function executeSessionPrepare(
|
|
26
|
+
export async function executeSessionPrepare(socket, command, config, directories, audit, sessions, diagnostics, signal) {
|
|
27
27
|
const metrics = new AccumulatingOperationMetrics();
|
|
28
28
|
try {
|
|
29
29
|
const readyEvent = await metrics.measure("prepare-total", async () => {
|
|
@@ -62,12 +62,6 @@ export async function executeSessionPrepare(publisher, socket, command, config,
|
|
|
62
62
|
event: "session_configured",
|
|
63
63
|
sessionId: command.sessionId,
|
|
64
64
|
});
|
|
65
|
-
publisher.publish(command.sessionId, {
|
|
66
|
-
configOptions,
|
|
67
|
-
kind: "session.config.updated",
|
|
68
|
-
requestId: command.requestId,
|
|
69
|
-
sessionId: command.sessionId,
|
|
70
|
-
});
|
|
71
65
|
}
|
|
72
66
|
const event = {
|
|
73
67
|
additionalDirectories: resolved.additionalDirectoryEntries,
|
|
@@ -85,12 +79,6 @@ export async function executeSessionPrepare(publisher, socket, command, config,
|
|
|
85
79
|
sessionId: command.sessionId,
|
|
86
80
|
runtimeTimings: metrics.snapshot(),
|
|
87
81
|
};
|
|
88
|
-
// Inspection-only preparation returns readiness to its caller without broadcasting it.
|
|
89
|
-
if (command.transient !== true) {
|
|
90
|
-
metrics.measureSync("readiness-commit", () => {
|
|
91
|
-
publisher.publish(command.sessionId, event);
|
|
92
|
-
});
|
|
93
|
-
}
|
|
94
82
|
return event;
|
|
95
83
|
});
|
|
96
84
|
send(socket, {
|
|
@@ -116,7 +104,7 @@ export async function executeSessionPrepare(publisher, socket, command, config,
|
|
|
116
104
|
reportOperationFailure(socket, command.requestId, command.sessionId, error, metrics.snapshot());
|
|
117
105
|
}
|
|
118
106
|
}
|
|
119
|
-
export async function executeSessionConfigure(
|
|
107
|
+
export async function executeSessionConfigure(socket, command, config, directories, audit, sessions, signal) {
|
|
120
108
|
try {
|
|
121
109
|
const resolved = await resolveSessionDirectories(directories, config.bindingId, command.directoryId, command.additionalDirectoryIds, signal);
|
|
122
110
|
const configOptions = await sessions.configureSession({
|
|
@@ -136,7 +124,7 @@ export async function executeSessionConfigure(publisher, socket, command, config
|
|
|
136
124
|
event: "session_configured",
|
|
137
125
|
sessionId: command.sessionId,
|
|
138
126
|
});
|
|
139
|
-
|
|
127
|
+
send(socket, {
|
|
140
128
|
configOptions,
|
|
141
129
|
kind: "session.config.updated",
|
|
142
130
|
requestId: command.requestId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-session-commands.js","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAG3F,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC/F,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-session-commands.js","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"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"}
|