@octopi-agent/engine 0.98.4 → 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 +35 -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 +57 -160
- package/dist/config-schema/engine.js +1 -5
- package/dist/config-schema/governance.d.ts +8 -1
- package/dist/config-schema/governance.js +8 -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 +24 -3
- package/dist/harness/agent/builder.js +131 -27
- package/dist/harness/agent/config-bridge.js +9 -2
- package/dist/harness/agent/config-integrity.js +19 -2
- package/dist/harness/agent/wire-agent-builder.d.ts +11 -3
- package/dist/harness/agent/wire-agent-builder.js +26 -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/loader.js +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.d.ts +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/sense/engine.js +2 -2
- package/dist/harness/collaboration/autonomous-subsystem/sense/input-builder.js +4 -4
- package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.d.ts +2 -2
- package/dist/harness/collaboration/autonomous-subsystem/sense/metrics.js +2 -2
- package/dist/harness/collaboration/autonomous-subsystem/signal/bus.d.ts +6 -0
- package/dist/harness/collaboration/autonomous-subsystem/signal/bus.js +25 -4
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +1 -1
- package/dist/harness/collaboration/autonomous-subsystem/types.d.ts +3 -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 +1 -6
- package/dist/harness/context/capabilities/summary/tool-binding.d.ts +1 -1
- package/dist/harness/context/capabilities/summary/types.d.ts +3 -6
- 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 +14 -15
- package/dist/harness/context/layers.js +41 -11
- 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 +2 -2
- package/dist/harness/context/summarize.js +9 -2
- package/dist/harness/context/system-prompt-assembler.d.ts +2 -0
- package/dist/harness/context/system-prompt-assembler.js +2 -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/ops-audit.d.ts +1 -1
- package/dist/harness/extension/execution-environment/resource-limits.d.ts +1 -1
- package/dist/harness/extension/execution-environment/resource-limits.js +1 -1
- package/dist/harness/extension/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/delegation.js +18 -8
- 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/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/sqlite/wisdom-store.js +35 -10
- package/dist/harness/memory/types.d.ts +6 -4
- package/dist/harness/memory/wisdom-formation.d.ts +14 -3
- package/dist/harness/memory/wisdom-formation.js +85 -22
- package/dist/harness/memory/wisdom-gates.d.ts +14 -0
- package/dist/harness/memory/wisdom-gates.js +59 -19
- package/dist/harness/memory/wisdom.js +9 -0
- package/dist/harness/observability/observer/hub.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 +37 -4
- package/dist/harness/run/runner.d.ts +44 -29
- package/dist/harness/run/runner.js +320 -102
- 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/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/wisdom-steward/formation/SUBSYSTEM.md +8 -1
- package/dist/subsystems/wisdom-steward/formation/config.yaml +1 -0
- package/dist/subsystems/wisdom-steward/formation/handler.js +27 -5
- package/package.json +11 -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,23 +11,25 @@
|
|
|
11
11
|
* - ErrorStrategy 重试策略(通过 onError 注入)
|
|
12
12
|
*
|
|
13
13
|
* 设计原则:
|
|
14
|
-
* - 使用
|
|
15
|
-
* - 使用
|
|
14
|
+
* - 使用 onStepComplete 做副作用(注入 steer 指令),不直接控制停止
|
|
15
|
+
* - 使用 shouldStopAfterStep 做停止决策(critical 循环、RunGuard)
|
|
16
16
|
* - 两层分离,不互相覆盖
|
|
17
17
|
*/
|
|
18
18
|
import { getTextContent } from '@octopi-agent/core/types.js';
|
|
19
19
|
import { classifyError } from '@octopi-agent/core/loop/error-classifier.js';
|
|
20
20
|
import { agentLoop } from '@octopi-agent/core/loop/agent-loop.js';
|
|
21
21
|
import { maxAttemptsFor } from './model-error-policy.js';
|
|
22
|
+
import { applyContextLengthFeedback } from './context-length-feedback.js';
|
|
22
23
|
import { guardRefusalProvider } from './refusal-guard.js';
|
|
23
24
|
import { recordToolCall, detectNoProgressLoop, } from '../concurrency/tool-loop-detection.js';
|
|
24
25
|
import { severityToAction } from '@octopi-agent/core/security-guard.js';
|
|
25
26
|
import { RunMetricsCollector } from './run-metrics-collector.js';
|
|
26
27
|
import { BudgetPolicyEngine } from '../budget/budget.js';
|
|
27
|
-
import { UsageLedger } from '../../governance/accounting/usage-ledger.js';
|
|
28
|
-
import { nominalTotalTokens } from '@octopi-agent/core/types/
|
|
28
|
+
import { UsageLedger, contextPressureTokens } from '../../governance/accounting/usage-ledger.js';
|
|
29
|
+
import { nominalTotalTokens } from '@octopi-agent/core/types/step.js';
|
|
29
30
|
import { getRunScope } from '../run-scope.js';
|
|
30
31
|
import { resolveHitlDecision } from '../../governance/human-in-the-loop/decision-cache.js';
|
|
32
|
+
import { shouldAbortWithoutRetry } from '../../extension/plugin-ecosystem/hooks/policy-error.js';
|
|
31
33
|
export const DEFAULT_RELIABILITY_CONFIG = {
|
|
32
34
|
planningRetry: {
|
|
33
35
|
maxAttempts: 2,
|
|
@@ -146,15 +148,15 @@ function createInitialState(checkpointInterval = 15) {
|
|
|
146
148
|
toolCallHistory: [],
|
|
147
149
|
loopCriticalTriggered: false,
|
|
148
150
|
collector: new RunMetricsCollector(),
|
|
149
|
-
|
|
151
|
+
checkpointStepCount: 0,
|
|
150
152
|
currentCheckpointInterval: checkpointInterval,
|
|
151
|
-
|
|
153
|
+
lastCheckpointStep: 0,
|
|
152
154
|
budgetStop: false,
|
|
153
155
|
runGuardStop: false,
|
|
154
156
|
runGuardRecovered: false,
|
|
155
157
|
hasProgress: true,
|
|
156
158
|
forceCheckpoint: false,
|
|
157
|
-
|
|
159
|
+
modelErrorAttempts: {},
|
|
158
160
|
pendingBudgetHardYield: false,
|
|
159
161
|
pendingSecurityEvents: [],
|
|
160
162
|
pendingRetryDelayMs: 0,
|
|
@@ -216,6 +218,10 @@ function hasStructuredPlanningOnlyFormat(text) {
|
|
|
216
218
|
* - 无审批通道 / 异常 / deny:回退 reject(false),无人值守不放行
|
|
217
219
|
* - `approve_session` / `approve_always` 由引擎缓存,同 session/进程免再问
|
|
218
220
|
*/
|
|
221
|
+
/** True when transformed tool arguments are a plain record SecurityGuard can inspect. */
|
|
222
|
+
function isPlainArgumentsRecord(value) {
|
|
223
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
224
|
+
}
|
|
219
225
|
async function confirmHighRiskDecision(harness, toolCall, reason, severity) {
|
|
220
226
|
const confirm = harness.confirmHighRisk;
|
|
221
227
|
if (!confirm)
|
|
@@ -241,18 +247,36 @@ async function confirmHighRiskDecision(harness, toolCall, reason, severity) {
|
|
|
241
247
|
*
|
|
242
248
|
* 包装 agentLoop(),注入所有可靠性行为。
|
|
243
249
|
*/
|
|
244
|
-
export async function* runAgentWithReliability(context, config, harness, signal) {
|
|
250
|
+
export async function* runAgentWithReliability(context, config, harness, signal, options) {
|
|
245
251
|
const state = createInitialState(harness.config?.checkpointInterval ?? 15);
|
|
246
252
|
const relConfig = { ...DEFAULT_RELIABILITY_CONFIG, ...harness.config };
|
|
247
253
|
// per-run Budget:从 harness 模板克隆,避免长驻进程 / 并发 session 共享计数
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
254
|
+
const templateBudget = harness.budget;
|
|
255
|
+
const budget = templateBudget
|
|
256
|
+
? new BudgetPolicyEngine(templateBudget.getConfig())
|
|
257
|
+
: undefined;
|
|
258
|
+
// 方案A(2026-11-01):等人不计入 wall-clock。ask_user 等阻塞式人机工具经
|
|
259
|
+
// noteHumanWait 回传等待时长,per-run 预算与 metrics collector 同口径扣除
|
|
260
|
+
// (Guard hardWallClockMs 同为 burn 阀,口径必须一致)。装配优先显式传入的
|
|
261
|
+
// toolRuntime,缺失时退回 RunScope ALS;都拿不到则不挂,等待照常计入
|
|
262
|
+
// (口径收紧方向,不放松预算)。compose 不覆盖:宿主自挂的统计不被静默顶掉。
|
|
263
|
+
{
|
|
264
|
+
const toolRuntime = options?.toolRuntime ?? getRunScope()?.toolRuntime;
|
|
265
|
+
if (toolRuntime) {
|
|
266
|
+
const runBudget = budget;
|
|
267
|
+
const collector = state.collector;
|
|
268
|
+
const prevNoteHumanWait = toolRuntime.noteHumanWait;
|
|
269
|
+
toolRuntime.noteHumanWait = (ms) => {
|
|
270
|
+
prevNoteHumanWait?.(ms);
|
|
271
|
+
runBudget?.addHumanWaitMs(ms);
|
|
272
|
+
collector.addHumanWaitMs(ms);
|
|
273
|
+
};
|
|
274
|
+
}
|
|
251
275
|
}
|
|
252
276
|
/** P1:run 级用量账本(只记账,不 kill) */
|
|
253
277
|
const ledger = new UsageLedger();
|
|
254
278
|
// ── 用于空响应/planning-only 重试的消息缓冲 ──
|
|
255
|
-
//
|
|
279
|
+
// onStepComplete 将 steer 消息推入此数组,getFollowUpMessages 返回给 agentLoop
|
|
256
280
|
// 使循环在无 tool_calls 时也能继续执行重试
|
|
257
281
|
const pendingFollowUps = [];
|
|
258
282
|
// ── 注入安全检查到 beforeToolCall ──
|
|
@@ -372,6 +396,17 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
372
396
|
return { block: true, reason, terminate: false };
|
|
373
397
|
}
|
|
374
398
|
}
|
|
399
|
+
// The execution contract is a plain record of arguments (the same shape the
|
|
400
|
+
// before_tool_call Transform contract enforces). Non-record payloads cannot be
|
|
401
|
+
// represented in ToolCall.arguments, so the SecurityGuard, the approval card
|
|
402
|
+
// and the ops audit would all inspect something other than what executes —
|
|
403
|
+
// fail closed instead of silently checking stale data.
|
|
404
|
+
if (!isPlainArgumentsRecord(ctx.args)) {
|
|
405
|
+
return { block: true, reason: 'tool arguments are not a plain record', terminate: false };
|
|
406
|
+
}
|
|
407
|
+
// Effective call = what the tool executes (post Transform). Every policy gate
|
|
408
|
+
// below and its audits inspect exactly this payload, never the raw model output.
|
|
409
|
+
const effectiveCall = { ...ctx.toolCall, arguments: ctx.args };
|
|
375
410
|
// SEC-2: session toolRights ∩ agent ToolPolicy (narrow-only, deny wins).
|
|
376
411
|
// Read from RunScope (per-run); harness is shared across concurrent sessions.
|
|
377
412
|
{
|
|
@@ -392,8 +427,8 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
392
427
|
event: 'ops.escalation.denied',
|
|
393
428
|
data: {
|
|
394
429
|
argv: [
|
|
395
|
-
String(
|
|
396
|
-
...(
|
|
430
|
+
String(effectiveCall.arguments?.cmd ?? ''),
|
|
431
|
+
...(effectiveCall.arguments?.args ?? []),
|
|
397
432
|
],
|
|
398
433
|
why: 'not_authorized',
|
|
399
434
|
toolName: ctx.toolCall.name,
|
|
@@ -430,7 +465,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
430
465
|
}
|
|
431
466
|
}
|
|
432
467
|
if (harness.security) {
|
|
433
|
-
const toolCheck = harness.security.checkToolCall(
|
|
468
|
+
const toolCheck = harness.security.checkToolCall(effectiveCall);
|
|
434
469
|
if (!toolCheck.isClean) {
|
|
435
470
|
const worst = toolCheck.violations.reduce((worst, v) => {
|
|
436
471
|
const order = { critical: 4, high: 3, medium: 2, low: 1 };
|
|
@@ -440,7 +475,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
440
475
|
if (action === 'block' || action === 'reject' || action === 'confirm') {
|
|
441
476
|
// high:优先走人工确认;无审批通道或用户拒绝时回退 reject
|
|
442
477
|
if (action === 'confirm') {
|
|
443
|
-
const confirmed = await confirmHighRiskDecision(harness,
|
|
478
|
+
const confirmed = await confirmHighRiskDecision(harness, effectiveCall, worst.description, worst.severity);
|
|
444
479
|
if (confirmed) {
|
|
445
480
|
// 确认放行:继续原始 beforeToolCall
|
|
446
481
|
if (originalBeforeToolCall) {
|
|
@@ -532,10 +567,15 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
532
567
|
});
|
|
533
568
|
}
|
|
534
569
|
: undefined,
|
|
535
|
-
//
|
|
536
|
-
|
|
570
|
+
// onStepComplete:可靠性副作用(注入 steer 指令,不控制停止)
|
|
571
|
+
onStepComplete: async (ctx) => {
|
|
537
572
|
// 一轮成功走到这里:重置模型错误 attempt
|
|
538
|
-
state.
|
|
573
|
+
state.modelErrorAttempts = {};
|
|
574
|
+
// 用户/扩展链先行(含 before_agent_finalize 定稿):下面的空回复/planning/
|
|
575
|
+
// no-op 判定必须针对定稿后的真实回复,否则 Finalize 补空/改写会误触重试或漏检。
|
|
576
|
+
if (config.onStepComplete) {
|
|
577
|
+
await config.onStepComplete(ctx);
|
|
578
|
+
}
|
|
539
579
|
const hasToolCalls = ctx.toolResults.length > 0;
|
|
540
580
|
const contentText = getTextContent(ctx.message.content);
|
|
541
581
|
const hasContent = contentText.trim().length > 0;
|
|
@@ -549,7 +589,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
549
589
|
tokenDelta: 0,
|
|
550
590
|
timestamp: Date.now(),
|
|
551
591
|
};
|
|
552
|
-
state.collector.
|
|
592
|
+
state.collector.recordStep(summary);
|
|
553
593
|
state.hasProgress = state.collector.hasProgress();
|
|
554
594
|
// 0b. Budget hard(P0:无 soft 续租;nominal tokens 仅诊断)
|
|
555
595
|
if (budget && !state.budgetStop) {
|
|
@@ -674,7 +714,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
674
714
|
// 高危信号:立即触发检查点(不等固定 interval)
|
|
675
715
|
state.forceCheckpoint = true;
|
|
676
716
|
if (state.loopCriticalTriggered) {
|
|
677
|
-
// 二次 critical:通过
|
|
717
|
+
// 二次 critical:通过 shouldStopAfterStep 停止
|
|
678
718
|
state._loopCriticalTwice = true;
|
|
679
719
|
// 停止必须可见:与 RunGuard 走同一事件通道
|
|
680
720
|
state.runGuardStop = {
|
|
@@ -705,11 +745,11 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
705
745
|
}
|
|
706
746
|
// 5. RunGuard 检查点(周期 + 高危即时)
|
|
707
747
|
if (harness.runGuard) {
|
|
708
|
-
state.
|
|
748
|
+
state.checkpointStepCount++;
|
|
709
749
|
const due = state.forceCheckpoint ||
|
|
710
|
-
state.
|
|
750
|
+
state.checkpointStepCount >= state.currentCheckpointInterval;
|
|
711
751
|
if (due) {
|
|
712
|
-
state.
|
|
752
|
+
state.checkpointStepCount = 0;
|
|
713
753
|
state.forceCheckpoint = false;
|
|
714
754
|
try {
|
|
715
755
|
// I1:checkpoint 身份优先 RunScope ALS(harness.sessionId 仅为回退)
|
|
@@ -732,7 +772,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
732
772
|
executeRecoveryActions(verdict.recoveryActions, ctx.context.messages);
|
|
733
773
|
}
|
|
734
774
|
state.collector.recordRecovery({
|
|
735
|
-
|
|
775
|
+
steps: ctxForGuard.steps,
|
|
736
776
|
actionType: primary,
|
|
737
777
|
reason: verdict.reason,
|
|
738
778
|
failureKind: verdict.failureKind,
|
|
@@ -746,7 +786,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
746
786
|
if (verdict.nextCheckpointIn && verdict.nextCheckpointIn > 0) {
|
|
747
787
|
state.currentCheckpointInterval = verdict.nextCheckpointIn;
|
|
748
788
|
}
|
|
749
|
-
state.
|
|
789
|
+
state.lastCheckpointStep = ctxForGuard.steps;
|
|
750
790
|
// 检查点后清空已消费的 external signals
|
|
751
791
|
state.collector.drainExternalSignals();
|
|
752
792
|
}
|
|
@@ -756,15 +796,11 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
756
796
|
}
|
|
757
797
|
}
|
|
758
798
|
else {
|
|
759
|
-
state.
|
|
760
|
-
}
|
|
761
|
-
// 调用用户的 onTurnComplete(如果有)
|
|
762
|
-
if (config.onTurnComplete) {
|
|
763
|
-
await config.onTurnComplete(ctx);
|
|
799
|
+
state.checkpointStepCount++;
|
|
764
800
|
}
|
|
765
801
|
},
|
|
766
|
-
//
|
|
767
|
-
|
|
802
|
+
// shouldStopAfterStep:停止决策
|
|
803
|
+
shouldStopAfterStep: async (ctx) => {
|
|
768
804
|
// 0. Budget hard
|
|
769
805
|
if (state.budgetStop) {
|
|
770
806
|
return true;
|
|
@@ -782,17 +818,37 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
782
818
|
return true;
|
|
783
819
|
}
|
|
784
820
|
// 4. 用户的停止条件
|
|
785
|
-
if (config.
|
|
786
|
-
return config.
|
|
821
|
+
if (config.shouldStopAfterStep) {
|
|
822
|
+
return config.shouldStopAfterStep(ctx);
|
|
787
823
|
}
|
|
788
824
|
return false;
|
|
789
825
|
},
|
|
790
826
|
// onError:错误分类 + ErrorStrategy
|
|
791
827
|
// Loop 契约:只允许 'retry' | 'abort';业务错误永不 throw
|
|
792
828
|
onError: async (error) => {
|
|
829
|
+
if (shouldAbortWithoutRetry(error))
|
|
830
|
+
return 'abort';
|
|
793
831
|
const classified = classifyError(error);
|
|
794
|
-
|
|
795
|
-
state.
|
|
832
|
+
// attempt 按错误原因独立计数(上限本就是 per-reason 的)
|
|
833
|
+
const attempt = state.modelErrorAttempts[classified.reason] ?? 0;
|
|
834
|
+
state.modelErrorAttempts[classified.reason] = attempt + 1;
|
|
835
|
+
// F 类反馈环(T2②③,arch/overflow-redesign.md):长度类 400 → 真值回填/
|
|
836
|
+
// 收缩上界写入 run 快照(side effect,非主路径依赖)。重试重跑迭代 →
|
|
837
|
+
// transformContext 重新装配 → fits 对新上界失效 → P1 阶梯自动砍后重发。
|
|
838
|
+
if (classified.reason === 'context_length') {
|
|
839
|
+
try {
|
|
840
|
+
applyContextLengthFeedback(classified, {
|
|
841
|
+
lastSuccessActual: ledger.snapshot().contextActualTokens,
|
|
842
|
+
sessionId: harness.sessionId,
|
|
843
|
+
onAlert: harness.onOverflowAlert,
|
|
844
|
+
});
|
|
845
|
+
}
|
|
846
|
+
catch (feedbackErr) {
|
|
847
|
+
// 反馈是 side effect:失败不得阻断错误决策链(retry/abort 照常)。
|
|
848
|
+
// 吞掉的只是回填/收缩写入,下一次 400 会再走一遍本路径。
|
|
849
|
+
console.warn('[overflow] context-length feedback failed:', feedbackErr);
|
|
850
|
+
}
|
|
851
|
+
}
|
|
796
852
|
// ErrorStrategy 决策(attempt 从 0 起,与 DefaultErrorStrategy 的 attempt < N 对齐)
|
|
797
853
|
// skip 在 Loop 层无对应动作,映射为 abort;模型灾备用 FallbackProvider,不在此切换
|
|
798
854
|
if (harness.errorStrategy) {
|
|
@@ -804,6 +860,9 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
804
860
|
pushRetryNotice(state, classified, attempt, delayMs, Math.max(1, maxAttemptsFor(classified.reason)));
|
|
805
861
|
return 'retry';
|
|
806
862
|
}
|
|
863
|
+
// abort:暂存可执行指引(Loop 契约穿不过 reason)
|
|
864
|
+
if (action.reason)
|
|
865
|
+
state.modelAbortGuidance = action.reason;
|
|
807
866
|
return 'abort';
|
|
808
867
|
}
|
|
809
868
|
// 默认:按错误原因分级重试(次数上限见 MODEL_ERROR_MAX_ATTEMPTS)
|
|
@@ -874,7 +933,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
874
933
|
ledger.recordUsage(toolResult.summaryUsage, { summary: true });
|
|
875
934
|
}
|
|
876
935
|
}
|
|
877
|
-
if (event.type === '
|
|
936
|
+
if (event.type === 'step_end') {
|
|
878
937
|
// P0/P1:nominal tokens 入账诊断 + UsageLedger;不触发 spend hard
|
|
879
938
|
if (event.usage && !event.error) {
|
|
880
939
|
const nominal = nominalTotalTokens(event.usage);
|
|
@@ -882,10 +941,10 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
882
941
|
budget?.consumeTokens(nominal);
|
|
883
942
|
ledger.recordUsage(event.usage);
|
|
884
943
|
}
|
|
885
|
-
budget?.
|
|
886
|
-
// P5: 更新 context
|
|
944
|
+
budget?.recordStep();
|
|
945
|
+
// P5: 更新 context 压力信息(传 sessionId:压力按 session 键控,不传兜底值并发下会串号)
|
|
887
946
|
if (harness.getContextPressure) {
|
|
888
|
-
const pressure = harness.getContextPressure();
|
|
947
|
+
const pressure = harness.getContextPressure(getRunScope()?.sessionId);
|
|
889
948
|
if (pressure) {
|
|
890
949
|
ledger.updateContextPressure(pressure.estimatedTokens, pressure.contextWindow);
|
|
891
950
|
}
|
|
@@ -930,7 +989,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
930
989
|
const policyUnits = relConfig.policyUnits;
|
|
931
990
|
const snapshot = ledger.snapshot({ scope: 'run' });
|
|
932
991
|
const onPolicyHit = relConfig.wrapUp?.onPolicyHit ?? 'wrap_up_then_stop';
|
|
933
|
-
const
|
|
992
|
+
const wrapUpSteps = relConfig.wrapUp?.steps ?? 3;
|
|
934
993
|
if (policyUnits) {
|
|
935
994
|
// 检查所有 policy 单位,找到第一个超限的
|
|
936
995
|
let exceededUnit;
|
|
@@ -966,7 +1025,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
966
1025
|
// 先 wrap-up,再 stop
|
|
967
1026
|
state.wrapUp = {
|
|
968
1027
|
reason: 'policy',
|
|
969
|
-
|
|
1028
|
+
stepsRemaining: wrapUpSteps,
|
|
970
1029
|
userMessage: `${userMessage}。停止新的探索性工具调用;基于已有信息输出结论、证据与未完成项。`,
|
|
971
1030
|
hintInjected: false,
|
|
972
1031
|
};
|
|
@@ -1004,16 +1063,19 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
1004
1063
|
// P2 wrap-up 控制梯:检查是否需要进入 wrap-up
|
|
1005
1064
|
if (!state.wrapUp && !state.budgetStop) {
|
|
1006
1065
|
const wrapUpConfig = relConfig.wrapUp;
|
|
1007
|
-
const
|
|
1066
|
+
const wrapUpSteps = wrapUpConfig?.steps ?? 3;
|
|
1008
1067
|
const contextRatio = wrapUpConfig?.contextRatio ?? 0.85;
|
|
1009
|
-
// 检查 context 轴 wrap-up
|
|
1068
|
+
// 检查 context 轴 wrap-up:压力裁决**实测优先**(arch §10.19 尺子事故 #3:
|
|
1069
|
+
// 估算/锚外推被毒读数劫持时,估算轴会 5× 虚高误杀 run——实测 173.7k/1.0M=17%
|
|
1070
|
+
// 被判 86% 掐死评审)。实测缺席时才回落估算(估算只做前瞻补充)。
|
|
1010
1071
|
const snapshot = ledger.snapshot({ scope: 'run' });
|
|
1011
|
-
|
|
1012
|
-
|
|
1072
|
+
const contextSizeTokens = contextPressureTokens(snapshot);
|
|
1073
|
+
if (contextSizeTokens && snapshot.contextWindowTokens) {
|
|
1074
|
+
const contextPressure = contextSizeTokens / snapshot.contextWindowTokens;
|
|
1013
1075
|
if (contextPressure >= contextRatio) {
|
|
1014
1076
|
state.wrapUp = {
|
|
1015
1077
|
reason: 'context',
|
|
1016
|
-
|
|
1078
|
+
stepsRemaining: wrapUpSteps,
|
|
1017
1079
|
userMessage: `[Context] 上下文压力接近上限(${Math.round(contextPressure * 100)}%)。停止新的探索性工具调用;基于已有信息输出结论、证据与未完成项。`,
|
|
1018
1080
|
hintInjected: false,
|
|
1019
1081
|
};
|
|
@@ -1021,7 +1083,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
1021
1083
|
type: 'budget.wrap_up',
|
|
1022
1084
|
timestamp: Date.now(),
|
|
1023
1085
|
metric: 'context',
|
|
1024
|
-
contextEst:
|
|
1086
|
+
contextEst: contextSizeTokens,
|
|
1025
1087
|
contextWindow: snapshot.contextWindowTokens,
|
|
1026
1088
|
userMessage: state.wrapUp.userMessage,
|
|
1027
1089
|
resumeHint: 'Run 已因 context 压力进入 wrap-up 模式,请输出阶段性结论。',
|
|
@@ -1036,7 +1098,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
1036
1098
|
if (report.elapsedMs >= wrapUpThreshold) {
|
|
1037
1099
|
state.wrapUp = {
|
|
1038
1100
|
reason: 'policy',
|
|
1039
|
-
|
|
1101
|
+
stepsRemaining: wrapUpSteps,
|
|
1040
1102
|
userMessage: `[Resource] 预算策略接近上限(wall_clock: ${Math.round(report.elapsedMs / 1000)}s / ${Math.round(maxWallClock / 1000)}s)。停止新的探索性工具调用;基于已有信息输出结论、证据与未完成项。`,
|
|
1041
1103
|
hintInjected: false,
|
|
1042
1104
|
};
|
|
@@ -1055,8 +1117,8 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
1055
1117
|
}
|
|
1056
1118
|
// wrap-up 窗口倒计时
|
|
1057
1119
|
if (state.wrapUp) {
|
|
1058
|
-
state.wrapUp.
|
|
1059
|
-
if (state.wrapUp.
|
|
1120
|
+
state.wrapUp.stepsRemaining--;
|
|
1121
|
+
if (state.wrapUp.stepsRemaining <= 0) {
|
|
1060
1122
|
// wrap-up 窗口结束,触发 stop
|
|
1061
1123
|
state.budgetStop = {
|
|
1062
1124
|
reason: state.wrapUp.reason,
|
|
@@ -1089,7 +1151,7 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
1089
1151
|
}
|
|
1090
1152
|
}
|
|
1091
1153
|
}
|
|
1092
|
-
//
|
|
1154
|
+
// onStepComplete 补判的 hard
|
|
1093
1155
|
if (state.pendingBudgetHardYield) {
|
|
1094
1156
|
const hard = state.pendingBudgetHardYield;
|
|
1095
1157
|
state.pendingBudgetHardYield = false;
|
|
@@ -1118,10 +1180,32 @@ export async function* runAgentWithReliability(context, config, harness, signal)
|
|
|
1118
1180
|
data: { reason: rec.reason, actions: rec.actions },
|
|
1119
1181
|
};
|
|
1120
1182
|
}
|
|
1183
|
+
// abort 指引注入(T2⑤/红线 2):Loop 契约穿不过 decision.reason,在出口
|
|
1184
|
+
// 把可执行指引并入可见错误文本——否则用户只看到原始 provider 报错
|
|
1185
|
+
if (event.type === 'agent_end' && event.reason === 'error' && state.modelAbortGuidance) {
|
|
1186
|
+
const guidance = state.modelAbortGuidance;
|
|
1187
|
+
state.modelAbortGuidance = undefined;
|
|
1188
|
+
yield withAbortGuidance(event, guidance);
|
|
1189
|
+
continue;
|
|
1190
|
+
}
|
|
1121
1191
|
yield event;
|
|
1122
1192
|
}
|
|
1123
1193
|
}
|
|
1124
1194
|
// ── 辅助函数 ──
|
|
1195
|
+
/**
|
|
1196
|
+
* 把 abort 指引并入可见错误文本(保留原始错误为 cause)。
|
|
1197
|
+
*
|
|
1198
|
+
* @param event - 原始 agent_end 事件
|
|
1199
|
+
* @param guidance - ErrorStrategy 产出的可执行指引
|
|
1200
|
+
* @returns 错误文本已增强的事件副本
|
|
1201
|
+
*/
|
|
1202
|
+
function withAbortGuidance(event, guidance) {
|
|
1203
|
+
const base = event.error instanceof Error ? event.error : new Error(String(event.error ?? 'model call failed'));
|
|
1204
|
+
return {
|
|
1205
|
+
...event,
|
|
1206
|
+
error: new Error(`${base.message}\n${guidance}`, { cause: base }),
|
|
1207
|
+
};
|
|
1208
|
+
}
|
|
1125
1209
|
function executeRecoveryActions(actions, messages) {
|
|
1126
1210
|
for (const action of actions) {
|
|
1127
1211
|
switch (action.type) {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 归属 reliability(实现);Guard 只依赖 Core 的 CheckpointContext 类型。
|
|
5
5
|
* 禁止:reliability → run-guard 实现包。
|
|
6
6
|
*/
|
|
7
|
-
import type { CheckpointContext,
|
|
7
|
+
import type { CheckpointContext, StepSummary, RecoveryAttemptRecord } from '@octopi-agent/core/interfaces/run-guard.js';
|
|
8
8
|
/** 恢复尝试记录 */
|
|
9
9
|
export type RecoveryAttempt = RecoveryAttemptRecord;
|
|
10
10
|
/** 外部高危信号 */
|
|
@@ -16,7 +16,9 @@ export interface ExternalRunSignal {
|
|
|
16
16
|
}
|
|
17
17
|
export declare class RunMetricsCollector {
|
|
18
18
|
private readonly startTime;
|
|
19
|
-
|
|
19
|
+
/** 人类输入等待累计(ask_user 等回传);elapsedMs 口径与 Budget 一致:等人不算运行 */
|
|
20
|
+
private humanWaitMs;
|
|
21
|
+
private globalSteps;
|
|
20
22
|
private totalToolCalls;
|
|
21
23
|
private nominalTotalTokens;
|
|
22
24
|
private lastToolName;
|
|
@@ -30,17 +32,25 @@ export declare class RunMetricsCollector {
|
|
|
30
32
|
private consecutiveIdenticalFailures;
|
|
31
33
|
private uniqueTools;
|
|
32
34
|
private recentToolCalls;
|
|
33
|
-
private
|
|
35
|
+
private stepSummaries;
|
|
34
36
|
private tokenDeltas;
|
|
35
37
|
private recoveryHistory;
|
|
36
38
|
private externalSignals;
|
|
37
39
|
private noopStreak;
|
|
38
40
|
private lastSuccessAt;
|
|
39
41
|
private lastSubstantialTextAt;
|
|
40
|
-
/** 记录一轮结束(token 另经 recordTokens 从
|
|
41
|
-
|
|
42
|
-
/** 记录本轮 token 消耗(与 Budget 共用
|
|
42
|
+
/** 记录一轮结束(token 另经 recordTokens 从 step_end.usage 累加) */
|
|
43
|
+
recordStep(summary: StepSummary): void;
|
|
44
|
+
/** 记录本轮 token 消耗(与 Budget 共用 step_end.usage) */
|
|
43
45
|
recordTokens(delta: number): void;
|
|
46
|
+
/**
|
|
47
|
+
* 记录人类输入等待时长(ask_user 等阻塞式人机工具回传)。
|
|
48
|
+
* Guard 的 hardWallClockMs 是 burn 阀,口径与 Budget wall-clock 对齐:等人不算运行。
|
|
49
|
+
* 累计以存续时长封顶(并行等待/超报不得把 elapsedMs 扣成 0 之外的假值)。
|
|
50
|
+
*
|
|
51
|
+
* @param ms - 本次等待时长(毫秒)
|
|
52
|
+
*/
|
|
53
|
+
addHumanWaitMs(ms: number): void;
|
|
44
54
|
/**
|
|
45
55
|
* 记录工具结果
|
|
46
56
|
*
|
|
@@ -67,8 +77,9 @@ export declare class RunMetricsCollector {
|
|
|
67
77
|
noteExternalSignal(sig: ExternalRunSignal): void;
|
|
68
78
|
/** 清空已消费的 external signals(检查点后) */
|
|
69
79
|
drainExternalSignals(): ExternalRunSignal[];
|
|
70
|
-
get
|
|
80
|
+
get steps(): number;
|
|
71
81
|
get tokens(): number;
|
|
82
|
+
/** 存续时长(含人类等待;展示/账本口径)。裁决口径见 buildContext(活跃时长) */
|
|
72
83
|
get elapsedMs(): number;
|
|
73
84
|
buildContext(ids: {
|
|
74
85
|
sessionId?: string;
|
|
@@ -86,7 +97,7 @@ export declare class RunMetricsCollector {
|
|
|
86
97
|
}): {
|
|
87
98
|
sessionId?: string;
|
|
88
99
|
agentId?: string;
|
|
89
|
-
|
|
100
|
+
steps: number;
|
|
90
101
|
totalToolCalls: number;
|
|
91
102
|
nominalTotalTokens: number;
|
|
92
103
|
elapsedMs: number;
|
|
@@ -39,7 +39,9 @@ const RECENT_TOOLS_MAX = 10;
|
|
|
39
39
|
const TOKEN_WINDOW = 10;
|
|
40
40
|
export class RunMetricsCollector {
|
|
41
41
|
startTime = Date.now();
|
|
42
|
-
|
|
42
|
+
/** 人类输入等待累计(ask_user 等回传);elapsedMs 口径与 Budget 一致:等人不算运行 */
|
|
43
|
+
humanWaitMs = 0;
|
|
44
|
+
globalSteps = 0;
|
|
43
45
|
totalToolCalls = 0;
|
|
44
46
|
nominalTotalTokens = 0;
|
|
45
47
|
lastToolName = '';
|
|
@@ -53,25 +55,25 @@ export class RunMetricsCollector {
|
|
|
53
55
|
consecutiveIdenticalFailures = 0;
|
|
54
56
|
uniqueTools = new Set();
|
|
55
57
|
recentToolCalls = [];
|
|
56
|
-
|
|
58
|
+
stepSummaries = [];
|
|
57
59
|
tokenDeltas = [];
|
|
58
60
|
recoveryHistory = [];
|
|
59
61
|
externalSignals = [];
|
|
60
62
|
noopStreak = 0;
|
|
61
63
|
lastSuccessAt = 0;
|
|
62
64
|
lastSubstantialTextAt = 0;
|
|
63
|
-
/** 记录一轮结束(token 另经 recordTokens 从
|
|
64
|
-
|
|
65
|
-
this.
|
|
66
|
-
this.
|
|
67
|
-
if (this.
|
|
68
|
-
this.
|
|
65
|
+
/** 记录一轮结束(token 另经 recordTokens 从 step_end.usage 累加) */
|
|
66
|
+
recordStep(summary) {
|
|
67
|
+
this.globalSteps++;
|
|
68
|
+
this.stepSummaries.push(summary);
|
|
69
|
+
if (this.stepSummaries.length > SUMMARIES_MAX) {
|
|
70
|
+
this.stepSummaries = this.stepSummaries.slice(-SUMMARIES_MAX);
|
|
69
71
|
}
|
|
70
72
|
if (summary.contentPreview && summary.contentPreview.length >= 80) {
|
|
71
|
-
this.lastSubstantialTextAt = this.
|
|
73
|
+
this.lastSubstantialTextAt = this.globalSteps;
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
|
-
/** 记录本轮 token 消耗(与 Budget 共用
|
|
76
|
+
/** 记录本轮 token 消耗(与 Budget 共用 step_end.usage) */
|
|
75
77
|
recordTokens(delta) {
|
|
76
78
|
if (delta <= 0)
|
|
77
79
|
return;
|
|
@@ -79,10 +81,22 @@ export class RunMetricsCollector {
|
|
|
79
81
|
this.tokenDeltas.push(delta);
|
|
80
82
|
if (this.tokenDeltas.length > TOKEN_WINDOW)
|
|
81
83
|
this.tokenDeltas.shift();
|
|
82
|
-
const last = this.
|
|
84
|
+
const last = this.stepSummaries[this.stepSummaries.length - 1];
|
|
83
85
|
if (last)
|
|
84
86
|
last.tokenDelta += delta;
|
|
85
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* 记录人类输入等待时长(ask_user 等阻塞式人机工具回传)。
|
|
90
|
+
* Guard 的 hardWallClockMs 是 burn 阀,口径与 Budget wall-clock 对齐:等人不算运行。
|
|
91
|
+
* 累计以存续时长封顶(并行等待/超报不得把 elapsedMs 扣成 0 之外的假值)。
|
|
92
|
+
*
|
|
93
|
+
* @param ms - 本次等待时长(毫秒)
|
|
94
|
+
*/
|
|
95
|
+
addHumanWaitMs(ms) {
|
|
96
|
+
if (ms > 0) {
|
|
97
|
+
this.humanWaitMs = Math.min(this.humanWaitMs + ms, Date.now() - this.startTime);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
86
100
|
/**
|
|
87
101
|
* 记录工具结果
|
|
88
102
|
*
|
|
@@ -133,7 +147,7 @@ export class RunMetricsCollector {
|
|
|
133
147
|
this.consecutiveIdenticalFailures = 0;
|
|
134
148
|
this.lastFailureFingerprint = '';
|
|
135
149
|
if (!isNoop) {
|
|
136
|
-
this.lastSuccessAt = this.
|
|
150
|
+
this.lastSuccessAt = this.globalSteps;
|
|
137
151
|
this.noopStreak = 0;
|
|
138
152
|
}
|
|
139
153
|
}
|
|
@@ -164,18 +178,18 @@ export class RunMetricsCollector {
|
|
|
164
178
|
if (this.noopStreak >= 3)
|
|
165
179
|
return false;
|
|
166
180
|
// 成功工具或实质文本出现在最近 3 轮内
|
|
167
|
-
if (this.
|
|
181
|
+
if (this.globalSteps - this.lastSuccessAt <= 3 && this.lastSuccessAt > 0)
|
|
168
182
|
return true;
|
|
169
|
-
if (this.
|
|
183
|
+
if (this.globalSteps - this.lastSubstantialTextAt <= 3 &&
|
|
170
184
|
this.lastSubstantialTextAt > 0) {
|
|
171
185
|
return true;
|
|
172
186
|
}
|
|
173
187
|
// 刚开始的 run:尚无失败堆积时视为有进展
|
|
174
|
-
if (this.
|
|
188
|
+
if (this.globalSteps <= 2 && this.consecutiveErrors === 0)
|
|
175
189
|
return true;
|
|
176
190
|
// 连续无成功且无实质文本
|
|
177
|
-
if (this.
|
|
178
|
-
this.
|
|
191
|
+
if (this.globalSteps - Math.max(this.lastSuccessAt, this.lastSubstantialTextAt) >= 3 &&
|
|
192
|
+
this.globalSteps >= 3) {
|
|
179
193
|
return false;
|
|
180
194
|
}
|
|
181
195
|
return this.consecutiveErrors === 0;
|
|
@@ -198,12 +212,13 @@ export class RunMetricsCollector {
|
|
|
198
212
|
this.externalSignals = [];
|
|
199
213
|
return s;
|
|
200
214
|
}
|
|
201
|
-
get
|
|
202
|
-
return this.
|
|
215
|
+
get steps() {
|
|
216
|
+
return this.globalSteps;
|
|
203
217
|
}
|
|
204
218
|
get tokens() {
|
|
205
219
|
return this.nominalTotalTokens;
|
|
206
220
|
}
|
|
221
|
+
/** 存续时长(含人类等待;展示/账本口径)。裁决口径见 buildContext(活跃时长) */
|
|
207
222
|
get elapsedMs() {
|
|
208
223
|
return Date.now() - this.startTime;
|
|
209
224
|
}
|
|
@@ -242,11 +257,11 @@ export class RunMetricsCollector {
|
|
|
242
257
|
return {
|
|
243
258
|
sessionId: ids.sessionId ?? 'inline',
|
|
244
259
|
agentId: ids.agentId ?? 'default',
|
|
245
|
-
|
|
260
|
+
steps: this.globalSteps,
|
|
246
261
|
totalToolCalls: this.totalToolCalls,
|
|
247
262
|
nominalTotalTokens: this.nominalTotalTokens,
|
|
248
|
-
elapsedMs: Date.now() - this.startTime,
|
|
249
|
-
recentSummaries: this.
|
|
263
|
+
elapsedMs: Math.max(0, Date.now() - this.startTime - this.humanWaitMs),
|
|
264
|
+
recentSummaries: this.stepSummaries.slice(-8),
|
|
250
265
|
metrics,
|
|
251
266
|
recoveryHistory: [...this.recoveryHistory],
|
|
252
267
|
externalSignals: this.externalSignals.map(s => ({
|
|
@@ -266,7 +281,7 @@ export class RunMetricsCollector {
|
|
|
266
281
|
return {
|
|
267
282
|
sessionId: ids.sessionId,
|
|
268
283
|
agentId: ids.agentId,
|
|
269
|
-
|
|
284
|
+
steps: this.globalSteps,
|
|
270
285
|
totalToolCalls: this.totalToolCalls,
|
|
271
286
|
nominalTotalTokens: this.nominalTotalTokens,
|
|
272
287
|
elapsedMs: Date.now() - this.startTime,
|