@pentoshi/clai 4.11.9 → 4.11.12
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/injected-blocks.d.ts +6 -0
- package/dist/agent/injected-blocks.js +29 -13
- package/dist/agent/injected-blocks.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/plan-tool.js +5 -1
- package/dist/agent/plan-tool.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/responder-context.js +8 -12
- package/dist/agent/responder-context.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 -1
- 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/tool-history.js +3 -3
- package/dist/agent/tool-history.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/history-writer.d.ts +1 -1
- package/dist/agent/turn/history-writer.js +8 -6
- package/dist/agent/turn/history-writer.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 +3 -2
- package/dist/agent/turn/loop/round-request.d.ts +2 -0
- package/dist/agent/turn/loop/round-request.js +19 -3
- package/dist/agent/turn/loop/round-request.js.map +1 -1
- package/dist/agent/turn/loop/run-rounds.js +2 -4
- package/dist/agent/turn/loop/run-rounds.js.map +1 -1
- package/dist/agent/turn/loop/stream-failure.d.ts +1 -0
- package/dist/agent/turn/loop/stream-failure.js +5 -1
- package/dist/agent/turn/loop/stream-failure.js.map +1 -1
- package/dist/agent/turn/mcp-agent-tools.js +6 -0
- package/dist/agent/turn/mcp-agent-tools.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/classic/panels/confirm-panel.js +1 -0
- package/dist/classic/panels/confirm-panel.js.map +1 -1
- package/dist/commands/providers.js +2 -0
- package/dist/commands/providers.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/adapters/openai-tools.js +3 -1
- package/dist/llm/adapters/openai-tools.js.map +1 -1
- package/dist/llm/anthropic.d.ts +2 -2
- package/dist/llm/anthropic.js +28 -18
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/capabilities.d.ts +5 -3
- package/dist/llm/capabilities.js +49 -17
- package/dist/llm/capabilities.js.map +1 -1
- package/dist/llm/capability/state.d.ts +1 -1
- package/dist/llm/capability/state.js +4 -8
- package/dist/llm/capability/state.js.map +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/custom-providers.d.ts +2 -0
- package/dist/llm/custom-providers.js +69 -7
- package/dist/llm/custom-providers.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/free.d.ts +2 -0
- package/dist/llm/free.js +32 -2
- package/dist/llm/free.js.map +1 -1
- package/dist/llm/key-rotation.d.ts +4 -0
- package/dist/llm/key-rotation.js +32 -5
- package/dist/llm/key-rotation.js.map +1 -1
- package/dist/llm/learned-capabilities.d.ts +2 -0
- package/dist/llm/learned-capabilities.js +31 -7
- package/dist/llm/learned-capabilities.js.map +1 -1
- package/dist/llm/model-families.js +9 -0
- package/dist/llm/model-families.js.map +1 -1
- package/dist/llm/model-layers/model-rules.js +7 -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 +41 -3
- package/dist/llm/provider-profile-layers.js.map +1 -1
- package/dist/llm/provider-profiles.js +3 -1
- package/dist/llm/provider-profiles.js.map +1 -1
- package/dist/llm/quota-signals.d.ts +4 -0
- package/dist/llm/quota-signals.js +22 -0
- package/dist/llm/quota-signals.js.map +1 -0
- 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/request-plan.js +15 -5
- package/dist/llm/request-plan.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 +22 -7
- 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/router.d.ts +1 -0
- package/dist/llm/router.js +6 -0
- package/dist/llm/router.js.map +1 -1
- package/dist/llm/routing/attempt-complete.js +16 -5
- package/dist/llm/routing/attempt-complete.js.map +1 -1
- package/dist/llm/routing/attempt-request.js +9 -1
- package/dist/llm/routing/attempt-request.js.map +1 -1
- package/dist/llm/routing/attempt-stream.js +16 -5
- package/dist/llm/routing/attempt-stream.js.map +1 -1
- package/dist/llm/routing/error-classification.d.ts +5 -0
- package/dist/llm/routing/error-classification.js +74 -6
- package/dist/llm/routing/error-classification.js.map +1 -1
- package/dist/llm/routing/failure-report.js +17 -2
- package/dist/llm/routing/failure-report.js.map +1 -1
- package/dist/llm/routing/key-rotation.d.ts +1 -0
- package/dist/llm/routing/key-rotation.js +18 -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/response-errors.d.ts +1 -0
- package/dist/llm/wire/response-errors.js +67 -0
- package/dist/llm/wire/response-errors.js.map +1 -1
- package/dist/llm/wire/responses-failure.d.ts +7 -0
- package/dist/llm/wire/responses-failure.js +49 -0
- package/dist/llm/wire/responses-failure.js.map +1 -0
- package/dist/llm/wire/responses-first.js +30 -83
- package/dist/llm/wire/responses-first.js.map +1 -1
- package/dist/mcp/auth/device.d.ts +29 -0
- package/dist/mcp/auth/device.js +125 -0
- package/dist/mcp/auth/device.js.map +1 -0
- package/dist/mcp/auth/loopback.d.ts +1 -0
- package/dist/mcp/auth/loopback.js +22 -2
- package/dist/mcp/auth/loopback.js.map +1 -1
- package/dist/mcp/auth/metadata.js +3 -0
- package/dist/mcp/auth/metadata.js.map +1 -1
- package/dist/mcp/auth/provider.d.ts +7 -1
- package/dist/mcp/auth/provider.js +111 -7
- package/dist/mcp/auth/provider.js.map +1 -1
- package/dist/mcp/auth/registration.d.ts +1 -0
- package/dist/mcp/auth/registration.js +4 -2
- package/dist/mcp/auth/registration.js.map +1 -1
- package/dist/mcp/auth/types.d.ts +8 -0
- package/dist/mcp/coerce.d.ts +5 -0
- package/dist/mcp/coerce.js +104 -0
- package/dist/mcp/coerce.js.map +1 -0
- package/dist/mcp/config-file.d.ts +6 -0
- package/dist/mcp/config-file.js +18 -2
- package/dist/mcp/config-file.js.map +1 -1
- package/dist/mcp/format.js +2 -0
- package/dist/mcp/format.js.map +1 -1
- package/dist/mcp/index.d.ts +3 -1
- package/dist/mcp/index.js +3 -1
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/known-servers.d.ts +36 -0
- package/dist/mcp/known-servers.js +265 -0
- package/dist/mcp/known-servers.js.map +1 -0
- package/dist/mcp/manager.d.ts +10 -1
- package/dist/mcp/manager.js +88 -20
- package/dist/mcp/manager.js.map +1 -1
- package/dist/mcp/runtime.d.ts +9 -0
- package/dist/mcp/runtime.js +157 -29
- 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/transport-http.js +4 -4
- package/dist/mcp/transport-http.js.map +1 -1
- package/dist/mcp/transport.d.ts +3 -2
- package/dist/mcp/transport.js +3 -1
- package/dist/mcp/transport.js.map +1 -1
- package/dist/mcp/types.d.ts +1 -1
- package/dist/mcp/validation.js +4 -1
- package/dist/mcp/validation.js.map +1 -1
- package/dist/noninteractive/blocks/tool-blocks.js +10 -5
- package/dist/noninteractive/blocks/tool-blocks.js.map +1 -1
- package/dist/noninteractive/start-noninteractive.js +6 -1
- package/dist/noninteractive/start-noninteractive.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 +2 -16
- package/dist/safety/tool-classification.js.map +1 -1
- package/dist/session-runtime/attach-output.d.ts +12 -0
- package/dist/session-runtime/attach-output.js +52 -0
- package/dist/session-runtime/attach-output.js.map +1 -0
- 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/client.js +144 -69
- package/dist/session-runtime/client.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 +19 -14
- 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/store/session-model.js +9 -7
- package/dist/store/session-model.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 +16 -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/definitions.js +2 -1
- package/dist/tools/definitions.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/bootstrap/resize-repaint.d.ts +1 -37
- package/dist/tui-v2/bootstrap/resize-repaint.js +9 -77
- package/dist/tui-v2/bootstrap/resize-repaint.js.map +1 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js +13 -27
- package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
- package/dist/tui-v2/components/jobs/jobs-panel.d.ts +2 -5
- package/dist/tui-v2/components/jobs/jobs-panel.js +4 -6
- package/dist/tui-v2/components/jobs/jobs-panel.js.map +1 -1
- package/dist/tui-v2/components/modal/confirm-modal.js +1 -0
- package/dist/tui-v2/components/modal/confirm-modal.js.map +1 -1
- package/dist/tui-v2/components/status/status-line.d.ts +1 -3
- package/dist/tui-v2/components/status/status-line.js +2 -3
- package/dist/tui-v2/components/status/status-line.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/thinking-presentation.js +2 -6
- package/dist/tui-v2/components/transcript/thinking-presentation.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/tui-v2/components/transcript/transcript-scrollbar.d.ts +2 -4
- package/dist/tui-v2/components/transcript/transcript-scrollbar.js +2 -3
- package/dist/tui-v2/components/transcript/transcript-scrollbar.js.map +1 -1
- package/dist/tui-v2/composer/composer-editor.d.ts +1 -3
- package/dist/tui-v2/composer/composer-editor.js +2 -3
- package/dist/tui-v2/composer/composer-editor.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 +44 -3
- package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
- package/dist/ui-core/commands/mcp-commands.js +121 -41
- package/dist/ui-core/commands/mcp-commands.js.map +1 -1
- package/dist/ui-core/commands/picker-commands.js +1 -1
- package/dist/ui-core/commands/picker-commands.js.map +1 -1
- package/dist/ui-core/commands/pickers/custom-provider.js +25 -7
- package/dist/ui-core/commands/pickers/custom-provider.js.map +1 -1
- package/dist/ui-core/controllers/overlay-controller.d.ts +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/dist/version.generated.js.map +1 -1
- package/package.json +1 -14
- 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,6 +1,7 @@
|
|
|
1
1
|
import { bodyAddsInformation, collapseWhitespace, MAX_ERROR_BODY_IN_MESSAGE_CHARS, ProviderError, STREAM_STALL_MARKER, } from "../http.js";
|
|
2
2
|
import { markStreamEmittedBytes } from "../stream-progress.js";
|
|
3
|
-
import {
|
|
3
|
+
import { mentionsQuotaExhaustion, mentionsRateLimit, } from "../quota-signals.js";
|
|
4
|
+
import { isCacheOnlyColdError, markServerErrorAttempts, serverErrorAttemptsFor, } from "./error-classification.js";
|
|
4
5
|
function appendFullProviderBody(text, error) {
|
|
5
6
|
if (!(error instanceof ProviderError))
|
|
6
7
|
return text;
|
|
@@ -48,6 +49,12 @@ export function formatProviderFailureForUser(error) {
|
|
|
48
49
|
if (status >= 500 && status < 600) {
|
|
49
50
|
return withFullBody(withExactError(`Upstream provider error (${status}). Retry or switch with \`/provider\` / \`/model\`.`));
|
|
50
51
|
}
|
|
52
|
+
if (mentionsQuotaExhaustion(error)) {
|
|
53
|
+
return withFullBody(withExactError("Provider reports the quota/credits for this key are exhausted. Add another API key (clai set <provider> <key>), top up the account, or switch provider."));
|
|
54
|
+
}
|
|
55
|
+
if (mentionsRateLimit(error)) {
|
|
56
|
+
return withFullBody(withExactError("Model is rate limited (reported in the provider error body, without a 429 status). Try another API key, provider, or model."));
|
|
57
|
+
}
|
|
51
58
|
}
|
|
52
59
|
const message = (error instanceof Error ? error.message : String(error))
|
|
53
60
|
.replace(/\s+/g, " ")
|
|
@@ -71,6 +78,12 @@ export function formatProviderFailureForUser(error) {
|
|
|
71
78
|
if (/fetch failed|network error|etimedout|enotfound|econnrefused/i.test(message)) {
|
|
72
79
|
return `${message} — network/DNS failure reaching the provider. Check connectivity and provider base URL.`;
|
|
73
80
|
}
|
|
81
|
+
if (mentionsQuotaExhaustion(error)) {
|
|
82
|
+
return `${message} — the provider reports quota/credits exhausted for this key. Add another API key or switch provider.`;
|
|
83
|
+
}
|
|
84
|
+
if (mentionsRateLimit(error)) {
|
|
85
|
+
return `${message} — the provider reports rate limiting without a 429 status. Retry shortly, or switch API key/provider.`;
|
|
86
|
+
}
|
|
74
87
|
return message;
|
|
75
88
|
})();
|
|
76
89
|
return appendFullProviderBody(generic, error);
|
|
@@ -106,7 +119,9 @@ export function aggregateProviderError(message, failures, emittedBytes = 0) {
|
|
|
106
119
|
provider,
|
|
107
120
|
message: text,
|
|
108
121
|
})), actionable?.status, actionable?.retryAfterSeconds);
|
|
109
|
-
|
|
122
|
+
markStreamEmittedBytes(aggregate, emittedBytes);
|
|
123
|
+
const serverAttempts = failures.reduce((total, failure) => Math.max(total, serverErrorAttemptsFor(failure.error)), 0);
|
|
124
|
+
return markServerErrorAttempts(aggregate, serverAttempts);
|
|
110
125
|
}
|
|
111
126
|
function escapeTableCell(value) {
|
|
112
127
|
return value.replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure-report.js","sourceRoot":"","sources":["../../../src/llm/routing/failure-report.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,+BAA+B,EAC/B,aAAa,EACb,mBAAmB,GACpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"failure-report.js","sourceRoot":"","sources":["../../../src/llm/routing/failure-report.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare function runWithKeyRotation<T>(opts: {
|
|
|
16
16
|
onStatus?: ((message: string) => void) | undefined;
|
|
17
17
|
maxRetries?: number | undefined;
|
|
18
18
|
singleDispatch?: boolean | undefined;
|
|
19
|
+
retryRateLimits?: boolean | undefined;
|
|
19
20
|
onSuccessfulRequest?: ((snapshot: SuccessfulRequestSnapshot) => void) | undefined;
|
|
20
21
|
}): Promise<T>;
|
|
21
22
|
export {};
|
|
@@ -6,7 +6,7 @@ import { isOperationPolicyError } from "../operation-ledger.js";
|
|
|
6
6
|
import { maskSecretTail } from "../provider.js";
|
|
7
7
|
import { tryCompleteOnce } from "./attempt-complete.js";
|
|
8
8
|
import { tryStreamOnce } from "./attempt-stream.js";
|
|
9
|
-
import { isRateLimited, isRetriableError, isServerUnavailable, MAX_RETRIES, MAX_RETRY_WAIT_MS, networkRetryWaitMs, retryWaitMs, sleep, } from "./error-classification.js";
|
|
9
|
+
import { isRateLimited, isRetriableError, isServerErrorFailure, isServerUnavailable, markServerErrorAttempts, MAX_RETRIES, MAX_RETRY_WAIT_MS, networkRetryWaitMs, retryWaitMs, SERVER_ERROR_MAX_ATTEMPTS, sleep, } from "./error-classification.js";
|
|
10
10
|
import { authForSlot } from "./provider-selection.js";
|
|
11
11
|
function failureReason(error) {
|
|
12
12
|
if (isRateLimited(error))
|
|
@@ -58,6 +58,7 @@ export async function runWithKeyRotation(opts) {
|
|
|
58
58
|
? 1
|
|
59
59
|
: attemptsPerKey(enabledCount, (opts.maxRetries ?? MAX_RETRIES) + 1);
|
|
60
60
|
let lastError;
|
|
61
|
+
let serverAttempts = 0;
|
|
61
62
|
const storedEndpoints = providerUsesEndpoints(providerId) && !singleDispatch
|
|
62
63
|
? getProviderEndpoints(providerId)
|
|
63
64
|
: undefined;
|
|
@@ -123,6 +124,10 @@ export async function runWithKeyRotation(opts) {
|
|
|
123
124
|
catch (error) {
|
|
124
125
|
const previousError = lastError;
|
|
125
126
|
lastError = error;
|
|
127
|
+
if (isServerErrorFailure(error)) {
|
|
128
|
+
serverAttempts += 1;
|
|
129
|
+
markServerErrorAttempts(error, serverAttempts);
|
|
130
|
+
}
|
|
126
131
|
if (isOperationPolicyError(error) && previousError !== undefined) {
|
|
127
132
|
throw previousError;
|
|
128
133
|
}
|
|
@@ -150,7 +155,14 @@ export async function runWithKeyRotation(opts) {
|
|
|
150
155
|
if (!rotatable) {
|
|
151
156
|
throw error;
|
|
152
157
|
}
|
|
153
|
-
|
|
158
|
+
if (isRateLimited(error) && opts.retryRateLimits === false) {
|
|
159
|
+
if (multiKey)
|
|
160
|
+
break;
|
|
161
|
+
throw error;
|
|
162
|
+
}
|
|
163
|
+
const serverBudgetExhausted = isServerErrorFailure(error) &&
|
|
164
|
+
serverAttempts >= SERVER_ERROR_MAX_ATTEMPTS;
|
|
165
|
+
const canRetrySame = attempt + 1 < maxPerKey && !serverBudgetExhausted;
|
|
154
166
|
if (canRetrySame) {
|
|
155
167
|
const wait = isRateLimited(error) || isServerUnavailable(error)
|
|
156
168
|
? retryWaitMs(error, attempt)
|
|
@@ -175,6 +187,10 @@ export async function runWithKeyRotation(opts) {
|
|
|
175
187
|
break;
|
|
176
188
|
}
|
|
177
189
|
}
|
|
190
|
+
if (isServerErrorFailure(lastError) &&
|
|
191
|
+
serverAttempts >= SERVER_ERROR_MAX_ATTEMPTS) {
|
|
192
|
+
throw lastError;
|
|
193
|
+
}
|
|
178
194
|
if (planIdx >= 0 &&
|
|
179
195
|
endpointCount > 1 &&
|
|
180
196
|
planIdx + 1 < plan.length &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key-rotation.js","sourceRoot":"","sources":["../../../src/llm/routing/key-rotation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAO9E,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,KAAK,GACN,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,aAAa,CAAC,KAAK,CAAC;QAAE,OAAO,cAAc,CAAC;IAChD,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,MAAM,GACV,KAAK,YAAY,aAAa,IAAI,KAAK,CAAC,MAAM;YAC5C,CAAC,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG;YACtB,CAAC,CAAC,EAAE,CAAC;QACT,OAAO,uBAAuB,MAAM,EAAE,CAAC;IACzC,CAAC;IACD,IAAI,KAAK,YAAY,aAAa,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACnD,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACjD,OAAO,gBAAgB,KAAK,CAAC,MAAM,GAAG,CAAC;QACzC,CAAC;QACD,OAAO,iBAAiB,KAAK,CAAC,MAAM,GAAG,CAAC;IAC1C,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAID,MAAM,UAAU,cAAc,CAC5B,QAAoC,EACpC,UAAoC;IAEpC,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QACnC,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACzC,IACE,KAAK,CAAC,IAAI,KAAK,OAAO;YACtB,KAAK,CAAC,IAAI,KAAK,QAAQ;YACvB,KAAK,CAAC,IAAI,KAAK,WAAW,EAC1B,CAAC;YACD,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAI,
|
|
1
|
+
{"version":3,"file":"key-rotation.js","sourceRoot":"","sources":["../../../src/llm/routing/key-rotation.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { anthropicProvider } from "../anthropic.js";
|
|
|
5
5
|
import { mantleProvider } from "../aws-mantle.js";
|
|
6
6
|
import { bynaraProvider } from "../bynara.js";
|
|
7
7
|
import { getCustomProviderSync } from "../custom-providers.js";
|
|
8
|
+
import { explabsProvider } from "../explabs.js";
|
|
8
9
|
import { fireworksProvider } from "../fireworks.js";
|
|
9
10
|
import { freeProvider } from "../free.js";
|
|
10
11
|
import { geminiProvider } from "../gemini.js";
|
|
@@ -40,6 +41,7 @@ export const providers = {
|
|
|
40
41
|
hetzner: hetznerProvider,
|
|
41
42
|
orcarouter: orcarouterProvider,
|
|
42
43
|
"merge-gateway": mergeGatewayProvider,
|
|
44
|
+
explabs: explabsProvider,
|
|
43
45
|
};
|
|
44
46
|
const fallbackOrder = [
|
|
45
47
|
"free",
|
|
@@ -61,6 +63,7 @@ const fallbackOrder = [
|
|
|
61
63
|
"hetzner",
|
|
62
64
|
"orcarouter",
|
|
63
65
|
"merge-gateway",
|
|
66
|
+
"explabs",
|
|
64
67
|
];
|
|
65
68
|
function allFallbackIds() {
|
|
66
69
|
const custom = getCustomProviders().map((d) => d.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-selection.js","sourceRoot":"","sources":["../../../src/llm/routing/provider-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAClB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,CAAC,MAAM,SAAS,GAAoC;IACxD,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,cAAc;IACtB,UAAU,EAAE,kBAAkB;IAC9B,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,iBAAiB;IAC5B,MAAM,EAAE,cAAc;IACtB,WAAW,EAAE,mBAAmB;IAChC,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,YAAY,EAAE,iBAAiB;IAC/B,KAAK,EAAE,aAAa;IACpB,SAAS,EAAE,iBAAiB;IAC5B,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,iBAAiB;IAC5B,OAAO,EAAE,eAAe;IACxB,UAAU,EAAE,kBAAkB;IAC9B,eAAe,EAAE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"provider-selection.js","sourceRoot":"","sources":["../../../src/llm/routing/provider-selection.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,15 +84,32 @@ export function recordRequestTokenObservation(input) {
|
|
|
84
84
|
});
|
|
85
85
|
persistCalibrations();
|
|
86
86
|
}
|
|
87
|
-
|
|
88
|
-
loadCalibrations();
|
|
89
|
-
const entry = calibrations.get(calibrationKey(provider, model));
|
|
87
|
+
function trustedCalibration(entry) {
|
|
90
88
|
if (!entry)
|
|
91
89
|
return undefined;
|
|
92
90
|
if (entry.samples < MIN_TRUSTED_SAMPLES && entry.ratio >= 1)
|
|
93
91
|
return undefined;
|
|
94
92
|
return { ratio: entry.ratio, samples: entry.samples };
|
|
95
93
|
}
|
|
94
|
+
function aggregateCalibration(keyPrefix) {
|
|
95
|
+
let samples = 0;
|
|
96
|
+
let weighted = 0;
|
|
97
|
+
for (const [key, entry] of calibrations) {
|
|
98
|
+
if (keyPrefix !== undefined && !key.startsWith(keyPrefix))
|
|
99
|
+
continue;
|
|
100
|
+
samples += entry.samples;
|
|
101
|
+
weighted += entry.ratio * entry.samples;
|
|
102
|
+
}
|
|
103
|
+
if (samples === 0)
|
|
104
|
+
return undefined;
|
|
105
|
+
return { ratio: clampRatio(weighted / samples), samples };
|
|
106
|
+
}
|
|
107
|
+
export function requestTokenCalibration(provider, model) {
|
|
108
|
+
loadCalibrations();
|
|
109
|
+
return (trustedCalibration(calibrations.get(calibrationKey(provider, model))) ??
|
|
110
|
+
trustedCalibration(aggregateCalibration(`${provider ?? "unknown"}::`)) ??
|
|
111
|
+
trustedCalibration(aggregateCalibration(undefined)));
|
|
112
|
+
}
|
|
96
113
|
export function calibratedRequestTokens(provider, model, estimatedTokens) {
|
|
97
114
|
if (!Number.isFinite(estimatedTokens) || estimatedTokens <= 0)
|
|
98
115
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-estimate-calibration.js","sourceRoot":"","sources":["../../src/llm/token-estimate-calibration.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"token-estimate-calibration.js","sourceRoot":"","sources":["../../src/llm/token-estimate-calibration.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,7 @@ export declare function normalizeTokenUsage(input: {
|
|
|
47
47
|
reasoningObserved?: boolean | undefined;
|
|
48
48
|
}): TokenUsage | undefined;
|
|
49
49
|
export declare function withReasoningObservation(usage: TokenUsage | undefined, observed: boolean): TokenUsage | undefined;
|
|
50
|
+
export declare function effectivePromptTokens(usage: TokenUsage | undefined): number | undefined;
|
|
50
51
|
export declare function estimateUsageFromMessages(messages: readonly ChatMessage[]): TokenUsage;
|
|
51
52
|
import { UsageCounter } from "./usage/provider-parsers.js";
|
|
52
53
|
export { mergeAnthropicStreamUsage, parseAnthropicUsage, parseFireworksUsage, parseGeminiUsage, parseOllamaUsage, parseOpenAiUsage, } from "./usage/provider-parsers.js";
|
package/dist/llm/token-usage.js
CHANGED
|
@@ -68,6 +68,15 @@ export function withReasoningObservation(usage, observed) {
|
|
|
68
68
|
return usage;
|
|
69
69
|
return { ...usage, reasoningObserved: true };
|
|
70
70
|
}
|
|
71
|
+
export function effectivePromptTokens(usage) {
|
|
72
|
+
if (!usage || usage.promptTokensKnown === false)
|
|
73
|
+
return undefined;
|
|
74
|
+
const cached = usage.cachedPromptTokens ?? 0;
|
|
75
|
+
const created = usage.cacheCreationTokens ?? 0;
|
|
76
|
+
return cached + created > usage.promptTokens
|
|
77
|
+
? usage.promptTokens + cached + created
|
|
78
|
+
: usage.promptTokens;
|
|
79
|
+
}
|
|
71
80
|
export function estimateUsageFromMessages(messages) {
|
|
72
81
|
const promptTokens = estimateMessagesTokens(messages);
|
|
73
82
|
return {
|
|
@@ -113,9 +122,7 @@ export function applyUsageToSnapshot(prev, usage, contextLimit) {
|
|
|
113
122
|
(usage.exact && hasPromptMeasurement ? usage.promptTokens : 0);
|
|
114
123
|
const sessionCompletion = (prev?.sessionCompletionTokens ?? 0) +
|
|
115
124
|
(usage.exact ? usage.completionTokens : 0);
|
|
116
|
-
const contextTokens =
|
|
117
|
-
? usage.promptTokens
|
|
118
|
-
: (prev?.contextTokens ?? usage.totalTokens);
|
|
125
|
+
const contextTokens = effectivePromptTokens(usage) ?? prev?.contextTokens ?? usage.totalTokens;
|
|
119
126
|
return {
|
|
120
127
|
contextTokens,
|
|
121
128
|
contextLimit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../src/llm/token-usage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../src/llm/token-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,14 @@
|
|
|
1
1
|
import { type LlmProvider } from "./provider.js";
|
|
2
2
|
export declare const TOKENROUTER_DEFAULT_BASE_URL = "https://api.tokenrouter.com/v1";
|
|
3
|
+
interface TokenrouterCatalogEntry {
|
|
4
|
+
readonly id?: string | undefined;
|
|
5
|
+
readonly supported_endpoint_types?: unknown;
|
|
6
|
+
readonly tags?: unknown;
|
|
7
|
+
}
|
|
8
|
+
export declare function chatCapableCatalog(data: {
|
|
9
|
+
data?: TokenrouterCatalogEntry[] | undefined;
|
|
10
|
+
}): {
|
|
11
|
+
data: TokenrouterCatalogEntry[];
|
|
12
|
+
};
|
|
3
13
|
export declare const tokenrouterProvider: LlmProvider;
|
|
14
|
+
export {};
|
package/dist/llm/tokenrouter.js
CHANGED
|
@@ -8,6 +8,32 @@ function resolveBaseUrl(auth) {
|
|
|
8
8
|
}
|
|
9
9
|
const modelCache = new Map();
|
|
10
10
|
const CACHE_TTL_MS = 60 * 60 * 1000;
|
|
11
|
+
const CHAT_ENDPOINT_TYPES = new Set([
|
|
12
|
+
"openai",
|
|
13
|
+
"openai-response",
|
|
14
|
+
"anthropic",
|
|
15
|
+
"anthropic-compatible",
|
|
16
|
+
"gemini",
|
|
17
|
+
]);
|
|
18
|
+
const NON_CHAT_MODEL_ID = /embedding|(?:^|[-/])embed(?:[-/]|$)|(?:^|[-/])image|image(?:[-/]|$)|(?:^|[-/])tts(?:[-/]|$)|whisper/i;
|
|
19
|
+
function servesChatCompletions(entry) {
|
|
20
|
+
const id = typeof entry.id === "string" ? entry.id : "";
|
|
21
|
+
if (!id.trim() || NON_CHAT_MODEL_ID.test(id))
|
|
22
|
+
return false;
|
|
23
|
+
const endpoints = Array.isArray(entry.supported_endpoint_types)
|
|
24
|
+
? entry.supported_endpoint_types.filter((value) => typeof value === "string")
|
|
25
|
+
: [];
|
|
26
|
+
if (endpoints.length > 0) {
|
|
27
|
+
return endpoints.some((endpoint) => CHAT_ENDPOINT_TYPES.has(endpoint));
|
|
28
|
+
}
|
|
29
|
+
const tags = typeof entry.tags === "string" ? entry.tags : "";
|
|
30
|
+
return !tags.trim() || /text/i.test(tags);
|
|
31
|
+
}
|
|
32
|
+
export function chatCapableCatalog(data) {
|
|
33
|
+
const entries = Array.isArray(data.data) ? data.data : [];
|
|
34
|
+
const chat = entries.filter(servesChatCompletions);
|
|
35
|
+
return { data: chat.length > 0 ? chat : entries };
|
|
36
|
+
}
|
|
11
37
|
export const tokenrouterProvider = {
|
|
12
38
|
id: "tokenrouter",
|
|
13
39
|
reasoningStyle: "openai",
|
|
@@ -29,7 +55,7 @@ export const tokenrouterProvider = {
|
|
|
29
55
|
headers["authorization"] = `Bearer ${auth.apiKey}`;
|
|
30
56
|
const response = await fetch(`${baseUrl}/models`, { headers });
|
|
31
57
|
const data = await readJson(response);
|
|
32
|
-
const models = ingestOpenAiModelCatalog("tokenrouter", data);
|
|
58
|
+
const models = ingestOpenAiModelCatalog("tokenrouter", chatCapableCatalog(data));
|
|
33
59
|
if (models.length > 0) {
|
|
34
60
|
modelCache.set(cacheKey, { models, fetchedAt: now });
|
|
35
61
|
return models;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenrouter.js","sourceRoot":"","sources":["../../src/llm/tokenrouter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,GAGrB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,sBAAsB,EACtB,kBAAkB,EAClB,QAAQ,EACR,wBAAwB,GACzB,MAAM,WAAW,CAAC;AAEnB,MAAM,CAAC,MAAM,4BAA4B,GAAG,gCAAgC,CAAC;AAE7E,SAAS,cAAc,CAAC,IAAkB;IACxC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAC1D,OAAO,QAAQ,IAAI,4BAA4B,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAmD,CAAC;AAC9E,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEpC,MAAM,CAAC,MAAM,mBAAmB,GAAgB;IAC9C,EAAE,EAAE,aAAa;IACjB,cAAc,EAAE,QAAQ;IACxB,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,aAAa,CAAC,WAAW;IACvC,MAAM,EAAE,qBAAqB;IAC7B,WAAW,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;IAC9D,KAAK,CAAC,UAAU,CAAC,IAAkB;QACjC,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,GAAG,OAAO,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;YACpD,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAA2B,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,MAAM;gBAAE,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;YACpE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/D,MAAM,IAAI,GAAG,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"tokenrouter.js","sourceRoot":"","sources":["../../src/llm/tokenrouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,7 +79,10 @@ function emitChatCompletionsBody(options) {
|
|
|
79
79
|
const affinitySession = currentSessionAffinity();
|
|
80
80
|
const affinityKey = options.providerId === "openrouter" ||
|
|
81
81
|
options.providerId === "fireworks" ||
|
|
82
|
-
options.providerId === "merge-gateway"
|
|
82
|
+
options.providerId === "merge-gateway" ||
|
|
83
|
+
options.providerId === "tokenrouter" ||
|
|
84
|
+
options.providerId === "openai" ||
|
|
85
|
+
options.providerId === "explabs"
|
|
83
86
|
? affinitySession
|
|
84
87
|
? sessionCacheAffinityKey(affinitySession)
|
|
85
88
|
: cacheAffinityKey(options.providerId, options.model, options.messages)
|
|
@@ -99,6 +102,12 @@ function emitChatCompletionsBody(options) {
|
|
|
99
102
|
affinityKey
|
|
100
103
|
? { session_id: affinityKey }
|
|
101
104
|
: {}),
|
|
105
|
+
...((options.providerId === "openai" ||
|
|
106
|
+
options.providerId === "tokenrouter" ||
|
|
107
|
+
options.providerId === "explabs") &&
|
|
108
|
+
affinityKey
|
|
109
|
+
? { prompt_cache_key: affinityKey }
|
|
110
|
+
: {}),
|
|
102
111
|
...(options.providerId === "fireworks"
|
|
103
112
|
? {
|
|
104
113
|
perf_metrics_in_response: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-body.js","sourceRoot":"","sources":["../../../src/llm/wire/chat-body.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"chat-body.js","sourceRoot":"","sources":["../../../src/llm/wire/chat-body.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export declare function parseResetSeconds(value: unknown): number | undefined;
|
|
1
2
|
export declare function readJson<T>(response: Response, signal?: AbortSignal): Promise<T>;
|
|
2
3
|
export declare const MAX_ERROR_BODY_CHARS = 8000;
|
|
3
4
|
export declare const MAX_ERROR_BODY_IN_MESSAGE_CHARS = 2000;
|
|
@@ -23,6 +23,69 @@ function parseRetryHintFromBody(text) {
|
|
|
23
23
|
}
|
|
24
24
|
return undefined;
|
|
25
25
|
}
|
|
26
|
+
const RESET_METADATA_KEYS = [
|
|
27
|
+
"x-ratelimit-reset",
|
|
28
|
+
"ratelimit-reset",
|
|
29
|
+
];
|
|
30
|
+
export function parseResetSeconds(value) {
|
|
31
|
+
if (typeof value === "number") {
|
|
32
|
+
if (!Number.isFinite(value) || value < 0)
|
|
33
|
+
return undefined;
|
|
34
|
+
if (value >= 1e12)
|
|
35
|
+
return Math.max(0, value / 1000 - Date.now() / 1000);
|
|
36
|
+
if (value >= 1e9)
|
|
37
|
+
return Math.max(0, value - Date.now() / 1000);
|
|
38
|
+
return value;
|
|
39
|
+
}
|
|
40
|
+
if (typeof value !== "string")
|
|
41
|
+
return undefined;
|
|
42
|
+
const trimmed = value.trim();
|
|
43
|
+
if (!trimmed)
|
|
44
|
+
return undefined;
|
|
45
|
+
const numeric = Number(trimmed);
|
|
46
|
+
if (Number.isFinite(numeric))
|
|
47
|
+
return parseResetSeconds(numeric);
|
|
48
|
+
const date = Date.parse(trimmed);
|
|
49
|
+
return Number.isFinite(date)
|
|
50
|
+
? Math.max(0, (date - Date.now()) / 1000)
|
|
51
|
+
: undefined;
|
|
52
|
+
}
|
|
53
|
+
function resetSecondsFromHeaders(headers) {
|
|
54
|
+
for (const key of RESET_METADATA_KEYS) {
|
|
55
|
+
const parsed = parseResetSeconds(headers.get(key));
|
|
56
|
+
if (parsed !== undefined)
|
|
57
|
+
return parsed;
|
|
58
|
+
}
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
function lookupResetSeconds(record) {
|
|
62
|
+
for (const [name, value] of Object.entries(record)) {
|
|
63
|
+
const lowered = name.toLowerCase().replace(/[._\s]+/g, "-");
|
|
64
|
+
if (!RESET_METADATA_KEYS.includes(lowered))
|
|
65
|
+
continue;
|
|
66
|
+
const parsed = parseResetSeconds(value);
|
|
67
|
+
if (parsed !== undefined)
|
|
68
|
+
return parsed;
|
|
69
|
+
}
|
|
70
|
+
const headers = record.headers;
|
|
71
|
+
return headers && typeof headers === "object"
|
|
72
|
+
? lookupResetSeconds(headers)
|
|
73
|
+
: undefined;
|
|
74
|
+
}
|
|
75
|
+
function resetSecondsFromBody(payload) {
|
|
76
|
+
if (!payload || typeof payload !== "object")
|
|
77
|
+
return undefined;
|
|
78
|
+
const container = payload;
|
|
79
|
+
const error = container.error;
|
|
80
|
+
if (error && typeof error === "object") {
|
|
81
|
+
const errorRecord = error;
|
|
82
|
+
const fromMetadata = resetSecondsFromBody(errorRecord.metadata);
|
|
83
|
+
const fromError = fromMetadata ?? lookupResetSeconds(errorRecord);
|
|
84
|
+
if (fromError !== undefined)
|
|
85
|
+
return fromError;
|
|
86
|
+
}
|
|
87
|
+
return lookupResetSeconds(container);
|
|
88
|
+
}
|
|
26
89
|
function statusCodeHint(status) {
|
|
27
90
|
if (status === 401) {
|
|
28
91
|
return " — check that the API key is valid (run `clai providers` to inspect)";
|
|
@@ -49,8 +112,10 @@ export async function readJson(response, signal) {
|
|
|
49
112
|
if (!response.ok) {
|
|
50
113
|
let detail = "";
|
|
51
114
|
let extractedMessage = "";
|
|
115
|
+
let parsedBody;
|
|
52
116
|
try {
|
|
53
117
|
const body = JSON.parse(text);
|
|
118
|
+
parsedBody = body;
|
|
54
119
|
const error = body.error;
|
|
55
120
|
let msg = "";
|
|
56
121
|
if (typeof error === "string") {
|
|
@@ -90,6 +155,8 @@ export async function readJson(response, signal) {
|
|
|
90
155
|
detail = `${detail} — full response: ${capped}`;
|
|
91
156
|
}
|
|
92
157
|
const retryAfterSeconds = parseRetryAfterHeader(response.headers.get("retry-after")) ??
|
|
158
|
+
resetSecondsFromHeaders(response.headers) ??
|
|
159
|
+
resetSecondsFromBody(parsedBody) ??
|
|
93
160
|
parseRetryHintFromBody(text);
|
|
94
161
|
const retryHint = retryAfterSeconds !== undefined
|
|
95
162
|
? ` (retry after ${Math.ceil(retryAfterSeconds)}s)`
|