@octopi-agent/engine 0.97.15 → 0.102.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/config-schema/agent.d.ts +37 -5
- package/dist/config-schema/agent.js +24 -4
- package/dist/config-schema/context.d.ts +6 -36
- package/dist/config-schema/context.js +4 -28
- package/dist/config-schema/engine.d.ts +61 -160
- package/dist/config-schema/engine.js +1 -5
- package/dist/config-schema/governance.d.ts +10 -1
- package/dist/config-schema/governance.js +38 -1
- package/dist/config-schema/models.d.ts +2 -8
- package/dist/config-schema/models.js +0 -2
- package/dist/config-schema/run.d.ts +2 -2
- package/dist/config-schema/run.js +2 -2
- package/dist/config-schema/shared.d.ts +0 -3
- package/dist/config-schema/shared.js +0 -2
- package/dist/config-schema/substrate.d.ts +14 -88
- package/dist/config-schema/substrate.js +22 -107
- package/dist/config.d.ts +45 -113
- package/dist/config.js +8 -2
- package/dist/harness/activation/dispatcher.js +7 -0
- package/dist/harness/activation/inbox.d.ts +3 -3
- package/dist/harness/activation/inbox.js +3 -3
- package/dist/harness/activation/runtime.js +13 -5
- package/dist/harness/activation/types.d.ts +2 -2
- package/dist/harness/agent/builder.d.ts +34 -2
- package/dist/harness/agent/builder.js +189 -58
- package/dist/harness/agent/config-bridge.js +9 -2
- package/dist/harness/agent/config-integrity.d.ts +66 -0
- package/dist/harness/agent/config-integrity.js +108 -2
- package/dist/harness/agent/wire-agent-builder.d.ts +11 -3
- package/dist/harness/agent/wire-agent-builder.js +31 -7
- package/dist/harness/capabilities/document/factory.d.ts +5 -0
- package/dist/harness/capabilities/document/factory.js +1 -0
- 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/index.d.ts +2 -2
- package/dist/harness/collaboration/autonomous-subsystem/index.js +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/loader.js +4 -1
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.d.ts +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.js +21 -4
- 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/completion-guard.d.ts +40 -0
- package/dist/harness/collaboration/autonomous-subsystem/think/completion-guard.js +59 -0
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/think/index.d.ts +2 -0
- package/dist/harness/collaboration/autonomous-subsystem/think/index.js +1 -0
- package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.js +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/types.d.ts +12 -3
- package/dist/harness/collaboration/delegation/child-run.d.ts +1 -1
- package/dist/harness/collaboration/delegation/child-run.js +4 -4
- 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/service.d.ts +2 -0
- package/dist/harness/collaboration/delegation/service.js +2 -1
- package/dist/harness/collaboration/delegation/store.d.ts +2 -0
- package/dist/harness/collaboration/delegation/store.js +2 -1
- package/dist/harness/collaboration/delegation/types.d.ts +23 -2
- package/dist/harness/collaboration/delegation/types.js +22 -0
- package/dist/harness/collaboration/delegation/wiring.js +11 -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 +0 -6
- package/dist/harness/context/capabilities/compact/engine.js +169 -121
- 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 +5 -1
- package/dist/harness/context/capabilities/compact/index.js +4 -0
- 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 +76 -11
- 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/port.js +0 -1
- package/dist/harness/context/capabilities/summary/resolver.d.ts +1 -1
- package/dist/harness/context/capabilities/summary/resolver.js +4 -9
- package/dist/harness/context/capabilities/summary/tool-binding.d.ts +1 -1
- package/dist/harness/context/capabilities/summary/types.d.ts +4 -7
- package/dist/harness/context/context-size-ledger.d.ts +143 -0
- package/dist/harness/context/context-size-ledger.js +236 -0
- package/dist/harness/context/default-context-engine.d.ts +195 -119
- package/dist/harness/context/default-context-engine.js +1241 -743
- package/dist/harness/context/index.d.ts +2 -2
- package/dist/harness/context/index.js +1 -1
- package/dist/harness/context/layer-types.d.ts +15 -0
- package/dist/harness/context/layer-types.js +14 -1
- package/dist/harness/context/layers.d.ts +16 -19
- package/dist/harness/context/layers.js +42 -14
- package/dist/harness/context/message-selector.d.ts +10 -8
- package/dist/harness/context/message-selector.js +49 -27
- package/dist/harness/context/summarize.d.ts +3 -3
- package/dist/harness/context/summarize.js +11 -4
- package/dist/harness/context/system-prompt-assembler.d.ts +4 -0
- package/dist/harness/context/system-prompt-assembler.js +3 -1
- 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 +6 -1
- package/dist/harness/context/tool-result-aging.js +16 -5
- 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 +127 -117
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +24 -2
- package/dist/harness/extension/execution-environment/effect-policy.js +30 -0
- package/dist/harness/extension/execution-environment/ops-audit.d.ts +7 -3
- package/dist/harness/extension/execution-environment/ops-audit.js +11 -12
- 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/undo-log.d.ts +6 -2
- package/dist/harness/extension/execution-environment/undo-log.js +31 -10
- package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +1 -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/plugins/api.d.ts +83 -249
- package/dist/harness/extension/plugin-ecosystem/plugins/api.js +88 -214
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-registry.d.ts +43 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/contribution-registry.js +61 -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 +50 -117
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.js +316 -285
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.d.ts +23 -490
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.js +85 -353
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.d.ts +41 -223
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.js +138 -19
- package/dist/harness/extension/plugin-ecosystem/plugins/staging.d.ts +15 -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/builtin.js +17 -24
- package/dist/harness/extension/plugin-ecosystem/tools/delegation.js +18 -8
- package/dist/harness/extension/plugin-ecosystem/tools/document-tools.js +3 -9
- package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +3 -6
- package/dist/harness/extension/plugin-ecosystem/tools/file-ops.js +9 -5
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +9 -130
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +122 -14
- package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +4 -13
- package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +25 -11
- package/dist/harness/extension/plugin-ecosystem/tools/platform.js +168 -62
- 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 +11 -2
- 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/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/security/capability-enforcer.js +1 -2
- package/dist/harness/governance/security/default-risk-policy.d.ts +1 -0
- package/dist/harness/governance/security/default-risk-policy.js +1 -0
- package/dist/harness/governance/security/default-security-guard.js +9 -0
- package/dist/harness/governance/security/index.d.ts +1 -0
- package/dist/harness/governance/security/index.js +2 -0
- package/dist/harness/governance/security/risk-evaluator.js +13 -0
- package/dist/harness/governance/security/risk-types.d.ts +12 -0
- package/dist/harness/governance/security/shell-parser-fallback.d.ts +29 -0
- package/dist/harness/governance/security/shell-parser-fallback.js +410 -0
- package/dist/harness/governance/security/shell-parser-shared.d.ts +83 -0
- package/dist/harness/governance/security/shell-parser-shared.js +188 -0
- package/dist/harness/governance/security/shell-parser-treesitter.d.ts +52 -0
- package/dist/harness/governance/security/shell-parser-treesitter.js +370 -0
- package/dist/harness/governance/security/shell-parser.d.ts +23 -10
- package/dist/harness/governance/security/shell-parser.js +37 -496
- package/dist/harness/governance/security/vendor/README.md +24 -0
- package/dist/harness/governance/security/vendor/tree-sitter-bash.LICENSE.txt +21 -0
- package/dist/harness/governance/security/vendor/tree-sitter-bash.wasm +0 -0
- package/dist/harness/index.d.ts +12 -12
- package/dist/harness/index.js +7 -7
- package/dist/harness/knowledge/boot-config.d.ts +55 -0
- package/dist/harness/knowledge/boot-config.js +50 -0
- package/dist/harness/knowledge/catalog-types.d.ts +2 -0
- package/dist/harness/knowledge/client.d.ts +24 -2
- package/dist/harness/knowledge/client.js +19 -5
- package/dist/harness/knowledge/db.js +5 -0
- 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 +6 -0
- package/dist/harness/knowledge/grounding.js +3 -1
- package/dist/harness/knowledge/http-app.js +35 -4
- 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 +3 -0
- package/dist/harness/knowledge/purge.js +5 -2
- package/dist/harness/knowledge/query-service.d.ts +13 -2
- package/dist/harness/knowledge/query-service.js +4 -2
- package/dist/harness/knowledge/query-worker-client.d.ts +9 -1
- package/dist/harness/knowledge/query-worker-client.js +4 -2
- package/dist/harness/knowledge/query-worker.js +4 -2
- package/dist/harness/knowledge/read-http.js +5 -1
- package/dist/harness/knowledge/serve.d.ts +8 -7
- package/dist/harness/knowledge/serve.js +9 -0
- package/dist/harness/knowledge/source-store.js +26 -3
- package/dist/harness/knowledge/start-service-process.d.ts +15 -7
- package/dist/harness/knowledge/start-service-process.js +21 -9
- package/dist/harness/knowledge/types.d.ts +7 -0
- package/dist/harness/knowledge/writer-service.d.ts +37 -9
- package/dist/harness/knowledge/writer-service.js +120 -14
- package/dist/harness/knowledge/writer-worker-client.d.ts +10 -9
- package/dist/harness/knowledge/writer-worker-client.js +20 -2
- package/dist/harness/knowledge/writer-worker.js +9 -1
- package/dist/harness/memory/index.d.ts +6 -2
- package/dist/harness/memory/index.js +4 -1
- package/dist/harness/memory/memory-events.d.ts +25 -0
- package/dist/harness/memory/memory-events.js +38 -0
- package/dist/harness/memory/sqlite/agent-db.js +15 -0
- package/dist/harness/memory/sqlite/wisdom-store.d.ts +7 -2
- package/dist/harness/memory/sqlite/wisdom-store.js +86 -12
- package/dist/harness/memory/steward-policy.d.ts +3 -0
- package/dist/harness/memory/steward-policy.js +1 -1
- package/dist/harness/memory/types.d.ts +47 -7
- package/dist/harness/memory/wisdom-attribution.d.ts +136 -0
- package/dist/harness/memory/wisdom-attribution.js +287 -0
- package/dist/harness/memory/wisdom-events.d.ts +37 -0
- package/dist/harness/memory/wisdom-events.js +61 -0
- package/dist/harness/memory/wisdom-formation.d.ts +31 -1
- package/dist/harness/memory/wisdom-formation.js +130 -33
- package/dist/harness/memory/wisdom-gates.d.ts +14 -0
- package/dist/harness/memory/wisdom-gates.js +59 -19
- package/dist/harness/memory/wisdom.d.ts +7 -2
- package/dist/harness/memory/wisdom.js +49 -2
- package/dist/harness/observability/observer/hub.js +25 -15
- 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 +66 -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/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 +10 -4
- package/dist/harness/run/reliability/run-agent.js +137 -53
- 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-scope.d.ts +41 -4
- package/dist/harness/run/runner.d.ts +71 -31
- package/dist/harness/run/runner.js +368 -106
- 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/transform-store.d.ts +136 -0
- package/dist/harness/session/transform-store.js +302 -0
- package/dist/harness/session/types.d.ts +2 -2
- package/dist/harness/shared/events/agent-event-map.d.ts +46 -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/paths/glob.d.ts +52 -0
- package/dist/harness/shared/paths/glob.js +218 -0
- package/dist/harness/shared/paths/index.d.ts +84 -0
- package/dist/harness/shared/paths/index.js +179 -0
- package/dist/harness/shared/types/agent-definition.d.ts +1 -2
- package/dist/index.d.ts +14 -17
- package/dist/index.js +7 -9
- 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.js +14 -1
- package/dist/integration/providers/openai.js +7 -1
- package/dist/integration/providers/usage.d.ts +1 -1
- package/dist/integration/providers/wire-dump.d.ts +1 -1
- package/dist/integration/storage/archive-manager.d.ts +6 -0
- package/dist/integration/storage/archive-manager.js +10 -0
- package/dist/integration/storage/jsonl.d.ts +1 -1
- package/dist/integration/storage/jsonl.js +18 -16
- package/dist/subsystems/cognition-steward/conceptualize/config.yaml +4 -2
- package/dist/subsystems/cognition-steward/conceptualize/handler.js +12 -20
- package/dist/subsystems/memory-steward/backfill/config.yaml +4 -2
- package/dist/subsystems/memory-steward/backfill/handler.js +44 -52
- package/dist/subsystems/wisdom-steward/attribute/SUBSYSTEM.md +24 -0
- package/dist/subsystems/wisdom-steward/attribute/config.yaml +60 -0
- package/dist/subsystems/wisdom-steward/attribute/handler.d.ts +23 -0
- package/dist/subsystems/wisdom-steward/attribute/handler.js +167 -0
- package/dist/subsystems/wisdom-steward/evaluate/handler.js +3 -1
- package/dist/subsystems/wisdom-steward/formation/SUBSYSTEM.md +8 -1
- package/dist/subsystems/wisdom-steward/formation/config.yaml +13 -5
- package/dist/subsystems/wisdom-steward/formation/handler.js +39 -23
- package/dist/subsystems/wisdom-steward/govern/config.yaml +1 -1
- package/dist/subsystems/wisdom-steward/govern/handler.js +4 -0
- package/package.json +16 -14
- 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,6 +11,7 @@
|
|
|
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,6 +19,7 @@ import { OpsAuditJournal, OpsAuditFileExportSink } from '../extension/execution-
|
|
|
18
19
|
import { getOctopiHome } from '../../paths.js';
|
|
19
20
|
import { extractLayerQuery } from '../context/layer-types.js';
|
|
20
21
|
import { formatTurnEndContent, formatTurnId, formatTurnStartContent, formatTurnContextXml, isTurnStartContent, joinSlotXml, parseTurnIdFromContent, } from '../context/turn-envelope.js';
|
|
22
|
+
import { collectRunAssistantTexts } from '../memory/wisdom-attribution.js';
|
|
21
23
|
import { splitRuntimeEnvironmentInjection, withRuntimeEnvironmentInjection } from '../context/runtime-datetime.js';
|
|
22
24
|
import { loadRootInstructionsInjection } from '../context/root-instructions.js';
|
|
23
25
|
import { extractTaskQueryHints, renderSessionTasksInjection } from '../session/tasks/render.js';
|
|
@@ -26,12 +28,13 @@ import { DEFAULT_TOOL_ISOLATION, resolveToolIsolationCwd, } from '../extension/e
|
|
|
26
28
|
import { mkdirSync } from 'node:fs';
|
|
27
29
|
import { join } from 'node:path';
|
|
28
30
|
import { toSessionFileName } from '@octopi-agent/core/session-filename.js';
|
|
29
|
-
import { readSessionCompact
|
|
31
|
+
import { readSessionCompact } from '../session/compact.js';
|
|
32
|
+
import { toCompactTransport } from '../context/capabilities/compact/types.js';
|
|
30
33
|
import { InProcessSessionLock, } from './concurrency/session-lease.js';
|
|
31
34
|
import { isToolPermitted } from '../governance/session-acl/tool-rights.js';
|
|
32
35
|
import { resolveToolCapabilities } from '../extension/execution-environment/tool-capabilities.js';
|
|
33
36
|
/**
|
|
34
|
-
* 失败凭证消息中附带残句的截断上限(显示用途;完整残句在带 error 标记的
|
|
37
|
+
* 失败凭证消息中附带残句的截断上限(显示用途;完整残句在带 error 标记的 step 账本)
|
|
35
38
|
*
|
|
36
39
|
* 展示型截断,与 wire-dump 的消息截断同性质——不是部署可变参数,故不进配置。
|
|
37
40
|
*/
|
|
@@ -104,25 +107,25 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
104
107
|
return { type: 'engine.error', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: { error: errorText } };
|
|
105
108
|
}
|
|
106
109
|
return { type: 'engine.end', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: { reason: event.reason } };
|
|
107
|
-
case '
|
|
110
|
+
case 'step_start':
|
|
108
111
|
// 必须带 session 元数据:gatewayBus.onAll 以 event.sessionId 为 WS 广播前提
|
|
109
|
-
return { type: '
|
|
112
|
+
return { type: 'step.start', timestamp: event.timestamp, agentId: meta.agentId, sessionId: meta.sessionId, data: {} };
|
|
110
113
|
case 'assistant_message':
|
|
111
114
|
state.assistantContent = typeof event.message.content === 'string' ? event.message.content : '';
|
|
112
115
|
// 完整消息已定稿,本次调用的部分流出功成身退(不得与正文叠加)
|
|
113
116
|
state.callStreamedContent = '';
|
|
114
117
|
return null;
|
|
115
|
-
case '
|
|
118
|
+
case 'step_end': {
|
|
116
119
|
// phase 透传给 UI:pre_tools ≠ 本轮 run 结束(见 architecture.md)
|
|
117
120
|
// 正文口径:优先完整消息;失败轮(error=true)只有本次调用的部分流出,
|
|
118
121
|
// 不得回落到上一次调用的回复冒充本次输出
|
|
119
122
|
const turnContent = state.assistantContent || state.callStreamedContent || '';
|
|
120
|
-
state.
|
|
121
|
-
state.
|
|
123
|
+
state.lastStepContent = turnContent;
|
|
124
|
+
state.lastStepError = Boolean(event.error);
|
|
122
125
|
state.assistantContent = '';
|
|
123
126
|
state.callStreamedContent = '';
|
|
124
127
|
return {
|
|
125
|
-
type: '
|
|
128
|
+
type: 'step.end',
|
|
126
129
|
timestamp: Date.now(),
|
|
127
130
|
agentId: meta.agentId,
|
|
128
131
|
sessionId: meta.sessionId,
|
|
@@ -159,6 +162,7 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
159
162
|
result: event.result.content,
|
|
160
163
|
durationMs: event.result.durationMs,
|
|
161
164
|
purpose: event.result.purpose,
|
|
165
|
+
...(event.result.source === undefined ? {} : { source: event.result.source }),
|
|
162
166
|
},
|
|
163
167
|
};
|
|
164
168
|
case 'stream.fallback_to_sync':
|
|
@@ -177,7 +181,7 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
177
181
|
state.stopMessage =
|
|
178
182
|
budgetReason === 'wall_clock'
|
|
179
183
|
? '本轮运行时间达到预算上限,已停止。'
|
|
180
|
-
: budgetReason === '
|
|
184
|
+
: budgetReason === 'steps'
|
|
181
185
|
? '本轮迭代次数达到预算上限,已停止。'
|
|
182
186
|
: '本轮工具调用次数达到预算上限,已停止。';
|
|
183
187
|
// 对齐 EventBus BUDGET_EXCEEDED;用户可见停止原因
|
|
@@ -265,6 +269,8 @@ export function adaptLoopEvent(event, meta, state) {
|
|
|
265
269
|
export class SessionAwareRunner {
|
|
266
270
|
/** 本 Runner 生效的 L2 级别(由 effectPolicy 展开) */
|
|
267
271
|
effectPathContainment = "none";
|
|
272
|
+
effectRefuseFinalSymlink = false;
|
|
273
|
+
effectPathDenylist = [];
|
|
268
274
|
effectChannel = "engine";
|
|
269
275
|
effectAllowRoots = [];
|
|
270
276
|
/** Effective effectPolicy.mode (for Runtime injection / UI) */
|
|
@@ -328,10 +334,14 @@ export class SessionAwareRunner {
|
|
|
328
334
|
systemPromptAssembler;
|
|
329
335
|
/** Assembler 层缓存清理钩子(可选接线;与 contextDetachIndex 无关) */
|
|
330
336
|
systemPromptAssemblerClear;
|
|
337
|
+
/** Wisdom 归因窗口记账钩子(学习环;不是观测通道,失败不得影响 run 收口) */
|
|
338
|
+
wisdomAttributionSink;
|
|
331
339
|
/** turn 级 Knowledge grounding(可选;arch/knowledge-layer.md §4.4) */
|
|
332
340
|
groundingAssembler;
|
|
333
341
|
/** 模型快照解析器(Gateway 注入;每 run 只调一次) */
|
|
334
342
|
resolveModelOverride;
|
|
343
|
+
/** 无 Gateway 快照时,附件轻量意图分流回退到 Builder 的当前会话 provider。 */
|
|
344
|
+
defaultIntentProvider;
|
|
335
345
|
constructor(agent, harness, store, config) {
|
|
336
346
|
this.agent = agent;
|
|
337
347
|
this.harness = harness;
|
|
@@ -341,6 +351,7 @@ export class SessionAwareRunner {
|
|
|
341
351
|
this._events = config?.events;
|
|
342
352
|
this._observerHub = config?.observerHub;
|
|
343
353
|
this.resolveModelOverride = config?.resolveModelOverride;
|
|
354
|
+
this.defaultIntentProvider = config?.defaultIntentProvider;
|
|
344
355
|
}
|
|
345
356
|
/**
|
|
346
357
|
* ops 审计记账(ops P2):写 hash 链账本。
|
|
@@ -350,9 +361,14 @@ export class SessionAwareRunner {
|
|
|
350
361
|
*
|
|
351
362
|
* @param event - §7 事件词表
|
|
352
363
|
* @param data - 事件载荷(hash 走 canonicalJson,键序无关)
|
|
364
|
+
* @param opts.ignoreRunOverride - true = 忽略 run 级 effectOpsAudit 粘滞值
|
|
365
|
+
* (准入拒绝发生在 run 起点之前,不受上一轮 run 的 opsAudit:'off' 影响)
|
|
353
366
|
*/
|
|
354
|
-
recordOpsAudit(event, data) {
|
|
355
|
-
|
|
367
|
+
recordOpsAudit(event, data, opts) {
|
|
368
|
+
const mode = (opts?.ignoreRunOverride ? undefined : this.effectOpsAudit) ??
|
|
369
|
+
this.config.effectPolicy?.opsAudit ??
|
|
370
|
+
'on';
|
|
371
|
+
if (mode !== 'on')
|
|
356
372
|
return;
|
|
357
373
|
if (!this.opsJournal) {
|
|
358
374
|
// 缺省按 agent 分文件:多 agent 并发追加同一文件会共享 tail → seq 撞号,
|
|
@@ -386,6 +402,32 @@ export class SessionAwareRunner {
|
|
|
386
402
|
this.noteOpsDegradation(`ops_audit_write_failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
387
403
|
}
|
|
388
404
|
}
|
|
405
|
+
/**
|
|
406
|
+
* 对外 ops 记账口(账本 + 观测双写)——run 准入拒绝等发生在 Runner 执行流之外、
|
|
407
|
+
* 但属同一 ops 语义面的事件(如 gateway 侧 knowledge.required 闸门)用它对齐
|
|
408
|
+
* `ops.config.security_changed` / `ops.kill_switch.tripped` 的三件套待遇。
|
|
409
|
+
* (不叫 recordOpsEvent:与工具上下文的同名回调(仅账本)区分。)
|
|
410
|
+
*
|
|
411
|
+
* @param event - §7 事件词表
|
|
412
|
+
* @param data - 事件载荷(hash 走 canonicalJson,入账本)
|
|
413
|
+
* @param origin - 触发者锚点(观测事件的 agentId/sessionId;账本锚未落定时补锚)
|
|
414
|
+
*/
|
|
415
|
+
recordAdmissionRefusal(event, data, origin) {
|
|
416
|
+
// 账本按 agent 分文件:事件发生在 run 起点之前(如准入拒绝)时锚未落定,用 origin 补锚
|
|
417
|
+
if (!this.opsAuditAgentId)
|
|
418
|
+
this.opsAuditAgentId = origin.agentId;
|
|
419
|
+
if (!this.opsAuditSessionId)
|
|
420
|
+
this.opsAuditSessionId = origin.sessionId;
|
|
421
|
+
// 准入拒绝不受上一轮 run 的 effectOpsAudit 粘滞值影响(否则审计缺口重现)
|
|
422
|
+
this.recordOpsAudit(event, data, { ignoreRunOverride: true });
|
|
423
|
+
this.emitObserved({
|
|
424
|
+
type: event,
|
|
425
|
+
timestamp: Date.now(),
|
|
426
|
+
agentId: origin.agentId,
|
|
427
|
+
sessionId: origin.sessionId,
|
|
428
|
+
data: { ...data },
|
|
429
|
+
});
|
|
430
|
+
}
|
|
389
431
|
/** 外送收口(懒建;仅配置了宿主侧收口路径时启用) */
|
|
390
432
|
resolveOpsExporter() {
|
|
391
433
|
const exportPath = this.config.effectPolicy?.opsAuditExportPath ?? this.config.opsAuditExportPath;
|
|
@@ -538,6 +580,12 @@ export class SessionAwareRunner {
|
|
|
538
580
|
this.systemPromptAssembler = assembler;
|
|
539
581
|
this.systemPromptAssemblerClear = clearSession;
|
|
540
582
|
}
|
|
583
|
+
/**
|
|
584
|
+
* 注入 Wisdom 归因窗口记账(run 收尾;学习环)
|
|
585
|
+
*/
|
|
586
|
+
setWisdomAttributionSink(sink) {
|
|
587
|
+
this.wisdomAttributionSink = sink;
|
|
588
|
+
}
|
|
541
589
|
/**
|
|
542
590
|
* 注入 turn 级 Knowledge grounding(可选)
|
|
543
591
|
*/
|
|
@@ -626,10 +674,16 @@ export class SessionAwareRunner {
|
|
|
626
674
|
// buildMs 从拿锁后起算(含 wait 会双重计时;F3-d 耗时区按分段展示)
|
|
627
675
|
const runStartTs = Date.now();
|
|
628
676
|
const _agentId = runConfig.agentId ?? 'default';
|
|
677
|
+
/** 本 run 身份单源(m1,2026-11-09 评审):runScope 构造与 afterStep 归属共用同一对象 */
|
|
678
|
+
const runIdentity = { sessionId, agentId: _agentId };
|
|
629
679
|
/** Observer 收口状态(finally 统一关闭,含异常路径) */
|
|
630
680
|
let observerRunId = '';
|
|
631
681
|
let observerFinalMessages;
|
|
632
682
|
let observerEndReason;
|
|
683
|
+
/** Wisdom 归因窗口素材(装配时抓 sources/query,收尾时切本轮 assistant 文本) */
|
|
684
|
+
let wisdomInjectedIds = [];
|
|
685
|
+
let runQueryText = '';
|
|
686
|
+
let runMessagesBase = 0;
|
|
633
687
|
/**
|
|
634
688
|
* 桥接状态(assistant 文本 / 停止原因)。
|
|
635
689
|
*
|
|
@@ -638,7 +692,7 @@ export class SessionAwareRunner {
|
|
|
638
692
|
*/
|
|
639
693
|
const adaptState = { assistantContent: '', lastUserContent: '' };
|
|
640
694
|
let observerErrorMsg;
|
|
641
|
-
let
|
|
695
|
+
let hasStepEnd = false;
|
|
642
696
|
/** 正常完成时需在持久化后真删 metadata.lastStop(save 浅合并删不掉) */
|
|
643
697
|
let clearLastStop = false;
|
|
644
698
|
/** 本 user turn 内第 N 次 LLM 调用(0-based;cache 观测) */
|
|
@@ -647,7 +701,15 @@ export class SessionAwareRunner {
|
|
|
647
701
|
// 3. 加载或创建 session
|
|
648
702
|
let session = await this.store.load(sessionId);
|
|
649
703
|
if (!session) {
|
|
650
|
-
session = this.createSession(sessionId,
|
|
704
|
+
session = this.createSession(sessionId, _agentId);
|
|
705
|
+
await this.store.save(sessionId, session);
|
|
706
|
+
await this.config.extensionHooks?.observe('session_start', {
|
|
707
|
+
sessionId,
|
|
708
|
+
agentId: _agentId,
|
|
709
|
+
...(runConfig.principal === undefined ? {} : { principal: runConfig.principal }),
|
|
710
|
+
...(signal === undefined ? {} : { signal }),
|
|
711
|
+
reason: 'created',
|
|
712
|
+
});
|
|
651
713
|
}
|
|
652
714
|
/** 上下文租约点之前的 Discourse 前缀(写回时并回,不进默认 LLM 窗口) */
|
|
653
715
|
let contextLeasePrefix = [];
|
|
@@ -657,6 +719,17 @@ export class SessionAwareRunner {
|
|
|
657
719
|
}
|
|
658
720
|
if (!session.tasks)
|
|
659
721
|
session.tasks = [];
|
|
722
|
+
// 校准状态恢复(取舍③配套):上次 run persist 的锚+样本回填——本轮第一请求即
|
|
723
|
+
// anchored/calibrated,消除「重启后跑几轮才校准」冷启动(best-effort:不阻塞 run)
|
|
724
|
+
const persistedCalibration = session.metadata?.calibration;
|
|
725
|
+
if (persistedCalibration && typeof this.harness.importCalibration === 'function') {
|
|
726
|
+
try {
|
|
727
|
+
this.harness.importCalibration(persistedCalibration);
|
|
728
|
+
}
|
|
729
|
+
catch (err) {
|
|
730
|
+
console.warn(`[ctx] session=${sessionId} calibration restore failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
731
|
+
}
|
|
732
|
+
}
|
|
660
733
|
// E6:可选 ACL(注入时才强制);primary 自动 owner;带入 agent 天花板
|
|
661
734
|
const acl = this.config.sessionAcl;
|
|
662
735
|
let sessionToolRights;
|
|
@@ -720,6 +793,28 @@ export class SessionAwareRunner {
|
|
|
720
793
|
await this.persistTurnSeq(sessionId, seq);
|
|
721
794
|
return formatTurnId(seq);
|
|
722
795
|
};
|
|
796
|
+
const extensionHooks = this.config.extensionHooks;
|
|
797
|
+
if (extensionHooks) {
|
|
798
|
+
const originalPrompt = getTextContent(input.content);
|
|
799
|
+
const prepared = await extensionHooks.transform('agent_turn_prepare', {
|
|
800
|
+
sessionId,
|
|
801
|
+
agentId: _agentId,
|
|
802
|
+
...(runConfig.principal === undefined ? {} : { principal: runConfig.principal }),
|
|
803
|
+
...(signal === undefined ? {} : { signal }),
|
|
804
|
+
prompt: originalPrompt,
|
|
805
|
+
messages: session.messages,
|
|
806
|
+
}, originalPrompt);
|
|
807
|
+
if (typeof prepared.value !== 'string') {
|
|
808
|
+
throw new Error('agent_turn_prepare must produce a prompt string');
|
|
809
|
+
}
|
|
810
|
+
if (typeof input.content === 'string')
|
|
811
|
+
input.content = prepared.value;
|
|
812
|
+
else if (Array.isArray(input.content)) {
|
|
813
|
+
input.content = input.content.map((block) => block.type === 'text'
|
|
814
|
+
? { ...block, text: prepared.value }
|
|
815
|
+
: block);
|
|
816
|
+
}
|
|
817
|
+
}
|
|
723
818
|
// 5. 追加用户消息(正文稍后一次定形为 <turn_start>)
|
|
724
819
|
session.messages.push(input);
|
|
725
820
|
session.meta.lastInteractionAt = Date.now();
|
|
@@ -791,7 +886,7 @@ export class SessionAwareRunner {
|
|
|
791
886
|
extractionStatus: 'pending',
|
|
792
887
|
});
|
|
793
888
|
// 注入指标
|
|
794
|
-
this._subsystemRuntime.metrics.update('
|
|
889
|
+
this._subsystemRuntime.metrics.update('step.count', session.messages.filter(m => m.role === 'assistant').length);
|
|
795
890
|
}
|
|
796
891
|
this._subsystemRuntime.applyPendingInjections(session.messages);
|
|
797
892
|
// steering / escalate:当前轮次立即生效(escalate 优先,写入 injectedContext)
|
|
@@ -833,9 +928,9 @@ export class SessionAwareRunner {
|
|
|
833
928
|
sessionId,
|
|
834
929
|
data: { ...driftData },
|
|
835
930
|
});
|
|
836
|
-
throw new Error(`security_config_drift: security-relevant config changed on disk (changed: ${integrity.changed.join(', ')}); ` +
|
|
837
|
-
`restart required to re-attest (restart adopts what is on disk — treat the human restart as the attestation act
|
|
838
|
-
`
|
|
931
|
+
throw new Error(`security_config_drift: security-relevant config changed on disk outside the console channel (changed: ${integrity.changed.join(', ')}); ` +
|
|
932
|
+
`restart required to re-attest (restart adopts what is on disk — treat the human restart as the attestation act). ` +
|
|
933
|
+
`Console/WebUI config writes re-attest automatically; this drift means the file was edited directly, bypassing the console`);
|
|
839
934
|
}
|
|
840
935
|
// ops P5 kill switch:宿主侧急停哨兵——run 准入即拒(不依赖 LLM 判断/agent 合作)
|
|
841
936
|
{
|
|
@@ -868,6 +963,8 @@ export class SessionAwareRunner {
|
|
|
868
963
|
const eff = resolveEffectiveEffectPolicy(this.config.effectPolicy ?? {}, this.config.agentWorkspace ?? effectiveRunConfig.cwd ?? undefined, isolation);
|
|
869
964
|
const sessionExtraRoots = readSessionEffectOverrides(session.metadata).transactionRoots;
|
|
870
965
|
this.effectPathContainment = eff.pathContainment;
|
|
966
|
+
this.effectRefuseFinalSymlink = eff.refuseFinalSymlink;
|
|
967
|
+
this.effectPathDenylist = eff.pathDenylist;
|
|
871
968
|
this.effectChannel = eff.effects;
|
|
872
969
|
this.effectAllowRoots = mergeTransactionRoots(eff.allowRoots, sessionExtraRoots);
|
|
873
970
|
this.effectMode = eff.mode;
|
|
@@ -1030,12 +1127,32 @@ export class SessionAwareRunner {
|
|
|
1030
1127
|
}
|
|
1031
1128
|
// ── Run 级模型快照:每 run 只 resolve 一次(必须在 system assembler 之前)──
|
|
1032
1129
|
const modelRef = this.readRunModelRef(session, effectiveRunConfig);
|
|
1033
|
-
|
|
1130
|
+
let resolvedModel = this.resolveModelOverride
|
|
1034
1131
|
? this.resolveModelOverride({
|
|
1035
1132
|
modelRef,
|
|
1036
1133
|
defaultProvider: effectiveRunConfig.modelProvider,
|
|
1037
1134
|
})
|
|
1038
1135
|
: null;
|
|
1136
|
+
if (extensionHooks && resolvedModel) {
|
|
1137
|
+
const transformed = await extensionHooks.transform('before_model_resolve', {
|
|
1138
|
+
sessionId,
|
|
1139
|
+
agentId: _agentId,
|
|
1140
|
+
...(effectiveRunConfig.principal === undefined ? {} : { principal: effectiveRunConfig.principal }),
|
|
1141
|
+
...(signal === undefined ? {} : { signal }),
|
|
1142
|
+
current: { provider: resolvedModel.providerName, model: resolvedModel.modelName },
|
|
1143
|
+
prompt: getTextContent(input.content),
|
|
1144
|
+
}, { provider: resolvedModel.providerName, model: resolvedModel.modelName });
|
|
1145
|
+
const selection = transformed.value;
|
|
1146
|
+
if (!this.resolveModelOverride)
|
|
1147
|
+
throw new Error('before_model_resolve has no Host model resolver');
|
|
1148
|
+
const transformedModel = this.resolveModelOverride({
|
|
1149
|
+
modelRef: `${selection.provider}/${selection.model}`,
|
|
1150
|
+
});
|
|
1151
|
+
if (!transformedModel) {
|
|
1152
|
+
throw new Error(`before_model_resolve selected an unconfigured model: ${selection.provider}/${selection.model}`);
|
|
1153
|
+
}
|
|
1154
|
+
resolvedModel = transformedModel;
|
|
1155
|
+
}
|
|
1039
1156
|
if (resolvedModel) {
|
|
1040
1157
|
effectiveRunConfig = {
|
|
1041
1158
|
...effectiveRunConfig,
|
|
@@ -1043,6 +1160,33 @@ export class SessionAwareRunner {
|
|
|
1043
1160
|
model: resolvedModel.modelName,
|
|
1044
1161
|
};
|
|
1045
1162
|
}
|
|
1163
|
+
const runId = createRunId(sessionId, _agentId);
|
|
1164
|
+
let pluginRuntimeSnapshot = '';
|
|
1165
|
+
if (extensionHooks) {
|
|
1166
|
+
const collected = await extensionHooks.collect('before_prompt_build', {
|
|
1167
|
+
sessionId,
|
|
1168
|
+
agentId: _agentId,
|
|
1169
|
+
runId,
|
|
1170
|
+
...(effectiveRunConfig.principal === undefined ? {} : { principal: effectiveRunConfig.principal }),
|
|
1171
|
+
...(signal === undefined ? {} : { signal }),
|
|
1172
|
+
prompt: getTextContent(input.content),
|
|
1173
|
+
messages: session.messages,
|
|
1174
|
+
});
|
|
1175
|
+
if (collected.contributions.length > 0) {
|
|
1176
|
+
const { PluginRuntimeSnapshotLayer } = await import('../context/layers.js');
|
|
1177
|
+
const layer = new PluginRuntimeSnapshotLayer(collected.contributions);
|
|
1178
|
+
const content = await layer.assemble({
|
|
1179
|
+
sessionId,
|
|
1180
|
+
agentId: _agentId,
|
|
1181
|
+
messages: session.messages,
|
|
1182
|
+
query: getTextContent(input.content),
|
|
1183
|
+
tokenBudget: Math.max(1, Math.min(this.config.extensionSnapshotBudgetTokens ?? 4096, Math.floor((effectiveRunConfig.contextWindow ?? 8192) * 0.1))),
|
|
1184
|
+
systemBudget: Math.floor((effectiveRunConfig.contextWindow ?? 8192) * 0.6),
|
|
1185
|
+
...(signal === undefined ? {} : { signal }),
|
|
1186
|
+
});
|
|
1187
|
+
pluginRuntimeSnapshot = content?.text ?? '';
|
|
1188
|
+
}
|
|
1189
|
+
}
|
|
1046
1190
|
// system prompt 终装:Assembler(层契约)优先,否则退回字符串拼接
|
|
1047
1191
|
// 结果只写入 runContext / RunScope,不作为「Agent 当前会话状态」
|
|
1048
1192
|
if (this.systemPromptAssembler) {
|
|
@@ -1066,6 +1210,12 @@ export class SessionAwareRunner {
|
|
|
1066
1210
|
: null;
|
|
1067
1211
|
if (assembled.manifest) {
|
|
1068
1212
|
const assembledAt = Date.now();
|
|
1213
|
+
const layerQuery = extractLayerQuery(session.messages, { topicHints });
|
|
1214
|
+
// 归因窗口素材(学习环,非观测):本轮 wisdom sources + query + 消息基线
|
|
1215
|
+
wisdomInjectedIds =
|
|
1216
|
+
assembled.manifest.layers.find((l) => l.id === 'wisdom')?.sources ?? [];
|
|
1217
|
+
runQueryText = layerQuery;
|
|
1218
|
+
runMessagesBase = session.messages.length;
|
|
1069
1219
|
this.emitObserved({
|
|
1070
1220
|
type: 'context.layers.assembled',
|
|
1071
1221
|
timestamp: assembledAt,
|
|
@@ -1076,7 +1226,7 @@ export class SessionAwareRunner {
|
|
|
1076
1226
|
agentId: _agentId,
|
|
1077
1227
|
manifest: assembled.manifest,
|
|
1078
1228
|
enabledLayerIds: assembled.manifest.layers.map((l) => l.id),
|
|
1079
|
-
query:
|
|
1229
|
+
query: layerQuery,
|
|
1080
1230
|
assembledAt,
|
|
1081
1231
|
},
|
|
1082
1232
|
});
|
|
@@ -1177,8 +1327,7 @@ export class SessionAwareRunner {
|
|
|
1177
1327
|
console.warn(`[octopi] toolIsolation session-subdir mkdir failed (session=${sessionId}, cwd=${resolvedToolCwd.cwd}): ${err instanceof Error ? err.message : String(err)}`);
|
|
1178
1328
|
}
|
|
1179
1329
|
}
|
|
1180
|
-
// Run
|
|
1181
|
-
const runId = createRunId(sessionId, _agentId);
|
|
1330
|
+
// Run 身份已在 Prompt Collect 前生成;Observer/审计复用同一 ID。
|
|
1182
1331
|
const attachmentRoots = this.config.sessionsDir
|
|
1183
1332
|
? [join(this.config.sessionsDir, toSessionFileName(sessionId), 'attachments')]
|
|
1184
1333
|
: undefined;
|
|
@@ -1208,11 +1357,19 @@ export class SessionAwareRunner {
|
|
|
1208
1357
|
? [resolveSessionUndoPaths(this.config.sessionsDir, sessionId).root]
|
|
1209
1358
|
: undefined;
|
|
1210
1359
|
const runScope = {
|
|
1211
|
-
|
|
1212
|
-
agentId: _agentId,
|
|
1360
|
+
...runIdentity,
|
|
1213
1361
|
runId,
|
|
1362
|
+
principal: effectiveRunConfig.principal,
|
|
1363
|
+
prompt: getTextContent(input.content),
|
|
1364
|
+
resolvedModel: resolvedModel ?? undefined,
|
|
1365
|
+
extensionSnapshotBudgetTokens: this.config.extensionSnapshotBudgetTokens,
|
|
1366
|
+
resolveConfiguredModel: this.resolveModelOverride
|
|
1367
|
+
? (selection) => this.resolveModelOverride({ modelRef: `${selection.provider}/${selection.model}` })
|
|
1368
|
+
: undefined,
|
|
1214
1369
|
systemPrompt: runContext.systemPrompt,
|
|
1215
1370
|
agentRevision: effectiveRunConfig.agentRevision,
|
|
1371
|
+
// 交接式摘要素材(F8R-05):每次装配现取活任务快照(attachSession 同对象)
|
|
1372
|
+
taskSnapshot: () => renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
1216
1373
|
toolRuntime: {
|
|
1217
1374
|
sessionId,
|
|
1218
1375
|
agentId: _agentId,
|
|
@@ -1246,6 +1403,8 @@ export class SessionAwareRunner {
|
|
|
1246
1403
|
? [resolvedToolCwd.cwd]
|
|
1247
1404
|
: undefined,
|
|
1248
1405
|
pathContainment: this.effectPathContainment,
|
|
1406
|
+
refuseFinalSymlink: this.effectRefuseFinalSymlink,
|
|
1407
|
+
pathDenylist: this.effectPathDenylist,
|
|
1249
1408
|
confirmEffect: this.config.confirmEffect,
|
|
1250
1409
|
effectChannel: this.effectChannel,
|
|
1251
1410
|
escalation: this.effectEscalation,
|
|
@@ -1311,18 +1470,18 @@ export class SessionAwareRunner {
|
|
|
1311
1470
|
fullTextMaxChars: this.config.sessionAttachmentInject?.fullTextMaxChars ?? 12_000,
|
|
1312
1471
|
intent: this.config.sessionAttachmentInject?.intent ?? 'llm',
|
|
1313
1472
|
timeoutMs: this.config.sessionAttachmentInject?.intentTimeoutMs ?? 800,
|
|
1314
|
-
resolver: resolvedModel?.provider
|
|
1315
|
-
? createLlmIntentResolver(resolvedModel.
|
|
1473
|
+
resolver: resolvedModel?.provider ?? this.defaultIntentProvider
|
|
1474
|
+
? createLlmIntentResolver((resolvedModel?.provider ?? this.defaultIntentProvider))
|
|
1316
1475
|
: undefined,
|
|
1317
1476
|
});
|
|
1318
|
-
|
|
1477
|
+
const grounding = await buildAttachmentGroundingText(items, {
|
|
1319
1478
|
fullTextMaxChars: this.config.sessionAttachmentInject?.fullTextMaxChars ?? 12_000,
|
|
1479
|
+
recallTopK: this.config.sessionAttachmentInject?.recallTopK ?? 6,
|
|
1320
1480
|
readText: (id, max) => attachSvc.readExtractedText(sessionId, id, max),
|
|
1321
1481
|
absolutePath: (id) => attachSvc.resolveAbsolutePath(sessionId, id),
|
|
1322
|
-
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
}
|
|
1482
|
+
recall: (query, ids, limit) => attachSvc.recall(sessionId, query, ids, limit),
|
|
1483
|
+
}, plan);
|
|
1484
|
+
attachmentText = grounding.text;
|
|
1326
1485
|
}
|
|
1327
1486
|
}
|
|
1328
1487
|
}
|
|
@@ -1333,7 +1492,7 @@ export class SessionAwareRunner {
|
|
|
1333
1492
|
const slotsXml = joinSlotXml([
|
|
1334
1493
|
{
|
|
1335
1494
|
tag: 'runtime_snapshot',
|
|
1336
|
-
body: runtimeSnapshotText
|
|
1495
|
+
body: [runtimeSnapshotText, pluginRuntimeSnapshot].filter(Boolean).join('\n\n'),
|
|
1337
1496
|
},
|
|
1338
1497
|
{
|
|
1339
1498
|
tag: 'session_attachments',
|
|
@@ -1421,17 +1580,21 @@ export class SessionAwareRunner {
|
|
|
1421
1580
|
}
|
|
1422
1581
|
}
|
|
1423
1582
|
}
|
|
1424
|
-
// Token
|
|
1583
|
+
// Token 估算器(rawTokens = 全量原文估算;P0-C 起不再充当 contextTokens 回退)
|
|
1425
1584
|
const estimator = new HeuristicTokenEstimator();
|
|
1426
1585
|
// 10. 运行 Agent(Agent.run = reliability 包装;context/runScope 为本 Run 私有)
|
|
1427
1586
|
let streamedContent = '';
|
|
1428
1587
|
let lastUsage = undefined;
|
|
1429
|
-
/**
|
|
1430
|
-
let
|
|
1588
|
+
/** 三量纲账(供收尾持久化;compact 视图值不进此账):实测单源 + 两个分流估算 */
|
|
1589
|
+
let lastPromptTokensActual = undefined;
|
|
1590
|
+
/** 最近一次 promptTokensActual 写入的来源(收尾持久化审计:usage=本步实测 / stale=沿用旧实测) */
|
|
1591
|
+
let lastPromptWriter = 'usage';
|
|
1592
|
+
let lastViewTokensEst = undefined;
|
|
1593
|
+
let lastRawTokens = undefined;
|
|
1431
1594
|
let lastContextWindow = undefined;
|
|
1432
1595
|
const meta = { agentId: effectiveRunConfig.agentId ?? 'default', sessionId };
|
|
1433
|
-
/** 本轮起始消息下标(
|
|
1434
|
-
let
|
|
1596
|
+
/** 本轮起始消息下标(afterStep 只传增量) */
|
|
1597
|
+
let stepStartIndex = runContext.messages.length;
|
|
1435
1598
|
/** 用户中止(编辑重发标记用) */
|
|
1436
1599
|
let runAborted = false;
|
|
1437
1600
|
/** 被接续消息的收尾通道(频道回复捕获等);消费后转发本 Run 全部事件 */
|
|
@@ -1521,7 +1684,7 @@ export class SessionAwareRunner {
|
|
|
1521
1684
|
flushInboxAcks();
|
|
1522
1685
|
}
|
|
1523
1686
|
}
|
|
1524
|
-
else if (loopEvent.type === '
|
|
1687
|
+
else if (loopEvent.type === 'step_end') {
|
|
1525
1688
|
// 漂移兜底:turn 边界无条件对齐一次(旁路写者整包回退后即使暂无
|
|
1526
1689
|
// 新消息也能自愈;无漂移时幂等零写)
|
|
1527
1690
|
if (await this.persistRunMessages(sessionId, _agentId, contextLeasePrefix, runContext.messages)) {
|
|
@@ -1534,20 +1697,47 @@ export class SessionAwareRunner {
|
|
|
1534
1697
|
// 适配事件格式(向后兼容)
|
|
1535
1698
|
const adapted = adaptLoopEvent(loopEvent, meta, adaptState);
|
|
1536
1699
|
if (adapted) {
|
|
1537
|
-
// 捕获 usage 数据,并在
|
|
1700
|
+
// 捕获 usage 数据,并在 step.end 事件中附加上下文信息(必须在 yield 之前,
|
|
1538
1701
|
// 否则 gateway 收到事件后立即广播,data 里还没有 context 字段)
|
|
1539
|
-
if (adapted.type === '
|
|
1702
|
+
if (adapted.type === 'step.end') {
|
|
1540
1703
|
const rawUsage = adapted.data?.usage;
|
|
1541
1704
|
if (rawUsage) {
|
|
1542
1705
|
lastUsage = rawUsage;
|
|
1543
1706
|
}
|
|
1544
|
-
const
|
|
1545
|
-
|
|
1546
|
-
|
|
1547
|
-
|
|
1548
|
-
|
|
1549
|
-
|
|
1550
|
-
|
|
1707
|
+
const eventData = adapted.data;
|
|
1708
|
+
// contextTokens 单源(P0-C):promptTokensActual 只记 provider 实测(本步 usage,
|
|
1709
|
+
// 无则沿用最近实测并标记 stale);无实测不更新、不猜——估算一律分流,不得冒充实测。
|
|
1710
|
+
// 每次写入打 [ctx] 审计(估算分支零日志是 600k 误显排查的最大盲区)。
|
|
1711
|
+
const promptActual = rawUsage
|
|
1712
|
+
? (rawUsage.inputReportedTokens ??
|
|
1713
|
+
rawUsage.inputUncachedTokens + rawUsage.inputCachedTokens + rawUsage.inputCacheWriteTokens)
|
|
1714
|
+
: lastPromptTokensActual;
|
|
1715
|
+
// 0 不是实测:provider 未回报 usage 时适配层会把缺失字段补 0(usage.ts),
|
|
1716
|
+
// 全零 usage 按「无实测」处理,不得写成实测(同样不更新、不猜)
|
|
1717
|
+
if (promptActual !== undefined && promptActual > 0) {
|
|
1718
|
+
const promptWriter = rawUsage ? 'usage' : 'stale';
|
|
1719
|
+
eventData.promptTokensActual = promptActual;
|
|
1720
|
+
lastPromptTokensActual = promptActual;
|
|
1721
|
+
lastPromptWriter = promptWriter;
|
|
1722
|
+
console.log(`[ctx] session=${sessionId} writer=${promptWriter} field=promptTokensActual value=${promptActual}`);
|
|
1723
|
+
}
|
|
1724
|
+
// viewTokensEst = 本请求视图估算(校准后,assemble/pressure 口径);
|
|
1725
|
+
// rawTokens = 全量原文估算(只进 Run 页签,永不冒充上下文用量)
|
|
1726
|
+
const pressure = this.harness.getContextPressure?.(sessionId);
|
|
1727
|
+
if (typeof pressure?.estimatedTokens === 'number') {
|
|
1728
|
+
eventData.viewTokensEst = pressure.estimatedTokens;
|
|
1729
|
+
lastViewTokensEst = pressure.estimatedTokens;
|
|
1730
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=viewTokensEst value=${pressure.estimatedTokens}`);
|
|
1731
|
+
}
|
|
1732
|
+
// rawTokens = 全量原文估算(只进 Run 页签,永不冒充上下文用量)。
|
|
1733
|
+
// 口径必须是 runContext.messages:fork/delegation 场景 :1981 会把
|
|
1734
|
+
// runContext.messages 重绑定到工作集,session.messages 停在重绑定前的
|
|
1735
|
+
// 快照(cs-* 会话 rawTokens 恒 4,203 的实锤),量它 = 量旧集合。
|
|
1736
|
+
const rawTokens = estimator.estimateMessages(runContext.messages);
|
|
1737
|
+
eventData.rawTokens = rawTokens;
|
|
1738
|
+
lastRawTokens = rawTokens;
|
|
1739
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=rawTokens value=${rawTokens}`);
|
|
1740
|
+
eventData.contextWindow = effectiveRunConfig.contextWindow;
|
|
1551
1741
|
// cache 观测:user 轮首调用 vs 同轮后续(跨轮前缀是否命中)
|
|
1552
1742
|
if (lastUsage) {
|
|
1553
1743
|
const cached = lastUsage.inputCachedTokens ?? 0;
|
|
@@ -1564,8 +1754,7 @@ export class SessionAwareRunner {
|
|
|
1564
1754
|
` cached=${cached} uncached=${uncached} write=${cacheWrite} prompt=${prompt}` +
|
|
1565
1755
|
` ratio=${(ratio * 100).toFixed(1)}% cacheAware=${lastUsage.cacheAware}`);
|
|
1566
1756
|
}
|
|
1567
|
-
// 记账供收尾持久化:UI
|
|
1568
|
-
lastContextTokens = contextTokens;
|
|
1757
|
+
// 记账供收尾持久化:UI 重开会话恢复显示(三量纲分账,见上)
|
|
1569
1758
|
lastContextWindow = effectiveRunConfig.contextWindow;
|
|
1570
1759
|
}
|
|
1571
1760
|
// 被接续消息的调用方收尾通道(如频道回复捕获):转发本 Run 事件;
|
|
@@ -1592,31 +1781,45 @@ export class SessionAwareRunner {
|
|
|
1592
1781
|
streamedContent += loopEvent.data.delta;
|
|
1593
1782
|
}
|
|
1594
1783
|
// assistantContent 由 adaptLoopEvent 在 assistant_message 事件上单一写入
|
|
1595
|
-
// turn_start:重置本轮增量游标(
|
|
1596
|
-
if (loopEvent.type === '
|
|
1597
|
-
|
|
1784
|
+
// turn_start:重置本轮增量游标(afterStep 只传本轮消息)
|
|
1785
|
+
if (loopEvent.type === 'step_start') {
|
|
1786
|
+
stepStartIndex = runContext.messages.length;
|
|
1598
1787
|
}
|
|
1599
|
-
//
|
|
1600
|
-
if (loopEvent.type === '
|
|
1601
|
-
|
|
1788
|
+
// step.end → 记录 step
|
|
1789
|
+
if (loopEvent.type === 'step_end') {
|
|
1790
|
+
hasStepEnd = true;
|
|
1602
1791
|
if (loopEvent.usage) {
|
|
1603
1792
|
lastUsage = loopEvent.usage;
|
|
1604
1793
|
}
|
|
1605
1794
|
llmCallIndexInUserTurn += 1;
|
|
1606
|
-
const
|
|
1607
|
-
|
|
1608
|
-
|
|
1795
|
+
const stepMessages = runContext.messages.slice(stepStartIndex);
|
|
1796
|
+
// 校准样本必须新鲜配对(arch §10.14):只传本步 usage。缺 usage(失败/重试/
|
|
1797
|
+
// 中止步)传 undefined——引擎不喂 observe。lastUsage 是展示口径的「最近实测」
|
|
1798
|
+
// (stale 语义见上方 promptTokensActual),拿它配当步估算分母会产出错配
|
|
1799
|
+
// ratio 样本(0.088/11.014 双向垃圾样本的源头)。
|
|
1800
|
+
// 校准样本身份单源(2026-11-09 事故):显式传本 run 身份,不经环境推断——
|
|
1801
|
+
// 本调用在 runner 事件循环(run 的 ALS 窗口外)执行,getRunScope() 会拿到
|
|
1802
|
+
// 泄漏的外层 scope,agent.contextSessionId 是共享可变字段;并发委派子 run
|
|
1803
|
+
// 下两者双向串味,错位样本毒化 ratio 校准(视图估算背离实测 160k vs 314k)。
|
|
1804
|
+
await this.agent.notifyAfterStep(runIdentity, loopEvent.usage, stepMessages);
|
|
1805
|
+
stepStartIndex = runContext.messages.length;
|
|
1609
1806
|
// 账本正文 = adaptLoopEvent 按调用算好的快照(失败轮只有本次调用的部分流出);
|
|
1610
1807
|
// 失败轮必须带 error 标记,空正文也留账(审计价值),不得拿历史内容凑数
|
|
1611
|
-
const content = adaptState.
|
|
1612
|
-
const turnFailed = Boolean(adaptState.
|
|
1808
|
+
const content = adaptState.lastStepContent ?? '';
|
|
1809
|
+
const turnFailed = Boolean(adaptState.lastStepError);
|
|
1613
1810
|
if (content || turnFailed) {
|
|
1614
|
-
session.
|
|
1615
|
-
id: `
|
|
1811
|
+
session.steps.push({
|
|
1812
|
+
id: `step_${Date.now()}`,
|
|
1616
1813
|
inputCount: Math.max(0, session.messages.length - 1),
|
|
1617
1814
|
output: { role: 'assistant', content, timestamp: Date.now(), agentId: _agentId },
|
|
1618
|
-
// 失败轮没有 usage(loop 的 error turn_end
|
|
1619
|
-
|
|
1815
|
+
// 失败轮没有 usage(loop 的 error turn_end 不带);不得写上一次调用的用量。
|
|
1816
|
+
// 非失败轮同理只记本步 usage——缺 usage(provider 未回报)留空,禁止拿
|
|
1817
|
+
// lastUsage(可能属于别步)冒充本步用量(评审 F7)。
|
|
1818
|
+
...(turnFailed
|
|
1819
|
+
? { error: true }
|
|
1820
|
+
: loopEvent.usage
|
|
1821
|
+
? { usage: loopEvent.usage }
|
|
1822
|
+
: {}),
|
|
1620
1823
|
durationMs: 0,
|
|
1621
1824
|
model: effectiveRunConfig.model ?? 'unknown',
|
|
1622
1825
|
timestamp: Date.now(),
|
|
@@ -1659,16 +1862,16 @@ export class SessionAwareRunner {
|
|
|
1659
1862
|
// 否则重载会话后这次失败无影无踪(只剩一段被当成正常回复的部分文本)。
|
|
1660
1863
|
const body = adaptState.errorMessage ?? '未知错误';
|
|
1661
1864
|
// 残句并入凭证消息(显示用途,截断):live 视图里用户看到过的部分输出
|
|
1662
|
-
// 重载后不再消失;完整残句仍以带 error 标记的
|
|
1663
|
-
// 最后一次尝试若以 turn_end(error) 收尾,partial 在
|
|
1865
|
+
// 重载后不再消失;完整残句仍以带 error 标记的 step 账本为准。
|
|
1866
|
+
// 最后一次尝试若以 turn_end(error) 收尾,partial 在 lastStepContent;
|
|
1664
1867
|
// 若直接 abort(无 turn_end),partial 还挂在 callStreamedContent 上。
|
|
1665
1868
|
const danglingPartial = adaptState.callStreamedContent ?? '';
|
|
1666
1869
|
// 回退只在「最后一个 turn 是失败轮」时启用:最终 abort 不产 turn_end 时
|
|
1667
|
-
//
|
|
1870
|
+
// lastStepContent 会停留在上一轮**成功**的正文上,直接用会把完整回复
|
|
1668
1871
|
// 冒充成「中断前的部分输出」
|
|
1669
|
-
const finalPartial = danglingPartial || (adaptState.
|
|
1872
|
+
const finalPartial = danglingPartial || (adaptState.lastStepError ? (adaptState.lastStepContent ?? '') : '');
|
|
1670
1873
|
const partialNote = finalPartial
|
|
1671
|
-
? `\n\n---\n中断前的部分输出(非完整回复):\n${finalPartial.slice(0, LLM_ERROR_PARTIAL_MAX_CHARS)}${finalPartial.length > LLM_ERROR_PARTIAL_MAX_CHARS ? '\n…(已截断,完整残句见
|
|
1874
|
+
? `\n\n---\n中断前的部分输出(非完整回复):\n${finalPartial.slice(0, LLM_ERROR_PARTIAL_MAX_CHARS)}${finalPartial.length > LLM_ERROR_PARTIAL_MAX_CHARS ? '\n…(已截断,完整残句见 step 账本)' : ''}`
|
|
1672
1875
|
: '';
|
|
1673
1876
|
session.messages.push({
|
|
1674
1877
|
role: 'user',
|
|
@@ -1692,9 +1895,9 @@ export class SessionAwareRunner {
|
|
|
1692
1895
|
// 最后一次失败尝试的 partial 也留账:abort 路径不再产 turn_end,
|
|
1693
1896
|
// 此处不记的话最后尝试的输出只剩前端 live 视图(重载即失)。
|
|
1694
1897
|
// 只补「无 turn_end」的缺口;turn_end(error) 路径已在账本里,不得重复记。
|
|
1695
|
-
if (
|
|
1696
|
-
session.
|
|
1697
|
-
id: `
|
|
1898
|
+
if (hasStepEnd && danglingPartial) {
|
|
1899
|
+
session.steps.push({
|
|
1900
|
+
id: `step_${Date.now()}`,
|
|
1698
1901
|
inputCount: Math.max(0, session.messages.length - 1),
|
|
1699
1902
|
output: { role: 'assistant', content: danglingPartial, timestamp: Date.now(), agentId: _agentId },
|
|
1700
1903
|
durationMs: 0,
|
|
@@ -1753,13 +1956,13 @@ export class SessionAwareRunner {
|
|
|
1753
1956
|
this.appendTurnEnd(session.messages, currentTurnId);
|
|
1754
1957
|
}
|
|
1755
1958
|
// 11. 引擎异常退出时的 session 一致性修复(须在 Observer final 采样之前)
|
|
1756
|
-
if (!
|
|
1959
|
+
if (!hasStepEnd) {
|
|
1757
1960
|
const fallbackContent = streamedContent || '';
|
|
1758
1961
|
const failedRun = adaptState.loopEndReason === 'error';
|
|
1759
1962
|
// 失败 run 空正文也留账(与 error turn_end 口径一致);正常/崩溃路径仍按有内容才记
|
|
1760
1963
|
if (fallbackContent || failedRun) {
|
|
1761
1964
|
// 失败 run 的部分流出不得冒充 assistant 回复入历史——失败凭证已由
|
|
1762
|
-
// runStopped 消息承担;只落一条带 error 标记的
|
|
1965
|
+
// runStopped 消息承担;只落一条带 error 标记的 step 账本保留审计。
|
|
1763
1966
|
if (!failedRun) {
|
|
1764
1967
|
session.messages.push({
|
|
1765
1968
|
role: 'assistant',
|
|
@@ -1768,11 +1971,13 @@ export class SessionAwareRunner {
|
|
|
1768
1971
|
agentId: _agentId,
|
|
1769
1972
|
});
|
|
1770
1973
|
}
|
|
1771
|
-
session.
|
|
1772
|
-
id: `
|
|
1974
|
+
session.steps.push({
|
|
1975
|
+
id: `step_${Date.now()}`,
|
|
1773
1976
|
inputCount: Math.max(0, session.messages.length - 1),
|
|
1774
1977
|
output: { role: 'assistant', content: fallbackContent, timestamp: Date.now(), agentId: _agentId },
|
|
1775
|
-
usage
|
|
1978
|
+
// 兜底合成记录:失败轮不写 usage(与上文账本口径一致,禁止拿别步用量凑数);
|
|
1979
|
+
// 非失败轮只在本 Run 确有实测时带上(评审 F7)
|
|
1980
|
+
...(!failedRun && lastUsage ? { usage: lastUsage } : {}),
|
|
1776
1981
|
durationMs: 0,
|
|
1777
1982
|
model: effectiveRunConfig.model ?? 'unknown',
|
|
1778
1983
|
timestamp: Date.now(),
|
|
@@ -1783,7 +1988,7 @@ export class SessionAwareRunner {
|
|
|
1783
1988
|
// Observer:记录最终 messages 与 endReason(真正 close 在 finally,保证异常也闭合)
|
|
1784
1989
|
observerFinalMessages = session.messages;
|
|
1785
1990
|
// P5: 使用 stopReason 区分终态(context_stopped / behavior_stopped / policy_stopped / security_stopped / completed)
|
|
1786
|
-
// LLM 错误路径只设 loopEndReason='error'、不设 stopReason;若在此回落到
|
|
1991
|
+
// LLM 错误路径只设 loopEndReason='error'、不设 stopReason;若在此回落到 hasStepEnd,
|
|
1787
1992
|
// 一次彻底失败会被记成 completed(run.timing / Observer / 指标全部失真)。
|
|
1788
1993
|
observerEndReason =
|
|
1789
1994
|
adaptState.stopReason ??
|
|
@@ -1791,13 +1996,13 @@ export class SessionAwareRunner {
|
|
|
1791
1996
|
? 'error'
|
|
1792
1997
|
: adaptState.loopEndReason === 'aborted'
|
|
1793
1998
|
? 'aborted'
|
|
1794
|
-
:
|
|
1999
|
+
: hasStepEnd
|
|
1795
2000
|
? 'completed'
|
|
1796
2001
|
: 'no_turn_end');
|
|
1797
|
-
// 中止标记:仅在本轮**未完成**被掐断时打标(
|
|
2002
|
+
// 中止标记:仅在本轮**未完成**被掐断时打标(hasStepEnd = 正常收尾)。
|
|
1798
2003
|
// 迟到 abort / signal 竞态不得给已完成轮贴编辑重发。
|
|
1799
2004
|
let clearAbortedTurn = false;
|
|
1800
|
-
const abortedMidTurn = runAborted || (Boolean(signal?.aborted) && !
|
|
2005
|
+
const abortedMidTurn = runAborted || (Boolean(signal?.aborted) && !hasStepEnd);
|
|
1801
2006
|
// L3:中止保留 undo(供编辑重发 discard);其余出口 commit(继续对话=隐式提交)
|
|
1802
2007
|
if (turnFileUndo) {
|
|
1803
2008
|
// Observer tool.effect:效应账本摘要(§5.6)
|
|
@@ -1838,17 +2043,43 @@ export class SessionAwareRunner {
|
|
|
1838
2043
|
sm.transition('idle');
|
|
1839
2044
|
session.meta.status = sm.state;
|
|
1840
2045
|
session.meta.updatedAt = Date.now();
|
|
1841
|
-
//
|
|
1842
|
-
|
|
1843
|
-
writeSessionCompact(session, _agentId, compactSnap);
|
|
2046
|
+
// 压缩覆盖/摘要正文由转换记录账本持久(sessions/<sid>/transform/);
|
|
2047
|
+
// 旧 contextCompact 快照停写(仅作迁移输入读取,见引擎 loadCompactState)。
|
|
1844
2048
|
// 上下文用量随会话持久化:重开会话恢复显示(不靠 UI 用末页消息猜)。
|
|
1845
|
-
//
|
|
1846
|
-
|
|
2049
|
+
// 三量纲分账(P0-C):promptTokensActual=实测单源(无实测不写、保留旧值不动)、
|
|
2050
|
+
// viewTokensEst=请求视图估算、rawTokens=全量原文估算;compact 视图值不写入。
|
|
2051
|
+
if (lastPromptTokensActual !== undefined ||
|
|
2052
|
+
lastViewTokensEst !== undefined ||
|
|
2053
|
+
lastRawTokens !== undefined ||
|
|
2054
|
+
lastContextWindow !== undefined) {
|
|
1847
2055
|
session.metadata = {
|
|
1848
2056
|
...session.metadata,
|
|
1849
|
-
|
|
2057
|
+
// 校准状态持久化(取舍③配套):锚+样本计数随会话落盘,restore 后回填
|
|
2058
|
+
...(typeof this.harness.exportCalibration === 'function'
|
|
2059
|
+
? { calibration: this.harness.exportCalibration() }
|
|
2060
|
+
: {}),
|
|
2061
|
+
...(lastPromptTokensActual !== undefined ? { promptTokensActual: lastPromptTokensActual } : {}),
|
|
2062
|
+
...(lastViewTokensEst !== undefined ? { viewTokensEst: lastViewTokensEst } : {}),
|
|
2063
|
+
...(lastRawTokens !== undefined ? { rawTokens: lastRawTokens } : {}),
|
|
1850
2064
|
...(lastContextWindow !== undefined ? { contextWindow: lastContextWindow } : {}),
|
|
1851
2065
|
};
|
|
2066
|
+
if (lastPromptTokensActual !== undefined) {
|
|
2067
|
+
console.log(`[ctx] session=${sessionId} writer=${lastPromptWriter} field=promptTokensActual value=${lastPromptTokensActual} (persist)`);
|
|
2068
|
+
}
|
|
2069
|
+
if (lastViewTokensEst !== undefined) {
|
|
2070
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=viewTokensEst value=${lastViewTokensEst} (persist)`);
|
|
2071
|
+
}
|
|
2072
|
+
if (lastRawTokens !== undefined) {
|
|
2073
|
+
console.log(`[ctx] session=${sessionId} writer=estimate field=rawTokens value=${lastRawTokens} (persist)`);
|
|
2074
|
+
}
|
|
2075
|
+
}
|
|
2076
|
+
// 存量校正(P0-C):旧 metadata.contextTokens 混装实测/估算、来源不可区分,显式清除。
|
|
2077
|
+
// save 浅合并删不掉键:先从对象移除,persist 后 updateMetadata 真删(同 abortedTurn)
|
|
2078
|
+
let clearLegacyContextTokens = false;
|
|
2079
|
+
if (session.metadata && 'contextTokens' in session.metadata) {
|
|
2080
|
+
const { contextTokens: _legacyCtx, ...restMeta } = session.metadata;
|
|
2081
|
+
session.metadata = restMeta;
|
|
2082
|
+
clearLegacyContextTokens = true;
|
|
1852
2083
|
}
|
|
1853
2084
|
await this.store.save(sessionId, session);
|
|
1854
2085
|
// 收尾权威写成功:剩余注入条目一并确认(此后 close 不再重投)
|
|
@@ -1863,6 +2094,11 @@ export class SessionAwareRunner {
|
|
|
1863
2094
|
delete meta.lastStop;
|
|
1864
2095
|
});
|
|
1865
2096
|
}
|
|
2097
|
+
if (clearLegacyContextTokens && this.store.updateMetadata) {
|
|
2098
|
+
await this.store.updateMetadata(sessionId, (meta) => {
|
|
2099
|
+
delete meta.contextTokens;
|
|
2100
|
+
});
|
|
2101
|
+
}
|
|
1866
2102
|
// 通知子系统:本轮处理完成(保持 active,但刷新 lastInteractionAt)
|
|
1867
2103
|
this._backfillTrigger?.noteActivity(sessionId, _agentId, session.meta.lastInteractionAt);
|
|
1868
2104
|
this.emitObserved({
|
|
@@ -1990,6 +2226,25 @@ export class SessionAwareRunner {
|
|
|
1990
2226
|
inboxRun?.close();
|
|
1991
2227
|
release();
|
|
1992
2228
|
gateRelease?.();
|
|
2229
|
+
// Wisdom 归因窗口记账(学习环):锁释放后再写,DB 慢不得拖住 session 锁;
|
|
2230
|
+
// 本轮注入 + 结局 + 引用摘录 → 判官批量判决。失败只告警(学习环可由下批窗口补),
|
|
2231
|
+
// 不走 eventSink/Observer——学习记账不是观测通道。
|
|
2232
|
+
if (this.wisdomAttributionSink && wisdomInjectedIds.length > 0 && observerFinalMessages) {
|
|
2233
|
+
try {
|
|
2234
|
+
await this.wisdomAttributionSink({
|
|
2235
|
+
sessionId,
|
|
2236
|
+
agentId: _agentId,
|
|
2237
|
+
outcome: runEndReason,
|
|
2238
|
+
query: runQueryText,
|
|
2239
|
+
injectedIds: wisdomInjectedIds,
|
|
2240
|
+
assistantTexts: collectRunAssistantTexts(observerFinalMessages, runMessagesBase),
|
|
2241
|
+
});
|
|
2242
|
+
}
|
|
2243
|
+
catch (err) {
|
|
2244
|
+
// 学习环静默关闭是严重问题:至少告警一次,不得只吞不报
|
|
2245
|
+
console.warn(`[Runner] wisdom attribution sink failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
2246
|
+
}
|
|
2247
|
+
}
|
|
1993
2248
|
}
|
|
1994
2249
|
}
|
|
1995
2250
|
/**
|
|
@@ -2014,30 +2269,33 @@ export class SessionAwareRunner {
|
|
|
2014
2269
|
compacted: false,
|
|
2015
2270
|
reason: 'session not found',
|
|
2016
2271
|
tokensBefore: 0,
|
|
2272
|
+
summarizeAttempted: false,
|
|
2017
2273
|
};
|
|
2018
2274
|
}
|
|
2275
|
+
// Compaction Hooks fire exactly once inside the compact engine
|
|
2276
|
+
// (HookedCompactEngine) with the real session identity. Orchestrating a
|
|
2277
|
+
// second vote/observe here double-fired every manual compaction and
|
|
2278
|
+
// observed denials as if they were outcomes.
|
|
2019
2279
|
const result = await options.compactStructural({
|
|
2020
2280
|
sessionId,
|
|
2021
2281
|
agentId,
|
|
2022
2282
|
messages: session.messages,
|
|
2023
2283
|
summarize: options.summarize,
|
|
2024
2284
|
compactTargetTokens: options.compactTargetTokens,
|
|
2285
|
+
// 请求口径计量原料(评审 B1):tools/system 缺失会让 before/after 少算整个
|
|
2286
|
+
// tool schema——「请求口径」名不副实
|
|
2287
|
+
systemPrompt: options.systemPrompt,
|
|
2288
|
+
tools: options.tools,
|
|
2025
2289
|
// 交接式摘要素材:task 快照(裸状态块,不含对话引导语)随指令尾部注入
|
|
2026
2290
|
taskSnapshot: renderSessionTasksInjection(session.tasks ?? [], { includeGuidance: false }),
|
|
2291
|
+
// 旧压缩快照读口(迁移输入):manual 路也要先迁移再产记录,防旧快照在
|
|
2292
|
+
// 下次 assemble 迁移时以更高 seq 反向覆盖新记录
|
|
2293
|
+
loadCompactState: () => readSessionCompact(session, agentId),
|
|
2027
2294
|
});
|
|
2028
|
-
|
|
2029
|
-
|
|
2030
|
-
|
|
2031
|
-
|
|
2032
|
-
lastProactiveCoverEnd: result.coveredMessageCount,
|
|
2033
|
-
lastProactiveTokens: result.tokensAfter,
|
|
2034
|
-
};
|
|
2035
|
-
this.agent.setSessionCompactState(sessionId, agentId, snap);
|
|
2036
|
-
writeSessionCompact(session, agentId, snap);
|
|
2037
|
-
session.meta.updatedAt = Date.now();
|
|
2038
|
-
await this.store.save(sessionId, session);
|
|
2039
|
-
}
|
|
2040
|
-
return result;
|
|
2295
|
+
// 压缩产物 = 引擎内持久转换记录(append-only);旧 contextCompact 快照不再写回。
|
|
2296
|
+
// 传输投影:view 不过锁面(大对象,UI 无需)——唯一投影实现在能力层
|
|
2297
|
+
//(禁止手抄字段表:新可选字段会静默丢失,评审 P3 major)
|
|
2298
|
+
return toCompactTransport(result);
|
|
2041
2299
|
}
|
|
2042
2300
|
finally {
|
|
2043
2301
|
release();
|
|
@@ -2059,12 +2317,16 @@ export class SessionAwareRunner {
|
|
|
2059
2317
|
* Rights are passed per-run (harness is shared across concurrent sessions).
|
|
2060
2318
|
*/
|
|
2061
2319
|
filterToolsForSessionRights(tools, sessionToolRights, agentToolPolicy) {
|
|
2062
|
-
|
|
2063
|
-
|
|
2064
|
-
|
|
2065
|
-
agentToolPolicy
|
|
2066
|
-
|
|
2067
|
-
|
|
2320
|
+
return tools.filter((t) => {
|
|
2321
|
+
if (!pluginToolPolicyAdapter.isPluginToolCallPermitted(t.name, t.source, agentToolPolicy))
|
|
2322
|
+
return false;
|
|
2323
|
+
if (!agentToolPolicy && !sessionToolRights)
|
|
2324
|
+
return true;
|
|
2325
|
+
return isToolPermitted(t.name, resolveToolCapabilities(t.name), [
|
|
2326
|
+
agentToolPolicy,
|
|
2327
|
+
sessionToolRights,
|
|
2328
|
+
]);
|
|
2329
|
+
});
|
|
2068
2330
|
}
|
|
2069
2331
|
/**
|
|
2070
2332
|
* 创建新 Session
|
|
@@ -2089,7 +2351,7 @@ export class SessionAwareRunner {
|
|
|
2089
2351
|
updatedAt: Date.now(),
|
|
2090
2352
|
},
|
|
2091
2353
|
messages: [],
|
|
2092
|
-
|
|
2354
|
+
steps: [],
|
|
2093
2355
|
metadata: {},
|
|
2094
2356
|
tasks: [],
|
|
2095
2357
|
};
|