@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,3 +1,4 @@
|
|
|
1
|
+
import { withRunExecutionLease } from "./run-execution-lease.js";
|
|
1
2
|
import { normalizeAgentAudience } from "./audience.js";
|
|
2
3
|
import { pluginRuntimeForManifest, RuntimeConnectionRegistry } from "./connections.js";
|
|
3
4
|
import { runUsesChannelReplyForHumanInput } from "./human-input-routing.js";
|
|
@@ -114,20 +115,9 @@ export async function completeConnectionAuthorizationCallbackImpl(host, callback
|
|
|
114
115
|
}
|
|
115
116
|
};
|
|
116
117
|
}
|
|
117
|
-
const
|
|
118
|
-
if (!
|
|
119
|
-
return {
|
|
120
|
-
status: 200,
|
|
121
|
-
body: {
|
|
122
|
-
ok: true,
|
|
123
|
-
connection: session.connectionName,
|
|
124
|
-
runId: run.id,
|
|
125
|
-
runStatus: run.status,
|
|
126
|
-
response: "Authorization already processed."
|
|
127
|
-
}
|
|
128
|
-
};
|
|
129
|
-
}
|
|
130
|
-
const runResult = await host.withRunAdmission(() => resumeConnectionToolContinuation(host, run, toolCall, session));
|
|
118
|
+
const runResult = await withRunExecutionLease(host.state, run.id, "execution", ["waiting_for_connection", "waiting_for_approval"], () => host.withRunAdmission(() => resumeConnectionToolContinuation(host, run, toolCall, session)));
|
|
119
|
+
if (!runResult)
|
|
120
|
+
return { status: 202, body: { ok: true, connection: session.connectionName, runId: run.id, continuation: "already_in_progress_or_settled" } };
|
|
131
121
|
return {
|
|
132
122
|
status: 200,
|
|
133
123
|
body: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-authorization.js","sourceRoot":"","sources":["../src/replay-resume-authorization.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"replay-resume-authorization.js","sourceRoot":"","sources":["../src/replay-resume-authorization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-connection.d.ts","sourceRoot":"","sources":["../src/replay-resume-connection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"replay-resume-connection.d.ts","sourceRoot":"","sources":["../src/replay-resume-connection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5D,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,SAAS,EACd,QAAQ,EAAE,cAAc,EACxB,oBAAoB,CAAC,EAAE,oCAAoC,GAC1D,OAAO,CAAC,cAAc,CAAC,CA6FzB"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { connectionAuthorizationPrompt, parseQualifiedName } from "./connections.js";
|
|
2
2
|
import { resumeHarnessLoopImpl } from "./replay-resume-harness.js";
|
|
3
3
|
import { preparedResumeToolResult, readHarnessContinuation } from "./replay-resume-shared.js";
|
|
4
|
+
import { checkTaskBudget } from "./task-budget.js";
|
|
4
5
|
export async function resumeConnectionToolContinuation(host, run, toolCall, authorizationSession) {
|
|
6
|
+
await checkTaskBudget(host.state, run.id);
|
|
5
7
|
const running = await host.state.updateRun(run.id, { status: "running" });
|
|
6
8
|
const hookController = await host.ensureAgentHookController(running);
|
|
7
9
|
const capabilities = hookController.current.declaration;
|
|
@@ -68,7 +70,7 @@ export async function resumeConnectionToolContinuation(host, run, toolCall, auth
|
|
|
68
70
|
}, () => bundle);
|
|
69
71
|
return host.completeRun(fallbackRun, fallbackSandboxHandle, response, host.runDeliveryChannel(fallbackRun));
|
|
70
72
|
}
|
|
71
|
-
const toolResult = preparedResumeToolResult(toolCall.toolName, outcome.modelOutput, host.
|
|
73
|
+
const toolResult = await preparedResumeToolResult(toolCall.toolName, outcome.modelOutput, host, run.id);
|
|
72
74
|
await sandboxHandle?.dispose();
|
|
73
75
|
return resumeHarnessLoopImpl(host, outcome.run, harness, restored, { toolResult });
|
|
74
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-connection.js","sourceRoot":"","sources":["../src/replay-resume-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"replay-resume-connection.js","sourceRoot":"","sources":["../src/replay-resume-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAK9F,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,IAAsB,EACtB,GAAc,EACd,QAAwB,EACxB,oBAA2D;IAE3D,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC;IACxD,MAAM,eAAe,GAAG,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5F,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,KAAK,CAAC,cAAc,MAAM,CAAC,cAAc,oDAAoD,CAAC,CAAC;IAC3G,CAAC;IACD,MAAM,UAAU,GAAG,MAAM;QACvB,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,CAAC,EAAE,QAAQ,KAAK,KAAK;QAC9G,CAAC,CAAC,KAAK,CAAC;IACV,IAAI,UAAU,GAAG,OAAO,CAAC;IACzB,IAAI,aAA+C,CAAC;IACpD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YAC3C,OAAO,EAAE,4BAA4B;YACrC,OAAO,EAAE,eAAe;YACxB,YAAY;YACZ,GAAG,EAAE,UAAU;SAChB,CAAC,CAAC;QACH,aAAa,GAAG,IAAI,CAAC,mBAAmB,CACtC,GAAG,EAAE,CAAC,UAAU,EAChB,CAAC,OAAO,EAAE,EAAE;YACV,UAAU,GAAG,OAAO,CAAC;QACvB,CAAC,EACD,GAAG,EAAE,CAAC,MAAM,CACb,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,aAAa;QAC5B,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACjH,CAAC,CAAC,oBAAoB;YACpB,CAAC,CAAC,IAAI,CAAC,kCAAkC,CAAC,oBAAoB,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,IAAI;SACvB,+BAA+B,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;SAC/F,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IACnC,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;IACzB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;QACjC,MAAM,aAAa,EAAE,OAAO,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC,MAAM,CAChB,OAAO,CAAC,GAAG,EACX,MAAM,6BAA6B,CACjC,IAAI,CAAC,mCAAmC,EACxC,OAAO,CAAC,sBAAsB,EAC9B,EAAE,CACH,EACD,KAAK,EACL,KAAK,EACL,IAAI,CACL,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,GAAG,uBAAuB,CACpC,oBAAoB,EAAE,YAAY,EAClC,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,EAC1C,QAAQ,CAAC,QAAQ,CAClB,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5E,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,IAAI,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAChI,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,+BAA+B,EAAE;YACpE,eAAe,EAAE,OAAO,CAAC,EAAE;YAC3B,eAAe,EAAE,OAAO,CAAC,mBAAmB;YAC5C,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,OAAO;YAC5C,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,OAAO;SAC7C,CAAC,CAAC;QACH,QAAQ,GAAG,SAAS,CAAC;IACvB,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAC3H,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QACpG,CAAC;QACD,IAAI,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;YAC3C,OAAO,EAAE,mBAAmB;YAC5B,OAAO,EAAE,OAAO;YAChB,YAAY;YACZ,GAAG,EAAE,WAAW;SACjB,CAAC,CAAC;QACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CACpD,GAAG,EAAE,CAAC,WAAW,EACjB,CAAC,OAAO,EAAE,EAAE;YACV,WAAW,GAAG,OAAO,CAAC;QACxB,CAAC,EACD,GAAG,EAAE,CAAC,MAAM,CACb,CAAC;QACF,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9G,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACxG,MAAM,aAAa,EAAE,OAAO,EAAE,CAAC;IAC/B,OAAO,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;AACrF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-controls.d.ts","sourceRoot":"","sources":["../src/replay-resume-controls.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replay-resume-controls.d.ts","sourceRoot":"","sources":["../src/replay-resume-controls.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AA6IzD,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAK1G;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAKvH;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAK3G"}
|
|
@@ -1,25 +1,22 @@
|
|
|
1
|
+
import { withRunExecutionLease } from "./run-execution-lease.js";
|
|
1
2
|
import { runtimeToolsForSurface } from "./builtin-tools.js";
|
|
2
3
|
import { parseQualifiedName } from "./connections.js";
|
|
3
4
|
import { surfaceForRun } from "./agent-surface.js";
|
|
4
5
|
import { resumeConnectionToolContinuation } from "./replay-resume-connection.js";
|
|
5
6
|
import { resumeHarnessLoopImpl } from "./replay-resume-harness.js";
|
|
6
|
-
import { preparedResumeToolResult, readHarnessContinuation,
|
|
7
|
+
import { preparedResumeToolResult, readHarnessContinuation, restoreMatchingContinuation } from "./replay-resume-shared.js";
|
|
7
8
|
import { applyCoreToolPolicy } from "./security.js";
|
|
8
|
-
|
|
9
|
+
async function resumeApprovalClaimed(host, runId) {
|
|
9
10
|
host.boot();
|
|
10
11
|
await host.initializeInstrumentation();
|
|
11
12
|
let run = await host.state.getRun(runId);
|
|
12
13
|
if (!run)
|
|
13
14
|
throw new Error(`Run not found: ${runId}`);
|
|
14
|
-
if (run
|
|
15
|
+
if (!(await isControlResume(host, run, "waiting_for_approval", "approve")))
|
|
15
16
|
throw new Error(`Run ${runId} is not waiting for approval.`);
|
|
16
17
|
const toolCall = (await host.state.listToolCalls(runId)).find((candidate) => candidate.status === "waiting_for_approval");
|
|
17
18
|
if (!toolCall)
|
|
18
19
|
throw new Error(`Run ${runId} has no approval-gated tool call to resume.`);
|
|
19
|
-
const resumeClaimed = await host.state.reserveIdempotencyKey("resume", `${run.id}:${toolCall.id}:${toolCall.updatedAt}`, run.id);
|
|
20
|
-
if (!resumeClaimed) {
|
|
21
|
-
await reclaimStaleResume(host, run, `${run.id}:${toolCall.id}:${toolCall.updatedAt}`, "approval");
|
|
22
|
-
}
|
|
23
20
|
if (parseQualifiedName(toolCall.toolName)) {
|
|
24
21
|
await host.state.appendEvent(run.id, "tool.approval_resumed", {
|
|
25
22
|
toolCallId: toolCall.id,
|
|
@@ -63,7 +60,7 @@ export async function resumeApprovalNowImpl(host, runId) {
|
|
|
63
60
|
}
|
|
64
61
|
const resumable = await restoreMatchingContinuation(host, run.id, toolCall.toolName);
|
|
65
62
|
if (resumable) {
|
|
66
|
-
const toolResult = preparedResumeToolResult(toolCall.toolName, outcome.modelOutput, host.
|
|
63
|
+
const toolResult = await preparedResumeToolResult(toolCall.toolName, outcome.modelOutput, host, run.id);
|
|
67
64
|
return resumeHarnessLoopImpl(host, outcome.run, resumable.harness, resumable.restored, { toolResult });
|
|
68
65
|
}
|
|
69
66
|
await host.state.appendEvent(run.id, "harness.resume_degraded", {
|
|
@@ -74,28 +71,19 @@ export async function resumeApprovalNowImpl(host, runId) {
|
|
|
74
71
|
const response = typeof outcome.modelOutput === "string" ? outcome.modelOutput : JSON.stringify(outcome.modelOutput);
|
|
75
72
|
return host.completeRun(outcome.run, sandboxHandle, response, host.runDeliveryChannel(outcome.run));
|
|
76
73
|
}
|
|
77
|
-
|
|
74
|
+
async function resumeInputClaimed(host, runId, answer) {
|
|
78
75
|
host.boot();
|
|
79
76
|
await host.initializeInstrumentation();
|
|
80
77
|
const run = await host.state.getRun(runId);
|
|
81
78
|
if (!run)
|
|
82
79
|
throw new Error(`Run not found: ${runId}`);
|
|
83
|
-
if (run
|
|
80
|
+
if (!(await isControlResume(host, run, "waiting_for_input", "answer")))
|
|
84
81
|
throw new Error(`Run ${runId} is not waiting for input.`);
|
|
85
82
|
const toolCall = (await host.state.listToolCalls(runId)).find((candidate) => candidate.status === "waiting_for_approval");
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
90
|
-
let running = await host.state.updateRun(run.id, { status: "running" });
|
|
91
|
-
await host.state.appendEvent(run.id, "human_input.received", { answer });
|
|
92
|
-
if (toolCall) {
|
|
93
|
-
await host.state.updateToolCall(toolCall.id, {
|
|
94
|
-
status: "completed",
|
|
95
|
-
result: { answer },
|
|
96
|
-
modelOutput: { answer }
|
|
97
|
-
});
|
|
98
|
-
}
|
|
83
|
+
let running = (await host.state.transactRun(run.id, () => ({
|
|
84
|
+
patch: { status: "running" }, events: [{ type: "human_input.received", data: { answer } }],
|
|
85
|
+
...(toolCall ? { toolCallUpdate: { id: toolCall.id, patch: { status: "completed", result: { answer }, modelOutput: { answer } } } } : {})
|
|
86
|
+
}))).run;
|
|
99
87
|
const toolName = toolCall?.toolName ?? "human_input";
|
|
100
88
|
const resumable = await restoreMatchingContinuation(host, run.id, toolName);
|
|
101
89
|
if (resumable) {
|
|
@@ -125,7 +113,7 @@ export async function resumeInputNowImpl(host, runId, answer) {
|
|
|
125
113
|
}, () => bundle);
|
|
126
114
|
return host.completeRun(running, sandboxHandle, `Received input: ${answer}`, host.runDeliveryChannel(running));
|
|
127
115
|
}
|
|
128
|
-
|
|
116
|
+
async function resumeSuspendedClaimed(host, runId) {
|
|
129
117
|
host.boot();
|
|
130
118
|
await host.initializeInstrumentation();
|
|
131
119
|
await host.ensureDynamicConnections();
|
|
@@ -134,9 +122,6 @@ export async function resumeSuspendedNowImpl(host, runId) {
|
|
|
134
122
|
throw new Error(`Run not found: ${runId}`);
|
|
135
123
|
if (run.status !== "suspended")
|
|
136
124
|
throw new Error(`Run ${runId} is not suspended.`);
|
|
137
|
-
const resumeClaimed = await host.state.reserveIdempotencyKey("resume:suspended", `${run.id}:${run.updatedAt}`, run.id);
|
|
138
|
-
if (!resumeClaimed)
|
|
139
|
-
throw new Error(`Run ${runId} suspended resume is already in progress.`);
|
|
140
125
|
const restored = readHarnessContinuation(undefined, await host.listHydratedCheckpoints(runId));
|
|
141
126
|
if (!restored)
|
|
142
127
|
throw new Error(`Run ${runId} has no harness continuation to resume.`);
|
|
@@ -154,4 +139,35 @@ export async function resumeSuspendedNowImpl(host, runId) {
|
|
|
154
139
|
await host.state.appendEvent(run.id, "run.resumed", { from: "suspended" });
|
|
155
140
|
return resumeHarnessLoopImpl(host, running, harness, restored, {});
|
|
156
141
|
}
|
|
142
|
+
export async function resumeApprovalNowImpl(host, runId) {
|
|
143
|
+
const result = await withRunExecutionLease(host.state, runId, "execution", ["waiting_for_approval", "created"], () => resumeApprovalClaimed(host, runId));
|
|
144
|
+
if (!result)
|
|
145
|
+
throw new Error(`Run ${runId} resume is already in progress or the run is not waiting_for_approval.`);
|
|
146
|
+
return result;
|
|
147
|
+
}
|
|
148
|
+
export async function resumeInputNowImpl(host, runId, answer) {
|
|
149
|
+
const result = await withRunExecutionLease(host.state, runId, "execution", ["waiting_for_input", "created"], () => resumeInputClaimed(host, runId, answer));
|
|
150
|
+
if (!result)
|
|
151
|
+
throw new Error(`Run ${runId} resume is already in progress or the run is not waiting_for_input.`);
|
|
152
|
+
return result;
|
|
153
|
+
}
|
|
154
|
+
export async function resumeSuspendedNowImpl(host, runId) {
|
|
155
|
+
const result = await withRunExecutionLease(host.state, runId, "execution", ["suspended", "created"], () => resumeSuspendedClaimed(host, runId));
|
|
156
|
+
if (!result)
|
|
157
|
+
throw new Error(`Run ${runId} resume is already in progress or the run is not suspended.`);
|
|
158
|
+
return result;
|
|
159
|
+
}
|
|
160
|
+
async function isControlResume(host, run, status, operation) {
|
|
161
|
+
if (run.status === status)
|
|
162
|
+
return true;
|
|
163
|
+
if (run.status !== "created" || !run.lifecycle?.resumeCommandId)
|
|
164
|
+
return false;
|
|
165
|
+
const command = (await host.state.listRunCommands(run.id)).find(command => command.id === run.lifecycle?.resumeCommandId);
|
|
166
|
+
if (command?.operation !== operation)
|
|
167
|
+
return false;
|
|
168
|
+
const pending = (await host.state.listToolCalls(run.id)).find(call => call.status === "waiting_for_approval");
|
|
169
|
+
if (!pending || pending.id !== command.pendingActionId)
|
|
170
|
+
throw new Error("The pending action changed before this command could be applied.");
|
|
171
|
+
return true;
|
|
172
|
+
}
|
|
157
173
|
//# sourceMappingURL=replay-resume-controls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-controls.js","sourceRoot":"","sources":["../src/replay-resume-controls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"replay-resume-controls.js","sourceRoot":"","sources":["../src/replay-resume-controls.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-recovery.d.ts","sourceRoot":"","sources":["../src/replay-resume-recovery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,yFAAyF;AACzF,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,SAAS,EACd,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,oBAAoB,EAAE,CAAA;CAAE,GAClD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"replay-resume-recovery.d.ts","sourceRoot":"","sources":["../src/replay-resume-recovery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,yFAAyF;AACzF,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,SAAS,EACd,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,oBAAoB,EAAE,CAAA;CAAE,GAClD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAyDhC"}
|
|
@@ -38,7 +38,11 @@ export async function resumeRunFromContinuationImpl(host, run, context) {
|
|
|
38
38
|
const resume = pending
|
|
39
39
|
? { toolResult: { toolName: pending.toolName, output: pending.output } }
|
|
40
40
|
: {};
|
|
41
|
-
|
|
41
|
+
const command = (await host.state.listRunCommands(run.id)).find(command => command.id === run.lifecycle?.resumeCommandId && command.status === "accepted" && command.checkpointId === checkpointId);
|
|
42
|
+
if (command?.operation === "answer" && restored.runtime.pendingToolName) {
|
|
43
|
+
resume.toolResult = { toolName: restored.runtime.pendingToolName, output: { answer: command.message } };
|
|
44
|
+
}
|
|
45
|
+
if (!pending && !resume.toolResult) {
|
|
42
46
|
// Real results assigned during recovery are completed tool calls newer
|
|
43
47
|
// than the checkpoint, so the report surfaces them alongside the
|
|
44
48
|
// interrupted placeholders.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-recovery.js","sourceRoot":"","sources":["../src/replay-resume-recovery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAE,iBAAiB,EAA6B,MAAM,mBAAmB,CAAC;AAEjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAE1E,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,IAAsB,EACtB,GAAc,EACd,OAAmD;IAEnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/D,IAAI,QAA4C,CAAC;IACjD,IAAI,mBAAuC,CAAC;IAC5C,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,KAAK,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC7E,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,sBAAsB;YAAE,SAAS;QACxE,QAAQ,GAAG,yBAAyB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YAAC,mBAAmB,GAAG,UAAU,CAAC,SAAS,CAAC;YAAC,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC;QAAC,CAAC;IAC7F,CAAC;IACD,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,IAAI,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAClH,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,+BAA+B,EAAE;YACpE,eAAe,EAAE,OAAO,CAAC,EAAE;YAC3B,eAAe,EAAE,OAAO,CAAC,mBAAmB;YAC5C,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,OAAO;YAC5C,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,OAAO;SAC7C,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,+BAA+B,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC;IACzD,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,IAAI,EAAE,CAAC;IACjD,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,eAAe,CAAC,CAAC;IAC/E,MAAM,MAAM,GAA6E,OAAO;QAC9F,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE;QACxE,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"replay-resume-recovery.js","sourceRoot":"","sources":["../src/replay-resume-recovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import type { AgentHarness, HarnessInputMedia, JsonObject } from "@assemblyline-agents/core";
|
|
2
2
|
import { type RestoredHarnessSession } from "./harness-continuation.js";
|
|
3
3
|
import type { ReplayResumeHost } from "./replay-resume-types.js";
|
|
4
|
-
import type { CheckpointRecord
|
|
5
|
-
export declare function reclaimStaleResume(host: ReplayResumeHost, run: RunRecord, baseKey: string, kind: "approval" | "input"): Promise<void>;
|
|
4
|
+
import type { CheckpointRecord } from "./state.js";
|
|
6
5
|
export declare function restoreMatchingContinuation(host: ReplayResumeHost, runId: string, toolName: string): Promise<{
|
|
7
6
|
harness: AgentHarness;
|
|
8
7
|
restored: RestoredHarnessSession;
|
|
9
8
|
} | undefined>;
|
|
10
|
-
export declare function preparedResumeToolResult(toolName: string, output: unknown,
|
|
9
|
+
export declare function preparedResumeToolResult(toolName: string, output: unknown, host: Pick<ReplayResumeHost, "env" | "blob" | "toolOutputMaxChars">, runId: string): Promise<{
|
|
11
10
|
toolName: string;
|
|
12
11
|
output: unknown;
|
|
13
12
|
media?: HarnessInputMedia[];
|
|
14
|
-
}
|
|
13
|
+
}>;
|
|
15
14
|
export declare function readHarnessContinuation(stored: JsonObject | undefined, checkpoints: CheckpointRecord[], toolName?: string): RestoredHarnessSession | undefined;
|
|
16
15
|
//# sourceMappingURL=replay-resume-shared.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-shared.d.ts","sourceRoot":"","sources":["../src/replay-resume-shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAA6B,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"replay-resume-shared.d.ts","sourceRoot":"","sources":["../src/replay-resume-shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAA6B,KAAK,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGnD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,sBAAsB,CAAA;CAAE,GAAG,SAAS,CAAC,CAclF;AAED,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,MAAM,GAAG,oBAAoB,CAAC,EACnE,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAAC,CAQ7E;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,GAAG,SAAS,EAC9B,WAAW,EAAE,gBAAgB,EAAE,EAC/B,QAAQ,CAAC,EAAE,MAAM,GAChB,sBAAsB,GAAG,SAAS,CAWpC"}
|
|
@@ -1,15 +1,6 @@
|
|
|
1
1
|
import { storedHarnessContinuation } from "./harness-continuation.js";
|
|
2
2
|
import { prepareToolModelOutput } from "./model-media.js";
|
|
3
|
-
|
|
4
|
-
export async function reclaimStaleResume(host, run, baseKey, kind) {
|
|
5
|
-
const inProgress = new Error(`Run ${run.id} ${kind} resume is already in progress.`);
|
|
6
|
-
if (Date.parse(run.updatedAt) > Date.now() - RESUME_RECLAIM_STALE_MS)
|
|
7
|
-
throw inProgress;
|
|
8
|
-
const reclaimed = await host.state.reserveIdempotencyKey("resume", `${baseKey}:retry:${run.updatedAt}`, run.id);
|
|
9
|
-
if (!reclaimed)
|
|
10
|
-
throw inProgress;
|
|
11
|
-
await host.state.updateRun(run.id, {});
|
|
12
|
-
}
|
|
3
|
+
import { retainToolModelOutput } from "./tool-result-output.js";
|
|
13
4
|
export async function restoreMatchingContinuation(host, runId, toolName) {
|
|
14
5
|
const restored = readHarnessContinuation(undefined, await host.listHydratedCheckpoints(runId), toolName);
|
|
15
6
|
if (!restored)
|
|
@@ -26,11 +17,11 @@ export async function restoreMatchingContinuation(host, runId, toolName) {
|
|
|
26
17
|
}
|
|
27
18
|
return { harness, restored };
|
|
28
19
|
}
|
|
29
|
-
export function preparedResumeToolResult(toolName, output,
|
|
30
|
-
const prepared = prepareToolModelOutput(output, env);
|
|
20
|
+
export async function preparedResumeToolResult(toolName, output, host, runId) {
|
|
21
|
+
const prepared = prepareToolModelOutput(output, host.env);
|
|
31
22
|
const result = {
|
|
32
23
|
toolName,
|
|
33
|
-
output: prepared.output
|
|
24
|
+
output: await retainToolModelOutput(host, runId, prepared.output)
|
|
34
25
|
};
|
|
35
26
|
if (prepared.media.length > 0)
|
|
36
27
|
result.media = prepared.media;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-shared.js","sourceRoot":"","sources":["../src/replay-resume-shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAA+B,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"replay-resume-shared.js","sourceRoot":"","sources":["../src/replay-resume-shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAA+B,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAG1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,IAAsB,EACtB,KAAa,EACb,QAAgB;IAEhB,MAAM,QAAQ,GAAG,uBAAuB,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;IACzG,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,IAAI,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAClH,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,+BAA+B,EAAE;YACnE,eAAe,EAAE,OAAO,CAAC,EAAE;YAC3B,eAAe,EAAE,OAAO,CAAC,mBAAmB;YAC5C,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,OAAO;YAC5C,aAAa,EAAE,QAAQ,CAAC,YAAY,CAAC,OAAO;SAC7C,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,QAAgB,EAChB,MAAe,EACf,IAAmE,EACnE,KAAa;IAEb,MAAM,QAAQ,GAAG,sBAAsB,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAuE;QACjF,QAAQ;QACR,MAAM,EAAE,MAAM,qBAAqB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC;KAClE,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC7D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,MAA8B,EAC9B,WAA+B,EAC/B,QAAiB;IAEjB,IAAI,MAAM;QAAE,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACrD,KAAK,IAAI,KAAK,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,sBAAsB;YAAE,SAAS;QACxE,MAAM,QAAQ,GAAG,yBAAyB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC;QACzD,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,eAAe,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;IACrH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -3,13 +3,15 @@ import type { AgentHookRunController } from "./agent-hook-evaluation.js";
|
|
|
3
3
|
import type { ChannelTurn } from "./channel.js";
|
|
4
4
|
import type { ConnectionAuthorizationSessionRecord, ConnectionAuthorizationSessionStore, ConnectionGrantStore, RuntimeConnectionRegistry } from "./connections.js";
|
|
5
5
|
import type { RuntimePause } from "./harness-continuation.js";
|
|
6
|
-
import type { ContextBundle, HarnessLoopSession, HarnessLoopState, RunAgentResult, RuntimeSandboxHandle } from "./runtime-types.js";
|
|
6
|
+
import type { ContextBundle, BlobAdapter, HarnessLoopSession, HarnessLoopState, RunAgentResult, RuntimeSandboxHandle } from "./runtime-types.js";
|
|
7
7
|
import type { ResolvedCoreToolPolicy } from "./security.js";
|
|
8
8
|
import type { CheckpointRecord, RunRecord, StateAdapter, ToolCallRecord } from "./state.js";
|
|
9
9
|
import type { CredentialBroker } from "./credential-broker.js";
|
|
10
10
|
/** Runtime capabilities required by replay and every resume path. */
|
|
11
11
|
export interface ReplayResumeHost {
|
|
12
12
|
state: StateAdapter;
|
|
13
|
+
blob: BlobAdapter;
|
|
14
|
+
toolOutputMaxChars: number;
|
|
13
15
|
manifest: AgentManifest;
|
|
14
16
|
coreToolPolicy: ResolvedCoreToolPolicy;
|
|
15
17
|
env: Record<string, string | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replay-resume-types.d.ts","sourceRoot":"","sources":["../src/replay-resume-types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"replay-resume-types.d.ts","sourceRoot":"","sources":["../src/replay-resume-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { RunCommand, RunRecord, RunTransactionUpdate, StateAdapter } from "./state.js";
|
|
2
|
+
/** Called only after execution stops or its lease expires. */
|
|
3
|
+
export declare function stoppedRunCommandUpdate(run: RunRecord, commands: RunCommand[]): RunTransactionUpdate | undefined;
|
|
4
|
+
/** Recover the receipt if a worker died after parking but before releasing ownership. */
|
|
5
|
+
export declare function settleStoppedRunCommands(state: StateAdapter, runId: string): Promise<void>;
|
|
6
|
+
//# sourceMappingURL=run-command-settlement.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-command-settlement.d.ts","sourceRoot":"","sources":["../src/run-command-settlement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE5F,8DAA8D;AAC9D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,oBAAoB,GAAG,SAAS,CAuBhH;AAED,yFAAyF;AACzF,wBAAsB,wBAAwB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhG"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/** Called only after execution stops or its lease expires. */
|
|
2
|
+
export function stoppedRunCommandUpdate(run, commands) {
|
|
3
|
+
const now = new Date().toISOString();
|
|
4
|
+
const terminal = ["failed", "completed", "cancelled"].includes(run.status);
|
|
5
|
+
const settled = [];
|
|
6
|
+
for (const command of commands) {
|
|
7
|
+
if (command.status !== "accepted")
|
|
8
|
+
continue;
|
|
9
|
+
if ((command.operation === "cancel" && run.status === "cancelled" && (!run.lifecycle?.cancellation || run.lifecycle.cancellation.settled)) ||
|
|
10
|
+
(command.operation === "pause" && run.status === "suspended")) {
|
|
11
|
+
settled.push({ ...command, status: "applied", appliedAt: now });
|
|
12
|
+
}
|
|
13
|
+
else if (terminal && (command.operation === "pause" || command.id === run.lifecycle?.resumeCommandId)) {
|
|
14
|
+
settled.push({ ...command, status: "rejected", error: "Execution ended before this command was applied." });
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
if (!settled.length)
|
|
18
|
+
return;
|
|
19
|
+
return {
|
|
20
|
+
commands: settled,
|
|
21
|
+
events: settled.map((command) => ({
|
|
22
|
+
type: `run.command_${command.status}`,
|
|
23
|
+
data: { commandId: command.id, operation: command.operation, ...(command.error ? { error: command.error } : {}) }
|
|
24
|
+
}))
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
/** Recover the receipt if a worker died after parking but before releasing ownership. */
|
|
28
|
+
export async function settleStoppedRunCommands(state, runId) {
|
|
29
|
+
await state.transactRun(runId, ({ run, commands }) => {
|
|
30
|
+
if (run.lifecycle?.lease && Date.parse(run.lifecycle.lease.expiresAt) > Date.now())
|
|
31
|
+
return;
|
|
32
|
+
return stoppedRunCommandUpdate(run, commands);
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=run-command-settlement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-command-settlement.js","sourceRoot":"","sources":["../src/run-command-settlement.ts"],"names":[],"mappings":"AAEA,8DAA8D;AAC9D,MAAM,UAAU,uBAAuB,CAAC,GAAc,EAAE,QAAsB;IAC5E,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU;YAAE,SAAS;QAC5C,IACE,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,IAAI,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACtI,CAAC,OAAO,CAAC,SAAS,KAAK,OAAO,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,CAAC,EAC7D,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAClE,CAAC;aAAM,IAAI,QAAQ,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,OAAO,IAAI,OAAO,CAAC,EAAE,KAAK,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,CAAC;YACxG,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,kDAAkD,EAAE,CAAC,CAAC;QAC9G,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO;IAC5B,OAAO;QACL,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAChC,IAAI,EAAE,eAAe,OAAO,CAAC,MAAM,EAAE;YACrC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;SAClH,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAAmB,EAAE,KAAa;IAC/E,MAAM,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnD,IAAI,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE;YAAE,OAAO;QAC3F,OAAO,uBAAuB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type RunCommand, type RunCommandOperation } from "./state/run-lifecycle.js";
|
|
2
|
+
import type { RunRecord, RunStatus, StateAdapter } from "./state.js";
|
|
3
|
+
export interface RunCommandInput {
|
|
4
|
+
id?: string;
|
|
5
|
+
operation: RunCommandOperation;
|
|
6
|
+
message?: string;
|
|
7
|
+
pendingActionId?: string;
|
|
8
|
+
/** Optimistic precondition for a caller that validated an earlier snapshot. */
|
|
9
|
+
expectedStatus?: RunStatus;
|
|
10
|
+
}
|
|
11
|
+
export declare const hasLiveRunLease: (run: RunRecord) => boolean;
|
|
12
|
+
/** Acceptance and the scheduling/control transition have one durable commit. */
|
|
13
|
+
export declare function submitRunCommand(state: StateAdapter, runId: string, input: RunCommandInput): Promise<RunCommand>;
|
|
14
|
+
/** Promote one accepted instruction when the preceding outcome has been reported. */
|
|
15
|
+
export declare function scheduleRunCommand(state: StateAdapter, runId: string): Promise<RunRecord>;
|
|
16
|
+
//# sourceMappingURL=run-commands.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-commands.d.ts","sourceRoot":"","sources":["../src/run-commands.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,UAAU,EACf,KAAK,mBAAmB,EAGzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAErE,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,mBAAmB,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,SAAS,CAAC;CAC5B;AAGD,eAAO,MAAM,eAAe,GAAI,KAAK,SAAS,KAAG,OACwC,CAAC;AAE1F,gFAAgF;AAChF,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,UAAU,CAAC,CA6FrB;AAsBD,qFAAqF;AACrF,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAgF/F"}
|