@vybestack/llxprt-code-core 0.11.0 → 0.12.0-nightly.260910.2aac6841e
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/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/prompt-config/defaults/default-prompts.json +3 -3
- package/dist/src/config/agentClientLifecycle.d.ts +4 -3
- package/dist/src/config/agentClientLifecycle.js +27 -14
- package/dist/src/config/agentClientLifecycle.js.map +1 -1
- package/dist/src/config/config.d.ts +2 -5
- package/dist/src/config/config.js +10 -23
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/configBase.d.ts +5 -1
- package/dist/src/config/configBase.js +27 -6
- package/dist/src/config/configBase.js.map +1 -1
- package/dist/src/config/configBaseCore.d.ts +26 -8
- package/dist/src/config/configBaseCore.js +30 -26
- package/dist/src/config/configBaseCore.js.map +1 -1
- package/dist/src/config/configMcpRuntime.d.ts +16 -0
- package/dist/src/config/configMcpRuntime.js +31 -0
- package/dist/src/config/configMcpRuntime.js.map +1 -0
- package/dist/src/config/configMediaDefaults.d.ts +10 -0
- package/dist/src/config/configMediaDefaults.js +17 -0
- package/dist/src/config/configMediaDefaults.js.map +1 -0
- package/dist/src/config/configTestHarness.d.ts +4 -0
- package/dist/src/config/configTypes.d.ts +4 -54
- package/dist/src/config/configTypes.js +6 -82
- package/dist/src/config/configTypes.js.map +1 -1
- package/dist/src/config/index.d.ts +1 -2
- package/dist/src/config/index.js +1 -2
- package/dist/src/config/index.js.map +1 -1
- package/dist/src/config/models.d.ts +0 -4
- package/dist/src/config/models.js +0 -4
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/toolRegistryFactory.d.ts +2 -2
- package/dist/src/core/clientContract.d.ts +4 -6
- package/dist/src/core/compression/transcriptPathNotice.d.ts +22 -0
- package/dist/src/core/compression/transcriptPathNotice.js +29 -0
- package/dist/src/core/compression/transcriptPathNotice.js.map +1 -0
- package/dist/src/core/contentGenerator.d.ts +2 -5
- package/dist/src/core/contentGenerator.js +10 -24
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/logger.d.ts +66 -0
- package/dist/src/core/logger.js +345 -30
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/prompts.d.ts +0 -1
- package/dist/src/core/prompts.js +5 -79
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/turn.d.ts +3 -3
- package/dist/src/hooks/hookTranslator.js +5 -4
- package/dist/src/hooks/hookTranslator.js.map +1 -1
- package/dist/src/index.d.ts +8 -6
- package/dist/src/index.js +8 -6
- package/dist/src/index.js.map +1 -1
- package/dist/src/llm-types/index.d.ts +1 -1
- package/dist/src/llm-types/modelEnvelope.d.ts +2 -1
- package/dist/src/llm-types/modelEnvelope.js +17 -1
- package/dist/src/llm-types/modelEnvelope.js.map +1 -1
- package/dist/src/models/schema.d.ts +40 -40
- package/dist/src/policy/policies/read-only.toml +0 -5
- package/dist/src/prompt-config/TemplateEngine.js +0 -3
- package/dist/src/prompt-config/TemplateEngine.js.map +1 -1
- package/dist/src/prompt-config/defaults/providers/gemini/core.md +0 -2
- package/dist/src/prompt-config/defaults/providers/gemini/models/gemini-2.5-flash/core.md +0 -2
- package/dist/src/prompt-config/defaults/providers/gemini/models/gemini-2.5-flash/gemini-2-5-flash/core.md +0 -2
- package/dist/src/prompt-config/prompt-loader.d.ts +1 -1
- package/dist/src/prompt-config/prompt-loader.js +4 -4
- package/dist/src/prompt-config/prompt-loader.js.map +1 -1
- package/dist/src/prompt-config/types.d.ts +0 -1
- package/dist/src/recording/CheckpointService.d.ts +4 -0
- package/dist/src/recording/CheckpointService.js +67 -46
- package/dist/src/recording/CheckpointService.js.map +1 -1
- package/dist/src/recording/HistoryMutationService.d.ts +1 -1
- package/dist/src/recording/HistoryMutationService.js +27 -4
- package/dist/src/recording/HistoryMutationService.js.map +1 -1
- package/dist/src/recording/RecordingIntegration.d.ts +36 -2
- package/dist/src/recording/RecordingIntegration.js +224 -7
- package/dist/src/recording/RecordingIntegration.js.map +1 -1
- package/dist/src/recording/ReplayEngine.d.ts +8 -10
- package/dist/src/recording/ReplayEngine.js +161 -95
- package/dist/src/recording/ReplayEngine.js.map +1 -1
- package/dist/src/recording/SessionDiscovery.d.ts +4 -2
- package/dist/src/recording/SessionDiscovery.js +13 -5
- package/dist/src/recording/SessionDiscovery.js.map +1 -1
- package/dist/src/recording/SessionRecordingService.d.ts +23 -3
- package/dist/src/recording/SessionRecordingService.js +209 -51
- package/dist/src/recording/SessionRecordingService.js.map +1 -1
- package/dist/src/recording/SessionTransitionService.d.ts +7 -0
- package/dist/src/recording/SessionTransitionService.js +66 -13
- package/dist/src/recording/SessionTransitionService.js.map +1 -1
- package/dist/src/recording/index.d.ts +1 -0
- package/dist/src/recording/index.js +1 -0
- package/dist/src/recording/index.js.map +1 -1
- package/dist/src/recording/janitor/cleanupTypes.d.ts +3 -0
- package/dist/src/recording/janitor/cleanupTypes.js.map +1 -1
- package/dist/src/recording/janitor/mediaReclamation.d.ts +23 -0
- package/dist/src/recording/janitor/mediaReclamation.js +195 -0
- package/dist/src/recording/janitor/mediaReclamation.js.map +1 -0
- package/dist/src/recording/janitor/sessionJanitor.js +47 -1
- package/dist/src/recording/janitor/sessionJanitor.js.map +1 -1
- package/dist/src/recording/janitor/sessionScanner.d.ts +12 -9
- package/dist/src/recording/janitor/sessionScanner.js +248 -193
- package/dist/src/recording/janitor/sessionScanner.js.map +1 -1
- package/dist/src/recording/replay-test-helpers.d.ts +10 -1
- package/dist/src/recording/replay-test-helpers.js +24 -2
- package/dist/src/recording/replay-test-helpers.js.map +1 -1
- package/dist/src/recording/replayCheckpointMetadata.d.ts +28 -0
- package/dist/src/recording/replayCheckpointMetadata.js +96 -0
- package/dist/src/recording/replayCheckpointMetadata.js.map +1 -0
- package/dist/src/recording/replayErrorFormatting.d.ts +6 -0
- package/dist/src/recording/replayErrorFormatting.js +38 -0
- package/dist/src/recording/replayErrorFormatting.js.map +1 -0
- package/dist/src/recording/resumeSession.d.ts +3 -0
- package/dist/src/recording/resumeSession.js +7 -1
- package/dist/src/recording/resumeSession.js.map +1 -1
- package/dist/src/recording/semanticMediaPurgeReplayValidation.d.ts +14 -0
- package/dist/src/recording/semanticMediaPurgeReplayValidation.js +24 -0
- package/dist/src/recording/semanticMediaPurgeReplayValidation.js.map +1 -0
- package/dist/src/recording/session-media-package-blobs.d.ts +8 -0
- package/dist/src/recording/session-media-package-blobs.js +72 -0
- package/dist/src/recording/session-media-package-blobs.js.map +1 -0
- package/dist/src/recording/session-media-package-import.d.ts +26 -0
- package/dist/src/recording/session-media-package-import.js +124 -0
- package/dist/src/recording/session-media-package-import.js.map +1 -0
- package/dist/src/recording/session-media-package-state.d.ts +19 -0
- package/dist/src/recording/session-media-package-state.js +56 -0
- package/dist/src/recording/session-media-package-state.js.map +1 -0
- package/dist/src/recording/session-media-package-validation.d.ts +59 -0
- package/dist/src/recording/session-media-package-validation.js +286 -0
- package/dist/src/recording/session-media-package-validation.js.map +1 -0
- package/dist/src/recording/session-media-package-writer.d.ts +18 -0
- package/dist/src/recording/session-media-package-writer.js +70 -0
- package/dist/src/recording/session-media-package-writer.js.map +1 -0
- package/dist/src/recording/session-media-package.d.ts +27 -0
- package/dist/src/recording/session-media-package.js +366 -0
- package/dist/src/recording/session-media-package.js.map +1 -0
- package/dist/src/recording/types.d.ts +34 -2
- package/dist/src/recording/types.js.map +1 -1
- package/dist/src/runtime/AgentRuntimeContext.d.ts +22 -5
- package/dist/src/runtime/AgentRuntimeLoader.d.ts +6 -0
- package/dist/src/runtime/AgentRuntimeLoader.js +25 -6
- package/dist/src/runtime/AgentRuntimeLoader.js.map +1 -1
- package/dist/src/runtime/contracts/PromptEstimation.d.ts +1 -0
- package/dist/src/runtime/contracts/PromptEstimation.js.map +1 -1
- package/dist/src/runtime/contracts/RuntimeProvider.d.ts +3 -2
- package/dist/src/runtime/contracts/RuntimeProviderManager.d.ts +0 -2
- package/dist/src/runtime/createAgentRuntimeContext.js +28 -1
- package/dist/src/runtime/createAgentRuntimeContext.js.map +1 -1
- package/dist/src/runtime/providerRuntimeContext.d.ts +12 -0
- package/dist/src/runtime/providerRuntimeContext.js +3 -0
- package/dist/src/runtime/providerRuntimeContext.js.map +1 -1
- package/dist/src/runtime/runtimeAdapters.js +2 -2
- package/dist/src/runtime/runtimeAdapters.js.map +1 -1
- package/dist/src/services/history/ContentConverters.d.ts +11 -7
- package/dist/src/services/history/ContentConverters.js +11 -7
- package/dist/src/services/history/ContentConverters.js.map +1 -1
- package/dist/src/services/history/HistoryService.d.ts +18 -180
- package/dist/src/services/history/HistoryService.js +53 -523
- package/dist/src/services/history/HistoryService.js.map +1 -1
- package/dist/src/services/history/HistoryServiceCore.d.ts +278 -0
- package/dist/src/services/history/HistoryServiceCore.js +727 -0
- package/dist/src/services/history/HistoryServiceCore.js.map +1 -0
- package/dist/src/services/history/IContent.d.ts +118 -16
- package/dist/src/services/history/IContent.js +284 -4
- package/dist/src/services/history/IContent.js.map +1 -1
- package/dist/src/services/history/contentSize.js +22 -2
- package/dist/src/services/history/contentSize.js.map +1 -1
- package/dist/src/services/history/historyChronology.d.ts +7 -0
- package/dist/src/services/history/historyChronology.js +35 -3
- package/dist/src/services/history/historyChronology.js.map +1 -1
- package/dist/src/services/history/historyCloneUtils.d.ts +5 -4
- package/dist/src/services/history/historyCloneUtils.js +23 -16
- package/dist/src/services/history/historyCloneUtils.js.map +1 -1
- package/dist/src/services/history/historyCompressionQueue.d.ts +33 -0
- package/dist/src/services/history/historyCompressionQueue.js +81 -0
- package/dist/src/services/history/historyCompressionQueue.js.map +1 -0
- package/dist/src/services/history/historyEventTypes.d.ts +3 -0
- package/dist/src/services/history/historyMutationFailure.d.ts +15 -0
- package/dist/src/services/history/historyMutationFailure.js +22 -0
- package/dist/src/services/history/historyMutationFailure.js.map +1 -1
- package/dist/src/services/history/historyProviderPipeline.d.ts +1 -1
- package/dist/src/services/history/historyProviderPipeline.js +15 -5
- package/dist/src/services/history/historyProviderPipeline.js.map +1 -1
- package/dist/src/services/history/historyTokenEstimation.js +10 -6
- package/dist/src/services/history/historyTokenEstimation.js.map +1 -1
- package/dist/src/services/history/historyToolNormalization.d.ts +2 -0
- package/dist/src/services/history/historyToolNormalization.js +26 -9
- package/dist/src/services/history/historyToolNormalization.js.map +1 -1
- package/dist/src/services/history/provider-file-binding.d.ts +11 -0
- package/dist/src/services/history/provider-file-binding.js +70 -0
- package/dist/src/services/history/provider-file-binding.js.map +1 -0
- package/dist/src/services/history/semantic-media-purge.d.ts +66 -0
- package/dist/src/services/history/semantic-media-purge.js +404 -0
- package/dist/src/services/history/semantic-media-purge.js.map +1 -0
- package/dist/src/storage/SessionPersistenceService.d.ts +53 -2
- package/dist/src/storage/SessionPersistenceService.js +435 -23
- package/dist/src/storage/SessionPersistenceService.js.map +1 -1
- package/dist/src/storage/history-media-ownership.d.ts +38 -0
- package/dist/src/storage/history-media-ownership.js +136 -0
- package/dist/src/storage/history-media-ownership.js.map +1 -0
- package/dist/src/storage/local-media-store-child.d.ts +6 -0
- package/dist/src/storage/local-media-store-child.js +140 -0
- package/dist/src/storage/local-media-store-child.js.map +1 -0
- package/dist/src/storage/local-media-store-files.d.ts +44 -0
- package/dist/src/storage/local-media-store-files.js +460 -0
- package/dist/src/storage/local-media-store-files.js.map +1 -0
- package/dist/src/storage/local-media-store-lock-recovery.d.ts +15 -0
- package/dist/src/storage/local-media-store-lock-recovery.js +112 -0
- package/dist/src/storage/local-media-store-lock-recovery.js.map +1 -0
- package/dist/src/storage/local-media-store-persistence.d.ts +48 -0
- package/dist/src/storage/local-media-store-persistence.js +443 -0
- package/dist/src/storage/local-media-store-persistence.js.map +1 -0
- package/dist/src/storage/local-media-store-quota.d.ts +6 -0
- package/dist/src/storage/local-media-store-quota.js +66 -0
- package/dist/src/storage/local-media-store-quota.js.map +1 -0
- package/dist/src/storage/local-media-store-reservations.d.ts +55 -0
- package/dist/src/storage/local-media-store-reservations.js +377 -0
- package/dist/src/storage/local-media-store-reservations.js.map +1 -0
- package/dist/src/storage/local-media-store-types.d.ts +110 -0
- package/dist/src/storage/local-media-store-types.js +35 -0
- package/dist/src/storage/local-media-store-types.js.map +1 -0
- package/dist/src/storage/local-media-store-validation.d.ts +34 -0
- package/dist/src/storage/local-media-store-validation.js +449 -0
- package/dist/src/storage/local-media-store-validation.js.map +1 -0
- package/dist/src/storage/local-media-store.d.ts +47 -0
- package/dist/src/storage/local-media-store.js +353 -0
- package/dist/src/storage/local-media-store.js.map +1 -0
- package/dist/src/storage/media-admission-service.d.ts +49 -0
- package/dist/src/storage/media-admission-service.js +333 -0
- package/dist/src/storage/media-admission-service.js.map +1 -0
- package/dist/src/storage/media-lifecycle-metrics.d.ts +75 -0
- package/dist/src/storage/media-lifecycle-metrics.js +105 -0
- package/dist/src/storage/media-lifecycle-metrics.js.map +1 -0
- package/dist/src/storage/media-reference-lifecycle.d.ts +16 -0
- package/dist/src/storage/media-reference-lifecycle.js +84 -0
- package/dist/src/storage/media-reference-lifecycle.js.map +1 -0
- package/dist/src/storage/request-media-resolver.d.ts +67 -0
- package/dist/src/storage/request-media-resolver.js +325 -0
- package/dist/src/storage/request-media-resolver.js.map +1 -0
- package/dist/src/storage/session-media-service-factories.d.ts +19 -0
- package/dist/src/storage/session-media-service-factories.js +34 -0
- package/dist/src/storage/session-media-service-factories.js.map +1 -0
- package/dist/src/storage/session-persistence-helpers.d.ts +10 -0
- package/dist/src/storage/session-persistence-helpers.js +46 -0
- package/dist/src/storage/session-persistence-helpers.js.map +1 -0
- package/dist/src/test-utils/config.d.ts +2 -0
- package/dist/src/test-utils/config.js +5 -5
- package/dist/src/test-utils/config.js.map +1 -1
- package/dist/src/test-utils/runtime.d.ts +2 -0
- package/dist/src/test-utils/runtime.js +1 -2
- package/dist/src/test-utils/runtime.js.map +1 -1
- package/dist/src/tools-adapters/CoreShellToolHostAdapter.js +1 -9
- package/dist/src/tools-adapters/CoreShellToolHostAdapter.js.map +1 -1
- package/dist/src/tools-adapters/CoreSkillServiceAdapter.d.ts +0 -2
- package/dist/src/tools-adapters/CoreSkillServiceAdapter.js +0 -17
- package/dist/src/tools-adapters/CoreSkillServiceAdapter.js.map +1 -1
- package/dist/src/tools-adapters/CoreToolHostAdapter.d.ts +0 -21
- package/dist/src/tools-adapters/CoreToolHostAdapter.js +0 -8
- package/dist/src/tools-adapters/CoreToolHostAdapter.js.map +1 -1
- package/dist/src/utils/environmentContext.d.ts +8 -9
- package/dist/src/utils/environmentContext.js +11 -22
- package/dist/src/utils/environmentContext.js.map +1 -1
- package/dist/src/utils/errorParsing.d.ts +1 -2
- package/dist/src/utils/errorParsing.js +22 -41
- package/dist/src/utils/errorParsing.js.map +1 -1
- package/dist/src/utils/generateContentResponseUtilities.js +12 -0
- package/dist/src/utils/generateContentResponseUtilities.js.map +1 -1
- package/dist/src/utils/summarizer.d.ts +1 -2
- package/dist/src/utils/summarizer.js +6 -5
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/tool-utils.js +7 -1
- package/dist/src/utils/tool-utils.js.map +1 -1
- package/index.ts +0 -4
- package/package.json +38 -30
- package/src/config/agentClientLifecycle.ts +53 -22
- package/src/config/config.ts +11 -26
- package/src/config/configBase.ts +46 -7
- package/src/config/configBaseCore.ts +38 -36
- package/src/config/configMcpRuntime.ts +46 -0
- package/src/config/configMediaDefaults.ts +19 -0
- package/src/config/configTypes.ts +13 -53
- package/src/config/index.ts +1 -4
- package/src/config/models.ts +0 -6
- package/src/config/toolRegistryFactory.ts +2 -2
- package/src/core/clientContract.ts +4 -6
- package/src/core/compression/transcriptPathNotice.ts +31 -0
- package/src/core/contentGenerator.ts +15 -39
- package/src/core/logger.ts +370 -39
- package/src/core/prompts.ts +4 -114
- package/src/core/turn.ts +3 -3
- package/src/hooks/hookTranslator.ts +6 -4
- package/src/index.ts +7 -7
- package/src/llm-types/index.ts +5 -0
- package/src/llm-types/modelEnvelope.ts +26 -2
- package/src/policy/policies/read-only.toml +0 -5
- package/src/prompt-config/TemplateEngine.ts +0 -3
- package/src/prompt-config/defaults/providers/gemini/core.md +0 -2
- package/src/prompt-config/defaults/providers/gemini/models/gemini-2.5-flash/core.md +0 -2
- package/src/prompt-config/defaults/providers/gemini/models/gemini-2.5-flash/gemini-2-5-flash/core.md +0 -2
- package/src/prompt-config/prompt-loader.ts +7 -8
- package/src/prompt-config/types.ts +0 -1
- package/src/recording/CheckpointService.ts +110 -45
- package/src/recording/HistoryMutationService.ts +28 -3
- package/src/recording/RecordingIntegration.ts +258 -11
- package/src/recording/ReplayEngine.ts +220 -110
- package/src/recording/SessionDiscovery.ts +30 -4
- package/src/recording/SessionRecordingService.ts +253 -55
- package/src/recording/SessionTransitionService.ts +75 -12
- package/src/recording/index.ts +7 -0
- package/src/recording/janitor/cleanupTypes.ts +4 -0
- package/src/recording/janitor/mediaReclamation.ts +295 -0
- package/src/recording/janitor/sessionJanitor.ts +54 -1
- package/src/recording/janitor/sessionScanner.ts +319 -227
- package/src/recording/replay-test-helpers.ts +33 -2
- package/src/recording/replayCheckpointMetadata.ts +115 -0
- package/src/recording/replayErrorFormatting.ts +43 -0
- package/src/recording/resumeSession.ts +10 -0
- package/src/recording/semanticMediaPurgeReplayValidation.ts +35 -0
- package/src/recording/session-media-package-blobs.ts +116 -0
- package/src/recording/session-media-package-import.ts +189 -0
- package/src/recording/session-media-package-state.ts +120 -0
- package/src/recording/session-media-package-validation.ts +400 -0
- package/src/recording/session-media-package-writer.ts +117 -0
- package/src/recording/session-media-package.ts +692 -0
- package/src/recording/types.ts +37 -2
- package/src/runtime/AgentRuntimeContext.ts +28 -5
- package/src/runtime/AgentRuntimeLoader.ts +32 -7
- package/src/runtime/contracts/PromptEstimation.ts +1 -0
- package/src/runtime/contracts/RuntimeProvider.ts +3 -8
- package/src/runtime/contracts/RuntimeProviderManager.ts +0 -2
- package/src/runtime/createAgentRuntimeContext.ts +43 -1
- package/src/runtime/providerRuntimeContext.ts +22 -0
- package/src/runtime/runtimeAdapters.ts +2 -2
- package/src/services/history/ContentConverters.ts +11 -7
- package/src/services/history/HistoryService.ts +71 -696
- package/src/services/history/HistoryServiceCore.ts +1055 -0
- package/src/services/history/IContent.ts +460 -20
- package/src/services/history/contentSize.ts +22 -2
- package/src/services/history/historyChronology.ts +53 -3
- package/src/services/history/historyCloneUtils.ts +26 -22
- package/src/services/history/historyCompressionQueue.ts +102 -0
- package/src/services/history/historyEventTypes.ts +9 -0
- package/src/services/history/historyMutationFailure.ts +33 -0
- package/src/services/history/historyProviderPipeline.ts +19 -5
- package/src/services/history/historyTokenEstimation.ts +9 -5
- package/src/services/history/historyToolNormalization.ts +43 -11
- package/src/services/history/provider-file-binding.ts +115 -0
- package/src/services/history/semantic-media-purge.ts +593 -0
- package/src/storage/SessionPersistenceService.ts +667 -30
- package/src/storage/history-media-ownership.ts +185 -0
- package/src/storage/local-media-store-child.ts +163 -0
- package/src/storage/local-media-store-files.ts +643 -0
- package/src/storage/local-media-store-lock-recovery.ts +159 -0
- package/src/storage/local-media-store-persistence.ts +737 -0
- package/src/storage/local-media-store-quota.ts +111 -0
- package/src/storage/local-media-store-reservations.ts +485 -0
- package/src/storage/local-media-store-types.ts +161 -0
- package/src/storage/local-media-store-validation.ts +643 -0
- package/src/storage/local-media-store.ts +696 -0
- package/src/storage/media-admission-service.ts +512 -0
- package/src/storage/media-lifecycle-metrics.ts +228 -0
- package/src/storage/media-reference-lifecycle.ts +164 -0
- package/src/storage/request-media-resolver.ts +491 -0
- package/src/storage/session-media-service-factories.ts +48 -0
- package/src/storage/session-persistence-helpers.ts +85 -0
- package/src/test-utils/config.ts +7 -5
- package/src/test-utils/runtime.ts +3 -2
- package/src/tools-adapters/CoreShellToolHostAdapter.ts +1 -11
- package/src/tools-adapters/CoreSkillServiceAdapter.ts +0 -23
- package/src/tools-adapters/CoreToolHostAdapter.ts +0 -36
- package/src/utils/environmentContext.ts +11 -30
- package/src/utils/errorParsing.ts +19 -69
- package/src/utils/generateContentResponseUtilities.ts +28 -1
- package/src/utils/summarizer.ts +8 -10
- package/src/utils/tool-utils.ts +7 -1
- package/dist/src/code_assist/codeAssist.d.ts +0 -19
- package/dist/src/code_assist/codeAssist.js +0 -41
- package/dist/src/code_assist/codeAssist.js.map +0 -1
- package/dist/src/code_assist/contentGeneratorAdapters.d.ts +0 -49
- package/dist/src/code_assist/contentGeneratorAdapters.js +0 -197
- package/dist/src/code_assist/contentGeneratorAdapters.js.map +0 -1
- package/dist/src/code_assist/converter.d.ts +0 -74
- package/dist/src/code_assist/converter.js +0 -158
- package/dist/src/code_assist/converter.js.map +0 -1
- package/dist/src/code_assist/googleGenAIWrapper.d.ts +0 -27
- package/dist/src/code_assist/googleGenAIWrapper.js +0 -46
- package/dist/src/code_assist/googleGenAIWrapper.js.map +0 -1
- package/dist/src/code_assist/oauth-credential-storage.d.ts +0 -30
- package/dist/src/code_assist/oauth-credential-storage.js +0 -135
- package/dist/src/code_assist/oauth-credential-storage.js.map +0 -1
- package/dist/src/code_assist/server.d.ts +0 -44
- package/dist/src/code_assist/server.js +0 -154
- package/dist/src/code_assist/server.js.map +0 -1
- package/dist/src/code_assist/setup.d.ts +0 -20
- package/dist/src/code_assist/setup.js +0 -126
- package/dist/src/code_assist/setup.js.map +0 -1
- package/dist/src/code_assist/types.d.ts +0 -161
- package/dist/src/code_assist/types.js +0 -46
- package/dist/src/code_assist/types.js.map +0 -1
- package/dist/src/utils/getFolderStructure.d.ts +0 -31
- package/dist/src/utils/getFolderStructure.js +0 -240
- package/dist/src/utils/getFolderStructure.js.map +0 -1
- package/dist/src/utils/installationManager.d.ts +0 -16
- package/dist/src/utils/installationManager.js +0 -51
- package/dist/src/utils/installationManager.js.map +0 -1
- package/dist/src/utils/llm-edit-fixer.d.ts +0 -25
- package/dist/src/utils/llm-edit-fixer.js +0 -120
- package/dist/src/utils/llm-edit-fixer.js.map +0 -1
- package/src/code_assist/codeAssist.ts +0 -59
- package/src/code_assist/contentGeneratorAdapters.ts +0 -275
- package/src/code_assist/converter.ts +0 -288
- package/src/code_assist/googleGenAIWrapper.ts +0 -90
- package/src/code_assist/oauth-credential-storage.ts +0 -171
- package/src/code_assist/server.ts +0 -263
- package/src/code_assist/setup.ts +0 -189
- package/src/code_assist/types.ts +0 -201
- package/src/utils/getFolderStructure.ts +0 -382
- package/src/utils/installationManager.ts +0 -59
- package/src/utils/llm-edit-fixer.ts +0 -157
|
@@ -14,6 +14,11 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import type { IContent, ChronologyMarker, ChronologyReplacedSpan } from './IContent.js';
|
|
17
|
+
export interface ChronologyState {
|
|
18
|
+
readonly nextSeq: number;
|
|
19
|
+
readonly currentUserTurn: number;
|
|
20
|
+
readonly nextStep: number;
|
|
21
|
+
}
|
|
17
22
|
/**
|
|
18
23
|
* Stamps and reconciles {@link ChronologyMarker}s onto {@link IContent}.
|
|
19
24
|
*
|
|
@@ -39,6 +44,8 @@ export declare class ChronologyStamper {
|
|
|
39
44
|
private currentUserTurn;
|
|
40
45
|
private nextStep;
|
|
41
46
|
constructor(now?: () => number);
|
|
47
|
+
snapshot(): ChronologyState;
|
|
48
|
+
restore(state: ChronologyState): void;
|
|
42
49
|
/**
|
|
43
50
|
* Attach a chronology marker to `content` and return it.
|
|
44
51
|
*
|
|
@@ -40,6 +40,18 @@ export class ChronologyStamper {
|
|
|
40
40
|
constructor(now = Date.now) {
|
|
41
41
|
this.now = now;
|
|
42
42
|
}
|
|
43
|
+
snapshot() {
|
|
44
|
+
return {
|
|
45
|
+
nextSeq: this.nextSeq,
|
|
46
|
+
currentUserTurn: this.currentUserTurn,
|
|
47
|
+
nextStep: this.nextStep,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
restore(state) {
|
|
51
|
+
this.nextSeq = state.nextSeq;
|
|
52
|
+
this.currentUserTurn = state.currentUserTurn;
|
|
53
|
+
this.nextStep = state.nextStep;
|
|
54
|
+
}
|
|
43
55
|
/**
|
|
44
56
|
* Attach a chronology marker to `content` and return it.
|
|
45
57
|
*
|
|
@@ -129,6 +141,25 @@ function collectSeqs(history) {
|
|
|
129
141
|
}
|
|
130
142
|
return seqs;
|
|
131
143
|
}
|
|
144
|
+
function transferSemanticMediaPurgeFrontier(previousHistory, newHistory) {
|
|
145
|
+
const frontier = previousHistory.find((content) => content.metadata?.semanticMediaPurgeFrontier !== undefined)?.metadata?.semanticMediaPurgeFrontier;
|
|
146
|
+
if (frontier === undefined ||
|
|
147
|
+
newHistory.length === 0 ||
|
|
148
|
+
newHistory.some((content) => content.metadata?.semanticMediaPurgeFrontier !== undefined)) {
|
|
149
|
+
return [...newHistory];
|
|
150
|
+
}
|
|
151
|
+
const first = newHistory[0];
|
|
152
|
+
return [
|
|
153
|
+
{
|
|
154
|
+
...first,
|
|
155
|
+
metadata: {
|
|
156
|
+
...first.metadata,
|
|
157
|
+
semanticMediaPurgeFrontier: frontier,
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
...newHistory.slice(1),
|
|
161
|
+
];
|
|
162
|
+
}
|
|
132
163
|
/**
|
|
133
164
|
* Annotate summary entries in `newHistory` with the span of chronology seqs
|
|
134
165
|
* destroyed by the compression that produced it.
|
|
@@ -159,7 +190,7 @@ export function annotateCompressionSpan(previousHistory, newHistory) {
|
|
|
159
190
|
}
|
|
160
191
|
}
|
|
161
192
|
if (destroyed.size === 0) {
|
|
162
|
-
return
|
|
193
|
+
return transferSemanticMediaPurgeFrontier(previousHistory, newHistory);
|
|
163
194
|
}
|
|
164
195
|
// Iterative min/max: spreading a Set into Math.min/Math.max puts every
|
|
165
196
|
// element on the call stack, which a large compressed history could overflow.
|
|
@@ -180,9 +211,9 @@ export function annotateCompressionSpan(previousHistory, newHistory) {
|
|
|
180
211
|
};
|
|
181
212
|
const hasSummary = newHistory.some((item) => item.metadata?.isSummary === true);
|
|
182
213
|
if (!hasSummary) {
|
|
183
|
-
return
|
|
214
|
+
return transferSemanticMediaPurgeFrontier(previousHistory, newHistory);
|
|
184
215
|
}
|
|
185
|
-
|
|
216
|
+
const annotated = newHistory.map((item) => {
|
|
186
217
|
if (item.metadata?.isSummary === true &&
|
|
187
218
|
item.metadata.chronologyReplaced === undefined) {
|
|
188
219
|
return {
|
|
@@ -195,6 +226,7 @@ export function annotateCompressionSpan(previousHistory, newHistory) {
|
|
|
195
226
|
}
|
|
196
227
|
return item;
|
|
197
228
|
});
|
|
229
|
+
return transferSemanticMediaPurgeFrontier(previousHistory, annotated);
|
|
198
230
|
}
|
|
199
231
|
/**
|
|
200
232
|
* Find the newest history item carrying a chronology marker and project its
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyChronology.js","sourceRoot":"","sources":["../../../../src/services/history/historyChronology.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"historyChronology.js","sourceRoot":"","sources":["../../../../src/services/history/historyChronology.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,14 @@
|
|
|
16
16
|
import type { IContent } from './IContent.js';
|
|
17
17
|
import type { DebugLogger } from '../../debug/index.js';
|
|
18
18
|
/**
|
|
19
|
-
*
|
|
20
|
-
*
|
|
19
|
+
* Sanitize provider history for serialization while cloning its top-level data.
|
|
20
|
+
* The copy isolates content and block references because getCurated() returns
|
|
21
|
+
* stored contents directly and in-process BeforeModel hooks may mutate them.
|
|
22
|
+
* Metadata retains its existing shallow-copy behavior.
|
|
21
23
|
*/
|
|
22
|
-
export declare function
|
|
24
|
+
export declare function sanitizeProviderHistoryForSerialization(contents: IContent[]): IContent[];
|
|
23
25
|
/**
|
|
24
26
|
* Sanitize a value to remove circular references.
|
|
25
27
|
*/
|
|
26
28
|
export declare function sanitizeParams(params: unknown): unknown;
|
|
27
|
-
/** Sanitize and log on error (for callers that want logging). */
|
|
28
29
|
export declare function sanitizeParamsWithLogger(params: unknown, logger: DebugLogger): unknown;
|
|
@@ -14,10 +14,12 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
/**
|
|
17
|
-
*
|
|
18
|
-
*
|
|
17
|
+
* Sanitize provider history for serialization while cloning its top-level data.
|
|
18
|
+
* The copy isolates content and block references because getCurated() returns
|
|
19
|
+
* stored contents directly and in-process BeforeModel hooks may mutate them.
|
|
20
|
+
* Metadata retains its existing shallow-copy behavior.
|
|
19
21
|
*/
|
|
20
|
-
export function
|
|
22
|
+
export function sanitizeProviderHistoryForSerialization(contents) {
|
|
21
23
|
return contents.map((content) => ({
|
|
22
24
|
speaker: content.speaker,
|
|
23
25
|
blocks: content.blocks.map(cloneBlock),
|
|
@@ -27,24 +29,30 @@ export function deepCloneWithoutCircularRefs(contents) {
|
|
|
27
29
|
/** Clone a single block, sanitizing tool_call/tool_response payloads. */
|
|
28
30
|
function cloneBlock(block) {
|
|
29
31
|
if (block.type === 'tool_call') {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
id: block.id,
|
|
33
|
-
name: block.name,
|
|
32
|
+
return {
|
|
33
|
+
...block,
|
|
34
34
|
parameters: sanitizeParams(block.parameters),
|
|
35
|
+
...(block.providerMetadata === undefined
|
|
36
|
+
? {}
|
|
37
|
+
: { providerMetadata: structuredClone(block.providerMetadata) }),
|
|
35
38
|
};
|
|
36
|
-
return cloned;
|
|
37
39
|
}
|
|
38
40
|
if (block.type === 'tool_response') {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
callId: block.callId,
|
|
42
|
-
toolName: block.toolName,
|
|
41
|
+
return {
|
|
42
|
+
...block,
|
|
43
43
|
result: sanitizeParams(block.result),
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
...(block.providerMetadata === undefined
|
|
45
|
+
? {}
|
|
46
|
+
: { providerMetadata: structuredClone(block.providerMetadata) }),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
if (block.type === 'media') {
|
|
50
|
+
return {
|
|
51
|
+
...block,
|
|
52
|
+
...(block.providerMetadata !== undefined
|
|
53
|
+
? { providerMetadata: structuredClone(block.providerMetadata) }
|
|
54
|
+
: {}),
|
|
46
55
|
};
|
|
47
|
-
return cloned;
|
|
48
56
|
}
|
|
49
57
|
return cloneGenericBlock(block);
|
|
50
58
|
}
|
|
@@ -88,7 +96,6 @@ export function sanitizeParams(params) {
|
|
|
88
96
|
};
|
|
89
97
|
}
|
|
90
98
|
}
|
|
91
|
-
/** Sanitize and log on error (for callers that want logging). */
|
|
92
99
|
export function sanitizeParamsWithLogger(params, logger) {
|
|
93
100
|
const sanitized = sanitizeParams(params);
|
|
94
101
|
if (typeof sanitized === 'object' &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyCloneUtils.js","sourceRoot":"","sources":["../../../../src/services/history/historyCloneUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"historyCloneUtils.js","sourceRoot":"","sources":["../../../../src/services/history/historyCloneUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Vybestack LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/** The phase in which a compression-queued operation must run. */
|
|
7
|
+
export type CompressionOperationKind = 'rebuild' | 'streaming';
|
|
8
|
+
/**
|
|
9
|
+
* FIFO queue of operations that arrived while compression held the history lock.
|
|
10
|
+
*
|
|
11
|
+
* Explicitly tagged rebuild operations run first, followed by `betweenPhases`,
|
|
12
|
+
* then streaming operations. FIFO is preserved within each phase (#3264, #3338).
|
|
13
|
+
*
|
|
14
|
+
* Every operation and `betweenPhases` is attempted under its own failure capture.
|
|
15
|
+
* Failures are combined and thrown after the complete flush, including a thrown
|
|
16
|
+
* `undefined`. The first failure wins unless multiple failures produce an
|
|
17
|
+
* `AggregateError`. Operations are never dropped (#2852).
|
|
18
|
+
*
|
|
19
|
+
* Crossing the high-water mark is reported once per lock cycle. Both `flush()`
|
|
20
|
+
* and `clear()` re-arm that diagnostic.
|
|
21
|
+
*/
|
|
22
|
+
export declare class CompressionOperationQueue {
|
|
23
|
+
private readonly onHighWater;
|
|
24
|
+
private readonly highWater;
|
|
25
|
+
private static readonly DEFAULT_HIGH_WATER;
|
|
26
|
+
private operations;
|
|
27
|
+
private highWaterReported;
|
|
28
|
+
constructor(onHighWater: (pendingCount: number) => void, highWater?: number);
|
|
29
|
+
get length(): number;
|
|
30
|
+
enqueue(operation: () => void, kind: CompressionOperationKind): void;
|
|
31
|
+
clear(): void;
|
|
32
|
+
flush(betweenPhases: () => void): void;
|
|
33
|
+
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Vybestack LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { combineMutationFailures, } from './historyMutationFailure.js';
|
|
7
|
+
/**
|
|
8
|
+
* FIFO queue of operations that arrived while compression held the history lock.
|
|
9
|
+
*
|
|
10
|
+
* Explicitly tagged rebuild operations run first, followed by `betweenPhases`,
|
|
11
|
+
* then streaming operations. FIFO is preserved within each phase (#3264, #3338).
|
|
12
|
+
*
|
|
13
|
+
* Every operation and `betweenPhases` is attempted under its own failure capture.
|
|
14
|
+
* Failures are combined and thrown after the complete flush, including a thrown
|
|
15
|
+
* `undefined`. The first failure wins unless multiple failures produce an
|
|
16
|
+
* `AggregateError`. Operations are never dropped (#2852).
|
|
17
|
+
*
|
|
18
|
+
* Crossing the high-water mark is reported once per lock cycle. Both `flush()`
|
|
19
|
+
* and `clear()` re-arm that diagnostic.
|
|
20
|
+
*/
|
|
21
|
+
export class CompressionOperationQueue {
|
|
22
|
+
onHighWater;
|
|
23
|
+
highWater;
|
|
24
|
+
static DEFAULT_HIGH_WATER = 4096;
|
|
25
|
+
operations = [];
|
|
26
|
+
highWaterReported = false;
|
|
27
|
+
constructor(onHighWater, highWater = CompressionOperationQueue.DEFAULT_HIGH_WATER) {
|
|
28
|
+
this.onHighWater = onHighWater;
|
|
29
|
+
this.highWater = highWater;
|
|
30
|
+
}
|
|
31
|
+
get length() {
|
|
32
|
+
return this.operations.length;
|
|
33
|
+
}
|
|
34
|
+
enqueue(operation, kind) {
|
|
35
|
+
this.operations.push({ kind, execute: operation });
|
|
36
|
+
if (!this.highWaterReported && this.operations.length >= this.highWater) {
|
|
37
|
+
this.highWaterReported = true;
|
|
38
|
+
this.onHighWater(this.operations.length);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
clear() {
|
|
42
|
+
this.operations = [];
|
|
43
|
+
this.highWaterReported = false;
|
|
44
|
+
}
|
|
45
|
+
flush(betweenPhases) {
|
|
46
|
+
const operations = this.operations;
|
|
47
|
+
this.operations = [];
|
|
48
|
+
this.highWaterReported = false;
|
|
49
|
+
const rebuildOperations = operations.filter((operation) => operation.kind === 'rebuild');
|
|
50
|
+
const streamingOperations = operations.filter((operation) => operation.kind === 'streaming');
|
|
51
|
+
let failure = { failed: false };
|
|
52
|
+
for (const operation of rebuildOperations) {
|
|
53
|
+
try {
|
|
54
|
+
operation.execute();
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
failure = combineMutationFailures(failure, { failed: true, error });
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
try {
|
|
61
|
+
betweenPhases();
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
failure = combineMutationFailures(failure, { failed: true, error });
|
|
65
|
+
}
|
|
66
|
+
for (const operation of streamingOperations) {
|
|
67
|
+
try {
|
|
68
|
+
operation.execute();
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
failure = combineMutationFailures(failure, { failed: true, error });
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
// Thrown only after every unit has been attempted, so a listener failure cannot
|
|
75
|
+
// discard queued content or suppress the release events (#3264). A thrown
|
|
76
|
+
// `undefined` is rethrown truthfully rather than swallowed by a sentinel.
|
|
77
|
+
if (failure.failed)
|
|
78
|
+
throw failure.error;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=historyCompressionQueue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"historyCompressionQueue.js","sourceRoot":"","sources":["../../../../src/services/history/historyCompressionQueue.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEL,uBAAuB,GACxB,MAAM,6BAA6B,CAAC;AAKrC;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,yBAAyB;IAWjB;IACA;IAXX,MAAM,CAAU,kBAAkB,GAAG,IAAI,CAAC;IAE1C,UAAU,GAGb,EAAE,CAAC;IAEA,iBAAiB,GAAG,KAAK,CAAC;IAElC,YACmB,WAA2C,EAC3C,YAAoB,yBAAyB,CAAC,kBAAkB;QADhE,gBAAW,GAAX,WAAW,CAAgC;QAC3C,cAAS,GAAT,SAAS,CAAuD;IAChF,CAAC;IAEJ,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,SAAqB,EAAE,IAA8B;QAC3D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACxE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAyB;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAE/B,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CACzC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAC5C,CAAC;QACF,MAAM,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAC3C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,WAAW,CAC9C,CAAC;QAEF,IAAI,OAAO,GAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAEjD,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACH,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,aAAa,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACxB,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAED,gFAAgF;QAChF,0EAA0E;QAC1E,0EAA0E;QAC1E,IAAI,OAAO,CAAC,MAAM;YAAE,MAAM,OAAO,CAAC,KAAK,CAAC;IAC1C,CAAC"}
|
|
@@ -21,16 +21,19 @@ import type { TokensUpdatedEvent } from './HistoryEvents.js';
|
|
|
21
21
|
export interface HistoryServiceEventEmitter {
|
|
22
22
|
on(event: 'tokensUpdated', listener: (eventData: TokensUpdatedEvent) => void): this;
|
|
23
23
|
on(event: 'contentAdded', listener: (content: IContent) => void): this;
|
|
24
|
+
on(event: 'contentBatchAdded', listener: (contents: readonly IContent[]) => void): this;
|
|
24
25
|
on(event: 'compressionStarted', listener: () => void): this;
|
|
25
26
|
on(event: 'compressionLockReleased', listener: () => void): this;
|
|
26
27
|
on(event: 'compressionEnded', listener: (summary: IContent, itemsCompressed: number) => void): this;
|
|
27
28
|
emit(event: 'tokensUpdated', eventData: TokensUpdatedEvent): boolean;
|
|
28
29
|
emit(event: 'contentAdded', content: IContent): boolean;
|
|
30
|
+
emit(event: 'contentBatchAdded', contents: readonly IContent[]): boolean;
|
|
29
31
|
emit(event: 'compressionStarted'): boolean;
|
|
30
32
|
emit(event: 'compressionLockReleased'): boolean;
|
|
31
33
|
emit(event: 'compressionEnded', summary: IContent, itemsCompressed: number): boolean;
|
|
32
34
|
off(event: 'tokensUpdated', listener: (eventData: TokensUpdatedEvent) => void): this;
|
|
33
35
|
off(event: 'contentAdded', listener: (content: IContent) => void): this;
|
|
36
|
+
off(event: 'contentBatchAdded', listener: (contents: readonly IContent[]) => void): this;
|
|
34
37
|
off(event: 'compressionStarted', listener: () => void): this;
|
|
35
38
|
off(event: 'compressionLockReleased', listener: () => void): this;
|
|
36
39
|
off(event: 'compressionEnded', listener: (summary: IContent, itemsCompressed: number) => void): this;
|
|
@@ -13,10 +13,25 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
+
import type { PreparedHistoryBatchEffect } from './HistoryServiceCore.js';
|
|
16
17
|
export type MutationFailure = {
|
|
17
18
|
failed: false;
|
|
18
19
|
} | {
|
|
19
20
|
failed: true;
|
|
20
21
|
error: unknown;
|
|
21
22
|
};
|
|
23
|
+
export type QueuedHistoryMutation = {
|
|
24
|
+
kind: 'synchronous';
|
|
25
|
+
execute: () => void;
|
|
26
|
+
} | {
|
|
27
|
+
kind: 'asynchronous';
|
|
28
|
+
execute: () => Promise<void>;
|
|
29
|
+
resolve: () => void;
|
|
30
|
+
reject: (error: unknown) => void;
|
|
31
|
+
};
|
|
22
32
|
export declare function combineMutationFailures(primary: MutationFailure, queued: MutationFailure): MutationFailure;
|
|
33
|
+
/**
|
|
34
|
+
* Runs every prepared effect's finalizer, collecting failures so one bad
|
|
35
|
+
* finalizer cannot hide the others.
|
|
36
|
+
*/
|
|
37
|
+
export declare function finalizeMutationEffects(effects: readonly PreparedHistoryBatchEffect[]): Promise<void>;
|
|
@@ -23,4 +23,26 @@ export function combineMutationFailures(primary, queued) {
|
|
|
23
23
|
error: new AggregateError([primary.error, queued.error], 'Multiple history mutations failed'),
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Runs every prepared effect's finalizer, collecting failures so one bad
|
|
28
|
+
* finalizer cannot hide the others.
|
|
29
|
+
*/
|
|
30
|
+
export async function finalizeMutationEffects(effects) {
|
|
31
|
+
const failures = [];
|
|
32
|
+
for (const effect of effects) {
|
|
33
|
+
if (effect.finalize === undefined)
|
|
34
|
+
continue;
|
|
35
|
+
try {
|
|
36
|
+
await effect.finalize();
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
failures.push(error);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (failures.length === 1)
|
|
43
|
+
throw failures[0];
|
|
44
|
+
if (failures.length > 1) {
|
|
45
|
+
throw new AggregateError(failures, 'History mutation finalization failed');
|
|
46
|
+
}
|
|
47
|
+
}
|
|
26
48
|
//# sourceMappingURL=historyMutationFailure.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyMutationFailure.js","sourceRoot":"","sources":["../../../../src/services/history/historyMutationFailure.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"historyMutationFailure.js","sourceRoot":"","sources":["../../../../src/services/history/historyMutationFailure.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAiBH,MAAM,UAAU,uBAAuB,CACrC,OAAwB,EACxB,MAAuB;IAEvB,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,OAAO,CAAC;IACnC,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,IAAI,cAAc,CACvB,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAC7B,mCAAmC,CACpC;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAA8C;IAE9C,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS;YAAE,SAAS;QAC5C,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,cAAc,CAAC,QAAQ,EAAE,sCAAsC,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC"}
|
|
@@ -22,7 +22,7 @@ import type { DebugLogger } from '../../debug/index.js';
|
|
|
22
22
|
* 2. Ensure every tool response has a matching tool call.
|
|
23
23
|
* 3. Ensure every tool call has a matching tool response.
|
|
24
24
|
* 4. Ensure tool responses are adjacent to their tool calls.
|
|
25
|
-
* 5.
|
|
25
|
+
* 5. Sanitize provider history for serialization.
|
|
26
26
|
*/
|
|
27
27
|
export declare function buildProviderContent(curated: IContent[], tailContents: IContent[], logger: DebugLogger): IContent[];
|
|
28
28
|
/**
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { HistoryToolNormalization } from './historyToolNormalization.js';
|
|
17
|
-
import {
|
|
17
|
+
import { sanitizeProviderHistoryForSerialization } from './historyCloneUtils.js';
|
|
18
18
|
/**
|
|
19
19
|
* Build a provider-ready content array from curated history and optional tail
|
|
20
20
|
* contents. This runs the multi-step normalization pipeline:
|
|
@@ -22,7 +22,7 @@ import { deepCloneWithoutCircularRefs } from './historyCloneUtils.js';
|
|
|
22
22
|
* 2. Ensure every tool response has a matching tool call.
|
|
23
23
|
* 3. Ensure every tool call has a matching tool response.
|
|
24
24
|
* 4. Ensure tool responses are adjacent to their tool calls.
|
|
25
|
-
* 5.
|
|
25
|
+
* 5. Sanitize provider history for serialization.
|
|
26
26
|
*/
|
|
27
27
|
export function buildProviderContent(curated, tailContents, logger) {
|
|
28
28
|
const combined = tailContents.length > 0 ? [...curated, ...tailContents] : curated;
|
|
@@ -43,8 +43,18 @@ export function buildProviderContent(curated, tailContents, logger) {
|
|
|
43
43
|
// contain duplicate or out-of-order tool results, which will 400 on provider
|
|
44
44
|
// switching. Normalize ordering and drop dupes.
|
|
45
45
|
const ordered = HistoryToolNormalization.ensureToolResponseAdjacency(completed, logger);
|
|
46
|
-
//
|
|
47
|
-
//
|
|
48
|
-
|
|
46
|
+
// Sanitize cyclic tool payloads while isolating prepared provider contents
|
|
47
|
+
// from the stored history references.
|
|
48
|
+
const sanitized = sanitizeProviderHistoryForSerialization(ordered);
|
|
49
|
+
const inputAnchorIndexes = combined.flatMap((content, index) => content.metadata?.cacheAnchor === true ? [index] : []);
|
|
50
|
+
const outputHasAnchor = sanitized.some((content) => content.metadata?.cacheAnchor === true);
|
|
51
|
+
if (inputAnchorIndexes.length > 0 && !outputHasAnchor) {
|
|
52
|
+
logger.warn('Provider history normalization removed a cache anchor', {
|
|
53
|
+
inputAnchorIndexes,
|
|
54
|
+
inputContentCount: combined.length,
|
|
55
|
+
outputContentCount: sanitized.length,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
return sanitized;
|
|
49
59
|
}
|
|
50
60
|
//# sourceMappingURL=historyProviderPipeline.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyProviderPipeline.js","sourceRoot":"","sources":["../../../../src/services/history/historyProviderPipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"historyProviderPipeline.js","sourceRoot":"","sources":["../../../../src/services/history/historyProviderPipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,uCAAuC,EAAE,MAAM,wBAAwB,CAAC;AAEjF;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAmB,EACnB,YAAwB,EACxB,MAAmB;IAEnB,MAAM,QAAQ,GACZ,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAEpE,uEAAuE;IACvE,yEAAyE;IACzE,0EAA0E;IAC1E,4BAA4B;IAC5B,MAAM,KAAK,GACT,wBAAwB,CAAC,+BAA+B,CAAC,QAAQ,CAAC,CAAC;IAErE,iFAAiF;IACjF,MAAM,UAAU,GAAG,wBAAwB,CAAC,wBAAwB,CAClE,KAAK,EACL,MAAM,CACP,CAAC;IAEF,0EAA0E;IAC1E,qEAAqE;IACrE,2EAA2E;IAC3E,qEAAqE;IACrE,MAAM,SAAS,GACb,wBAAwB,CAAC,8BAA8B,CAAC,UAAU,CAAC,CAAC;IAEtE,wEAAwE;IACxE,0EAA0E;IAC1E,6EAA6E;IAC7E,gDAAgD;IAChD,MAAM,OAAO,GAAG,wBAAwB,CAAC,2BAA2B,CAClE,SAAS,EACT,MAAM,CACP,CAAC;IAEF,2EAA2E;IAC3E,sCAAsC;IACtC,MAAM,SAAS,GAAG,uCAAuC,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAC7D,OAAO,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACtD,CAAC;IACF,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CACpD,CAAC;IACF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,uDAAuD,EAAE;YACnE,kBAAkB;YAClB,iBAAiB,EAAE,QAAQ,CAAC,MAAM;YAClC,kBAAkB,EAAE,SAAS,CAAC,MAAM;SACrC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -88,13 +88,17 @@ export function serializeWireContentForEstimate(content) {
|
|
|
88
88
|
* provider family. This is independent of the text tokenizer and cannot throw,
|
|
89
89
|
* so it is added outside the tokenizer try/catch in {@link estimateContentTokens}.
|
|
90
90
|
*/
|
|
91
|
-
function estimateMediaBlockImageTokens(block, provider) {
|
|
91
|
+
function estimateMediaBlockImageTokens(block, provider, model) {
|
|
92
92
|
if (!block.mimeType.toLowerCase().startsWith('image/'))
|
|
93
93
|
return 0;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
94
|
+
let dimensions;
|
|
95
|
+
if (block.encoding === 'reference') {
|
|
96
|
+
dimensions = block.dimensions;
|
|
97
|
+
}
|
|
98
|
+
else if (block.encoding === 'base64') {
|
|
99
|
+
dimensions = parseImageDimensionsFromBase64(block.data) ?? block.dimensions;
|
|
100
|
+
}
|
|
101
|
+
return estimateImageTokens({ provider, dimensions, model });
|
|
98
102
|
}
|
|
99
103
|
/**
|
|
100
104
|
* Estimate token count for a single content entry using the provided tokenizer.
|
|
@@ -104,7 +108,7 @@ export async function estimateContentTokens(content, modelName, tokenizerProvide
|
|
|
104
108
|
let totalTokens = 0;
|
|
105
109
|
for (const block of content.blocks) {
|
|
106
110
|
if (block.type === 'media') {
|
|
107
|
-
totalTokens += estimateMediaBlockImageTokens(block, tokenizerProvider.activeProvider);
|
|
111
|
+
totalTokens += estimateMediaBlockImageTokens(block, tokenizerProvider.activeProvider, modelName);
|
|
108
112
|
}
|
|
109
113
|
const blockText = blockToEstimationText(block, logger);
|
|
110
114
|
if (!blockText) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"historyTokenEstimation.js","sourceRoot":"","sources":["../../../../src/services/history/historyTokenEstimation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAWH,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4DAA4D,CAAC;AAEjG;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,YAAgC,EAChC,YAAgC;IAEhC,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,0BAA0B,CAAC,IAAY;IACrD,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC;IACpB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IAC3C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,uFAAuF;AACvF,SAAS,iBAAiB,CAAC,KAAc,EAAE,QAAgB;IACzD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,0BAA0B,CAAC,KAAmB;IAC5D,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,KAAK,WAAW;YACd,OAAO,iBAAiB,CACtB;gBACE,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,EACD,cAAc,KAAK,CAAC,IAAI,EAAE,CAC3B,CAAC;QACJ,KAAK,eAAe;YAClB,OAAO,iBAAiB,CACtB;gBACE,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;aACnB,EACD,kBAAkB,KAAK,CAAC,QAAQ,IAAI,SAAS,EAAE,CAChD,CAAC;QACJ,KAAK,UAAU;YACb,OAAO,KAAK,CAAC,OAAO,CAAC;QACvB,KAAK,MAAM;YACT,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,KAAK,OAAO;YACV,OAAO,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;QAC7B;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,+BAA+B,CAAC,OAAiB;IAC/D,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAC9E,CAAC;AAaD;;;;GAIG;AACH,SAAS,6BAA6B,CACpC,KAAiB,EACjB,QAA4B;
|
|
1
|
+
{"version":3,"file":"historyTokenEstimation.js","sourceRoot":"","sources":["../../../../src/services/history/historyTokenEstimation.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,8 @@ export declare class HistoryToolNormalization {
|
|
|
68
68
|
private static replaceDuplicateResponse;
|
|
69
69
|
/** Assign media blocks to a tool-call index, if not already assigned. */
|
|
70
70
|
private static assignMedia;
|
|
71
|
+
/** Return the source only when the output exactly retains one adjacent tool content. */
|
|
72
|
+
private static retainedAdjacentSource;
|
|
71
73
|
/** Reassemble stripped contents with tool responses after their tool-call messages. */
|
|
72
74
|
private static reassembleAdjacencyResult;
|
|
73
75
|
}
|
|
@@ -205,7 +205,7 @@ export class HistoryToolNormalization {
|
|
|
205
205
|
keptResponseByCallId: new Map(),
|
|
206
206
|
};
|
|
207
207
|
const strippedContents = contents.map((content) => HistoryToolNormalization.stripSingleContent(content, toolCallIndexById, maps, logger));
|
|
208
|
-
return HistoryToolNormalization.reassembleAdjacencyResult(strippedContents,
|
|
208
|
+
return HistoryToolNormalization.reassembleAdjacencyResult(strippedContents, contents, maps);
|
|
209
209
|
}
|
|
210
210
|
/** Build a map from tool call ID to the index of the content containing it. */
|
|
211
211
|
static buildToolCallIndexById(contents) {
|
|
@@ -322,24 +322,41 @@ export class HistoryToolNormalization {
|
|
|
322
322
|
]);
|
|
323
323
|
return toolCallIndex;
|
|
324
324
|
}
|
|
325
|
+
/** Return the source only when the output exactly retains one adjacent tool content. */
|
|
326
|
+
static retainedAdjacentSource(toolCallIndex, sourceContents, assembledBlocks) {
|
|
327
|
+
const source = sourceContents[toolCallIndex + 1];
|
|
328
|
+
if (source === undefined ||
|
|
329
|
+
source.speaker !== 'tool' ||
|
|
330
|
+
!hasValidBlocks(source) ||
|
|
331
|
+
source.blocks.some((block) => block.type !== 'tool_response' && block.type !== 'media')) {
|
|
332
|
+
return undefined;
|
|
333
|
+
}
|
|
334
|
+
const retainsOrderedBlocks = assembledBlocks.length === source.blocks.length &&
|
|
335
|
+
assembledBlocks.every((block, index) => block === source.blocks[index]);
|
|
336
|
+
return retainsOrderedBlocks ? source : undefined;
|
|
337
|
+
}
|
|
325
338
|
/** Reassemble stripped contents with tool responses after their tool-call messages. */
|
|
326
|
-
static reassembleAdjacencyResult(strippedContents,
|
|
339
|
+
static reassembleAdjacencyResult(strippedContents, sourceContents, maps) {
|
|
327
340
|
const result = [];
|
|
328
341
|
for (let i = 0; i < strippedContents.length; i++) {
|
|
329
342
|
const content = strippedContents[i];
|
|
330
343
|
if (content) {
|
|
331
344
|
result.push(content);
|
|
332
345
|
}
|
|
333
|
-
const responses = responsesByToolCallIndex.get(i);
|
|
346
|
+
const responses = maps.responsesByToolCallIndex.get(i);
|
|
334
347
|
if (responses && responses.length > 0) {
|
|
335
|
-
const mediaForThisIndex = mediaBlocksByToolCallIndex.get(i) ?? [];
|
|
348
|
+
const mediaForThisIndex = maps.mediaBlocksByToolCallIndex.get(i) ?? [];
|
|
349
|
+
const assembledBlocks = [...responses, ...mediaForThisIndex];
|
|
350
|
+
const retainedSource = HistoryToolNormalization.retainedAdjacentSource(i, sourceContents, assembledBlocks);
|
|
336
351
|
result.push({
|
|
337
352
|
speaker: 'tool',
|
|
338
|
-
blocks:
|
|
339
|
-
metadata:
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
353
|
+
blocks: assembledBlocks,
|
|
354
|
+
metadata: retainedSource
|
|
355
|
+
? retainedSource.metadata
|
|
356
|
+
: {
|
|
357
|
+
synthetic: true,
|
|
358
|
+
reason: 'reordered_tool_responses',
|
|
359
|
+
},
|
|
343
360
|
});
|
|
344
361
|
}
|
|
345
362
|
}
|