@octopi-agent/engine 0.70.7 → 0.90.11
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/LICENSE +201 -201
- package/NOTICE +7 -7
- package/README.md +64 -26
- package/dist/config-schema/agent.d.ts +89 -1
- package/dist/config-schema/agent.js +81 -5
- package/dist/config-schema/context.d.ts +24 -5
- package/dist/config-schema/context.js +28 -1
- package/dist/config-schema/engine.d.ts +205 -13
- package/dist/config-schema/engine.js +31 -2
- package/dist/config-schema/governance.d.ts +95 -0
- package/dist/config-schema/governance.js +93 -1
- package/dist/config-schema/models.d.ts +3 -3
- package/dist/config-schema/observability.d.ts +6 -0
- package/dist/config-schema/observability.js +16 -0
- package/dist/config-schema/run.d.ts +10 -0
- package/dist/config-schema/run.js +18 -0
- package/dist/config-schema/shared.d.ts +13 -0
- package/dist/config-schema/shared.js +22 -0
- package/dist/config-schema/substrate.d.ts +2 -2
- package/dist/config-schema/subsystems.d.ts +1 -1
- package/dist/config-schema/subsystems.js +2 -1
- package/dist/config.d.ts +201 -8
- package/dist/config.js +105 -3
- package/dist/harness/activation/compiler.js +3 -0
- package/dist/harness/activation/runtime.d.ts +7 -0
- package/dist/harness/activation/runtime.js +60 -2
- package/dist/harness/activation/sources/agent-signal.d.ts +11 -0
- package/dist/harness/activation/sources/agent-signal.js +33 -0
- package/dist/harness/activation/types.d.ts +6 -1
- package/dist/harness/agent/builder.d.ts +50 -5
- package/dist/harness/agent/builder.js +189 -59
- package/dist/harness/agent/config-bridge.d.ts +33 -25
- package/dist/harness/agent/config-bridge.js +84 -291
- package/dist/harness/agent/index.d.ts +3 -1
- package/dist/harness/agent/index.js +2 -1
- package/dist/harness/agent/tool-purpose.d.ts +46 -0
- package/dist/harness/agent/tool-purpose.js +127 -0
- package/dist/harness/agent/wire-agent-builder.d.ts +133 -0
- package/dist/harness/agent/wire-agent-builder.js +370 -0
- package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.d.ts +11 -1
- package/dist/harness/collaboration/autonomous-subsystem/boundary/validator.js +11 -1
- package/dist/harness/collaboration/autonomous-subsystem/loader.d.ts +13 -0
- package/dist/harness/collaboration/autonomous-subsystem/loader.js +16 -1
- package/dist/harness/collaboration/autonomous-subsystem/runtime.d.ts +8 -1
- package/dist/harness/collaboration/autonomous-subsystem/runtime.js +17 -9
- package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.d.ts +12 -0
- package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.js +19 -0
- package/dist/harness/collaboration/autonomous-subsystem/sense/session-lifecycle-bridge.d.ts +6 -0
- package/dist/harness/collaboration/autonomous-subsystem/sense/session-lifecycle-bridge.js +24 -7
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.d.ts +5 -2
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +11 -3
- package/dist/harness/collaboration/autonomous-subsystem/think/index.d.ts +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/think/index.js +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/think/llm-port.d.ts +7 -4
- package/dist/harness/collaboration/autonomous-subsystem/think/llm-port.js +8 -9
- package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.d.ts +36 -10
- package/dist/harness/collaboration/autonomous-subsystem/think/model-resolver.js +60 -7
- package/dist/harness/collaboration/delegation/child-run.d.ts +144 -0
- package/dist/harness/collaboration/delegation/child-run.js +241 -0
- package/dist/harness/collaboration/delegation/index.d.ts +26 -0
- package/dist/harness/collaboration/delegation/index.js +25 -0
- package/dist/harness/collaboration/delegation/notifier.d.ts +46 -0
- package/dist/harness/collaboration/delegation/notifier.js +84 -0
- package/dist/harness/collaboration/delegation/registry-types.d.ts +200 -0
- package/dist/harness/collaboration/delegation/registry-types.js +61 -0
- package/dist/harness/collaboration/delegation/registry.d.ts +110 -0
- package/dist/harness/collaboration/delegation/registry.js +220 -0
- package/dist/harness/collaboration/delegation/service.d.ts +249 -0
- package/dist/harness/collaboration/delegation/service.js +499 -0
- package/dist/harness/collaboration/delegation/store.d.ts +155 -0
- package/dist/harness/collaboration/delegation/store.js +271 -0
- package/dist/harness/collaboration/delegation/transport.d.ts +73 -0
- package/dist/harness/collaboration/delegation/transport.js +61 -0
- package/dist/harness/collaboration/delegation/types.d.ts +231 -0
- package/dist/harness/collaboration/delegation/types.js +70 -0
- package/dist/harness/collaboration/delegation/wiring.d.ts +111 -0
- package/dist/harness/collaboration/delegation/wiring.js +145 -0
- package/dist/harness/collaboration/orchestration/index.d.ts +11 -13
- package/dist/harness/collaboration/orchestration/index.js +11 -11
- package/dist/harness/context/assembler.d.ts +2 -2
- package/dist/harness/context/assembler.js +12 -7
- package/dist/harness/context/capabilities/compact/engine.js +80 -38
- package/dist/harness/context/capabilities/compact/types.d.ts +12 -1
- package/dist/harness/context/capabilities/summary/registry.js +10 -0
- package/dist/harness/context/constitution/default-agents.md +230 -228
- package/dist/harness/context/default-context-engine.d.ts +101 -23
- package/dist/harness/context/default-context-engine.js +483 -172
- package/dist/harness/context/hybrid-compressor.d.ts +3 -3
- package/dist/harness/context/hybrid-compressor.js +18 -23
- package/dist/harness/context/index.d.ts +5 -1
- package/dist/harness/context/index.js +2 -0
- package/dist/harness/context/layer-snapshot.d.ts +4 -0
- package/dist/harness/context/layer-snapshot.js +30 -18
- package/dist/harness/context/layer-types.d.ts +85 -1
- package/dist/harness/context/layer-types.js +110 -4
- package/dist/harness/context/layers.d.ts +5 -2
- package/dist/harness/context/layers.js +11 -5
- package/dist/harness/context/llm-summarizer.d.ts +15 -1
- package/dist/harness/context/llm-summarizer.js +107 -56
- package/dist/harness/context/message-selector.js +6 -2
- package/dist/harness/context/root-instructions.d.ts +72 -0
- package/dist/harness/context/root-instructions.js +227 -0
- package/dist/harness/context/runtime-datetime.d.ts +34 -7
- package/dist/harness/context/runtime-datetime.js +66 -10
- package/dist/harness/context/smart-router.d.ts +1 -1
- package/dist/harness/context/smart-router.js +1 -1
- package/dist/harness/context/system-prompt-assembler.d.ts +30 -0
- package/dist/harness/context/system-prompt-assembler.js +73 -6
- package/dist/harness/context/token-constants.d.ts +2 -2
- package/dist/harness/context/token-constants.js +2 -2
- package/dist/harness/context/token-estimate-fns.d.ts +1 -3
- package/dist/harness/context/token-estimate-fns.js +2 -4
- package/dist/harness/context/token-estimator.d.ts +1 -1
- package/dist/harness/context/token-estimator.js +14 -6
- package/dist/harness/context/tool-result-aging.d.ts +140 -0
- package/dist/harness/context/tool-result-aging.js +331 -0
- package/dist/harness/context/tool-result-body.d.ts +10 -0
- package/dist/harness/context/tool-result-body.js +27 -0
- package/dist/harness/context/turn-envelope.d.ts +123 -0
- package/dist/harness/context/turn-envelope.js +188 -0
- package/dist/harness/context/types.d.ts +35 -47
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +258 -0
- package/dist/harness/extension/execution-environment/effect-policy.js +358 -0
- package/dist/harness/extension/execution-environment/index.d.ts +18 -2
- package/dist/harness/extension/execution-environment/index.js +11 -2
- package/dist/harness/extension/execution-environment/isolation.js +5 -1
- package/dist/harness/extension/execution-environment/memory-undo.d.ts +101 -0
- package/dist/harness/extension/execution-environment/memory-undo.js +192 -0
- package/dist/harness/extension/execution-environment/process-isolation.d.ts +84 -0
- package/dist/harness/extension/execution-environment/process-isolation.js +315 -0
- package/dist/harness/extension/execution-environment/resource-limits.d.ts +36 -0
- package/dist/harness/extension/execution-environment/resource-limits.js +84 -0
- package/dist/harness/extension/execution-environment/sandbox.d.ts +125 -4
- package/dist/harness/extension/execution-environment/sandbox.js +521 -51
- package/dist/harness/extension/execution-environment/shell-journal.d.ts +100 -0
- package/dist/harness/extension/execution-environment/shell-journal.js +299 -0
- package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +45 -0
- package/dist/harness/extension/execution-environment/tool-capabilities.js +126 -0
- package/dist/harness/extension/execution-environment/types.d.ts +67 -39
- package/dist/harness/extension/execution-environment/types.js +2 -2
- package/dist/harness/extension/execution-environment/undo-log.d.ts +203 -0
- package/dist/harness/extension/execution-environment/undo-log.js +627 -0
- package/dist/harness/extension/execution-environment/undo-merge.d.ts +40 -0
- package/dist/harness/extension/execution-environment/undo-merge.js +167 -0
- package/dist/harness/extension/plugin-ecosystem/client-tools/index.d.ts +1 -1
- package/dist/harness/extension/plugin-ecosystem/client-tools/types.d.ts +9 -0
- package/dist/harness/extension/plugin-ecosystem/mcp/bridge.js +2 -0
- package/dist/harness/extension/plugin-ecosystem/plugins/api.d.ts +1 -6
- package/dist/harness/extension/plugin-ecosystem/plugins/api.js +3 -8
- package/dist/harness/extension/plugin-ecosystem/plugins/capability.d.ts +0 -3
- package/dist/harness/extension/plugin-ecosystem/plugins/capability.js +0 -3
- package/dist/harness/extension/plugin-ecosystem/plugins/entry.d.ts +2 -10
- package/dist/harness/extension/plugin-ecosystem/plugins/entry.js +2 -9
- package/dist/harness/extension/plugin-ecosystem/plugins/index.d.ts +1 -3
- package/dist/harness/extension/plugin-ecosystem/plugins/index.js +1 -3
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.d.ts +2 -4
- package/dist/harness/extension/plugin-ecosystem/plugins/loader.js +4 -21
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.d.ts +3 -9
- package/dist/harness/extension/plugin-ecosystem/plugins/manager.js +4 -8
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.d.ts +1 -4
- package/dist/harness/extension/plugin-ecosystem/plugins/manifest.js +1 -3
- package/dist/harness/extension/plugin-ecosystem/skills/manager.d.ts +1 -1
- package/dist/harness/extension/plugin-ecosystem/skills/manager.js +1 -1
- package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.d.ts +51 -0
- package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +153 -0
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +1 -0
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +18 -3
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +277 -81
- package/dist/harness/extension/plugin-ecosystem/tools/delegation.d.ts +31 -0
- package/dist/harness/extension/plugin-ecosystem/tools/delegation.js +291 -0
- package/dist/harness/extension/plugin-ecosystem/tools/document-tools.js +10 -2
- package/dist/harness/extension/plugin-ecosystem/tools/env-info.js +1 -0
- package/dist/harness/extension/plugin-ecosystem/tools/eol.d.ts +35 -0
- package/dist/harness/extension/plugin-ecosystem/tools/eol.js +43 -0
- package/dist/harness/extension/plugin-ecosystem/tools/file-edit.js +40 -9
- package/dist/harness/extension/plugin-ecosystem/tools/file-ops.d.ts +33 -0
- package/dist/harness/extension/plugin-ecosystem/tools/file-ops.js +376 -0
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.d.ts +12 -2
- package/dist/harness/extension/plugin-ecosystem/tools/file-search.js +241 -70
- package/dist/harness/extension/plugin-ecosystem/tools/git-runner.d.ts +31 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-runner.js +104 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.d.ts +111 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-status-snapshot.js +197 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.d.ts +27 -0
- package/dist/harness/extension/plugin-ecosystem/tools/git-tools.js +463 -0
- package/dist/harness/extension/plugin-ecosystem/tools/http.d.ts +10 -6
- package/dist/harness/extension/plugin-ecosystem/tools/http.js +41 -47
- package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +6 -0
- package/dist/harness/extension/plugin-ecosystem/tools/index.js +4 -0
- package/dist/harness/extension/plugin-ecosystem/tools/knowledge.js +4 -0
- package/dist/harness/extension/plugin-ecosystem/tools/memory.js +25 -1
- package/dist/harness/extension/plugin-ecosystem/tools/package-tools.d.ts +13 -0
- package/dist/harness/extension/plugin-ecosystem/tools/package-tools.js +391 -0
- package/dist/harness/extension/plugin-ecosystem/tools/platform.d.ts +51 -2
- package/dist/harness/extension/plugin-ecosystem/tools/platform.js +151 -12
- package/dist/harness/extension/plugin-ecosystem/tools/session-history.js +2 -0
- package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.d.ts +10 -1
- package/dist/harness/extension/plugin-ecosystem/tools/tool-bus.js +35 -19
- package/dist/harness/extension/plugin-ecosystem/tools/tool-set.d.ts +8 -0
- package/dist/harness/extension/plugin-ecosystem/tools/tool-set.js +5 -0
- package/dist/harness/extension/plugin-ecosystem/tools/web-search.js +1 -0
- package/dist/harness/governance/credentials/index.d.ts +1 -1
- package/dist/harness/governance/credentials/store.d.ts +16 -4
- package/dist/harness/governance/credentials/store.js +33 -6
- package/dist/harness/governance/credentials/types.d.ts +11 -0
- package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +105 -0
- package/dist/harness/governance/human-in-the-loop/decision-cache.js +184 -0
- package/dist/harness/governance/human-in-the-loop/index.d.ts +5 -5
- package/dist/harness/governance/human-in-the-loop/index.js +3 -3
- package/dist/harness/governance/human-in-the-loop/types.d.ts +7 -62
- package/dist/harness/governance/human-in-the-loop/types.js +6 -2
- package/dist/harness/governance/security/capability-enforcer.d.ts +9 -1
- package/dist/harness/governance/security/capability-enforcer.js +31 -8
- package/dist/harness/governance/security/degradation.js +5 -7
- package/dist/harness/governance/security/risk-evaluator.d.ts +1 -1
- package/dist/harness/governance/security/risk-evaluator.js +4 -82
- package/dist/harness/governance/security/temp-path.d.ts +41 -0
- package/dist/harness/governance/security/temp-path.js +117 -0
- package/dist/harness/governance/session-acl/index.d.ts +1 -0
- package/dist/harness/governance/session-acl/index.js +1 -0
- package/dist/harness/governance/session-acl/rights.d.ts +12 -0
- package/dist/harness/governance/session-acl/rights.js +89 -7
- package/dist/harness/governance/session-acl/seed-roles.js +9 -1
- package/dist/harness/governance/session-acl/service.js +21 -29
- package/dist/harness/governance/session-acl/tool-rights.d.ts +81 -0
- package/dist/harness/governance/session-acl/tool-rights.js +238 -0
- package/dist/harness/governance/session-acl/types.d.ts +22 -0
- package/dist/harness/index.d.ts +16 -12
- package/dist/harness/index.js +10 -6
- package/dist/harness/knowledge/file-identity.d.ts +8 -0
- package/dist/harness/knowledge/file-identity.js +26 -1
- package/dist/harness/knowledge/file-index-store.js +11 -11
- package/dist/harness/knowledge/grounding.d.ts +2 -1
- package/dist/harness/knowledge/grounding.js +8 -5
- package/dist/harness/knowledge/index-store.d.ts +31 -4
- package/dist/harness/knowledge/index-store.js +121 -39
- package/dist/harness/knowledge/index.d.ts +2 -2
- package/dist/harness/knowledge/index.js +1 -1
- package/dist/harness/knowledge/ingest.d.ts +115 -115
- package/dist/harness/knowledge/ingest.js +154 -151
- package/dist/harness/knowledge/job-control-state.js +4 -4
- package/dist/harness/knowledge/job-control.js +11 -11
- package/dist/harness/knowledge/knowledge-serve-child.js +1 -1
- package/dist/harness/knowledge/membership-store.js +11 -11
- package/dist/harness/knowledge/network-guard.d.ts +61 -4
- package/dist/harness/knowledge/network-guard.js +390 -113
- package/dist/harness/knowledge/purge.js +4 -1
- package/dist/harness/knowledge/query-service.js +3 -3
- package/dist/harness/knowledge/writer-service.d.ts +2 -0
- package/dist/harness/knowledge/writer-service.js +14 -13
- package/dist/harness/memory/backfill-coverage.js +3 -1
- package/dist/harness/memory/backfill-trigger.d.ts +2 -2
- package/dist/harness/memory/backfill-trigger.js +4 -4
- package/dist/harness/memory/index.d.ts +1 -0
- package/dist/harness/memory/index.js +1 -0
- package/dist/harness/memory/sqlite/agent-db.js +2 -0
- package/dist/harness/memory/sqlite/memory-store.d.ts +1 -0
- package/dist/harness/memory/sqlite/memory-store.js +14 -4
- package/dist/harness/memory/sqlite/wisdom-store.js +9 -9
- package/dist/harness/memory/store.d.ts +1 -0
- package/dist/harness/memory/store.js +3 -0
- package/dist/harness/memory/time-format.d.ts +28 -0
- package/dist/harness/memory/time-format.js +52 -0
- package/dist/harness/memory/types.d.ts +12 -0
- package/dist/harness/observability/observer/hub.js +53 -2
- package/dist/harness/observability/observer/index.d.ts +2 -2
- package/dist/harness/observability/observer/index.js +1 -1
- package/dist/harness/observability/observer/types.d.ts +80 -0
- package/dist/harness/observability/observer/types.js +118 -9
- package/dist/harness/run/agent/agent.d.ts +18 -0
- package/dist/harness/run/agent/agent.js +26 -0
- package/dist/harness/run/concurrency/tool-loop-detection-core.d.ts +1 -1
- package/dist/harness/run/concurrency/tool-loop-detection-core.js +1 -1
- package/dist/harness/run/reliability/harness-events.d.ts +4 -0
- package/dist/harness/run/reliability/run-agent.js +110 -18
- package/dist/harness/run/reliability/run-metrics-collector.d.ts +28 -2
- package/dist/harness/run/reliability/run-metrics-collector.js +92 -2
- package/dist/harness/run/run-guard/default-run-guard.d.ts +0 -5
- package/dist/harness/run/run-guard/default-run-guard.js +104 -44
- package/dist/harness/run/run-scope.d.ts +52 -0
- package/dist/harness/run/runner.d.ts +117 -16
- package/dist/harness/run/runner.js +668 -157
- package/dist/harness/session/attachments/llm-intent.js +17 -17
- package/dist/harness/session/history/port.js +16 -5
- package/dist/harness/session/in-memory-store.d.ts +6 -0
- package/dist/harness/session/in-memory-store.js +55 -3
- package/dist/harness/session/schedules/index.d.ts +10 -0
- package/dist/harness/session/schedules/index.js +10 -0
- package/dist/harness/session/schedules/render.d.ts +13 -0
- package/dist/harness/session/schedules/render.js +63 -0
- package/dist/harness/session/schedules/service.d.ts +179 -0
- package/dist/harness/session/schedules/service.js +695 -0
- package/dist/harness/session/schedules/store.d.ts +119 -0
- package/dist/harness/session/schedules/store.js +323 -0
- package/dist/harness/session/schedules/tools.d.ts +39 -0
- package/dist/harness/session/schedules/tools.js +442 -0
- package/dist/harness/session/schedules/types.d.ts +104 -0
- package/dist/harness/session/schedules/types.js +97 -0
- package/dist/harness/session/tasks/tools.js +22 -0
- package/dist/harness/session/title.js +25 -9
- package/dist/harness/session/types.d.ts +35 -0
- package/dist/harness/shared/events/agent-event-map.d.ts +39 -0
- package/dist/harness/shared/events/agent-event-map.js +2 -0
- package/dist/harness/shared/types/agent-definition.d.ts +23 -0
- package/dist/index.d.ts +25 -9
- package/dist/index.js +11 -2
- package/dist/integration/observability/run-telemetry.d.ts +8 -0
- package/dist/integration/observability/run-telemetry.js +31 -8
- package/dist/integration/observability/trace-collector.js +26 -4
- package/dist/integration/observability/trace-events.d.ts +1 -0
- package/dist/integration/observability/trace-events.js +2 -0
- package/dist/integration/observability/trace-logger.js +27 -17
- package/dist/integration/providers/anthropic.d.ts +10 -0
- package/dist/integration/providers/anthropic.js +44 -1
- package/dist/integration/providers/openai.d.ts +10 -0
- package/dist/integration/providers/openai.js +58 -2
- package/dist/integration/providers/wire-dump-diff.d.ts +191 -0
- package/dist/integration/providers/wire-dump-diff.js +351 -0
- package/dist/integration/providers/wire-dump.d.ts +178 -0
- package/dist/integration/providers/wire-dump.js +396 -0
- package/dist/integration/storage/jsonl.d.ts +29 -0
- package/dist/integration/storage/jsonl.js +243 -41
- package/dist/integration/storage/session-index.js +63 -8
- package/dist/paths.d.ts +19 -0
- package/dist/paths.js +38 -1
- package/dist/subsystems/cognition-steward/conceptualize/SUBSYSTEM.md +43 -43
- package/dist/subsystems/cognition-steward/conceptualize/config.yaml +50 -50
- package/dist/subsystems/cognition-steward/consolidate/SUBSYSTEM.md +6 -6
- package/dist/subsystems/cognition-steward/consolidate/config.yaml +54 -54
- package/dist/subsystems/memory-steward/backfill/handler.js +9 -0
- package/dist/subsystems/safety-guard/config.yaml +3 -1
- package/dist/subsystems/wisdom-steward/evaluate/config.yaml +50 -50
- package/dist/subsystems/wisdom-steward/formation/SUBSYSTEM.md +42 -42
- package/dist/subsystems/wisdom-steward/formation/config.yaml +54 -54
- package/dist/subsystems/wisdom-steward/govern/config.yaml +55 -55
- package/package.json +115 -115
- package/dist/harness/collaboration/multi-agent/agent-registry-types.d.ts +0 -144
- package/dist/harness/collaboration/multi-agent/agent-registry-types.js +0 -25
- package/dist/harness/collaboration/multi-agent/index.d.ts +0 -17
- package/dist/harness/collaboration/multi-agent/index.js +0 -15
- package/dist/harness/collaboration/multi-agent/process.d.ts +0 -167
- package/dist/harness/collaboration/multi-agent/process.js +0 -256
- package/dist/harness/collaboration/multi-agent/registry.d.ts +0 -36
- package/dist/harness/collaboration/multi-agent/registry.js +0 -137
- package/dist/harness/collaboration/multi-agent/swarm.d.ts +0 -135
- package/dist/harness/collaboration/multi-agent/swarm.js +0 -317
- package/dist/harness/collaboration/multi-agent/types.d.ts +0 -66
- package/dist/harness/collaboration/multi-agent/types.js +0 -15
- package/dist/harness/collaboration/orchestration/async-task-store.d.ts +0 -107
- package/dist/harness/collaboration/orchestration/async-task-store.js +0 -12
- package/dist/harness/collaboration/orchestration/async-task.d.ts +0 -156
- package/dist/harness/collaboration/orchestration/async-task.js +0 -359
- package/dist/harness/collaboration/orchestration/planner/hybrid-planner.d.ts +0 -47
- package/dist/harness/collaboration/orchestration/planner/hybrid-planner.js +0 -61
- package/dist/harness/collaboration/orchestration/planner/index.d.ts +0 -9
- package/dist/harness/collaboration/orchestration/planner/index.js +0 -6
- package/dist/harness/collaboration/orchestration/planner/llm-planner.d.ts +0 -54
- package/dist/harness/collaboration/orchestration/planner/llm-planner.js +0 -167
- package/dist/harness/collaboration/orchestration/planner/rule-planner.d.ts +0 -85
- package/dist/harness/collaboration/orchestration/planner/rule-planner.js +0 -175
- package/dist/harness/collaboration/orchestration/quality/classifier.d.ts +0 -21
- package/dist/harness/collaboration/orchestration/quality/classifier.js +0 -235
- package/dist/harness/collaboration/orchestration/quality/gate.d.ts +0 -29
- package/dist/harness/collaboration/orchestration/quality/gate.js +0 -409
- package/dist/harness/collaboration/orchestration/quality/index.d.ts +0 -9
- package/dist/harness/collaboration/orchestration/quality/index.js +0 -8
- package/dist/harness/collaboration/orchestration/quality/types.d.ts +0 -159
- package/dist/harness/collaboration/orchestration/quality/types.js +0 -33
- package/dist/harness/collaboration/orchestration/scheduler/index.d.ts +0 -5
- package/dist/harness/collaboration/orchestration/scheduler/index.js +0 -4
- package/dist/harness/collaboration/orchestration/scheduler/task-scheduler.d.ts +0 -143
- package/dist/harness/collaboration/orchestration/scheduler/task-scheduler.js +0 -297
- package/dist/harness/collaboration/orchestration/strategy/classifier.d.ts +0 -12
- package/dist/harness/collaboration/orchestration/strategy/classifier.js +0 -81
- package/dist/harness/collaboration/orchestration/strategy/index.d.ts +0 -3
- package/dist/harness/collaboration/orchestration/strategy/index.js +0 -2
- package/dist/harness/collaboration/orchestration/strategy/router.d.ts +0 -28
- package/dist/harness/collaboration/orchestration/strategy/router.js +0 -105
- package/dist/harness/collaboration/orchestration/strategy/types.d.ts +0 -49
- package/dist/harness/collaboration/orchestration/strategy/types.js +0 -4
- package/dist/harness/collaboration/orchestration/workflow/engine.d.ts +0 -86
- package/dist/harness/collaboration/orchestration/workflow/engine.js +0 -298
- package/dist/harness/collaboration/orchestration/workflow/index.d.ts +0 -9
- package/dist/harness/collaboration/orchestration/workflow/index.js +0 -7
- package/dist/harness/collaboration/orchestration/workflow/types.d.ts +0 -143
- package/dist/harness/collaboration/orchestration/workflow/types.js +0 -7
- package/dist/harness/governance/human-in-the-loop/approval-manager.d.ts +0 -32
- package/dist/harness/governance/human-in-the-loop/approval-manager.js +0 -93
- /package/dist/harness/collaboration/{multi-agent → delegation}/message-channel-types.d.ts +0 -0
- /package/dist/harness/collaboration/{multi-agent → delegation}/message-channel-types.js +0 -0
|
@@ -10,6 +10,7 @@ import { SubsystemTimeoutError } from './errors.js';
|
|
|
10
10
|
import { TokenBudgetExceededError } from './think/executor.js';
|
|
11
11
|
import { randomUUID } from 'node:crypto';
|
|
12
12
|
import { SenseEngine } from './sense/engine.js';
|
|
13
|
+
import { SessionLifecycleBridge } from './sense/session-lifecycle-bridge.js';
|
|
13
14
|
import { ThinkExecutor } from './think/executor.js';
|
|
14
15
|
import { ModelResolver } from './think/model-resolver.js';
|
|
15
16
|
import { createSubsystemLLMPort, DEP_LLM_PORT, DEP_RESOLVED_MODEL, DEP_RESOLVED_MODELS, DEP_SUBSYSTEM_PROMPT, } from './think/llm-port.js';
|
|
@@ -22,10 +23,12 @@ import { buildAgentInput } from './sense/input-builder.js';
|
|
|
22
23
|
// ── SubsystemRuntime ──
|
|
23
24
|
export class SubsystemRuntime {
|
|
24
25
|
deps;
|
|
26
|
+
securityEnforcement;
|
|
25
27
|
senseEngine;
|
|
26
28
|
thinkExecutor;
|
|
27
29
|
signalBus;
|
|
28
30
|
sessionManager;
|
|
31
|
+
sessionLifecycleBridge;
|
|
29
32
|
auditWriter;
|
|
30
33
|
modelResolver;
|
|
31
34
|
subsystems = new Map();
|
|
@@ -35,24 +38,27 @@ export class SubsystemRuntime {
|
|
|
35
38
|
activeTimeouts = new Map();
|
|
36
39
|
constructor(config) {
|
|
37
40
|
this.deps = config.deps;
|
|
41
|
+
this.securityEnforcement = config.securityEnforcement;
|
|
38
42
|
this.senseEngine = new SenseEngine({
|
|
39
43
|
events: config.deps.events,
|
|
40
44
|
});
|
|
45
|
+
// levels 缺省为空:think.model 引用未配置的级别名时 fail-loud(见 ModelResolver),
|
|
46
|
+
// 不再用 'default/mini' 这类假缺省静默打错模型。
|
|
41
47
|
this.modelResolver = new ModelResolver({
|
|
42
|
-
levels: config.deps.modelLevels ?? {
|
|
43
|
-
mini: { primary: 'default/mini' },
|
|
44
|
-
standard: { primary: 'default/standard' },
|
|
45
|
-
pro: { primary: 'default/pro' },
|
|
46
|
-
},
|
|
47
|
-
defaultProvider: config.deps.defaultModelProvider,
|
|
48
|
+
levels: config.deps.modelLevels ?? {},
|
|
48
49
|
});
|
|
49
50
|
this.thinkExecutor = new ThinkExecutor({
|
|
50
51
|
modelResolver: this.modelResolver,
|
|
51
52
|
modelProvider: config.deps.model,
|
|
53
|
+
providers: config.deps.providers,
|
|
52
54
|
errorStrategy: config.deps.errorStrategy,
|
|
53
55
|
});
|
|
54
56
|
this.signalBus = new SignalBus({ events: config.deps.events });
|
|
55
57
|
this.sessionManager = new SubsystemSessionManager();
|
|
58
|
+
// 会话生命周期 → metrics(session.lifecycle.* / session.idle.ms / session.extraction.*),
|
|
59
|
+
// schedule 模式条件(ctx 只有 metrics)依赖这些键感知空闲/生命周期。
|
|
60
|
+
// agentId 绑定:共享总线上多 agent 事件不互相污染。
|
|
61
|
+
this.sessionLifecycleBridge = new SessionLifecycleBridge(config.deps.events, this.senseEngine.metricsStore, { agentId: config.agentId });
|
|
56
62
|
config.deps.events.on('session.ended', (event) => {
|
|
57
63
|
const data = (event.data ?? {});
|
|
58
64
|
const agentId = event.agentId ?? data.agentId;
|
|
@@ -137,7 +143,7 @@ export class SubsystemRuntime {
|
|
|
137
143
|
*/
|
|
138
144
|
register(spec) {
|
|
139
145
|
// 校验
|
|
140
|
-
const errors = validateSubsystemSpec(spec);
|
|
146
|
+
const errors = validateSubsystemSpec(spec, this.securityEnforcement);
|
|
141
147
|
if (errors.length > 0) {
|
|
142
148
|
return errors.map((e) => `[${e.field}] ${e.message}`);
|
|
143
149
|
}
|
|
@@ -257,6 +263,7 @@ export class SubsystemRuntime {
|
|
|
257
263
|
* 清理所有资源
|
|
258
264
|
*/
|
|
259
265
|
dispose() {
|
|
266
|
+
this.sessionLifecycleBridge.dispose();
|
|
260
267
|
this.cancelPendingAbortTimers();
|
|
261
268
|
this.senseEngine.dispose();
|
|
262
269
|
this.sessionManager.dispose();
|
|
@@ -361,13 +368,14 @@ export class SubsystemRuntime {
|
|
|
361
368
|
if (entry.spec.think.systemPrompt) {
|
|
362
369
|
injectDeps[DEP_SUBSYSTEM_PROMPT] = entry.spec.think.systemPrompt;
|
|
363
370
|
}
|
|
364
|
-
const resolved = this.modelResolver.
|
|
371
|
+
const resolved = this.modelResolver.resolveRef(entry.spec.think.model);
|
|
365
372
|
injectDeps[DEP_RESOLVED_MODEL] = resolved.primary.model;
|
|
366
373
|
injectDeps[DEP_RESOLVED_MODELS] = resolved;
|
|
367
374
|
injectDeps[DEP_LLM_PORT] = createSubsystemLLMPort({
|
|
368
375
|
provider: this.deps.model,
|
|
376
|
+
providers: this.deps.providers,
|
|
369
377
|
modelResolver: this.modelResolver,
|
|
370
|
-
modelRef: entry.spec.think.model
|
|
378
|
+
modelRef: entry.spec.think.model,
|
|
371
379
|
cognitivePrompt: entry.spec.think.systemPrompt,
|
|
372
380
|
});
|
|
373
381
|
const result = await this.thinkExecutor.execute(entry.spec.think, input, entry.spec.act.mode, tools, injectDeps, { abortSignal: abortController.signal, tokenBudget: maxTokens });
|
|
@@ -35,6 +35,18 @@ export declare class MetricsStore {
|
|
|
35
35
|
* @returns 指标值,不存在返回 undefined
|
|
36
36
|
*/
|
|
37
37
|
get(key: string): number | undefined;
|
|
38
|
+
/**
|
|
39
|
+
* 删除指标
|
|
40
|
+
*
|
|
41
|
+
* @param key - 指标名
|
|
42
|
+
*/
|
|
43
|
+
delete(key: string): void;
|
|
44
|
+
/**
|
|
45
|
+
* 删除某前缀下的全部指标(如「最新状态」类标志换值时清旧值)
|
|
46
|
+
*
|
|
47
|
+
* @param prefix - 指标名前缀
|
|
48
|
+
*/
|
|
49
|
+
deletePrefix(prefix: string): void;
|
|
38
50
|
/**
|
|
39
51
|
* 获取当前指标快照
|
|
40
52
|
*/
|
|
@@ -42,6 +42,25 @@ export class MetricsStore {
|
|
|
42
42
|
get(key) {
|
|
43
43
|
return this.metrics.get(key);
|
|
44
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* 删除指标
|
|
47
|
+
*
|
|
48
|
+
* @param key - 指标名
|
|
49
|
+
*/
|
|
50
|
+
delete(key) {
|
|
51
|
+
this.metrics.delete(key);
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* 删除某前缀下的全部指标(如「最新状态」类标志换值时清旧值)
|
|
55
|
+
*
|
|
56
|
+
* @param prefix - 指标名前缀
|
|
57
|
+
*/
|
|
58
|
+
deletePrefix(prefix) {
|
|
59
|
+
for (const key of this.metrics.keys()) {
|
|
60
|
+
if (key.startsWith(prefix))
|
|
61
|
+
this.metrics.delete(key);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
45
64
|
/**
|
|
46
65
|
* 获取当前指标快照
|
|
47
66
|
*/
|
|
@@ -18,6 +18,11 @@ export interface SessionLifecycleBridgeOptions {
|
|
|
18
18
|
enableIdle?: boolean;
|
|
19
19
|
/** idle 更新间隔(毫秒,默认 15_000) */
|
|
20
20
|
idleTickMs?: number;
|
|
21
|
+
/**
|
|
22
|
+
* 只跟踪该 agent 的会话事件(SubsystemRuntime 按 agentId 绑定)。
|
|
23
|
+
* 缺省不过滤(嵌入宿主单 agent 场景)。
|
|
24
|
+
*/
|
|
25
|
+
agentId?: string;
|
|
21
26
|
}
|
|
22
27
|
/**
|
|
23
28
|
* SessionLifecycleBridge
|
|
@@ -30,6 +35,7 @@ export declare class SessionLifecycleBridge {
|
|
|
30
35
|
private tick?;
|
|
31
36
|
private enableIdle;
|
|
32
37
|
private idleTickMs;
|
|
38
|
+
private agentId?;
|
|
33
39
|
constructor(events: EventBus, metrics: MetricsStore, options?: SessionLifecycleBridgeOptions);
|
|
34
40
|
/** 更新主会话状态(外部调用:Runner / SessionManager / PluginManager) */
|
|
35
41
|
updateState(input: {
|
|
@@ -21,11 +21,13 @@ export class SessionLifecycleBridge {
|
|
|
21
21
|
tick;
|
|
22
22
|
enableIdle;
|
|
23
23
|
idleTickMs;
|
|
24
|
+
agentId;
|
|
24
25
|
constructor(events, metrics, options) {
|
|
25
26
|
this.events = events;
|
|
26
27
|
this.metrics = metrics;
|
|
27
28
|
this.enableIdle = options?.enableIdle ?? true;
|
|
28
29
|
this.idleTickMs = options?.idleTickMs ?? 15_000;
|
|
30
|
+
this.agentId = options?.agentId;
|
|
29
31
|
// 订阅通用 session 生命周期事件(由 runner / plugin-manager 等发出)
|
|
30
32
|
this.disposables.push(this.events.on('session.lifecycle.updated', (e) => this.onLifecycleUpdated(e)));
|
|
31
33
|
// 订阅 engine.end 以标记 session 最近结束
|
|
@@ -33,6 +35,8 @@ export class SessionLifecycleBridge {
|
|
|
33
35
|
// 可选:轮询计算 idle 指标(不触发子系统,仅更新指标快照)
|
|
34
36
|
if (this.enableIdle) {
|
|
35
37
|
this.tick = setInterval(() => this.refreshIdleMetrics(), this.idleTickMs);
|
|
38
|
+
// 指标刷新计时器不得拖住进程退出(与 schedule timers 同口径)
|
|
39
|
+
this.tick.unref?.();
|
|
36
40
|
}
|
|
37
41
|
}
|
|
38
42
|
/** 更新主会话状态(外部调用:Runner / SessionManager / PluginManager) */
|
|
@@ -43,9 +47,13 @@ export class SessionLifecycleBridge {
|
|
|
43
47
|
...input,
|
|
44
48
|
};
|
|
45
49
|
this.state.set(input.sessionId, next);
|
|
46
|
-
//
|
|
47
|
-
|
|
50
|
+
// 「最新状态」类指标:换值即清同族旧值(不做 latching 计数,条件表达式读到的是当前态)
|
|
51
|
+
if (next.lifecycle) {
|
|
52
|
+
this.metrics.deletePrefix('session.lifecycle.');
|
|
53
|
+
this.metrics.update(`session.lifecycle.${next.lifecycle}`, 1);
|
|
54
|
+
}
|
|
48
55
|
if (next.extractionStatus) {
|
|
56
|
+
this.metrics.deletePrefix('session.extraction.');
|
|
49
57
|
this.metrics.update(`session.extraction.${next.extractionStatus}`, 1);
|
|
50
58
|
}
|
|
51
59
|
}
|
|
@@ -74,6 +82,10 @@ export class SessionLifecycleBridge {
|
|
|
74
82
|
}
|
|
75
83
|
onLifecycleUpdated(event) {
|
|
76
84
|
const data = (event.data ?? {});
|
|
85
|
+
// agent 过滤:共享总线(gatewayBus)上多 agent 事件不互相污染指标
|
|
86
|
+
const eventAgentId = (event.agentId ?? data.agentId);
|
|
87
|
+
if (this.agentId && eventAgentId && eventAgentId !== this.agentId)
|
|
88
|
+
return;
|
|
77
89
|
const sessionId = (event.sessionId ?? data.sessionId);
|
|
78
90
|
if (!sessionId)
|
|
79
91
|
return;
|
|
@@ -86,6 +98,8 @@ export class SessionLifecycleBridge {
|
|
|
86
98
|
});
|
|
87
99
|
}
|
|
88
100
|
onEngineEnd(event) {
|
|
101
|
+
if (this.agentId && event.agentId && event.agentId !== this.agentId)
|
|
102
|
+
return;
|
|
89
103
|
const sessionId = event.sessionId;
|
|
90
104
|
if (!sessionId)
|
|
91
105
|
return;
|
|
@@ -96,13 +110,16 @@ export class SessionLifecycleBridge {
|
|
|
96
110
|
});
|
|
97
111
|
}
|
|
98
112
|
refreshIdleMetrics() {
|
|
99
|
-
// 仅做指标刷新,不做触发;触发由 SenseEngine
|
|
100
|
-
|
|
113
|
+
// 仅做指标刷新,不做触发;触发由 SenseEngine 条件驱动。
|
|
114
|
+
// 多会话取「最近有交互」的会话:session.idle.ms 语义 = 该 agent 静默了多久
|
|
115
|
+
let newest;
|
|
101
116
|
for (const [, s] of this.state) {
|
|
102
|
-
if (s.lastInteractionAt) {
|
|
103
|
-
|
|
104
|
-
this.metrics.update('session.idle.ms', idleMs);
|
|
117
|
+
if (s.lastInteractionAt && (newest === undefined || s.lastInteractionAt > newest)) {
|
|
118
|
+
newest = s.lastInteractionAt;
|
|
105
119
|
}
|
|
106
120
|
}
|
|
121
|
+
if (newest !== undefined) {
|
|
122
|
+
this.metrics.update('session.idle.ms', Date.now() - newest);
|
|
123
|
+
}
|
|
107
124
|
}
|
|
108
125
|
}
|
|
@@ -10,15 +10,17 @@ import type { ModelProvider } from '@octopi-agent/core/interfaces/model-provider
|
|
|
10
10
|
import type { ErrorStrategy } from '@octopi-agent/core/interfaces/error-strategy.js';
|
|
11
11
|
import type { RegisteredTool } from '@octopi-agent/core/types.js';
|
|
12
12
|
import type { ThinkConfig, SubsystemInput, SubsystemOutput, ActMode, InjectedDependencies } from '../types.js';
|
|
13
|
-
import type
|
|
13
|
+
import { type ModelResolver } from './model-resolver.js';
|
|
14
14
|
export declare class TokenBudgetExceededError extends Error {
|
|
15
15
|
constructor(message?: string);
|
|
16
16
|
}
|
|
17
17
|
export interface ThinkExecutorConfig {
|
|
18
18
|
/** 模型解析器 */
|
|
19
19
|
modelResolver: ModelResolver;
|
|
20
|
-
/**
|
|
20
|
+
/** 主 ModelProvider 实例(未指名 provider / 未命中时回退) */
|
|
21
21
|
modelProvider: ModelProvider;
|
|
22
|
+
/** 按名注册的 provider 映射(`provider/model` 引用解析用) */
|
|
23
|
+
providers?: Map<string, ModelProvider>;
|
|
22
24
|
/** 共享的 ErrorStrategy */
|
|
23
25
|
errorStrategy: ErrorStrategy;
|
|
24
26
|
}
|
|
@@ -35,6 +37,7 @@ export interface ThinkExecutorConfig {
|
|
|
35
37
|
export declare class ThinkExecutor {
|
|
36
38
|
private modelResolver;
|
|
37
39
|
private modelProvider;
|
|
40
|
+
private providers?;
|
|
38
41
|
private errorStrategy;
|
|
39
42
|
constructor(config: ThinkExecutorConfig);
|
|
40
43
|
/**
|
|
@@ -7,7 +7,9 @@
|
|
|
7
7
|
* @module autonomous-subsystem/think/executor
|
|
8
8
|
*/
|
|
9
9
|
import { Agent } from '../../../run/agent/index.js';
|
|
10
|
+
import { createUnconfiguredFileEffects, createUnconfiguredMemoryEffects, } from '../../../extension/execution-environment/undo-log.js';
|
|
10
11
|
import { bindModelName } from '../../../run/reliability/model-binding.js';
|
|
12
|
+
import { resolveProviderInstance } from './model-resolver.js';
|
|
11
13
|
import { shouldFallbackModel } from './llm-port.js';
|
|
12
14
|
import { estimateTextTokens } from '../../../context/index.js';
|
|
13
15
|
export class TokenBudgetExceededError extends Error {
|
|
@@ -29,9 +31,11 @@ export class TokenBudgetExceededError extends Error {
|
|
|
29
31
|
export class ThinkExecutor {
|
|
30
32
|
modelResolver;
|
|
31
33
|
modelProvider;
|
|
34
|
+
providers;
|
|
32
35
|
errorStrategy;
|
|
33
36
|
constructor(config) {
|
|
34
37
|
this.modelResolver = config.modelResolver;
|
|
38
|
+
this.providers = config.providers;
|
|
35
39
|
this.modelProvider = config.modelProvider;
|
|
36
40
|
this.errorStrategy = config.errorStrategy;
|
|
37
41
|
}
|
|
@@ -75,8 +79,7 @@ export class ThinkExecutor {
|
|
|
75
79
|
throw new Error('think.implementation "llm" requires a systemPrompt');
|
|
76
80
|
}
|
|
77
81
|
this.ensureInputWithinBudget(input, options?.tokenBudget);
|
|
78
|
-
const
|
|
79
|
-
const resolved = this.modelResolver.resolve(modelRef);
|
|
82
|
+
const resolved = this.modelResolver.resolveRef(think.model);
|
|
80
83
|
const agentTools = this.buildAgentTools(resolvedTools);
|
|
81
84
|
const agent = new Agent({
|
|
82
85
|
model: this.modelProvider,
|
|
@@ -111,7 +114,9 @@ export class ThinkExecutor {
|
|
|
111
114
|
tokenUsage = undefined;
|
|
112
115
|
// 每次 fallback 重置消息与模型,避免上一次 agentLoop 原地改写污染
|
|
113
116
|
agent.context.messages = freshMessages();
|
|
114
|
-
|
|
117
|
+
// provider/model 说到做到:按解析出的 provider 名选实例,模型名显式才 bind
|
|
118
|
+
const activeProvider = resolveProviderInstance(target, this.providers, this.modelProvider);
|
|
119
|
+
agent.setModel(target.model !== undefined ? bindModelName(activeProvider, target.model) : activeProvider);
|
|
115
120
|
for await (const event of agent.run(options?.abortSignal)) {
|
|
116
121
|
if (event.type === 'assistant_message') {
|
|
117
122
|
lastContent = typeof event.message.content === 'string' ? event.message.content : '';
|
|
@@ -203,6 +208,7 @@ export class ThinkExecutor {
|
|
|
203
208
|
return Array.from(tools.values()).map((t) => ({
|
|
204
209
|
name: t.definition.name,
|
|
205
210
|
description: t.definition.description,
|
|
211
|
+
executionMode: t.executionMode,
|
|
206
212
|
parameters: {
|
|
207
213
|
type: 'object',
|
|
208
214
|
properties: Object.fromEntries(Object.entries(t.definition.parameters).map(([key, param]) => [
|
|
@@ -220,6 +226,8 @@ export class ThinkExecutor {
|
|
|
220
226
|
sessionId: 'subsystem',
|
|
221
227
|
agentId: 'subsystem',
|
|
222
228
|
messages: [],
|
|
229
|
+
fileEffects: createUnconfiguredFileEffects(),
|
|
230
|
+
memoryEffects: createUnconfiguredMemoryEffects(),
|
|
223
231
|
});
|
|
224
232
|
return {
|
|
225
233
|
toolCallId,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { ThinkExecutor } from './executor.js';
|
|
2
2
|
export type { ThinkExecutorConfig } from './executor.js';
|
|
3
|
-
export { ModelResolver } from './model-resolver.js';
|
|
3
|
+
export { ModelResolver, resolveProviderInstance } from './model-resolver.js';
|
|
4
4
|
export type { ModelResolverConfig, ResolvedModel, ResolvedModelWithFallback } from './model-resolver.js';
|
|
5
5
|
export { createSubsystemLLMPort, shouldFallbackModel, DEP_LLM_PORT, DEP_SUBSYSTEM_PROMPT, DEP_RESOLVED_MODEL, DEP_RESOLVED_MODELS, } from './llm-port.js';
|
|
6
6
|
export type { SubsystemLLMPort, SubsystemLLMPortChatRequest, CreateSubsystemLLMPortOptions, } from './llm-port.js';
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { ThinkExecutor } from './executor.js';
|
|
2
|
-
export { ModelResolver } from './model-resolver.js';
|
|
2
|
+
export { ModelResolver, resolveProviderInstance } from './model-resolver.js';
|
|
3
3
|
export { createSubsystemLLMPort, shouldFallbackModel, DEP_LLM_PORT, DEP_SUBSYSTEM_PROMPT, DEP_RESOLVED_MODEL, DEP_RESOLVED_MODELS, } from './llm-port.js';
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* @module autonomous-subsystem/think/llm-port
|
|
13
13
|
*/
|
|
14
14
|
import type { ModelProvider, LLMMessage, LLMResponse } from '@octopi-agent/core/interfaces/model-provider.js';
|
|
15
|
-
import type
|
|
15
|
+
import { type ModelResolver, type ResolvedModelWithFallback } from './model-resolver.js';
|
|
16
16
|
/** 注入依赖键:统一 LLM 端口 */
|
|
17
17
|
export declare const DEP_LLM_PORT = "llmPort";
|
|
18
18
|
/** 注入依赖键:SUBSYSTEM.md 正文(认知指令) */
|
|
@@ -35,9 +35,9 @@ export interface SubsystemLLMPortChatRequest {
|
|
|
35
35
|
export interface SubsystemLLMPort {
|
|
36
36
|
/** SUBSYSTEM.md 正文(认知指令),可能为空 */
|
|
37
37
|
readonly cognitivePrompt: string;
|
|
38
|
-
/** 默认模型名(primary
|
|
39
|
-
readonly defaultModel
|
|
40
|
-
/**
|
|
38
|
+
/** 默认模型名(primary);undefined = provider defaultModel */
|
|
39
|
+
readonly defaultModel?: string;
|
|
40
|
+
/** 主 provider 名 */
|
|
41
41
|
readonly providerName: string;
|
|
42
42
|
/** 完整解析结果(含 fallback) */
|
|
43
43
|
readonly resolved: ResolvedModelWithFallback;
|
|
@@ -45,7 +45,10 @@ export interface SubsystemLLMPort {
|
|
|
45
45
|
chat(request: SubsystemLLMPortChatRequest): Promise<LLMResponse>;
|
|
46
46
|
}
|
|
47
47
|
export interface CreateSubsystemLLMPortOptions {
|
|
48
|
+
/** 主 provider 实例(resolved 未指名 provider / 未命中时回退) */
|
|
48
49
|
provider: ModelProvider;
|
|
50
|
+
/** 按名注册的 provider 映射(`provider/model` 引用解析用) */
|
|
51
|
+
providers?: Map<string, ModelProvider>;
|
|
49
52
|
modelResolver: ModelResolver;
|
|
50
53
|
/** think.model 引用;缺省 'standard' */
|
|
51
54
|
modelRef?: string;
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*
|
|
12
12
|
* @module autonomous-subsystem/think/llm-port
|
|
13
13
|
*/
|
|
14
|
+
import { resolveProviderInstance, } from './model-resolver.js';
|
|
14
15
|
/** 注入依赖键:统一 LLM 端口 */
|
|
15
16
|
export const DEP_LLM_PORT = 'llmPort';
|
|
16
17
|
/** 注入依赖键:SUBSYSTEM.md 正文(认知指令) */
|
|
@@ -51,16 +52,12 @@ export function shouldFallbackModel(err) {
|
|
|
51
52
|
return true;
|
|
52
53
|
return false;
|
|
53
54
|
}
|
|
54
|
-
function toResolvedModel(model) {
|
|
55
|
-
// ModelProvider.chat 的 model 字段使用模型名;provider 由注入的 provider 实例决定
|
|
56
|
-
return model.model;
|
|
57
|
-
}
|
|
58
55
|
/**
|
|
59
56
|
* 创建子系统 LLM 端口
|
|
60
57
|
*/
|
|
61
58
|
export function createSubsystemLLMPort(options) {
|
|
62
|
-
const { provider, modelResolver, modelRef, cognitivePrompt } = options;
|
|
63
|
-
const resolved = modelResolver.
|
|
59
|
+
const { provider, providers, modelResolver, modelRef, cognitivePrompt } = options;
|
|
60
|
+
const resolved = modelResolver.resolveRef(modelRef);
|
|
64
61
|
const chat = async (request) => {
|
|
65
62
|
const system = request.systemPrompt ?? cognitivePrompt;
|
|
66
63
|
const messages = system
|
|
@@ -73,16 +70,18 @@ export function createSubsystemLLMPort(options) {
|
|
|
73
70
|
const modelsToTry = [chain.primary, ...chain.fallback];
|
|
74
71
|
let lastErr;
|
|
75
72
|
for (let i = 0; i < modelsToTry.length; i++) {
|
|
76
|
-
const
|
|
73
|
+
const target = modelsToTry[i];
|
|
74
|
+
// provider/model 说到做到:按解析出的 provider 名选实例,未指名/未命中回退主 provider
|
|
75
|
+
const activeProvider = resolveProviderInstance(target, providers, provider);
|
|
77
76
|
const llmRequest = {
|
|
78
77
|
messages,
|
|
79
|
-
model:
|
|
78
|
+
model: target.model ?? activeProvider.defaultModel,
|
|
80
79
|
temperature: request.temperature,
|
|
81
80
|
maxTokens: request.maxTokens,
|
|
82
81
|
signal: request.signal,
|
|
83
82
|
};
|
|
84
83
|
try {
|
|
85
|
-
const response = await
|
|
84
|
+
const response = await activeProvider.chat(llmRequest);
|
|
86
85
|
if (response.finishReason === 'error') {
|
|
87
86
|
lastErr = new Error(response.content || 'LLM chat error');
|
|
88
87
|
// 与 catch 路径同一策略:仅瞬时/可重试错误才换模型,避免鉴权/参数错白试
|
|
@@ -5,15 +5,21 @@
|
|
|
5
5
|
* 支持三种格式:级别名(mini/standard/pro)、provider/model、裸模型名。
|
|
6
6
|
* 级别名模式支持 primary + fallback 降级链。
|
|
7
7
|
*
|
|
8
|
+
* 语义约定:
|
|
9
|
+
* - `provider` 为 undefined = 不指名 provider(用主 provider 实例)
|
|
10
|
+
* - `model` 为 undefined = 不指名模型(用所选 provider 的 defaultModel)
|
|
11
|
+
* - 级别名未在 levels 中配置时 **fail-loud**(报可操作错误),不用假缺省静默打错模型
|
|
12
|
+
*
|
|
8
13
|
* @module autonomous-subsystem/think/model-resolver
|
|
9
14
|
*/
|
|
15
|
+
import type { ModelProvider } from '@octopi-agent/core/interfaces/model-provider.js';
|
|
10
16
|
import type { ModelLevelMap } from '../types.js';
|
|
11
17
|
/** 解析后的模型引用 */
|
|
12
18
|
export interface ResolvedModel {
|
|
13
|
-
/** provider
|
|
14
|
-
provider
|
|
15
|
-
/**
|
|
16
|
-
model
|
|
19
|
+
/** provider 名称;undefined = 主 provider */
|
|
20
|
+
provider?: string;
|
|
21
|
+
/** 模型名称;undefined = provider 的 defaultModel */
|
|
22
|
+
model?: string;
|
|
17
23
|
}
|
|
18
24
|
/** 带 fallback 的解析结果 */
|
|
19
25
|
export interface ResolvedModelWithFallback {
|
|
@@ -25,11 +31,18 @@ export interface ResolvedModelWithFallback {
|
|
|
25
31
|
fromLevel: boolean;
|
|
26
32
|
}
|
|
27
33
|
export interface ModelResolverConfig {
|
|
28
|
-
/**
|
|
34
|
+
/** 模型级别映射表(config.models.level) */
|
|
29
35
|
levels: ModelLevelMap;
|
|
30
|
-
/** 默认 provider(裸模型名时使用) */
|
|
31
|
-
defaultProvider?: string;
|
|
32
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* 按解析结果选择 provider 实例
|
|
39
|
+
*
|
|
40
|
+
* @param resolved - 解析出的模型引用
|
|
41
|
+
* @param providers - 按名注册的 provider 映射(可空)
|
|
42
|
+
* @param fallback - 主 provider 实例(未指名 / 未命中时使用)
|
|
43
|
+
* @returns provider 实例;指名未命中时回退 fallback 并告警
|
|
44
|
+
*/
|
|
45
|
+
export declare function resolveProviderInstance(resolved: ResolvedModel, providers: Map<string, ModelProvider> | undefined, fallback: ModelProvider): ModelProvider;
|
|
33
46
|
/**
|
|
34
47
|
* ModelResolver — 模型分级解析器
|
|
35
48
|
*
|
|
@@ -38,27 +51,40 @@ export interface ModelResolverConfig {
|
|
|
38
51
|
*/
|
|
39
52
|
export declare class ModelResolver {
|
|
40
53
|
private levels;
|
|
41
|
-
private defaultProvider;
|
|
42
54
|
constructor(config: ModelResolverConfig);
|
|
43
55
|
/**
|
|
44
56
|
* 解析模型引用
|
|
45
57
|
*
|
|
46
58
|
* @param modelRef - 模型引用字符串(如 "mini"、"openai-main/gpt-4o-mini"、"gpt-4o-mini")
|
|
47
59
|
* @returns 带 fallback 的解析结果
|
|
48
|
-
* @throws
|
|
60
|
+
* @throws 级别名未配置时抛出可操作错误
|
|
49
61
|
*/
|
|
50
62
|
resolve(modelRef: string): ResolvedModelWithFallback;
|
|
63
|
+
/**
|
|
64
|
+
* 解析可缺省的模型引用
|
|
65
|
+
*
|
|
66
|
+
* - 显式 modelRef → 同 {@link resolve}(未配置级别名 fail-loud)
|
|
67
|
+
* - 缺省 → 'standard' 级别(若已配置),否则主 provider 缺省模型
|
|
68
|
+
*
|
|
69
|
+
* @param modelRef - 可选模型引用
|
|
70
|
+
* @returns 带 fallback 的解析结果
|
|
71
|
+
*/
|
|
72
|
+
resolveRef(modelRef?: string): ResolvedModelWithFallback;
|
|
51
73
|
/**
|
|
52
74
|
* 更新级别映射(用于三级作用域合并)
|
|
75
|
+
*
|
|
76
|
+
* @param levels - 要合并的级别映射
|
|
53
77
|
*/
|
|
54
78
|
updateLevels(levels: ModelLevelMap): void;
|
|
55
79
|
/**
|
|
56
80
|
* 获取所有已配置的级别名
|
|
81
|
+
*
|
|
82
|
+
* @returns 级别名数组
|
|
57
83
|
*/
|
|
58
84
|
get levelNames(): string[];
|
|
59
85
|
private resolveLevel;
|
|
60
86
|
/**
|
|
61
|
-
* 解析 "provider/model"
|
|
87
|
+
* 解析 "provider/model" 格式;无 provider 段时返回裸模型名引用
|
|
62
88
|
*/
|
|
63
89
|
private parseModelRef;
|
|
64
90
|
}
|
|
@@ -5,8 +5,38 @@
|
|
|
5
5
|
* 支持三种格式:级别名(mini/standard/pro)、provider/model、裸模型名。
|
|
6
6
|
* 级别名模式支持 primary + fallback 降级链。
|
|
7
7
|
*
|
|
8
|
+
* 语义约定:
|
|
9
|
+
* - `provider` 为 undefined = 不指名 provider(用主 provider 实例)
|
|
10
|
+
* - `model` 为 undefined = 不指名模型(用所选 provider 的 defaultModel)
|
|
11
|
+
* - 级别名未在 levels 中配置时 **fail-loud**(报可操作错误),不用假缺省静默打错模型
|
|
12
|
+
*
|
|
8
13
|
* @module autonomous-subsystem/think/model-resolver
|
|
9
14
|
*/
|
|
15
|
+
/** 产品约定的级别名(init/example/docs 均定义):未配置时给可操作错误,而不是把别名当模型名打给 provider */
|
|
16
|
+
const WELLKNOWN_LEVEL_ALIASES = new Set(['summary', 'mini', 'standard', 'pro']);
|
|
17
|
+
/**
|
|
18
|
+
* 按解析结果选择 provider 实例
|
|
19
|
+
*
|
|
20
|
+
* @param resolved - 解析出的模型引用
|
|
21
|
+
* @param providers - 按名注册的 provider 映射(可空)
|
|
22
|
+
* @param fallback - 主 provider 实例(未指名 / 未命中时使用)
|
|
23
|
+
* @returns provider 实例;指名未命中时回退 fallback 并告警
|
|
24
|
+
*/
|
|
25
|
+
export function resolveProviderInstance(resolved, providers, fallback) {
|
|
26
|
+
if (!resolved.provider)
|
|
27
|
+
return fallback;
|
|
28
|
+
const named = providers?.get(resolved.provider);
|
|
29
|
+
if (named)
|
|
30
|
+
return named;
|
|
31
|
+
// 未注册名回退主 provider 是拍板的 fail-open 策略(docs §7.4);告警按名去重防逐调用刷屏
|
|
32
|
+
if (!warnedProviderNames.has(resolved.provider)) {
|
|
33
|
+
warnedProviderNames.add(resolved.provider);
|
|
34
|
+
console.warn(`[SubsystemThink] provider "${resolved.provider}" not registered; falling back to main provider`);
|
|
35
|
+
}
|
|
36
|
+
return fallback;
|
|
37
|
+
}
|
|
38
|
+
/** 已告警过的未注册 provider 名(每进程每名一次) */
|
|
39
|
+
const warnedProviderNames = new Set();
|
|
10
40
|
/**
|
|
11
41
|
* ModelResolver — 模型分级解析器
|
|
12
42
|
*
|
|
@@ -15,17 +45,15 @@
|
|
|
15
45
|
*/
|
|
16
46
|
export class ModelResolver {
|
|
17
47
|
levels;
|
|
18
|
-
defaultProvider;
|
|
19
48
|
constructor(config) {
|
|
20
49
|
this.levels = config.levels;
|
|
21
|
-
this.defaultProvider = config.defaultProvider ?? 'default';
|
|
22
50
|
}
|
|
23
51
|
/**
|
|
24
52
|
* 解析模型引用
|
|
25
53
|
*
|
|
26
54
|
* @param modelRef - 模型引用字符串(如 "mini"、"openai-main/gpt-4o-mini"、"gpt-4o-mini")
|
|
27
55
|
* @returns 带 fallback 的解析结果
|
|
28
|
-
* @throws
|
|
56
|
+
* @throws 级别名未配置时抛出可操作错误
|
|
29
57
|
*/
|
|
30
58
|
resolve(modelRef) {
|
|
31
59
|
// 1. 尝试级别名
|
|
@@ -33,6 +61,10 @@ export class ModelResolver {
|
|
|
33
61
|
if (level) {
|
|
34
62
|
return this.resolveLevel(modelRef, level);
|
|
35
63
|
}
|
|
64
|
+
if (WELLKNOWN_LEVEL_ALIASES.has(modelRef)) {
|
|
65
|
+
throw new Error(`unresolved_model_level: "${modelRef}" is not configured in models.level ` +
|
|
66
|
+
`(configured: ${Object.keys(this.levels).join(', ') || 'none'})`);
|
|
67
|
+
}
|
|
36
68
|
// 2. 尝试 provider/model 格式
|
|
37
69
|
const slashIdx = modelRef.indexOf('/');
|
|
38
70
|
if (slashIdx > 0) {
|
|
@@ -44,21 +76,42 @@ export class ModelResolver {
|
|
|
44
76
|
fromLevel: false,
|
|
45
77
|
};
|
|
46
78
|
}
|
|
47
|
-
// 3.
|
|
79
|
+
// 3. 裸模型名:主 provider + 显式模型名
|
|
48
80
|
return {
|
|
49
|
-
primary: { provider:
|
|
81
|
+
primary: { provider: undefined, model: modelRef },
|
|
50
82
|
fallback: [],
|
|
51
83
|
fromLevel: false,
|
|
52
84
|
};
|
|
53
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* 解析可缺省的模型引用
|
|
88
|
+
*
|
|
89
|
+
* - 显式 modelRef → 同 {@link resolve}(未配置级别名 fail-loud)
|
|
90
|
+
* - 缺省 → 'standard' 级别(若已配置),否则主 provider 缺省模型
|
|
91
|
+
*
|
|
92
|
+
* @param modelRef - 可选模型引用
|
|
93
|
+
* @returns 带 fallback 的解析结果
|
|
94
|
+
*/
|
|
95
|
+
resolveRef(modelRef) {
|
|
96
|
+
if (modelRef)
|
|
97
|
+
return this.resolve(modelRef);
|
|
98
|
+
const standard = this.levels['standard'];
|
|
99
|
+
if (standard)
|
|
100
|
+
return this.resolveLevel('standard', standard);
|
|
101
|
+
return { primary: { provider: undefined, model: undefined }, fallback: [], fromLevel: false };
|
|
102
|
+
}
|
|
54
103
|
/**
|
|
55
104
|
* 更新级别映射(用于三级作用域合并)
|
|
105
|
+
*
|
|
106
|
+
* @param levels - 要合并的级别映射
|
|
56
107
|
*/
|
|
57
108
|
updateLevels(levels) {
|
|
58
109
|
this.levels = { ...this.levels, ...levels };
|
|
59
110
|
}
|
|
60
111
|
/**
|
|
61
112
|
* 获取所有已配置的级别名
|
|
113
|
+
*
|
|
114
|
+
* @returns 级别名数组
|
|
62
115
|
*/
|
|
63
116
|
get levelNames() {
|
|
64
117
|
return Object.keys(this.levels);
|
|
@@ -74,12 +127,12 @@ export class ModelResolver {
|
|
|
74
127
|
};
|
|
75
128
|
}
|
|
76
129
|
/**
|
|
77
|
-
* 解析 "provider/model"
|
|
130
|
+
* 解析 "provider/model" 格式;无 provider 段时返回裸模型名引用
|
|
78
131
|
*/
|
|
79
132
|
parseModelRef(ref) {
|
|
80
133
|
const slashIdx = ref.indexOf('/');
|
|
81
134
|
if (slashIdx <= 0) {
|
|
82
|
-
return { provider:
|
|
135
|
+
return { provider: undefined, model: ref };
|
|
83
136
|
}
|
|
84
137
|
return {
|
|
85
138
|
provider: ref.slice(0, slashIdx),
|