crewx-bridge 0.2.7 → 0.2.8
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/README.md +78 -8
- package/dist/api.d.ts +10 -1
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +102 -7
- package/dist/api.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +2 -2
- package/dist/config.js.map +1 -1
- package/dist/daemon-lock.d.ts +29 -0
- package/dist/daemon-lock.d.ts.map +1 -0
- package/dist/daemon-lock.js +257 -0
- package/dist/daemon-lock.js.map +1 -0
- package/dist/daemon.d.ts +21 -4
- package/dist/daemon.d.ts.map +1 -1
- package/dist/daemon.js +466 -140
- package/dist/daemon.js.map +1 -1
- package/dist/errors.d.ts +12 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +19 -5
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +16 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +100 -19
- package/dist/index.js.map +1 -1
- package/dist/journal.d.ts +51 -1
- package/dist/journal.d.ts.map +1 -1
- package/dist/journal.js +213 -4
- package/dist/journal.js.map +1 -1
- package/dist/outcomes.d.ts +12 -0
- package/dist/outcomes.d.ts.map +1 -0
- package/dist/outcomes.js +52 -0
- package/dist/outcomes.js.map +1 -0
- package/dist/service.d.ts +14 -0
- package/dist/service.d.ts.map +1 -1
- package/dist/service.js +80 -1
- package/dist/service.js.map +1 -1
- package/dist/supervisor.d.ts +12 -2
- package/dist/supervisor.d.ts.map +1 -1
- package/dist/supervisor.js +105 -14
- package/dist/supervisor.js.map +1 -1
- package/package.json +3 -3
package/dist/journal.js
CHANGED
|
@@ -4,7 +4,7 @@ import { bridgeJournalPath, readSecureText, writeSecureText, } from "./config.js
|
|
|
4
4
|
import { BridgeError } from "./errors.js";
|
|
5
5
|
const JournalCommandSchema = z
|
|
6
6
|
.object({
|
|
7
|
-
state: z.enum(["accepted", "succeeded", "failed"]),
|
|
7
|
+
state: z.enum(["prepared", "accepted", "succeeded", "failed"]),
|
|
8
8
|
runId: z.uuid(),
|
|
9
9
|
type: z.enum(["start_agent", "stop_agent"]),
|
|
10
10
|
result: z
|
|
@@ -17,13 +17,40 @@ const JournalCommandSchema = z
|
|
|
17
17
|
.strict()
|
|
18
18
|
.optional(),
|
|
19
19
|
errorCode: z.string().max(80).optional(),
|
|
20
|
+
errorMessage: z.string().max(1_000).optional(),
|
|
21
|
+
reconciliation: z
|
|
22
|
+
.object({
|
|
23
|
+
state: z.enum(["pending", "quarantined"]),
|
|
24
|
+
attempts: z.number().int().nonnegative(),
|
|
25
|
+
lastAttemptAt: z.iso.datetime({ offset: true }),
|
|
26
|
+
status: z.number().int().min(400).max(599).optional(),
|
|
27
|
+
errorCode: z.string().max(80).optional(),
|
|
28
|
+
errorMessage: z.string().max(500).optional(),
|
|
29
|
+
compatibility: z.literal("legacy_lease").optional(),
|
|
30
|
+
quarantinedAt: z.iso.datetime({ offset: true }).optional(),
|
|
31
|
+
})
|
|
32
|
+
.strict()
|
|
33
|
+
.optional(),
|
|
34
|
+
resolution: z
|
|
35
|
+
.object({
|
|
36
|
+
action: z.enum(["retry", "accept_server_state"]),
|
|
37
|
+
resolvedAt: z.iso.datetime({ offset: true }),
|
|
38
|
+
previousAttempts: z.number().int().nonnegative(),
|
|
39
|
+
previousStatus: z.number().int().min(400).max(599).optional(),
|
|
40
|
+
previousErrorCode: z.string().max(80).optional(),
|
|
41
|
+
previousErrorMessage: z.string().max(500).optional(),
|
|
42
|
+
})
|
|
43
|
+
.strict()
|
|
44
|
+
.optional(),
|
|
20
45
|
updatedAt: z.iso.datetime({ offset: true }),
|
|
46
|
+
reportedAt: z.iso.datetime({ offset: true }).optional(),
|
|
21
47
|
})
|
|
22
48
|
.strict();
|
|
23
49
|
const JournalRunSchema = z
|
|
24
50
|
.object({
|
|
25
51
|
status: BridgeRunStatusSchema,
|
|
26
52
|
pid: z.number().int().positive().nullable(),
|
|
53
|
+
processNonce: z.string().regex(/^[A-Za-z0-9_-]{32,128}$/).optional(),
|
|
27
54
|
adapter: AgentAdapterSchema,
|
|
28
55
|
folderId: z.uuid(),
|
|
29
56
|
startedAt: z.iso.datetime({ offset: true }).nullable(),
|
|
@@ -46,6 +73,13 @@ const EMPTY_JOURNAL = {
|
|
|
46
73
|
commands: {},
|
|
47
74
|
runs: {},
|
|
48
75
|
};
|
|
76
|
+
export const MAX_JOURNAL_BYTES = 1024 * 1024;
|
|
77
|
+
export const MAX_JOURNAL_RECOVERY_BYTES = 8 * 1024 * 1024;
|
|
78
|
+
const MAX_REPORTED_COMMANDS = 512;
|
|
79
|
+
const MAX_TERMINAL_RUNS = 256;
|
|
80
|
+
function terminalRun(run) {
|
|
81
|
+
return ["stopped", "failed", "lost"].includes(run.status);
|
|
82
|
+
}
|
|
49
83
|
export class BridgeJournal {
|
|
50
84
|
path;
|
|
51
85
|
state;
|
|
@@ -54,7 +88,7 @@ export class BridgeJournal {
|
|
|
54
88
|
this.path = bridgeJournalPath(environment, platform);
|
|
55
89
|
}
|
|
56
90
|
async load() {
|
|
57
|
-
const raw = await readSecureText(this.path);
|
|
91
|
+
const raw = await readSecureText(this.path, MAX_JOURNAL_RECOVERY_BYTES);
|
|
58
92
|
if (!raw) {
|
|
59
93
|
this.state = structuredClone(EMPTY_JOURNAL);
|
|
60
94
|
return;
|
|
@@ -73,6 +107,8 @@ export class BridgeJournal {
|
|
|
73
107
|
throw new BridgeError("invalid_journal", "The local Bridge journal has an unsupported or unsafe shape.");
|
|
74
108
|
}
|
|
75
109
|
this.state = result.data;
|
|
110
|
+
if (this.compact())
|
|
111
|
+
await this.persist();
|
|
76
112
|
}
|
|
77
113
|
getCommand(commandId) {
|
|
78
114
|
return this.current().commands[commandId];
|
|
@@ -90,6 +126,89 @@ export class BridgeJournal {
|
|
|
90
126
|
...run,
|
|
91
127
|
}));
|
|
92
128
|
}
|
|
129
|
+
unreportedOutcomes(limit = 32) {
|
|
130
|
+
return Object.entries(this.current().commands)
|
|
131
|
+
.filter(([, command]) => (command.state === "succeeded" || command.state === "failed") &&
|
|
132
|
+
command.reportedAt === undefined &&
|
|
133
|
+
command.reconciliation?.state !== "quarantined")
|
|
134
|
+
.sort(([, left], [, right]) => (left.reconciliation?.lastAttemptAt ?? left.updatedAt).localeCompare(right.reconciliation?.lastAttemptAt ?? right.updatedAt))
|
|
135
|
+
.slice(0, Math.max(0, limit))
|
|
136
|
+
.map(([id, command]) => ({ id, ...command }));
|
|
137
|
+
}
|
|
138
|
+
quarantinedOutcomes(limit = 16) {
|
|
139
|
+
return Object.entries(this.current().commands)
|
|
140
|
+
.filter(([, command]) => command.reportedAt === undefined &&
|
|
141
|
+
command.reconciliation?.state === "quarantined")
|
|
142
|
+
.sort(([, left], [, right]) => (left.reconciliation?.quarantinedAt ?? left.updatedAt).localeCompare(right.reconciliation?.quarantinedAt ?? right.updatedAt))
|
|
143
|
+
.slice(0, Math.max(0, limit))
|
|
144
|
+
.map(([id, command]) => ({ id, ...command }));
|
|
145
|
+
}
|
|
146
|
+
requiresClaimBackpressure() {
|
|
147
|
+
return (this.quarantinedOutcomes(1).length > 0 ||
|
|
148
|
+
Object.values(this.current().commands).some((command) => (command.state === "succeeded" || command.state === "failed") &&
|
|
149
|
+
command.reportedAt === undefined &&
|
|
150
|
+
command.reconciliation?.state !== "quarantined" &&
|
|
151
|
+
command.reconciliation?.compatibility !== "legacy_lease"));
|
|
152
|
+
}
|
|
153
|
+
async retryQuarantinedOutcome(commandId) {
|
|
154
|
+
const command = this.requireQuarantinedOutcome(commandId);
|
|
155
|
+
const now = new Date().toISOString();
|
|
156
|
+
this.current().commands[commandId] = {
|
|
157
|
+
...command,
|
|
158
|
+
reconciliation: {
|
|
159
|
+
state: "pending",
|
|
160
|
+
attempts: 0,
|
|
161
|
+
lastAttemptAt: now,
|
|
162
|
+
...(command.reconciliation?.status !== undefined
|
|
163
|
+
? { status: command.reconciliation.status }
|
|
164
|
+
: {}),
|
|
165
|
+
...(command.reconciliation?.errorCode
|
|
166
|
+
? { errorCode: command.reconciliation.errorCode }
|
|
167
|
+
: {}),
|
|
168
|
+
...(command.reconciliation?.errorMessage
|
|
169
|
+
? { errorMessage: command.reconciliation.errorMessage }
|
|
170
|
+
: {}),
|
|
171
|
+
},
|
|
172
|
+
resolution: this.operatorResolution(command, "retry", now),
|
|
173
|
+
updatedAt: now,
|
|
174
|
+
};
|
|
175
|
+
await this.persist();
|
|
176
|
+
}
|
|
177
|
+
async acceptServerState(commandId) {
|
|
178
|
+
const command = this.requireQuarantinedOutcome(commandId);
|
|
179
|
+
const now = new Date().toISOString();
|
|
180
|
+
this.current().commands[commandId] = {
|
|
181
|
+
...command,
|
|
182
|
+
resolution: this.operatorResolution(command, "accept_server_state", now),
|
|
183
|
+
reportedAt: now,
|
|
184
|
+
updatedAt: now,
|
|
185
|
+
};
|
|
186
|
+
await this.persist();
|
|
187
|
+
}
|
|
188
|
+
async recordReconciliationFailure(commandId, failure) {
|
|
189
|
+
const command = this.current().commands[commandId];
|
|
190
|
+
if (!command || command.reportedAt !== undefined)
|
|
191
|
+
return;
|
|
192
|
+
const now = new Date().toISOString();
|
|
193
|
+
this.current().commands[commandId] = {
|
|
194
|
+
...command,
|
|
195
|
+
reconciliation: {
|
|
196
|
+
state: failure.quarantined ? "quarantined" : "pending",
|
|
197
|
+
attempts: (command.reconciliation?.attempts ?? 0) + 1,
|
|
198
|
+
lastAttemptAt: now,
|
|
199
|
+
...(failure.status !== undefined ? { status: failure.status } : {}),
|
|
200
|
+
...(failure.errorCode ? { errorCode: failure.errorCode } : {}),
|
|
201
|
+
...(failure.errorMessage
|
|
202
|
+
? { errorMessage: failure.errorMessage.slice(0, 500) }
|
|
203
|
+
: {}),
|
|
204
|
+
...(failure.compatibility
|
|
205
|
+
? { compatibility: failure.compatibility }
|
|
206
|
+
: {}),
|
|
207
|
+
...(failure.quarantined ? { quarantinedAt: now } : {}),
|
|
208
|
+
},
|
|
209
|
+
};
|
|
210
|
+
await this.persist();
|
|
211
|
+
}
|
|
93
212
|
async recordCommand(commandId, command) {
|
|
94
213
|
this.current().commands[commandId] = {
|
|
95
214
|
...command,
|
|
@@ -97,6 +216,16 @@ export class BridgeJournal {
|
|
|
97
216
|
};
|
|
98
217
|
await this.persist();
|
|
99
218
|
}
|
|
219
|
+
async markCommandReported(commandId) {
|
|
220
|
+
const command = this.current().commands[commandId];
|
|
221
|
+
if (!command)
|
|
222
|
+
return;
|
|
223
|
+
this.current().commands[commandId] = {
|
|
224
|
+
...command,
|
|
225
|
+
reportedAt: new Date().toISOString(),
|
|
226
|
+
};
|
|
227
|
+
await this.persist();
|
|
228
|
+
}
|
|
100
229
|
async recordRun(runId, run) {
|
|
101
230
|
this.current().runs[runId] = JournalRunSchema.parse(run);
|
|
102
231
|
await this.persist();
|
|
@@ -107,10 +236,90 @@ export class BridgeJournal {
|
|
|
107
236
|
}
|
|
108
237
|
return this.state;
|
|
109
238
|
}
|
|
239
|
+
requireQuarantinedOutcome(commandId) {
|
|
240
|
+
const command = this.current().commands[commandId];
|
|
241
|
+
if (!command ||
|
|
242
|
+
command.reportedAt !== undefined ||
|
|
243
|
+
command.reconciliation?.state !== "quarantined") {
|
|
244
|
+
throw new BridgeError("outcome_not_quarantined", `Bridge command ${commandId} is not a quarantined outcome.`, 1, { retryable: false });
|
|
245
|
+
}
|
|
246
|
+
return command;
|
|
247
|
+
}
|
|
248
|
+
operatorResolution(command, action, resolvedAt) {
|
|
249
|
+
return {
|
|
250
|
+
action,
|
|
251
|
+
resolvedAt,
|
|
252
|
+
previousAttempts: command.reconciliation?.attempts ?? 0,
|
|
253
|
+
...(command.reconciliation?.status !== undefined
|
|
254
|
+
? { previousStatus: command.reconciliation.status }
|
|
255
|
+
: {}),
|
|
256
|
+
...(command.reconciliation?.errorCode
|
|
257
|
+
? { previousErrorCode: command.reconciliation.errorCode }
|
|
258
|
+
: {}),
|
|
259
|
+
...(command.reconciliation?.errorMessage
|
|
260
|
+
? { previousErrorMessage: command.reconciliation.errorMessage }
|
|
261
|
+
: {}),
|
|
262
|
+
};
|
|
263
|
+
}
|
|
264
|
+
compact() {
|
|
265
|
+
const state = this.current();
|
|
266
|
+
const originalCommands = Object.keys(state.commands).length;
|
|
267
|
+
const originalRuns = Object.keys(state.runs).length;
|
|
268
|
+
const protectedCommands = Object.entries(state.commands).filter(([, command]) => command.state === "prepared" ||
|
|
269
|
+
command.state === "accepted" ||
|
|
270
|
+
command.reportedAt === undefined);
|
|
271
|
+
const reportedCommands = Object.entries(state.commands)
|
|
272
|
+
.filter(([, command]) => command.reportedAt !== undefined)
|
|
273
|
+
.sort(([, left], [, right]) => right.updatedAt.localeCompare(left.updatedAt))
|
|
274
|
+
.slice(0, MAX_REPORTED_COMMANDS);
|
|
275
|
+
state.commands = Object.fromEntries([
|
|
276
|
+
...reportedCommands,
|
|
277
|
+
...protectedCommands,
|
|
278
|
+
]);
|
|
279
|
+
const protectedRunIds = new Set(Object.values(state.commands).map((command) => command.runId));
|
|
280
|
+
const protectedRuns = Object.entries(state.runs).filter(([id, run]) => !terminalRun(run) || protectedRunIds.has(id));
|
|
281
|
+
const terminalRuns = Object.entries(state.runs)
|
|
282
|
+
.filter(([id, run]) => terminalRun(run) && !protectedRunIds.has(id))
|
|
283
|
+
.sort(([, left], [, right]) => (right.endedAt ?? right.startedAt ?? "").localeCompare(left.endedAt ?? left.startedAt ?? ""))
|
|
284
|
+
.slice(0, MAX_TERMINAL_RUNS);
|
|
285
|
+
state.runs = Object.fromEntries([...protectedRuns, ...terminalRuns]);
|
|
286
|
+
let snapshot = `${JSON.stringify(JournalSchema.parse(state), null, 2)}\n`;
|
|
287
|
+
while (Buffer.byteLength(snapshot) > MAX_JOURNAL_BYTES) {
|
|
288
|
+
const referencedRunIds = new Set(Object.values(state.commands).map((command) => command.runId));
|
|
289
|
+
const removableRun = Object.entries(state.runs)
|
|
290
|
+
.filter(([id, run]) => terminalRun(run) && !referencedRunIds.has(id))
|
|
291
|
+
.sort(([, left], [, right]) => (left.endedAt ?? left.startedAt ?? "").localeCompare(right.endedAt ?? right.startedAt ?? ""))[0];
|
|
292
|
+
if (removableRun) {
|
|
293
|
+
delete state.runs[removableRun[0]];
|
|
294
|
+
snapshot = `${JSON.stringify(JournalSchema.parse(state), null, 2)}\n`;
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
const removableCommand = Object.entries(state.commands)
|
|
298
|
+
.filter(([, command]) => command.reportedAt !== undefined)
|
|
299
|
+
.sort(([, left], [, right]) => left.updatedAt.localeCompare(right.updatedAt))[0];
|
|
300
|
+
if (removableCommand) {
|
|
301
|
+
const removedRunId = removableCommand[1].runId;
|
|
302
|
+
delete state.commands[removableCommand[0]];
|
|
303
|
+
const removedRun = state.runs[removedRunId];
|
|
304
|
+
const stillReferenced = Object.values(state.commands).some((command) => command.runId === removedRunId);
|
|
305
|
+
if (removedRun && terminalRun(removedRun) && !stillReferenced) {
|
|
306
|
+
delete state.runs[removedRunId];
|
|
307
|
+
}
|
|
308
|
+
snapshot = `${JSON.stringify(JournalSchema.parse(state), null, 2)}\n`;
|
|
309
|
+
continue;
|
|
310
|
+
}
|
|
311
|
+
throw new BridgeError("journal_capacity_exceeded", "The Bridge journal contains too much pending recovery state. Resolve or revoke the affected runs before starting new work.");
|
|
312
|
+
}
|
|
313
|
+
return (originalCommands !== Object.keys(state.commands).length ||
|
|
314
|
+
originalRuns !== Object.keys(state.runs).length);
|
|
315
|
+
}
|
|
110
316
|
async persist() {
|
|
317
|
+
this.compact();
|
|
111
318
|
const snapshot = JSON.stringify(JournalSchema.parse(this.current()), null, 2);
|
|
112
|
-
|
|
113
|
-
|
|
319
|
+
const previousWrite = this.writes;
|
|
320
|
+
const write = previousWrite.catch(() => undefined).then(() => writeSecureText(this.path, `${snapshot}\n`));
|
|
321
|
+
this.writes = write;
|
|
322
|
+
await write;
|
|
114
323
|
}
|
|
115
324
|
}
|
|
116
325
|
//# sourceMappingURL=journal.js.map
|
package/dist/journal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../src/journal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,iBAAiB,EAEjB,cAAc,EACd,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,oBAAoB,GAAG,CAAC;KAC3B,MAAM,CAAC;IACN,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAClD,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE;IACf,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC3C,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,UAAU,EAAE,qBAAqB,CAAC,QAAQ,EAAE;QAC5C,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;QACtD,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;QACjD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;KACjD,CAAC;SACD,MAAM,EAAE;SACR,QAAQ,EAAE;IACb,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;CAC5C,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,gBAAgB,GAAG,CAAC;KACvB,MAAM,CAAC;IACN,MAAM,EAAE,qBAAqB;IAC7B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC3C,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE;IAClB,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE;IACtD,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC/D,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAChD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAChD,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;CAC/C,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACrB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC;IACpD,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC;CAC7C,CAAC;KACD,MAAM,EAAE,CAAC;AAGZ,MAAM,aAAa,GAAiB;IAClC,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,EAAE;IACZ,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,MAAM,OAAO,aAAa;IACf,IAAI,CAAS;IACd,KAAK,CAA2B;IAChC,MAAM,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAElD,YACE,cAAqC,OAAO,CAAC,GAAG,EAChD,QAAQ,GAAG,OAAO,CAAC,QAAQ;QAE3B,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QACD,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,WAAW,CAAC,iBAAiB,EAAE,2CAA2C,EAAE,CAAC,EAAE;gBACvF,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,WAAW,CACnB,iBAAiB,EACjB,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,UAAU,CAAC,SAAiB;QAC1B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,IAAI,EAAE;aACf,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACd,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CACzD,CAAC;IACN,CAAC;IAED,IAAI;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,EAAE;YACF,GAAG,GAAG;SACP,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,SAAiB,EACjB,OAA0C;QAE1C,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG;YACnC,GAAG,OAAO;YACV,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;QACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,SAAS,CACb,KAAa,EACb,GAAe;QAEf,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAEO,OAAO;QACb,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,WAAW,CACnB,oBAAoB,EACpB,+CAA+C,CAChD,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAClC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,IAAI,CAAC,CAC5C,CAAC;QACF,MAAM,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../src/journal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type BridgeDaemonLockLike } from "./daemon-lock.js";
|
|
2
|
+
import { BridgeJournal } from "./journal.js";
|
|
3
|
+
import { type InspectBridgeRunner } from "./supervisor.js";
|
|
4
|
+
export interface OutcomeControlOptions {
|
|
5
|
+
journal?: BridgeJournal;
|
|
6
|
+
daemonLock?: BridgeDaemonLockLike;
|
|
7
|
+
inspectRunner?: InspectBridgeRunner;
|
|
8
|
+
now?: () => Date;
|
|
9
|
+
}
|
|
10
|
+
export declare function retryQuarantinedOutcome(commandId: string, options?: OutcomeControlOptions): Promise<void>;
|
|
11
|
+
export declare function acceptServerOutcome(commandId: string, options?: OutcomeControlOptions): Promise<void>;
|
|
12
|
+
//# sourceMappingURL=outcomes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outcomes.d.ts","sourceRoot":"","sources":["../src/outcomes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAiBD,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,IAAI,CAAC,CA8Cf"}
|
package/dist/outcomes.js
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { BridgeDaemonLock } from "./daemon-lock.js";
|
|
2
|
+
import { BridgeError } from "./errors.js";
|
|
3
|
+
import { BridgeJournal } from "./journal.js";
|
|
4
|
+
import { inspectBridgeRunnerIdentity, } from "./supervisor.js";
|
|
5
|
+
async function withStoppedDaemon(options, action) {
|
|
6
|
+
const lock = options.daemonLock ?? new BridgeDaemonLock();
|
|
7
|
+
await lock.acquire();
|
|
8
|
+
try {
|
|
9
|
+
const journal = options.journal ?? new BridgeJournal();
|
|
10
|
+
await journal.load();
|
|
11
|
+
await action(journal);
|
|
12
|
+
}
|
|
13
|
+
finally {
|
|
14
|
+
await lock.release();
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export async function retryQuarantinedOutcome(commandId, options = {}) {
|
|
18
|
+
await withStoppedDaemon(options, async (journal) => {
|
|
19
|
+
await journal.retryQuarantinedOutcome(commandId);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
export async function acceptServerOutcome(commandId, options = {}) {
|
|
23
|
+
await withStoppedDaemon(options, async (journal) => {
|
|
24
|
+
const command = journal.getCommand(commandId);
|
|
25
|
+
if (!command ||
|
|
26
|
+
command.reportedAt !== undefined ||
|
|
27
|
+
command.reconciliation?.state !== "quarantined") {
|
|
28
|
+
throw new BridgeError("outcome_not_quarantined", `Bridge command ${commandId} is not a quarantined outcome.`, 1, { retryable: false });
|
|
29
|
+
}
|
|
30
|
+
const run = journal.getRun(command.runId);
|
|
31
|
+
if (run && ["starting", "running", "stopping"].includes(run.status)) {
|
|
32
|
+
const verifiedAlive = Boolean(run.pid &&
|
|
33
|
+
run.processNonce &&
|
|
34
|
+
(options.inspectRunner ?? inspectBridgeRunnerIdentity)(run.pid, {
|
|
35
|
+
runId: command.runId,
|
|
36
|
+
processNonce: run.processNonce,
|
|
37
|
+
}));
|
|
38
|
+
if (verifiedAlive) {
|
|
39
|
+
throw new BridgeError("outcome_run_still_active", `Bridge run ${command.runId} is still alive. Stop it before accepting the server state.`, 1, { retryable: false });
|
|
40
|
+
}
|
|
41
|
+
await journal.recordRun(command.runId, {
|
|
42
|
+
...run,
|
|
43
|
+
status: "lost",
|
|
44
|
+
endedAt: (options.now ?? (() => new Date()))().toISOString(),
|
|
45
|
+
errorCode: "operator_accepted_server_state",
|
|
46
|
+
errorMessage: "The local run could not be verified while its quarantined command was resolved by accepting server state.",
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
await journal.acceptServerState(commandId);
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=outcomes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outcomes.js","sourceRoot":"","sources":["../src/outcomes.ts"],"names":[],"mappings":"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"}
|
package/dist/service.d.ts
CHANGED
|
@@ -41,6 +41,20 @@ export declare function restartService(options?: {
|
|
|
41
41
|
effectiveUid?: number;
|
|
42
42
|
executor?: ServiceExecutor;
|
|
43
43
|
}): Promise<void>;
|
|
44
|
+
export declare function stopService(options?: {
|
|
45
|
+
platform?: NodeJS.Platform;
|
|
46
|
+
userHome?: string;
|
|
47
|
+
uid?: number;
|
|
48
|
+
effectiveUid?: number;
|
|
49
|
+
executor?: ServiceExecutor;
|
|
50
|
+
}): Promise<void>;
|
|
51
|
+
export declare function startService(options?: {
|
|
52
|
+
platform?: NodeJS.Platform;
|
|
53
|
+
userHome?: string;
|
|
54
|
+
uid?: number;
|
|
55
|
+
effectiveUid?: number;
|
|
56
|
+
executor?: ServiceExecutor;
|
|
57
|
+
}): Promise<void>;
|
|
44
58
|
export declare function serviceStatus(options?: {
|
|
45
59
|
platform?: NodeJS.Platform;
|
|
46
60
|
uid?: number;
|
package/dist/service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,qBAAqB,EAE3B,MAAM,aAAa,CAAC;AAKrB,MAAM,MAAM,eAAe,GAAG,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,MAAM,EAAE,KACpB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AA+BjD,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/dist/service.js
CHANGED
|
@@ -57,6 +57,8 @@ export function launchdDefinition(options) {
|
|
|
57
57
|
<true/>
|
|
58
58
|
<key>ThrottleInterval</key>
|
|
59
59
|
<integer>5</integer>
|
|
60
|
+
<key>ExitTimeOut</key>
|
|
61
|
+
<integer>75</integer>
|
|
60
62
|
<key>ProcessType</key>
|
|
61
63
|
<string>Background</string>
|
|
62
64
|
<key>StandardOutPath</key>
|
|
@@ -81,7 +83,7 @@ ExecStart=${systemdQuote(options.nodePath)} ${systemdQuote(options.entrypoint)}
|
|
|
81
83
|
Environment=${systemdQuote(`PATH=${safePathEnvironment(options.pathEnvironment ?? "/usr/local/bin:/usr/bin:/bin")}`)}
|
|
82
84
|
Restart=on-failure
|
|
83
85
|
RestartSec=5
|
|
84
|
-
TimeoutStopSec=
|
|
86
|
+
TimeoutStopSec=75
|
|
85
87
|
UMask=0077
|
|
86
88
|
NoNewPrivileges=true
|
|
87
89
|
PrivateTmp=true
|
|
@@ -203,10 +205,23 @@ export async function restartService(options = {}) {
|
|
|
203
205
|
throw new BridgeError("uid_unavailable", "Unable to determine the current user ID.");
|
|
204
206
|
}
|
|
205
207
|
const path = servicePath(platform, options.userHome ?? homedir());
|
|
208
|
+
const label = `gui/${uid}/com.crewx.bridge`;
|
|
206
209
|
await executor("launchctl", ["bootout", `gui/${uid}`, path]).catch(() => ({
|
|
207
210
|
stdout: "",
|
|
208
211
|
stderr: "",
|
|
209
212
|
}));
|
|
213
|
+
const deadline = Date.now() + 75_000;
|
|
214
|
+
while (true) {
|
|
215
|
+
const stillLoaded = await executor("launchctl", ["print", label])
|
|
216
|
+
.then(() => true)
|
|
217
|
+
.catch(() => false);
|
|
218
|
+
if (!stillLoaded)
|
|
219
|
+
break;
|
|
220
|
+
if (Date.now() >= deadline) {
|
|
221
|
+
throw new BridgeError("service_stop_timeout", "The previous CrewX Bridge service did not finish stopping within 75 seconds.");
|
|
222
|
+
}
|
|
223
|
+
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
224
|
+
}
|
|
210
225
|
await executor("launchctl", ["bootstrap", `gui/${uid}`, path]);
|
|
211
226
|
return;
|
|
212
227
|
}
|
|
@@ -216,6 +231,70 @@ export async function restartService(options = {}) {
|
|
|
216
231
|
}
|
|
217
232
|
throw new BridgeError("unsupported_platform", "CrewX Bridge services currently support macOS and Linux.");
|
|
218
233
|
}
|
|
234
|
+
export async function stopService(options = {}) {
|
|
235
|
+
const platform = options.platform ?? process.platform;
|
|
236
|
+
refuseRoot(platform, options.effectiveUid);
|
|
237
|
+
const executor = options.executor ?? defaultExecutor;
|
|
238
|
+
if (platform === "darwin") {
|
|
239
|
+
const uid = options.uid ??
|
|
240
|
+
(typeof process.getuid === "function" ? process.getuid() : undefined);
|
|
241
|
+
if (uid === undefined) {
|
|
242
|
+
throw new BridgeError("uid_unavailable", "Unable to determine the current user ID.");
|
|
243
|
+
}
|
|
244
|
+
const path = servicePath(platform, options.userHome ?? homedir());
|
|
245
|
+
const label = `gui/${uid}/com.crewx.bridge`;
|
|
246
|
+
await executor("launchctl", ["bootout", `gui/${uid}`, path]).catch(() => ({
|
|
247
|
+
stdout: "",
|
|
248
|
+
stderr: "",
|
|
249
|
+
}));
|
|
250
|
+
const deadline = Date.now() + 75_000;
|
|
251
|
+
while (true) {
|
|
252
|
+
const stillLoaded = await executor("launchctl", ["print", label])
|
|
253
|
+
.then(() => true)
|
|
254
|
+
.catch(() => false);
|
|
255
|
+
if (!stillLoaded)
|
|
256
|
+
return;
|
|
257
|
+
if (Date.now() >= deadline) {
|
|
258
|
+
throw new BridgeError("service_stop_timeout", "CrewX Bridge did not finish stopping within 75 seconds.");
|
|
259
|
+
}
|
|
260
|
+
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
if (platform === "linux") {
|
|
264
|
+
await executor("systemctl", ["--user", "stop", "crewx-bridge.service"]);
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
267
|
+
throw new BridgeError("unsupported_platform", "CrewX Bridge services currently support macOS and Linux.");
|
|
268
|
+
}
|
|
269
|
+
export async function startService(options = {}) {
|
|
270
|
+
const platform = options.platform ?? process.platform;
|
|
271
|
+
refuseRoot(platform, options.effectiveUid);
|
|
272
|
+
const executor = options.executor ?? defaultExecutor;
|
|
273
|
+
if (platform === "darwin") {
|
|
274
|
+
const uid = options.uid ??
|
|
275
|
+
(typeof process.getuid === "function" ? process.getuid() : undefined);
|
|
276
|
+
if (uid === undefined) {
|
|
277
|
+
throw new BridgeError("uid_unavailable", "Unable to determine the current user ID.");
|
|
278
|
+
}
|
|
279
|
+
const label = `gui/${uid}/com.crewx.bridge`;
|
|
280
|
+
const loaded = await executor("launchctl", ["print", label])
|
|
281
|
+
.then(() => true)
|
|
282
|
+
.catch(() => false);
|
|
283
|
+
if (!loaded) {
|
|
284
|
+
await executor("launchctl", [
|
|
285
|
+
"bootstrap",
|
|
286
|
+
`gui/${uid}`,
|
|
287
|
+
servicePath(platform, options.userHome ?? homedir()),
|
|
288
|
+
]);
|
|
289
|
+
}
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
292
|
+
if (platform === "linux") {
|
|
293
|
+
await executor("systemctl", ["--user", "start", "crewx-bridge.service"]);
|
|
294
|
+
return;
|
|
295
|
+
}
|
|
296
|
+
throw new BridgeError("unsupported_platform", "CrewX Bridge services currently support macOS and Linux.");
|
|
297
|
+
}
|
|
219
298
|
export async function serviceStatus(options = {}) {
|
|
220
299
|
const platform = options.platform ?? process.platform;
|
|
221
300
|
const executor = options.executor ?? defaultExecutor;
|
package/dist/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/dist/supervisor.d.ts
CHANGED
|
@@ -14,7 +14,15 @@ export interface SupervisedRunExit {
|
|
|
14
14
|
errorMessage?: string;
|
|
15
15
|
logPath?: string;
|
|
16
16
|
}
|
|
17
|
+
export declare const RUNNER_SHUTDOWN_GRACE_MS = 65000;
|
|
18
|
+
export interface BridgeRunnerIdentity {
|
|
19
|
+
runId: string;
|
|
20
|
+
processNonce: string;
|
|
21
|
+
}
|
|
22
|
+
export type InspectBridgeRunner = (pid: number, identity: BridgeRunnerIdentity) => boolean;
|
|
23
|
+
export declare function inspectBridgeRunnerIdentity(pid: number, identity: BridgeRunnerIdentity, platform?: NodeJS.Platform): boolean;
|
|
17
24
|
export declare function minimalChildEnvironment(additions: Record<string, string>, source?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
25
|
+
export declare function runnerScopeForStart(payload: Pick<BridgeStartAgentPayload, "agent_id" | "runner_scope">, serverUrl: string, adapter: BridgeStartAgentPayload["adapter"]): string;
|
|
18
26
|
export declare function resolveAgentCliEntrypoint(): string;
|
|
19
27
|
export declare class ProcessSupervisor {
|
|
20
28
|
private readonly config;
|
|
@@ -22,15 +30,17 @@ export declare class ProcessSupervisor {
|
|
|
22
30
|
private readonly cliEntrypoint;
|
|
23
31
|
private readonly onExit;
|
|
24
32
|
private readonly runLogs?;
|
|
33
|
+
private readonly inspectRunner;
|
|
25
34
|
private readonly runs;
|
|
26
|
-
constructor(config: BridgeConfig, spawnProcess?: SpawnProcess, cliEntrypoint?: string, onExit?: (event: SupervisedRunExit) => void, runLogs?: BridgeRunLogs | undefined);
|
|
35
|
+
constructor(config: BridgeConfig, spawnProcess?: SpawnProcess, cliEntrypoint?: string, onExit?: (event: SupervisedRunExit) => void, runLogs?: BridgeRunLogs | undefined, inspectRunner?: InspectBridgeRunner);
|
|
27
36
|
activeCount(): number;
|
|
28
37
|
activeRuns(): Array<{
|
|
29
38
|
id: string;
|
|
30
39
|
pid: number;
|
|
31
40
|
}>;
|
|
32
41
|
isRunning(runId: string, _journalPid?: number | null): boolean;
|
|
33
|
-
|
|
42
|
+
adopt(runId: string, pid: number, processNonce: string): boolean;
|
|
43
|
+
start(payload: BridgeStartAgentPayload, secret: BridgeCommandSecret, folder: BridgeFolderConfig, processNonce?: string): number;
|
|
34
44
|
stop(runId: string, _journalPid?: number | null): Promise<void>;
|
|
35
45
|
stopAll(): Promise<void>;
|
|
36
46
|
}
|
package/dist/supervisor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../src/supervisor.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../src/supervisor.ts"],"names":[],"mappings":"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"}
|