@pentoshi/clai 4.11.11 → 4.11.13
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/README.md +31 -3
- package/dist/agent/compaction/summary-execution.d.ts +1 -0
- package/dist/agent/compaction/summary-execution.js +101 -27
- package/dist/agent/compaction/summary-execution.js.map +1 -1
- package/dist/agent/compaction-executor.js +3 -3
- package/dist/agent/compaction-executor.js.map +1 -1
- package/dist/agent/compaction-summary.d.ts +2 -0
- package/dist/agent/compaction-summary.js +8 -0
- package/dist/agent/compaction-summary.js.map +1 -1
- package/dist/agent/context/compact-with-summary.d.ts +1 -0
- package/dist/agent/context/compact-with-summary.js +60 -30
- package/dist/agent/context/compact-with-summary.js.map +1 -1
- package/dist/agent/events.d.ts +1 -0
- package/dist/agent/evidence/task-classification.js +0 -1
- package/dist/agent/evidence/task-classification.js.map +1 -1
- package/dist/agent/evidence/tool-budgets.js +0 -9
- package/dist/agent/evidence/tool-budgets.js.map +1 -1
- package/dist/agent/loop-guard.js +0 -4
- package/dist/agent/loop-guard.js.map +1 -1
- package/dist/agent/outcomes.js +1 -1
- package/dist/agent/outcomes.js.map +1 -1
- package/dist/agent/parser/arg-formatting.js +0 -8
- package/dist/agent/parser/arg-formatting.js.map +1 -1
- package/dist/agent/parser/bare-recognition.js +0 -4
- package/dist/agent/parser/bare-recognition.js.map +1 -1
- package/dist/agent/progress.js +0 -26
- package/dist/agent/progress.js.map +1 -1
- package/dist/agent/request-accounting.d.ts +1 -0
- package/dist/agent/request-accounting.js +24 -8
- package/dist/agent/request-accounting.js.map +1 -1
- package/dist/agent/request-budget.d.ts +3 -0
- package/dist/agent/request-budget.js +22 -8
- package/dist/agent/request-budget.js.map +1 -1
- package/dist/agent/runner.js +1 -2
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/session-policy.js +0 -5
- package/dist/agent/session-policy.js.map +1 -1
- package/dist/agent/stream-recovery.d.ts +4 -0
- package/dist/agent/stream-recovery.js +14 -15
- package/dist/agent/stream-recovery.js.map +1 -1
- package/dist/agent/task-evidence.js +3 -12
- package/dist/agent/task-evidence.js.map +1 -1
- package/dist/agent/tool-call-parser.js +2 -2
- package/dist/agent/tool-call-parser.js.map +1 -1
- package/dist/agent/turn/automatic-compaction-execution.d.ts +1 -0
- package/dist/agent/turn/automatic-compaction-execution.js +4 -2
- package/dist/agent/turn/automatic-compaction-execution.js.map +1 -1
- package/dist/agent/turn/compaction-admission.d.ts +5 -1
- package/dist/agent/turn/compaction-admission.js +7 -5
- package/dist/agent/turn/compaction-admission.js.map +1 -1
- package/dist/agent/turn/compaction-coordinator.d.ts +2 -1
- package/dist/agent/turn/compaction-coordinator.js +24 -7
- package/dist/agent/turn/compaction-coordinator.js.map +1 -1
- package/dist/agent/turn/compaction-final-fit.d.ts +1 -1
- package/dist/agent/turn/compaction-final-fit.js +5 -4
- package/dist/agent/turn/compaction-final-fit.js.map +1 -1
- package/dist/agent/turn/compaction-summarizer.js +1 -1
- package/dist/agent/turn/compaction-summarizer.js.map +1 -1
- package/dist/agent/turn/event-emitter.js +3 -0
- package/dist/agent/turn/event-emitter.js.map +1 -1
- package/dist/agent/turn/loop/completion-interpretation.js +4 -4
- package/dist/agent/turn/loop/completion-interpretation.js.map +1 -1
- package/dist/agent/turn/loop/deps.d.ts +2 -1
- package/dist/agent/turn/loop/round-request.d.ts +2 -0
- package/dist/agent/turn/loop/round-request.js +17 -3
- package/dist/agent/turn/loop/round-request.js.map +1 -1
- package/dist/agent/turn/loop/run-rounds.js +1 -3
- package/dist/agent/turn/loop/run-rounds.js.map +1 -1
- package/dist/agent/turn/loop/stream-failure.js +4 -1
- package/dist/agent/turn/loop/stream-failure.js.map +1 -1
- package/dist/agent/turn/tool-evidence-signals.js +0 -2
- package/dist/agent/turn/tool-evidence-signals.js.map +1 -1
- package/dist/agent/turn/tool-execution/engagement-checkpoint.js +2 -1
- package/dist/agent/turn/tool-execution/engagement-checkpoint.js.map +1 -1
- package/dist/agent/turn/tool-execution/guards.js +8 -3
- package/dist/agent/turn/tool-execution/guards.js.map +1 -1
- package/dist/agent/turn/tool-routing.d.ts +0 -1
- package/dist/agent/turn/tool-routing.js +0 -2
- package/dist/agent/turn/tool-routing.js.map +1 -1
- package/dist/app/adapters/agent-event-adapter.js +3 -0
- package/dist/app/adapters/agent-event-adapter.js.map +1 -1
- package/dist/app/commands/catalog.js +15 -1
- package/dist/app/commands/catalog.js.map +1 -1
- package/dist/app/controllers/session-compact-helper.js +59 -45
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/controllers/session-context-usage.js +16 -5
- package/dist/app/controllers/session-context-usage.js.map +1 -1
- package/dist/app/events/app-event.d.ts +1 -0
- package/dist/app/events/app-event.js.map +1 -1
- package/dist/commands/providers.js +2 -0
- package/dist/commands/providers.js.map +1 -1
- package/dist/commands/update/installers.js +17 -2
- package/dist/commands/update/installers.js.map +1 -1
- package/dist/llm/adapters/anthropic-tools.d.ts +1 -0
- package/dist/llm/adapters/anthropic-tools.js +8 -4
- package/dist/llm/adapters/anthropic-tools.js.map +1 -1
- package/dist/llm/anthropic.d.ts +1 -1
- package/dist/llm/anthropic.js +8 -3
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/capability/state.d.ts +1 -1
- package/dist/llm/capability/tool-dialect.js +1 -0
- package/dist/llm/capability/tool-dialect.js.map +1 -1
- package/dist/llm/capability/vision-patterns.js +12 -0
- package/dist/llm/capability/vision-patterns.js.map +1 -1
- package/dist/llm/explabs.d.ts +12 -0
- package/dist/llm/explabs.js +348 -0
- package/dist/llm/explabs.js.map +1 -0
- package/dist/llm/key-rotation.d.ts +4 -0
- package/dist/llm/key-rotation.js +30 -0
- package/dist/llm/key-rotation.js.map +1 -1
- package/dist/llm/model-layers/model-rules.js +6 -0
- package/dist/llm/model-layers/model-rules.js.map +1 -1
- package/dist/llm/provider-identity.js +7 -0
- package/dist/llm/provider-identity.js.map +1 -1
- package/dist/llm/provider-info-text.js +65 -0
- package/dist/llm/provider-info-text.js.map +1 -1
- package/dist/llm/provider-profile-layers.js +40 -2
- package/dist/llm/provider-profile-layers.js.map +1 -1
- package/dist/llm/reasoning-capability.js +19 -1
- package/dist/llm/reasoning-capability.js.map +1 -1
- package/dist/llm/reasoning-controls.d.ts +1 -0
- package/dist/llm/reasoning-controls.js +4 -0
- package/dist/llm/reasoning-controls.js.map +1 -1
- package/dist/llm/reasoning-errors.js +2 -2
- package/dist/llm/reasoning-errors.js.map +1 -1
- package/dist/llm/responses/item-events.js +1 -1
- package/dist/llm/responses/item-events.js.map +1 -1
- package/dist/llm/responses-complete.js +2 -1
- package/dist/llm/responses-complete.js.map +1 -1
- package/dist/llm/responses-config.d.ts +1 -0
- package/dist/llm/responses-config.js.map +1 -1
- package/dist/llm/responses-empty-output.d.ts +2 -0
- package/dist/llm/responses-empty-output.js +22 -0
- package/dist/llm/responses-empty-output.js.map +1 -0
- package/dist/llm/responses-parse.js +8 -2
- package/dist/llm/responses-parse.js.map +1 -1
- package/dist/llm/responses-request.d.ts +1 -0
- package/dist/llm/responses-request.js +19 -6
- package/dist/llm/responses-request.js.map +1 -1
- package/dist/llm/responses-stream-accumulator.js +7 -1
- package/dist/llm/responses-stream-accumulator.js.map +1 -1
- package/dist/llm/routing/attempt-complete.js +3 -1
- package/dist/llm/routing/attempt-complete.js.map +1 -1
- package/dist/llm/routing/attempt-stream.js +3 -1
- package/dist/llm/routing/attempt-stream.js.map +1 -1
- package/dist/llm/routing/error-classification.d.ts +4 -0
- package/dist/llm/routing/error-classification.js +34 -0
- package/dist/llm/routing/error-classification.js.map +1 -1
- package/dist/llm/routing/failure-report.js +4 -2
- package/dist/llm/routing/failure-report.js.map +1 -1
- package/dist/llm/routing/key-rotation.js +13 -2
- package/dist/llm/routing/key-rotation.js.map +1 -1
- package/dist/llm/routing/provider-selection.js +3 -0
- package/dist/llm/routing/provider-selection.js.map +1 -1
- package/dist/llm/token-estimate-calibration.js +20 -3
- package/dist/llm/token-estimate-calibration.js.map +1 -1
- package/dist/llm/token-usage.d.ts +1 -0
- package/dist/llm/token-usage.js +10 -3
- package/dist/llm/token-usage.js.map +1 -1
- package/dist/llm/tokenrouter.d.ts +11 -0
- package/dist/llm/tokenrouter.js +27 -1
- package/dist/llm/tokenrouter.js.map +1 -1
- package/dist/llm/wire/chat-body.js +10 -1
- package/dist/llm/wire/chat-body.js.map +1 -1
- package/dist/llm/wire/responses-failure.js +1 -1
- package/dist/llm/wire/responses-failure.js.map +1 -1
- package/dist/llm/wire/responses-first.js +16 -28
- package/dist/llm/wire/responses-first.js.map +1 -1
- package/dist/mcp/auth/provider.js +0 -1
- package/dist/mcp/auth/provider.js.map +1 -1
- package/dist/mcp/format.js +2 -0
- package/dist/mcp/format.js.map +1 -1
- package/dist/mcp/manager.d.ts +4 -0
- package/dist/mcp/manager.js +37 -19
- package/dist/mcp/manager.js.map +1 -1
- package/dist/mcp/runtime.d.ts +3 -0
- package/dist/mcp/runtime.js +50 -25
- package/dist/mcp/runtime.js.map +1 -1
- package/dist/mcp/schema-compact.d.ts +5 -0
- package/dist/mcp/schema-compact.js +157 -0
- package/dist/mcp/schema-compact.js.map +1 -0
- package/dist/mcp/types.d.ts +1 -1
- package/dist/noninteractive/blocks/tool-blocks.js +10 -5
- package/dist/noninteractive/blocks/tool-blocks.js.map +1 -1
- package/dist/prompts/embedded.js +1 -1
- package/dist/prompts/embedded.js.map +1 -1
- package/dist/prompts/system.agent.md +4 -6
- package/dist/safety/classifier.js +0 -8
- package/dist/safety/classifier.js.map +1 -1
- package/dist/safety/engagement-policy.js +0 -23
- package/dist/safety/engagement-policy.js.map +1 -1
- package/dist/safety/tool-classification.js +0 -15
- package/dist/safety/tool-classification.js.map +1 -1
- package/dist/session-runtime/binding.d.ts +1 -0
- package/dist/session-runtime/binding.js +7 -0
- package/dist/session-runtime/binding.js.map +1 -1
- package/dist/session-runtime/child-bridge.d.ts +1 -0
- package/dist/session-runtime/child-bridge.js +3 -0
- package/dist/session-runtime/child-bridge.js.map +1 -1
- package/dist/session-runtime/discovery.js +1 -0
- package/dist/session-runtime/discovery.js.map +1 -1
- package/dist/session-runtime/host.d.ts +1 -0
- package/dist/session-runtime/host.js +9 -3
- package/dist/session-runtime/host.js.map +1 -1
- package/dist/session-runtime/reaper.d.ts +1 -0
- package/dist/session-runtime/reaper.js +7 -2
- package/dist/session-runtime/reaper.js.map +1 -1
- package/dist/session-runtime/store.js +1 -0
- package/dist/session-runtime/store.js.map +1 -1
- package/dist/session-runtime/types.d.ts +3 -0
- package/dist/store/config.js +1 -0
- package/dist/store/config.js.map +1 -1
- package/dist/tools/capabilities.js +4 -16
- package/dist/tools/capabilities.js.map +1 -1
- package/dist/tools/definitions/aggregate.js +2 -6
- package/dist/tools/definitions/aggregate.js.map +1 -1
- package/dist/tools/definitions/define.js +0 -8
- package/dist/tools/definitions/define.js.map +1 -1
- package/dist/tools/definitions/files.js +6 -1
- package/dist/tools/definitions/files.js.map +1 -1
- package/dist/tools/definitions/network.d.ts +2 -0
- package/dist/tools/definitions/network.js +17 -0
- package/dist/tools/definitions/network.js.map +1 -0
- package/dist/tools/definitions/orchestration.js +1 -1
- package/dist/tools/definitions/selection.js +1 -4
- package/dist/tools/definitions/selection.js.map +1 -1
- package/dist/tools/fs/search.d.ts +21 -2
- package/dist/tools/fs/search.js +394 -93
- package/dist/tools/fs/search.js.map +1 -1
- package/dist/tools/handlers/files-1.js.map +1 -1
- package/dist/tools/handlers/network-3.js +0 -4
- package/dist/tools/handlers/network-3.js.map +1 -1
- package/dist/tools/handlers/shell-2.js +0 -18
- package/dist/tools/handlers/shell-2.js.map +1 -1
- package/dist/tools/net-ping-sweep.js +1 -1
- package/dist/tools/net-ping-sweep.js.map +1 -1
- package/dist/tools/policies/output-policy.js +0 -3
- package/dist/tools/policies/output-policy.js.map +1 -1
- package/dist/tools/registry.d.ts +0 -9
- package/dist/tools/registry.js +0 -24
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/shell/exec-attempt.js +15 -2
- package/dist/tools/shell/exec-attempt.js.map +1 -1
- package/dist/tui-v2/components/transcript/file-diff-card.d.ts +1 -0
- package/dist/tui-v2/components/transcript/file-diff-card.js +30 -10
- package/dist/tui-v2/components/transcript/file-diff-card.js.map +1 -1
- package/dist/tui-v2/components/transcript/tool-card.d.ts +1 -0
- package/dist/tui-v2/components/transcript/tool-card.js +4 -2
- package/dist/tui-v2/components/transcript/tool-card.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-row.js +1 -1
- package/dist/tui-v2/components/transcript/transcript-row.js.map +1 -1
- package/dist/types.d.ts +2 -1
- package/dist/types.js +1 -0
- package/dist/types.js.map +1 -1
- package/dist/ui-core/bootstrap/composition-root.js +1 -1
- package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
- package/dist/ui-core/commands/mcp-commands.js +41 -11
- package/dist/ui-core/commands/mcp-commands.js.map +1 -1
- package/dist/ui-core/plan/plan-lifecycle.js +1 -1
- package/dist/ui-core/plan/plan-lifecycle.js.map +1 -1
- package/dist/ui-core/rendering/file-diff-view.d.ts +9 -0
- package/dist/ui-core/rendering/file-diff-view.js +20 -1
- package/dist/ui-core/rendering/file-diff-view.js.map +1 -1
- package/dist/ui-core/rendering/syntax/clike.d.ts +1 -0
- package/dist/ui-core/rendering/syntax/clike.js.map +1 -1
- package/dist/ui-core/rendering/syntax/language-highlighters.d.ts +1 -0
- package/dist/ui-core/rendering/syntax/language-highlighters.js +256 -0
- package/dist/ui-core/rendering/syntax/language-highlighters.js.map +1 -1
- package/dist/ui-core/rendering/syntax-highlight.js +2 -2
- package/dist/ui-core/rendering/syntax-highlight.js.map +1 -1
- package/dist/ui-core/state/transcript/apply-app-event.js +3 -1
- package/dist/ui-core/state/transcript/apply-app-event.js.map +1 -1
- package/dist/version.generated.d.ts +2 -2
- package/dist/version.generated.js +2 -2
- package/package.json +1 -1
- package/dist/tools/definitions/network-1.d.ts +0 -2
- package/dist/tools/definitions/network-1.js +0 -72
- package/dist/tools/definitions/network-1.js.map +0 -1
- package/dist/tools/definitions/network-2.d.ts +0 -2
- package/dist/tools/definitions/network-2.js +0 -22
- package/dist/tools/definitions/network-2.js.map +0 -1
- package/dist/tools/definitions/pentest.d.ts +0 -2
- package/dist/tools/definitions/pentest.js +0 -91
- package/dist/tools/definitions/pentest.js.map +0 -1
- package/dist/tools/dns-native.d.ts +0 -3
- package/dist/tools/dns-native.js +0 -165
- package/dist/tools/dns-native.js.map +0 -1
- package/dist/tools/handlers/network-1.d.ts +0 -2
- package/dist/tools/handlers/network-1.js +0 -52
- package/dist/tools/handlers/network-1.js.map +0 -1
- package/dist/tools/handlers/network-2.d.ts +0 -2
- package/dist/tools/handlers/network-2.js +0 -32
- package/dist/tools/handlers/network-2.js.map +0 -1
- package/dist/tools/handlers/nmap-preparation.d.ts +0 -13
- package/dist/tools/handlers/nmap-preparation.js +0 -66
- package/dist/tools/handlers/nmap-preparation.js.map +0 -1
- package/dist/tools/handlers/pentest.d.ts +0 -2
- package/dist/tools/handlers/pentest.js +0 -208
- package/dist/tools/handlers/pentest.js.map +0 -1
- package/dist/tools/network-context.d.ts +0 -22
- package/dist/tools/network-context.js +0 -130
- package/dist/tools/network-context.js.map +0 -1
- package/dist/tools/nmap-runner.d.ts +0 -10
- package/dist/tools/nmap-runner.js +0 -240
- package/dist/tools/nmap-runner.js.map +0 -1
- package/dist/tools/pentest-workflows.d.ts +0 -8
- package/dist/tools/pentest-workflows.js +0 -175
- package/dist/tools/pentest-workflows.js.map +0 -1
- package/dist/tools/validate.d.ts +0 -26
- package/dist/tools/validate.js +0 -373
- package/dist/tools/validate.js.map +0 -1
- package/dist/tools/whois-native.d.ts +0 -2
- package/dist/tools/whois-native.js +0 -78
- package/dist/tools/whois-native.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arg-formatting.js","sourceRoot":"","sources":["../../../src/agent/parser/arg-formatting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG1C,MAAM,UAAU,qBAAqB,CACnC,IAAyC;IAEzC,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,MAAM,QAAQ,GACZ,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ;QAChC,CAAC,CAAC,IAAI,CAAC,SAAS;QAChB,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;YAC/B,CAAC,CAAC,IAAI,CAAC,MAAM;YACb,CAAC,CAAC,SAAS,CAAC;IAClB,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,MAAM,KAAK,GACT,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACvD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,GAAG,GACP,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACpB,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,KAAK,GACT,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC;QACvE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACtB,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,KAAK,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC;QAC7D,OAAO,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,GAAG,EAAE,CAAC;IACxD,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;QAC/B,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,IAAI,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,GAAG,KAAK,GAAG,CAAC;IAC5C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,KAAK,GAAG,EAAE,CAAC;IACrD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,KAAK,EAAE,CAAC;IAC7C,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAc;IAC3C,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAClC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;IACjF,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,IAAI,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"arg-formatting.js","sourceRoot":"","sources":["../../../src/agent/parser/arg-formatting.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,10 +32,6 @@ export function inferToolFromArgs(obj) {
|
|
|
32
32
|
return "task.update";
|
|
33
33
|
if (has("tool"))
|
|
34
34
|
return "pkg.install";
|
|
35
|
-
if (has("record") && has("target"))
|
|
36
|
-
return "dns.lookup";
|
|
37
|
-
if (has("ports") && has("target"))
|
|
38
|
-
return "net.scan";
|
|
39
35
|
if (has("url")) {
|
|
40
36
|
return has("method") || has("body") ? "http.fetch" : "web.fetch";
|
|
41
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bare-recognition.js","sourceRoot":"","sources":["../../../src/agent/parser/bare-recognition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEhE,MAAM,UAAU,iBAAiB,CAC/B,GAA4B;IAE5B,MAAM,GAAG,GAAG,CAAC,GAAW,EAAW,EAAE,CACnC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjD,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACnD,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,cAAc,CAAC;IACxC,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,YAAY,CAAC;IACtC,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,iBAAiB,CAAC;IAChF,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IACvD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,WAAW,CAAC;IACzE,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,UAAU,CAAC;IACrD,IAAI,GAAG,CAAC,SAAS,CAAC;QAAE,OAAO,WAAW,CAAC;IACvC,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,YAAY,CAAC;IACtC,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,YAAY,CAAC;IACtC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,aAAa,CAAC;IACtD,IAAI,GAAG,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,UAAU,CAAC;IAC7D,IACE,GAAG,CAAC,QAAQ,CAAC;QACb,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9D,OAAO,WAAW,CAAC;IACrB,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO,aAAa,CAAC;IACxD,IAAI,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,aAAa,CAAC;IACtC,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"bare-recognition.js","sourceRoot":"","sources":["../../../src/agent/parser/bare-recognition.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/progress.js
CHANGED
|
@@ -30,32 +30,6 @@ export function evaluateProgress(plan, call, result) {
|
|
|
30
30
|
};
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
-
if (call.name === "dns.lookup") {
|
|
34
|
-
if (ok && output.length > 10) {
|
|
35
|
-
return {
|
|
36
|
-
madeProgress: true,
|
|
37
|
-
goalSatisfied: true,
|
|
38
|
-
shouldContinue: false,
|
|
39
|
-
reason: "DNS records retrieved.",
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
if (output.includes("nxdomain")) {
|
|
43
|
-
return {
|
|
44
|
-
madeProgress: true,
|
|
45
|
-
goalSatisfied: true,
|
|
46
|
-
shouldContinue: false,
|
|
47
|
-
reason: "Domain does not exist (NXDOMAIN).",
|
|
48
|
-
};
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
if (call.name === "whois.lookup" && ok && output.length > 50) {
|
|
52
|
-
return {
|
|
53
|
-
madeProgress: true,
|
|
54
|
-
goalSatisfied: true,
|
|
55
|
-
shouldContinue: false,
|
|
56
|
-
reason: "Whois data retrieved.",
|
|
57
|
-
};
|
|
58
|
-
}
|
|
59
33
|
if ((call.name === "fs.edit" ||
|
|
60
34
|
call.name === "fs.replaceLines" ||
|
|
61
35
|
call.name === "fs.write" ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/agent/progress.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,gBAAgB,CAC9B,IAA0B,EAC1B,IAAc,EACd,MAAkB;IAElB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAC3C,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IAErB,IACE,CAAC,EAAE;QACH,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC;YACnC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,EAC/C,CAAC;QACD,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,8FAA8F;SACvG,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAChD,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,yEAAyE;SAClF,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,EAAE,CAAC;QAC5D,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACpE,OAAO;gBACL,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,IAAI;gBACnB,cAAc,EAAE,KAAK;gBACrB,MAAM,EAAE,6CAA6C;aACtD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/agent/progress.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,gBAAgB,CAC9B,IAA0B,EAC1B,IAAc,EACd,MAAkB;IAElB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;IAC3C,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IAErB,IACE,CAAC,EAAE;QACH,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC;YACnC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,EAC/C,CAAC;QACD,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,8FAA8F;SACvG,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAChD,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,yEAAyE;SAClF,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,EAAE,CAAC;QAC5D,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACpE,OAAO;gBACL,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,IAAI;gBACnB,cAAc,EAAE,KAAK;gBACrB,MAAM,EAAE,6CAA6C;aACtD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IACE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;QACtB,IAAI,CAAC,IAAI,KAAK,iBAAiB;QAC/B,IAAI,CAAC,IAAI,KAAK,UAAU;QACxB,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC;QAC5B,EAAE,EACF,CAAC;QACD,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE,KAAK;YACrB,MAAM,EAAE,+BAA+B;SACxC,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,EAAE,EAAE,CAAC;QACpC,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE,KAAK;YACrB,MAAM,EAAE,2BAA2B;SACpC,CAAC;IACJ,CAAC;IAED,IAAI,EAAE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,yCAAyC;SAClD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,QAAQ,IAAI,CAAC,IAAI,iBAAiB,MAAM,CAAC,QAAQ,IAAI,GAAG,IAAI;SACrE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,IAAI;QACpB,MAAM,EAAE,aAAa;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -4,6 +4,7 @@ export declare const RESERVED_OUTPUT_TOKENS = 24576;
|
|
|
4
4
|
export declare const SAFETY_MARGIN_TOKENS = 2048;
|
|
5
5
|
export declare function estimateTextTokens(text: string): number;
|
|
6
6
|
export declare function estimateImageTokens(image: ChatImage): number;
|
|
7
|
+
export declare function estimateMessageBaseTokens(message: ChatMessage): number;
|
|
7
8
|
export declare function estimateMessageTokens(message: ChatMessage): number;
|
|
8
9
|
export declare function estimateMessagesTokens(messages: readonly ChatMessage[]): number;
|
|
9
10
|
export declare function estimateToolSchemaTokens(tools: readonly ToolDefinition[] | undefined): number;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { compileRequestPlan, } from "../llm/request-plan.js";
|
|
2
2
|
import { reasoningArtifactTokensForMessage } from "../llm/reasoning-artifacts.js";
|
|
3
3
|
import { calibratedRequestTokens, requestTokenCalibration, } from "../llm/token-estimate-calibration.js";
|
|
4
|
-
import {
|
|
4
|
+
import { modelContextWindow } from "../llm/context-windows.js";
|
|
5
5
|
import { readImageDimensions } from "../attachments/image-content.js";
|
|
6
6
|
import { measureToolCallsChars } from "./message-slim.js";
|
|
7
7
|
export const RESERVED_OUTPUT_TOKENS = 24_576;
|
|
@@ -21,13 +21,12 @@ export function estimateImageTokens(image) {
|
|
|
21
21
|
: Math.ceil(rawBytes / 900);
|
|
22
22
|
return Math.min(MAX_IMAGE_TOKENS, Math.max(MIN_IMAGE_TOKENS, tokens));
|
|
23
23
|
}
|
|
24
|
-
export function
|
|
24
|
+
export function estimateMessageBaseTokens(message) {
|
|
25
25
|
let sum = estimateTextTokens(message.content) + 4;
|
|
26
26
|
if (message.toolCalls?.length) {
|
|
27
27
|
const toolChars = measureToolCallsChars(message.toolCalls);
|
|
28
28
|
sum += Math.ceil(toolChars / 3.3);
|
|
29
29
|
}
|
|
30
|
-
sum += reasoningArtifactTokensForMessage(message);
|
|
31
30
|
if (message.images) {
|
|
32
31
|
for (const image of message.images) {
|
|
33
32
|
sum += estimateImageTokens(image);
|
|
@@ -35,6 +34,10 @@ export function estimateMessageTokens(message) {
|
|
|
35
34
|
}
|
|
36
35
|
return sum;
|
|
37
36
|
}
|
|
37
|
+
export function estimateMessageTokens(message) {
|
|
38
|
+
return (estimateMessageBaseTokens(message) +
|
|
39
|
+
reasoningArtifactTokensForMessage(message));
|
|
40
|
+
}
|
|
38
41
|
export function estimateMessagesTokens(messages) {
|
|
39
42
|
let sum = 0;
|
|
40
43
|
for (const message of messages) {
|
|
@@ -55,7 +58,7 @@ export function resolveEffectiveContextLimit(input) {
|
|
|
55
58
|
: undefined;
|
|
56
59
|
const limitTokens = override ??
|
|
57
60
|
(input?.model !== undefined || input?.provider !== undefined
|
|
58
|
-
?
|
|
61
|
+
? modelContextWindow(input.model, input.provider)
|
|
59
62
|
: undefined);
|
|
60
63
|
if (limitTokens === undefined) {
|
|
61
64
|
return {
|
|
@@ -74,13 +77,25 @@ export function resolveEffectiveContextLimit(input) {
|
|
|
74
77
|
effectiveSafeTokens: Math.max(1, limitTokens - reservedOutputTokens - safetyMarginTokens),
|
|
75
78
|
};
|
|
76
79
|
}
|
|
77
|
-
function
|
|
80
|
+
function replayedArtifactTokensByMessage(plan) {
|
|
81
|
+
const totals = new Map();
|
|
82
|
+
for (const entry of plan.replay.decisions) {
|
|
83
|
+
if (entry.decision.action !== "replayed")
|
|
84
|
+
continue;
|
|
85
|
+
totals.set(entry.messageIndex, (totals.get(entry.messageIndex) ?? 0) +
|
|
86
|
+
Math.ceil(entry.decision.byteLength / 3.3));
|
|
87
|
+
}
|
|
88
|
+
return totals;
|
|
89
|
+
}
|
|
90
|
+
function accountTimeline(plan, replayedArtifactTokens) {
|
|
78
91
|
const totals = { instructionsTokens: 0, historyTokens: 0, liveTokens: 0 };
|
|
79
92
|
const messages = plan.timeline.messages;
|
|
80
93
|
for (const section of plan.timeline.sections) {
|
|
81
94
|
let sectionTokens = 0;
|
|
82
95
|
for (let index = section.messageStart; index < section.messageEnd; index += 1) {
|
|
83
|
-
sectionTokens +=
|
|
96
|
+
sectionTokens +=
|
|
97
|
+
estimateMessageBaseTokens(messages[index]) +
|
|
98
|
+
(replayedArtifactTokens.get(index) ?? 0);
|
|
84
99
|
}
|
|
85
100
|
if (section.kind === "instructions")
|
|
86
101
|
totals.instructionsTokens = sectionTokens;
|
|
@@ -92,7 +107,8 @@ function accountTimeline(plan) {
|
|
|
92
107
|
return totals;
|
|
93
108
|
}
|
|
94
109
|
export function accountRequestPlan(plan, policy) {
|
|
95
|
-
const
|
|
110
|
+
const replayedArtifactTokens = replayedArtifactTokensByMessage(plan);
|
|
111
|
+
const totals = accountTimeline(plan, replayedArtifactTokens);
|
|
96
112
|
const toolsTokens = estimateToolSchemaTokens(plan.tools.definitions);
|
|
97
113
|
const rawRequestTokens = totals.instructionsTokens +
|
|
98
114
|
totals.historyTokens +
|
|
@@ -104,7 +120,7 @@ export function accountRequestPlan(plan, policy) {
|
|
|
104
120
|
};
|
|
105
121
|
const calibration = requestTokenCalibration(route.provider, route.model);
|
|
106
122
|
const requestTokens = calibratedRequestTokens(route.provider, route.model, rawRequestTokens);
|
|
107
|
-
const artifactTokens =
|
|
123
|
+
const artifactTokens = [...replayedArtifactTokens.values()].reduce((sum, tokens) => sum + tokens, 0);
|
|
108
124
|
const imageTokens = plan.timeline.messages.reduce((sum, message) => sum +
|
|
109
125
|
(message.images ?? []).reduce((inner, image) => inner + estimateImageTokens(image), 0), 0);
|
|
110
126
|
const limit = resolveEffectiveContextLimit({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-accounting.js","sourceRoot":"","sources":["../../src/agent/request-accounting.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,kBAAkB,GAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iCAAiC,EAAE,MAAM,+BAA+B,CAAC;AAClF,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"request-accounting.js","sourceRoot":"","sources":["../../src/agent/request-accounting.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { ProviderId } from "../types.js";
|
|
|
2
2
|
import { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS } from "./request-accounting.js";
|
|
3
3
|
export { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS };
|
|
4
4
|
export declare const DEFAULT_AUTO_COMPACT_REQUEST_TOKENS = 180000;
|
|
5
|
+
export declare const AUTO_COMPACT_HEADROOM_TOKENS: number;
|
|
5
6
|
export declare const CUSTOM_CONTEXT_COMPACTION_RATIO = 0.7;
|
|
6
7
|
export declare const MIN_AUTO_COMPACT_REQUEST_TOKENS = 20000;
|
|
7
8
|
export type RequestBudgetSource = "explicit" | "legacy" | "default" | "session";
|
|
@@ -16,6 +17,8 @@ export declare function configuredRequestTokens(): {
|
|
|
16
17
|
tokens: number;
|
|
17
18
|
source: RequestBudgetSource;
|
|
18
19
|
};
|
|
20
|
+
export declare function effectiveSafeTokensForWindow(window: number): number;
|
|
21
|
+
export declare function autoCompactHeadroomTokens(modelSafe: number): number;
|
|
19
22
|
export declare function modelSafeRequestTokens(provider: ProviderId | undefined, model: string | undefined): number;
|
|
20
23
|
export declare function resolveRequestBudget(input?: {
|
|
21
24
|
readonly provider?: ProviderId | undefined;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { getConfig, hasExplicitConfigKey } from "../store/config.js";
|
|
2
2
|
import { modelContextWindow } from "../llm/token-usage.js";
|
|
3
3
|
import { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS, } from "./request-accounting.js";
|
|
4
|
+
import { COMPACTION_INPUT_SAFETY_TOKENS, COMPACTION_MAX_COMPLETION_TOKENS, } from "./compaction-summary.js";
|
|
4
5
|
export { RESERVED_OUTPUT_TOKENS, SAFETY_MARGIN_TOKENS };
|
|
5
6
|
export const DEFAULT_AUTO_COMPACT_REQUEST_TOKENS = 180_000;
|
|
7
|
+
export const AUTO_COMPACT_HEADROOM_TOKENS = COMPACTION_MAX_COMPLETION_TOKENS + COMPACTION_INPUT_SAFETY_TOKENS;
|
|
6
8
|
export const CUSTOM_CONTEXT_COMPACTION_RATIO = 0.7;
|
|
7
9
|
export const MIN_AUTO_COMPACT_REQUEST_TOKENS = 20_000;
|
|
8
10
|
export function configuredRequestTokens() {
|
|
@@ -20,35 +22,47 @@ export function configuredRequestTokens() {
|
|
|
20
22
|
source: "default",
|
|
21
23
|
};
|
|
22
24
|
}
|
|
25
|
+
export function effectiveSafeTokensForWindow(window) {
|
|
26
|
+
const floored = Math.max(0, Math.floor(window));
|
|
27
|
+
const reserved = Math.min(RESERVED_OUTPUT_TOKENS, Math.floor(floored * 0.25));
|
|
28
|
+
return Math.max(1, floored - reserved - SAFETY_MARGIN_TOKENS);
|
|
29
|
+
}
|
|
30
|
+
export function autoCompactHeadroomTokens(modelSafe) {
|
|
31
|
+
return Math.min(AUTO_COMPACT_HEADROOM_TOKENS, Math.max(0, Math.floor(modelSafe * 0.25)));
|
|
32
|
+
}
|
|
33
|
+
function effectiveAutoCompactTrigger(configured, modelSafe) {
|
|
34
|
+
return Math.max(1, Math.min(configured, modelSafe - autoCompactHeadroomTokens(modelSafe)));
|
|
35
|
+
}
|
|
23
36
|
export function modelSafeRequestTokens(provider, model) {
|
|
24
|
-
|
|
25
|
-
return Math.max(MIN_AUTO_COMPACT_REQUEST_TOKENS, window - RESERVED_OUTPUT_TOKENS - SAFETY_MARGIN_TOKENS);
|
|
37
|
+
return effectiveSafeTokensForWindow(modelContextWindow(model, provider));
|
|
26
38
|
}
|
|
27
39
|
export function resolveRequestBudget(input) {
|
|
28
40
|
const customLimit = input?.contextLimitTokens;
|
|
29
41
|
if (typeof customLimit === "number" &&
|
|
30
42
|
Number.isFinite(customLimit) &&
|
|
31
43
|
customLimit >= MIN_AUTO_COMPACT_REQUEST_TOKENS) {
|
|
32
|
-
const modelSafe =
|
|
33
|
-
const
|
|
44
|
+
const modelSafe = effectiveSafeTokensForWindow(customLimit);
|
|
45
|
+
const configured = Math.floor(customLimit * CUSTOM_CONTEXT_COMPACTION_RATIO);
|
|
46
|
+
const effectiveTrigger = effectiveAutoCompactTrigger(configured, modelSafe);
|
|
34
47
|
return {
|
|
35
|
-
configured
|
|
48
|
+
configured,
|
|
36
49
|
modelSafe,
|
|
37
50
|
effectiveTrigger,
|
|
38
51
|
source: "session",
|
|
39
|
-
clampedByModel:
|
|
52
|
+
clampedByModel: effectiveTrigger < configured,
|
|
40
53
|
};
|
|
41
54
|
}
|
|
42
55
|
const resolved = configuredRequestTokens();
|
|
43
56
|
const raw = input?.overrideTokens ?? resolved.tokens;
|
|
44
57
|
const configured = Math.max(MIN_AUTO_COMPACT_REQUEST_TOKENS, raw);
|
|
45
58
|
const modelSafe = modelSafeRequestTokens(input?.provider, input?.model);
|
|
59
|
+
const effectiveTrigger = effectiveAutoCompactTrigger(configured, modelSafe);
|
|
46
60
|
return {
|
|
47
61
|
configured,
|
|
48
62
|
modelSafe,
|
|
49
|
-
effectiveTrigger
|
|
63
|
+
effectiveTrigger,
|
|
50
64
|
source: input?.overrideTokens === undefined ? resolved.source : "explicit",
|
|
51
|
-
clampedByModel:
|
|
65
|
+
clampedByModel: effectiveTrigger < configured,
|
|
52
66
|
};
|
|
53
67
|
}
|
|
54
68
|
export function requestBudgetDenominator(provider, model, contextLimitTokens) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-budget.js","sourceRoot":"","sources":["../../src/agent/request-budget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EACL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,mCAAmC,GAAG,OAAO,CAAC;AAE3D,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC;AAYtD,MAAM,UAAU,uBAAuB;IAIrC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,IACE,oBAAoB,CAAC,0BAA0B,CAAC;QAChD,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EACnD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,wBAAwB,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IACzE,CAAC;IACD,IACE,oBAAoB,CAAC,wBAAwB,CAAC;QAC9C,OAAO,MAAM,CAAC,sBAAsB,KAAK,QAAQ,EACjD,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IACrE,CAAC;IACD,OAAO;QACL,MAAM,EAAE,mCAAmC;QAC3C,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"request-budget.js","sourceRoot":"","sources":["../../src/agent/request-budget.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/runner.js
CHANGED
|
@@ -171,7 +171,6 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
171
171
|
mcpPresent: Boolean(mcpRuntime),
|
|
172
172
|
mcpToolNames,
|
|
173
173
|
mcpToolDefinitions,
|
|
174
|
-
imageOcrEnabled,
|
|
175
174
|
skillsAvailable,
|
|
176
175
|
toolCalling: options.toolCalling ?? config.toolCalling,
|
|
177
176
|
useCompactSystemPrompt: () => useCompactSystemPrompt,
|
|
@@ -245,7 +244,7 @@ export async function runAgentTurn(prompt, options = {}) {
|
|
|
245
244
|
selectedSkillNames,
|
|
246
245
|
inputTokenBudget,
|
|
247
246
|
getMcpContext: () => mcpRuntime?.promptContext({
|
|
248
|
-
nativeTools:
|
|
247
|
+
nativeTools: nativeToolsActive,
|
|
249
248
|
...(agentMode === "ask" ? { askMode: true } : {}),
|
|
250
249
|
}),
|
|
251
250
|
getProjectRoot: getActiveProjectRoot,
|
package/dist/agent/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAWzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAMjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACxB,iBAAiB,GAElB,MAAM,iCAAiC,CAAC;AAIzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,yCAAyC,IAAI,iCAAiC,EAAE,MAAM,gCAAgC,CAAC;AAChI,OAAO,EACL,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,mBAAmB,IAAI,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACxG,OAAO,EACL,UAAU,GAGX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EACL,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,SAAS,0BAA0B,CAAC,IAAc;IAChD,IAAI,CAAC;QACH,OAAO,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,gCAAgC,CACvC,IAAc;IAEd,IAAI,CAAC;QACH,OAAO,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AACD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACL,QAAQ,EACR,UAAU,GAEX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,mBAAmB,EAEnB,sBAAsB,EAEtB,YAAY,EACZ,oBAAoB,GAErB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAEL,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,gBAAgB,GAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,cAAc,uBAAuB,CAAC;AACtC,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,sBAAsB,EACtB,eAAe,EACf,oBAAoB,GAErB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,UAAU,yCAAyC,CACvD,IAA6B,EAC7B,WAAqC,EACrC,aAA+C,EAC/C,qBAA0C;IAE1C,OAAO,iCAAiC,CACtC,IAAI,EACJ,WAAW,EACX,aAAa,EACb,qBAAqB,CACtB,CAAC;AACJ,CAAC;AAwCD,SAAS,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC7C,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IACtC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,EAAE,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,UAA2B,EAAE;IAE7B,MAAM,SAAS,GACb,OAAO,CAAC,IAAI,KAAK,MAAM;QACvB,OAAO,CAAC,IAAI,KAAK,OAAO;QACxB,OAAO,CAAC,IAAI,KAAK,KAAK;QACpB,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC,OAAO,CAAC;IACd,MAAM,UAAU,GAAG,SAAS,KAAK,MAAM,CAAC;IACxC,MAAM,SAAS,GAAkB;QAC/B,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC;KAC1C,CAAC;IACF,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAoB,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;IACjE,MAAM,WAAW,GAAG,sBAAsB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACnE,MAAM,EACJ,WAAW,EACX,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,wBAAwB,EACxB,qBAAqB,GACtB,GAAG,WAAW,CAAC;IAChB,IAAI,YAAY,GAAkB,EAAE,CAAC;IACrC,IAAI,0BAA0B,GAAG,KAAK,CAAC;IACvC,MAAM,eAAe,GAAG,IAAI,oBAAoB,CAAC;QAC/C,uBAAuB,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,uBAAuB,EAAE;QACnE,YAAY,EAAE,CAAC,cAAc,EAAE,EAAE,CAC/B,UAAU,CAAC,iCAAiC,CAAC,cAAc,CAAC;KAC/D,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,kBAAkB,CAAC;QACpC,sBAAsB,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE;QACvD,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;QAChC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,0BAA0B;QAC9C,qBAAqB;QACrB,yBAAyB,EAAE,GAAG,EAAE,CAC9B,IAAI,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAC/C,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,CACzD,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QACnE,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAC;IAEH,IAAI,QAAkC,CAAC;IAEvC,IAAI,CAAC;QACH,IAAI,CAAC;YACH,IAAI,EAAE,YAAY;YAClB,MAAM;YACN,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS;gBACrC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE;gBAC1C,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;QAC/B,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACjD,IACE,UAAU;YACV,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,IAAI,YAAY,CAAC,EAChE,CAAC;YACD,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;QACjC,CAAC;QACD,IAAI,UAAU,IAAI,YAAY;YAAE,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,kBAAkB,GACtB,UAAU,EAAE,eAAe,CAAC;YAC1B,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClD,CAAC,IAAI,EAAE,CAAC;QACX,QAAQ,GAAG,UAAU,EAAE,SAAS,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CACzC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAChC,CAAC;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,IAAI,gBAAgB,CAAC;QACxD,MAAM,cAAc,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC;YACrC,GAAG,EAAE,OAAO,EAAE;YACd,GAAG,CAAC,oBAAoB,EAAE;gBACxB,CAAC,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAG,EAAE;gBAC1C,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,oBAAoB,CAC1C,MAAM,EACN,iBAAiB,EACjB,OAAO,CAAC,YAAY,KAAK,KAAK,CAC/B,CAAC;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,eAAe,CAAC;QACnE,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,IAAI,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,mBAAmB,CAAC;YAC/B,QAAQ,EAAE,eAAe;YACzB,KAAK,EAAE,YAAY;YACnB,yBAAyB,EAAE,OAAO,CAAC,yBAAyB;SAC7D,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,iBAAiB,CAAC;YACpC,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;YAC/B,YAAY;YACZ,kBAAkB;YAClB,eAAe;YACf,eAAe;YACf,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;YACtD,sBAAsB,EAAE,GAAG,EAAE,CAAC,sBAAsB;SACrD,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;QAClD,MAAM,kBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;QAC1D,MAAM,SAAS,GAAG,cAAc,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAChE,MAAM,cAAc,GAAG,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,EACJ,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,GACnB,GAAG,cAAc,CAAC;QACnB,0BAA0B,GAAG,cAAc,CAAC,mBAAmB,CAAC;QAChE,MAAM,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,yBAAyB,GAAG,GAAuB,EAAE,CACzD,OAAO,CAAC,qBAAqB;YAC3B,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC;YAC1D,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACjC,MAAM,gBAAgB,GAAG,wBAAwB,CAC/C,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,CAAC;QACF,MAAM,sBAAsB,GAAG,gBAAgB,KAAK,SAAS,CAAC;QAC9D,MAAM,cAAc,GAAG,CACrB,MAAe,EACf,OAAgB,EAChB,gBAA4B,IAAI,CAAC,QAAQ,EACzC,aAAqB,IAAI,CAAC,KAAK,EACD,EAAE,CAChC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;QACzE,MAAM,wBAAwB,GAAG,CAAC,MAAe,EAAU,EAAE,CAC3D,WAAW,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1E,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,GACrD,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,OAAO,GAAkB,OAAO,CAAC,OAAO,IAAI,mBAAmB,EAAE,CAAC;QACxE,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAC3B,OAAO,CAAC,gBAAgB,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,iBAAiB;YAC5B,OAAO,CAAC,iBAAiB,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QACnD,IAAI,CAAC,yBAAyB,EAAE,EAAE,CAAC;YACjC,qBAAqB,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,wBAAwB,CACxC,UAAU,EACV,mBAAmB,EAAE,CACtB,CAAC;QACF,IAAI,UAAU,IAAI,sBAAsB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5D,OAAO,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;QACpC,CAAC;QACD,0BAA0B,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;QAE3D,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,GAAG,mBAAmB,CAAC;YACpE,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,GAAG,EAAE,OAAO,EAAE;SACf,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,oBAAoB,CAAC;YAClD,MAAM;YACN,SAAS,EAAE,oBAAoB;YAC/B,wBAAwB,EAAE,CAAC,kBAAkB,IAAI,CAAC,kBAAkB;YACpE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAU;YAClE,MAAM,EAAE,WAAW;SACpB,CAAC,CAAC;QACH,IAAI,sBAAsB,GAAG,gBAAgB,CAAC,KAAK,CAAC;QACpD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,CAAC;QACvD,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;QAC/D,MAAM,wBAAwB,GAAG,KAAK,IAAmB,EAAE;YACzD,sBAAsB,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC5D,CAAC,CAAC;QAEF,MAAM,iBAAiB,GAAG,eAAe,IAAI,UAAU,EAAE,IAAI,KAAK,SAAS,CAAC;QAC5E,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,GAChD,MAAM,mBAAmB,CAAC;YACxB,MAAM;YACN,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,cAAc;YACd,eAAe;YACf,UAAU;YACV,aAAa;YACb,kBAAkB;YAClB,kBAAkB;YAClB,mBAAmB;YACnB,eAAe;YACf,eAAe;YACf,UAAU;YACV,kBAAkB;YAClB,gBAAgB;YAChB,aAAa,EAAE,GAAG,EAAE,CAClB,UAAU,EAAE,aAAa,CAAC;gBACxB,WAAW,EAAE,KAAK;gBAClB,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClD,CAAC;YACJ,cAAc,EAAE,oBAAoB;YACpC,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;YAClE,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC;SACrE,CAAC,CAAC;QACL,MAAM,0BAA0B,GAAG,CAAC,MAAe,EAAU,EAAE,CAC7D,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,mBAAmB,CAAC;YACnC,MAAM;YACN,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,SAAS;YACf,cAAc;YACd,kBAAkB;YAClB,iBAAiB;YACjB,gBAAgB;YAChB,mBAAmB,EAAE,wBAAwB;YAC7C,iBAAiB,EAAE,sBAAsB;YACzC,WAAW,EAAE,iBAAiB;YAC9B,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK;SACzC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QACnC,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;QAC7D,YAAY,GAAG,QAAQ,CAAC;QACxB,MAAM,qBAAqB,GAAG,GAAS,EAAE;YACvC,8BAA8B,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;YACjE,yBAAyB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACzD,CAAC,CAAC;QACF,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;YAC5C,MAAM;YACN,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,oBAAoB,EAAE,UAAU,CAAC,uBAAuB,CACtD,OAAO,CAAC,SAAS,CAClB;SACF,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC;QAC9C,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,QAAQ,CAAC;QACtD,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,cAAc,CAAC;QACtE,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,KAAK,CAAC;QACpD,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,cAAc,CAAC;QACtE,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,eAAe,CAAC;QAC/D,IAAI,kBAAkB,CAAC,qBAAqB,EAAE,CAAC;YAC7C,eAAe,CAAC,GAAG,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;YAC1D,QAAQ;YACR,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,eAAe;YACvB,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;YAClE,uBAAuB,EAAE,GAAG,EAAE,CAC5B,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,SAAS,CAAC;YACvD,mBAAmB,EAAE,GAAG,EAAE,CACxB,UAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC;YACnD,qBAAqB,EAAE,CAAC,OAAO,EAAE,EAAE,CACjC,UAAU,CAAC,8BAA8B,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC;SACxE,CAAC,CAAC;QACH,IAAI,mBAAmB,GAEX,GAAG,EAAE,CAAC,SAAS,CAAC;QAC5B,MAAM,EACJ,mBAAmB,EACnB,yBAAyB,EACzB,aAAa,EACb,oBAAoB,GACrB,GAAG,uBAAuB,CAAC;YAC1B,QAAQ;YACR,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,qBAAqB;YACrB,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,gBAAgB;YACpD,qBAAqB;SACtB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACtD,MAAM,aAAa,GAAG,mBAAmB,CAAC;YACxC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC;SACnE,CAAC,CAAC;QAGH,MAAM,aAAa,GAAG,yBAAyB,EAAE,CAAC;QAElD,MAAM,aAAa,GAAG,uBAAuB,EAAE,CAAC;QAChD,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,gBAAgB,GAAuB,EAAE,CAAC;QAEhD,8BAA8B,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAE1D,MAAM,iBAAiB,GAAgB,CAAC,OAAO,EAAE,EAAE,CACjD,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,aAAa,CAAC;YAC7B,SAAS;YACT,SAAS,EAAE,gBAAgB;YAC3B,kBAAkB,EAAE,aAAa;YACjC,WAAW,EAAE,oBAAoB;YACjC,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC;QACjD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;QAC7D,MAAM,wBAAwB,GAAG,QAAQ,CAAC,wBAAwB,CAAC;QACnE,MAAM,mBAAmB,GAAG,QAAQ,CAAC,mBAAmB,CAAC;QAEzD,mBAAmB,GAAG,0BAA0B,CAAC;YAC/C,QAAQ;YACR,MAAM;YACN,qBAAqB;YACrB,qBAAqB;YACrB,UAAU,EAAE,kBAAkB,IAAI,kBAAkB;YACpD,aAAa,EAAE,aAAa,IAAI,eAAe;YAC/C,aAAa;YACb,cAAc;YACd,aAAa;YACb,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU;YAC5B,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK;YAC9C,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;YAC/D,WAAW,EAAE,oBAAoB;SAClC,CAAC,CAAC;QACH,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAEhC,MAAM,wBAAwB,GAAkB,EAAE,CAAC;QACnD,MAAM,oCAAoC,GAA4B,EAAE,CAAC;QAEzE,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,GAAG,wBAAwB,CAAC;YAC5C,SAAS;YACT,QAAQ,EAAE,UAAU,EAAE,IAAI;SAC3B,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;YAClC,MAAM;YACN,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ;YACR,SAAS;YACT,WAAW;YACX,0BAA0B,EAAE,CAAC,UAAU,EAAE,EAAE,CACzC,SAAS,CAAC,0BAA0B,CAAC,UAAU,IAAI,EAAE,CAAC;SACzD,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;QACpC,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC;QAEvC,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5C,MAAM,eAAe,GAAG,0BAA0B,CAAC;YACjD,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC;YACtD,aAAa;YACb,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC;YACxD,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;YACrE,eAAe,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC;YACpE,cAAc;SACf,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,iBAAiB,EAAE,CAAC;QAExC,MAAM,iBAAiB,GAAG,sBAAsB,CAAC;YAC/C,OAAO,EAAE,SAAS,KAAK,KAAK;YAC5B,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;YACzC,OAAO;YACP,WAAW;YACX,WAAW;YACX,SAAS;YACT,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;YACrB,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC;YACtD,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC;YACxD,aAAa;YACb,eAAe;YACf,cAAc;SACf,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;QACtE,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;QAE1E,KAAK,UAAU,kBAAkB,CAC/B,QAAuB;YAEvB,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CACtC,iBAAiB,CAAC,QAAQ,CAAC,EAC3B,QAAQ,EAAE,eAAe,EAAE,EAC3B,OAAO,CAAC,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC,MAAM,CAC/C,CAAC;YACF,OAAO,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,cAAc,GAAmB;YACrC,GAAG,WAAW;YACd,OAAO;YACP,IAAI;YACJ,OAAO;YACP,QAAQ;YACR,MAAM;YACN,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;YAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK;YACvB,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;YACrB,UAAU;YACV,QAAQ;YACR,cAAc;YACd,eAAe;YACf,mBAAmB;YACnB,eAAe;YACf,UAAU,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC;YACpC,SAAS;YACT,UAAU;YACV,UAAU;YACV,WAAW;YACX,WAAW;YACX,gBAAgB;YAChB,eAAe;YACf,YAAY;YACZ,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa;YACvC,SAAS;YACT,iBAAiB;YACjB,gBAAgB;YAChB,wBAAwB;YACxB,oCAAoC;YACpC,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB;YAC7C,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB;YAC/C,SAAS,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAC5C,aAAa;YACb,QAAQ;YACR,mBAAmB;YACnB,wBAAwB;YACxB,qBAAqB;YACrB,mBAAmB;YACnB,mBAAmB;YACnB,iBAAiB;YACjB,2BAA2B;YAC3B,kBAAkB;YAClB,2BAA2B;SAC5B,CAAC;QACF,MAAM,iBAAiB,GAAG,CACxB,IAAc,EACd,WAAmB,EACnB,YAAyB,EACE,EAAE,CAC7B,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAEjE,MAAM,wBAAwB,GAAG,CAAC,CAAC;QACnC,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAC/B,MAAM,kBAAkB,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACzD,MAAM,wBAAwB,GAA6B,EAAE,CAAC;QAC9D,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAG7B,CAAC;QAEJ,MAAM,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,GACnD,wBAAwB,CAAC;YACvB,QAAQ;YACR,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;YAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK;YACvB,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,wBAAwB;YACpC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,OAAO,EAAE,YAAY;YACrB,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,kBAAkB;YAC5B,cAAc,EAAE,wBAAwB;YACxC,kBAAkB,EAAE,yBAAyB;YAC7C,WAAW,EAAE,GAAG,EAAE,CAChB,cAAc,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;YAC3D,6BAA6B,EAAE,GAAG,EAAE;gBAClC,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjE,OAAO,cAAc,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;YACxD,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;YAClE,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;YACjD,WAAW,EAAE,oBAAoB;YACjC,oBAAoB;YACpB,oBAAoB,EAAE,GAAG,EAAE,CACzB,UAAU,CAAC,uBAAuB,CAAC,OAAO,CAAC,SAAS,CAAC;YACvD,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;YAC/D,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC;YACjE,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,6BAA6B;YACzD,oBAAoB,EAAE,GAAG,EAAE;gBACzB,IAAI,CAAC,6BAA6B,GAAG,SAAS,CAAC;YACjD,CAAC;YACD,iBAAiB,EAAE,GAAG,EAAE,CAAC,sBAAsB;YAC/C,WAAW,EAAE,GAAG,EAAE,CAAC,iBAAiB;YACpC,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK;YAC9C,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE;YACnD,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;YACxD,yBAAyB,EAAE,CAAC,KAAK,EAAE,EAAE;gBACnC,sBAAsB,GAAG,KAAK,CAAC;YACjC,CAAC;YACD,UAAU,EAAE,oBAAoB;YAChC,YAAY,EAAE,sBAAsB;YACpC,WAAW,EAAE,qBAAqB;YAClC,cAAc,EAAE,wBAAwB;YACxC,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxB,KAAK,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAChC,CAAC;SACF,CAAC,CAAC;QAEL,MAAM,QAAQ,GAAiB;YAC7B,GAAG,cAAc;YACjB,OAAO;YACP,GAAG,WAAW;YACd,IAAI;YACJ,QAAQ;YACR,aAAa;YACb,WAAW;YACX,aAAa;YACb,UAAU;YACV,SAAS;YACT,aAAa;YACb,WAAW;YACX,eAAe;YACf,aAAa;YACb,kBAAkB;YAClB,kBAAkB;YAClB,sBAAsB;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ;YACR,eAAe;YACf,aAAa;YACb,gBAAgB;YAChB,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW;YAC1B,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9B,WAAW,GAAG,OAAO,CAAC;gBACtB,iBAAiB,GAAG,MAAM,CAAC;YAC7B,CAAC;YACD,iBAAiB,EAAE,GAAG,EAAE,CAAC,iBAAiB;YAC1C,0BAA0B;YAC1B,yBAAyB;YACzB,yBAAyB;YACzB,cAAc;YACd,gBAAgB;YAChB,kBAAkB;YAClB,qBAAqB;YACrB,wBAAwB;YACxB,mBAAmB;YACnB,mBAAmB;YACnB,kBAAkB;YAClB,UAAU;YACV,iBAAiB;YACjB,eAAe,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,eAAe,EAAE;YAClD,oBAAoB;YACpB,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;YAChC,yBAAyB;SAC1B,CAAC;QAEF,OAAO,MAAM,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,CACvD,aAAa,CAAC,QAAQ,EAAE;YACtB,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC;SACzC,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,OAAO,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC;YACb,OAAO,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;QACtC,CAAC;QACD,eAAe,CAAC,OAAO,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,UAAU,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/E,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;YAC1D,CAAC;YAAC,MAAM,CAAC;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAChE,CAAC,CAAC;QACH,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,QAAQ,EAAE,OAAO,EAAE,CAAC;IACtB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,UAA2B,EAAE;IAE7B,OAAO,CAAC,MAAM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AACtD,CAAC"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,14 +21,9 @@ const PRE_APPROVAL_ALLOWED_TOOLS = new Set([
|
|
|
21
21
|
"sysinfo",
|
|
22
22
|
"tool.batch",
|
|
23
23
|
"tool.check",
|
|
24
|
-
"net.context",
|
|
25
24
|
"web.search",
|
|
26
25
|
"web.fetch",
|
|
27
|
-
"dns.lookup",
|
|
28
|
-
"whois.lookup",
|
|
29
26
|
"http.fetch",
|
|
30
|
-
"net.scan",
|
|
31
|
-
"pentest.recon",
|
|
32
27
|
"wordlist.find",
|
|
33
28
|
"image.ocr",
|
|
34
29
|
"pdf.read",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-policy.js","sourceRoot":"","sources":["../../src/agent/session-policy.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,mBAAmB,CAAC,SAAkB;IACpD,OAAO;QACL,KAAK,EAAE,IAAI,GAAG,EAAE;QAChB,iBAAiB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACnC,SAAS,EACP,SAAS;YACT,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QAC7E,YAAY,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QAC9B,gBAAgB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;QACtC,iBAAiB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;KACxC,CAAC;AACJ,CAAC;AAED,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAS;IACjD,aAAa;IACb,WAAW;IACX,UAAU;IACV,WAAW;IACX,aAAa;IACb,SAAS;IACT,SAAS;IACT,WAAW;IACX,SAAS;IACT,YAAY;IACZ,YAAY;IACZ,
|
|
1
|
+
{"version":3,"file":"session-policy.js","sourceRoot":"","sources":["../../src/agent/session-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export interface StreamRecoveryState {
|
|
|
3
3
|
empty: number;
|
|
4
4
|
rateLimit: number;
|
|
5
5
|
server: number;
|
|
6
|
+
serverAttempts: number;
|
|
6
7
|
network: number;
|
|
7
8
|
stall: number;
|
|
8
9
|
context: number;
|
|
@@ -14,6 +15,7 @@ export interface StreamRecoveryLimits {
|
|
|
14
15
|
readonly maxEmpty: number;
|
|
15
16
|
readonly maxRateLimit: number;
|
|
16
17
|
readonly maxServer: number;
|
|
18
|
+
readonly maxServerAttempts: number;
|
|
17
19
|
readonly maxNetwork: number;
|
|
18
20
|
readonly maxStall: number;
|
|
19
21
|
readonly maxContext: number;
|
|
@@ -38,6 +40,8 @@ export declare function classifyStreamFailure(error: unknown): StreamFailureKind
|
|
|
38
40
|
export declare function createStreamRecoveryState(): StreamRecoveryState;
|
|
39
41
|
export declare function resetStreamRecoveryState(state: StreamRecoveryState): void;
|
|
40
42
|
export declare function recordRecoveryAttempt(state: StreamRecoveryState, kind: StreamFailureKind, progressed?: boolean): void;
|
|
43
|
+
export declare function recordServerErrorAttempts(state: StreamRecoveryState, attempts: number): void;
|
|
44
|
+
export declare function serverErrorAttemptsFrom(error: unknown): number;
|
|
41
45
|
export declare function planStreamRecovery(input: {
|
|
42
46
|
error?: unknown;
|
|
43
47
|
kind?: StreamFailureKind;
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { ProviderError, STREAM_STALL_MARKER } from "../llm/http.js";
|
|
2
|
+
import { rateLimitWaitMsFor } from "../llm/key-rotation.js";
|
|
2
3
|
import { isEmptyCompletionError } from "../llm/router.js";
|
|
4
|
+
import { SERVER_ERROR_MAX_ATTEMPTS, serverErrorAttemptsFor, } from "../llm/routing/error-classification.js";
|
|
3
5
|
export const DEFAULT_STREAM_RECOVERY_LIMITS = {
|
|
4
6
|
maxEmpty: 4,
|
|
5
7
|
maxRateLimit: 5,
|
|
6
8
|
maxServer: 3,
|
|
9
|
+
maxServerAttempts: SERVER_ERROR_MAX_ATTEMPTS,
|
|
7
10
|
maxNetwork: 3,
|
|
8
11
|
maxStall: 2,
|
|
9
12
|
maxContext: 2,
|
|
@@ -74,6 +77,7 @@ export function createStreamRecoveryState() {
|
|
|
74
77
|
empty: 0,
|
|
75
78
|
rateLimit: 0,
|
|
76
79
|
server: 0,
|
|
80
|
+
serverAttempts: 0,
|
|
77
81
|
network: 0,
|
|
78
82
|
stall: 0,
|
|
79
83
|
context: 0,
|
|
@@ -86,6 +90,7 @@ export function resetStreamRecoveryState(state) {
|
|
|
86
90
|
state.empty = 0;
|
|
87
91
|
state.rateLimit = 0;
|
|
88
92
|
state.server = 0;
|
|
93
|
+
state.serverAttempts = 0;
|
|
89
94
|
state.network = 0;
|
|
90
95
|
state.stall = 0;
|
|
91
96
|
state.context = 0;
|
|
@@ -123,19 +128,15 @@ export function recordRecoveryAttempt(state, kind, progressed = false) {
|
|
|
123
128
|
break;
|
|
124
129
|
}
|
|
125
130
|
}
|
|
131
|
+
export function recordServerErrorAttempts(state, attempts) {
|
|
132
|
+
state.serverAttempts += Math.max(0, attempts);
|
|
133
|
+
}
|
|
134
|
+
export function serverErrorAttemptsFrom(error) {
|
|
135
|
+
return Math.max(1, serverErrorAttemptsFor(error));
|
|
136
|
+
}
|
|
126
137
|
function pick(delays, attempt, max) {
|
|
127
138
|
return Math.min(delays[attempt] ?? delays[delays.length - 1] ?? 0, max);
|
|
128
139
|
}
|
|
129
|
-
function retryAfterSecondsFrom(error) {
|
|
130
|
-
if (error instanceof ProviderError && error.retryAfterSeconds !== undefined) {
|
|
131
|
-
return error.retryAfterSeconds;
|
|
132
|
-
}
|
|
133
|
-
const match = (error instanceof Error ? error.message : String(error ?? "")).match(/retry after ([0-9.]+)\s*s/i);
|
|
134
|
-
if (!match)
|
|
135
|
-
return undefined;
|
|
136
|
-
const seconds = Number.parseFloat(match[1]);
|
|
137
|
-
return Number.isFinite(seconds) && seconds >= 0 ? seconds : undefined;
|
|
138
|
-
}
|
|
139
140
|
export function planStreamRecovery(input) {
|
|
140
141
|
const limits = input.limits ?? DEFAULT_STREAM_RECOVERY_LIMITS;
|
|
141
142
|
const kind = input.kind ?? classifyStreamFailure(input.error);
|
|
@@ -179,11 +180,7 @@ export function planStreamRecovery(input) {
|
|
|
179
180
|
const n = attempt(state.rateLimit, limits.maxRateLimit);
|
|
180
181
|
if (n >= limits.maxRateLimit)
|
|
181
182
|
return giveUp;
|
|
182
|
-
const
|
|
183
|
-
const providerSeconds = retryAfterSecondsFrom(input.error);
|
|
184
|
-
const delayMs = Math.min(cap, providerSeconds === undefined
|
|
185
|
-
? scheduled
|
|
186
|
-
: Math.max(scheduled, providerSeconds * 1000));
|
|
183
|
+
const delayMs = rateLimitWaitMsFor(input.error, n, cap);
|
|
187
184
|
return {
|
|
188
185
|
action: "retry",
|
|
189
186
|
kind,
|
|
@@ -197,6 +194,8 @@ export function planStreamRecovery(input) {
|
|
|
197
194
|
};
|
|
198
195
|
}
|
|
199
196
|
case "server": {
|
|
197
|
+
if (state.serverAttempts >= limits.maxServerAttempts)
|
|
198
|
+
return giveUp;
|
|
200
199
|
const n = attempt(state.server, limits.maxServer);
|
|
201
200
|
if (n >= limits.maxServer)
|
|
202
201
|
return giveUp;
|