@openai/agents-core 0.8.5 → 0.9.1
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 +22 -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 +152 -57
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +153 -58
- package/dist/run.mjs.map +1 -1
- package/dist/runState.d.ts +110 -3
- package/dist/runState.js +414 -53
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +412 -53
- 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/sessionPersistence.js +33 -12
- package/dist/runner/sessionPersistence.js.map +1 -1
- package/dist/runner/sessionPersistence.mjs +33 -12
- package/dist/runner/sessionPersistence.mjs.map +1 -1
- package/dist/runner/streamReconciliation.d.ts +14 -0
- package/dist/runner/streamReconciliation.js +80 -0
- package/dist/runner/streamReconciliation.js.map +1 -0
- package/dist/runner/streamReconciliation.mjs +72 -0
- package/dist/runner/streamReconciliation.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/toolUseTracker.d.ts +3 -1
- package/dist/runner/toolUseTracker.js +2 -2
- package/dist/runner/toolUseTracker.js.map +1 -1
- package/dist/runner/toolUseTracker.mjs +2 -2
- package/dist/runner/toolUseTracker.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
package/dist/runner/runLoop.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Agent, AgentOutputType } from '../agent';
|
|
2
2
|
import type { RunState } from '../runState';
|
|
3
|
-
import type { Runner, ToolErrorFormatter } from '../run';
|
|
3
|
+
import type { RunConfig, Runner, ToolErrorFormatter } from '../run';
|
|
4
4
|
import type { SingleStepResult } from './steps';
|
|
5
5
|
export type InterruptedTurnOutcome = {
|
|
6
6
|
nextStep: SingleStepResult['nextStep'];
|
|
@@ -23,6 +23,7 @@ export declare function resumeInterruptedTurn<TContext, TAgent extends Agent<TCo
|
|
|
23
23
|
state: RunState<TContext, TAgent>;
|
|
24
24
|
runner: Runner;
|
|
25
25
|
toolErrorFormatter?: ToolErrorFormatter;
|
|
26
|
+
agentToolParentRunConfig?: Partial<RunConfig>;
|
|
26
27
|
onStepItems?: (turnResult: SingleStepResult) => void;
|
|
27
28
|
}): Promise<InterruptedTurnOutcome>;
|
|
28
29
|
export declare function handleInterruptedOutcome<TContext, TAgent extends Agent<TContext, AgentOutputType>>(options: {
|
package/dist/runner/runLoop.js
CHANGED
|
@@ -21,8 +21,8 @@ function applyTurnResult(options) {
|
|
|
21
21
|
: undefined;
|
|
22
22
|
}
|
|
23
23
|
async function resumeInterruptedTurn(options) {
|
|
24
|
-
const { state, runner, toolErrorFormatter, onStepItems } = options;
|
|
25
|
-
const turnResult = await (0, turnResolution_1.resolveInterruptedTurn)(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state, toolErrorFormatter);
|
|
24
|
+
const { state, runner, toolErrorFormatter, agentToolParentRunConfig, onStepItems, } = options;
|
|
25
|
+
const turnResult = await (0, turnResolution_1.resolveInterruptedTurn)(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state, toolErrorFormatter, agentToolParentRunConfig);
|
|
26
26
|
applyTurnResult({
|
|
27
27
|
state,
|
|
28
28
|
turnResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runLoop.js","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":";;AA6BA,0CA2BC;AAED,
|
|
1
|
+
{"version":3,"file":"runLoop.js","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":";;AA6BA,0CA2BC;AAED,sDAgDC;AAED,4DA4BC;AAnID,wDAA0D;AAwB1D,SAAgB,eAAe,CAG7B,OAAiD;IACjD,MAAM,EACJ,KAAK,EACL,UAAU,EACV,KAAK,EACL,SAAS,EACT,oBAAoB,EACpB,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;IAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACnD,KAAK,CAAC,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC;IAChD,KAAK,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;IAClD,IACE,oBAAoB;QACpB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAClD,CAAC;QACD,KAAK,CAAC,oBAAoB,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC;IACzC,KAAK,CAAC,kBAAkB;QACtB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,wBAAwB;YACnD,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAGzC,OAMD;IACC,MAAM,EACJ,KAAK,EACL,MAAM,EACN,kBAAkB,EAClB,wBAAwB,EACxB,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,MAAM,UAAU,GAAG,MAAM,IAAA,uCAAsB,EAC7C,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,iBAAkB,EACxB,KAAK,CAAC,sBAAoD,EAC1D,MAAM,EACN,KAAK,EACL,kBAAkB,EAClB,wBAAwB,CACzB,CAAC;IAEF,eAAe,CAAC;QACd,KAAK;QACL,UAAU;QACV,KAAK,EAAE,KAAK,CAAC,aAAa;QAC1B,SAAS,EAAE,KAAK,CAAC,sBAAsB,EAAE,SAAS,IAAI,EAAE;QACxD,oBAAoB,EAAE,KAAK;QAC3B,WAAW;KACZ,CAAC,CAAC;IAEH,8EAA8E;IAC9E,kGAAkG;IAClG,yDAAyD;IACzD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAC1D,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAC1E,CAAC;IACD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;QACvD,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;AACnE,CAAC;AAED,SAAgB,wBAAwB,CAGtC,OAID;IACC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,GAAG,OAAO,CAAC;IAEjE,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,KAAK,qBAAqB;YACxB,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACtC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;QACvD,KAAK,YAAY;YACf,iGAAiG;YACjG,4BAA4B,CAAC,IAAI,CAAC,CAAC;YACnC,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;YAC/B,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QACvD,KAAK,cAAc;YACjB,4BAA4B,CAAC,KAAK,CAAC,CAAC;YACpC,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACtC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;QACxD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,WAAW,GAAU,OAAO,CAAC,MAAM,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/dist/runner/runLoop.mjs
CHANGED
|
@@ -16,8 +16,8 @@ export function applyTurnResult(options) {
|
|
|
16
16
|
: undefined;
|
|
17
17
|
}
|
|
18
18
|
export async function resumeInterruptedTurn(options) {
|
|
19
|
-
const { state, runner, toolErrorFormatter, onStepItems } = options;
|
|
20
|
-
const turnResult = await resolveInterruptedTurn(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state, toolErrorFormatter);
|
|
19
|
+
const { state, runner, toolErrorFormatter, agentToolParentRunConfig, onStepItems, } = options;
|
|
20
|
+
const turnResult = await resolveInterruptedTurn(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state, toolErrorFormatter, agentToolParentRunConfig);
|
|
21
21
|
applyTurnResult({
|
|
22
22
|
state,
|
|
23
23
|
turnResult,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runLoop.mjs","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":"OAKO,EAAE,sBAAsB,EAAE;AAwBjC,MAAM,UAAU,eAAe,CAG7B,OAAiD;IACjD,MAAM,EACJ,KAAK,EACL,UAAU,EACV,KAAK,EACL,SAAS,EACT,oBAAoB,EACpB,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;IAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACnD,KAAK,CAAC,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC;IAChD,KAAK,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;IAClD,IACE,oBAAoB;QACpB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAClD,CAAC;QACD,KAAK,CAAC,oBAAoB,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC;IACzC,KAAK,CAAC,kBAAkB;QACtB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,wBAAwB;YACnD,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAGzC,
|
|
1
|
+
{"version":3,"file":"runLoop.mjs","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":"OAKO,EAAE,sBAAsB,EAAE;AAwBjC,MAAM,UAAU,eAAe,CAG7B,OAAiD;IACjD,MAAM,EACJ,KAAK,EACL,UAAU,EACV,KAAK,EACL,SAAS,EACT,oBAAoB,EACpB,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;IAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACnD,KAAK,CAAC,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC;IAChD,KAAK,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;IAClD,IACE,oBAAoB;QACpB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAClD,CAAC;QACD,KAAK,CAAC,oBAAoB,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC;IACzC,KAAK,CAAC,kBAAkB;QACtB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,wBAAwB;YACnD,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAGzC,OAMD;IACC,MAAM,EACJ,KAAK,EACL,MAAM,EACN,kBAAkB,EAClB,wBAAwB,EACxB,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAC7C,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,iBAAkB,EACxB,KAAK,CAAC,sBAAoD,EAC1D,MAAM,EACN,KAAK,EACL,kBAAkB,EAClB,wBAAwB,CACzB,CAAC;IAEF,eAAe,CAAC;QACd,KAAK;QACL,UAAU;QACV,KAAK,EAAE,KAAK,CAAC,aAAa;QAC1B,SAAS,EAAE,KAAK,CAAC,sBAAsB,EAAE,SAAS,IAAI,EAAE;QACxD,oBAAoB,EAAE,KAAK;QAC3B,WAAW;KACZ,CAAC,CAAC;IAEH,8EAA8E;IAC9E,kGAAkG;IAClG,yDAAyD;IACzD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAC1D,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;IAC1E,CAAC;IACD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;QACvD,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAGtC,OAID;IACC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,4BAA4B,EAAE,GAAG,OAAO,CAAC;IAEjE,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,KAAK,qBAAqB;YACxB,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACtC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;QACvD,KAAK,YAAY;YACf,iGAAiG;YACjG,4BAA4B,CAAC,IAAI,CAAC,CAAC;YACnC,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;YAC/B,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QACvD,KAAK,cAAc;YACjB,4BAA4B,CAAC,KAAK,CAAC,CAAC;YACpC,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACtC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;QACxD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,WAAW,GAAU,OAAO,CAAC,MAAM,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { Agent, AgentOutputType } from '../agent';
|
|
2
|
+
import { type RunState } from '../runState';
|
|
3
|
+
import type { SandboxRuntimeManager } from '../sandbox/runtime';
|
|
4
|
+
import type { SandboxMemoryAgentRunner } from '../sandbox/memory/generation';
|
|
5
|
+
import type { SandboxRuntimeModel } from '../sandbox/runtime/agentPreparation';
|
|
6
|
+
import type { AgentInputItem } from '../types';
|
|
7
|
+
export type SandboxMemoryPersistenceContext = {
|
|
8
|
+
sdkSessionId?: () => Promise<string | undefined>;
|
|
9
|
+
inputOverride?: () => string | AgentInputItem[] | undefined;
|
|
10
|
+
};
|
|
11
|
+
export declare function prepareSandboxInterruptedTurnResume<TContext, TAgent extends Agent<TContext, AgentOutputType>>(args: {
|
|
12
|
+
startingAgent: TAgent;
|
|
13
|
+
state: RunState<TContext, TAgent>;
|
|
14
|
+
sandboxRuntime: SandboxRuntimeManager<TContext>;
|
|
15
|
+
runConfigModel?: SandboxRuntimeModel;
|
|
16
|
+
}): Promise<void>;
|
|
17
|
+
export declare function finalizeSandboxRuntime<TContext>(args: {
|
|
18
|
+
state: RunState<TContext, Agent<TContext, AgentOutputType>>;
|
|
19
|
+
sandboxRuntime: SandboxRuntimeManager<TContext>;
|
|
20
|
+
preserveSessionsForInterruption: boolean;
|
|
21
|
+
runError?: unknown;
|
|
22
|
+
groupId?: string;
|
|
23
|
+
memoryContext?: SandboxMemoryPersistenceContext;
|
|
24
|
+
runAgent: SandboxMemoryAgentRunner;
|
|
25
|
+
}): Promise<void>;
|
|
26
|
+
export declare function rehydrateInterruptedTurnExecutionTools<TContext, TAgent extends Agent<TContext, AgentOutputType>>(args: {
|
|
27
|
+
startingAgent: TAgent;
|
|
28
|
+
state: RunState<TContext, TAgent>;
|
|
29
|
+
sandboxRuntime: SandboxRuntimeManager<TContext>;
|
|
30
|
+
runConfigModel?: SandboxRuntimeModel;
|
|
31
|
+
force?: boolean;
|
|
32
|
+
}): Promise<void>;
|
|
33
|
+
export declare function isSandboxRuntimeAgent<TContext>(agent: Agent<TContext, AgentOutputType>): boolean;
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.prepareSandboxInterruptedTurnResume = prepareSandboxInterruptedTurnResume;
|
|
7
|
+
exports.finalizeSandboxRuntime = finalizeSandboxRuntime;
|
|
8
|
+
exports.rehydrateInterruptedTurnExecutionTools = rehydrateInterruptedTurnExecutionTools;
|
|
9
|
+
exports.isSandboxRuntimeAgent = isSandboxRuntimeAgent;
|
|
10
|
+
const errors_1 = require("../errors.js");
|
|
11
|
+
const logger_1 = __importDefault(require("../logger.js"));
|
|
12
|
+
const runState_1 = require("../runState.js");
|
|
13
|
+
const agentKeys_1 = require("../sandbox/runtime/agentKeys.js");
|
|
14
|
+
const toolRehydration_1 = require("../sandbox/runtime/toolRehydration.js");
|
|
15
|
+
const tool_1 = require("../tool.js");
|
|
16
|
+
const context_1 = require("../tracing/context.js");
|
|
17
|
+
const modelPreparation_1 = require("./modelPreparation.js");
|
|
18
|
+
async function prepareSandboxInterruptedTurnResume(args) {
|
|
19
|
+
const { startingAgent, state, sandboxRuntime, runConfigModel } = args;
|
|
20
|
+
logger_1.default.debug('Continuing from interruption');
|
|
21
|
+
if (!state._lastTurnResponse || !state._lastProcessedResponse) {
|
|
22
|
+
throw new errors_1.UserError('No model response found in previous state', state);
|
|
23
|
+
}
|
|
24
|
+
const requiresExecutionToolRehydration = (0, toolRehydration_1.processedResponseRequiresExecutionToolRehydration)(state._lastProcessedResponse);
|
|
25
|
+
if (!(0, agentKeys_1.isSandboxAgent)(state._currentAgent) &&
|
|
26
|
+
!requiresExecutionToolRehydration) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const resumedPreservedSessions = await sandboxRuntime.adoptPreservedOwnedSessions();
|
|
30
|
+
if (resumedPreservedSessions || requiresExecutionToolRehydration) {
|
|
31
|
+
await rehydrateInterruptedTurnExecutionTools({
|
|
32
|
+
startingAgent,
|
|
33
|
+
state,
|
|
34
|
+
sandboxRuntime,
|
|
35
|
+
runConfigModel,
|
|
36
|
+
force: resumedPreservedSessions,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
async function finalizeSandboxRuntime(args) {
|
|
41
|
+
const { state, sandboxRuntime, preserveSessionsForInterruption, runError, groupId, memoryContext, runAgent, } = args;
|
|
42
|
+
if (!preserveSessionsForInterruption) {
|
|
43
|
+
try {
|
|
44
|
+
await (0, tool_1.disposeResolvedComputers)({ runContext: state._context });
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
logger_1.default.warn(`Failed to dispose computers after run: ${error}`);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
await sandboxRuntime.enqueueMemoryGeneration(state, {
|
|
51
|
+
exception: runError,
|
|
52
|
+
groupId,
|
|
53
|
+
inputOverride: memoryContext?.inputOverride?.(),
|
|
54
|
+
sdkSessionId: memoryContext?.sdkSessionId,
|
|
55
|
+
runAgent: async (agent, input, runOptions) => await runAgent(agent, input, runOptions),
|
|
56
|
+
});
|
|
57
|
+
try {
|
|
58
|
+
await sandboxRuntime.cleanup(state, {
|
|
59
|
+
preserveOwnedSessions: preserveSessionsForInterruption,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
finally {
|
|
63
|
+
if (state._currentAgentSpan) {
|
|
64
|
+
try {
|
|
65
|
+
if (!preserveSessionsForInterruption) {
|
|
66
|
+
state._currentAgentSpan.end();
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
finally {
|
|
70
|
+
(0, context_1.resetCurrentSpan)();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
async function rehydrateInterruptedTurnExecutionTools(args) {
|
|
76
|
+
const { startingAgent, state, sandboxRuntime, runConfigModel, force } = args;
|
|
77
|
+
if (!force &&
|
|
78
|
+
!(0, toolRehydration_1.processedResponseRequiresExecutionToolRehydration)(state._lastProcessedResponse)) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const preparedSandboxAgent = await sandboxRuntime.prepareAgent({
|
|
82
|
+
currentAgent: state._currentAgent,
|
|
83
|
+
turnInput: [],
|
|
84
|
+
runConfigModel,
|
|
85
|
+
});
|
|
86
|
+
const artifacts = await (0, modelPreparation_1.prepareAgentArtifacts)(state, preparedSandboxAgent.executionAgent);
|
|
87
|
+
await (0, runState_1.rehydrateProcessedResponseTools)(startingAgent, state, artifacts.tools);
|
|
88
|
+
}
|
|
89
|
+
function isSandboxRuntimeAgent(agent) {
|
|
90
|
+
return (0, agentKeys_1.isSandboxAgent)(agent);
|
|
91
|
+
}
|
|
92
|
+
//# sourceMappingURL=sandbox.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../src/runner/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { UserError } from "../errors.mjs";
|
|
2
|
+
import logger from "../logger.mjs";
|
|
3
|
+
import { rehydrateProcessedResponseTools } from "../runState.mjs";
|
|
4
|
+
import { isSandboxAgent } from "../sandbox/runtime/agentKeys.mjs";
|
|
5
|
+
import { processedResponseRequiresExecutionToolRehydration } from "../sandbox/runtime/toolRehydration.mjs";
|
|
6
|
+
import { disposeResolvedComputers } from "../tool.mjs";
|
|
7
|
+
import { resetCurrentSpan } from "../tracing/context.mjs";
|
|
8
|
+
import { prepareAgentArtifacts } from "./modelPreparation.mjs";
|
|
9
|
+
export async function prepareSandboxInterruptedTurnResume(args) {
|
|
10
|
+
const { startingAgent, state, sandboxRuntime, runConfigModel } = args;
|
|
11
|
+
logger.debug('Continuing from interruption');
|
|
12
|
+
if (!state._lastTurnResponse || !state._lastProcessedResponse) {
|
|
13
|
+
throw new UserError('No model response found in previous state', state);
|
|
14
|
+
}
|
|
15
|
+
const requiresExecutionToolRehydration = processedResponseRequiresExecutionToolRehydration(state._lastProcessedResponse);
|
|
16
|
+
if (!isSandboxAgent(state._currentAgent) &&
|
|
17
|
+
!requiresExecutionToolRehydration) {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const resumedPreservedSessions = await sandboxRuntime.adoptPreservedOwnedSessions();
|
|
21
|
+
if (resumedPreservedSessions || requiresExecutionToolRehydration) {
|
|
22
|
+
await rehydrateInterruptedTurnExecutionTools({
|
|
23
|
+
startingAgent,
|
|
24
|
+
state,
|
|
25
|
+
sandboxRuntime,
|
|
26
|
+
runConfigModel,
|
|
27
|
+
force: resumedPreservedSessions,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
export async function finalizeSandboxRuntime(args) {
|
|
32
|
+
const { state, sandboxRuntime, preserveSessionsForInterruption, runError, groupId, memoryContext, runAgent, } = args;
|
|
33
|
+
if (!preserveSessionsForInterruption) {
|
|
34
|
+
try {
|
|
35
|
+
await disposeResolvedComputers({ runContext: state._context });
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
logger.warn(`Failed to dispose computers after run: ${error}`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
await sandboxRuntime.enqueueMemoryGeneration(state, {
|
|
42
|
+
exception: runError,
|
|
43
|
+
groupId,
|
|
44
|
+
inputOverride: memoryContext?.inputOverride?.(),
|
|
45
|
+
sdkSessionId: memoryContext?.sdkSessionId,
|
|
46
|
+
runAgent: async (agent, input, runOptions) => await runAgent(agent, input, runOptions),
|
|
47
|
+
});
|
|
48
|
+
try {
|
|
49
|
+
await sandboxRuntime.cleanup(state, {
|
|
50
|
+
preserveOwnedSessions: preserveSessionsForInterruption,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
if (state._currentAgentSpan) {
|
|
55
|
+
try {
|
|
56
|
+
if (!preserveSessionsForInterruption) {
|
|
57
|
+
state._currentAgentSpan.end();
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
resetCurrentSpan();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
export async function rehydrateInterruptedTurnExecutionTools(args) {
|
|
67
|
+
const { startingAgent, state, sandboxRuntime, runConfigModel, force } = args;
|
|
68
|
+
if (!force &&
|
|
69
|
+
!processedResponseRequiresExecutionToolRehydration(state._lastProcessedResponse)) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const preparedSandboxAgent = await sandboxRuntime.prepareAgent({
|
|
73
|
+
currentAgent: state._currentAgent,
|
|
74
|
+
turnInput: [],
|
|
75
|
+
runConfigModel,
|
|
76
|
+
});
|
|
77
|
+
const artifacts = await prepareAgentArtifacts(state, preparedSandboxAgent.executionAgent);
|
|
78
|
+
await rehydrateProcessedResponseTools(startingAgent, state, artifacts.tools);
|
|
79
|
+
}
|
|
80
|
+
export function isSandboxRuntimeAgent(agent) {
|
|
81
|
+
return isSandboxAgent(agent);
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=sandbox.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandbox.mjs","sourceRoot":"","sources":["../../src/runner/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -250,8 +250,9 @@ async function prepareInputItemsWithSession(input, session, sessionInputCallback
|
|
|
250
250
|
const history = await session.getItems();
|
|
251
251
|
const newInputItems = (0, items_1.toAgentInputList)(input);
|
|
252
252
|
if (!sessionInputCallback) {
|
|
253
|
+
const historyForModelInput = history.map((item) => prepareHistoryItemForModelInput(session, item));
|
|
253
254
|
const preparedInput = includeHistoryInPreparedInput
|
|
254
|
-
? (0, items_1.dropOrphanToolCalls)([...
|
|
255
|
+
? (0, items_1.dropOrphanToolCalls)([...historyForModelInput, ...newInputItems], {
|
|
255
256
|
pruningIndexes: new Set(history.map((_, index) => index)),
|
|
256
257
|
})
|
|
257
258
|
: newInputItems;
|
|
@@ -266,33 +267,37 @@ async function prepareInputItemsWithSession(input, session, sessionInputCallback
|
|
|
266
267
|
if (!Array.isArray(combined)) {
|
|
267
268
|
throw new errors_1.UserError('Session input callback must return an array of AgentInputItem objects.');
|
|
268
269
|
}
|
|
269
|
-
const historyCounts = buildItemFrequencyMap(historySnapshot
|
|
270
|
+
const historyCounts = buildItemFrequencyMap(historySnapshot, {
|
|
271
|
+
session,
|
|
272
|
+
prepareForModelInput: true,
|
|
273
|
+
});
|
|
270
274
|
const newInputCounts = buildItemFrequencyMap(newInputSnapshot);
|
|
271
275
|
const historyRefs = (0, items_1.buildAgentInputPool)(historySnapshot);
|
|
272
276
|
const newInputRefs = (0, items_1.buildAgentInputPool)(newInputSnapshot);
|
|
273
277
|
const historyIndexes = new Set();
|
|
274
278
|
const appended = [];
|
|
275
279
|
for (const [index, item] of combined.entries()) {
|
|
276
|
-
const
|
|
280
|
+
const historyKey = getHistoryItemModelInputKey(session, item);
|
|
281
|
+
const newInputKey = (0, items_1.getAgentInputItemKey)(item);
|
|
277
282
|
if ((0, items_1.removeAgentInputFromPool)(newInputRefs, item)) {
|
|
278
|
-
decrementCount(newInputCounts,
|
|
283
|
+
decrementCount(newInputCounts, newInputKey);
|
|
279
284
|
appended.push(item);
|
|
280
285
|
continue;
|
|
281
286
|
}
|
|
282
287
|
if ((0, items_1.removeAgentInputFromPool)(historyRefs, item)) {
|
|
283
|
-
decrementCount(historyCounts,
|
|
288
|
+
decrementCount(historyCounts, historyKey);
|
|
284
289
|
historyIndexes.add(index);
|
|
285
290
|
continue;
|
|
286
291
|
}
|
|
287
|
-
const historyRemaining = historyCounts.get(
|
|
292
|
+
const historyRemaining = historyCounts.get(historyKey) ?? 0;
|
|
288
293
|
if (historyRemaining > 0) {
|
|
289
|
-
historyCounts.set(
|
|
294
|
+
historyCounts.set(historyKey, historyRemaining - 1);
|
|
290
295
|
historyIndexes.add(index);
|
|
291
296
|
continue;
|
|
292
297
|
}
|
|
293
|
-
const newRemaining = newInputCounts.get(
|
|
298
|
+
const newRemaining = newInputCounts.get(newInputKey) ?? 0;
|
|
294
299
|
if (newRemaining > 0) {
|
|
295
|
-
newInputCounts.set(
|
|
300
|
+
newInputCounts.set(newInputKey, newRemaining - 1);
|
|
296
301
|
appended.push(item);
|
|
297
302
|
continue;
|
|
298
303
|
}
|
|
@@ -312,13 +317,27 @@ async function prepareInputItemsWithSession(input, session, sessionInputCallback
|
|
|
312
317
|
logger_1.default.warn('sessionInputCallback dropped all new inputs in a server-managed conversation; original turn inputs were restored to avoid losing the API delta. Keep at least one new item or omit conversationId if you intended to drop them.');
|
|
313
318
|
}
|
|
314
319
|
const prunedPreparedItems = includeHistoryInPreparedInput
|
|
315
|
-
? (0, items_1.dropOrphanToolCalls)(preparedItems, { pruningIndexes: historyIndexes })
|
|
320
|
+
? (0, items_1.dropOrphanToolCalls)(prepareHistoryItemsForModelInput(session, preparedItems, historyIndexes), { pruningIndexes: historyIndexes })
|
|
316
321
|
: preparedItems;
|
|
317
322
|
return {
|
|
318
323
|
preparedInput: prunedPreparedItems,
|
|
319
324
|
sessionItems: appended,
|
|
320
325
|
};
|
|
321
326
|
}
|
|
327
|
+
function prepareHistoryItemsForModelInput(session, items, historyIndexes) {
|
|
328
|
+
if (!session.prepareHistoryItemForModelInput || historyIndexes.size === 0) {
|
|
329
|
+
return items;
|
|
330
|
+
}
|
|
331
|
+
return items.map((item, index) => historyIndexes.has(index)
|
|
332
|
+
? prepareHistoryItemForModelInput(session, item)
|
|
333
|
+
: item);
|
|
334
|
+
}
|
|
335
|
+
function prepareHistoryItemForModelInput(session, item) {
|
|
336
|
+
return session.prepareHistoryItemForModelInput?.(item) ?? item;
|
|
337
|
+
}
|
|
338
|
+
function getHistoryItemModelInputKey(session, item) {
|
|
339
|
+
return (0, items_1.getAgentInputItemKey)(prepareHistoryItemForModelInput(session, item));
|
|
340
|
+
}
|
|
322
341
|
function normalizeItemsForSessionPersistence(items) {
|
|
323
342
|
return items.map((item) => sanitizeValueForSession(stripTransientCallIds(item)));
|
|
324
343
|
}
|
|
@@ -451,10 +470,12 @@ async function runCompactionOnSession(session, responseId, state) {
|
|
|
451
470
|
requestUsageEntries: [usage],
|
|
452
471
|
}));
|
|
453
472
|
}
|
|
454
|
-
function buildItemFrequencyMap(items) {
|
|
473
|
+
function buildItemFrequencyMap(items, options) {
|
|
455
474
|
const counts = new Map();
|
|
456
475
|
for (const item of items) {
|
|
457
|
-
const key =
|
|
476
|
+
const key = options?.prepareForModelInput && options.session
|
|
477
|
+
? getHistoryItemModelInputKey(options.session, item)
|
|
478
|
+
: (0, items_1.getAgentInputItemKey)(item);
|
|
458
479
|
counts.set(key, (counts.get(key) ?? 0) + 1);
|
|
459
480
|
}
|
|
460
481
|
return counts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionPersistence.js","sourceRoot":"","sources":["../../src/runner/sessionPersistence.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sessionPersistence.js","sourceRoot":"","sources":["../../src/runner/sessionPersistence.ts"],"names":[],"mappings":"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"}
|
|
@@ -240,8 +240,9 @@ export async function prepareInputItemsWithSession(input, session, sessionInputC
|
|
|
240
240
|
const history = await session.getItems();
|
|
241
241
|
const newInputItems = toAgentInputList(input);
|
|
242
242
|
if (!sessionInputCallback) {
|
|
243
|
+
const historyForModelInput = history.map((item) => prepareHistoryItemForModelInput(session, item));
|
|
243
244
|
const preparedInput = includeHistoryInPreparedInput
|
|
244
|
-
? dropOrphanToolCalls([...
|
|
245
|
+
? dropOrphanToolCalls([...historyForModelInput, ...newInputItems], {
|
|
245
246
|
pruningIndexes: new Set(history.map((_, index) => index)),
|
|
246
247
|
})
|
|
247
248
|
: newInputItems;
|
|
@@ -256,33 +257,37 @@ export async function prepareInputItemsWithSession(input, session, sessionInputC
|
|
|
256
257
|
if (!Array.isArray(combined)) {
|
|
257
258
|
throw new UserError('Session input callback must return an array of AgentInputItem objects.');
|
|
258
259
|
}
|
|
259
|
-
const historyCounts = buildItemFrequencyMap(historySnapshot
|
|
260
|
+
const historyCounts = buildItemFrequencyMap(historySnapshot, {
|
|
261
|
+
session,
|
|
262
|
+
prepareForModelInput: true,
|
|
263
|
+
});
|
|
260
264
|
const newInputCounts = buildItemFrequencyMap(newInputSnapshot);
|
|
261
265
|
const historyRefs = buildAgentInputPool(historySnapshot);
|
|
262
266
|
const newInputRefs = buildAgentInputPool(newInputSnapshot);
|
|
263
267
|
const historyIndexes = new Set();
|
|
264
268
|
const appended = [];
|
|
265
269
|
for (const [index, item] of combined.entries()) {
|
|
266
|
-
const
|
|
270
|
+
const historyKey = getHistoryItemModelInputKey(session, item);
|
|
271
|
+
const newInputKey = getAgentInputItemKey(item);
|
|
267
272
|
if (removeAgentInputFromPool(newInputRefs, item)) {
|
|
268
|
-
decrementCount(newInputCounts,
|
|
273
|
+
decrementCount(newInputCounts, newInputKey);
|
|
269
274
|
appended.push(item);
|
|
270
275
|
continue;
|
|
271
276
|
}
|
|
272
277
|
if (removeAgentInputFromPool(historyRefs, item)) {
|
|
273
|
-
decrementCount(historyCounts,
|
|
278
|
+
decrementCount(historyCounts, historyKey);
|
|
274
279
|
historyIndexes.add(index);
|
|
275
280
|
continue;
|
|
276
281
|
}
|
|
277
|
-
const historyRemaining = historyCounts.get(
|
|
282
|
+
const historyRemaining = historyCounts.get(historyKey) ?? 0;
|
|
278
283
|
if (historyRemaining > 0) {
|
|
279
|
-
historyCounts.set(
|
|
284
|
+
historyCounts.set(historyKey, historyRemaining - 1);
|
|
280
285
|
historyIndexes.add(index);
|
|
281
286
|
continue;
|
|
282
287
|
}
|
|
283
|
-
const newRemaining = newInputCounts.get(
|
|
288
|
+
const newRemaining = newInputCounts.get(newInputKey) ?? 0;
|
|
284
289
|
if (newRemaining > 0) {
|
|
285
|
-
newInputCounts.set(
|
|
290
|
+
newInputCounts.set(newInputKey, newRemaining - 1);
|
|
286
291
|
appended.push(item);
|
|
287
292
|
continue;
|
|
288
293
|
}
|
|
@@ -302,13 +307,27 @@ export async function prepareInputItemsWithSession(input, session, sessionInputC
|
|
|
302
307
|
logger.warn('sessionInputCallback dropped all new inputs in a server-managed conversation; original turn inputs were restored to avoid losing the API delta. Keep at least one new item or omit conversationId if you intended to drop them.');
|
|
303
308
|
}
|
|
304
309
|
const prunedPreparedItems = includeHistoryInPreparedInput
|
|
305
|
-
? dropOrphanToolCalls(preparedItems, { pruningIndexes: historyIndexes })
|
|
310
|
+
? dropOrphanToolCalls(prepareHistoryItemsForModelInput(session, preparedItems, historyIndexes), { pruningIndexes: historyIndexes })
|
|
306
311
|
: preparedItems;
|
|
307
312
|
return {
|
|
308
313
|
preparedInput: prunedPreparedItems,
|
|
309
314
|
sessionItems: appended,
|
|
310
315
|
};
|
|
311
316
|
}
|
|
317
|
+
function prepareHistoryItemsForModelInput(session, items, historyIndexes) {
|
|
318
|
+
if (!session.prepareHistoryItemForModelInput || historyIndexes.size === 0) {
|
|
319
|
+
return items;
|
|
320
|
+
}
|
|
321
|
+
return items.map((item, index) => historyIndexes.has(index)
|
|
322
|
+
? prepareHistoryItemForModelInput(session, item)
|
|
323
|
+
: item);
|
|
324
|
+
}
|
|
325
|
+
function prepareHistoryItemForModelInput(session, item) {
|
|
326
|
+
return session.prepareHistoryItemForModelInput?.(item) ?? item;
|
|
327
|
+
}
|
|
328
|
+
function getHistoryItemModelInputKey(session, item) {
|
|
329
|
+
return getAgentInputItemKey(prepareHistoryItemForModelInput(session, item));
|
|
330
|
+
}
|
|
312
331
|
function normalizeItemsForSessionPersistence(items) {
|
|
313
332
|
return items.map((item) => sanitizeValueForSession(stripTransientCallIds(item)));
|
|
314
333
|
}
|
|
@@ -441,10 +460,12 @@ async function runCompactionOnSession(session, responseId, state) {
|
|
|
441
460
|
requestUsageEntries: [usage],
|
|
442
461
|
}));
|
|
443
462
|
}
|
|
444
|
-
function buildItemFrequencyMap(items) {
|
|
463
|
+
function buildItemFrequencyMap(items, options) {
|
|
445
464
|
const counts = new Map();
|
|
446
465
|
for (const item of items) {
|
|
447
|
-
const key =
|
|
466
|
+
const key = options?.prepareForModelInput && options.session
|
|
467
|
+
? getHistoryItemModelInputKey(options.session, item)
|
|
468
|
+
: getAgentInputItemKey(item);
|
|
448
469
|
counts.set(key, (counts.get(key) ?? 0) + 1);
|
|
449
470
|
}
|
|
450
471
|
return counts;
|