@assemblyline-agents/runtime 6.1.5 → 7.1.0
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 +6 -0
- package/dist/background-review.d.ts.map +1 -1
- package/dist/background-review.js +10 -1
- package/dist/background-review.js.map +1 -1
- package/dist/background-subagents.d.ts +9 -11
- package/dist/background-subagents.d.ts.map +1 -1
- package/dist/background-subagents.js +67 -126
- package/dist/background-subagents.js.map +1 -1
- package/dist/background-work-summary.d.ts +21 -0
- package/dist/background-work-summary.d.ts.map +1 -0
- package/dist/background-work-summary.js +94 -0
- package/dist/background-work-summary.js.map +1 -0
- package/dist/background-work-tool.d.ts +7 -0
- package/dist/background-work-tool.d.ts.map +1 -0
- package/dist/background-work-tool.js +73 -0
- package/dist/background-work-tool.js.map +1 -0
- package/dist/builtin-tool-executors.d.ts.map +1 -1
- package/dist/builtin-tool-executors.js +4 -0
- package/dist/builtin-tool-executors.js.map +1 -1
- package/dist/builtin-tools.d.ts +1 -1
- package/dist/builtin-tools.d.ts.map +1 -1
- package/dist/builtin-tools.js +6 -0
- package/dist/builtin-tools.js.map +1 -1
- package/dist/channel.d.ts +3 -1
- package/dist/channel.d.ts.map +1 -1
- package/dist/connection-wait-recovery.d.ts +5 -0
- package/dist/connection-wait-recovery.d.ts.map +1 -0
- package/dist/connection-wait-recovery.js +106 -0
- package/dist/connection-wait-recovery.js.map +1 -0
- package/dist/conversation-turn-dispatch.d.ts.map +1 -1
- package/dist/conversation-turn-dispatch.js +2 -1
- package/dist/conversation-turn-dispatch.js.map +1 -1
- package/dist/delivery-queue.d.ts.map +1 -1
- package/dist/delivery-queue.js +2 -0
- package/dist/delivery-queue.js.map +1 -1
- package/dist/delivery-send.d.ts.map +1 -1
- package/dist/delivery-send.js +8 -6
- package/dist/delivery-send.js.map +1 -1
- package/dist/harness-execution-context.d.ts +2 -0
- package/dist/harness-execution-context.d.ts.map +1 -1
- package/dist/harness-execution-context.js +29 -3
- package/dist/harness-execution-context.js.map +1 -1
- package/dist/harness-tool-execution.d.ts.map +1 -1
- package/dist/harness-tool-execution.js +45 -72
- package/dist/harness-tool-execution.js.map +1 -1
- package/dist/harness-turn-execution.d.ts.map +1 -1
- package/dist/harness-turn-execution.js +8 -1
- package/dist/harness-turn-execution.js.map +1 -1
- package/dist/in-memory-run-store.d.ts +5 -0
- package/dist/in-memory-run-store.d.ts.map +1 -1
- package/dist/in-memory-run-store.js +34 -82
- package/dist/in-memory-run-store.js.map +1 -1
- package/dist/in-memory-run-transactions.d.ts +14 -0
- package/dist/in-memory-run-transactions.d.ts.map +1 -0
- package/dist/in-memory-run-transactions.js +163 -0
- package/dist/in-memory-run-transactions.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/operator-controls.d.ts.map +1 -1
- package/dist/operator-controls.js +10 -21
- package/dist/operator-controls.js.map +1 -1
- package/dist/read-tool-result.d.ts +3 -0
- package/dist/read-tool-result.d.ts.map +1 -0
- package/dist/read-tool-result.js +25 -0
- package/dist/read-tool-result.js.map +1 -0
- package/dist/replay-resume-authorization.d.ts.map +1 -1
- package/dist/replay-resume-authorization.js +4 -14
- package/dist/replay-resume-authorization.js.map +1 -1
- package/dist/replay-resume-connection.d.ts.map +1 -1
- package/dist/replay-resume-connection.js +3 -1
- package/dist/replay-resume-connection.js.map +1 -1
- package/dist/replay-resume-controls.d.ts.map +1 -1
- package/dist/replay-resume-controls.js +43 -27
- package/dist/replay-resume-controls.js.map +1 -1
- package/dist/replay-resume-recovery.d.ts.map +1 -1
- package/dist/replay-resume-recovery.js +5 -1
- package/dist/replay-resume-recovery.js.map +1 -1
- package/dist/replay-resume-shared.d.ts +3 -4
- package/dist/replay-resume-shared.d.ts.map +1 -1
- package/dist/replay-resume-shared.js +4 -13
- package/dist/replay-resume-shared.js.map +1 -1
- package/dist/replay-resume-types.d.ts +3 -1
- package/dist/replay-resume-types.d.ts.map +1 -1
- package/dist/run-command-settlement.d.ts +6 -0
- package/dist/run-command-settlement.d.ts.map +1 -0
- package/dist/run-command-settlement.js +35 -0
- package/dist/run-command-settlement.js.map +1 -0
- package/dist/run-commands.d.ts +16 -0
- package/dist/run-commands.d.ts.map +1 -0
- package/dist/run-commands.js +195 -0
- package/dist/run-commands.js.map +1 -0
- package/dist/run-execution-host.d.ts +1 -0
- package/dist/run-execution-host.d.ts.map +1 -1
- package/dist/run-execution-lease.d.ts +15 -0
- package/dist/run-execution-lease.d.ts.map +1 -0
- package/dist/run-execution-lease.js +160 -0
- package/dist/run-execution-lease.js.map +1 -0
- package/dist/run-execution.d.ts.map +1 -1
- package/dist/run-execution.js +2 -0
- package/dist/run-execution.js.map +1 -1
- package/dist/run-heartbeat.d.ts.map +1 -1
- package/dist/run-heartbeat.js +25 -0
- package/dist/run-heartbeat.js.map +1 -1
- package/dist/run-initialization.d.ts.map +1 -1
- package/dist/run-initialization.js +7 -0
- package/dist/run-initialization.js.map +1 -1
- package/dist/run-outcome.d.ts.map +1 -1
- package/dist/run-outcome.js +5 -7
- package/dist/run-outcome.js.map +1 -1
- package/dist/run-recovery.d.ts +2 -2
- package/dist/run-recovery.d.ts.map +1 -1
- package/dist/run-recovery.js +73 -212
- package/dist/run-recovery.js.map +1 -1
- package/dist/run-stream.d.ts.map +1 -1
- package/dist/run-stream.js +9 -3
- package/dist/run-stream.js.map +1 -1
- package/dist/run-tree-cancellation.d.ts +9 -0
- package/dist/run-tree-cancellation.d.ts.map +1 -0
- package/dist/run-tree-cancellation.js +166 -0
- package/dist/run-tree-cancellation.js.map +1 -0
- package/dist/run-tree.d.ts +9 -0
- package/dist/run-tree.d.ts.map +1 -0
- package/dist/run-tree.js +37 -0
- package/dist/run-tree.js.map +1 -0
- package/dist/runtime-engine-base.d.ts +1 -0
- package/dist/runtime-engine-base.d.ts.map +1 -1
- package/dist/runtime-engine-base.js +11 -1
- package/dist/runtime-engine-base.js.map +1 -1
- package/dist/runtime-engine-capabilities.d.ts.map +1 -1
- package/dist/runtime-engine-capabilities.js +5 -2
- package/dist/runtime-engine-capabilities.js.map +1 -1
- package/dist/runtime-engine-config.d.ts.map +1 -1
- package/dist/runtime-engine-config.js +3 -2
- package/dist/runtime-engine-config.js.map +1 -1
- package/dist/runtime-engine-operations.d.ts +12 -2
- package/dist/runtime-engine-operations.d.ts.map +1 -1
- package/dist/runtime-engine-operations.js +52 -5
- package/dist/runtime-engine-operations.js.map +1 -1
- package/dist/runtime-engine-run.d.ts.map +1 -1
- package/dist/runtime-engine-run.js +3 -0
- package/dist/runtime-engine-run.js.map +1 -1
- package/dist/runtime-types.d.ts +7 -1
- package/dist/runtime-types.d.ts.map +1 -1
- package/dist/state/run-lifecycle.d.ts +111 -0
- package/dist/state/run-lifecycle.d.ts.map +1 -0
- package/dist/state/run-lifecycle.js +70 -0
- package/dist/state/run-lifecycle.js.map +1 -0
- package/dist/state/run-state.d.ts +1 -0
- package/dist/state/run-state.d.ts.map +1 -1
- package/dist/state/run-state.js.map +1 -1
- package/dist/state/store-contracts.d.ts +3 -0
- package/dist/state/store-contracts.d.ts.map +1 -1
- package/dist/state/store-contracts.js +1 -1
- package/dist/state/store-contracts.js.map +1 -1
- package/dist/state/task-budget.d.ts +39 -0
- package/dist/state/task-budget.d.ts.map +1 -0
- package/dist/state/task-budget.js +2 -0
- package/dist/state/task-budget.js.map +1 -0
- package/dist/state-stores.d.ts.map +1 -1
- package/dist/state-stores.js +1 -0
- package/dist/state-stores.js.map +1 -1
- package/dist/state.d.ts +2 -0
- package/dist/state.d.ts.map +1 -1
- package/dist/state.js +2 -0
- package/dist/state.js.map +1 -1
- package/dist/storage.d.ts +3 -0
- package/dist/storage.d.ts.map +1 -1
- package/dist/storage.js +6 -0
- package/dist/storage.js.map +1 -1
- package/dist/subagent-background-resume.d.ts +2 -2
- package/dist/subagent-background-resume.d.ts.map +1 -1
- package/dist/subagent-background-resume.js +11 -41
- package/dist/subagent-background-resume.js.map +1 -1
- package/dist/subagent-delegate-tool.d.ts +1 -1
- package/dist/subagent-delegate-tool.d.ts.map +1 -1
- package/dist/subagent-delegate-tool.js +20 -4
- package/dist/subagent-delegate-tool.js.map +1 -1
- package/dist/subagent-execution.d.ts +3 -1
- package/dist/subagent-execution.d.ts.map +1 -1
- package/dist/subagent-execution.js +61 -21
- package/dist/subagent-execution.js.map +1 -1
- package/dist/subagent-settlement.d.ts +1 -1
- package/dist/subagent-settlement.d.ts.map +1 -1
- package/dist/subagent-settlement.js +67 -43
- package/dist/subagent-settlement.js.map +1 -1
- package/dist/task-budget-accounting.d.ts +13 -0
- package/dist/task-budget-accounting.d.ts.map +1 -0
- package/dist/task-budget-accounting.js +35 -0
- package/dist/task-budget-accounting.js.map +1 -0
- package/dist/task-budget-config.d.ts +5 -0
- package/dist/task-budget-config.d.ts.map +1 -0
- package/dist/task-budget-config.js +55 -0
- package/dist/task-budget-config.js.map +1 -0
- package/dist/task-budget-harness.d.ts +5 -0
- package/dist/task-budget-harness.d.ts.map +1 -0
- package/dist/task-budget-harness.js +44 -0
- package/dist/task-budget-harness.js.map +1 -0
- package/dist/task-budget.d.ts +14 -0
- package/dist/task-budget.d.ts.map +1 -0
- package/dist/task-budget.js +212 -0
- package/dist/task-budget.js.map +1 -0
- package/dist/task-deadline.d.ts +4 -0
- package/dist/task-deadline.d.ts.map +1 -0
- package/dist/task-deadline.js +36 -0
- package/dist/task-deadline.js.map +1 -0
- package/dist/tool-execution-host.d.ts +4 -2
- package/dist/tool-execution-host.d.ts.map +1 -1
- package/dist/tool-execution.d.ts.map +1 -1
- package/dist/tool-execution.js +24 -9
- package/dist/tool-execution.js.map +1 -1
- package/dist/tool-result-output.d.ts +14 -0
- package/dist/tool-result-output.d.ts.map +1 -0
- package/dist/tool-result-output.js +66 -0
- package/dist/tool-result-output.js.map +1 -0
- package/package.json +3 -3
|
@@ -1,47 +1,17 @@
|
|
|
1
1
|
import { surfaceForRun } from "./agent-surface.js";
|
|
2
2
|
import { resumableSubagent } from "./subagent-execution.js";
|
|
3
|
-
import {
|
|
4
|
-
/**
|
|
5
|
-
export async function queueSubagentResumeImpl(host, parentRunId, childRunId, subagentName, message) {
|
|
6
|
-
const child = await resumableSubagent(host, parentRunId, childRunId, subagentName);
|
|
3
|
+
import { submitRunCommand, scheduleRunCommand } from "./run-commands.js";
|
|
4
|
+
/** A follow-up is a durable inbox item, including while its previous turn is active. */
|
|
5
|
+
export async function queueSubagentResumeImpl(host, parentRunId, childRunId, subagentName, message, commandId) {
|
|
6
|
+
const child = await resumableSubagent(host, parentRunId, childRunId, subagentName, true);
|
|
7
7
|
const parent = (await host.state.getRun(parentRunId));
|
|
8
|
-
if (surfaceForRun(host.manifest, parent).path !== "root")
|
|
8
|
+
if (surfaceForRun(host.manifest, parent).path !== "root")
|
|
9
9
|
throw new Error("Only the root agent can queue background subagent follow-ups.");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
if (
|
|
14
|
-
throw new Error(
|
|
15
|
-
|
|
16
|
-
try {
|
|
17
|
-
const current = await host.state.getRun(childRunId);
|
|
18
|
-
if (!current || current.status !== child.status || current.updatedAt !== child.updatedAt) {
|
|
19
|
-
throw new Error(`Subagent run ${childRunId} changed before its follow-up was queued.`);
|
|
20
|
-
}
|
|
21
|
-
const queued = await host.state.updateRun(childRunId, {
|
|
22
|
-
status: "created",
|
|
23
|
-
controlIntent: undefined,
|
|
24
|
-
terminalReason: undefined,
|
|
25
|
-
terminalError: undefined,
|
|
26
|
-
input: {
|
|
27
|
-
...child.input,
|
|
28
|
-
parentRunId,
|
|
29
|
-
background: {
|
|
30
|
-
conversationId: typeof parent.input.conversationId === "string" ? parent.input.conversationId : parent.id,
|
|
31
|
-
channel: typeof parent.input.channel === "string" ? parent.input.channel : "local",
|
|
32
|
-
eventId: typeof parent.input.eventId === "string" ? parent.input.eventId : parent.id
|
|
33
|
-
},
|
|
34
|
-
backgroundResume: { message, checkpointId }
|
|
35
|
-
}
|
|
36
|
-
});
|
|
37
|
-
await host.state.appendEvent(parentRunId, "subagent.resumed", {
|
|
38
|
-
subagent: subagentName, childRunId, previousStatus: child.status, background: true
|
|
39
|
-
});
|
|
40
|
-
return queued;
|
|
41
|
-
}
|
|
42
|
-
catch (error) {
|
|
43
|
-
await host.state.releaseIdempotencyKey?.("subagent:resume-queue", key);
|
|
44
|
-
throw error;
|
|
45
|
-
}
|
|
10
|
+
const command = await submitRunCommand(host.state, childRunId, {
|
|
11
|
+
...(commandId ? { id: commandId } : {}), operation: "followup", message, expectedStatus: child.status
|
|
12
|
+
});
|
|
13
|
+
if (command.status === "rejected")
|
|
14
|
+
throw new Error(command.error);
|
|
15
|
+
return scheduleRunCommand(host.state, childRunId);
|
|
46
16
|
}
|
|
47
17
|
//# sourceMappingURL=subagent-background-resume.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-background-resume.js","sourceRoot":"","sources":["../src/subagent-background-resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAA8B,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"subagent-background-resume.js","sourceRoot":"","sources":["../src/subagent-background-resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAA8B,MAAM,yBAAyB,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGzE,wFAAwF;AACxF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,IAA2B,EAAE,WAAmB,EAAE,UAAkB,EAChH,YAAoB,EAAE,OAAe,EAAE,SAAkB;IACzD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAE,CAAC;IACvD,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,KAAK,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IAC3I,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE;QAC7D,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,MAAM;KACtG,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClE,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -2,5 +2,5 @@ import { type JsonObject } from "@assemblyline-agents/core";
|
|
|
2
2
|
import type { RunRecord } from "./state.js";
|
|
3
3
|
import type { ToolExecutionHost } from "./tool-execution-host.js";
|
|
4
4
|
/** The host's execution policy wins over every model-supplied delegation argument. */
|
|
5
|
-
export declare function executeDelegateTool(host: ToolExecutionHost, run: RunRecord, params: unknown): Promise<JsonObject>;
|
|
5
|
+
export declare function executeDelegateTool(host: ToolExecutionHost, run: RunRecord, params: unknown, commandId?: string): Promise<JsonObject>;
|
|
6
6
|
//# sourceMappingURL=subagent-delegate-tool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-delegate-tool.d.ts","sourceRoot":"","sources":["../src/subagent-delegate-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAIhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,sFAAsF;AACtF,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"subagent-delegate-tool.d.ts","sourceRoot":"","sources":["../src/subagent-delegate-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAIhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,sFAAsF;AACtF,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAsC3I"}
|
|
@@ -4,7 +4,7 @@ import { isJsonObject } from "./json-util.js";
|
|
|
4
4
|
import { stringValue } from "./runtime-util.js";
|
|
5
5
|
import { subagentToolResult } from "./subagent-execution.js";
|
|
6
6
|
/** The host's execution policy wins over every model-supplied delegation argument. */
|
|
7
|
-
export async function executeDelegateTool(host, run, params) {
|
|
7
|
+
export async function executeDelegateTool(host, run, params, commandId) {
|
|
8
8
|
if (!isJsonObject(params))
|
|
9
9
|
throw new Error(`${DELEGATE_TOOL_NAME} requires an object input.`);
|
|
10
10
|
const agent = stringValue(params.agent);
|
|
@@ -16,16 +16,32 @@ export async function executeDelegateTool(host, run, params) {
|
|
|
16
16
|
if (!child)
|
|
17
17
|
throw new Error(`Subagent not found: ${agent}`);
|
|
18
18
|
const background = host.backgroundOnlySubagents.has(child.path) || params.background === true;
|
|
19
|
+
if (params.includeMessage !== undefined && typeof params.includeMessage !== "boolean") {
|
|
20
|
+
throw new Error("includeMessage must be a boolean.");
|
|
21
|
+
}
|
|
22
|
+
if (params.includeMessage === true && (run.input.agentSurface !== "root" || typeof run.input.message !== "string")) {
|
|
23
|
+
throw new Error("includeMessage requires an originating root message.");
|
|
24
|
+
}
|
|
25
|
+
const acknowledgment = params.acknowledgment;
|
|
26
|
+
if (acknowledgment !== undefined && (!background || run.input.agentSurface !== "root"
|
|
27
|
+
|| typeof acknowledgment !== "string" || !acknowledgment.trim() || acknowledgment.length > 240)) {
|
|
28
|
+
throw new Error("acknowledgment requires root background delegation and 1–240 characters of member-facing text.");
|
|
29
|
+
}
|
|
19
30
|
const resumeRunId = stringValue(params.resumeRunId);
|
|
20
31
|
const task = { ...params };
|
|
21
32
|
delete task.agent;
|
|
22
33
|
delete task.background;
|
|
23
34
|
delete task.resumeRunId;
|
|
35
|
+
delete task.acknowledgment;
|
|
36
|
+
delete task.includeMessage;
|
|
37
|
+
if (params.includeMessage === true)
|
|
38
|
+
task.sourceMessage = run.input.message;
|
|
24
39
|
if (background) {
|
|
25
40
|
const queued = resumeRunId
|
|
26
|
-
? await host.queueSubagentResume(run.id, resumeRunId, agent, JSON.stringify(task))
|
|
27
|
-
: await host.queueSubagent(run.id, agent, task);
|
|
28
|
-
return { runId: queued.id, agent, status: "queued", background: true
|
|
41
|
+
? await host.queueSubagentResume(run.id, resumeRunId, agent, JSON.stringify(task), commandId)
|
|
42
|
+
: await host.queueSubagent(run.id, agent, task, commandId);
|
|
43
|
+
return { runId: queued.id, agent, status: "queued", background: true,
|
|
44
|
+
...(typeof acknowledgment === "string" ? { acknowledgment: acknowledgment.trim() } : {}) };
|
|
29
45
|
}
|
|
30
46
|
const timeline = resumeRunId
|
|
31
47
|
? await host.resumeSubagent(run.id, resumeRunId, agent, JSON.stringify(task))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-delegate-tool.js","sourceRoot":"","sources":["../src/subagent-delegate-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAmB,MAAM,2BAA2B,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAAuB,EAAE,GAAc,EAAE,MAAe;
|
|
1
|
+
{"version":3,"file":"subagent-delegate-tool.js","sourceRoot":"","sources":["../src/subagent-delegate-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,7 @@ export interface SubagentExecutionHost {
|
|
|
70
70
|
message?: string;
|
|
71
71
|
}): Promise<RunAgentResult>;
|
|
72
72
|
completeRun(run: RunRecord, sandboxHandle: RuntimeSandboxHandle, response: string, channel: string, turn?: ChannelTurn, conversationId?: string): Promise<RunAgentResult>;
|
|
73
|
+
resumeSubagentAction(runId: string, command: import("./state/run-lifecycle.js").RunCommand): Promise<RunAgentResult>;
|
|
73
74
|
settleSubagentRun(timeline: RunTimeline, report?: SubagentReport): Promise<RunTimeline>;
|
|
74
75
|
emitSpan(name: string, startedAt: string, attributes: JsonObject, options?: EmitSpanOptions): Promise<void>;
|
|
75
76
|
runSpanAttributes(run: RunRecord, extra?: JsonObject): JsonObject;
|
|
@@ -84,9 +85,10 @@ export declare function runSubagentImpl(host: SubagentExecutionHost, parentRunId
|
|
|
84
85
|
* run even when the child originally ran in the background.
|
|
85
86
|
*/
|
|
86
87
|
export declare function resumeSubagentImpl(host: SubagentExecutionHost, parentRunId: string, childRunId: string, expectedSubagentName: string, message: string): Promise<RunTimeline>;
|
|
87
|
-
export declare function resumableSubagent(host: SubagentExecutionHost, parentRunId: string, childRunId: string, expectedSubagentName: string): Promise<RunRecord>;
|
|
88
|
+
export declare function resumableSubagent(host: SubagentExecutionHost, parentRunId: string, childRunId: string, expectedSubagentName: string, allowActive?: boolean): Promise<RunRecord>;
|
|
88
89
|
export declare function createSubagentRunImpl(host: SubagentExecutionHost, parentRunId: string, subagentName: string, inputTask: JsonObject, options?: {
|
|
89
90
|
background?: boolean;
|
|
91
|
+
commandId?: string;
|
|
90
92
|
}): Promise<RunRecord>;
|
|
91
93
|
export declare function executeSubagentRunImpl(host: SubagentExecutionHost, childRunId: string): Promise<RunTimeline>;
|
|
92
94
|
export declare function subagentToolResult(timeline: RunTimeline): JsonObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-execution.d.ts","sourceRoot":"","sources":["../src/subagent-execution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"subagent-execution.d.ts","sourceRoot":"","sources":["../src/subagent-execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
import { assertRunTreeOpen } from "./run-tree.js";
|
|
2
|
+
import { checkTaskBudget } from "./task-budget.js";
|
|
3
|
+
import { isDeepStrictEqual } from "node:util";
|
|
4
|
+
import { createHash, randomUUID } from "node:crypto";
|
|
5
|
+
import { initialRunLifecycle } from "./state/run-lifecycle.js";
|
|
6
|
+
import { withRunExecutionLease } from "./run-execution-lease.js";
|
|
7
|
+
import { RunLeaseLostError } from "./state/run-lifecycle.js";
|
|
1
8
|
import { attachmentResourcePath } from "./attachments.js";
|
|
2
9
|
import { timestamp } from "./runtime-util.js";
|
|
3
10
|
import { isJsonObject } from "./json-util.js";
|
|
@@ -23,13 +30,16 @@ export async function resumeSubagentImpl(host, parentRunId, childRunId, expected
|
|
|
23
30
|
await host.state.appendEvent(parentRunId, "subagent.resumed", {
|
|
24
31
|
subagent: expectedSubagentName, childRunId, previousStatus: child.status
|
|
25
32
|
});
|
|
33
|
+
if (child.lifecycle?.notification)
|
|
34
|
+
await host.settleSubagentRun(await host.replay(child.id));
|
|
26
35
|
await resumeAgentHarnessSubagent(host, child, message);
|
|
27
36
|
return host.settleSubagentRun(await host.replay(childRunId), { parentRunId, background: false, resumed: true });
|
|
28
37
|
}
|
|
29
|
-
export async function resumableSubagent(host, parentRunId, childRunId, expectedSubagentName) {
|
|
38
|
+
export async function resumableSubagent(host, parentRunId, childRunId, expectedSubagentName, allowActive = false) {
|
|
30
39
|
const parent = await host.state.getRun(parentRunId);
|
|
31
40
|
if (!parent)
|
|
32
41
|
throw new Error(`Parent run not found: ${parentRunId}`);
|
|
42
|
+
await assertRunTreeOpen(host.state, childRunId);
|
|
33
43
|
const child = await host.state.getRun(childRunId);
|
|
34
44
|
if (!child)
|
|
35
45
|
throw new Error(`Subagent run not found: ${childRunId}`);
|
|
@@ -45,7 +55,7 @@ export async function resumableSubagent(host, parentRunId, childRunId, expectedS
|
|
|
45
55
|
// Only a settled child can take a follow-up. An executing run would be
|
|
46
56
|
// double-driven, and a run parked on approval, input, or a connection has its
|
|
47
57
|
// own resume path.
|
|
48
|
-
if (!RESUMABLE_CHILD_STATUSES.has(child.status)) {
|
|
58
|
+
if (!allowActive && !RESUMABLE_CHILD_STATUSES.has(child.status)) {
|
|
49
59
|
throw new Error(`Subagent run ${childRunId} is ${child.status}; wait for it to settle before resuming it.`);
|
|
50
60
|
}
|
|
51
61
|
if (!enabledSubagents(parent).includes(subagentName)) {
|
|
@@ -86,7 +96,9 @@ export async function createSubagentRunImpl(host, parentRunId, subagentName, inp
|
|
|
86
96
|
// projectId and workspaceId stay on the parent: the sandbox session key and
|
|
87
97
|
// workspace selection prefer them, so copying them would make a
|
|
88
98
|
// project-scoped parent and its child share one sandbox and workspace.
|
|
89
|
-
const
|
|
99
|
+
const id = options.commandId ? `subagent-${createHash("sha256").update(`${parentRunId}:${options.commandId}`).digest("hex")}` : randomUUID();
|
|
100
|
+
const child = {
|
|
101
|
+
id, createdAt: timestamp(), updatedAt: timestamp(), lifecycle: initialRunLifecycle(),
|
|
90
102
|
agentRevision: host.manifest.agentRevision,
|
|
91
103
|
status: "created",
|
|
92
104
|
input: {
|
|
@@ -110,23 +122,38 @@ export async function createSubagentRunImpl(host, parentRunId, subagentName, inp
|
|
|
110
122
|
// same stubs and approval policy ({results} cursors restart per child).
|
|
111
123
|
...(parent.input.eval !== undefined ? { eval: parent.input.eval } : {})
|
|
112
124
|
}
|
|
125
|
+
};
|
|
126
|
+
const existingChild = await host.state.getRun(child.id);
|
|
127
|
+
if (existingChild) {
|
|
128
|
+
if (!isDeepStrictEqual(existingChild.input.task, child.input.task) || !isDeepStrictEqual(existingChild.input.attachmentMetadata, child.input.attachmentMetadata)) {
|
|
129
|
+
throw new Error("This delegation command ID was already accepted with different arguments.");
|
|
130
|
+
}
|
|
131
|
+
return existingChild;
|
|
132
|
+
}
|
|
133
|
+
await checkTaskBudget(host.state, parentRunId);
|
|
134
|
+
await host.state.transactRun(parentRunId, ({ run }) => {
|
|
135
|
+
if (run.status === "cancelled" || run.lifecycle?.cancellation)
|
|
136
|
+
throw new Error("Cannot delegate from a cancelled run.");
|
|
137
|
+
return { childRun: child, events: [{ id: `subagent-called:${id}`, type: "subagent.called", data: {
|
|
138
|
+
subagent: subagentName,
|
|
139
|
+
childRunId: child.id,
|
|
140
|
+
task,
|
|
141
|
+
files: attachments.map((attachment) => attachmentResourcePath(attachment)),
|
|
142
|
+
background: options.background === true
|
|
143
|
+
} }, { id: `subagent-accepted:${id}`, runId: id, type: "run.accepted", data: {
|
|
144
|
+
parentRunId,
|
|
145
|
+
subagent: subagentName,
|
|
146
|
+
freshHistory: true,
|
|
147
|
+
freshState: true,
|
|
148
|
+
engine: "pi",
|
|
149
|
+
background: options.background === true
|
|
150
|
+
} }] };
|
|
113
151
|
});
|
|
114
|
-
await host.state.
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
background: options.background === true
|
|
120
|
-
});
|
|
121
|
-
await host.state.appendEvent(child.id, "run.accepted", {
|
|
122
|
-
parentRunId,
|
|
123
|
-
subagent: subagentName,
|
|
124
|
-
freshHistory: true,
|
|
125
|
-
freshState: true,
|
|
126
|
-
engine: "pi",
|
|
127
|
-
background: options.background === true
|
|
128
|
-
});
|
|
129
|
-
return child;
|
|
152
|
+
const accepted = (await host.state.getRun(child.id));
|
|
153
|
+
if (!isDeepStrictEqual(accepted.input.task, child.input.task) || !isDeepStrictEqual(accepted.input.attachmentMetadata, child.input.attachmentMetadata)) {
|
|
154
|
+
throw new Error("This delegation command ID was already accepted with different arguments.");
|
|
155
|
+
}
|
|
156
|
+
return accepted;
|
|
130
157
|
}
|
|
131
158
|
/**
|
|
132
159
|
* Parent attachment records the child receives by reference. `files` names
|
|
@@ -187,6 +214,11 @@ async function indexSharedAttachments(state, child, parentRunId) {
|
|
|
187
214
|
return attachments;
|
|
188
215
|
}
|
|
189
216
|
export async function executeSubagentRunImpl(host, childRunId) {
|
|
217
|
+
await checkTaskBudget(host.state, childRunId);
|
|
218
|
+
const result = await withRunExecutionLease(host.state, childRunId, "execution", ["created"], () => executeClaimedSubagent(host, childRunId));
|
|
219
|
+
return result ?? host.replay(childRunId);
|
|
220
|
+
}
|
|
221
|
+
async function executeClaimedSubagent(host, childRunId) {
|
|
190
222
|
const storedChild = await host.state.getRun(childRunId);
|
|
191
223
|
if (!storedChild)
|
|
192
224
|
throw new Error(`Subagent run not found: ${childRunId}`);
|
|
@@ -199,7 +231,11 @@ export async function executeSubagentRunImpl(host, childRunId) {
|
|
|
199
231
|
try {
|
|
200
232
|
if (!parentRunId || !parent)
|
|
201
233
|
throw new Error(`Parent run not found: ${parentRunId ?? "(none)"}`);
|
|
202
|
-
|
|
234
|
+
const command = (await host.state.listRunCommands(childRunId)).find(command => command.id === storedChild.lifecycle?.resumeCommandId);
|
|
235
|
+
if (command && ["answer", "approve"].includes(command.operation)) {
|
|
236
|
+
await host.resumeSubagentAction(childRunId, command);
|
|
237
|
+
}
|
|
238
|
+
else if (isJsonObject(storedChild.input.backgroundResume)) {
|
|
203
239
|
await resumeAgentHarnessSubagent(host, storedChild);
|
|
204
240
|
}
|
|
205
241
|
else {
|
|
@@ -207,6 +243,8 @@ export async function executeSubagentRunImpl(host, childRunId) {
|
|
|
207
243
|
}
|
|
208
244
|
}
|
|
209
245
|
catch (error) {
|
|
246
|
+
if (error instanceof RunLeaseLostError)
|
|
247
|
+
throw error;
|
|
210
248
|
// A child must never be left `running` with no executor: the parent would
|
|
211
249
|
// wait on it forever and the recovery sweep would misreport it as orphaned.
|
|
212
250
|
const current = await host.state.getRun(childRunId);
|
|
@@ -332,7 +370,7 @@ export function subagentRecoveryHint(timeline) {
|
|
|
332
370
|
if (!subagentResumable(timeline)) {
|
|
333
371
|
return `Child run "${timeline.run.id}" stopped before it persisted a resumable continuation, so it cannot be resumed. Delegate the task again if it is still needed.`;
|
|
334
372
|
}
|
|
335
|
-
return `This child
|
|
373
|
+
return `This child has a retained continuation. Resume reopens its workspace and validates harness compatibility. Continue it with delegate using resumeRunId "${timeline.run.id}" and a short instruction naming what is still missing. Do not re-delegate the original task: that starts an empty workspace and rebuilds finished work.`;
|
|
336
374
|
}
|
|
337
375
|
export async function readSubagentImpl(host, childRunId, cursor) {
|
|
338
376
|
const timeline = await host.replay(childRunId);
|
|
@@ -359,6 +397,8 @@ export async function sendSubagentFollowupImpl(host, childRunId, message) {
|
|
|
359
397
|
throw new Error(`Subagent not found: ${subagentName}`);
|
|
360
398
|
}
|
|
361
399
|
assertForegroundAllowed(host, subagentPath);
|
|
400
|
+
if (child.lifecycle?.notification)
|
|
401
|
+
await host.settleSubagentRun(await host.replay(child.id));
|
|
362
402
|
await resumeAgentHarnessSubagent(host, child, message);
|
|
363
403
|
return finalizeSubagentHandoffImpl(host, await host.replay(child.id));
|
|
364
404
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-execution.js","sourceRoot":"","sources":["../src/subagent-execution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subagent-execution.js","sourceRoot":"","sources":["../src/subagent-execution.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export declare function isBackgroundSubagentRun(run: RunRecord): boolean;
|
|
|
42
42
|
/** Default report: the creating parent, background when the child has a background origin. */
|
|
43
43
|
export declare function subagentReportFor(child: RunRecord): SubagentReport | undefined;
|
|
44
44
|
export declare function settleSubagentRunImpl(host: SubagentSettlementHost, initialTimeline: RunTimeline, report?: SubagentReport | undefined): Promise<RunTimeline>;
|
|
45
|
-
/**
|
|
45
|
+
/** The durable obligation identifies one outcome or request for help. */
|
|
46
46
|
export declare function subagentSettlementKey(timeline: RunTimeline): string;
|
|
47
47
|
export declare function finalizeSubagentHandoffImpl(host: SubagentHandoffHost, initialTimeline: RunTimeline): Promise<RunTimeline>;
|
|
48
48
|
/** Resume a Pi-backed subagent with a follow-up through its durable continuation. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-settlement.d.ts","sourceRoot":"","sources":["../src/subagent-settlement.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"subagent-settlement.d.ts","sourceRoot":"","sources":["../src/subagent-settlement.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
+
import { checkTaskBudget } from "./task-budget.js";
|
|
2
|
+
import { currentRunExecution, withRunExecutionLease } from "./run-execution-lease.js";
|
|
3
|
+
import { scheduleRunCommand } from "./run-commands.js";
|
|
4
|
+
import { initialRunLifecycle } from "./state/run-lifecycle.js";
|
|
1
5
|
import { storedHarnessContinuation } from "./harness-continuation.js";
|
|
2
6
|
import { isJsonObject } from "./json-util.js";
|
|
3
7
|
import { failRun } from "./run-outcome.js";
|
|
4
8
|
import { acceptSubagentHandoff, buildVerifiedSubagentHandoff, publicSubagentHandoff, readySubagentHandoff, recordSubagentHandoffReady, subagentHandoffRetryMessage } from "./subagent-handoff.js";
|
|
5
9
|
const TERMINAL_STATUSES = new Set(["completed", "failed", "cancelled"]);
|
|
6
|
-
const SETTLEMENT_MARKER_EVENTS = new Set(["run.completed", "run.failed", "run.cancelled", "run.recovered"]);
|
|
7
10
|
export function isTerminalRunStatus(status) {
|
|
8
11
|
return TERMINAL_STATUSES.has(status);
|
|
9
12
|
}
|
|
@@ -17,52 +20,53 @@ export function subagentReportFor(child) {
|
|
|
17
20
|
return parentRunId ? { parentRunId, background: isBackgroundSubagentRun(child) } : undefined;
|
|
18
21
|
}
|
|
19
22
|
export async function settleSubagentRunImpl(host, initialTimeline, report = subagentReportFor(initialTimeline.run)) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
try {
|
|
23
|
+
const id = initialTimeline.run.id;
|
|
24
|
+
const result = await withRunExecutionLease(host.state, id, "settlement", ["completed", "failed", "cancelled", "waiting_for_approval", "waiting_for_input", "waiting_for_connection"], async () => {
|
|
25
|
+
let timeline = await host.replay(id);
|
|
26
|
+
if (TERMINAL_STATUSES.has(timeline.run.status))
|
|
27
|
+
timeline = await finalizeSubagentHandoffImpl(host, timeline);
|
|
28
|
+
const notification = timeline.run.lifecycle?.notification;
|
|
29
|
+
if (!report || !notification)
|
|
30
|
+
return timeline;
|
|
29
31
|
const status = timeline.run.status;
|
|
30
32
|
const receipt = status === "completed" ? readySubagentHandoff(timeline.events) : undefined;
|
|
31
|
-
if (receipt && !report.background)
|
|
33
|
+
if (receipt && !report.background)
|
|
32
34
|
await acceptSubagentHandoff(host.state, report.parentRunId, receipt);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
35
|
+
await host.state.transactRun(id, () => ({ events: [{
|
|
36
|
+
id: `subagent-report:${notification.id}`, runId: report.parentRunId,
|
|
37
|
+
type: notification.kind === "attention" ? "subagent.needs_attention" : `subagent.${status}`,
|
|
38
|
+
data: { subagent: typeof timeline.run.input.subagent === "string" ? timeline.run.input.subagent : null,
|
|
39
|
+
childRunId: id, status, notificationId: notification.id,
|
|
40
|
+
...(report.resumed ? { resumed: true } : {}), ...(receipt ? { handoff: publicSubagentHandoff(receipt) } : {}) }
|
|
41
|
+
}] }), currentRunExecution(id));
|
|
42
|
+
// The durable conversation queue deduplicates this notification ID. A
|
|
43
|
+
// crash after enqueue is harmless: the obligation remains and retries.
|
|
41
44
|
if (report.background)
|
|
42
45
|
await host.queueBackgroundSubagentCompletion(timeline);
|
|
43
|
-
await host.state.
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
46
|
+
await host.state.transactRun(id, ({ run }) => {
|
|
47
|
+
if (run.lifecycle?.notification?.id !== notification.id)
|
|
48
|
+
return;
|
|
49
|
+
const { notification: _notice, ...lifecycle } = run.lifecycle;
|
|
50
|
+
return { patch: { lifecycle: { ...lifecycle, reportedNotificationId: notification.id } }, events: [{
|
|
51
|
+
id: `subagent-settled:${notification.id}`, type: notification.kind === "attention" ? "subagent.attention_reported" : "subagent.settled",
|
|
52
|
+
data: { parentRunId: report.parentRunId, status, background: report.background, notificationId: notification.id }
|
|
53
|
+
}] };
|
|
54
|
+
}, currentRunExecution(id));
|
|
55
|
+
return host.replay(id);
|
|
56
|
+
});
|
|
57
|
+
await scheduleRunCommand(host.state, id);
|
|
58
|
+
return result ?? host.replay(id);
|
|
54
59
|
}
|
|
55
|
-
/**
|
|
60
|
+
/** The durable obligation identifies one outcome or request for help. */
|
|
56
61
|
export function subagentSettlementKey(timeline) {
|
|
57
|
-
|
|
58
|
-
for (const event of timeline.events) {
|
|
59
|
-
if (SETTLEMENT_MARKER_EVENTS.has(event.type) && event.sequence > marker)
|
|
60
|
-
marker = event.sequence;
|
|
61
|
-
}
|
|
62
|
-
return `${timeline.run.id}:${marker}`;
|
|
62
|
+
return timeline.run.lifecycle?.notification?.id ?? timeline.run.lifecycle?.reportedNotificationId ?? `${timeline.run.id}:0`;
|
|
63
63
|
}
|
|
64
64
|
export async function finalizeSubagentHandoffImpl(host, initialTimeline) {
|
|
65
|
-
|
|
65
|
+
const result = await withRunExecutionLease(host.state, initialTimeline.run.id, "settlement", ["completed"], () => finalizeClaimedHandoff(host, initialTimeline.run.id));
|
|
66
|
+
return result ?? host.replay(initialTimeline.run.id);
|
|
67
|
+
}
|
|
68
|
+
async function finalizeClaimedHandoff(host, runId) {
|
|
69
|
+
let timeline = await host.replay(runId);
|
|
66
70
|
if (timeline.run.status !== "completed")
|
|
67
71
|
return timeline;
|
|
68
72
|
if (readyAfterLatestCompletion(timeline.events))
|
|
@@ -76,7 +80,7 @@ export async function finalizeSubagentHandoffImpl(host, initialTimeline) {
|
|
|
76
80
|
}
|
|
77
81
|
catch (error) {
|
|
78
82
|
lastError = error instanceof Error ? error.message : String(error);
|
|
79
|
-
const retrying =
|
|
83
|
+
const retrying = (timeline.run.lifecycle?.repairAttempts ?? 0) < 1;
|
|
80
84
|
await host.state.appendEvent(timeline.run.id, "subagent.handoff_rejected", {
|
|
81
85
|
error: lastError,
|
|
82
86
|
attempt: attempt + 1,
|
|
@@ -85,6 +89,12 @@ export async function finalizeSubagentHandoffImpl(host, initialTimeline) {
|
|
|
85
89
|
if (!retrying)
|
|
86
90
|
break;
|
|
87
91
|
try {
|
|
92
|
+
await host.state.transactRun(runId, ({ run }) => ({ patch: {
|
|
93
|
+
lifecycle: { ...(run.lifecycle ?? initialRunLifecycle()), repairAttempts: (run.lifecycle?.repairAttempts ?? 0) + 1 },
|
|
94
|
+
...(run.lifecycle?.checkpointId ? { input: { ...run.input, backgroundResume: {
|
|
95
|
+
message: subagentHandoffRetryMessage(lastError), checkpointId: run.lifecycle.checkpointId
|
|
96
|
+
} } } : {})
|
|
97
|
+
} }), currentRunExecution(runId));
|
|
88
98
|
await resumeAgentHarnessSubagent(host, timeline.run, subagentHandoffRetryMessage(lastError));
|
|
89
99
|
timeline = await host.replay(timeline.run.id);
|
|
90
100
|
}
|
|
@@ -109,10 +119,24 @@ function readyAfterLatestCompletion(events) {
|
|
|
109
119
|
}
|
|
110
120
|
/** Resume a Pi-backed subagent with a follow-up through its durable continuation. */
|
|
111
121
|
export async function resumeAgentHarnessSubagent(host, child, message) {
|
|
112
|
-
|
|
113
|
-
const
|
|
114
|
-
const
|
|
115
|
-
|
|
122
|
+
await checkTaskBudget(host.state, child.id);
|
|
123
|
+
const nested = Boolean(currentRunExecution(child.id));
|
|
124
|
+
const result = await withRunExecutionLease(host.state, child.id, "execution", ["completed", "failed", "cancelled", "suspended"], async () => {
|
|
125
|
+
const latest = (await host.state.getRun(child.id));
|
|
126
|
+
const { harness, restored, checkpointId } = await loadSubagentContinuation(host, latest);
|
|
127
|
+
const followup = message ?? pendingBackgroundResumeMessage(latest, checkpointId);
|
|
128
|
+
const running = (await host.state.transactRun(child.id, ({ run }) => {
|
|
129
|
+
const lifecycle = run.lifecycle ?? initialRunLifecycle();
|
|
130
|
+
return { patch: { status: "running", controlIntent: undefined,
|
|
131
|
+
lifecycle: nested ? lifecycle : { ...lifecycle, generation: lifecycle.generation + 1, repairAttempts: 0, recoveryAttempts: 0 },
|
|
132
|
+
...(followup ? { input: { ...run.input, backgroundResume: { message: followup, checkpointId } } } : {})
|
|
133
|
+
}, ...(!nested ? { events: [{ type: "run.generation_started", data: { generation: lifecycle.generation + 1 } }] } : {}) };
|
|
134
|
+
})).run;
|
|
135
|
+
return host.resumeHarnessLoop(running, harness, restored, followup ? { message: followup } : {});
|
|
136
|
+
});
|
|
137
|
+
if (!result)
|
|
138
|
+
throw new Error(`Subagent run ${child.id} is already executing or cannot be resumed in its current state.`);
|
|
139
|
+
return result;
|
|
116
140
|
}
|
|
117
141
|
/** A queued follow-up is injected only until its first new continuation is durable. */
|
|
118
142
|
export function pendingBackgroundResumeMessage(run, checkpointId) {
|