@assemblyline-agents/runtime 2.0.0 → 3.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/LICENSE +1 -1
- package/dist/a2a-client.d.ts +22 -0
- package/dist/a2a-client.d.ts.map +1 -0
- package/dist/a2a-client.js +211 -0
- package/dist/a2a-client.js.map +1 -0
- package/dist/agent-hook-context.d.ts +6 -1
- package/dist/agent-hook-context.d.ts.map +1 -1
- package/dist/agent-hook-context.js +24 -11
- package/dist/agent-hook-context.js.map +1 -1
- package/dist/agent-hook-evaluation.d.ts +6 -1
- package/dist/agent-hook-evaluation.d.ts.map +1 -1
- package/dist/agent-hook-evaluation.js +16 -5
- package/dist/agent-hook-evaluation.js.map +1 -1
- package/dist/agent-hook-run-lifecycle.d.ts +5 -1
- package/dist/agent-hook-run-lifecycle.d.ts.map +1 -1
- package/dist/agent-hook-run-lifecycle.js +11 -13
- package/dist/agent-hook-run-lifecycle.js.map +1 -1
- package/dist/agent-surface.d.ts +32 -0
- package/dist/agent-surface.d.ts.map +1 -0
- package/dist/agent-surface.js +85 -0
- package/dist/agent-surface.js.map +1 -0
- package/dist/attachments.d.ts +5 -1
- package/dist/attachments.d.ts.map +1 -1
- package/dist/attachments.js +58 -32
- package/dist/attachments.js.map +1 -1
- package/dist/audience.d.ts +30 -0
- package/dist/audience.d.ts.map +1 -0
- package/dist/audience.js +68 -0
- package/dist/audience.js.map +1 -0
- package/dist/automation-event-match.d.ts +8 -0
- package/dist/automation-event-match.d.ts.map +1 -0
- package/dist/automation-event-match.js +25 -0
- package/dist/automation-event-match.js.map +1 -0
- package/dist/background-review-trigger.d.ts.map +1 -1
- package/dist/background-review-trigger.js +14 -16
- package/dist/background-review-trigger.js.map +1 -1
- package/dist/background-review-types.d.ts +9 -2
- package/dist/background-review-types.d.ts.map +1 -1
- package/dist/background-review-worker.js +2 -2
- package/dist/background-review-worker.js.map +1 -1
- package/dist/background-review.d.ts.map +1 -1
- package/dist/background-review.js +27 -10
- package/dist/background-review.js.map +1 -1
- package/dist/builtin-tool-executors.d.ts +47 -21
- package/dist/builtin-tool-executors.d.ts.map +1 -1
- package/dist/builtin-tool-executors.js +293 -121
- package/dist/builtin-tool-executors.js.map +1 -1
- package/dist/builtin-tools.d.ts +16 -8
- package/dist/builtin-tools.d.ts.map +1 -1
- package/dist/builtin-tools.js +309 -70
- package/dist/builtin-tools.js.map +1 -1
- package/dist/capability-catalog.d.ts +3 -2
- package/dist/capability-catalog.d.ts.map +1 -1
- package/dist/capability-catalog.js +10 -6
- package/dist/capability-catalog.js.map +1 -1
- package/dist/capability-inspection.d.ts +31 -0
- package/dist/capability-inspection.d.ts.map +1 -0
- package/dist/capability-inspection.js +58 -0
- package/dist/capability-inspection.js.map +1 -0
- package/dist/channel-http-util.d.ts.map +1 -1
- package/dist/channel-http-util.js +6 -2
- package/dist/channel-http-util.js.map +1 -1
- package/dist/channel-ingress.d.ts +16 -1
- package/dist/channel-ingress.d.ts.map +1 -1
- package/dist/channel-ingress.js +117 -7
- package/dist/channel-ingress.js.map +1 -1
- package/dist/channel.d.ts +58 -2
- package/dist/channel.d.ts.map +1 -1
- package/dist/checkpoints.d.ts +1 -1
- package/dist/checkpoints.d.ts.map +1 -1
- package/dist/checkpoints.js +6 -6
- package/dist/checkpoints.js.map +1 -1
- package/dist/child-process-env.d.ts +7 -0
- package/dist/child-process-env.d.ts.map +1 -0
- package/dist/child-process-env.js +41 -0
- package/dist/child-process-env.js.map +1 -0
- package/dist/computer-relay-protocol.d.ts.map +1 -1
- package/dist/computer-relay-protocol.js +4 -4
- package/dist/computer-relay-protocol.js.map +1 -1
- package/dist/concurrency.d.ts +1 -1
- package/dist/concurrency.js +1 -1
- package/dist/connection-auth-util.d.ts +1 -0
- package/dist/connection-auth-util.d.ts.map +1 -1
- package/dist/connection-auth-util.js +1 -1
- package/dist/connection-auth-util.js.map +1 -1
- package/dist/connection-clients.d.ts +11 -3
- package/dist/connection-clients.d.ts.map +1 -1
- package/dist/connection-clients.js +71 -8
- package/dist/connection-clients.js.map +1 -1
- package/dist/connection-event-store.d.ts +98 -0
- package/dist/connection-event-store.d.ts.map +1 -0
- package/dist/connection-event-store.js +162 -0
- package/dist/connection-event-store.js.map +1 -0
- package/dist/connection-events.d.ts +51 -0
- package/dist/connection-events.d.ts.map +1 -0
- package/dist/connection-events.js +343 -0
- package/dist/connection-events.js.map +1 -0
- package/dist/connection-stores.d.ts +3 -0
- package/dist/connection-stores.d.ts.map +1 -1
- package/dist/connection-stores.js +4 -1
- package/dist/connection-stores.js.map +1 -1
- package/dist/connection-util.d.ts +3 -2
- package/dist/connection-util.d.ts.map +1 -1
- package/dist/connection-util.js +18 -1
- package/dist/connection-util.js.map +1 -1
- package/dist/connections.d.ts +54 -5
- package/dist/connections.d.ts.map +1 -1
- package/dist/connections.js +342 -53
- package/dist/connections.js.map +1 -1
- package/dist/context-policy-util.d.ts.map +1 -1
- package/dist/context-policy-util.js +1 -3
- package/dist/context-policy-util.js.map +1 -1
- package/dist/conversation-context.d.ts +6 -2
- package/dist/conversation-context.d.ts.map +1 -1
- package/dist/conversation-context.js +45 -12
- package/dist/conversation-context.js.map +1 -1
- package/dist/conversation-transcript.d.ts +8 -5
- package/dist/conversation-transcript.d.ts.map +1 -1
- package/dist/conversation-transcript.js +24 -5
- package/dist/conversation-transcript.js.map +1 -1
- package/dist/conversation-turn-coalescing.d.ts +22 -0
- package/dist/conversation-turn-coalescing.d.ts.map +1 -0
- package/dist/conversation-turn-coalescing.js +121 -0
- package/dist/conversation-turn-coalescing.js.map +1 -0
- package/dist/conversation-turn-dispatch.d.ts +5 -2
- package/dist/conversation-turn-dispatch.d.ts.map +1 -1
- package/dist/conversation-turn-dispatch.js +59 -22
- package/dist/conversation-turn-dispatch.js.map +1 -1
- package/dist/default-outbound-route.d.ts +29 -0
- package/dist/default-outbound-route.d.ts.map +1 -0
- package/dist/default-outbound-route.js +105 -0
- package/dist/default-outbound-route.js.map +1 -0
- package/dist/delivery-artifacts.d.ts +2 -0
- package/dist/delivery-artifacts.d.ts.map +1 -0
- package/dist/delivery-artifacts.js +34 -0
- package/dist/delivery-artifacts.js.map +1 -0
- package/dist/delivery-files.d.ts +5 -0
- package/dist/delivery-files.d.ts.map +1 -0
- package/dist/delivery-files.js +33 -0
- package/dist/delivery-files.js.map +1 -0
- package/dist/delivery-queue.d.ts +21 -1
- package/dist/delivery-queue.d.ts.map +1 -1
- package/dist/delivery-queue.js +144 -1
- package/dist/delivery-queue.js.map +1 -1
- package/dist/delivery-send.d.ts +2 -2
- package/dist/delivery-send.d.ts.map +1 -1
- package/dist/delivery-send.js +256 -100
- package/dist/delivery-send.js.map +1 -1
- package/dist/durable-files.d.ts +37 -0
- package/dist/durable-files.d.ts.map +1 -0
- package/dist/durable-files.js +63 -0
- package/dist/durable-files.js.map +1 -0
- package/dist/harness-loop.d.ts +6 -1
- package/dist/harness-loop.d.ts.map +1 -1
- package/dist/harness-loop.js +110 -25
- package/dist/harness-loop.js.map +1 -1
- package/dist/heic-transcode-worker.d.ts +2 -0
- package/dist/heic-transcode-worker.d.ts.map +1 -0
- package/dist/heic-transcode-worker.js +59 -0
- package/dist/heic-transcode-worker.js.map +1 -0
- package/dist/heic-transcode.d.ts +18 -0
- package/dist/heic-transcode.d.ts.map +1 -0
- package/dist/heic-transcode.js +99 -0
- package/dist/heic-transcode.js.map +1 -0
- package/dist/human-input-routing.d.ts +22 -0
- package/dist/human-input-routing.d.ts.map +1 -0
- package/dist/human-input-routing.js +26 -0
- package/dist/human-input-routing.js.map +1 -0
- package/dist/in-memory-conversation-turn-store.d.ts +3 -1
- package/dist/in-memory-conversation-turn-store.d.ts.map +1 -1
- package/dist/in-memory-conversation-turn-store.js +41 -2
- package/dist/in-memory-conversation-turn-store.js.map +1 -1
- package/dist/in-memory-run-store.d.ts +8 -0
- package/dist/in-memory-run-store.d.ts.map +1 -1
- package/dist/in-memory-run-store.js +28 -5
- package/dist/in-memory-run-store.js.map +1 -1
- package/dist/in-memory-sandbox-session-store.d.ts +2 -1
- package/dist/in-memory-sandbox-session-store.d.ts.map +1 -1
- package/dist/in-memory-sandbox-session-store.js +65 -1
- package/dist/in-memory-sandbox-session-store.js.map +1 -1
- package/dist/in-memory-small-stores.d.ts +18 -1
- package/dist/in-memory-small-stores.d.ts.map +1 -1
- package/dist/in-memory-small-stores.js +107 -1
- package/dist/in-memory-small-stores.js.map +1 -1
- package/dist/in-memory-workspace-store.d.ts +40 -0
- package/dist/in-memory-workspace-store.d.ts.map +1 -0
- package/dist/in-memory-workspace-store.js +370 -0
- package/dist/in-memory-workspace-store.js.map +1 -0
- package/dist/index.d.ts +73 -36
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +390 -258
- package/dist/index.js.map +1 -1
- package/dist/json-util.d.ts +8 -0
- package/dist/json-util.d.ts.map +1 -1
- package/dist/json-util.js +8 -0
- package/dist/json-util.js.map +1 -1
- package/dist/local-sandbox.d.ts +3 -2
- package/dist/local-sandbox.d.ts.map +1 -1
- package/dist/local-sandbox.js +69 -25
- package/dist/local-sandbox.js.map +1 -1
- package/dist/mcp-client.d.ts.map +1 -1
- package/dist/mcp-client.js +3 -2
- package/dist/mcp-client.js.map +1 -1
- package/dist/media-processor.d.ts +42 -0
- package/dist/media-processor.d.ts.map +1 -0
- package/dist/media-processor.js +2 -0
- package/dist/media-processor.js.map +1 -0
- package/dist/model-media.d.ts +13 -1
- package/dist/model-media.d.ts.map +1 -1
- package/dist/model-media.js +81 -18
- package/dist/model-media.js.map +1 -1
- package/dist/model-visible-interrupts.d.ts +10 -0
- package/dist/model-visible-interrupts.d.ts.map +1 -0
- package/dist/model-visible-interrupts.js +41 -0
- package/dist/model-visible-interrupts.js.map +1 -0
- package/dist/operator-controls.d.ts.map +1 -1
- package/dist/operator-controls.js +16 -3
- package/dist/operator-controls.js.map +1 -1
- package/dist/outbound-http-policy.d.ts +7 -0
- package/dist/outbound-http-policy.d.ts.map +1 -0
- package/dist/outbound-http-policy.js +155 -0
- package/dist/outbound-http-policy.js.map +1 -0
- package/dist/public-api.d.ts +21 -0
- package/dist/public-api.d.ts.map +1 -0
- package/dist/public-api.js +19 -0
- package/dist/public-api.js.map +1 -0
- package/dist/replay-resume.d.ts +8 -0
- package/dist/replay-resume.d.ts.map +1 -1
- package/dist/replay-resume.js +141 -11
- package/dist/replay-resume.js.map +1 -1
- package/dist/resource-projection-util.d.ts +1 -1
- package/dist/resource-projection-util.d.ts.map +1 -1
- package/dist/resource-projection-util.js +21 -10
- package/dist/resource-projection-util.js.map +1 -1
- package/dist/resource-projection.d.ts +8 -1
- package/dist/resource-projection.d.ts.map +1 -1
- package/dist/resource-projection.js +229 -29
- package/dist/resource-projection.js.map +1 -1
- package/dist/run-heartbeat.d.ts +12 -2
- package/dist/run-heartbeat.d.ts.map +1 -1
- package/dist/run-heartbeat.js +31 -4
- package/dist/run-heartbeat.js.map +1 -1
- package/dist/run-outcome.d.ts +9 -5
- package/dist/run-outcome.d.ts.map +1 -1
- package/dist/run-outcome.js +14 -5
- package/dist/run-outcome.js.map +1 -1
- package/dist/run-recovery.d.ts +19 -3
- package/dist/run-recovery.d.ts.map +1 -1
- package/dist/run-recovery.js +205 -34
- package/dist/run-recovery.js.map +1 -1
- package/dist/run-replay.d.ts +35 -0
- package/dist/run-replay.d.ts.map +1 -0
- package/dist/run-replay.js +193 -0
- package/dist/run-replay.js.map +1 -0
- package/dist/run-result.d.ts +4 -0
- package/dist/run-result.d.ts.map +1 -0
- package/dist/run-result.js +18 -0
- package/dist/run-result.js.map +1 -0
- package/dist/run-timeline-query.d.ts +38 -0
- package/dist/run-timeline-query.d.ts.map +1 -0
- package/dist/run-timeline-query.js +99 -0
- package/dist/run-timeline-query.js.map +1 -0
- package/dist/runs-query.d.ts.map +1 -1
- package/dist/runs-query.js +11 -3
- package/dist/runs-query.js.map +1 -1
- package/dist/runtime-bundle.d.ts.map +1 -1
- package/dist/runtime-bundle.js +2 -0
- package/dist/runtime-bundle.js.map +1 -1
- package/dist/runtime-learning.d.ts +15 -13
- package/dist/runtime-learning.d.ts.map +1 -1
- package/dist/runtime-learning.js +79 -58
- package/dist/runtime-learning.js.map +1 -1
- package/dist/runtime-types.d.ts +68 -9
- package/dist/runtime-types.d.ts.map +1 -1
- package/dist/sandbox-fs.d.ts +8 -5
- package/dist/sandbox-fs.d.ts.map +1 -1
- package/dist/sandbox-fs.js +30 -31
- package/dist/sandbox-fs.js.map +1 -1
- package/dist/sandbox-handle.d.ts +25 -0
- package/dist/sandbox-handle.d.ts.map +1 -0
- package/dist/sandbox-handle.js +120 -0
- package/dist/sandbox-handle.js.map +1 -0
- package/dist/sandbox-session-identity.d.ts +14 -0
- package/dist/sandbox-session-identity.d.ts.map +1 -0
- package/dist/sandbox-session-identity.js +33 -0
- package/dist/sandbox-session-identity.js.map +1 -0
- package/dist/sandbox-session-key.d.ts.map +1 -1
- package/dist/sandbox-session-key.js +12 -9
- package/dist/sandbox-session-key.js.map +1 -1
- package/dist/sandbox-session-lifecycle.d.ts.map +1 -1
- package/dist/sandbox-session-lifecycle.js +187 -44
- package/dist/sandbox-session-lifecycle.js.map +1 -1
- package/dist/sandbox-snapshot-policy.js +3 -3
- package/dist/sandbox-snapshot-policy.js.map +1 -1
- package/dist/sandbox-state-sync.d.ts +4 -2
- package/dist/sandbox-state-sync.d.ts.map +1 -1
- package/dist/sandbox-state-sync.js +47 -15
- package/dist/sandbox-state-sync.js.map +1 -1
- package/dist/sandbox-sync-worker.d.ts +11 -2
- package/dist/sandbox-sync-worker.d.ts.map +1 -1
- package/dist/sandbox-sync-worker.js +143 -31
- package/dist/sandbox-sync-worker.js.map +1 -1
- package/dist/schedule-execution.d.ts.map +1 -1
- package/dist/schedule-execution.js +127 -23
- package/dist/schedule-execution.js.map +1 -1
- package/dist/sdk-api-client.d.ts +17 -0
- package/dist/sdk-api-client.d.ts.map +1 -0
- package/dist/sdk-api-client.js +55 -0
- package/dist/sdk-api-client.js.map +1 -0
- package/dist/security.js +2 -2
- package/dist/security.js.map +1 -1
- package/dist/self-improvement.d.ts +5 -1
- package/dist/self-improvement.d.ts.map +1 -1
- package/dist/self-improvement.js +28 -14
- package/dist/self-improvement.js.map +1 -1
- package/dist/skill-bundles.d.ts +55 -0
- package/dist/skill-bundles.d.ts.map +1 -0
- package/dist/skill-bundles.js +134 -0
- package/dist/skill-bundles.js.map +1 -0
- package/dist/source-loader.js +7 -7
- package/dist/source-loader.js.map +1 -1
- package/dist/state-store-helpers.d.ts +2 -0
- package/dist/state-store-helpers.d.ts.map +1 -1
- package/dist/state-store-helpers.js +11 -1
- package/dist/state-store-helpers.js.map +1 -1
- package/dist/state-stores.d.ts +1 -0
- package/dist/state-stores.d.ts.map +1 -1
- package/dist/state-stores.js +26 -7
- package/dist/state-stores.js.map +1 -1
- package/dist/state.d.ts +305 -5
- package/dist/state.d.ts.map +1 -1
- package/dist/state.js +41 -2
- package/dist/state.js.map +1 -1
- package/dist/storage.d.ts +47 -2
- package/dist/storage.d.ts.map +1 -1
- package/dist/storage.js +158 -6
- package/dist/storage.js.map +1 -1
- package/dist/subagent-execution.d.ts +1 -1
- package/dist/subagent-execution.d.ts.map +1 -1
- package/dist/subagent-execution.js +10 -12
- package/dist/subagent-execution.js.map +1 -1
- package/dist/target-instructions.js +1 -1
- package/dist/target-instructions.js.map +1 -1
- package/dist/tool-apis.d.ts.map +1 -1
- package/dist/tool-apis.js +33 -9
- package/dist/tool-apis.js.map +1 -1
- package/dist/tool-execution.d.ts +22 -12
- package/dist/tool-execution.d.ts.map +1 -1
- package/dist/tool-execution.js +368 -238
- package/dist/tool-execution.js.map +1 -1
- package/dist/turn-media.d.ts +29 -0
- package/dist/turn-media.d.ts.map +1 -0
- package/dist/turn-media.js +233 -0
- package/dist/turn-media.js.map +1 -0
- package/dist/usage-reconciliation.d.ts +1 -1
- package/dist/usage-reconciliation.js +1 -1
- package/dist/workspace-id.d.ts +10 -0
- package/dist/workspace-id.d.ts.map +1 -0
- package/dist/workspace-id.js +55 -0
- package/dist/workspace-id.js.map +1 -0
- package/dist/workspace-manifest.d.ts +24 -0
- package/dist/workspace-manifest.d.ts.map +1 -0
- package/dist/workspace-manifest.js +111 -0
- package/dist/workspace-manifest.js.map +1 -0
- package/dist/workspace-operation-limiter.d.ts +16 -0
- package/dist/workspace-operation-limiter.d.ts.map +1 -0
- package/dist/workspace-operation-limiter.js +31 -0
- package/dist/workspace-operation-limiter.js.map +1 -0
- package/dist/workspace-operations.d.ts +145 -0
- package/dist/workspace-operations.d.ts.map +1 -0
- package/dist/workspace-operations.js +420 -0
- package/dist/workspace-operations.js.map +1 -0
- package/dist/workspace-runtime.d.ts +110 -0
- package/dist/workspace-runtime.d.ts.map +1 -0
- package/dist/workspace-runtime.js +240 -0
- package/dist/workspace-runtime.js.map +1 -0
- package/dist/workspace-search.d.ts +55 -0
- package/dist/workspace-search.d.ts.map +1 -0
- package/dist/workspace-search.js +262 -0
- package/dist/workspace-search.js.map +1 -0
- package/dist/workspace-service.d.ts +173 -0
- package/dist/workspace-service.d.ts.map +1 -0
- package/dist/workspace-service.js +619 -0
- package/dist/workspace-service.js.map +1 -0
- package/dist/workspace.d.ts +7 -0
- package/dist/workspace.d.ts.map +1 -0
- package/dist/workspace.js +7 -0
- package/dist/workspace.js.map +1 -0
- package/package.json +7 -4
|
@@ -1,47 +1,119 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
1
2
|
import { hasCurrentSandboxFilesystemContract, sandboxFilesystemContractMetadata } from "@assemblyline-agents/core";
|
|
2
3
|
import { safeJson } from "./json-util.js";
|
|
3
|
-
import { stringValue, timestamp } from "./runtime-util.js";
|
|
4
|
+
import { durableAgentScopeForManifest, stringValue, timestamp } from "./runtime-util.js";
|
|
5
|
+
import { hasSandboxSessionIdentity, sandboxSessionIdentity, sandboxSessionIdentityMetadata } from "./sandbox-session-identity.js";
|
|
6
|
+
import { resolveWorkspaceForRun } from "./workspace-id.js";
|
|
4
7
|
export async function acquireSandboxForRun(host, run) {
|
|
5
8
|
const sessionKey = host.sessionKey(run);
|
|
9
|
+
const agentScope = durableAgentScopeForManifest(host.manifest);
|
|
6
10
|
const provider = host.sandbox.provider ?? "sandbox";
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const reconnectInput = {
|
|
11
|
-
runId: run.id,
|
|
12
|
-
sandboxId: existing?.sandboxId ?? "",
|
|
13
|
-
sessionKey,
|
|
14
|
-
manifest: reconnectManifest
|
|
15
|
-
};
|
|
16
|
-
const root = stringValue(reconnectManifest.sandboxRoot);
|
|
17
|
-
if (root)
|
|
18
|
-
reconnectInput.root = root;
|
|
19
|
-
if (existing?.sandboxId && reconnectCompatible) {
|
|
20
|
-
const connected = await host.sandbox.connect?.(reconnectInput)
|
|
21
|
-
.catch(host.swallow("sandbox connect probe failed", { runId: run.id, sessionKey }));
|
|
22
|
-
if (connected)
|
|
23
|
-
return reuseSession(host, run, sessionKey, provider, connected, existing, "connect");
|
|
24
|
-
const woken = await host.sandbox.wake?.(reconnectInput)
|
|
25
|
-
.catch(host.swallow("sandbox wake probe failed", { runId: run.id, sessionKey }));
|
|
26
|
-
if (woken)
|
|
27
|
-
return reuseSession(host, run, sessionKey, provider, woken, existing, "wake");
|
|
11
|
+
let existing = await host.state.getSandboxSession(sessionKey);
|
|
12
|
+
if (existing && !storedSessionHasExpectedIdentity(existing, agentScope, sessionKey)) {
|
|
13
|
+
existing = await rejectInvalidSessionIdentity(host, run, existing, agentScope, sessionKey);
|
|
28
14
|
}
|
|
15
|
+
if (existing?.dirty) {
|
|
16
|
+
const workspace = await resolveWorkspaceForRun(host.state, agentScope, run);
|
|
17
|
+
while (existing.dirty) {
|
|
18
|
+
const observedWorkspaceId = stringValue(existing.manifest.workspaceId);
|
|
19
|
+
const obsoleteContract = !hasCurrentSandboxFilesystemContract(existing.manifest);
|
|
20
|
+
if (!obsoleteContract && observedWorkspaceId === workspace.id)
|
|
21
|
+
break;
|
|
22
|
+
const rotatedAt = timestamp();
|
|
23
|
+
const reason = obsoleteContract ? "obsolete_filesystem_contract" : "workspace_ownership_mismatch";
|
|
24
|
+
const quarantineKey = `${sessionKey}:quarantine:${existing.id}`;
|
|
25
|
+
const replacementProviderSessionKey = `${sessionKey}:generation:${randomUUID()}`;
|
|
26
|
+
const physicalContract = sandboxFilesystemContractMetadata(host.sandbox.provider === "local" ? "emulated" : "physical");
|
|
27
|
+
const replacementIdentity = sandboxSessionIdentityMetadata({
|
|
28
|
+
sessionKey: replacementProviderSessionKey,
|
|
29
|
+
agentScope,
|
|
30
|
+
logicalSessionKey: sessionKey
|
|
31
|
+
});
|
|
32
|
+
const rotation = await host.state.rotateSandboxSession({
|
|
33
|
+
sessionKey,
|
|
34
|
+
expectedSandboxId: existing.sandboxId,
|
|
35
|
+
quarantineKey,
|
|
36
|
+
replacementProviderSessionKey,
|
|
37
|
+
runId: run.id,
|
|
38
|
+
reason,
|
|
39
|
+
expectedWorkspaceId: workspace.id,
|
|
40
|
+
replacementManifest: {
|
|
41
|
+
...replacementIdentity,
|
|
42
|
+
...physicalContract,
|
|
43
|
+
rotation: {
|
|
44
|
+
reason,
|
|
45
|
+
rotatedAt,
|
|
46
|
+
quarantineKey,
|
|
47
|
+
expectedWorkspaceId: workspace.id,
|
|
48
|
+
observedWorkspaceId: observedWorkspaceId ?? null
|
|
49
|
+
}
|
|
50
|
+
},
|
|
51
|
+
quarantineState: obsoleteContract || !observedWorkspaceId || !hasBaseVersionId(existing.manifest.baseVersionId)
|
|
52
|
+
? "blocked_requires_operator"
|
|
53
|
+
: existing.state,
|
|
54
|
+
rotatedAt
|
|
55
|
+
});
|
|
56
|
+
existing = rotation.replacement;
|
|
57
|
+
if (rotation.rotated) {
|
|
58
|
+
await host.state.appendEvent(run.id, "sandbox.quarantined", {
|
|
59
|
+
reason,
|
|
60
|
+
sessionKey,
|
|
61
|
+
quarantineKey,
|
|
62
|
+
sandboxId: rotation.quarantined?.sandboxId ?? null,
|
|
63
|
+
expectedWorkspaceId: workspace.id,
|
|
64
|
+
observedWorkspaceId: observedWorkspaceId ?? null,
|
|
65
|
+
replacementProviderSessionKey
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
const reconnectManifest = existing?.manifest ?? {};
|
|
71
|
+
const providerSessionKey = existing
|
|
72
|
+
? requiredProviderSessionKey(reconnectManifest)
|
|
73
|
+
: sessionKey;
|
|
74
|
+
const identityInput = { sessionKey: providerSessionKey, agentScope, logicalSessionKey: sessionKey };
|
|
75
|
+
const expectedIdentity = sandboxSessionIdentity(identityInput);
|
|
76
|
+
const identityMetadata = sandboxSessionIdentityMetadata(identityInput);
|
|
77
|
+
const reconnectCompatible = hasCurrentSandboxFilesystemContract(reconnectManifest) &&
|
|
78
|
+
hasSandboxSessionIdentity(reconnectManifest, expectedIdentity);
|
|
29
79
|
const lookup = (!existing || reconnectCompatible) ? await host.sandbox.lookup?.({
|
|
30
|
-
sessionKey,
|
|
80
|
+
sessionKey: providerSessionKey,
|
|
81
|
+
agentScope,
|
|
82
|
+
logicalSessionKey: sessionKey,
|
|
31
83
|
runId: run.id,
|
|
32
84
|
agentRevision: run.agentRevision,
|
|
33
85
|
manifest: {
|
|
34
86
|
...reconnectManifest,
|
|
87
|
+
...identityMetadata,
|
|
35
88
|
...sandboxFilesystemContractMetadata(host.sandbox.provider === "local" ? "emulated" : "physical")
|
|
36
89
|
}
|
|
37
90
|
}).catch(host.swallow("sandbox lookup probe failed", { runId: run.id, sessionKey })) : undefined;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
91
|
+
const verifiedLookup = lookup && hasSandboxSessionIdentity(lookup.manifest, expectedIdentity)
|
|
92
|
+
? lookup
|
|
93
|
+
: undefined;
|
|
94
|
+
if (lookup && !verifiedLookup) {
|
|
95
|
+
await host.state.appendEvent(run.id, "sandbox.identity_rejected", {
|
|
41
96
|
sandboxId: lookup.sandboxId,
|
|
42
97
|
sessionKey,
|
|
43
|
-
|
|
44
|
-
|
|
98
|
+
providerSessionKey,
|
|
99
|
+
reason: "provider_ownership_mismatch"
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
if (verifiedLookup) {
|
|
103
|
+
const providerManifest = {
|
|
104
|
+
...reconnectManifest,
|
|
105
|
+
...(verifiedLookup.manifest ?? {}),
|
|
106
|
+
...identityMetadata,
|
|
107
|
+
...sandboxFilesystemContractMetadata(host.sandbox.provider === "local" ? "emulated" : "physical")
|
|
108
|
+
};
|
|
109
|
+
const lookupInput = {
|
|
110
|
+
runId: run.id,
|
|
111
|
+
sandboxId: verifiedLookup.sandboxId,
|
|
112
|
+
sessionKey: providerSessionKey,
|
|
113
|
+
agentScope,
|
|
114
|
+
logicalSessionKey: sessionKey,
|
|
115
|
+
manifest: providerManifest,
|
|
116
|
+
...(verifiedLookup.root ? { root: verifiedLookup.root } : {})
|
|
45
117
|
};
|
|
46
118
|
const connected = await host.sandbox.connect?.(lookupInput)
|
|
47
119
|
.catch(host.swallow("sandbox connect probe failed", { runId: run.id, sessionKey }))
|
|
@@ -49,18 +121,20 @@ export async function acquireSandboxForRun(host, run) {
|
|
|
49
121
|
.catch(host.swallow("sandbox wake probe failed", { runId: run.id, sessionKey }));
|
|
50
122
|
if (connected) {
|
|
51
123
|
await upsertSandboxSession(host, run, sessionKey, provider, connected, existing?.dirty ?? false, existing?.syncJobId, {
|
|
52
|
-
...
|
|
124
|
+
...providerManifest,
|
|
53
125
|
sandboxRoot: connected.root,
|
|
54
126
|
...sandboxFilesystemContractMetadata(connected.provider === "local" ? "emulated" : "physical")
|
|
55
127
|
}, "live");
|
|
56
|
-
await host.state.appendEvent(run.id, "sandbox.reused", { sandboxId: connected.id, sessionKey, mode:
|
|
128
|
+
await host.state.appendEvent(run.id, "sandbox.reused", { sandboxId: connected.id, sessionKey, mode: verifiedLookup.state ?? "lookup" });
|
|
57
129
|
return connected;
|
|
58
130
|
}
|
|
59
131
|
}
|
|
60
132
|
const createInput = {
|
|
61
|
-
sessionKey,
|
|
133
|
+
sessionKey: providerSessionKey,
|
|
134
|
+
agentScope,
|
|
135
|
+
logicalSessionKey: sessionKey,
|
|
62
136
|
metadata: {
|
|
63
|
-
|
|
137
|
+
...identityMetadata,
|
|
64
138
|
runId: run.id,
|
|
65
139
|
agentRevision: run.agentRevision,
|
|
66
140
|
...(typeof run.input.agentSandbox === "string" ? { agentSandbox: run.input.agentSandbox } : {}),
|
|
@@ -84,23 +158,92 @@ export async function acquireSandboxForRun(host, run) {
|
|
|
84
158
|
}
|
|
85
159
|
if (existing?.snapshotId && reconnectCompatible)
|
|
86
160
|
createInput.snapshotId = existing.snapshotId;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
161
|
+
if (typeof host.sandbox.create !== "function") {
|
|
162
|
+
throw new Error("Sandbox adapter must implement create(run, input); acquire-only adapters cannot preserve durable provider session identity.");
|
|
163
|
+
}
|
|
164
|
+
const created = await host.sandbox.create(run, createInput);
|
|
165
|
+
const retainedDirtyState = reconnectCompatible ? existing?.dirty ?? false : false;
|
|
166
|
+
await upsertSandboxSession(host, run, sessionKey, provider, created, retainedDirtyState, reconnectCompatible ? existing?.syncJobId : undefined, {
|
|
167
|
+
...(reconnectCompatible ? existing?.manifest ?? {} : {}),
|
|
168
|
+
...identityMetadata,
|
|
90
169
|
sandboxRoot: created.root,
|
|
91
170
|
...sandboxFilesystemContractMetadata(created.provider === "local" ? "emulated" : "physical")
|
|
92
|
-
},
|
|
171
|
+
}, retainedDirtyState ? "dirty" : "live");
|
|
93
172
|
await host.state.appendEvent(run.id, "sandbox.created", { sandboxId: created.id, sessionKey });
|
|
94
173
|
return created;
|
|
95
174
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
175
|
+
function storedSessionHasExpectedIdentity(session, agentScope, logicalSessionKey) {
|
|
176
|
+
const providerSessionKey = stringValue(session.manifest.providerSessionKey);
|
|
177
|
+
if (!providerSessionKey)
|
|
178
|
+
return false;
|
|
179
|
+
return hasSandboxSessionIdentity(session.manifest, {
|
|
180
|
+
agentScope,
|
|
181
|
+
logicalSessionKey,
|
|
182
|
+
providerSessionKey
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
async function rejectInvalidSessionIdentity(host, run, existing, agentScope, sessionKey) {
|
|
186
|
+
const rejectedAt = timestamp();
|
|
187
|
+
const replacementProviderSessionKey = `${sessionKey}:generation:${randomUUID()}`;
|
|
188
|
+
const replacementManifest = {
|
|
189
|
+
...sandboxSessionIdentityMetadata({
|
|
190
|
+
sessionKey: replacementProviderSessionKey,
|
|
191
|
+
agentScope,
|
|
192
|
+
logicalSessionKey: sessionKey
|
|
193
|
+
}),
|
|
194
|
+
...sandboxFilesystemContractMetadata(host.sandbox.provider === "local" ? "emulated" : "physical")
|
|
195
|
+
};
|
|
196
|
+
if (existing.dirty) {
|
|
197
|
+
const workspace = await resolveWorkspaceForRun(host.state, agentScope, run);
|
|
198
|
+
const quarantineKey = `${sessionKey}:quarantine:${existing.id}`;
|
|
199
|
+
const rotation = await host.state.rotateSandboxSession({
|
|
200
|
+
sessionKey,
|
|
201
|
+
expectedSandboxId: existing.sandboxId,
|
|
202
|
+
quarantineKey,
|
|
203
|
+
replacementProviderSessionKey,
|
|
204
|
+
runId: run.id,
|
|
205
|
+
reason: "sandbox_identity_mismatch",
|
|
206
|
+
expectedWorkspaceId: workspace.id,
|
|
207
|
+
replacementManifest,
|
|
208
|
+
quarantineState: "blocked_requires_operator",
|
|
209
|
+
rotatedAt: rejectedAt
|
|
210
|
+
});
|
|
211
|
+
await host.state.appendEvent(run.id, "sandbox.identity_rejected", {
|
|
212
|
+
sandboxId: existing.sandboxId,
|
|
213
|
+
sessionKey,
|
|
214
|
+
quarantineKey,
|
|
215
|
+
reason: "persisted_ownership_mismatch",
|
|
216
|
+
dirty: true
|
|
217
|
+
});
|
|
218
|
+
return rotation.replacement;
|
|
219
|
+
}
|
|
220
|
+
const replacement = await host.state.updateSandboxSession(sessionKey, {
|
|
221
|
+
sandboxId: "",
|
|
222
|
+
runId: run.id,
|
|
223
|
+
state: "clean",
|
|
224
|
+
dirty: false,
|
|
225
|
+
lastSeenAt: rejectedAt,
|
|
226
|
+
lastSyncedAt: undefined,
|
|
227
|
+
snapshotId: undefined,
|
|
228
|
+
syncJobId: undefined,
|
|
229
|
+
manifest: replacementManifest
|
|
230
|
+
});
|
|
231
|
+
await host.state.appendEvent(run.id, "sandbox.identity_rejected", {
|
|
232
|
+
sandboxId: existing.sandboxId,
|
|
233
|
+
sessionKey,
|
|
234
|
+
reason: "persisted_ownership_mismatch",
|
|
235
|
+
dirty: false
|
|
236
|
+
});
|
|
237
|
+
return replacement;
|
|
238
|
+
}
|
|
239
|
+
function requiredProviderSessionKey(manifest) {
|
|
240
|
+
const providerSessionKey = stringValue(manifest.providerSessionKey);
|
|
241
|
+
if (!providerSessionKey)
|
|
242
|
+
throw new Error("Sandbox providerSessionKey must be a non-empty string.");
|
|
243
|
+
return providerSessionKey;
|
|
244
|
+
}
|
|
245
|
+
function hasBaseVersionId(value) {
|
|
246
|
+
return value === null || typeof value === "string";
|
|
104
247
|
}
|
|
105
248
|
async function upsertSandboxSession(host, run, sessionKey, provider, session, dirty, syncJobId, manifest, state) {
|
|
106
249
|
return host.state.upsertSandboxSession({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-session-lifecycle.js","sourceRoot":"","sources":["../src/sandbox-session-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EACnC,iCAAiC,EAIlC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"sandbox-session-lifecycle.js","sourceRoot":"","sources":["../src/sandbox-session-lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,12 @@ export function sandboxSnapshotPolicyFromManifest(manifest) {
|
|
|
16
16
|
return configured?.snapshot ?? manifest.sandboxes[0]?.snapshot;
|
|
17
17
|
}
|
|
18
18
|
export function sandboxSnapshotPolicyFromEnv(env) {
|
|
19
|
-
const mode = normalizeSandboxSnapshotMode(env.
|
|
19
|
+
const mode = normalizeSandboxSnapshotMode(env.ASSEMBLY_LINE_SANDBOX_SNAPSHOT_MODE);
|
|
20
20
|
if (!mode)
|
|
21
21
|
return undefined;
|
|
22
22
|
const policy = { mode };
|
|
23
|
-
const retainLast = normalizeNonNegativeInteger(env.
|
|
24
|
-
const reason = stringValue(env.
|
|
23
|
+
const retainLast = normalizeNonNegativeInteger(env.ASSEMBLY_LINE_SANDBOX_SNAPSHOT_RETAIN_LAST);
|
|
24
|
+
const reason = stringValue(env.ASSEMBLY_LINE_SANDBOX_SNAPSHOT_REASON);
|
|
25
25
|
if (retainLast !== undefined)
|
|
26
26
|
policy.retainLast = retainLast;
|
|
27
27
|
if (reason)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-snapshot-policy.js","sourceRoot":"","sources":["../src/sandbox-snapshot-policy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD;;;;GAIG;AAEH,MAAM,UAAU,4BAA4B,CAC1C,QAAuB,EACvB,GAAuC,EACvC,QAAgC;IAEhC,OAAO,8BAA8B,CAAC,QAAQ,IAAI,4BAA4B,CAAC,GAAG,CAAC,IAAI,iCAAiC,CAAC,QAAQ,CAAC,CAAC,CAAC;AACtI,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,QAAuB;IACvE,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;IACnD,MAAM,UAAU,GAAG,WAAW;QAC5B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,WAAW,CAAC;QACvE,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,UAAU,EAAE,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,GAAuC;IAClF,MAAM,IAAI,GAAG,4BAA4B,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"sandbox-snapshot-policy.js","sourceRoot":"","sources":["../src/sandbox-snapshot-policy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD;;;;GAIG;AAEH,MAAM,UAAU,4BAA4B,CAC1C,QAAuB,EACvB,GAAuC,EACvC,QAAgC;IAEhC,OAAO,8BAA8B,CAAC,QAAQ,IAAI,4BAA4B,CAAC,GAAG,CAAC,IAAI,iCAAiC,CAAC,QAAQ,CAAC,CAAC,CAAC;AACtI,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,QAAuB;IACvE,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;IACnD,MAAM,UAAU,GAAG,WAAW;QAC5B,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,WAAW,CAAC;QACvE,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,UAAU,EAAE,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,GAAuC;IAClF,MAAM,IAAI,GAAG,4BAA4B,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACnF,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,MAAM,MAAM,GAA0B,EAAE,IAAI,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,2BAA2B,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IAC/F,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IACtE,IAAI,UAAU,KAAK,SAAS;QAAE,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;IAC7D,IAAI,MAAM;QAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACnC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,MAA8B;IAC3E,MAAM,IAAI,GAAG,4BAA4B,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,CAAC;IACnE,MAAM,UAAU,GAA0B,EAAE,IAAI,EAAE,CAAC;IACnD,MAAM,UAAU,GAAG,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,IAAI,UAAU,KAAK,SAAS;QAAE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC;IACjE,IAAI,MAAM;QAAE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;IACvC,IAAI,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC;QAAE,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC1E,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,KAAc;IACzD,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,YAAY,IAAI,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC1G,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,KAAc;IACxD,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACxF,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,GAAc;IACvD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;IACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1C,OAAO,QAAQ,CAAC,eAAe,KAAK,IAAI,IAAI,QAAQ,CAAC,eAAe,KAAK,IAAI,IAAI,QAAQ,CAAC,sBAAsB,KAAK,IAAI,CAAC;AAC5H,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,MAA6B,EAC7B,GAAc,EACd,OAAuB,EACvB,KAAgE,EAChE,MAAc;IAOd,MAAM,QAAQ,GAAe;QAC3B,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC1B,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,KAAK,EAAE,GAAG,CAAC,EAAE;QACb,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,KAAK;KACN,CAAC;IACF,MAAM,OAAO,GAKT;QACF,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM;QACN,QAAQ;KACT,CAAC;IACF,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAC5E,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAAyB,EACzB,OAKC,EACD,GAAc,EACd,OAAuB,EACvB,KAAgE;IAEhE,MAAM,QAAQ,GAAe;QAC3B,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC3B,KAAK,EAAE,GAAG,CAAC,EAAE;QACb,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,KAAK;QACL,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,iBAAiB,EAAE,QAAQ,CAAC,SAAS;KACtC,CAAC;IACF,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAC/E,IAAI,QAAQ,CAAC,QAAQ;QAAE,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;IAC7D,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -2,15 +2,17 @@ import type { SandboxSession } from "@assemblyline-agents/core";
|
|
|
2
2
|
import { type ResolvedSkillsConfig, type SkillStore } from "./self-improvement.js";
|
|
3
3
|
import type { LearningStore } from "./learning-store.js";
|
|
4
4
|
import type { MemoryStore, SandboxTombstone } from "./runtime-types.js";
|
|
5
|
+
import type { SkillBundleIndex } from "./skill-bundles.js";
|
|
5
6
|
import type { MemoryScope, ResolvedStateAdapter, RunRecord } from "./state.js";
|
|
6
7
|
export interface SandboxStateSyncHost {
|
|
7
8
|
state: ResolvedStateAdapter;
|
|
8
9
|
memoryStore: MemoryStore;
|
|
9
10
|
skillStore: SkillStore;
|
|
11
|
+
skillBundleIndex: SkillBundleIndex;
|
|
10
12
|
learningStore: LearningStore;
|
|
11
|
-
|
|
13
|
+
skillsConfigForRun(run: RunRecord): ResolvedSkillsConfig;
|
|
12
14
|
memoryScopeForRun(run: RunRecord): MemoryScope;
|
|
13
|
-
|
|
15
|
+
skillScopeForRun(run: RunRecord): string;
|
|
14
16
|
}
|
|
15
17
|
export declare function syncMemoryFromSandbox(host: SandboxStateSyncHost, run: RunRecord, sandboxSession: SandboxSession, tombstones: SandboxTombstone[]): Promise<{
|
|
16
18
|
written: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-state-sync.d.ts","sourceRoot":"","sources":["../src/sandbox-state-sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAUhE,OAAO,EAA4B,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE/E,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,oBAAoB,CAAC;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,
|
|
1
|
+
{"version":3,"file":"sandbox-state-sync.d.ts","sourceRoot":"","sources":["../src/sandbox-state-sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAUhE,OAAO,EAA4B,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE/E,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,oBAAoB,CAAC;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG,oBAAoB,CAAC;IACzD,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,WAAW,CAAC;IAC/C,gBAAgB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CAAC;CAC1C;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,oBAAoB,EAC1B,GAAG,EAAE,SAAS,EACd,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,gBAAgB,EAAE,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAsCnD;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,oBAAoB,EAC1B,GAAG,EAAE,SAAS,EACd,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,gBAAgB,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgGf"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { memoryBodyText } from "./state-store-helpers.js";
|
|
2
2
|
import { memoryPathFromSandboxRelativePath, scanSandboxFiles } from "./sandbox-fs.js";
|
|
3
|
-
import { isValidSandboxSkillBody,
|
|
3
|
+
import { isValidSandboxSkillBody, normalizeResourcePath, resourceSha256, sandboxFileContentsToUtf8, sha256Text } from "./resource-projection-util.js";
|
|
4
4
|
import { archiveSkill, writeSkill } from "./self-improvement.js";
|
|
5
5
|
export async function syncMemoryFromSandbox(host, run, sandboxSession, tombstones) {
|
|
6
6
|
const scope = host.memoryScopeForRun(run);
|
|
@@ -47,32 +47,55 @@ export async function syncSkillsFromSandbox(host, run, sandboxSession, tombstone
|
|
|
47
47
|
catch {
|
|
48
48
|
files = [];
|
|
49
49
|
}
|
|
50
|
-
const skillScope = host.
|
|
50
|
+
const skillScope = host.skillScopeForRun(run);
|
|
51
|
+
const skillsConfig = host.skillsConfigForRun(run);
|
|
51
52
|
const before = await host.skillStore.list(skillScope);
|
|
52
53
|
const beforeByName = new Map(before.map((skill) => [skill.name, skill]));
|
|
53
|
-
const deletedSkillNames = new Set(tombstones
|
|
54
|
+
const deletedSkillNames = new Set(tombstones
|
|
55
|
+
.map((tombstone) => skillNameForTombstonePath(host.skillBundleIndex, tombstone.path))
|
|
56
|
+
.filter((name) => Boolean(name)));
|
|
54
57
|
const sandboxSkills = [];
|
|
55
58
|
const invalid = [];
|
|
59
|
+
const resourceWritesIgnored = [];
|
|
56
60
|
for (const file of files) {
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
+
const logicalPath = `/skills/${file.relativePath.replace(/\\/g, "/").replace(/^\/+/u, "")}`;
|
|
62
|
+
const name = host.skillBundleIndex.skillNameForEntrypointPath(logicalPath);
|
|
63
|
+
if (name) {
|
|
64
|
+
const body = sandboxFileContentsToUtf8(file.contents);
|
|
65
|
+
if (!isValidSandboxSkillBody(body)) {
|
|
66
|
+
invalid.push(logicalPath);
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
sandboxSkills.push({ name, body });
|
|
61
70
|
continue;
|
|
62
71
|
}
|
|
63
|
-
const
|
|
64
|
-
if (
|
|
65
|
-
|
|
72
|
+
const resource = host.skillBundleIndex.resourceForPath(logicalPath);
|
|
73
|
+
if (resource) {
|
|
74
|
+
// Bundle resources are read-only: a modified copy is never persisted.
|
|
75
|
+
if (resourceSha256(file.contents) !== resource.resource.sha256) {
|
|
76
|
+
resourceWritesIgnored.push(logicalPath);
|
|
77
|
+
}
|
|
66
78
|
continue;
|
|
67
79
|
}
|
|
68
|
-
|
|
80
|
+
if (host.skillBundleIndex.bundleForPath(logicalPath)) {
|
|
81
|
+
// New files dropped inside a bundle tree are run outputs, not skill state.
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
if (file.relativePath.endsWith("SKILL.md"))
|
|
85
|
+
invalid.push(logicalPath);
|
|
86
|
+
}
|
|
87
|
+
if (resourceWritesIgnored.length > 0) {
|
|
88
|
+
await host.state.appendEvent(run.id, "skill.resource_write_ignored", {
|
|
89
|
+
paths: resourceWritesIgnored,
|
|
90
|
+
detail: "bundle resources are read-only; deploy a new bundle revision to change them"
|
|
91
|
+
});
|
|
69
92
|
}
|
|
70
93
|
const changed = sandboxSkills.filter((skill) => {
|
|
71
94
|
if (deletedSkillNames.has(skill.name))
|
|
72
95
|
return false;
|
|
73
96
|
return beforeByName.get(skill.name)?.bodySha256 !== sha256Text(skill.body);
|
|
74
97
|
});
|
|
75
|
-
if (!
|
|
98
|
+
if (!skillsConfig.enabled) {
|
|
76
99
|
if (changed.length > 0 || deletedSkillNames.size > 0 || invalid.length > 0) {
|
|
77
100
|
throw new Error("Sandbox skill writes are blocked because self-improvement is disabled.");
|
|
78
101
|
}
|
|
@@ -87,7 +110,7 @@ export async function syncSkillsFromSandbox(host, run, sandboxSession, tombstone
|
|
|
87
110
|
if (!beforeByName.has(name))
|
|
88
111
|
continue;
|
|
89
112
|
await archiveSkill(host.skillStore, host.learningStore, skillScope, name, {
|
|
90
|
-
requireApproval:
|
|
113
|
+
requireApproval: skillsConfig.writeApproval,
|
|
91
114
|
origin: "agent",
|
|
92
115
|
sourceRunId: run.id
|
|
93
116
|
});
|
|
@@ -101,7 +124,7 @@ export async function syncSkillsFromSandbox(host, run, sandboxSession, tombstone
|
|
|
101
124
|
origin: "agent",
|
|
102
125
|
sourceRunId: run.id
|
|
103
126
|
}, {
|
|
104
|
-
requireApproval:
|
|
127
|
+
requireApproval: skillsConfig.writeApproval
|
|
105
128
|
});
|
|
106
129
|
if (existing)
|
|
107
130
|
updated.push(skill.name);
|
|
@@ -109,7 +132,16 @@ export async function syncSkillsFromSandbox(host, run, sandboxSession, tombstone
|
|
|
109
132
|
created.push(skill.name);
|
|
110
133
|
}
|
|
111
134
|
if (created.length || updated.length || deleted.length) {
|
|
112
|
-
await host.state.appendEvent(run.id, "skill.synced", { created, updated, deleted, pending:
|
|
135
|
+
await host.state.appendEvent(run.id, "skill.synced", { created, updated, deleted, pending: skillsConfig.writeApproval });
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
/** Tombstones archive a skill only when they target its canonical SKILL.md entrypoint. */
|
|
139
|
+
function skillNameForTombstonePath(index, path) {
|
|
140
|
+
try {
|
|
141
|
+
return index.skillNameForEntrypointPath(normalizeResourcePath(path));
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
return undefined;
|
|
113
145
|
}
|
|
114
146
|
}
|
|
115
147
|
//# sourceMappingURL=sandbox-state-sync.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-state-sync.js","sourceRoot":"","sources":["../src/sandbox-state-sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,iCAAiC,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EACL,uBAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"sandbox-state-sync.js","sourceRoot":"","sources":["../src/sandbox-state-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,11 @@ import type { JsonObject, SandboxSession, SandboxSnapshotPolicy } from "@assembl
|
|
|
2
2
|
import type { RuntimeLogger } from "./logging.js";
|
|
3
3
|
import type { BlobAdapter, EmitSpanOptions, SandboxAdapter, SandboxTombstone } from "./runtime-types.js";
|
|
4
4
|
import type { CheckpointRecord, RunRecord, SandboxSyncDiagnostics, SandboxSyncExecutionResult, SandboxSyncJobInspection, SandboxSyncJobRecord, StateAdapter } from "./state.js";
|
|
5
|
+
import type { WorkspaceSyncResult } from "./workspace-service.js";
|
|
5
6
|
/**
|
|
6
|
-
* Sandbox-sync job worker: the durable queue that syncs memory
|
|
7
|
-
* out of a sandbox after delivery, plus snapshot capture
|
|
7
|
+
* Sandbox-sync job worker: the durable queue that syncs memory, skills, and the
|
|
8
|
+
* versioned workspace out of a sandbox after delivery, plus snapshot capture
|
|
9
|
+
* and session disposal.
|
|
8
10
|
* Follows the delivery-queue/run-recovery host-delegate pattern: AssemblyLineRuntime
|
|
9
11
|
* builds a {@link SandboxSyncWorkerHost} closing over itself and keeps thin
|
|
10
12
|
* delegate methods with unchanged signatures.
|
|
@@ -26,6 +28,7 @@ export interface SandboxSyncWorkerHost {
|
|
|
26
28
|
deleted: string[];
|
|
27
29
|
}>;
|
|
28
30
|
syncSkillsFromSandbox(run: RunRecord, sandboxSession: SandboxSession, tombstones: SandboxTombstone[]): Promise<void>;
|
|
31
|
+
syncWorkspace(run: RunRecord, sandboxSession: SandboxSession, syncJob: SandboxSyncJobRecord): Promise<WorkspaceSyncResult>;
|
|
29
32
|
emitSpan(name: string, startedAt: string, attributes: JsonObject, options?: EmitSpanOptions): Promise<void>;
|
|
30
33
|
runSpanAttributes(run: RunRecord, extra?: JsonObject): JsonObject;
|
|
31
34
|
turnSpanId(runId: string): string;
|
|
@@ -45,6 +48,12 @@ export declare function retrySandboxSyncJobImpl(host: SandboxSyncWorkerHost, job
|
|
|
45
48
|
now?: Date;
|
|
46
49
|
resetAttempts?: boolean;
|
|
47
50
|
}): Promise<SandboxSyncJobRecord>;
|
|
51
|
+
/**
|
|
52
|
+
* Emit durable evidence for a sync job whose expired lease was just
|
|
53
|
+
* recovered: exhausted jobs were terminalized to `blocked_requires_operator`
|
|
54
|
+
* and must surface like any other final sync failure; the rest retry.
|
|
55
|
+
*/
|
|
56
|
+
export declare function reportRecoveredSandboxSyncJob(host: Pick<SandboxSyncWorkerHost, "state">, job: SandboxSyncJobRecord): Promise<void>;
|
|
48
57
|
export declare function runDueSandboxSyncJobsImpl(host: SandboxSyncWorkerHost, options?: {
|
|
49
58
|
now?: Date;
|
|
50
59
|
limit?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox-sync-worker.d.ts","sourceRoot":"","sources":["../src/sandbox-sync-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,qBAAqB,EACtB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EACf,cAAc,EAEd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"sandbox-sync-worker.d.ts","sourceRoot":"","sources":["../src/sandbox-sync-worker.ts"],"names":[],"mappings":"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"}
|