@openai/agents-core 0.8.4 → 0.9.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/dist/agentToolRunConfig.js +3 -0
- package/dist/agentToolRunConfig.js.map +1 -1
- package/dist/agentToolRunConfig.mjs +3 -0
- package/dist/agentToolRunConfig.mjs.map +1 -1
- package/dist/errors.d.ts +10 -0
- package/dist/errors.js +15 -1
- package/dist/errors.js.map +1 -1
- package/dist/errors.mjs +13 -0
- package/dist/errors.mjs.map +1 -1
- package/dist/handoff.js +1 -1
- package/dist/handoff.js.map +1 -1
- package/dist/handoff.mjs +1 -1
- package/dist/handoff.mjs.map +1 -1
- package/dist/index.d.ts +5 -4
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +3 -2
- package/dist/index.mjs.map +1 -1
- package/dist/items.d.ts +13 -0
- package/dist/items.js +15 -0
- package/dist/items.js.map +1 -1
- package/dist/items.mjs +15 -0
- package/dist/items.mjs.map +1 -1
- package/dist/memory/historyMutations.d.ts +6 -0
- package/dist/memory/historyMutations.js +32 -0
- package/dist/memory/historyMutations.js.map +1 -0
- package/dist/memory/historyMutations.mjs +29 -0
- package/dist/memory/historyMutations.mjs.map +1 -0
- package/dist/memory/memorySession.d.ts +3 -2
- package/dist/memory/memorySession.js +7 -0
- package/dist/memory/memorySession.js.map +1 -1
- package/dist/memory/memorySession.mjs +7 -0
- package/dist/memory/memorySession.mjs.map +1 -1
- package/dist/memory/session.d.ts +15 -0
- package/dist/memory/session.js +6 -0
- package/dist/memory/session.js.map +1 -1
- package/dist/memory/session.mjs +5 -0
- package/dist/memory/session.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/model.d.ts +21 -0
- package/dist/run.d.ts +7 -1
- package/dist/run.js +116 -57
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +117 -58
- package/dist/run.mjs.map +1 -1
- package/dist/runState.d.ts +83 -1
- package/dist/runState.js +96 -11
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +95 -11
- package/dist/runState.mjs.map +1 -1
- package/dist/runner/errorHandlers.d.ts +13 -4
- package/dist/runner/errorHandlers.js +22 -4
- package/dist/runner/errorHandlers.js.map +1 -1
- package/dist/runner/errorHandlers.mjs +21 -4
- package/dist/runner/errorHandlers.mjs.map +1 -1
- package/dist/runner/items.js +11 -1
- package/dist/runner/items.js.map +1 -1
- package/dist/runner/items.mjs +11 -1
- package/dist/runner/items.mjs.map +1 -1
- package/dist/runner/modelPreparation.d.ts +1 -1
- package/dist/runner/modelPreparation.js +7 -7
- package/dist/runner/modelPreparation.js.map +1 -1
- package/dist/runner/modelPreparation.mjs +7 -7
- package/dist/runner/modelPreparation.mjs.map +1 -1
- package/dist/runner/runLoop.d.ts +2 -1
- package/dist/runner/runLoop.js +2 -2
- package/dist/runner/runLoop.js.map +1 -1
- package/dist/runner/runLoop.mjs +2 -2
- package/dist/runner/runLoop.mjs.map +1 -1
- package/dist/runner/sandbox.d.ts +33 -0
- package/dist/runner/sandbox.js +92 -0
- package/dist/runner/sandbox.js.map +1 -0
- package/dist/runner/sandbox.mjs +83 -0
- package/dist/runner/sandbox.mjs.map +1 -0
- package/dist/runner/toolExecution.js +25 -13
- package/dist/runner/toolExecution.js.map +1 -1
- package/dist/runner/toolExecution.mjs +25 -13
- package/dist/runner/toolExecution.mjs.map +1 -1
- package/dist/runner/tracing.js +1 -0
- package/dist/runner/tracing.js.map +1 -1
- package/dist/runner/tracing.mjs +1 -0
- package/dist/runner/tracing.mjs.map +1 -1
- package/dist/runner/turnPreparation.d.ts +2 -4
- package/dist/runner/turnPreparation.js +7 -3
- package/dist/runner/turnPreparation.js.map +1 -1
- package/dist/runner/turnPreparation.mjs +7 -3
- package/dist/runner/turnPreparation.mjs.map +1 -1
- package/dist/runner/turnResolution.js +158 -31
- package/dist/runner/turnResolution.js.map +1 -1
- package/dist/runner/turnResolution.mjs +160 -33
- package/dist/runner/turnResolution.mjs.map +1 -1
- package/dist/runner/types.d.ts +8 -8
- package/dist/sandbox/agent.d.ts +24 -0
- package/dist/sandbox/agent.js +68 -0
- package/dist/sandbox/agent.js.map +1 -0
- package/dist/sandbox/agent.mjs +64 -0
- package/dist/sandbox/agent.mjs.map +1 -0
- package/dist/sandbox/brand.d.ts +1 -0
- package/dist/sandbox/brand.js +5 -0
- package/dist/sandbox/brand.js.map +1 -0
- package/dist/sandbox/brand.mjs +2 -0
- package/dist/sandbox/brand.mjs.map +1 -0
- package/dist/sandbox/capabilities/base.d.ts +25 -0
- package/dist/sandbox/capabilities/base.js +89 -0
- package/dist/sandbox/capabilities/base.js.map +1 -0
- package/dist/sandbox/capabilities/base.mjs +84 -0
- package/dist/sandbox/capabilities/base.mjs.map +1 -0
- package/dist/sandbox/capabilities/compaction.d.ts +33 -0
- package/dist/sandbox/capabilities/compaction.js +172 -0
- package/dist/sandbox/capabilities/compaction.js.map +1 -0
- package/dist/sandbox/capabilities/compaction.mjs +164 -0
- package/dist/sandbox/capabilities/compaction.mjs.map +1 -0
- package/dist/sandbox/capabilities/filesystem.d.ts +14 -0
- package/dist/sandbox/capabilities/filesystem.js +447 -0
- package/dist/sandbox/capabilities/filesystem.js.map +1 -0
- package/dist/sandbox/capabilities/filesystem.mjs +444 -0
- package/dist/sandbox/capabilities/filesystem.mjs.map +1 -0
- package/dist/sandbox/capabilities/index.d.ts +19 -0
- package/dist/sandbox/capabilities/index.js +31 -0
- package/dist/sandbox/capabilities/index.js.map +1 -0
- package/dist/sandbox/capabilities/index.mjs +17 -0
- package/dist/sandbox/capabilities/index.mjs.map +1 -0
- package/dist/sandbox/capabilities/memory.d.ts +52 -0
- package/dist/sandbox/capabilities/memory.js +290 -0
- package/dist/sandbox/capabilities/memory.js.map +1 -0
- package/dist/sandbox/capabilities/memory.mjs +286 -0
- package/dist/sandbox/capabilities/memory.mjs.map +1 -0
- package/dist/sandbox/capabilities/shell.d.ts +15 -0
- package/dist/sandbox/capabilities/shell.js +130 -0
- package/dist/sandbox/capabilities/shell.js.map +1 -0
- package/dist/sandbox/capabilities/shell.mjs +127 -0
- package/dist/sandbox/capabilities/shell.mjs.map +1 -0
- package/dist/sandbox/capabilities/skills.d.ts +47 -0
- package/dist/sandbox/capabilities/skills.js +453 -0
- package/dist/sandbox/capabilities/skills.js.map +1 -0
- package/dist/sandbox/capabilities/skills.mjs +449 -0
- package/dist/sandbox/capabilities/skills.mjs.map +1 -0
- package/dist/sandbox/capabilities/transport.d.ts +3 -0
- package/dist/sandbox/capabilities/transport.js +33 -0
- package/dist/sandbox/capabilities/transport.js.map +1 -0
- package/dist/sandbox/capabilities/transport.mjs +28 -0
- package/dist/sandbox/capabilities/transport.mjs.map +1 -0
- package/dist/sandbox/client.d.ts +53 -0
- package/dist/sandbox/client.js +34 -0
- package/dist/sandbox/client.js.map +1 -0
- package/dist/sandbox/client.mjs +31 -0
- package/dist/sandbox/client.mjs.map +1 -0
- package/dist/sandbox/entries/factories.d.ts +17 -0
- package/dist/sandbox/entries/factories.js +112 -0
- package/dist/sandbox/entries/factories.js.map +1 -0
- package/dist/sandbox/entries/factories.mjs +94 -0
- package/dist/sandbox/entries/factories.mjs.map +1 -0
- package/dist/sandbox/entries/guards.d.ts +5 -0
- package/dist/sandbox/entries/guards.js +19 -0
- package/dist/sandbox/entries/guards.js.map +1 -0
- package/dist/sandbox/entries/guards.mjs +13 -0
- package/dist/sandbox/entries/guards.mjs.map +1 -0
- package/dist/sandbox/entries/index.d.ts +3 -0
- package/dist/sandbox/entries/index.js +26 -0
- package/dist/sandbox/entries/index.js.map +1 -0
- package/dist/sandbox/entries/index.mjs +3 -0
- package/dist/sandbox/entries/index.mjs.map +1 -0
- package/dist/sandbox/entries/types.d.ts +177 -0
- package/dist/sandbox/entries/types.js +3 -0
- package/dist/sandbox/entries/types.js.map +1 -0
- package/dist/sandbox/entries/types.mjs +2 -0
- package/dist/sandbox/entries/types.mjs.map +1 -0
- package/dist/sandbox/errors.d.ts +151 -0
- package/dist/sandbox/errors.js +303 -0
- package/dist/sandbox/errors.js.map +1 -0
- package/dist/sandbox/errors.mjs +251 -0
- package/dist/sandbox/errors.mjs.map +1 -0
- package/dist/sandbox/events.d.ts +51 -0
- package/dist/sandbox/events.js +104 -0
- package/dist/sandbox/events.js.map +1 -0
- package/dist/sandbox/events.mjs +95 -0
- package/dist/sandbox/events.mjs.map +1 -0
- package/dist/sandbox/index.d.ts +14 -0
- package/dist/sandbox/index.js +31 -0
- package/dist/sandbox/index.js.map +1 -0
- package/dist/sandbox/index.mjs +15 -0
- package/dist/sandbox/index.mjs.map +1 -0
- package/dist/sandbox/internal.d.ts +7 -0
- package/dist/sandbox/internal.js +46 -0
- package/dist/sandbox/internal.js.map +1 -0
- package/dist/sandbox/internal.mjs +8 -0
- package/dist/sandbox/internal.mjs.map +1 -0
- package/dist/sandbox/local.d.ts +3 -0
- package/dist/sandbox/local.js +20 -0
- package/dist/sandbox/local.js.map +1 -0
- package/dist/sandbox/local.mjs +4 -0
- package/dist/sandbox/local.mjs.map +1 -0
- package/dist/sandbox/localSkills.d.ts +13 -0
- package/dist/sandbox/localSkills.js +62 -0
- package/dist/sandbox/localSkills.js.map +1 -0
- package/dist/sandbox/localSkills.mjs +59 -0
- package/dist/sandbox/localSkills.mjs.map +1 -0
- package/dist/sandbox/manifest.d.ts +86 -0
- package/dist/sandbox/manifest.js +553 -0
- package/dist/sandbox/manifest.js.map +1 -0
- package/dist/sandbox/manifest.mjs +545 -0
- package/dist/sandbox/manifest.mjs.map +1 -0
- package/dist/sandbox/memory/generation.d.ts +56 -0
- package/dist/sandbox/memory/generation.js +426 -0
- package/dist/sandbox/memory/generation.js.map +1 -0
- package/dist/sandbox/memory/generation.mjs +385 -0
- package/dist/sandbox/memory/generation.mjs.map +1 -0
- package/dist/sandbox/memory/prompts.d.ts +16 -0
- package/dist/sandbox/memory/prompts.js +1685 -0
- package/dist/sandbox/memory/prompts.js.map +1 -0
- package/dist/sandbox/memory/prompts.mjs +1679 -0
- package/dist/sandbox/memory/prompts.mjs.map +1 -0
- package/dist/sandbox/memory/rollouts.d.ts +33 -0
- package/dist/sandbox/memory/rollouts.js +228 -0
- package/dist/sandbox/memory/rollouts.js.map +1 -0
- package/dist/sandbox/memory/rollouts.mjs +221 -0
- package/dist/sandbox/memory/rollouts.mjs.map +1 -0
- package/dist/sandbox/memory/storage.d.ts +70 -0
- package/dist/sandbox/memory/storage.js +543 -0
- package/dist/sandbox/memory/storage.js.map +1 -0
- package/dist/sandbox/memory/storage.mjs +537 -0
- package/dist/sandbox/memory/storage.mjs.map +1 -0
- package/dist/sandbox/pathGrants.d.ts +11 -0
- package/dist/sandbox/pathGrants.js +28 -0
- package/dist/sandbox/pathGrants.js.map +1 -0
- package/dist/sandbox/pathGrants.mjs +25 -0
- package/dist/sandbox/pathGrants.mjs.map +1 -0
- package/dist/sandbox/permissions.d.ts +29 -0
- package/dist/sandbox/permissions.js +140 -0
- package/dist/sandbox/permissions.js.map +1 -0
- package/dist/sandbox/permissions.mjs +134 -0
- package/dist/sandbox/permissions.mjs.map +1 -0
- package/dist/sandbox/runtime/agentKeys.d.ts +7 -0
- package/dist/sandbox/runtime/agentKeys.js +76 -0
- package/dist/sandbox/runtime/agentKeys.js.map +1 -0
- package/dist/sandbox/runtime/agentKeys.mjs +69 -0
- package/dist/sandbox/runtime/agentKeys.mjs.map +1 -0
- package/dist/sandbox/runtime/agentPreparation.d.ts +20 -0
- package/dist/sandbox/runtime/agentPreparation.js +178 -0
- package/dist/sandbox/runtime/agentPreparation.js.map +1 -0
- package/dist/sandbox/runtime/agentPreparation.mjs +172 -0
- package/dist/sandbox/runtime/agentPreparation.mjs.map +1 -0
- package/dist/sandbox/runtime/index.d.ts +5 -0
- package/dist/sandbox/runtime/index.js +22 -0
- package/dist/sandbox/runtime/index.js.map +1 -0
- package/dist/sandbox/runtime/index.mjs +6 -0
- package/dist/sandbox/runtime/index.mjs.map +1 -0
- package/dist/sandbox/runtime/livePreservedSessions.d.ts +25 -0
- package/dist/sandbox/runtime/livePreservedSessions.js +58 -0
- package/dist/sandbox/runtime/livePreservedSessions.js.map +1 -0
- package/dist/sandbox/runtime/livePreservedSessions.mjs +51 -0
- package/dist/sandbox/runtime/livePreservedSessions.mjs.map +1 -0
- package/dist/sandbox/runtime/manager.d.ts +68 -0
- package/dist/sandbox/runtime/manager.js +704 -0
- package/dist/sandbox/runtime/manager.js.map +1 -0
- package/dist/sandbox/runtime/manager.mjs +697 -0
- package/dist/sandbox/runtime/manager.mjs.map +1 -0
- package/dist/sandbox/runtime/prompts.d.ts +6 -0
- package/dist/sandbox/runtime/prompts.js +108 -0
- package/dist/sandbox/runtime/prompts.js.map +1 -0
- package/dist/sandbox/runtime/prompts.mjs +101 -0
- package/dist/sandbox/runtime/prompts.mjs.map +1 -0
- package/dist/sandbox/runtime/providedSessionManifest.d.ts +3 -0
- package/dist/sandbox/runtime/providedSessionManifest.js +175 -0
- package/dist/sandbox/runtime/providedSessionManifest.js.map +1 -0
- package/dist/sandbox/runtime/providedSessionManifest.mjs +172 -0
- package/dist/sandbox/runtime/providedSessionManifest.mjs.map +1 -0
- package/dist/sandbox/runtime/runAsManifest.d.ts +4 -0
- package/dist/sandbox/runtime/runAsManifest.js +40 -0
- package/dist/sandbox/runtime/runAsManifest.js.map +1 -0
- package/dist/sandbox/runtime/runAsManifest.mjs +36 -0
- package/dist/sandbox/runtime/runAsManifest.mjs.map +1 -0
- package/dist/sandbox/runtime/sessionLifecycle.d.ts +6 -0
- package/dist/sandbox/runtime/sessionLifecycle.js +222 -0
- package/dist/sandbox/runtime/sessionLifecycle.js.map +1 -0
- package/dist/sandbox/runtime/sessionLifecycle.mjs +215 -0
- package/dist/sandbox/runtime/sessionLifecycle.mjs.map +1 -0
- package/dist/sandbox/runtime/sessionSerialization.d.ts +12 -0
- package/dist/sandbox/runtime/sessionSerialization.js +74 -0
- package/dist/sandbox/runtime/sessionSerialization.js.map +1 -0
- package/dist/sandbox/runtime/sessionSerialization.mjs +71 -0
- package/dist/sandbox/runtime/sessionSerialization.mjs.map +1 -0
- package/dist/sandbox/runtime/sessionState.d.ts +26 -0
- package/dist/sandbox/runtime/sessionState.js +113 -0
- package/dist/sandbox/runtime/sessionState.js.map +1 -0
- package/dist/sandbox/runtime/sessionState.mjs +104 -0
- package/dist/sandbox/runtime/sessionState.mjs.map +1 -0
- package/dist/sandbox/runtime/spans.d.ts +1 -0
- package/dist/sandbox/runtime/spans.js +51 -0
- package/dist/sandbox/runtime/spans.js.map +1 -0
- package/dist/sandbox/runtime/spans.mjs +48 -0
- package/dist/sandbox/runtime/spans.mjs.map +1 -0
- package/dist/sandbox/runtime/toolRehydration.d.ts +34 -0
- package/dist/sandbox/runtime/toolRehydration.js +207 -0
- package/dist/sandbox/runtime/toolRehydration.js.map +1 -0
- package/dist/sandbox/runtime/toolRehydration.mjs +200 -0
- package/dist/sandbox/runtime/toolRehydration.mjs.map +1 -0
- package/dist/sandbox/sandboxes/docker.d.ts +75 -0
- package/dist/sandbox/sandboxes/docker.js +2015 -0
- package/dist/sandbox/sandboxes/docker.js.map +1 -0
- package/dist/sandbox/sandboxes/docker.mjs +2010 -0
- package/dist/sandbox/sandboxes/docker.mjs.map +1 -0
- package/dist/sandbox/sandboxes/index.d.ts +3 -0
- package/dist/sandbox/sandboxes/index.js +20 -0
- package/dist/sandbox/sandboxes/index.js.map +1 -0
- package/dist/sandbox/sandboxes/index.mjs +4 -0
- package/dist/sandbox/sandboxes/index.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/localSnapshotPaths.d.ts +1 -0
- package/dist/sandbox/sandboxes/shared/localSnapshotPaths.js +22 -0
- package/dist/sandbox/sandboxes/shared/localSnapshotPaths.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/localSnapshotPaths.mjs +19 -0
- package/dist/sandbox/sandboxes/shared/localSnapshotPaths.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/localSnapshots.d.ts +34 -0
- package/dist/sandbox/sandboxes/shared/localSnapshots.js +525 -0
- package/dist/sandbox/sandboxes/shared/localSnapshots.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/localSnapshots.mjs +508 -0
- package/dist/sandbox/sandboxes/shared/localSnapshots.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/localWorkspace.d.ts +27 -0
- package/dist/sandbox/sandboxes/shared/localWorkspace.js +693 -0
- package/dist/sandbox/sandboxes/shared/localWorkspace.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/localWorkspace.mjs +684 -0
- package/dist/sandbox/sandboxes/shared/localWorkspace.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/manifestPersistence.d.ts +15 -0
- package/dist/sandbox/sandboxes/shared/manifestPersistence.js +191 -0
- package/dist/sandbox/sandboxes/shared/manifestPersistence.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/manifestPersistence.mjs +182 -0
- package/dist/sandbox/sandboxes/shared/manifestPersistence.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/pty.d.ts +9 -0
- package/dist/sandbox/sandboxes/shared/pty.js +151 -0
- package/dist/sandbox/sandboxes/shared/pty.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/pty.mjs +148 -0
- package/dist/sandbox/sandboxes/shared/pty.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/runProcess.d.ts +16 -0
- package/dist/sandbox/sandboxes/shared/runProcess.js +90 -0
- package/dist/sandbox/sandboxes/shared/runProcess.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/runProcess.mjs +86 -0
- package/dist/sandbox/sandboxes/shared/runProcess.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/sessionStateValues.d.ts +18 -0
- package/dist/sandbox/sandboxes/shared/sessionStateValues.js +40 -0
- package/dist/sandbox/sandboxes/shared/sessionStateValues.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/sessionStateValues.mjs +35 -0
- package/dist/sandbox/sandboxes/shared/sessionStateValues.mjs.map +1 -0
- package/dist/sandbox/sandboxes/shared/shellCommand.d.ts +17 -0
- package/dist/sandbox/sandboxes/shared/shellCommand.js +38 -0
- package/dist/sandbox/sandboxes/shared/shellCommand.js.map +1 -0
- package/dist/sandbox/sandboxes/shared/shellCommand.mjs +34 -0
- package/dist/sandbox/sandboxes/shared/shellCommand.mjs.map +1 -0
- package/dist/sandbox/sandboxes/types.d.ts +11 -0
- package/dist/sandbox/sandboxes/types.js +3 -0
- package/dist/sandbox/sandboxes/types.js.map +1 -0
- package/dist/sandbox/sandboxes/types.mjs +2 -0
- package/dist/sandbox/sandboxes/types.mjs.map +1 -0
- package/dist/sandbox/sandboxes/unixLocal.d.ts +95 -0
- package/dist/sandbox/sandboxes/unixLocal.js +863 -0
- package/dist/sandbox/sandboxes/unixLocal.js.map +1 -0
- package/dist/sandbox/sandboxes/unixLocal.mjs +858 -0
- package/dist/sandbox/sandboxes/unixLocal.mjs.map +1 -0
- package/dist/sandbox/session.d.ts +123 -0
- package/dist/sandbox/session.js +58 -0
- package/dist/sandbox/session.js.map +1 -0
- package/dist/sandbox/session.mjs +50 -0
- package/dist/sandbox/session.mjs.map +1 -0
- package/dist/sandbox/shared/compare.d.ts +2 -0
- package/dist/sandbox/shared/compare.js +13 -0
- package/dist/sandbox/shared/compare.js.map +1 -0
- package/dist/sandbox/shared/compare.mjs +9 -0
- package/dist/sandbox/shared/compare.mjs.map +1 -0
- package/dist/sandbox/shared/environment.d.ts +14 -0
- package/dist/sandbox/shared/environment.js +69 -0
- package/dist/sandbox/shared/environment.js.map +1 -0
- package/dist/sandbox/shared/environment.mjs +59 -0
- package/dist/sandbox/shared/environment.mjs.map +1 -0
- package/dist/sandbox/shared/hostPath.d.ts +4 -0
- package/dist/sandbox/shared/hostPath.js +22 -0
- package/dist/sandbox/shared/hostPath.js.map +1 -0
- package/dist/sandbox/shared/hostPath.mjs +16 -0
- package/dist/sandbox/shared/hostPath.mjs.map +1 -0
- package/dist/sandbox/shared/manifestCollections.d.ts +12 -0
- package/dist/sandbox/shared/manifestCollections.js +40 -0
- package/dist/sandbox/shared/manifestCollections.js.map +1 -0
- package/dist/sandbox/shared/manifestCollections.mjs +34 -0
- package/dist/sandbox/shared/manifestCollections.mjs.map +1 -0
- package/dist/sandbox/shared/media.d.ts +6 -0
- package/dist/sandbox/shared/media.js +126 -0
- package/dist/sandbox/shared/media.js.map +1 -0
- package/dist/sandbox/shared/media.mjs +119 -0
- package/dist/sandbox/shared/media.mjs.map +1 -0
- package/dist/sandbox/shared/output.d.ts +12 -0
- package/dist/sandbox/shared/output.js +108 -0
- package/dist/sandbox/shared/output.js.map +1 -0
- package/dist/sandbox/shared/output.mjs +103 -0
- package/dist/sandbox/shared/output.mjs.map +1 -0
- package/dist/sandbox/shared/posixPath.d.ts +7 -0
- package/dist/sandbox/shared/posixPath.js +90 -0
- package/dist/sandbox/shared/posixPath.js.map +1 -0
- package/dist/sandbox/shared/posixPath.mjs +81 -0
- package/dist/sandbox/shared/posixPath.mjs.map +1 -0
- package/dist/sandbox/shared/remoteMountCommandAllowlist.d.ts +3 -0
- package/dist/sandbox/shared/remoteMountCommandAllowlist.js +33 -0
- package/dist/sandbox/shared/remoteMountCommandAllowlist.js.map +1 -0
- package/dist/sandbox/shared/remoteMountCommandAllowlist.mjs +28 -0
- package/dist/sandbox/shared/remoteMountCommandAllowlist.mjs.map +1 -0
- package/dist/sandbox/shared/shell.d.ts +1 -0
- package/dist/sandbox/shared/shell.js +7 -0
- package/dist/sandbox/shared/shell.js.map +1 -0
- package/dist/sandbox/shared/shell.mjs +4 -0
- package/dist/sandbox/shared/shell.mjs.map +1 -0
- package/dist/sandbox/shared/stableJson.d.ts +12 -0
- package/dist/sandbox/shared/stableJson.js +40 -0
- package/dist/sandbox/shared/stableJson.js.map +1 -0
- package/dist/sandbox/shared/stableJson.mjs +35 -0
- package/dist/sandbox/shared/stableJson.mjs.map +1 -0
- package/dist/sandbox/shared/typeGuards.d.ts +6 -0
- package/dist/sandbox/shared/typeGuards.js +34 -0
- package/dist/sandbox/shared/typeGuards.js.map +1 -0
- package/dist/sandbox/shared/typeGuards.mjs +26 -0
- package/dist/sandbox/shared/typeGuards.mjs.map +1 -0
- package/dist/sandbox/snapshot.d.ts +60 -0
- package/dist/sandbox/snapshot.js +45 -0
- package/dist/sandbox/snapshot.js.map +1 -0
- package/dist/sandbox/snapshot.mjs +39 -0
- package/dist/sandbox/snapshot.mjs.map +1 -0
- package/dist/sandbox/users.d.ts +11 -0
- package/dist/sandbox/users.js +31 -0
- package/dist/sandbox/users.js.map +1 -0
- package/dist/sandbox/users.mjs +26 -0
- package/dist/sandbox/users.mjs.map +1 -0
- package/dist/sandbox/workspacePaths.d.ts +20 -0
- package/dist/sandbox/workspacePaths.js +73 -0
- package/dist/sandbox/workspacePaths.js.map +1 -0
- package/dist/sandbox/workspacePaths.mjs +69 -0
- package/dist/sandbox/workspacePaths.mjs.map +1 -0
- package/dist/tool.js +1 -1
- package/dist/tool.js.map +1 -1
- package/dist/tool.mjs +1 -1
- package/dist/tool.mjs.map +1 -1
- package/dist/types/protocol.d.ts +8 -0
- package/dist/types/protocol.js +1 -0
- package/dist/types/protocol.js.map +1 -1
- package/dist/types/protocol.mjs +1 -0
- package/dist/types/protocol.mjs.map +1 -1
- package/dist/utils/messages.d.ts +6 -0
- package/dist/utils/messages.js +21 -0
- package/dist/utils/messages.js.map +1 -1
- package/dist/utils/messages.mjs +20 -0
- package/dist/utils/messages.mjs.map +1 -1
- package/dist/utils/strictToolSchema.d.ts +4 -0
- package/dist/utils/strictToolSchema.js +358 -0
- package/dist/utils/strictToolSchema.js.map +1 -0
- package/dist/utils/strictToolSchema.mjs +353 -0
- package/dist/utils/strictToolSchema.mjs.map +1 -0
- package/dist/utils/tools.d.ts +3 -1
- package/dist/utils/tools.js +18 -7
- package/dist/utils/tools.js.map +1 -1
- package/dist/utils/tools.mjs +18 -7
- package/dist/utils/tools.mjs.map +1 -1
- package/dist/utils/zodJsonSchemaCompat.js +18 -16
- package/dist/utils/zodJsonSchemaCompat.js.map +1 -1
- package/dist/utils/zodJsonSchemaCompat.mjs +18 -16
- package/dist/utils/zodJsonSchemaCompat.mjs.map +1 -1
- package/package.json +25 -1
|
@@ -0,0 +1,537 @@
|
|
|
1
|
+
import { UserError } from "../../errors.mjs";
|
|
2
|
+
import { dir, file } from "../entries/index.mjs";
|
|
3
|
+
import { normalizeRelativePath } from "../manifest.mjs";
|
|
4
|
+
import { withSandboxSpan } from "../runtime/spans.mjs";
|
|
5
|
+
import { shellQuote } from "../shared/shell.mjs";
|
|
6
|
+
const MEMORY_TEXT_MAX_BYTES = 1_000_000;
|
|
7
|
+
const MEMORY_READ_BEGIN_MARKER = '__OPENAI_AGENTS_MEMORY_READ_BEGIN__';
|
|
8
|
+
const MEMORY_READ_END_MARKER = '__OPENAI_AGENTS_MEMORY_READ_END__';
|
|
9
|
+
const MEMORY_READ_MISSING_MARKER = '__OPENAI_AGENTS_MEMORY_READ_MISSING__';
|
|
10
|
+
const MEMORY_READ_STATUS_MARKER = '__OPENAI_AGENTS_MEMORY_READ_STATUS__';
|
|
11
|
+
export class InMemoryMemoryStore {
|
|
12
|
+
files = new Map();
|
|
13
|
+
async read(path) {
|
|
14
|
+
const file = this.files.get(normalizeRelativePath(path));
|
|
15
|
+
return file ? new Uint8Array(file) : null;
|
|
16
|
+
}
|
|
17
|
+
async write(path, data) {
|
|
18
|
+
this.files.set(normalizeRelativePath(path), new Uint8Array(data));
|
|
19
|
+
}
|
|
20
|
+
async delete(path) {
|
|
21
|
+
this.files.delete(normalizeRelativePath(path));
|
|
22
|
+
}
|
|
23
|
+
async list(prefix) {
|
|
24
|
+
const normalizedPrefix = normalizeRelativePath(prefix);
|
|
25
|
+
const scanPrefix = normalizedPrefix ? `${normalizedPrefix}/` : '';
|
|
26
|
+
return [...this.files.keys()].filter((path) => path.startsWith(scanPrefix));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export class SandboxMemoryStorage {
|
|
30
|
+
session;
|
|
31
|
+
runAs;
|
|
32
|
+
store;
|
|
33
|
+
appendQueues = new Map();
|
|
34
|
+
constructor(args) {
|
|
35
|
+
this.session = args.session;
|
|
36
|
+
this.runAs = args.runAs;
|
|
37
|
+
this.store = args.store;
|
|
38
|
+
}
|
|
39
|
+
updateRuntimeContext(args) {
|
|
40
|
+
this.runAs = args.runAs;
|
|
41
|
+
}
|
|
42
|
+
async ensureLayout(memory) {
|
|
43
|
+
await this.hydrateFromStore(memory.layout.memoriesDir);
|
|
44
|
+
const memoriesDir = memory.layout.memoriesDir;
|
|
45
|
+
await this.ensureDir(memoriesDir);
|
|
46
|
+
await this.ensureDir(joinRelativePaths(memoriesDir, 'raw_memories'));
|
|
47
|
+
await this.ensureDir(joinRelativePaths(memoriesDir, 'rollout_summaries'));
|
|
48
|
+
await this.ensureDir(joinRelativePaths(memoriesDir, 'skills'));
|
|
49
|
+
await this.ensureDir(memory.layout.sessionsDir);
|
|
50
|
+
await this.ensureFile(joinRelativePaths(memoriesDir, 'MEMORY.md'));
|
|
51
|
+
await this.ensureFile(joinRelativePaths(memoriesDir, memory.layout.summaryFile));
|
|
52
|
+
}
|
|
53
|
+
async appendJsonl(path, payload) {
|
|
54
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
55
|
+
const line = JSON.stringify(payload);
|
|
56
|
+
await this.runQueuedAppend(normalizedPath, async () => {
|
|
57
|
+
if (!this.session.readFile && this.session.execCommand) {
|
|
58
|
+
await this.appendJsonlWithShell(normalizedPath, line);
|
|
59
|
+
await this.appendJsonlToStore(normalizedPath, line);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const existing = (await this.readFullText(normalizedPath)) ?? '';
|
|
63
|
+
const separator = existing.length > 0 && !existing.endsWith('\n') ? '\n' : '';
|
|
64
|
+
await this.writeText(normalizedPath, `${existing}${separator}${line}\n`);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
async readText(path) {
|
|
68
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
69
|
+
if (this.session.pathExists) {
|
|
70
|
+
const exists = await this.session.pathExists(normalizedPath, this.runAs);
|
|
71
|
+
if (!exists) {
|
|
72
|
+
const stored = await this.store?.read(normalizedPath);
|
|
73
|
+
return stored ? decodeText(stored) : null;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (this.session.readFile) {
|
|
77
|
+
try {
|
|
78
|
+
const payload = await withSandboxSpan('sandbox.memory.read_file', {
|
|
79
|
+
path: normalizedPath,
|
|
80
|
+
run_as: this.runAs,
|
|
81
|
+
}, async () => await this.session.readFile({
|
|
82
|
+
path: normalizedPath,
|
|
83
|
+
runAs: this.runAs,
|
|
84
|
+
maxBytes: MEMORY_TEXT_MAX_BYTES,
|
|
85
|
+
}));
|
|
86
|
+
return decodeText(payload);
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
if (isMissingFileError(error)) {
|
|
90
|
+
const stored = await this.store?.read(normalizedPath);
|
|
91
|
+
return stored ? decodeText(stored) : null;
|
|
92
|
+
}
|
|
93
|
+
throw error;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
const stored = await this.store?.read(normalizedPath);
|
|
97
|
+
if (stored) {
|
|
98
|
+
return decodeText(stored);
|
|
99
|
+
}
|
|
100
|
+
if (this.session.execCommand) {
|
|
101
|
+
return await this.readTextWithShell(normalizedPath, {
|
|
102
|
+
maxBytes: MEMORY_TEXT_MAX_BYTES,
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
throw new UserError('Memory generation requires sandbox sessions to provide readFile() or execCommand().');
|
|
106
|
+
}
|
|
107
|
+
async readFullText(path) {
|
|
108
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
109
|
+
if (this.session.pathExists) {
|
|
110
|
+
const exists = await this.session.pathExists(normalizedPath, this.runAs);
|
|
111
|
+
if (!exists) {
|
|
112
|
+
const stored = await this.store?.read(normalizedPath);
|
|
113
|
+
return stored ? decodeText(stored) : null;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
if (this.session.readFile) {
|
|
117
|
+
try {
|
|
118
|
+
const payload = await withSandboxSpan('sandbox.memory.read_file', {
|
|
119
|
+
path: normalizedPath,
|
|
120
|
+
run_as: this.runAs,
|
|
121
|
+
full_read: true,
|
|
122
|
+
}, async () => await this.session.readFile({
|
|
123
|
+
path: normalizedPath,
|
|
124
|
+
runAs: this.runAs,
|
|
125
|
+
}));
|
|
126
|
+
return decodeText(payload);
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
if (isMissingFileError(error)) {
|
|
130
|
+
const stored = await this.store?.read(normalizedPath);
|
|
131
|
+
return stored ? decodeText(stored) : null;
|
|
132
|
+
}
|
|
133
|
+
throw error;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
const stored = await this.store?.read(normalizedPath);
|
|
137
|
+
if (stored) {
|
|
138
|
+
return decodeText(stored);
|
|
139
|
+
}
|
|
140
|
+
if (this.session.execCommand) {
|
|
141
|
+
return await this.readTextWithShell(normalizedPath, { maxBytes: null });
|
|
142
|
+
}
|
|
143
|
+
throw new UserError('Memory generation requires sandbox sessions to provide readFile() or execCommand().');
|
|
144
|
+
}
|
|
145
|
+
async runQueuedAppend(path, append) {
|
|
146
|
+
const previousAppend = this.appendQueues.get(path) ?? Promise.resolve();
|
|
147
|
+
const currentAppend = previousAppend.catch(() => undefined).then(append);
|
|
148
|
+
this.appendQueues.set(path, currentAppend);
|
|
149
|
+
try {
|
|
150
|
+
await currentAppend;
|
|
151
|
+
}
|
|
152
|
+
finally {
|
|
153
|
+
if (this.appendQueues.get(path) === currentAppend) {
|
|
154
|
+
this.appendQueues.delete(path);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
async writeText(path, content) {
|
|
159
|
+
if (!this.session.materializeEntry) {
|
|
160
|
+
throw new UserError('Memory generation requires sandbox sessions to provide materializeEntry().');
|
|
161
|
+
}
|
|
162
|
+
// Memory lives in the sandbox workspace, not only in the side store, so agents
|
|
163
|
+
// can inspect or edit it and workspace snapshots carry it across resumes.
|
|
164
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
165
|
+
const payload = new TextEncoder().encode(content);
|
|
166
|
+
await withSandboxSpan('sandbox.memory.write_file', {
|
|
167
|
+
path: normalizedPath,
|
|
168
|
+
run_as: this.runAs,
|
|
169
|
+
}, async () => await this.session.materializeEntry({
|
|
170
|
+
path: normalizedPath,
|
|
171
|
+
entry: file({ content }),
|
|
172
|
+
runAs: this.runAs,
|
|
173
|
+
}));
|
|
174
|
+
await this.store?.write(normalizedPath, payload);
|
|
175
|
+
}
|
|
176
|
+
async listDir(path) {
|
|
177
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
178
|
+
if (this.session.listDir) {
|
|
179
|
+
try {
|
|
180
|
+
return mergeDirectoryEntries(await this.session.listDir({
|
|
181
|
+
path: normalizedPath,
|
|
182
|
+
runAs: this.runAs,
|
|
183
|
+
}), await this.listStoreDirectory(normalizedPath));
|
|
184
|
+
}
|
|
185
|
+
catch {
|
|
186
|
+
return await this.listStoreDirectory(normalizedPath);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
const prefix = normalizedPath ? `${normalizedPath}/` : '';
|
|
190
|
+
const manifestEntries = Object.keys(this.session.state.manifest.entries)
|
|
191
|
+
.filter((entryPath) => entryPath.startsWith(prefix))
|
|
192
|
+
.map((entryPath) => entryPath.slice(prefix.length))
|
|
193
|
+
.filter((relativePath) => relativePath.length > 0 && !relativePath.includes('/'))
|
|
194
|
+
.map((name) => ({
|
|
195
|
+
name,
|
|
196
|
+
path: `${prefix}${name}`,
|
|
197
|
+
type: this.session.state.manifest.entries[`${prefix}${name}`]?.type ===
|
|
198
|
+
'dir'
|
|
199
|
+
? 'dir'
|
|
200
|
+
: 'file',
|
|
201
|
+
}));
|
|
202
|
+
return mergeDirectoryEntries(manifestEntries, await this.listStoreDirectory(normalizedPath));
|
|
203
|
+
}
|
|
204
|
+
async hydrateFromStore(prefix) {
|
|
205
|
+
if (!this.store?.list || !this.session.materializeEntry) {
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
const files = await this.store.list(prefix);
|
|
209
|
+
for (const filePath of files.sort()) {
|
|
210
|
+
const normalizedPath = normalizeRelativePath(filePath);
|
|
211
|
+
if (this.session.pathExists &&
|
|
212
|
+
(await this.session.pathExists(normalizedPath, this.runAs))) {
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
215
|
+
const payload = await this.store.read(filePath);
|
|
216
|
+
if (!payload) {
|
|
217
|
+
continue;
|
|
218
|
+
}
|
|
219
|
+
await this.session.materializeEntry({
|
|
220
|
+
path: normalizedPath,
|
|
221
|
+
entry: file({ content: payload }),
|
|
222
|
+
runAs: this.runAs,
|
|
223
|
+
});
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
async listStoreDirectory(path) {
|
|
227
|
+
if (!this.store?.list) {
|
|
228
|
+
return [];
|
|
229
|
+
}
|
|
230
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
231
|
+
const prefix = normalizedPath ? `${normalizedPath}/` : '';
|
|
232
|
+
const entries = new Map();
|
|
233
|
+
for (const filePath of await this.store.list(normalizedPath)) {
|
|
234
|
+
const relativePath = filePath.startsWith(prefix)
|
|
235
|
+
? filePath.slice(prefix.length)
|
|
236
|
+
: filePath;
|
|
237
|
+
if (!relativePath) {
|
|
238
|
+
continue;
|
|
239
|
+
}
|
|
240
|
+
const [name, ...rest] = relativePath.split('/');
|
|
241
|
+
if (!name) {
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
entries.set(name, {
|
|
245
|
+
name,
|
|
246
|
+
path: `${prefix}${name}`,
|
|
247
|
+
type: rest.length > 0 ? 'dir' : 'file',
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
return [...entries.values()];
|
|
251
|
+
}
|
|
252
|
+
async buildPhaseTwoInputSelection(args) {
|
|
253
|
+
const currentItems = await this.listCurrentSelectionItems(args.memoriesDir);
|
|
254
|
+
const selected = currentItems.slice(0, args.maxRawMemoriesForConsolidation);
|
|
255
|
+
const priorSelected = await this.readPhaseTwoSelection(args.memoriesDir);
|
|
256
|
+
const selectedRolloutIds = new Set(selected.map((item) => item.rolloutId));
|
|
257
|
+
const priorRolloutIds = new Set(priorSelected.map((item) => item.rolloutId));
|
|
258
|
+
return {
|
|
259
|
+
selected,
|
|
260
|
+
retainedRolloutIds: new Set([...selectedRolloutIds].filter((rolloutId) => priorRolloutIds.has(rolloutId))),
|
|
261
|
+
removed: priorSelected.filter((item) => !selectedRolloutIds.has(item.rolloutId)),
|
|
262
|
+
};
|
|
263
|
+
}
|
|
264
|
+
async rebuildRawMemories(args) {
|
|
265
|
+
const chunks = [];
|
|
266
|
+
for (const item of args.selectedItems) {
|
|
267
|
+
const rawMemory = await this.readText(joinRelativePaths(args.memoriesDir, 'raw_memories', `${item.rolloutId}.md`));
|
|
268
|
+
if (rawMemory !== null && rawMemory.trim().length > 0) {
|
|
269
|
+
chunks.push(rawMemory.trimEnd());
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
if (chunks.length === 0) {
|
|
273
|
+
return false;
|
|
274
|
+
}
|
|
275
|
+
await this.writeText(joinRelativePaths(args.memoriesDir, 'raw_memories.md'), chunks.join('\n\n'));
|
|
276
|
+
return true;
|
|
277
|
+
}
|
|
278
|
+
async writePhaseTwoSelection(args) {
|
|
279
|
+
await this.writeText(joinRelativePaths(args.memoriesDir, 'phase_two_selection.json'), `${JSON.stringify({
|
|
280
|
+
version: 1,
|
|
281
|
+
updated_at: utcIsoTimestamp(),
|
|
282
|
+
selected: args.selectedItems.map((item) => ({
|
|
283
|
+
rollout_id: item.rolloutId,
|
|
284
|
+
updated_at: item.updatedAt,
|
|
285
|
+
rollout_path: item.rolloutPath,
|
|
286
|
+
rollout_summary_file: item.rolloutSummaryFile,
|
|
287
|
+
terminal_state: item.terminalState,
|
|
288
|
+
})),
|
|
289
|
+
}, null, 2)}\n`);
|
|
290
|
+
}
|
|
291
|
+
async ensureDir(path) {
|
|
292
|
+
if (!this.session.materializeEntry) {
|
|
293
|
+
throw new UserError('Memory generation requires sandbox sessions to provide materializeEntry().');
|
|
294
|
+
}
|
|
295
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
296
|
+
await this.session.materializeEntry({
|
|
297
|
+
path: normalizedPath,
|
|
298
|
+
entry: dir(),
|
|
299
|
+
runAs: this.runAs,
|
|
300
|
+
});
|
|
301
|
+
}
|
|
302
|
+
async ensureFile(path) {
|
|
303
|
+
if ((await this.readText(path)) !== null) {
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
await this.writeText(path, '');
|
|
307
|
+
}
|
|
308
|
+
async readTextWithShell(path, options) {
|
|
309
|
+
const readCommand = options.maxBytes === null
|
|
310
|
+
? `cat ${shellQuote(path)};`
|
|
311
|
+
: `head -c ${options.maxBytes} ${shellQuote(path)};`;
|
|
312
|
+
const command = [
|
|
313
|
+
`if [ -f ${shellQuote(path)} ]; then`,
|
|
314
|
+
`printf '%s\n' ${shellQuote(MEMORY_READ_BEGIN_MARKER)};`,
|
|
315
|
+
readCommand,
|
|
316
|
+
'read_status=$?;',
|
|
317
|
+
`printf '%s%s' ${shellQuote(MEMORY_READ_STATUS_MARKER)} "$read_status";`,
|
|
318
|
+
`printf '%s' ${shellQuote(MEMORY_READ_END_MARKER)};`,
|
|
319
|
+
'else',
|
|
320
|
+
`printf '%s' ${shellQuote(MEMORY_READ_MISSING_MARKER)};`,
|
|
321
|
+
'fi',
|
|
322
|
+
].join(' ');
|
|
323
|
+
const output = await withSandboxSpan('sandbox.memory.read_file', {
|
|
324
|
+
path,
|
|
325
|
+
run_as: this.runAs,
|
|
326
|
+
}, async () => await this.session.execCommand({
|
|
327
|
+
cmd: command,
|
|
328
|
+
login: false,
|
|
329
|
+
yieldTimeMs: 10_000,
|
|
330
|
+
maxOutputTokens: options.maxBytes === null
|
|
331
|
+
? undefined
|
|
332
|
+
: Math.ceil((options.maxBytes + 4096) / 4),
|
|
333
|
+
runAs: this.runAs,
|
|
334
|
+
}));
|
|
335
|
+
const begin = output.indexOf(MEMORY_READ_BEGIN_MARKER);
|
|
336
|
+
if (begin < 0 && output.includes(MEMORY_READ_MISSING_MARKER)) {
|
|
337
|
+
return null;
|
|
338
|
+
}
|
|
339
|
+
const status = output.indexOf(MEMORY_READ_STATUS_MARKER, begin + MEMORY_READ_BEGIN_MARKER.length);
|
|
340
|
+
const end = output.indexOf(MEMORY_READ_END_MARKER, status + MEMORY_READ_STATUS_MARKER.length);
|
|
341
|
+
if (begin < 0 || status < 0 || end < 0 || execOutputWasTruncated(output)) {
|
|
342
|
+
throw new UserError(`Failed to read memory file "${path}" from shell output.`);
|
|
343
|
+
}
|
|
344
|
+
const readStatus = output
|
|
345
|
+
.slice(status + MEMORY_READ_STATUS_MARKER.length, end)
|
|
346
|
+
.trim();
|
|
347
|
+
if (readStatus !== '0') {
|
|
348
|
+
throw new UserError(`Failed to read memory file "${path}" from shell; command exited with code ${readStatus}.`);
|
|
349
|
+
}
|
|
350
|
+
const payload = output.slice(begin + MEMORY_READ_BEGIN_MARKER.length, status);
|
|
351
|
+
return payload.startsWith('\n') ? payload.slice(1) : payload;
|
|
352
|
+
}
|
|
353
|
+
async appendJsonlWithShell(path, line) {
|
|
354
|
+
const parent = parentRelativePath(path);
|
|
355
|
+
const quotedPath = shellQuote(path);
|
|
356
|
+
const command = [
|
|
357
|
+
parent ? `mkdir -p -- ${shellQuote(parent)};` : '',
|
|
358
|
+
`if [ -f ${quotedPath} ] && [ -s ${quotedPath} ] && [ "$(tail -c 1 ${quotedPath})" != "" ]; then`,
|
|
359
|
+
`printf '\\n' >> ${quotedPath};`,
|
|
360
|
+
'fi;',
|
|
361
|
+
`printf '%s\\n' ${shellQuote(line)} >> ${quotedPath};`,
|
|
362
|
+
].join(' ');
|
|
363
|
+
const output = await withSandboxSpan('sandbox.memory.append_jsonl', {
|
|
364
|
+
path,
|
|
365
|
+
run_as: this.runAs,
|
|
366
|
+
}, async () => await this.session.execCommand({
|
|
367
|
+
cmd: command,
|
|
368
|
+
login: false,
|
|
369
|
+
yieldTimeMs: 10_000,
|
|
370
|
+
maxOutputTokens: 20_000,
|
|
371
|
+
runAs: this.runAs,
|
|
372
|
+
}));
|
|
373
|
+
if (!execOutputSucceeded(output) || execOutputWasTruncated(output)) {
|
|
374
|
+
throw new UserError(`Failed to append memory JSONL file "${path}" from shell output.`);
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
async appendJsonlToStore(path, line) {
|
|
378
|
+
if (!this.store) {
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
const existing = (await this.store.read(path)) ?? new Uint8Array();
|
|
382
|
+
const existingText = decodeText(existing);
|
|
383
|
+
const separator = existingText.length > 0 && !existingText.endsWith('\n') ? '\n' : '';
|
|
384
|
+
await this.store.write(path, new TextEncoder().encode(`${existingText}${separator}${line}\n`));
|
|
385
|
+
}
|
|
386
|
+
async readPhaseTwoSelection(memoriesDir) {
|
|
387
|
+
const rawPayload = await this.readText(joinRelativePaths(memoriesDir, 'phase_two_selection.json'));
|
|
388
|
+
if (rawPayload === null) {
|
|
389
|
+
return [];
|
|
390
|
+
}
|
|
391
|
+
try {
|
|
392
|
+
const payload = JSON.parse(rawPayload);
|
|
393
|
+
if (!Array.isArray(payload.selected)) {
|
|
394
|
+
return [];
|
|
395
|
+
}
|
|
396
|
+
return payload.selected
|
|
397
|
+
.map((entry) => selectionItemFromJson(entry))
|
|
398
|
+
.filter((entry) => entry !== null);
|
|
399
|
+
}
|
|
400
|
+
catch {
|
|
401
|
+
return [];
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
async listCurrentSelectionItems(memoriesDir) {
|
|
405
|
+
const rawMemoriesDir = joinRelativePaths(memoriesDir, 'raw_memories');
|
|
406
|
+
const entries = await this.listDir(rawMemoriesDir);
|
|
407
|
+
const items = [];
|
|
408
|
+
for (const entry of entries) {
|
|
409
|
+
if (entry.type === 'dir' || !entry.name.endsWith('.md')) {
|
|
410
|
+
continue;
|
|
411
|
+
}
|
|
412
|
+
const rawMemory = await this.readText(joinRelativePaths(rawMemoriesDir, entry.name));
|
|
413
|
+
if (rawMemory === null) {
|
|
414
|
+
continue;
|
|
415
|
+
}
|
|
416
|
+
const item = extractSelectionItem(rawMemory);
|
|
417
|
+
if (item !== null) {
|
|
418
|
+
items.push({
|
|
419
|
+
sortKey: updatedAtSortKey(rawMemory),
|
|
420
|
+
rolloutId: item.rolloutId,
|
|
421
|
+
item,
|
|
422
|
+
});
|
|
423
|
+
}
|
|
424
|
+
}
|
|
425
|
+
items.sort((left, right) => {
|
|
426
|
+
const sortComparison = right.sortKey[0] - left.sortKey[0] ||
|
|
427
|
+
right.sortKey[1].localeCompare(left.sortKey[1]);
|
|
428
|
+
return sortComparison || right.rolloutId.localeCompare(left.rolloutId);
|
|
429
|
+
});
|
|
430
|
+
return items.map((item) => item.item);
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
export function joinRelativePaths(left, right, ...rest) {
|
|
434
|
+
return [left, right, ...rest].reduce((prefix, part) => {
|
|
435
|
+
const normalizedPrefix = normalizeRelativePath(prefix);
|
|
436
|
+
const normalizedPart = normalizeRelativePath(part);
|
|
437
|
+
if (!normalizedPrefix) {
|
|
438
|
+
return normalizedPart;
|
|
439
|
+
}
|
|
440
|
+
if (!normalizedPart) {
|
|
441
|
+
return normalizedPrefix;
|
|
442
|
+
}
|
|
443
|
+
return `${normalizedPrefix}/${normalizedPart}`;
|
|
444
|
+
});
|
|
445
|
+
}
|
|
446
|
+
function selectionItemFromJson(value) {
|
|
447
|
+
if (!value || typeof value !== 'object') {
|
|
448
|
+
return null;
|
|
449
|
+
}
|
|
450
|
+
const payload = value;
|
|
451
|
+
const rolloutId = stringValue(payload.rollout_id).trim();
|
|
452
|
+
const rolloutSummaryFile = stringValue(payload.rollout_summary_file).trim();
|
|
453
|
+
if (!rolloutId || !rolloutSummaryFile) {
|
|
454
|
+
return null;
|
|
455
|
+
}
|
|
456
|
+
return {
|
|
457
|
+
rolloutId,
|
|
458
|
+
updatedAt: stringValue(payload.updated_at).trim(),
|
|
459
|
+
rolloutPath: stringValue(payload.rollout_path).trim(),
|
|
460
|
+
rolloutSummaryFile,
|
|
461
|
+
terminalState: stringValue(payload.terminal_state).trim(),
|
|
462
|
+
};
|
|
463
|
+
}
|
|
464
|
+
function extractSelectionItem(rawMemory) {
|
|
465
|
+
const rolloutId = extractMetadataValue(rawMemory, 'rollout_id');
|
|
466
|
+
const rolloutSummaryFile = extractMetadataValue(rawMemory, 'rollout_summary_file');
|
|
467
|
+
if (!rolloutId || !rolloutSummaryFile) {
|
|
468
|
+
return null;
|
|
469
|
+
}
|
|
470
|
+
return {
|
|
471
|
+
rolloutId,
|
|
472
|
+
updatedAt: extractMetadataValue(rawMemory, 'updated_at'),
|
|
473
|
+
rolloutPath: extractMetadataValue(rawMemory, 'rollout_path'),
|
|
474
|
+
rolloutSummaryFile,
|
|
475
|
+
terminalState: extractMetadataValue(rawMemory, 'terminal_state'),
|
|
476
|
+
};
|
|
477
|
+
}
|
|
478
|
+
function extractMetadataValue(rawMemory, key) {
|
|
479
|
+
const prefix = `${key}:`;
|
|
480
|
+
for (const line of rawMemory.split('\n')) {
|
|
481
|
+
if (line.startsWith(prefix)) {
|
|
482
|
+
return line.slice(prefix.length).trim();
|
|
483
|
+
}
|
|
484
|
+
}
|
|
485
|
+
return '';
|
|
486
|
+
}
|
|
487
|
+
function updatedAtSortKey(rawMemory) {
|
|
488
|
+
const updatedAt = extractMetadataValue(rawMemory, 'updated_at');
|
|
489
|
+
if (!updatedAt || updatedAt === 'unknown') {
|
|
490
|
+
return [0, ''];
|
|
491
|
+
}
|
|
492
|
+
return [1, updatedAt];
|
|
493
|
+
}
|
|
494
|
+
function stringValue(value) {
|
|
495
|
+
return typeof value === 'string' ? value : '';
|
|
496
|
+
}
|
|
497
|
+
function decodeText(payload) {
|
|
498
|
+
if (typeof payload === 'string') {
|
|
499
|
+
return payload;
|
|
500
|
+
}
|
|
501
|
+
return new TextDecoder('utf-8', { fatal: false }).decode(payload);
|
|
502
|
+
}
|
|
503
|
+
function parentRelativePath(path) {
|
|
504
|
+
const normalizedPath = normalizeRelativePath(path);
|
|
505
|
+
const index = normalizedPath.lastIndexOf('/');
|
|
506
|
+
return index < 0 ? '' : normalizedPath.slice(0, index);
|
|
507
|
+
}
|
|
508
|
+
function execOutputSucceeded(output) {
|
|
509
|
+
return /(?:^|\n)Process exited with code 0(?:\n|$)/u.test(output);
|
|
510
|
+
}
|
|
511
|
+
function execOutputWasTruncated(output) {
|
|
512
|
+
const outputMarker = '\nOutput:';
|
|
513
|
+
const outputStart = output.indexOf(outputMarker);
|
|
514
|
+
const metadata = outputStart < 0 ? output : output.slice(0, outputStart + 1);
|
|
515
|
+
return /(?:^|\n)Original token count: \d+(?:\n|$)/u.test(metadata);
|
|
516
|
+
}
|
|
517
|
+
function mergeDirectoryEntries(left, right) {
|
|
518
|
+
const merged = new Map();
|
|
519
|
+
for (const entry of [...left, ...right]) {
|
|
520
|
+
const existing = merged.get(entry.name);
|
|
521
|
+
if (existing?.type === 'dir') {
|
|
522
|
+
continue;
|
|
523
|
+
}
|
|
524
|
+
merged.set(entry.name, entry);
|
|
525
|
+
}
|
|
526
|
+
return [...merged.values()].sort((a, b) => a.name.localeCompare(b.name));
|
|
527
|
+
}
|
|
528
|
+
function isMissingFileError(error) {
|
|
529
|
+
return (typeof error === 'object' &&
|
|
530
|
+
error !== null &&
|
|
531
|
+
'code' in error &&
|
|
532
|
+
error.code === 'ENOENT');
|
|
533
|
+
}
|
|
534
|
+
function utcIsoTimestamp() {
|
|
535
|
+
return new Date().toISOString().replace(/Z$/, '+00:00');
|
|
536
|
+
}
|
|
537
|
+
//# sourceMappingURL=storage.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storage.mjs","sourceRoot":"","sources":["../../../src/sandbox/memory/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export type SandboxPathGrantInit = {
|
|
2
|
+
path: string;
|
|
3
|
+
readOnly?: boolean;
|
|
4
|
+
description?: string;
|
|
5
|
+
};
|
|
6
|
+
export type SandboxPathGrant = {
|
|
7
|
+
path: string;
|
|
8
|
+
readOnly: boolean;
|
|
9
|
+
description?: string;
|
|
10
|
+
};
|
|
11
|
+
export declare function normalizePathGrant(grant: SandboxPathGrantInit): SandboxPathGrant;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizePathGrant = normalizePathGrant;
|
|
4
|
+
const posixPath_1 = require("./shared/posixPath.js");
|
|
5
|
+
function normalizePathGrant(grant) {
|
|
6
|
+
if ('read_only' in grant) {
|
|
7
|
+
throw new Error('Use camelCase config keys in sandbox path grants; snake_case key "read_only" is not supported.');
|
|
8
|
+
}
|
|
9
|
+
if ((0, posixPath_1.hasParentPathSegment)(grant.path)) {
|
|
10
|
+
throw new Error('Sandbox path grant path must not contain parent segments.');
|
|
11
|
+
}
|
|
12
|
+
if ((0, posixPath_1.hasBackslashPathSeparator)(grant.path)) {
|
|
13
|
+
throw new Error('Sandbox path grant path must use "/" separators.');
|
|
14
|
+
}
|
|
15
|
+
const normalizedPath = (0, posixPath_1.normalizePosixPath)(grant.path);
|
|
16
|
+
if (!normalizedPath.startsWith('/')) {
|
|
17
|
+
throw new Error('Sandbox path grant path must be absolute.');
|
|
18
|
+
}
|
|
19
|
+
if (normalizedPath === '/') {
|
|
20
|
+
throw new Error('Sandbox path grant path must not be filesystem root.');
|
|
21
|
+
}
|
|
22
|
+
return {
|
|
23
|
+
path: normalizedPath,
|
|
24
|
+
readOnly: grant.readOnly ?? false,
|
|
25
|
+
...(grant.description ? { description: grant.description } : {}),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=pathGrants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pathGrants.js","sourceRoot":"","sources":["../../src/sandbox/pathGrants.ts"],"names":[],"mappings":";;AAkBA,gDA6BC;AA/CD,qDAI4B;AAc5B,SAAgB,kBAAkB,CAChC,KAA2B;IAE3B,IAAI,WAAW,IAAK,KAAiC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;IACJ,CAAC;IACD,IAAI,IAAA,gCAAoB,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,CAAC;IACD,IAAI,IAAA,qCAAyB,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,cAAc,GAAG,IAAA,8BAAkB,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QACjC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjE,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { hasBackslashPathSeparator, hasParentPathSegment, normalizePosixPath, } from "./shared/posixPath.mjs";
|
|
2
|
+
export function normalizePathGrant(grant) {
|
|
3
|
+
if ('read_only' in grant) {
|
|
4
|
+
throw new Error('Use camelCase config keys in sandbox path grants; snake_case key "read_only" is not supported.');
|
|
5
|
+
}
|
|
6
|
+
if (hasParentPathSegment(grant.path)) {
|
|
7
|
+
throw new Error('Sandbox path grant path must not contain parent segments.');
|
|
8
|
+
}
|
|
9
|
+
if (hasBackslashPathSeparator(grant.path)) {
|
|
10
|
+
throw new Error('Sandbox path grant path must use "/" separators.');
|
|
11
|
+
}
|
|
12
|
+
const normalizedPath = normalizePosixPath(grant.path);
|
|
13
|
+
if (!normalizedPath.startsWith('/')) {
|
|
14
|
+
throw new Error('Sandbox path grant path must be absolute.');
|
|
15
|
+
}
|
|
16
|
+
if (normalizedPath === '/') {
|
|
17
|
+
throw new Error('Sandbox path grant path must not be filesystem root.');
|
|
18
|
+
}
|
|
19
|
+
return {
|
|
20
|
+
path: normalizedPath,
|
|
21
|
+
readOnly: grant.readOnly ?? false,
|
|
22
|
+
...(grant.description ? { description: grant.description } : {}),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=pathGrants.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pathGrants.mjs","sourceRoot":"","sources":["../../src/sandbox/pathGrants.ts"],"names":[],"mappings":"OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACpB,kBAAkB,GACnB;AAcD,MAAM,UAAU,kBAAkB,CAChC,KAA2B;IAE3B,IAAI,WAAW,IAAK,KAAiC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;IACJ,CAAC;IACD,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,CAAC;IACD,IAAI,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QACjC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjE,CAAC;AACJ,CAAC"}
|