@octopi-agent/engine 0.98.4 → 0.121.10
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/builtin-model-info.js +28 -7
- package/dist/config-admin/agent-presets.d.ts +32 -0
- package/dist/config-admin/agent-presets.js +133 -0
- package/dist/config-admin/discover.d.ts +33 -4
- package/dist/config-admin/discover.js +101 -6
- package/dist/config-admin/env.d.ts +11 -0
- package/dist/config-admin/env.js +41 -0
- package/dist/config-admin/error-copy.d.ts +106 -0
- package/dist/config-admin/error-copy.js +287 -0
- package/dist/config-admin/i18n.d.ts +21 -0
- package/dist/config-admin/i18n.js +19 -0
- package/dist/config-admin/index.d.ts +6 -2
- package/dist/config-admin/index.js +3 -1
- package/dist/config-admin/model-presets.d.ts +14 -0
- package/dist/config-admin/model-presets.js +595 -70
- package/dist/config-admin/onboarding-apply.d.ts +71 -0
- package/dist/config-admin/onboarding-apply.js +235 -0
- package/dist/config-admin/onboarding.d.ts +154 -0
- package/dist/config-admin/onboarding.js +270 -0
- package/dist/config-admin/redact.d.ts +42 -9
- package/dist/config-admin/redact.js +69 -5
- package/dist/config-schema/agent.d.ts +40 -6
- package/dist/config-schema/agent.js +44 -6
- package/dist/config-schema/browser.d.ts +62 -0
- package/dist/config-schema/browser.js +89 -0
- package/dist/config-schema/context.d.ts +12 -37
- package/dist/config-schema/context.js +10 -31
- package/dist/config-schema/engine.d.ts +140 -164
- package/dist/config-schema/engine.js +10 -7
- package/dist/config-schema/governance.d.ts +20 -2
- package/dist/config-schema/governance.js +18 -3
- package/dist/config-schema/models.d.ts +10 -12
- package/dist/config-schema/models.js +16 -3
- package/dist/config-schema/run.d.ts +6 -2
- package/dist/config-schema/run.js +12 -2
- package/dist/config-schema/shared.d.ts +1 -3
- package/dist/config-schema/shared.js +4 -4
- package/dist/config-schema/substrate.d.ts +19 -88
- package/dist/config-schema/substrate.js +30 -107
- package/dist/config.d.ts +161 -123
- package/dist/config.js +109 -7
- package/dist/file-mode.d.ts +67 -0
- package/dist/file-mode.js +182 -0
- package/dist/fork-child.d.ts +82 -0
- package/dist/fork-child.js +123 -0
- package/dist/harness/activation/delegated-run.d.ts +42 -0
- package/dist/harness/activation/delegated-run.js +71 -0
- package/dist/harness/activation/dispatcher.js +11 -0
- package/dist/harness/activation/inbox.d.ts +3 -3
- package/dist/harness/activation/inbox.js +3 -3
- package/dist/harness/activation/index.d.ts +1 -0
- package/dist/harness/activation/run-backend.d.ts +92 -0
- package/dist/harness/activation/run-backend.js +16 -0
- package/dist/harness/activation/run-protocol.d.ts +392 -0
- package/dist/harness/activation/run-protocol.js +19 -0
- package/dist/harness/activation/runtime.d.ts +33 -0
- package/dist/harness/activation/runtime.js +130 -31
- package/dist/harness/activation/types.d.ts +20 -3
- package/dist/harness/agent/builder.d.ts +36 -3
- package/dist/harness/agent/builder.js +206 -46
- package/dist/harness/agent/config-bridge.d.ts +10 -1
- package/dist/harness/agent/config-bridge.js +24 -5
- package/dist/harness/agent/config-integrity.js +19 -2
- package/dist/harness/agent/registered-tool-adapter.d.ts +27 -0
- package/dist/harness/agent/registered-tool-adapter.js +67 -0
- package/dist/harness/agent/wire-agent-builder.d.ts +13 -3
- package/dist/harness/agent/wire-agent-builder.js +35 -9
- package/dist/harness/capabilities/document/backends/plain.js +2 -1
- package/dist/harness/capabilities/document/factory.d.ts +5 -0
- package/dist/harness/capabilities/document/factory.js +1 -0
- package/dist/harness/capabilities/document/legacy/factory.js +3 -2
- package/dist/harness/capabilities/document/port.js +6 -3
- package/dist/harness/capabilities/document/types.d.ts +5 -0
- package/dist/harness/collaboration/autonomous-subsystem/audit/reader.d.ts +17 -0
- package/dist/harness/collaboration/autonomous-subsystem/audit/reader.js +66 -36
- package/dist/harness/collaboration/autonomous-subsystem/audit/writer.d.ts +6 -2
- package/dist/harness/collaboration/autonomous-subsystem/audit/writer.js +27 -7
- package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.js +13 -0
- package/dist/harness/collaboration/autonomous-subsystem/loader.js +2 -1
- package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +11 -0
- package/dist/harness/collaboration/autonomous-subsystem/runtime.js +17 -0
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.d.ts +14 -4
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.js +50 -41
- package/dist/harness/collaboration/autonomous-subsystem/sense/input-builder.js +4 -4
- package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.d.ts +2 -2
- package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.js +2 -2
- package/dist/harness/collaboration/autonomous-subsystem/signal/bus.d.ts +6 -0
- package/dist/harness/collaboration/autonomous-subsystem/signal/bus.js +25 -4
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +4 -1
- package/dist/harness/collaboration/autonomous-subsystem/types.d.ts +7 -3
- package/dist/harness/collaboration/delegation/child-run.d.ts +10 -1
- package/dist/harness/collaboration/delegation/child-run.js +38 -6
- package/dist/harness/collaboration/delegation/index.d.ts +1 -1
- package/dist/harness/collaboration/delegation/index.js +1 -1
- package/dist/harness/collaboration/delegation/notifier.d.ts +6 -1
- package/dist/harness/collaboration/delegation/notifier.js +8 -1
- package/dist/harness/collaboration/delegation/registry-types.d.ts +2 -0
- package/dist/harness/collaboration/delegation/service.d.ts +11 -4
- package/dist/harness/collaboration/delegation/service.js +35 -13
- package/dist/harness/collaboration/delegation/store.d.ts +4 -0
- package/dist/harness/collaboration/delegation/store.js +3 -1
- package/dist/harness/collaboration/delegation/types.d.ts +34 -2
- package/dist/harness/collaboration/delegation/types.js +22 -0
- package/dist/harness/collaboration/delegation/wiring.d.ts +2 -0
- package/dist/harness/collaboration/delegation/wiring.js +12 -1
- package/dist/harness/context/budget-allocator.d.ts +26 -18
- package/dist/harness/context/budget-allocator.js +67 -32
- package/dist/harness/context/capabilities/compact/engine.d.ts +44 -11
- package/dist/harness/context/capabilities/compact/engine.js +296 -160
- package/dist/harness/context/capabilities/compact/handover.d.ts +5 -3
- package/dist/harness/context/capabilities/compact/handover.js +7 -5
- package/dist/harness/context/capabilities/compact/index.d.ts +7 -2
- package/dist/harness/context/capabilities/compact/index.js +5 -1
- package/dist/harness/context/capabilities/compact/mechanical.d.ts +130 -0
- package/dist/harness/context/capabilities/compact/mechanical.js +268 -0
- package/dist/harness/context/capabilities/compact/messages.d.ts +60 -0
- package/dist/harness/context/capabilities/compact/messages.js +91 -0
- package/dist/harness/context/capabilities/compact/types.d.ts +134 -19
- package/dist/harness/context/capabilities/compact/types.js +11 -1
- package/dist/harness/context/capabilities/compact/view-split.d.ts +36 -0
- package/dist/harness/context/capabilities/compact/view-split.js +72 -0
- package/dist/harness/context/capabilities/summary/gate.d.ts +19 -2
- package/dist/harness/context/capabilities/summary/gate.js +53 -6
- package/dist/harness/context/capabilities/summary/port.js +0 -1
- package/dist/harness/context/capabilities/summary/registry.js +20 -0
- package/dist/harness/context/capabilities/summary/resolver.d.ts +1 -1
- package/dist/harness/context/capabilities/summary/resolver.js +1 -6
- package/dist/harness/context/capabilities/summary/tool-binding.d.ts +1 -1
- package/dist/harness/context/capabilities/summary/tool-binding.js +16 -12
- package/dist/harness/context/capabilities/summary/tool-bindings.d.ts +13 -0
- package/dist/harness/context/capabilities/summary/tool-bindings.js +22 -0
- package/dist/harness/context/capabilities/summary/types.d.ts +19 -6
- package/dist/harness/context/constitution/default-agents.md +85 -0
- package/dist/harness/context/context-size-ledger.d.ts +143 -0
- package/dist/harness/context/context-size-ledger.js +243 -0
- package/dist/harness/context/default-context-engine.d.ts +290 -120
- package/dist/harness/context/default-context-engine.js +1555 -764
- package/dist/harness/context/index.d.ts +3 -2
- package/dist/harness/context/index.js +2 -1
- package/dist/harness/context/layer-health.d.ts +4 -0
- package/dist/harness/context/layer-health.js +4 -0
- package/dist/harness/context/layer-types.d.ts +72 -0
- package/dist/harness/context/layer-types.js +87 -2
- package/dist/harness/context/layers.d.ts +17 -15
- package/dist/harness/context/layers.js +54 -17
- package/dist/harness/context/message-selector.d.ts +10 -8
- package/dist/harness/context/message-selector.js +49 -27
- package/dist/harness/context/prefix-fingerprint.d.ts +46 -0
- package/dist/harness/context/prefix-fingerprint.js +52 -0
- package/dist/harness/context/summarize.d.ts +2 -2
- package/dist/harness/context/summarize.js +27 -2
- package/dist/harness/context/system-prompt-assembler.d.ts +4 -0
- package/dist/harness/context/system-prompt-assembler.js +7 -3
- package/dist/harness/context/token-constants.d.ts +8 -6
- package/dist/harness/context/token-constants.js +8 -7
- package/dist/harness/context/token-estimate-fns.d.ts +37 -27
- package/dist/harness/context/token-estimate-fns.js +85 -66
- package/dist/harness/context/token-estimator.d.ts +27 -12
- package/dist/harness/context/token-estimator.js +120 -66
- package/dist/harness/context/token-segments.d.ts +88 -0
- package/dist/harness/context/token-segments.js +103 -0
- package/dist/harness/context/tool-result-aging.d.ts +109 -16
- package/dist/harness/context/tool-result-aging.js +220 -55
- package/dist/harness/context/tool-result-body.js +2 -0
- package/dist/harness/context/transform/anchors.d.ts +66 -0
- package/dist/harness/context/transform/anchors.js +125 -0
- package/dist/harness/context/transform/fold.d.ts +56 -0
- package/dist/harness/context/transform/fold.js +135 -0
- package/dist/harness/context/transform/migrate.d.ts +41 -0
- package/dist/harness/context/transform/migrate.js +69 -0
- package/dist/harness/context/transform/types.d.ts +129 -0
- package/dist/harness/context/transform/types.js +19 -0
- package/dist/harness/context/turn-envelope.d.ts +6 -3
- package/dist/harness/context/types.d.ts +196 -119
- package/dist/harness/context/types.js +25 -1
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +4 -3
- package/dist/harness/extension/execution-environment/effect-policy.js +2 -2
- package/dist/harness/extension/execution-environment/ops-audit.d.ts +1 -1
- package/dist/harness/extension/execution-environment/privileged-exec.js +4 -1
- package/dist/harness/extension/execution-environment/resource-limits.d.ts +1 -1
- package/dist/harness/extension/execution-environment/resource-limits.js +1 -1
- package/dist/harness/extension/execution-environment/workspace.js +1 -1
- package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +28 -2
- package/dist/harness/extension/plugin-ecosystem/channel-types.js +11 -2
- package/dist/harness/extension/plugin-ecosystem/client-tools/registry.d.ts +12 -0
- package/dist/harness/extension/plugin-ecosystem/client-tools/registry.js +25 -0
- package/dist/harness/extension/plugin-ecosystem/commands/builtin.js +28 -1
- package/dist/harness/extension/plugin-ecosystem/commands/index.d.ts +3 -1
- package/dist/harness/extension/plugin-ecosystem/commands/index.js +1 -0
- package/dist/harness/extension/plugin-ecosystem/commands/plugin-bridge.d.ts +12 -1
- package/dist/harness/extension/plugin-ecosystem/commands/plugin-bridge.js +14 -4
- package/dist/harness/extension/plugin-ecosystem/commands/router.d.ts +5 -4
- package/dist/harness/extension/plugin-ecosystem/commands/router.js +23 -14
- package/dist/harness/extension/plugin-ecosystem/commands/types.d.ts +8 -1
- package/dist/harness/extension/plugin-ecosystem/commands/types.js +2 -1
- package/dist/harness/extension/plugin-ecosystem/hooks/adapter.d.ts +54 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/adapter.js +397 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/compaction-integration.d.ts +16 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/compaction-integration.js +66 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/index.d.ts +4 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/index.js +2 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/iteration-snapshot.d.ts +11 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/iteration-snapshot.js +54 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/journal.d.ts +9 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/journal.js +22 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/policy-error.d.ts +12 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/policy-error.js +19 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/run-integration.d.ts +36 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/run-integration.js +338 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/services.d.ts +24 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/services.js +139 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/types.d.ts +229 -0
- package/dist/harness/extension/plugin-ecosystem/hooks/types.js +1 -0
- package/dist/harness/extension/plugin-ecosystem/index.d.ts +1 -0
- package/dist/harness/extension/plugin-ecosystem/index.js +1 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/api.d.ts +223 -222
- package/dist/harness/extension/plugin-ecosystem/plugins/api.js +218 -203
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-instances.d.ts +95 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-instances.js +170 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-kinds.d.ts +178 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-kinds.js +314 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-registry.d.ts +78 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-registry.js +80 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/engine-compatibility.d.ts +4 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/engine-compatibility.js +18 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/entry.d.ts +7 -85
- package/dist/harness/extension/plugin-ecosystem/plugins/entry.js +8 -50
- package/dist/harness/extension/plugin-ecosystem/plugins/index.d.ts +6 -23
- package/dist/harness/extension/plugin-ecosystem/plugins/index.js +3 -23
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.d.ts +57 -114
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.js +279 -282
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.d.ts +46 -484
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.js +123 -345
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.d.ts +50 -223
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.js +144 -20
- package/dist/harness/extension/plugin-ecosystem/plugins/staging.d.ts +17 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/staging.js +15 -0
- package/dist/harness/extension/plugin-ecosystem/skills/manager.d.ts +6 -1
- package/dist/harness/extension/plugin-ecosystem/skills/manager.js +17 -1
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.d.ts +3 -0
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +46 -21
- package/dist/harness/extension/plugin-ecosystem/tools/browser-types.d.ts +333 -0
- package/dist/harness/extension/plugin-ecosystem/tools/browser-types.js +16 -0
- package/dist/harness/extension/plugin-ecosystem/tools/browser.d.ts +64 -0
- package/dist/harness/extension/plugin-ecosystem/tools/browser.js +692 -0
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +0 -37
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +108 -4
- package/dist/harness/extension/plugin-ecosystem/tools/delegation.js +36 -8
- package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +34 -0
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.d.ts +0 -6
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +57 -4
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +81 -13
- package/dist/harness/extension/plugin-ecosystem/tools/http.js +5 -0
- package/dist/harness/extension/plugin-ecosystem/tools/knowledge.js +13 -7
- package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +126 -14
- package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +1 -1
- package/dist/harness/extension/plugin-ecosystem/tools/platform.js +44 -5
- package/dist/harness/extension/plugin-ecosystem/tools/plugin-tool.d.ts +11 -0
- package/dist/harness/extension/plugin-ecosystem/tools/plugin-tool.js +39 -0
- package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.d.ts +1 -1
- package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.js +19 -24
- package/dist/harness/extension/plugin-ecosystem/tools/tool-set.d.ts +7 -0
- package/dist/harness/extension/plugin-ecosystem/tools/tool-set.js +4 -0
- package/dist/harness/governance/accounting/usage-ledger.d.ts +13 -1
- package/dist/harness/governance/accounting/usage-ledger.js +23 -1
- package/dist/harness/governance/credentials/db.d.ts +9 -0
- package/dist/harness/governance/credentials/db.js +122 -31
- package/dist/harness/governance/credentials/store.d.ts +68 -7
- package/dist/harness/governance/credentials/store.js +177 -64
- package/dist/harness/governance/credentials/types.d.ts +13 -2
- package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +3 -3
- package/dist/harness/governance/human-in-the-loop/decision-cache.js +2 -2
- package/dist/harness/governance/index.d.ts +1 -0
- package/dist/harness/governance/index.js +1 -0
- package/dist/harness/governance/registry/db.d.ts +32 -0
- package/dist/harness/governance/registry/db.js +142 -0
- package/dist/harness/governance/registry/index.d.ts +9 -0
- package/dist/harness/governance/registry/index.js +9 -0
- package/dist/harness/governance/registry/service.d.ts +381 -0
- package/dist/harness/governance/registry/service.js +825 -0
- package/dist/harness/governance/registry/types.d.ts +77 -0
- package/dist/harness/governance/registry/types.js +7 -0
- package/dist/harness/governance/security/capability-enforcer.js +1 -2
- package/dist/harness/governance/security/default-security-guard.d.ts +3 -0
- package/dist/harness/governance/security/default-security-guard.js +12 -1
- package/dist/harness/governance/security/risk-evaluator.d.ts +13 -3
- package/dist/harness/governance/security/risk-evaluator.js +307 -21
- package/dist/harness/governance/security/shell-parser-treesitter.js +12 -4
- package/dist/harness/governance/session-acl/tool-rights.d.ts +1 -0
- package/dist/harness/index.d.ts +17 -15
- package/dist/harness/index.js +9 -9
- package/dist/harness/knowledge/boot-config.d.ts +57 -0
- package/dist/harness/knowledge/boot-config.js +52 -0
- package/dist/harness/knowledge/catalog-types.d.ts +2 -0
- package/dist/harness/knowledge/client.d.ts +77 -9
- package/dist/harness/knowledge/client.js +95 -24
- package/dist/harness/knowledge/db.d.ts +16 -0
- package/dist/harness/knowledge/db.js +112 -41
- package/dist/harness/knowledge/describe-sample.d.ts +23 -0
- package/dist/harness/knowledge/describe-sample.js +58 -0
- package/dist/harness/knowledge/describe.d.ts +8 -0
- package/dist/harness/knowledge/describe.js +18 -2
- package/dist/harness/knowledge/engine-thread.js +11 -7
- package/dist/harness/knowledge/grounding.js +7 -2
- package/dist/harness/knowledge/http-app.d.ts +15 -0
- package/dist/harness/knowledge/http-app.js +117 -25
- package/dist/harness/knowledge/http-bridge.d.ts +15 -0
- package/dist/harness/knowledge/http-bridge.js +19 -0
- package/dist/harness/knowledge/http-params.d.ts +18 -0
- package/dist/harness/knowledge/http-params.js +24 -0
- package/dist/harness/knowledge/index.d.ts +2 -0
- package/dist/harness/knowledge/index.js +1 -0
- package/dist/harness/knowledge/knowledge-serve-child.js +5 -3
- package/dist/harness/knowledge/purge.js +5 -2
- package/dist/harness/knowledge/query-service.d.ts +25 -4
- package/dist/harness/knowledge/query-service.js +79 -43
- package/dist/harness/knowledge/query-worker-client.d.ts +14 -2
- package/dist/harness/knowledge/query-worker-client.js +8 -3
- package/dist/harness/knowledge/query-worker.js +9 -5
- package/dist/harness/knowledge/read-http.d.ts +2 -0
- package/dist/harness/knowledge/read-http.js +14 -3
- package/dist/harness/knowledge/retriever.d.ts +1 -1
- package/dist/harness/knowledge/retriever.js +1 -2
- package/dist/harness/knowledge/serve.d.ts +14 -8
- package/dist/harness/knowledge/serve.js +14 -6
- package/dist/harness/knowledge/source-store.d.ts +101 -5
- package/dist/harness/knowledge/source-store.js +323 -74
- package/dist/harness/knowledge/start-service-process.d.ts +41 -14
- package/dist/harness/knowledge/start-service-process.js +67 -96
- package/dist/harness/knowledge/tenant-gate.d.ts +81 -0
- package/dist/harness/knowledge/tenant-gate.js +167 -0
- package/dist/harness/knowledge/types.d.ts +7 -0
- package/dist/harness/knowledge/writer-service.d.ts +55 -11
- package/dist/harness/knowledge/writer-service.js +200 -30
- package/dist/harness/knowledge/writer-worker-client.d.ts +19 -11
- package/dist/harness/knowledge/writer-worker-client.js +40 -5
- package/dist/harness/knowledge/writer-worker.js +20 -5
- package/dist/harness/memory/backfill-trigger.d.ts +10 -3
- package/dist/harness/memory/backfill-trigger.js +19 -19
- package/dist/harness/memory/cognition-seeds.d.ts +45 -0
- package/dist/harness/memory/cognition-seeds.js +67 -0
- package/dist/harness/memory/cognition.d.ts +12 -3
- package/dist/harness/memory/cognition.js +55 -35
- package/dist/harness/memory/conceptualizer.d.ts +11 -1
- package/dist/harness/memory/conceptualizer.js +10 -1
- package/dist/harness/memory/context-slice.d.ts +42 -0
- package/dist/harness/memory/context-slice.js +197 -0
- package/dist/harness/memory/health-probe.d.ts +8 -2
- package/dist/harness/memory/health-probe.js +10 -13
- package/dist/harness/memory/index.d.ts +5 -1
- package/dist/harness/memory/index.js +3 -1
- package/dist/harness/memory/sqlite/agent-db.d.ts +1 -0
- package/dist/harness/memory/sqlite/agent-db.js +9 -8
- package/dist/harness/memory/sqlite/cognition-store.d.ts +26 -3
- package/dist/harness/memory/sqlite/cognition-store.js +103 -45
- package/dist/harness/memory/sqlite/memory-store.js +4 -0
- package/dist/harness/memory/sqlite/sqlite-vec.d.ts +24 -1
- package/dist/harness/memory/sqlite/sqlite-vec.js +37 -1
- package/dist/harness/memory/sqlite/wisdom-store.js +35 -10
- package/dist/harness/memory/types.d.ts +24 -6
- package/dist/harness/memory/wisdom-formation.d.ts +14 -3
- package/dist/harness/memory/wisdom-formation.js +85 -22
- package/dist/harness/memory/wisdom-gates.d.ts +14 -0
- package/dist/harness/memory/wisdom-gates.js +59 -19
- package/dist/harness/memory/wisdom.js +9 -0
- package/dist/harness/observability/observer/hub.d.ts +10 -0
- package/dist/harness/observability/observer/hub.js +120 -17
- package/dist/harness/observability/observer/types.d.ts +10 -6
- package/dist/harness/run/agent/agent.d.ts +40 -21
- package/dist/harness/run/agent/agent.js +67 -13
- package/dist/harness/run/agent/index.d.ts +1 -1
- package/dist/harness/run/budget/budget.d.ts +28 -10
- package/dist/harness/run/budget/budget.js +38 -15
- package/dist/harness/run/concurrency/tool-validator.js +4 -3
- package/dist/harness/run/model/index.d.ts +3 -1
- package/dist/harness/run/model/index.js +2 -1
- package/dist/harness/run/model/resolver.d.ts +4 -1
- package/dist/harness/run/model/resolver.js +36 -2
- package/dist/harness/run/model/run-scope.d.ts +2 -0
- package/dist/harness/run/model/run-scope.js +7 -0
- package/dist/harness/run/model/types.d.ts +22 -5
- package/dist/harness/run/model/types.js +3 -2
- package/dist/harness/run/model/window-truth.d.ts +37 -0
- package/dist/harness/run/model/window-truth.js +39 -0
- package/dist/harness/run/reliability/context-length-feedback.d.ts +77 -0
- package/dist/harness/run/reliability/context-length-feedback.js +128 -0
- package/dist/harness/run/reliability/harness-events.d.ts +3 -3
- package/dist/harness/run/reliability/model-error-policy.js +4 -0
- package/dist/harness/run/reliability/run-agent.d.ts +32 -4
- package/dist/harness/run/reliability/run-agent.js +216 -63
- package/dist/harness/run/reliability/run-metrics-collector.d.ts +19 -8
- package/dist/harness/run/reliability/run-metrics-collector.js +38 -23
- package/dist/harness/run/run-guard/default-run-guard.js +8 -8
- package/dist/harness/run/run-host.d.ts +302 -0
- package/dist/harness/run/run-host.js +978 -0
- package/dist/harness/run/run-scope.d.ts +48 -4
- package/dist/harness/run/run-scope.js +19 -1
- package/dist/harness/run/runner.d.ts +181 -39
- package/dist/harness/run/runner.js +654 -119
- package/dist/harness/session/attachments/index.d.ts +1 -0
- package/dist/harness/session/attachments/index.js +1 -0
- package/dist/harness/session/attachments/inject.d.ts +21 -10
- package/dist/harness/session/attachments/inject.js +76 -24
- package/dist/harness/session/attachments/recall-index.d.ts +70 -0
- package/dist/harness/session/attachments/recall-index.js +219 -0
- package/dist/harness/session/attachments/service.d.ts +21 -0
- package/dist/harness/session/attachments/service.js +258 -139
- package/dist/harness/session/attachments/types.d.ts +6 -0
- package/dist/harness/session/in-memory-store.js +13 -1
- package/dist/harness/session/schedules/service.d.ts +10 -2
- package/dist/harness/session/schedules/service.js +13 -2
- package/dist/harness/session/tasks/tools.js +12 -0
- package/dist/harness/session/transform-store.d.ts +136 -0
- package/dist/harness/session/transform-store.js +302 -0
- package/dist/harness/session/types.d.ts +11 -15
- package/dist/harness/shared/events/agent-event-map.d.ts +75 -13
- package/dist/harness/shared/events/agent-event-map.js +3 -2
- package/dist/harness/shared/events/scenario-events.d.ts +6 -6
- package/dist/harness/shared/types/agent-definition.d.ts +7 -2
- package/dist/index.d.ts +16 -18
- package/dist/index.js +9 -10
- package/dist/integration/agent-runtime/channel-message-source.d.ts +3 -1
- package/dist/integration/agent-runtime/channel-message-source.js +4 -3
- package/dist/integration/browser/camoufox.d.ts +40 -0
- package/dist/integration/browser/camoufox.js +80 -0
- package/dist/integration/browser/index.d.ts +91 -0
- package/dist/integration/browser/index.js +110 -0
- package/dist/integration/browser/install.d.ts +47 -0
- package/dist/integration/browser/install.js +214 -0
- package/dist/integration/browser/playwright.d.ts +224 -0
- package/dist/integration/browser/playwright.js +925 -0
- package/dist/integration/browser/service.d.ts +41 -0
- package/dist/integration/browser/service.js +181 -0
- package/dist/integration/browser/stealth.d.ts +42 -0
- package/dist/integration/browser/stealth.js +104 -0
- package/dist/integration/observability/metrics.d.ts +6 -6
- package/dist/integration/observability/metrics.js +13 -13
- package/dist/integration/observability/observer-bridge.js +2 -2
- package/dist/integration/observability/trace-collector.d.ts +5 -5
- package/dist/integration/observability/trace-collector.js +34 -35
- package/dist/integration/observability/trace-events.d.ts +3 -3
- package/dist/integration/observability/trace-events.js +3 -3
- package/dist/integration/providers/anthropic-message-normalize.d.ts +20 -0
- package/dist/integration/providers/anthropic-message-normalize.js +48 -0
- package/dist/integration/providers/anthropic.js +41 -3
- package/dist/integration/providers/fetch-timeout.d.ts +17 -0
- package/dist/integration/providers/fetch-timeout.js +24 -0
- package/dist/integration/providers/openai.d.ts +8 -0
- package/dist/integration/providers/openai.js +48 -2
- package/dist/integration/providers/usage.d.ts +1 -1
- package/dist/integration/providers/wire-dump-diff.js +2 -1
- package/dist/integration/providers/wire-dump.d.ts +57 -3
- package/dist/integration/providers/wire-dump.js +119 -6
- package/dist/integration/storage/archive-manager.d.ts +20 -2
- package/dist/integration/storage/archive-manager.js +34 -8
- package/dist/integration/storage/atomic-tmp.d.ts +12 -0
- package/dist/integration/storage/atomic-tmp.js +36 -0
- package/dist/integration/storage/jsonl.d.ts +10 -1
- package/dist/integration/storage/jsonl.js +155 -54
- package/dist/integration/storage/session-index.d.ts +5 -0
- package/dist/integration/storage/session-index.js +25 -4
- package/dist/integration/tools/assemble.d.ts +50 -0
- package/dist/integration/tools/assemble.js +137 -0
- package/dist/paths.d.ts +18 -0
- package/dist/paths.js +36 -0
- package/dist/subsystems/cognition-steward/conceptualize/config.yaml +3 -1
- package/dist/subsystems/cognition-steward/conceptualize/handler.js +74 -5
- package/dist/subsystems/cognition-steward/consolidate/SUBSYSTEM.md +3 -2
- package/dist/subsystems/cognition-steward/consolidate/config.yaml +11 -2
- package/dist/subsystems/cognition-steward/consolidate/handler.d.ts +6 -3
- package/dist/subsystems/cognition-steward/consolidate/handler.js +266 -28
- package/dist/subsystems/memory-steward/backfill/handler.js +3 -2
- package/dist/subsystems/memory-steward/govern/config.yaml +6 -1
- package/dist/subsystems/wisdom-steward/attribute/config.yaml +5 -1
- package/dist/subsystems/wisdom-steward/formation/SUBSYSTEM.md +8 -1
- package/dist/subsystems/wisdom-steward/formation/config.yaml +4 -0
- package/dist/subsystems/wisdom-steward/formation/handler.js +27 -5
- package/dist/subsystems/wisdom-steward/govern/config.yaml +6 -1
- package/package.json +14 -15
- package/dist/harness/context/hybrid-compressor.d.ts +0 -41
- package/dist/harness/context/hybrid-compressor.js +0 -159
- package/dist/harness/context/llm-summarizer.d.ts +0 -46
- package/dist/harness/context/llm-summarizer.js +0 -249
- package/dist/harness/context/smart-router.d.ts +0 -75
- package/dist/harness/context/smart-router.js +0 -118
- package/dist/harness/context/truncate-compressor.d.ts +0 -28
- package/dist/harness/context/truncate-compressor.js +0 -107
- package/dist/harness/extension/plugin-ecosystem/plugins/capability.d.ts +0 -97
- package/dist/harness/extension/plugin-ecosystem/plugins/capability.js +0 -155
- package/dist/harness/extension/plugin-ecosystem/plugins/hooks.d.ts +0 -7
- package/dist/harness/extension/plugin-ecosystem/plugins/hooks.js +0 -7
- package/dist/harness/extension/plugin-ecosystem/plugins/lifecycle.d.ts +0 -86
- package/dist/harness/extension/plugin-ecosystem/plugins/lifecycle.js +0 -139
|
@@ -11,9 +11,11 @@
|
|
|
11
11
|
* Agent 是 Harness 运行时门面;不要再手拼 runAgentWithReliability。
|
|
12
12
|
*/
|
|
13
13
|
import { getTextContent } from '@octopi-agent/core/types.js';
|
|
14
|
+
import * as pluginToolPolicyAdapter from '../extension/plugin-ecosystem/tools/plugin-tool.js';
|
|
14
15
|
import { tightenSessionRights } from '../governance/session-acl/rights.js';
|
|
15
16
|
import { createSessionStateMachine } from '../session/state-machine.js';
|
|
16
17
|
import { HeuristicTokenEstimator } from '../context/index.js';
|
|
18
|
+
import { collectToolAgers, collectToolArgAgers } from '../context/tool-result-aging.js';
|
|
17
19
|
import { OpsAuditJournal, OpsAuditFileExportSink } from '../extension/execution-environment/ops-audit.js';
|
|
18
20
|
import { getOctopiHome } from '../../paths.js';
|
|
19
21
|
import { extractLayerQuery } from '../context/layer-types.js';
|
|
@@ -23,16 +25,48 @@ import { splitRuntimeEnvironmentInjection, withRuntimeEnvironmentInjection } fro
|
|
|
23
25
|
import { loadRootInstructionsInjection } from '../context/root-instructions.js';
|
|
24
26
|
import { extractTaskQueryHints, renderSessionTasksInjection } from '../session/tasks/render.js';
|
|
25
27
|
import { createRunId } from './run-scope.js';
|
|
28
|
+
/**
|
|
29
|
+
* in-run 压缩不可承接(无活跃 run / run 已收尾)——调用方(RunHost)应落回
|
|
30
|
+
* compactSession 锁路径执行。抛此类 = 语义化的 fallback 信号,不是故障。
|
|
31
|
+
*/
|
|
32
|
+
export class InRunCompactUnavailable extends Error {
|
|
33
|
+
constructor(message) {
|
|
34
|
+
super(message);
|
|
35
|
+
this.name = 'InRunCompactUnavailable';
|
|
36
|
+
}
|
|
37
|
+
}
|
|
26
38
|
import { DEFAULT_TOOL_ISOLATION, resolveToolIsolationCwd, } from '../extension/execution-environment/isolation.js';
|
|
27
39
|
import { mkdirSync } from 'node:fs';
|
|
28
40
|
import { join } from 'node:path';
|
|
29
41
|
import { toSessionFileName } from '@octopi-agent/core/session-filename.js';
|
|
30
|
-
import { readSessionCompact
|
|
42
|
+
import { readSessionCompact } from '../session/compact.js';
|
|
43
|
+
import { contextSizeSnapshot } from '../context/types.js';
|
|
44
|
+
import { toCompactTransport } from '../context/capabilities/compact/types.js';
|
|
31
45
|
import { InProcessSessionLock, } from './concurrency/session-lease.js';
|
|
32
46
|
import { isToolPermitted } from '../governance/session-acl/tool-rights.js';
|
|
33
47
|
import { resolveToolCapabilities } from '../extension/execution-environment/tool-capabilities.js';
|
|
34
48
|
/**
|
|
35
|
-
*
|
|
49
|
+
* principal 归属补全(arch/multi-tenancy.md §4):调用方 claim 优先;
|
|
50
|
+
* tenantId 缺省锚 agent 归属租户(host truth,非 claim)。无任何输入 = undefined。
|
|
51
|
+
*
|
|
52
|
+
* @param principal - 调用方转发的 principal(RunRequest 真源)
|
|
53
|
+
* @param tenantId - agent 归属租户(Runner 配置)
|
|
54
|
+
* @returns 补全后的 principal
|
|
55
|
+
*/
|
|
56
|
+
function withTenantPrincipal(principal, tenantId) {
|
|
57
|
+
if (!principal && !tenantId)
|
|
58
|
+
return undefined;
|
|
59
|
+
// 两者都有且不一致 = fail-loud(评审 MIN-9:不静默换租户身份)
|
|
60
|
+
if (principal?.tenantId && tenantId && principal.tenantId !== tenantId) {
|
|
61
|
+
throw new Error(`principal tenant mismatch: claim=${principal.tenantId} agent=${tenantId} (cross-tenant identity is not accepted)`);
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
...principal,
|
|
65
|
+
...(principal?.tenantId || !tenantId ? {} : { tenantId }),
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* 失败凭证消息中附带残句的截断上限(显示用途;完整残句在带 error 标记的 step 账本)
|
|
36
70
|
*
|
|
37
71
|
* 展示型截断,与 wire-dump 的消息截断同性质——不是部署可变参数,故不进配置。
|
|
38
72
|
*/
|
|
@@ -105,25 +139,25 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
105
139
|
return { type: 'engine.error', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: { error: errorText } };
|
|
106
140
|
}
|
|
107
141
|
return { type: 'engine.end', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: { reason: event.reason } };
|
|
108
|
-
case '
|
|
142
|
+
case 'step_start':
|
|
109
143
|
// 必须带 session 元数据:gatewayBus.onAll 以 event.sessionId 为 WS 广播前提
|
|
110
|
-
return { type: '
|
|
144
|
+
return { type: 'step.start', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: {} };
|
|
111
145
|
case 'assistant_message':
|
|
112
146
|
state.assistantContent = typeof event.message.content === 'string' ? event.message.content : '';
|
|
113
147
|
// 完整消息已定稿,本次调用的部分流出功成身退(不得与正文叠加)
|
|
114
148
|
state.callStreamedContent = '';
|
|
115
149
|
return null;
|
|
116
|
-
case '
|
|
150
|
+
case 'step_end': {
|
|
117
151
|
// phase 透传给 UI:pre_tools ≠ 本轮 run 结束(见 architecture.md)
|
|
118
152
|
// 正文口径:优先完整消息;失败轮(error=true)只有本次调用的部分流出,
|
|
119
153
|
// 不得回落到上一次调用的回复冒充本次输出
|
|
120
154
|
const turnContent = state.assistantContent || state.callStreamedContent || '';
|
|
121
|
-
state.
|
|
122
|
-
state.
|
|
155
|
+
state.lastStepContent = turnContent;
|
|
156
|
+
state.lastStepError = Boolean(event.error);
|
|
123
157
|
state.assistantContent = '';
|
|
124
158
|
state.callStreamedContent = '';
|
|
125
159
|
return {
|
|
126
|
-
type: '
|
|
160
|
+
type: 'step.end',
|
|
127
161
|
timestamp: Date.now(),
|
|
128
162
|
agentId: meta.agentId,
|
|
129
163
|
sessionId: meta.sessionId,
|
|
@@ -160,6 +194,7 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
160
194
|
result: event.result.content,
|
|
161
195
|
durationMs: event.result.durationMs,
|
|
162
196
|
purpose: event.result.purpose,
|
|
197
|
+
...(event.result.source === undefined ? {} : { source: event.result.source }),
|
|
163
198
|
},
|
|
164
199
|
};
|
|
165
200
|
case 'stream.fallback_to_sync':
|
|
@@ -178,7 +213,7 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
178
213
|
state.stopMessage =
|
|
179
214
|
budgetReason === 'wall_clock'
|
|
180
215
|
? '本轮运行时间达到预算上限,已停止。'
|
|
181
|
-
: budgetReason === '
|
|
216
|
+
: budgetReason === 'steps'
|
|
182
217
|
? '本轮迭代次数达到预算上限,已停止。'
|
|
183
218
|
: '本轮工具调用次数达到预算上限,已停止。';
|
|
184
219
|
// 对齐 EventBus BUDGET_EXCEEDED;用户可见停止原因
|
|
@@ -313,6 +348,12 @@ export class SessionAwareRunner {
|
|
|
313
348
|
config;
|
|
314
349
|
/** Session 状态机缓存 */
|
|
315
350
|
stateMachines = new Map();
|
|
351
|
+
/** 活跃 handle 会话(in-run 压缩承接判定;sessionId → run 归属 agentId,E4 键校验用) */
|
|
352
|
+
activeHandleSessions = new Map();
|
|
353
|
+
/** in-flight 压缩执行(key = sessionId\\0agentId):执行期间的请求 join 当前执行(coalesce 跨缝,评审 del-d0830117 F5) */
|
|
354
|
+
inFlightCompacts = new Map();
|
|
355
|
+
/** in-run 压缩请求槽(sessionId → 队列;消息缝 drain,见 requestInRunCompact) */
|
|
356
|
+
inRunCompactRequests = new Map();
|
|
316
357
|
/** 自主子系统运行时 */
|
|
317
358
|
_subsystemRuntime;
|
|
318
359
|
_backfillTrigger;
|
|
@@ -321,6 +362,8 @@ export class SessionAwareRunner {
|
|
|
321
362
|
_events;
|
|
322
363
|
/** 产品 Observer Hub(Run 现场;可选) */
|
|
323
364
|
_observerHub;
|
|
365
|
+
/** 观测专属事件出口(跨进程桥;见 setObservedEventSink) */
|
|
366
|
+
_observedEventSink;
|
|
324
367
|
/** 工具运行时上下文提供者 */
|
|
325
368
|
toolContextProvider;
|
|
326
369
|
/** 文件式 persona 的 run 时解析器;每次 handle 前解析,实现热更新 */
|
|
@@ -337,6 +380,8 @@ export class SessionAwareRunner {
|
|
|
337
380
|
groundingAssembler;
|
|
338
381
|
/** 模型快照解析器(Gateway 注入;每 run 只调一次) */
|
|
339
382
|
resolveModelOverride;
|
|
383
|
+
/** 无 Gateway 快照时,附件轻量意图分流回退到 Builder 的当前会话 provider。 */
|
|
384
|
+
defaultIntentProvider;
|
|
340
385
|
constructor(agent, harness, store, config) {
|
|
341
386
|
this.agent = agent;
|
|
342
387
|
this.harness = harness;
|
|
@@ -346,6 +391,7 @@ export class SessionAwareRunner {
|
|
|
346
391
|
this._events = config?.events;
|
|
347
392
|
this._observerHub = config?.observerHub;
|
|
348
393
|
this.resolveModelOverride = config?.resolveModelOverride;
|
|
394
|
+
this.defaultIntentProvider = config?.defaultIntentProvider;
|
|
349
395
|
}
|
|
350
396
|
/**
|
|
351
397
|
* ops 审计记账(ops P2):写 hash 链账本。
|
|
@@ -355,9 +401,14 @@ export class SessionAwareRunner {
|
|
|
355
401
|
*
|
|
356
402
|
* @param event - §7 事件词表
|
|
357
403
|
* @param data - 事件载荷(hash 走 canonicalJson,键序无关)
|
|
404
|
+
* @param opts.ignoreRunOverride - true = 忽略 run 级 effectOpsAudit 粘滞值
|
|
405
|
+
* (准入拒绝发生在 run 起点之前,不受上一轮 run 的 opsAudit:'off' 影响)
|
|
358
406
|
*/
|
|
359
|
-
recordOpsAudit(event, data) {
|
|
360
|
-
|
|
407
|
+
recordOpsAudit(event, data, opts) {
|
|
408
|
+
const mode = (opts?.ignoreRunOverride ? undefined : this.effectOpsAudit) ??
|
|
409
|
+
this.config.effectPolicy?.opsAudit ??
|
|
410
|
+
'on';
|
|
411
|
+
if (mode !== 'on')
|
|
361
412
|
return;
|
|
362
413
|
if (!this.opsJournal) {
|
|
363
414
|
// 缺省按 agent 分文件:多 agent 并发追加同一文件会共享 tail → seq 撞号,
|
|
@@ -391,6 +442,32 @@ export class SessionAwareRunner {
|
|
|
391
442
|
this.noteOpsDegradation(`ops_audit_write_failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
392
443
|
}
|
|
393
444
|
}
|
|
445
|
+
/**
|
|
446
|
+
* 对外 ops 记账口(账本 + 观测双写)——run 准入拒绝等发生在 Runner 执行流之外、
|
|
447
|
+
* 但属同一 ops 语义面的事件(如 gateway 侧 knowledge.required 闸门)用它对齐
|
|
448
|
+
* `ops.config.security_changed` / `ops.kill_switch.tripped` 的三件套待遇。
|
|
449
|
+
* (不叫 recordOpsEvent:与工具上下文的同名回调(仅账本)区分。)
|
|
450
|
+
*
|
|
451
|
+
* @param event - §7 事件词表
|
|
452
|
+
* @param data - 事件载荷(hash 走 canonicalJson,入账本)
|
|
453
|
+
* @param origin - 触发者锚点(观测事件的 agentId/sessionId;账本锚未落定时补锚)
|
|
454
|
+
*/
|
|
455
|
+
recordAdmissionRefusal(event, data, origin) {
|
|
456
|
+
// 账本按 agent 分文件:事件发生在 run 起点之前(如准入拒绝)时锚未落定,用 origin 补锚
|
|
457
|
+
if (!this.opsAuditAgentId)
|
|
458
|
+
this.opsAuditAgentId = origin.agentId;
|
|
459
|
+
if (!this.opsAuditSessionId)
|
|
460
|
+
this.opsAuditSessionId = origin.sessionId;
|
|
461
|
+
// 准入拒绝不受上一轮 run 的 effectOpsAudit 粘滞值影响(否则审计缺口重现)
|
|
462
|
+
this.recordOpsAudit(event, data, { ignoreRunOverride: true });
|
|
463
|
+
this.emitObserved({
|
|
464
|
+
type: event,
|
|
465
|
+
timestamp: Date.now(),
|
|
466
|
+
agentId: origin.agentId,
|
|
467
|
+
sessionId: origin.sessionId,
|
|
468
|
+
data: { ...data },
|
|
469
|
+
});
|
|
470
|
+
}
|
|
394
471
|
/** 外送收口(懒建;仅配置了宿主侧收口路径时启用) */
|
|
395
472
|
resolveOpsExporter() {
|
|
396
473
|
const exportPath = this.config.effectPolicy?.opsAuditExportPath ?? this.config.opsAuditExportPath;
|
|
@@ -431,15 +508,42 @@ export class SessionAwareRunner {
|
|
|
431
508
|
this._observerHub = hub;
|
|
432
509
|
}
|
|
433
510
|
/**
|
|
434
|
-
*
|
|
511
|
+
* 注入观测专属事件出口(跨进程桥:run 实例 → gateway)。
|
|
512
|
+
*
|
|
513
|
+
* emitObserved 事件分两类:loop adapted 事件(已进 execute 流 yield,`streamed` 标记)
|
|
514
|
+
* 与观测专属事件(context.layers.assembled / tool.exec.update / run.timing 等,
|
|
515
|
+
* 只进 Hub+EventBus、不进事件 yield 流)。进程内 EventBus 的可见性在 run/gateway
|
|
516
|
+
* 拆分后不再跨进程,专属事件经此 sink 转 notify('session_event') 过网线;
|
|
517
|
+
* streamed 事件已在 execute 流中,不得重复过线。
|
|
518
|
+
*
|
|
519
|
+
* @param sink - 专属事件回调(异常 fail-open,不中断 run)
|
|
520
|
+
*/
|
|
521
|
+
setObservedEventSink(sink) {
|
|
522
|
+
this._observedEventSink = sink;
|
|
523
|
+
}
|
|
524
|
+
/**
|
|
525
|
+
* 发射事件:先采 Observer Hub,再进 EventBus(协调总线)。
|
|
526
|
+
*
|
|
527
|
+
* @param event - §7 事件词表
|
|
528
|
+
* @param opts.streamed - 事件已经 execute 流 yield(loop adapted);此时不再走
|
|
529
|
+
* observedEventSink,防跨进程桥重复过线
|
|
435
530
|
*/
|
|
436
|
-
emitObserved(event) {
|
|
531
|
+
emitObserved(event, opts) {
|
|
437
532
|
try {
|
|
438
533
|
this._observerHub?.ingestEvent(event);
|
|
439
534
|
}
|
|
440
535
|
catch {
|
|
441
536
|
// 观测 fail-open:不阻断事件广播
|
|
442
537
|
}
|
|
538
|
+
// sink 先于 bus:bus 监听抛错不该吞掉跨进程出口(NIT-1;fail-open 语义完整)
|
|
539
|
+
if (!opts?.streamed) {
|
|
540
|
+
try {
|
|
541
|
+
this._observedEventSink?.(event);
|
|
542
|
+
}
|
|
543
|
+
catch {
|
|
544
|
+
// 观测 fail-open:桥转发失败不中断 run(与 Hub 同语义)
|
|
545
|
+
}
|
|
546
|
+
}
|
|
443
547
|
this._events?.emit(event);
|
|
444
548
|
}
|
|
445
549
|
/**
|
|
@@ -637,6 +741,8 @@ export class SessionAwareRunner {
|
|
|
637
741
|
// buildMs 从拿锁后起算(含 wait 会双重计时;F3-d 耗时区按分段展示)
|
|
638
742
|
const runStartTs = Date.now();
|
|
639
743
|
const _agentId = runConfig.agentId ?? 'default';
|
|
744
|
+
/** 本 run 身份单源(m1,2026-11-09 评审):runScope 构造与 afterStep 归属共用同一对象 */
|
|
745
|
+
const runIdentity = { sessionId, agentId: _agentId };
|
|
640
746
|
/** Observer 收口状态(finally 统一关闭,含异常路径) */
|
|
641
747
|
let observerRunId = '';
|
|
642
748
|
let observerFinalMessages;
|
|
@@ -653,16 +759,26 @@ export class SessionAwareRunner {
|
|
|
653
759
|
*/
|
|
654
760
|
const adaptState = { assistantContent: '', lastUserContent: '' };
|
|
655
761
|
let observerErrorMsg;
|
|
656
|
-
let
|
|
762
|
+
let hasStepEnd = false;
|
|
657
763
|
/** 正常完成时需在持久化后真删 metadata.lastStop(save 浅合并删不掉) */
|
|
658
764
|
let clearLastStop = false;
|
|
659
765
|
/** 本 user turn 内第 N 次 LLM 调用(0-based;cache 观测) */
|
|
660
766
|
let llmCallIndexInUserTurn = 0;
|
|
661
767
|
try {
|
|
768
|
+
// in-run 压缩承接面:handle 持锁期间登记(requestInRunCompact 判定锚;带 run 归属 agentId 供 E4 键校验)
|
|
769
|
+
this.activeHandleSessions.set(sessionId, _agentId);
|
|
662
770
|
// 3. 加载或创建 session
|
|
663
771
|
let session = await this.store.load(sessionId);
|
|
664
772
|
if (!session) {
|
|
665
|
-
session = this.createSession(sessionId, runConfig.
|
|
773
|
+
session = this.createSession(sessionId, _agentId, runConfig.principal?.tenantId);
|
|
774
|
+
await this.store.save(sessionId, session);
|
|
775
|
+
await this.config.extensionHooks?.observe('session_start', {
|
|
776
|
+
sessionId,
|
|
777
|
+
agentId: _agentId,
|
|
778
|
+
...(runConfig.principal === undefined ? {} : { principal: runConfig.principal }),
|
|
779
|
+
...(signal === undefined ? {} : { signal }),
|
|
780
|
+
reason: 'created',
|
|
781
|
+
});
|
|
666
782
|
}
|
|
667
783
|
/** 上下文租约点之前的 Discourse 前缀(写回时并回,不进默认 LLM 窗口) */
|
|
668
784
|
let contextLeasePrefix = [];
|
|
@@ -672,6 +788,17 @@ export class SessionAwareRunner {
|
|
|
672
788
|
}
|
|
673
789
|
if (!session.tasks)
|
|
674
790
|
session.tasks = [];
|
|
791
|
+
// 校准状态恢复(取舍③配套):上次 run persist 的锚+样本回填——本轮第一请求即
|
|
792
|
+
// anchored/calibrated,消除「重启后跑几轮才校准」冷启动(best-effort:不阻塞 run)
|
|
793
|
+
const persistedCalibration = session.metadata?.calibration;
|
|
794
|
+
if (persistedCalibration && typeof this.harness.importCalibration === 'function') {
|
|
795
|
+
try {
|
|
796
|
+
this.harness.importCalibration(persistedCalibration);
|
|
797
|
+
}
|
|
798
|
+
catch (err) {
|
|
799
|
+
console.warn(`[ctx] session=${sessionId} calibration restore failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
800
|
+
}
|
|
801
|
+
}
|
|
675
802
|
// E6:可选 ACL(注入时才强制);primary 自动 owner;带入 agent 天花板
|
|
676
803
|
const acl = this.config.sessionAcl;
|
|
677
804
|
let sessionToolRights;
|
|
@@ -735,6 +862,28 @@ export class SessionAwareRunner {
|
|
|
735
862
|
await this.persistTurnSeq(sessionId, seq);
|
|
736
863
|
return formatTurnId(seq);
|
|
737
864
|
};
|
|
865
|
+
const extensionHooks = this.config.extensionHooks;
|
|
866
|
+
if (extensionHooks) {
|
|
867
|
+
const originalPrompt = getTextContent(input.content);
|
|
868
|
+
const prepared = await extensionHooks.transform('agent_turn_prepare', {
|
|
869
|
+
sessionId,
|
|
870
|
+
agentId: _agentId,
|
|
871
|
+
...(runConfig.principal === undefined ? {} : { principal: runConfig.principal }),
|
|
872
|
+
...(signal === undefined ? {} : { signal }),
|
|
873
|
+
prompt: originalPrompt,
|
|
874
|
+
messages: session.messages,
|
|
875
|
+
}, originalPrompt);
|
|
876
|
+
if (typeof prepared.value !== 'string') {
|
|
877
|
+
throw new Error('agent_turn_prepare must produce a prompt string');
|
|
878
|
+
}
|
|
879
|
+
if (typeof input.content === 'string')
|
|
880
|
+
input.content = prepared.value;
|
|
881
|
+
else if (Array.isArray(input.content)) {
|
|
882
|
+
input.content = input.content.map((block) => block.type === 'text'
|
|
883
|
+
? { ...block, text: prepared.value }
|
|
884
|
+
: block);
|
|
885
|
+
}
|
|
886
|
+
}
|
|
738
887
|
// 5. 追加用户消息(正文稍后一次定形为 <turn_start>)
|
|
739
888
|
session.messages.push(input);
|
|
740
889
|
session.meta.lastInteractionAt = Date.now();
|
|
@@ -806,7 +955,7 @@ export class SessionAwareRunner {
|
|
|
806
955
|
extractionStatus: 'pending',
|
|
807
956
|
});
|
|
808
957
|
// 注入指标
|
|
809
|
-
this._subsystemRuntime.metrics.update('
|
|
958
|
+
this._subsystemRuntime.metrics.update('step.count', session.messages.filter(m => m.role === 'assistant').length);
|
|
810
959
|
}
|
|
811
960
|
this._subsystemRuntime.applyPendingInjections(session.messages);
|
|
812
961
|
// steering / escalate:当前轮次立即生效(escalate 优先,写入 injectedContext)
|
|
@@ -1047,12 +1196,32 @@ export class SessionAwareRunner {
|
|
|
1047
1196
|
}
|
|
1048
1197
|
// ── Run 级模型快照:每 run 只 resolve 一次(必须在 system assembler 之前)──
|
|
1049
1198
|
const modelRef = this.readRunModelRef(session, effectiveRunConfig);
|
|
1050
|
-
|
|
1199
|
+
let resolvedModel = this.resolveModelOverride
|
|
1051
1200
|
? this.resolveModelOverride({
|
|
1052
1201
|
modelRef,
|
|
1053
1202
|
defaultProvider: effectiveRunConfig.modelProvider,
|
|
1054
1203
|
})
|
|
1055
1204
|
: null;
|
|
1205
|
+
if (extensionHooks && resolvedModel) {
|
|
1206
|
+
const transformed = await extensionHooks.transform('before_model_resolve', {
|
|
1207
|
+
sessionId,
|
|
1208
|
+
agentId: _agentId,
|
|
1209
|
+
...(effectiveRunConfig.principal === undefined ? {} : { principal: effectiveRunConfig.principal }),
|
|
1210
|
+
...(signal === undefined ? {} : { signal }),
|
|
1211
|
+
current: { provider: resolvedModel.providerName, model: resolvedModel.modelName },
|
|
1212
|
+
prompt: getTextContent(input.content),
|
|
1213
|
+
}, { provider: resolvedModel.providerName, model: resolvedModel.modelName });
|
|
1214
|
+
const selection = transformed.value;
|
|
1215
|
+
if (!this.resolveModelOverride)
|
|
1216
|
+
throw new Error('before_model_resolve has no Host model resolver');
|
|
1217
|
+
const transformedModel = this.resolveModelOverride({
|
|
1218
|
+
modelRef: `${selection.provider}/${selection.model}`,
|
|
1219
|
+
});
|
|
1220
|
+
if (!transformedModel) {
|
|
1221
|
+
throw new Error(`before_model_resolve selected an unconfigured model: ${selection.provider}/${selection.model}`);
|
|
1222
|
+
}
|
|
1223
|
+
resolvedModel = transformedModel;
|
|
1224
|
+
}
|
|
1056
1225
|
if (resolvedModel) {
|
|
1057
1226
|
effectiveRunConfig = {
|
|
1058
1227
|
...effectiveRunConfig,
|
|
@@ -1060,6 +1229,33 @@ export class SessionAwareRunner {
|
|
|
1060
1229
|
model: resolvedModel.modelName,
|
|
1061
1230
|
};
|
|
1062
1231
|
}
|
|
1232
|
+
const runId = createRunId(sessionId, _agentId);
|
|
1233
|
+
let pluginRuntimeSnapshot = '';
|
|
1234
|
+
if (extensionHooks) {
|
|
1235
|
+
const collected = await extensionHooks.collect('before_prompt_build', {
|
|
1236
|
+
sessionId,
|
|
1237
|
+
agentId: _agentId,
|
|
1238
|
+
runId,
|
|
1239
|
+
...(effectiveRunConfig.principal === undefined ? {} : { principal: effectiveRunConfig.principal }),
|
|
1240
|
+
...(signal === undefined ? {} : { signal }),
|
|
1241
|
+
prompt: getTextContent(input.content),
|
|
1242
|
+
messages: session.messages,
|
|
1243
|
+
});
|
|
1244
|
+
if (collected.contributions.length > 0) {
|
|
1245
|
+
const { PluginRuntimeSnapshotLayer } = await import('../context/layers.js');
|
|
1246
|
+
const layer = new PluginRuntimeSnapshotLayer(collected.contributions);
|
|
1247
|
+
const content = await layer.assemble({
|
|
1248
|
+
sessionId,
|
|
1249
|
+
agentId: _agentId,
|
|
1250
|
+
messages: session.messages,
|
|
1251
|
+
query: getTextContent(input.content),
|
|
1252
|
+
tokenBudget: Math.max(1, Math.min(this.config.extensionSnapshotBudgetTokens ?? 4096, Math.floor((effectiveRunConfig.contextWindow ?? 8192) * 0.1))),
|
|
1253
|
+
systemBudget: Math.floor((effectiveRunConfig.contextWindow ?? 8192) * 0.6),
|
|
1254
|
+
...(signal === undefined ? {} : { signal }),
|
|
1255
|
+
});
|
|
1256
|
+
pluginRuntimeSnapshot = content?.text ?? '';
|
|
1257
|
+
}
|
|
1258
|
+
}
|
|
1063
1259
|
// system prompt 终装:Assembler(层契约)优先,否则退回字符串拼接
|
|
1064
1260
|
// 结果只写入 runContext / RunScope,不作为「Agent 当前会话状态」
|
|
1065
1261
|
if (this.systemPromptAssembler) {
|
|
@@ -1200,8 +1396,7 @@ export class SessionAwareRunner {
|
|
|
1200
1396
|
console.warn(`[octopi] toolIsolation session-subdir mkdir failed (session=${sessionId}, cwd=${resolvedToolCwd.cwd}): ${err instanceof Error ? err.message : String(err)}`);
|
|
1201
1397
|
}
|
|
1202
1398
|
}
|
|
1203
|
-
// Run
|
|
1204
|
-
const runId = createRunId(sessionId, _agentId);
|
|
1399
|
+
// Run 身份已在 Prompt Collect 前生成;Observer/审计复用同一 ID。
|
|
1205
1400
|
const attachmentRoots = this.config.sessionsDir
|
|
1206
1401
|
? [join(this.config.sessionsDir, toSessionFileName(sessionId), 'attachments')]
|
|
1207
1402
|
: undefined;
|
|
@@ -1230,12 +1425,29 @@ export class SessionAwareRunner {
|
|
|
1230
1425
|
const undoRoots = this.config.sessionsDir
|
|
1231
1426
|
? [resolveSessionUndoPaths(this.config.sessionsDir, sessionId).root]
|
|
1232
1427
|
: undefined;
|
|
1428
|
+
// §9.1-6:session 租户 → principal 归属。会话是数据的家——已有会话归属为准;
|
|
1429
|
+
// 派发面 claim(Trigger.tenantId / 委派继承位)只负责给**新**会话育归属。
|
|
1430
|
+
// 渠道锚可比会话粗(ws/宿主面锚=DEFAULT 而会话是租户 REST 所建),
|
|
1431
|
+
// claim≠会话不是错误;真正的跨租户防线在 withTenantPrincipal(vs agent 归属)。
|
|
1233
1432
|
const runScope = {
|
|
1234
|
-
|
|
1235
|
-
agentId: _agentId,
|
|
1433
|
+
...runIdentity,
|
|
1236
1434
|
runId,
|
|
1435
|
+
// principal 归属补全:调用方 claim 优先;tenantId 缺省锚 agent 归属(host truth,非 claim)。
|
|
1436
|
+
// 凭证域解析(credentials §4)从本字段取归属——无归属 = 宿主面(信任边界,MAJ-3 语义)。
|
|
1437
|
+
principal: withTenantPrincipal({
|
|
1438
|
+
...(effectiveRunConfig.principal ?? {}),
|
|
1439
|
+
...(session.meta.tenantId === undefined ? {} : { tenantId: session.meta.tenantId }),
|
|
1440
|
+
}, this.config.tenantId),
|
|
1441
|
+
prompt: getTextContent(input.content),
|
|
1442
|
+
resolvedModel: resolvedModel ?? undefined,
|
|
1443
|
+
extensionSnapshotBudgetTokens: this.config.extensionSnapshotBudgetTokens,
|
|
1444
|
+
resolveConfiguredModel: this.resolveModelOverride
|
|
1445
|
+
? (selection) => this.resolveModelOverride({ modelRef: `${selection.provider}/${selection.model}` })
|
|
1446
|
+
: undefined,
|
|
1237
1447
|
systemPrompt: runContext.systemPrompt,
|
|
1238
1448
|
agentRevision: effectiveRunConfig.agentRevision,
|
|
1449
|
+
// 交接式摘要素材(F8R-05):每次装配现取活任务快照(attachSession 同对象)
|
|
1450
|
+
taskSnapshot: () => renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
1239
1451
|
toolRuntime: {
|
|
1240
1452
|
sessionId,
|
|
1241
1453
|
agentId: _agentId,
|
|
@@ -1336,18 +1548,18 @@ export class SessionAwareRunner {
|
|
|
1336
1548
|
fullTextMaxChars: this.config.sessionAttachmentInject?.fullTextMaxChars ?? 12_000,
|
|
1337
1549
|
intent: this.config.sessionAttachmentInject?.intent ?? 'llm',
|
|
1338
1550
|
timeoutMs: this.config.sessionAttachmentInject?.intentTimeoutMs ?? 800,
|
|
1339
|
-
resolver: resolvedModel?.provider
|
|
1340
|
-
? createLlmIntentResolver(resolvedModel.
|
|
1551
|
+
resolver: resolvedModel?.provider ?? this.defaultIntentProvider
|
|
1552
|
+
? createLlmIntentResolver((resolvedModel?.provider ?? this.defaultIntentProvider))
|
|
1341
1553
|
: undefined,
|
|
1342
1554
|
});
|
|
1343
|
-
|
|
1555
|
+
const grounding = await buildAttachmentGroundingText(items, {
|
|
1344
1556
|
fullTextMaxChars: this.config.sessionAttachmentInject?.fullTextMaxChars ?? 12_000,
|
|
1557
|
+
recallTopK: this.config.sessionAttachmentInject?.recallTopK ?? 6,
|
|
1345
1558
|
readText: (id, max) => attachSvc.readExtractedText(sessionId, id, max),
|
|
1346
1559
|
absolutePath: (id) => attachSvc.resolveAbsolutePath(sessionId, id),
|
|
1347
|
-
|
|
1348
|
-
|
|
1349
|
-
|
|
1350
|
-
}
|
|
1560
|
+
recall: (query, ids, limit) => attachSvc.recall(sessionId, query, ids, limit),
|
|
1561
|
+
}, plan);
|
|
1562
|
+
attachmentText = grounding.text;
|
|
1351
1563
|
}
|
|
1352
1564
|
}
|
|
1353
1565
|
}
|
|
@@ -1358,7 +1570,7 @@ export class SessionAwareRunner {
|
|
|
1358
1570
|
const slotsXml = joinSlotXml([
|
|
1359
1571
|
{
|
|
1360
1572
|
tag: 'runtime_snapshot',
|
|
1361
|
-
body: runtimeSnapshotText
|
|
1573
|
+
body: [runtimeSnapshotText, pluginRuntimeSnapshot].filter(Boolean).join('\n\n'),
|
|
1362
1574
|
},
|
|
1363
1575
|
{
|
|
1364
1576
|
tag: 'session_attachments',
|
|
@@ -1375,7 +1587,7 @@ export class SessionAwareRunner {
|
|
|
1375
1587
|
turnId: currentTurnId,
|
|
1376
1588
|
slotsXml,
|
|
1377
1589
|
});
|
|
1378
|
-
this.bakeTurnStart(input, currentTurnId, turnContextXml);
|
|
1590
|
+
this.bakeTurnStart(input, currentTurnId, turnContextXml, runId);
|
|
1379
1591
|
// 视图 = detach 切片(含已定形 user);全回放,无条件成为 LLM 窗口
|
|
1380
1592
|
runContext.messages = baseMsgs;
|
|
1381
1593
|
if (runScope.toolRuntime) {
|
|
@@ -1446,17 +1658,24 @@ export class SessionAwareRunner {
|
|
|
1446
1658
|
}
|
|
1447
1659
|
}
|
|
1448
1660
|
}
|
|
1449
|
-
// Token
|
|
1661
|
+
// Token 估算器(rawTokens = 全量原文估算;P0-C 起不再充当 contextTokens 回退)
|
|
1450
1662
|
const estimator = new HeuristicTokenEstimator();
|
|
1451
1663
|
// 10. 运行 Agent(Agent.run = reliability 包装;context/runScope 为本 Run 私有)
|
|
1452
1664
|
let streamedContent = '';
|
|
1453
1665
|
let lastUsage = undefined;
|
|
1454
|
-
/**
|
|
1455
|
-
let
|
|
1666
|
+
/** 三量纲账(供收尾持久化;compact 视图值不进此账):实测单源 + 两个分流估算 */
|
|
1667
|
+
let lastPromptTokensActual = undefined;
|
|
1668
|
+
/** 最近一次 promptTokensActual 写入的来源(收尾持久化审计:usage=本步实测 / stale=沿用旧实测) */
|
|
1669
|
+
let lastPromptWriter = 'usage';
|
|
1670
|
+
let lastViewTokensEst = undefined;
|
|
1671
|
+
let lastRawTokens = undefined;
|
|
1456
1672
|
let lastContextWindow = undefined;
|
|
1673
|
+
/** 当前上下文大小显示槽(持久化 contextSize):只随真实用量更新(stale 不冒名,F4);
|
|
1674
|
+
* 压缩后估算由 manual 压缩持久化 / auto 压缩随该步 usage 覆盖 */
|
|
1675
|
+
let lastContextSize = undefined;
|
|
1457
1676
|
const meta = { agentId: effectiveRunConfig.agentId ?? 'default', sessionId };
|
|
1458
|
-
/** 本轮起始消息下标(
|
|
1459
|
-
let
|
|
1677
|
+
/** 本轮起始消息下标(afterStep 只传增量) */
|
|
1678
|
+
let stepStartIndex = runContext.messages.length;
|
|
1460
1679
|
/** 用户中止(编辑重发标记用) */
|
|
1461
1680
|
let runAborted = false;
|
|
1462
1681
|
/** 被接续消息的收尾通道(频道回复捕获等);消费后转发本 Run 全部事件 */
|
|
@@ -1491,7 +1710,7 @@ export class SessionAwareRunner {
|
|
|
1491
1710
|
this.bakeTurnStart(entry.message, currentTurnId, formatTurnContextXml({
|
|
1492
1711
|
turnId: currentTurnId,
|
|
1493
1712
|
slotsXml: joinSlotXml([{ tag: 'runtime_snapshot', body: runtimeSnapshotText ?? '' }]),
|
|
1494
|
-
}));
|
|
1713
|
+
}), runId);
|
|
1495
1714
|
injected.push(entry.message);
|
|
1496
1715
|
// ack 延到转录同步成功后统一 flush;同步失败/崩溃由 close 的
|
|
1497
1716
|
// unacked 重投兜底(at-least-once,见 SessionInbox)
|
|
@@ -1500,6 +1719,10 @@ export class SessionAwareRunner {
|
|
|
1500
1719
|
entryObservers.add(entry.onEvent);
|
|
1501
1720
|
}
|
|
1502
1721
|
}
|
|
1722
|
+
// in-run 手动压缩(方案 A):下一个消息缝执行已挂起的压缩请求
|
|
1723
|
+
// (run 持锁中,走无锁核心;压缩产物 append-only,下一步装配自然生效;
|
|
1724
|
+
// run abort 透传至摘要调用——F1:压缩不挂满 summarizeTimeoutMs)
|
|
1725
|
+
await this.drainInRunCompacts(sessionId, session, signal);
|
|
1503
1726
|
if (injected.length) {
|
|
1504
1727
|
this.emitObserved({
|
|
1505
1728
|
type: 'session.inbox.appended',
|
|
@@ -1546,7 +1769,7 @@ export class SessionAwareRunner {
|
|
|
1546
1769
|
flushInboxAcks();
|
|
1547
1770
|
}
|
|
1548
1771
|
}
|
|
1549
|
-
else if (loopEvent.type === '
|
|
1772
|
+
else if (loopEvent.type === 'step_end') {
|
|
1550
1773
|
// 漂移兜底:turn 边界无条件对齐一次(旁路写者整包回退后即使暂无
|
|
1551
1774
|
// 新消息也能自愈;无漂移时幂等零写)
|
|
1552
1775
|
if (await this.persistRunMessages(sessionId, _agentId, contextLeasePrefix, runContext.messages)) {
|
|
@@ -1559,20 +1782,54 @@ export class SessionAwareRunner {
|
|
|
1559
1782
|
// 适配事件格式(向后兼容)
|
|
1560
1783
|
const adapted = adaptLoopEvent(loopEvent, meta, adaptState);
|
|
1561
1784
|
if (adapted) {
|
|
1562
|
-
// 捕获 usage 数据,并在
|
|
1785
|
+
// 捕获 usage 数据,并在 step.end 事件中附加上下文信息(必须在 yield 之前,
|
|
1563
1786
|
// 否则 gateway 收到事件后立即广播,data 里还没有 context 字段)
|
|
1564
|
-
if (adapted.type === '
|
|
1787
|
+
if (adapted.type === 'step.end') {
|
|
1565
1788
|
const rawUsage = adapted.data?.usage;
|
|
1566
1789
|
if (rawUsage) {
|
|
1567
1790
|
lastUsage = rawUsage;
|
|
1568
1791
|
}
|
|
1569
|
-
const
|
|
1570
|
-
|
|
1571
|
-
|
|
1572
|
-
|
|
1573
|
-
|
|
1574
|
-
|
|
1575
|
-
|
|
1792
|
+
const eventData = adapted.data;
|
|
1793
|
+
// contextTokens 单源(P0-C):promptTokensActual 只记 provider 实测(本步 usage,
|
|
1794
|
+
// 无则沿用最近实测并标记 stale);无实测不更新、不猜——估算一律分流,不得冒充实测。
|
|
1795
|
+
// 每次写入打 [ctx] 审计(估算分支零日志是 600k 误显排查的最大盲区)。
|
|
1796
|
+
const promptActual = rawUsage
|
|
1797
|
+
? (rawUsage.inputReportedTokens ??
|
|
1798
|
+
rawUsage.inputUncachedTokens + rawUsage.inputCachedTokens + rawUsage.inputCacheWriteTokens)
|
|
1799
|
+
: lastPromptTokensActual;
|
|
1800
|
+
// 0 不是实测:provider 未回报 usage 时适配层会把缺失字段补 0(usage.ts),
|
|
1801
|
+
// 全零 usage 按「无实测」处理,不得写成实测(同样不更新、不猜)
|
|
1802
|
+
if (promptActual !== undefined && promptActual > 0) {
|
|
1803
|
+
const promptWriter = rawUsage ? 'usage' : 'stale';
|
|
1804
|
+
eventData.promptTokensActual = promptActual;
|
|
1805
|
+
lastPromptTokensActual = promptActual;
|
|
1806
|
+
lastPromptWriter = promptWriter;
|
|
1807
|
+
console.log(`[ctx] session=${sessionId} writer=${promptWriter} field=promptTokensActual value=${promptActual}`);
|
|
1808
|
+
// contextSize 显示槽:只随真实用量更新(stale 回填不冒名新实测,评审 F4)。
|
|
1809
|
+
// 只在更新的这一步随事件携带——无用量步不重发旧值,防覆盖更新的压缩估算
|
|
1810
|
+
if (rawUsage) {
|
|
1811
|
+
lastContextSize = contextSizeSnapshot('usage', promptActual);
|
|
1812
|
+
eventData.contextSize = lastContextSize;
|
|
1813
|
+
console.log(`[ctx] session=${sessionId} writer=usage field=contextSize value=${promptActual}`);
|
|
1814
|
+
}
|
|
1815
|
+
}
|
|
1816
|
+
// viewTokensEst = 本请求视图估算(校准后,assemble/pressure 口径);
|
|
1817
|
+
// rawTokens = 全量原文估算(只进 Run 页签,永不冒充上下文用量)
|
|
1818
|
+
const pressure = this.harness.getContextPressure?.(sessionId);
|
|
1819
|
+
if (typeof pressure?.estimatedTokens === 'number') {
|
|
1820
|
+
eventData.viewTokensEst = pressure.estimatedTokens;
|
|
1821
|
+
lastViewTokensEst = pressure.estimatedTokens;
|
|
1822
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=viewTokensEst value=${pressure.estimatedTokens}`);
|
|
1823
|
+
}
|
|
1824
|
+
// rawTokens = 全量原文估算(只进 Run 页签,永不冒充上下文用量)。
|
|
1825
|
+
// 口径必须是 runContext.messages:fork/delegation 场景 :1981 会把
|
|
1826
|
+
// runContext.messages 重绑定到工作集,session.messages 停在重绑定前的
|
|
1827
|
+
// 快照(cs-* 会话 rawTokens 恒 4,203 的实锤),量它 = 量旧集合。
|
|
1828
|
+
const rawTokens = estimator.estimateMessages(runContext.messages);
|
|
1829
|
+
eventData.rawTokens = rawTokens;
|
|
1830
|
+
lastRawTokens = rawTokens;
|
|
1831
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=rawTokens value=${rawTokens}`);
|
|
1832
|
+
eventData.contextWindow = effectiveRunConfig.contextWindow;
|
|
1576
1833
|
// cache 观测:user 轮首调用 vs 同轮后续(跨轮前缀是否命中)
|
|
1577
1834
|
if (lastUsage) {
|
|
1578
1835
|
const cached = lastUsage.inputCachedTokens ?? 0;
|
|
@@ -1589,8 +1846,7 @@ export class SessionAwareRunner {
|
|
|
1589
1846
|
` cached=${cached} uncached=${uncached} write=${cacheWrite} prompt=${prompt}` +
|
|
1590
1847
|
` ratio=${(ratio * 100).toFixed(1)}% cacheAware=${lastUsage.cacheAware}`);
|
|
1591
1848
|
}
|
|
1592
|
-
// 记账供收尾持久化:UI
|
|
1593
|
-
lastContextTokens = contextTokens;
|
|
1849
|
+
// 记账供收尾持久化:UI 重开会话恢复显示(三量纲分账,见上)
|
|
1594
1850
|
lastContextWindow = effectiveRunConfig.contextWindow;
|
|
1595
1851
|
}
|
|
1596
1852
|
// 被接续消息的调用方收尾通道(如频道回复捕获):转发本 Run 事件;
|
|
@@ -1608,8 +1864,9 @@ export class SessionAwareRunner {
|
|
|
1608
1864
|
this.config.eventSink?.(adapted, meta);
|
|
1609
1865
|
// 事件桥:循环事件同时广播到 EventBus
|
|
1610
1866
|
// 跳过高频流式 delta(每 token 一次),避免 EventBus 拥塞
|
|
1867
|
+
// streamed:adapted 已在上方 yield 进 execute 流,跨进程桥不过重复线
|
|
1611
1868
|
if (adapted.type !== 'llm_stream_delta' && adapted.type !== 'llm_thinking_delta') {
|
|
1612
|
-
this.emitObserved(adapted);
|
|
1869
|
+
this.emitObserved(adapted, { streamed: true });
|
|
1613
1870
|
}
|
|
1614
1871
|
}
|
|
1615
1872
|
// 收集流式内容
|
|
@@ -1617,31 +1874,45 @@ export class SessionAwareRunner {
|
|
|
1617
1874
|
streamedContent += loopEvent.data.delta;
|
|
1618
1875
|
}
|
|
1619
1876
|
// assistantContent 由 adaptLoopEvent 在 assistant_message 事件上单一写入
|
|
1620
|
-
// turn_start:重置本轮增量游标(
|
|
1621
|
-
if (loopEvent.type === '
|
|
1622
|
-
|
|
1877
|
+
// turn_start:重置本轮增量游标(afterStep 只传本轮消息)
|
|
1878
|
+
if (loopEvent.type === 'step_start') {
|
|
1879
|
+
stepStartIndex = runContext.messages.length;
|
|
1623
1880
|
}
|
|
1624
|
-
//
|
|
1625
|
-
if (loopEvent.type === '
|
|
1626
|
-
|
|
1881
|
+
// step.end → 记录 step
|
|
1882
|
+
if (loopEvent.type === 'step_end') {
|
|
1883
|
+
hasStepEnd = true;
|
|
1627
1884
|
if (loopEvent.usage) {
|
|
1628
1885
|
lastUsage = loopEvent.usage;
|
|
1629
1886
|
}
|
|
1630
1887
|
llmCallIndexInUserTurn += 1;
|
|
1631
|
-
const
|
|
1632
|
-
|
|
1633
|
-
|
|
1888
|
+
const stepMessages = runContext.messages.slice(stepStartIndex);
|
|
1889
|
+
// 校准样本必须新鲜配对(arch §10.14):只传本步 usage。缺 usage(失败/重试/
|
|
1890
|
+
// 中止步)传 undefined——引擎不喂 observe。lastUsage 是展示口径的「最近实测」
|
|
1891
|
+
// (stale 语义见上方 promptTokensActual),拿它配当步估算分母会产出错配
|
|
1892
|
+
// ratio 样本(0.088/11.014 双向垃圾样本的源头)。
|
|
1893
|
+
// 校准样本身份单源(2026-11-09 事故):显式传本 run 身份,不经环境推断——
|
|
1894
|
+
// 本调用在 runner 事件循环(run 的 ALS 窗口外)执行,getRunScope() 会拿到
|
|
1895
|
+
// 泄漏的外层 scope,agent.contextSessionId 是共享可变字段;并发委派子 run
|
|
1896
|
+
// 下两者双向串味,错位样本毒化 ratio 校准(视图估算背离实测 160k vs 314k)。
|
|
1897
|
+
await this.agent.notifyAfterStep(runIdentity, loopEvent.usage, stepMessages);
|
|
1898
|
+
stepStartIndex = runContext.messages.length;
|
|
1634
1899
|
// 账本正文 = adaptLoopEvent 按调用算好的快照(失败轮只有本次调用的部分流出);
|
|
1635
1900
|
// 失败轮必须带 error 标记,空正文也留账(审计价值),不得拿历史内容凑数
|
|
1636
|
-
const content = adaptState.
|
|
1637
|
-
const turnFailed = Boolean(adaptState.
|
|
1901
|
+
const content = adaptState.lastStepContent ?? '';
|
|
1902
|
+
const turnFailed = Boolean(adaptState.lastStepError);
|
|
1638
1903
|
if (content || turnFailed) {
|
|
1639
|
-
session.
|
|
1640
|
-
id: `
|
|
1904
|
+
session.steps.push({
|
|
1905
|
+
id: `step_${Date.now()}`,
|
|
1641
1906
|
inputCount: Math.max(0, session.messages.length - 1),
|
|
1642
1907
|
output: { role: 'assistant', content, timestamp: Date.now(), agentId: _agentId },
|
|
1643
|
-
// 失败轮没有 usage(loop 的 error turn_end
|
|
1644
|
-
|
|
1908
|
+
// 失败轮没有 usage(loop 的 error turn_end 不带);不得写上一次调用的用量。
|
|
1909
|
+
// 非失败轮同理只记本步 usage——缺 usage(provider 未回报)留空,禁止拿
|
|
1910
|
+
// lastUsage(可能属于别步)冒充本步用量(评审 F7)。
|
|
1911
|
+
...(turnFailed
|
|
1912
|
+
? { error: true }
|
|
1913
|
+
: loopEvent.usage
|
|
1914
|
+
? { usage: loopEvent.usage }
|
|
1915
|
+
: {}),
|
|
1645
1916
|
durationMs: 0,
|
|
1646
1917
|
model: effectiveRunConfig.model ?? 'unknown',
|
|
1647
1918
|
timestamp: Date.now(),
|
|
@@ -1684,16 +1955,16 @@ export class SessionAwareRunner {
|
|
|
1684
1955
|
// 否则重载会话后这次失败无影无踪(只剩一段被当成正常回复的部分文本)。
|
|
1685
1956
|
const body = adaptState.errorMessage ?? '未知错误';
|
|
1686
1957
|
// 残句并入凭证消息(显示用途,截断):live 视图里用户看到过的部分输出
|
|
1687
|
-
// 重载后不再消失;完整残句仍以带 error 标记的
|
|
1688
|
-
// 最后一次尝试若以 turn_end(error) 收尾,partial 在
|
|
1958
|
+
// 重载后不再消失;完整残句仍以带 error 标记的 step 账本为准。
|
|
1959
|
+
// 最后一次尝试若以 turn_end(error) 收尾,partial 在 lastStepContent;
|
|
1689
1960
|
// 若直接 abort(无 turn_end),partial 还挂在 callStreamedContent 上。
|
|
1690
1961
|
const danglingPartial = adaptState.callStreamedContent ?? '';
|
|
1691
1962
|
// 回退只在「最后一个 turn 是失败轮」时启用:最终 abort 不产 turn_end 时
|
|
1692
|
-
//
|
|
1963
|
+
// lastStepContent 会停留在上一轮**成功**的正文上,直接用会把完整回复
|
|
1693
1964
|
// 冒充成「中断前的部分输出」
|
|
1694
|
-
const finalPartial = danglingPartial || (adaptState.
|
|
1965
|
+
const finalPartial = danglingPartial || (adaptState.lastStepError ? (adaptState.lastStepContent ?? '') : '');
|
|
1695
1966
|
const partialNote = finalPartial
|
|
1696
|
-
? `\n\n---\n中断前的部分输出(非完整回复):\n${finalPartial.slice(0, LLM_ERROR_PARTIAL_MAX_CHARS)}${finalPartial.length > LLM_ERROR_PARTIAL_MAX_CHARS ? '\n…(已截断,完整残句见
|
|
1967
|
+
? `\n\n---\n中断前的部分输出(非完整回复):\n${finalPartial.slice(0, LLM_ERROR_PARTIAL_MAX_CHARS)}${finalPartial.length > LLM_ERROR_PARTIAL_MAX_CHARS ? '\n…(已截断,完整残句见 step 账本)' : ''}`
|
|
1697
1968
|
: '';
|
|
1698
1969
|
session.messages.push({
|
|
1699
1970
|
role: 'user',
|
|
@@ -1717,9 +1988,9 @@ export class SessionAwareRunner {
|
|
|
1717
1988
|
// 最后一次失败尝试的 partial 也留账:abort 路径不再产 turn_end,
|
|
1718
1989
|
// 此处不记的话最后尝试的输出只剩前端 live 视图(重载即失)。
|
|
1719
1990
|
// 只补「无 turn_end」的缺口;turn_end(error) 路径已在账本里,不得重复记。
|
|
1720
|
-
if (
|
|
1721
|
-
session.
|
|
1722
|
-
id: `
|
|
1991
|
+
if (hasStepEnd && danglingPartial) {
|
|
1992
|
+
session.steps.push({
|
|
1993
|
+
id: `step_${Date.now()}`,
|
|
1723
1994
|
inputCount: Math.max(0, session.messages.length - 1),
|
|
1724
1995
|
output: { role: 'assistant', content: danglingPartial, timestamp: Date.now(), agentId: _agentId },
|
|
1725
1996
|
durationMs: 0,
|
|
@@ -1778,13 +2049,13 @@ export class SessionAwareRunner {
|
|
|
1778
2049
|
this.appendTurnEnd(session.messages, currentTurnId);
|
|
1779
2050
|
}
|
|
1780
2051
|
// 11. 引擎异常退出时的 session 一致性修复(须在 Observer final 采样之前)
|
|
1781
|
-
if (!
|
|
2052
|
+
if (!hasStepEnd) {
|
|
1782
2053
|
const fallbackContent = streamedContent || '';
|
|
1783
2054
|
const failedRun = adaptState.loopEndReason === 'error';
|
|
1784
2055
|
// 失败 run 空正文也留账(与 error turn_end 口径一致);正常/崩溃路径仍按有内容才记
|
|
1785
2056
|
if (fallbackContent || failedRun) {
|
|
1786
2057
|
// 失败 run 的部分流出不得冒充 assistant 回复入历史——失败凭证已由
|
|
1787
|
-
// runStopped 消息承担;只落一条带 error 标记的
|
|
2058
|
+
// runStopped 消息承担;只落一条带 error 标记的 step 账本保留审计。
|
|
1788
2059
|
if (!failedRun) {
|
|
1789
2060
|
session.messages.push({
|
|
1790
2061
|
role: 'assistant',
|
|
@@ -1793,11 +2064,13 @@ export class SessionAwareRunner {
|
|
|
1793
2064
|
agentId: _agentId,
|
|
1794
2065
|
});
|
|
1795
2066
|
}
|
|
1796
|
-
session.
|
|
1797
|
-
id: `
|
|
2067
|
+
session.steps.push({
|
|
2068
|
+
id: `step_${Date.now()}`,
|
|
1798
2069
|
inputCount: Math.max(0, session.messages.length - 1),
|
|
1799
2070
|
output: { role: 'assistant', content: fallbackContent, timestamp: Date.now(), agentId: _agentId },
|
|
1800
|
-
usage
|
|
2071
|
+
// 兜底合成记录:失败轮不写 usage(与上文账本口径一致,禁止拿别步用量凑数);
|
|
2072
|
+
// 非失败轮只在本 Run 确有实测时带上(评审 F7)
|
|
2073
|
+
...(!failedRun && lastUsage ? { usage: lastUsage } : {}),
|
|
1801
2074
|
durationMs: 0,
|
|
1802
2075
|
model: effectiveRunConfig.model ?? 'unknown',
|
|
1803
2076
|
timestamp: Date.now(),
|
|
@@ -1808,7 +2081,7 @@ export class SessionAwareRunner {
|
|
|
1808
2081
|
// Observer:记录最终 messages 与 endReason(真正 close 在 finally,保证异常也闭合)
|
|
1809
2082
|
observerFinalMessages = session.messages;
|
|
1810
2083
|
// P5: 使用 stopReason 区分终态(context_stopped / behavior_stopped / policy_stopped / security_stopped / completed)
|
|
1811
|
-
// LLM 错误路径只设 loopEndReason='error'、不设 stopReason;若在此回落到
|
|
2084
|
+
// LLM 错误路径只设 loopEndReason='error'、不设 stopReason;若在此回落到 hasStepEnd,
|
|
1812
2085
|
// 一次彻底失败会被记成 completed(run.timing / Observer / 指标全部失真)。
|
|
1813
2086
|
observerEndReason =
|
|
1814
2087
|
adaptState.stopReason ??
|
|
@@ -1816,13 +2089,13 @@ export class SessionAwareRunner {
|
|
|
1816
2089
|
? 'error'
|
|
1817
2090
|
: adaptState.loopEndReason === 'aborted'
|
|
1818
2091
|
? 'aborted'
|
|
1819
|
-
:
|
|
2092
|
+
: hasStepEnd
|
|
1820
2093
|
? 'completed'
|
|
1821
2094
|
: 'no_turn_end');
|
|
1822
|
-
// 中止标记:仅在本轮**未完成**被掐断时打标(
|
|
2095
|
+
// 中止标记:仅在本轮**未完成**被掐断时打标(hasStepEnd = 正常收尾)。
|
|
1823
2096
|
// 迟到 abort / signal 竞态不得给已完成轮贴编辑重发。
|
|
1824
2097
|
let clearAbortedTurn = false;
|
|
1825
|
-
const abortedMidTurn = runAborted || (Boolean(signal?.aborted) && !
|
|
2098
|
+
const abortedMidTurn = runAborted || (Boolean(signal?.aborted) && !hasStepEnd);
|
|
1826
2099
|
// L3:中止保留 undo(供编辑重发 discard);其余出口 commit(继续对话=隐式提交)
|
|
1827
2100
|
if (turnFileUndo) {
|
|
1828
2101
|
// Observer tool.effect:效应账本摘要(§5.6)
|
|
@@ -1863,17 +2136,46 @@ export class SessionAwareRunner {
|
|
|
1863
2136
|
sm.transition('idle');
|
|
1864
2137
|
session.meta.status = sm.state;
|
|
1865
2138
|
session.meta.updatedAt = Date.now();
|
|
1866
|
-
//
|
|
1867
|
-
|
|
1868
|
-
writeSessionCompact(session, _agentId, compactSnap);
|
|
2139
|
+
// 压缩覆盖/摘要正文由转换记录账本持久(sessions/<sid>/transform/);
|
|
2140
|
+
// 旧 contextCompact 快照停写(仅作迁移输入读取,见引擎 loadCompactState)。
|
|
1869
2141
|
// 上下文用量随会话持久化:重开会话恢复显示(不靠 UI 用末页消息猜)。
|
|
1870
|
-
//
|
|
1871
|
-
|
|
2142
|
+
// 三量纲分账(P0-C):promptTokensActual=实测单源(无实测不写、保留旧值不动)、
|
|
2143
|
+
// viewTokensEst=请求视图估算、rawTokens=全量原文估算;compact 视图值不写入。
|
|
2144
|
+
if (lastPromptTokensActual !== undefined ||
|
|
2145
|
+
lastViewTokensEst !== undefined ||
|
|
2146
|
+
lastRawTokens !== undefined ||
|
|
2147
|
+
lastContextWindow !== undefined ||
|
|
2148
|
+
lastContextSize !== undefined) {
|
|
1872
2149
|
session.metadata = {
|
|
1873
2150
|
...session.metadata,
|
|
1874
|
-
|
|
2151
|
+
// 校准状态持久化(取舍③配套):锚+样本计数随会话落盘,restore 后回填
|
|
2152
|
+
...(typeof this.harness.exportCalibration === 'function'
|
|
2153
|
+
? { calibration: this.harness.exportCalibration() }
|
|
2154
|
+
: {}),
|
|
2155
|
+
...(lastPromptTokensActual !== undefined ? { promptTokensActual: lastPromptTokensActual } : {}),
|
|
2156
|
+
...(lastViewTokensEst !== undefined ? { viewTokensEst: lastViewTokensEst } : {}),
|
|
2157
|
+
...(lastRawTokens !== undefined ? { rawTokens: lastRawTokens } : {}),
|
|
1875
2158
|
...(lastContextWindow !== undefined ? { contextWindow: lastContextWindow } : {}),
|
|
2159
|
+
// contextSize 显示槽(web 顶栏唯一取数源):冷恢复不回退压缩前读数(F8)
|
|
2160
|
+
...(lastContextSize !== undefined ? { contextSize: lastContextSize } : {}),
|
|
1876
2161
|
};
|
|
2162
|
+
if (lastPromptTokensActual !== undefined) {
|
|
2163
|
+
console.log(`[ctx] session=${sessionId} writer=${lastPromptWriter} field=promptTokensActual value=${lastPromptTokensActual} (persist)`);
|
|
2164
|
+
}
|
|
2165
|
+
if (lastViewTokensEst !== undefined) {
|
|
2166
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=viewTokensEst value=${lastViewTokensEst} (persist)`);
|
|
2167
|
+
}
|
|
2168
|
+
if (lastRawTokens !== undefined) {
|
|
2169
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=rawTokens value=${lastRawTokens} (persist)`);
|
|
2170
|
+
}
|
|
2171
|
+
}
|
|
2172
|
+
// 存量校正(P0-C):旧 metadata.contextTokens 混装实测/估算、来源不可区分,显式清除。
|
|
2173
|
+
// save 浅合并删不掉键:先从对象移除,persist 后 updateMetadata 真删(同 abortedTurn)
|
|
2174
|
+
let clearLegacyContextTokens = false;
|
|
2175
|
+
if (session.metadata && 'contextTokens' in session.metadata) {
|
|
2176
|
+
const { contextTokens: _legacyCtx, ...restMeta } = session.metadata;
|
|
2177
|
+
session.metadata = restMeta;
|
|
2178
|
+
clearLegacyContextTokens = true;
|
|
1877
2179
|
}
|
|
1878
2180
|
await this.store.save(sessionId, session);
|
|
1879
2181
|
// 收尾权威写成功:剩余注入条目一并确认(此后 close 不再重投)
|
|
@@ -1888,6 +2190,11 @@ export class SessionAwareRunner {
|
|
|
1888
2190
|
delete meta.lastStop;
|
|
1889
2191
|
});
|
|
1890
2192
|
}
|
|
2193
|
+
if (clearLegacyContextTokens && this.store.updateMetadata) {
|
|
2194
|
+
await this.store.updateMetadata(sessionId, (meta) => {
|
|
2195
|
+
delete meta.contextTokens;
|
|
2196
|
+
});
|
|
2197
|
+
}
|
|
1891
2198
|
// 通知子系统:本轮处理完成(保持 active,但刷新 lastInteractionAt)
|
|
1892
2199
|
this._backfillTrigger?.noteActivity(sessionId, _agentId, session.meta.lastInteractionAt);
|
|
1893
2200
|
this.emitObserved({
|
|
@@ -1945,6 +2252,17 @@ export class SessionAwareRunner {
|
|
|
1945
2252
|
throw err;
|
|
1946
2253
|
}
|
|
1947
2254
|
finally {
|
|
2255
|
+
// in-run 压缩槽清理:残留请求 reject(InRunCompactUnavailable)→ 调用方
|
|
2256
|
+
// fallback 锁路径执行。不在 finally 执行压缩——那会拖慢 abort 收尾;
|
|
2257
|
+
// 锁路径在本 handle 释放锁后立即可执行,语义无缝(方案 A)。
|
|
2258
|
+
this.activeHandleSessions.delete(sessionId);
|
|
2259
|
+
const pendingCompacts = this.inRunCompactRequests.get(sessionId);
|
|
2260
|
+
if (pendingCompacts) {
|
|
2261
|
+
this.inRunCompactRequests.delete(sessionId);
|
|
2262
|
+
for (const req of pendingCompacts) {
|
|
2263
|
+
req.reject(new InRunCompactUnavailable(`in_run_compact: run for session "${sessionId}" ended before the next seam`));
|
|
2264
|
+
}
|
|
2265
|
+
}
|
|
1948
2266
|
// run 收口:reason = 观测口径,stopReason = 停止闸门。
|
|
1949
2267
|
// 计时进 trace(run.timing);console 保留一条完整生命周期日志——前次事故
|
|
1950
2268
|
// 「run 结束原因零日志、只能靠反推落盘消息定位」,该留痕不随探针删除。
|
|
@@ -2036,6 +2354,82 @@ export class SessionAwareRunner {
|
|
|
2036
2354
|
}
|
|
2037
2355
|
}
|
|
2038
2356
|
}
|
|
2357
|
+
/**
|
|
2358
|
+
* 某会话的 LLM 工具面(wire 面)——「无 run」调用方(manual 压缩)的单一来源。
|
|
2359
|
+
*
|
|
2360
|
+
* 与 run 内组装(`runContext.tools`)同式:`agent.toolsForSession` ∩ `agentToolPolicy`
|
|
2361
|
+
* ∩ session ACL `toolRights`(SEC-2 同一漏斗,禁手抄)。摘要请求要吃到前缀缓存,
|
|
2362
|
+
* 它的 tools 必须与下一主请求逐字节相同——多一个少一个,前缀就从第一字节断开。
|
|
2363
|
+
*
|
|
2364
|
+
* 差异如实声明(不假装等价):run 内还能叠 per-run `rightsCeiling` 与 run 启动时的
|
|
2365
|
+
* 工具集快照;这里取不到 run,只能取配置级天花板。ACL 拒绝时不抛——压缩是用户显式
|
|
2366
|
+
* 操作,不应因参与者授权不可用而整体失效——但要打日志(fail loud,不静默)。
|
|
2367
|
+
*
|
|
2368
|
+
* @param sessionId - 会话 id
|
|
2369
|
+
* @param agentId - 归属 agent(ACL 授权主体)
|
|
2370
|
+
* @returns provider 格式工具定义(顺序与会话面一致)
|
|
2371
|
+
*/
|
|
2372
|
+
async resolveSessionLlmTools(sessionId, agentId) {
|
|
2373
|
+
const { buildToolDefinitions } = await import('@octopi-agent/core/loop/agent-loop.js');
|
|
2374
|
+
return buildToolDefinitions(await this.resolveSessionToolSet(sessionId, agentId));
|
|
2375
|
+
}
|
|
2376
|
+
/**
|
|
2377
|
+
* 会话工具面的唯一过滤点(SEC-2 漏斗,禁手抄)
|
|
2378
|
+
*
|
|
2379
|
+
* `resolveSessionLlmTools`(只要 wire 定义)与 `resolveSessionToolSurface`
|
|
2380
|
+
* (wire 定义 + 老化策略)都必须经过这里——**不允许各自复述一遍过滤链**。
|
|
2381
|
+
* 2026-11-13 的前缀分叉正是因为两条路径各自手抄参数表,改一边忘另一边。
|
|
2382
|
+
*
|
|
2383
|
+
* @param sessionId - 会话 id
|
|
2384
|
+
* @param agentId - 归属 agent(ACL 授权主体)
|
|
2385
|
+
* @returns 经 ACL/策略过滤后的 AgentTool 集合
|
|
2386
|
+
*/
|
|
2387
|
+
async resolveSessionToolSet(sessionId, agentId) {
|
|
2388
|
+
const session = await this.store.load(sessionId);
|
|
2389
|
+
let rights;
|
|
2390
|
+
const acl = this.config.sessionAcl;
|
|
2391
|
+
if (acl && session) {
|
|
2392
|
+
const auth = acl.authorizeRun({
|
|
2393
|
+
session,
|
|
2394
|
+
agentId,
|
|
2395
|
+
agentMax: this.config.agentMaxSessionRights,
|
|
2396
|
+
});
|
|
2397
|
+
if (auth.ok) {
|
|
2398
|
+
rights = auth.rights?.toolRights;
|
|
2399
|
+
}
|
|
2400
|
+
else {
|
|
2401
|
+
// 吞掉拒绝原因并继续:压缩不是新 run,不能因 ACL 拒绝而整体不可用;但绝不静默——
|
|
2402
|
+
// 工具面可能因此比主请求宽,摘要退化为 cache-miss(只慢不坏),留痕便于归因。
|
|
2403
|
+
console.warn(`[Runner] compact tool face: session ACL denied (${auth.reason ?? 'unknown'}) ` +
|
|
2404
|
+
`session=${sessionId} agent=${agentId} — summary prefix may miss cache`);
|
|
2405
|
+
}
|
|
2406
|
+
}
|
|
2407
|
+
return this.filterToolsForSessionRights(this.agent.toolsForSession(sessionId), rights, this.config.agentToolPolicy);
|
|
2408
|
+
}
|
|
2409
|
+
/**
|
|
2410
|
+
* 某会话的 wire 工具面 **同时**带出老化策略(manual 压缩专用)
|
|
2411
|
+
*
|
|
2412
|
+
* 为什么必须成对返回:摘要请求的 messages 前缀要与会话请求逐字节相同,
|
|
2413
|
+
* 而 messages 老化依赖 toolAgers。只给 tools(wire 定义)不给 agers,
|
|
2414
|
+
* 摘要视图就会退回默认机械指针 —— 2026-11-13 生产实测:678 个共同工具结果中
|
|
2415
|
+
* 515 个(76%)形态不同 → 前缀从第 2 条消息起就分叉,缓存 0 命中。
|
|
2416
|
+
*
|
|
2417
|
+
* 单一漏斗:内部仍走 {@link resolveSessionLlmTools} 的同一过滤(`toolsForSession`
|
|
2418
|
+
* ∩ `agentToolPolicy` ∩ session ACL),两边不可能出现两份工具集。
|
|
2419
|
+
*
|
|
2420
|
+
* @param sessionId - 会话 id
|
|
2421
|
+
* @param agentId - 归属 agent
|
|
2422
|
+
* @returns wire 工具定义(顺序与会话面一致)与按名索引的老化器
|
|
2423
|
+
*/
|
|
2424
|
+
async resolveSessionToolSurface(sessionId, agentId) {
|
|
2425
|
+
const { buildToolDefinitions } = await import('@octopi-agent/core/loop/agent-loop.js');
|
|
2426
|
+
const surface = await this.resolveSessionToolSet(sessionId, agentId);
|
|
2427
|
+
return {
|
|
2428
|
+
tools: buildToolDefinitions(surface),
|
|
2429
|
+
toolAgers: collectToolAgers(surface),
|
|
2430
|
+
toolArgAgers: collectToolArgAgers(surface),
|
|
2431
|
+
};
|
|
2432
|
+
}
|
|
2039
2433
|
/**
|
|
2040
2434
|
* Session compact under the same session lock as handle (E1/E4).
|
|
2041
2435
|
*
|
|
@@ -2058,35 +2452,166 @@ export class SessionAwareRunner {
|
|
|
2058
2452
|
compacted: false,
|
|
2059
2453
|
reason: 'session not found',
|
|
2060
2454
|
tokensBefore: 0,
|
|
2455
|
+
summarizeAttempted: false,
|
|
2061
2456
|
};
|
|
2062
2457
|
}
|
|
2063
|
-
|
|
2064
|
-
sessionId,
|
|
2065
|
-
agentId,
|
|
2066
|
-
messages: session.messages,
|
|
2067
|
-
summarize: options.summarize,
|
|
2068
|
-
compactTargetTokens: options.compactTargetTokens,
|
|
2069
|
-
// 交接式摘要素材:task 快照(裸状态块,不含对话引导语)随指令尾部注入
|
|
2070
|
-
taskSnapshot: renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
2071
|
-
});
|
|
2072
|
-
if (result.ok && result.summary && result.compacted) {
|
|
2073
|
-
const snap = {
|
|
2074
|
-
summary: result.summary,
|
|
2075
|
-
lastProactiveMessageCount: session.messages.length,
|
|
2076
|
-
lastProactiveCoverEnd: result.coveredMessageCount,
|
|
2077
|
-
lastProactiveTokens: result.tokensAfter,
|
|
2078
|
-
};
|
|
2079
|
-
this.agent.setSessionCompactState(sessionId, agentId, snap);
|
|
2080
|
-
writeSessionCompact(session, agentId, snap);
|
|
2081
|
-
session.meta.updatedAt = Date.now();
|
|
2082
|
-
await this.store.save(sessionId, session);
|
|
2083
|
-
}
|
|
2084
|
-
return result;
|
|
2458
|
+
return await this.runCompactCore(sessionId, agentId, session, options);
|
|
2085
2459
|
}
|
|
2086
2460
|
finally {
|
|
2087
2461
|
release();
|
|
2088
2462
|
}
|
|
2089
2463
|
}
|
|
2464
|
+
/**
|
|
2465
|
+
* 压缩执行核心(**无锁**):两个入口共用——compactSession(锁路径,store 快照)与
|
|
2466
|
+
* in-run 消息缝(run 持锁中,传 handle 内活 session,见 requestInRunCompact)。
|
|
2467
|
+
* 锁语义(E1/E4 单写者)由入口负责,本方法不得再抢锁(自抢即死锁)。
|
|
2468
|
+
*
|
|
2469
|
+
* @param sessionId - 会话 id
|
|
2470
|
+
* @param agentId - compact 视图归属 agent(E4 键)
|
|
2471
|
+
* @param session - 会话数据(消息/任务/compact 快照读口的来源)
|
|
2472
|
+
* @param options - 压缩执行选项(compactStructural 等,已解析)
|
|
2473
|
+
* @param signal - run 中止信号(in-run 路透传至摘要/压缩调用;锁路径不传)
|
|
2474
|
+
* @returns 压缩结果
|
|
2475
|
+
*/
|
|
2476
|
+
async runCompactCore(sessionId, agentId, session, options, signal) {
|
|
2477
|
+
// Compaction Hooks fire exactly once inside the compact engine
|
|
2478
|
+
// (HookedCompactEngine) with the real session identity. Orchestrating a
|
|
2479
|
+
// second vote/observe here double-fired every manual compaction and
|
|
2480
|
+
// observed denials as if they were outcomes.
|
|
2481
|
+
const result = await options.compactStructural({
|
|
2482
|
+
sessionId,
|
|
2483
|
+
agentId,
|
|
2484
|
+
messages: session.messages,
|
|
2485
|
+
summarize: options.summarize,
|
|
2486
|
+
compactTargetTokens: options.compactTargetTokens,
|
|
2487
|
+
// 请求口径计量原料(评审 B1):tools/system 缺失会让 before/after 少算整个
|
|
2488
|
+
// tool schema——「请求口径」名不副实
|
|
2489
|
+
systemPrompt: options.systemPrompt,
|
|
2490
|
+
tools: options.tools,
|
|
2491
|
+
// 老化策略:缺它摘要视图退回默认指针,与会话前缀分叉(2026-11-13 实测 76% 结果形态不同)
|
|
2492
|
+
toolAgers: options.toolAgers,
|
|
2493
|
+
toolArgAgers: options.toolArgAgers,
|
|
2494
|
+
// run 中止信号(F1,评审 del-d0830117):摘要 LLM 调用随 run abort 取消,
|
|
2495
|
+
// 不再挂满 summarizeTimeoutMs(缺省 300s)
|
|
2496
|
+
signal,
|
|
2497
|
+
// 交接式摘要素材:task 快照(裸状态块,不含对话引导语)随指令尾部注入
|
|
2498
|
+
taskSnapshot: renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
2499
|
+
// 旧压缩快照读口(迁移输入):manual 路也要先迁移再产记录,防旧快照在
|
|
2500
|
+
// 下次 assemble 迁移时以更高 seq 反向覆盖新记录
|
|
2501
|
+
loadCompactState: () => readSessionCompact(session, agentId),
|
|
2502
|
+
});
|
|
2503
|
+
// 压缩产物 = 引擎内持久转换记录(append-only);旧 contextCompact 快照不再写回。
|
|
2504
|
+
// contextSize 显示槽持久化(F8:刷新不丢压缩后读数)——manual 压缩完成即写即落盘。
|
|
2505
|
+
// 只在真压缩(compacted)时持久化:零覆盖轮的估算不得覆盖旧实测(评审 F-1)。
|
|
2506
|
+
// 走 updateMetadata 目标写(与 save 同会话串行):compactStructural 可达数十秒,
|
|
2507
|
+
// 整包 save 会用陈旧 session 回写并发更新的 metadata 键(浅合并调用方优先)。
|
|
2508
|
+
if (result.compacted && result.contextSize) {
|
|
2509
|
+
const size = result.contextSize;
|
|
2510
|
+
// 活对象同步(评审 del-d0830117 F2):收尾整包 save 的 metadata 浅合并是
|
|
2511
|
+
// incoming 胜——若不同步活对象,run 收尾会用 run 起点的旧 contextSize
|
|
2512
|
+
// 盖回本次写入(title 三键有 titleUpdatedAt 仲裁,contextSize 没有)
|
|
2513
|
+
session.metadata = { ...session.metadata, contextSize: size };
|
|
2514
|
+
if (this.store.updateMetadata) {
|
|
2515
|
+
await this.store.updateMetadata(sessionId, (meta) => {
|
|
2516
|
+
meta.contextSize = size;
|
|
2517
|
+
});
|
|
2518
|
+
console.log(`[ctx] session=${sessionId} writer=compact field=contextSize value=${size.tokens} (persist)`);
|
|
2519
|
+
}
|
|
2520
|
+
else {
|
|
2521
|
+
// 显式降级不静默:缺 updateMetadata 的 store 丢的是「刷新后仍显示压缩后读数」
|
|
2522
|
+
console.warn(`[ctx] session=${sessionId} writer=compact field=contextSize persist skipped: store lacks updateMetadata`);
|
|
2523
|
+
}
|
|
2524
|
+
}
|
|
2525
|
+
// 传输投影:view 不过锁面(大对象,UI 无需)——唯一投影实现在能力层
|
|
2526
|
+
//(禁止手抄字段表:新可选字段会静默丢失,评审 P3 major)
|
|
2527
|
+
return toCompactTransport(result);
|
|
2528
|
+
}
|
|
2529
|
+
/**
|
|
2530
|
+
* mid-run 手动压缩(方案 A,2026-11-20 拍板):请求交**活跃 run** 在下一个消息缝
|
|
2531
|
+
* 执行同一条 compact 路径(同保护/同摘要/同 transform 记录),不抢 session 锁
|
|
2532
|
+
* (run 持锁中,自抢即死锁)。同 (sessionId, agentId) 的并发请求 coalesce 到
|
|
2533
|
+
* 同一次缝执行。无活跃 run / run 已收尾 → 抛 InRunCompactUnavailable,
|
|
2534
|
+
* 调用方落回 compactSession 锁路径(FIFO 立即执行)。
|
|
2535
|
+
*
|
|
2536
|
+
* @param sessionId - 会话 id
|
|
2537
|
+
* @param agentId - compact 视图归属 agent(E4 键)
|
|
2538
|
+
* @param options - 与 compactSession 同形的解析结果(compactStructural 等)
|
|
2539
|
+
* @returns 压缩结果(下一个消息缝执行完成后 resolve)
|
|
2540
|
+
* @throws {InRunCompactUnavailable} 无活跃 run 可承接(调用方 fallback 锁路径)
|
|
2541
|
+
*/
|
|
2542
|
+
requestInRunCompact(sessionId, agentId, options) {
|
|
2543
|
+
const runAgentId = this.activeHandleSessions.get(sessionId);
|
|
2544
|
+
if (runAgentId === undefined) {
|
|
2545
|
+
return Promise.reject(new InRunCompactUnavailable(`in_run_compact: no active run for session "${sessionId}"`));
|
|
2546
|
+
}
|
|
2547
|
+
if (runAgentId !== agentId) {
|
|
2548
|
+
// E4 键(评审 del-d0830117 F4):压缩归属 agent ≠ run 归属 agent 时不得在
|
|
2549
|
+
// 别人 run 的缝里静默执行(用错账本 + 别人的活消息)——落回锁路径自行消歧
|
|
2550
|
+
return Promise.reject(new InRunCompactUnavailable(`in_run_compact: run agent "${runAgentId}" does not match compact agent "${agentId}"`));
|
|
2551
|
+
}
|
|
2552
|
+
const coalesceKey = `${sessionId}\u0000${agentId}`;
|
|
2553
|
+
const inflight = this.inFlightCompacts.get(coalesceKey);
|
|
2554
|
+
// F5:执行期间(已 drain、未完成)的点击 join 当前执行——不重复烧 LLM
|
|
2555
|
+
if (inflight)
|
|
2556
|
+
return inflight;
|
|
2557
|
+
let queue = this.inRunCompactRequests.get(sessionId);
|
|
2558
|
+
if (!queue) {
|
|
2559
|
+
queue = [];
|
|
2560
|
+
this.inRunCompactRequests.set(sessionId, queue);
|
|
2561
|
+
}
|
|
2562
|
+
// coalesce:同键已有未执行请求 → 复用其承诺(压缩语义幂等,重复执行只烧 LLM)
|
|
2563
|
+
const existing = queue.find((r) => r.agentId === agentId);
|
|
2564
|
+
if (existing)
|
|
2565
|
+
return existing.promise;
|
|
2566
|
+
let resolve;
|
|
2567
|
+
let reject;
|
|
2568
|
+
const promise = new Promise((res, rej) => {
|
|
2569
|
+
resolve = res;
|
|
2570
|
+
reject = rej;
|
|
2571
|
+
});
|
|
2572
|
+
queue.push({ agentId, options, resolve, reject, promise });
|
|
2573
|
+
return promise;
|
|
2574
|
+
}
|
|
2575
|
+
/**
|
|
2576
|
+
* 消息缝执行 in-run 压缩队列(consumeMessages 缝上调用;run 持锁,单写者)。
|
|
2577
|
+
* 逐条执行、逐条结算;单条失败只 reject 该条,不拖垮队列。
|
|
2578
|
+
*
|
|
2579
|
+
* @param sessionId - 会话 id
|
|
2580
|
+
* @param session - handle 内活 session(消息/任务最新视图)
|
|
2581
|
+
*/
|
|
2582
|
+
async drainInRunCompacts(sessionId, session, signal) {
|
|
2583
|
+
const queue = this.inRunCompactRequests.get(sessionId);
|
|
2584
|
+
if (!queue?.length)
|
|
2585
|
+
return;
|
|
2586
|
+
this.inRunCompactRequests.delete(sessionId);
|
|
2587
|
+
for (const req of queue) {
|
|
2588
|
+
if (signal?.aborted) {
|
|
2589
|
+
// run 已中止:不在收尾路上执行压缩(不拖 abort),交调用方 fallback 锁路径
|
|
2590
|
+
//(承诺仍兑现;锁路径在本 handle 释放锁后立即执行)
|
|
2591
|
+
req.reject(new InRunCompactUnavailable(`in_run_compact: run for session "${sessionId}" aborted`));
|
|
2592
|
+
continue;
|
|
2593
|
+
}
|
|
2594
|
+
const coalesceKey = `${sessionId}\u0000${req.agentId}`;
|
|
2595
|
+
const exec = this.runCompactCore(sessionId, req.agentId, session, req.options, signal)
|
|
2596
|
+
.then((r) => {
|
|
2597
|
+
req.resolve(r);
|
|
2598
|
+
return r;
|
|
2599
|
+
})
|
|
2600
|
+
.catch((err) => {
|
|
2601
|
+
req.reject(err instanceof Error ? err : new Error(String(err)));
|
|
2602
|
+
throw err;
|
|
2603
|
+
})
|
|
2604
|
+
.finally(() => {
|
|
2605
|
+
this.inFlightCompacts.delete(coalesceKey);
|
|
2606
|
+
});
|
|
2607
|
+
// in-flight 登记在 await 之前(跨缝 coalesce 窗口自 finally 开);顺序承重:
|
|
2608
|
+
// 本方法内 delete map / settle 之间不得插入 await 之外的新结算点(防双结算)
|
|
2609
|
+
this.inFlightCompacts.set(coalesceKey, exec);
|
|
2610
|
+
await exec.catch(() => {
|
|
2611
|
+
// 单条失败不拖垮队列(该条已 settle);吞掉避免 unhandled rejection
|
|
2612
|
+
});
|
|
2613
|
+
}
|
|
2614
|
+
}
|
|
2090
2615
|
/**
|
|
2091
2616
|
* 获取 Session 锁(经 SessionLease;E2 键 = sessionId)
|
|
2092
2617
|
*
|
|
@@ -2103,12 +2628,16 @@ export class SessionAwareRunner {
|
|
|
2103
2628
|
* Rights are passed per-run (harness is shared across concurrent sessions).
|
|
2104
2629
|
*/
|
|
2105
2630
|
filterToolsForSessionRights(tools, sessionToolRights, agentToolPolicy) {
|
|
2106
|
-
|
|
2107
|
-
|
|
2108
|
-
|
|
2109
|
-
agentToolPolicy
|
|
2110
|
-
|
|
2111
|
-
|
|
2631
|
+
return tools.filter((t) => {
|
|
2632
|
+
if (!pluginToolPolicyAdapter.isPluginToolCallPermitted(t.name, t.source, agentToolPolicy))
|
|
2633
|
+
return false;
|
|
2634
|
+
if (!agentToolPolicy && !sessionToolRights)
|
|
2635
|
+
return true;
|
|
2636
|
+
return isToolPermitted(t.name, resolveToolCapabilities(t.name), [
|
|
2637
|
+
agentToolPolicy,
|
|
2638
|
+
sessionToolRights,
|
|
2639
|
+
]);
|
|
2640
|
+
});
|
|
2112
2641
|
}
|
|
2113
2642
|
/**
|
|
2114
2643
|
* 创建新 Session
|
|
@@ -2116,7 +2645,7 @@ export class SessionAwareRunner {
|
|
|
2116
2645
|
* 模型 2:`primaryAgentId` = 创建时的 agentId(Accountability)。
|
|
2117
2646
|
* 存储主键 = sessionId;agentId 只作归属/参与投影。
|
|
2118
2647
|
*/
|
|
2119
|
-
createSession(sessionId, agentId) {
|
|
2648
|
+
createSession(sessionId, agentId, tenantId) {
|
|
2120
2649
|
return {
|
|
2121
2650
|
id: sessionId,
|
|
2122
2651
|
agentId,
|
|
@@ -2131,9 +2660,12 @@ export class SessionAwareRunner {
|
|
|
2131
2660
|
sessionStartedAt: Date.now(),
|
|
2132
2661
|
lastInteractionAt: Date.now(),
|
|
2133
2662
|
updatedAt: Date.now(),
|
|
2663
|
+
// §9.1-6:新会话归属 = 派发面 claim(渠道锚/租户会话创建方);
|
|
2664
|
+
// 缺省不落 DEFAULT——存量语义(宿主面)由消费侧归一
|
|
2665
|
+
...(tenantId === undefined ? {} : { tenantId: tenantId }),
|
|
2134
2666
|
},
|
|
2135
2667
|
messages: [],
|
|
2136
|
-
|
|
2668
|
+
steps: [],
|
|
2137
2669
|
metadata: {},
|
|
2138
2670
|
tasks: [],
|
|
2139
2671
|
};
|
|
@@ -2174,9 +2706,10 @@ export class SessionAwareRunner {
|
|
|
2174
2706
|
* @param userMessage - 本 turn 用户消息对象(session.messages 中的同一引用)
|
|
2175
2707
|
* @param turnId - 会话内单调 turn id
|
|
2176
2708
|
* @param turnContextXml - `<turn_context>…</turn_context>` 整段
|
|
2709
|
+
* @param runId - 本 run 归因(`metadata.runId`,tool-result-aging 的 run 起点边界用)
|
|
2177
2710
|
* @throws 若已定形(禁止二次改写)
|
|
2178
2711
|
*/
|
|
2179
|
-
bakeTurnStart(userMessage, turnId, turnContextXml) {
|
|
2712
|
+
bakeTurnStart(userMessage, turnId, turnContextXml, runId) {
|
|
2180
2713
|
const content = userMessage.content;
|
|
2181
2714
|
const text = typeof content === 'string' ? content : getTextContent(content);
|
|
2182
2715
|
if (isTurnStartContent(text)) {
|
|
@@ -2197,7 +2730,9 @@ export class SessionAwareRunner {
|
|
|
2197
2730
|
...content.filter((b) => b.type !== 'text'),
|
|
2198
2731
|
];
|
|
2199
2732
|
}
|
|
2200
|
-
|
|
2733
|
+
// runId:老化的 run 起点归因(tool-result-aging)——同 run 的插话/续 turn
|
|
2734
|
+
// 携带同一 runId,老化边界不随插话推进
|
|
2735
|
+
userMessage.metadata = { ...userMessage.metadata, turnId, runId };
|
|
2201
2736
|
}
|
|
2202
2737
|
/** 构造 turn 闭标消息(write-once 由调用处重复检查保证) */
|
|
2203
2738
|
makeTurnEndMessage(turnId) {
|