mixdog 1.4.2 → 1.4.4
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/package.json +2 -2
- package/scripts/build-shipped-history.mjs +15 -5
- package/scripts/gate-local.mjs +65 -19
- package/scripts/graph-parity.mjs +8 -3
- package/scripts/lib/gate-scheduler.mjs +2 -1
- package/scripts/lib/run-node-tests.mjs +17 -5
- package/scripts/lib/test-failure-summary.mjs +1 -8
- package/scripts/lib/test-spawn-ledger.mjs +33 -2
- package/scripts/post-release-check.mjs +26 -16
- package/scripts/provider-pingpong-live.mjs +1 -1
- package/scripts/prune-embedding-runtime.mjs +3 -1
- package/scripts/release-paths.mjs +7 -1
- package/src/defaults/shipped-history.json +24 -0
- package/src/defaults/skills/computer-use/SKILL.md +14 -3
- package/src/defaults/skills/memory-management/SKILL.md +10 -5
- package/src/defaults/skills/setup/SKILL.md +2 -2
- package/src/defaults/skills/setup/references/actions.md +17 -4
- package/src/defaults/skills/setup/references/surfaces.md +3 -0
- package/src/defaults/skills/setup-guide/SKILL.md +6 -1
- package/src/lib/instruction-text.cjs +36 -0
- package/src/lib/rules-builder.cjs +34 -20
- package/src/orchestration/balanced.md +23 -0
- package/src/orchestration/focused.md +22 -0
- package/src/orchestration/none.md +5 -0
- package/src/orchestration/swarm.md +24 -0
- package/src/rules/agent-mode/AGENT_MODE.md +3 -1
- package/src/rules/agent-mode/MIXY.md +5 -3
- package/src/runtime/agent/orchestrator/agent-runtime/agent-dispatch/session-prep.mjs +3 -3
- package/src/runtime/agent/orchestrator/agent-runtime/agent-dispatch.mjs +0 -1
- package/src/runtime/agent/orchestrator/agent-runtime/agent-progress-watchdog.mjs +4 -2
- package/src/runtime/agent/orchestrator/agent-runtime/cache-strategy.mjs +0 -9
- package/src/runtime/agent/orchestrator/agent-runtime/heartbeat-completion.mjs +2 -2
- package/src/runtime/agent/orchestrator/agent-runtime/session-builder.mjs +67 -0
- package/src/runtime/agent/orchestrator/agent-trace-format.mjs +1 -0
- package/src/runtime/agent/orchestrator/context/role-instructions.mjs +4 -4
- package/src/runtime/agent/orchestrator/mcp/agent-connectors.mjs +3 -1
- package/src/runtime/agent/orchestrator/mcp/child-tree.mjs +199 -46
- package/src/runtime/agent/orchestrator/mcp/client-config.mjs +3 -5
- package/src/runtime/agent/orchestrator/mcp/client-transport.mjs +9 -3
- package/src/runtime/agent/orchestrator/mcp/client.mjs +3 -5
- package/src/runtime/agent/orchestrator/mcp/oauth-client.mjs +1 -1
- package/src/runtime/agent/orchestrator/mcp/oauth-credentials.mjs +8 -2
- package/src/runtime/agent/orchestrator/mcp/oauth-probe.mjs +1 -1
- package/src/runtime/agent/orchestrator/mcp/oauth-provider.mjs +14 -0
- package/src/runtime/agent/orchestrator/mcp/oauth.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/admission-scheduler.mjs +2 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-api-request.mjs +11 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-oauth-client-version.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-start.mjs +4 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-events/content-block-stop.mjs +3 -3
- package/src/runtime/agent/orchestrator/providers/anthropic-sse-turn/turn-outcome.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic-turn-result.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/anthropic.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/codex-client-meta.mjs +1 -1
- package/src/runtime/agent/orchestrator/providers/custom-provider-config.mjs +121 -9
- package/src/runtime/agent/orchestrator/providers/custom-provider.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/gemini-thinking.mjs +2 -2
- package/src/runtime/agent/orchestrator/providers/lib/generation-window.mjs +9 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-send.mjs +9 -1
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-result.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-chat-stream/stream-state.mjs +5 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-options.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/openai-compat-response-normalization.mjs +6 -6
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses-head-parity.json +2784 -2872
- package/src/runtime/agent/orchestrator/providers/openai-compat-responses.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/openai-compat-xai.mjs +5 -8
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-events.mjs +3 -0
- package/src/runtime/agent/orchestrator/providers/openai-http-sse-response-state/response-outcome.mjs +2 -0
- package/src/runtime/agent/orchestrator/providers/openai-responses-payload-parity.fixture.json +288 -300
- package/src/runtime/agent/orchestrator/providers/openai-ws-response-state.mjs +9 -2
- package/src/runtime/agent/orchestrator/providers/openrouter-provider-routing.mjs +28 -0
- package/src/runtime/agent/orchestrator/providers/openrouter.mjs +4 -1
- package/src/runtime/agent/orchestrator/providers/registry.mjs +30 -25
- package/src/runtime/agent/orchestrator/providers/vertex-ai.mjs +10 -1
- package/src/runtime/agent/orchestrator/providers/xai-tool-search-head-parity.json +10 -30
- package/src/runtime/agent/orchestrator/runtime-core/ask-user-result.mjs +66 -0
- package/src/runtime/agent/orchestrator/runtime-core/builtin-features.mjs +30 -0
- package/src/runtime/agent/orchestrator/runtime-core/config-helpers.mjs +0 -11
- package/src/runtime/agent/orchestrator/runtime-core/deferred-tool-availability.mjs +8 -0
- package/src/runtime/agent/orchestrator/runtime-core/deferred-tool-delta.mjs +17 -3
- package/src/runtime/agent/orchestrator/runtime-core/goal-control.mjs +47 -27
- package/src/runtime/agent/orchestrator/runtime-core/goal-deadlines.mjs +141 -10
- package/src/runtime/agent/orchestrator/runtime-core/goal-mutations.mjs +26 -63
- package/src/runtime/agent/orchestrator/runtime-core/goal-reminder.mjs +28 -3
- package/src/runtime/agent/orchestrator/runtime-core/goal-runtime.mjs +36 -11
- package/src/runtime/agent/orchestrator/runtime-core/goal-state.mjs +88 -56
- package/src/runtime/agent/orchestrator/runtime-core/goal-storage.mjs +4 -1
- package/src/runtime/agent/orchestrator/runtime-core/goal-store.mjs +51 -32
- package/src/runtime/agent/orchestrator/runtime-core/goal-text.mjs +45 -145
- package/src/runtime/agent/orchestrator/runtime-core/goal-tool-defs.mjs +15 -98
- package/src/runtime/agent/orchestrator/runtime-core/goal-tool-exec.mjs +32 -99
- package/src/runtime/agent/orchestrator/runtime-core/goal-turns.mjs +23 -78
- package/src/runtime/agent/orchestrator/runtime-core/orchestration.mjs +69 -48
- package/src/runtime/agent/orchestrator/runtime-core/todo-list.mjs +367 -0
- package/src/runtime/agent/orchestrator/runtime-core/todo-tool-defs.mjs +47 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-availability.mjs +155 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog-data.mjs +9 -0
- package/src/runtime/agent/orchestrator/runtime-core/tool-catalog.mjs +119 -35
- package/src/runtime/agent/orchestrator/runtime-core/tool-defs.mjs +1 -1
- package/src/runtime/agent/orchestrator/runtime-core/workflow/context.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/agent-loop.mjs +28 -22
- package/src/runtime/agent/orchestrator/session/agent-pool-progress.mjs +30 -0
- package/src/runtime/agent/orchestrator/session/attachment-preflight.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/cache-warm.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/catalog-db/index.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/catalog-db/schema.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/compact/execution-tail.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/compact/runner.mjs +3 -0
- package/src/runtime/agent/orchestrator/session/compact/summary-route.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/context-utils.mjs +8 -12
- package/src/runtime/agent/orchestrator/session/conversation-import/claude.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/conversation-import/codex.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/conversation-import/convert.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/conversation-import/imported-session.mjs +7 -3
- package/src/runtime/agent/orchestrator/session/human-gate/held-message.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/human-gate/requests.mjs +1 -2
- package/src/runtime/agent/orchestrator/session/human-gate/run-policy.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/image-strip-recovery.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/completion-guards.mjs +11 -1
- package/src/runtime/agent/orchestrator/session/loop/context-overflow.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/loop-state.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/loop/no-tool-turn/todo-check.mjs +196 -0
- package/src/runtime/agent/orchestrator/session/loop/no-tool-turn.mjs +116 -50
- package/src/runtime/agent/orchestrator/session/loop/pre-dispatch-deny.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/loop/provider-tool-exclusions.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/route-fallback.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/loop/steering.mjs +3 -1
- package/src/runtime/agent/orchestrator/session/loop/stored-tool-args.mjs +5 -6
- package/src/runtime/agent/orchestrator/session/loop/tool-exec/before-hook.mjs +6 -1
- package/src/runtime/agent/orchestrator/session/loop/tool-exec/dispatch.mjs +16 -2
- package/src/runtime/agent/orchestrator/session/loop/turn-report.mjs +35 -0
- package/src/runtime/agent/orchestrator/session/loop/usage.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/ask-session.mjs +57 -26
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-auto-effort.mjs +9 -7
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-execute.mjs +21 -3
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-failure.mjs +27 -11
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-open.mjs +37 -34
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-prepare.mjs +15 -0
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-settle.mjs +25 -15
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-state.mjs +79 -24
- package/src/runtime/agent/orchestrator/session/manager/ask-turn-steering-drain.mjs +3 -0
- package/src/runtime/agent/orchestrator/session/manager/compaction-runner.mjs +12 -1
- package/src/runtime/agent/orchestrator/session/manager/context-meta.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/idle-cleanup.mjs +6 -1
- package/src/runtime/agent/orchestrator/session/manager/pending-messages.mjs +9 -1
- package/src/runtime/agent/orchestrator/session/manager/pending-spool-path.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/manager/pending-spool-shard.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/prompt-settings.mjs +598 -0
- package/src/runtime/agent/orchestrator/session/manager/prompt-utils.mjs +19 -0
- package/src/runtime/agent/orchestrator/session/manager/rules-cache.mjs +19 -10
- package/src/runtime/agent/orchestrator/session/manager/runtime-liveness.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/manager/session-close.mjs +5 -0
- package/src/runtime/agent/orchestrator/session/manager/session-fallback-title.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/session-lifecycle.mjs +31 -0
- package/src/runtime/agent/orchestrator/session/manager/session-lock.mjs +31 -0
- package/src/runtime/agent/orchestrator/session/manager/session-prompt-composition.mjs +42 -6
- package/src/runtime/agent/orchestrator/session/manager/session-record.mjs +2 -0
- package/src/runtime/agent/orchestrator/session/manager/tool-resolution.mjs +11 -1
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint-context.mjs +8 -9
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint-journal.mjs +339 -88
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint-recovery.mjs +135 -11
- package/src/runtime/agent/orchestrator/session/manager/turn-checkpoint.mjs +377 -104
- package/src/runtime/agent/orchestrator/session/manager/turn-durability.mjs +144 -0
- package/src/runtime/agent/orchestrator/session/manager/turn-interruption.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/manager/usage-metrics.mjs +4 -0
- package/src/runtime/agent/orchestrator/session/manager.mjs +6 -0
- package/src/runtime/agent/orchestrator/session/mixy-name.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/pre-send-compact.mjs +8 -1
- package/src/runtime/agent/orchestrator/session/save-session-worker.mjs +5 -1
- package/src/runtime/agent/orchestrator/session/store/canonical-reader.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/store/liveness-veto.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/store/save-worker.mjs +23 -2
- package/src/runtime/agent/orchestrator/session/store/sweep/sub-agent-retention.mjs +3 -3
- package/src/runtime/agent/orchestrator/session/store/transcript-durability.mjs +88 -0
- package/src/runtime/agent/orchestrator/session/store-agent-worker-rows.mjs +5 -0
- package/src/runtime/agent/orchestrator/session/store-summary-log.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/store-transcript-projection.mjs +14 -5
- package/src/runtime/agent/orchestrator/session/store-transcript-worker.mjs +2 -2
- package/src/runtime/agent/orchestrator/session/store.mjs +17 -6
- package/src/runtime/agent/orchestrator/session/synthetic-user-envelope.mjs +7 -1
- package/src/runtime/agent/orchestrator/session/tail-reminder-rules.mjs +9 -1
- package/src/runtime/agent/orchestrator/session/transcript-restore/agent-envelope.mjs +1 -1
- package/src/runtime/agent/orchestrator/session/transcript-restore/restore.mjs +3 -1
- package/src/runtime/agent/orchestrator/session/transcript-restore/user-text.mjs +2 -2
- package/src/runtime/agent/orchestrator/stall-policy.mjs +3 -5
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/backgrounded-result.mjs +4 -1
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/misuse-guard.mjs +21 -3
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/result-format.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool/worktree-add-guard.mjs +77 -0
- package/src/runtime/agent/orchestrator/tools/builtin/bash-tool.mjs +0 -1
- package/src/runtime/agent/orchestrator/tools/builtin/git-command-tool.mjs +7 -3
- package/src/runtime/agent/orchestrator/tools/builtin/git-worktree-tool.mjs +27 -9
- package/src/runtime/agent/orchestrator/tools/builtin/lib/search-input-helpers.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-output-silence.mjs +64 -0
- package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-task-output.mjs +20 -6
- package/src/runtime/agent/orchestrator/tools/builtin/read-range-index.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/builtin/read-single-fast-paths.mjs +0 -1
- package/src/runtime/agent/orchestrator/tools/builtin/search-tool.mjs +0 -10
- package/src/runtime/agent/orchestrator/tools/builtin/shell-jobs.mjs +1 -2
- package/src/runtime/agent/orchestrator/tools/builtin/task-tool.mjs +12 -1
- package/src/runtime/agent/orchestrator/tools/builtin.mjs +1 -24
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary/child-kill.mjs +4 -3
- package/src/runtime/agent/orchestrator/tools/code-graph/graph-binary.mjs +1 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/calls.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/code-graph/modes/symbols.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/code-graph/search.mjs +4 -5
- package/src/runtime/agent/orchestrator/tools/code-graph/symbol-index.mjs +3 -4
- package/src/runtime/agent/orchestrator/tools/code-graph.mjs +4 -22
- package/src/runtime/agent/orchestrator/tools/lib/shell-descendants.mjs +2 -2
- package/src/runtime/agent/orchestrator/tools/lib/shell-run-state.mjs +1 -1
- package/src/runtime/agent/orchestrator/tools/shell-command.mjs +0 -4
- package/src/runtime/agent/orchestrator/tools/shell-policy.mjs +0 -1
- package/src/runtime/attachments/attachment-reference.mjs +1 -1
- package/src/runtime/attachments/pdf-extract.mjs +1 -1
- package/src/runtime/attachments/store.d.mts +1 -0
- package/src/runtime/attachments/store.mjs +2 -2
- package/src/runtime/channels/lib/config-reload-watch.mjs +42 -0
- package/src/runtime/channels/lib/owned-runtime/config-reload.mjs +29 -9
- package/src/runtime/channels/lib/routines-db.mjs +35 -0
- package/src/runtime/channels/lib/scheduler.mjs +33 -0
- package/src/runtime/channels/lib/schedules-db.mjs +15 -4
- package/src/runtime/channels/lib/webhook/session-dispatch.mjs +4 -1
- package/src/runtime/channels/lib/webhooks-db.mjs +13 -3
- package/src/runtime/channels/lib/whisper-server.mjs +12 -12
- package/src/runtime/channels/lib/worker-main.mjs +9 -31
- package/src/runtime/computer-bridge/action-schema.mjs +2 -2
- package/src/runtime/computer-bridge/core-actions.mjs +16 -2
- package/src/runtime/computer-bridge/linux-readiness.mjs +10 -14
- package/src/runtime/computer-bridge/result-canonical.mjs +6 -0
- package/src/runtime/connectors/connector-accounts-mcp.mjs +169 -33
- package/src/runtime/connectors/gmail-app-password.mjs +2 -2
- package/src/runtime/connectors/google-mcp.mjs +1 -1
- package/src/runtime/effort-judge/judge-client.mjs +2 -2
- package/src/runtime/effort-judge/judge-input.mjs +4 -4
- package/src/runtime/explore/explorer.mjs +0 -5
- package/src/runtime/explore/tool.mjs +3 -3
- package/src/runtime/local-provider/hardware.mjs +1 -1
- package/src/runtime/media/adapters/codex-image.mjs +3 -3
- package/src/runtime/media/adapters/gemini-video.mjs +1 -1
- package/src/runtime/media/media-usage.mjs +1 -1
- package/src/runtime/media/store.mjs +1 -1
- package/src/runtime/memory/index.mjs +11 -1
- package/src/runtime/memory/lib/embedding-reindex.mjs +27 -0
- package/src/runtime/memory/lib/memory-embed.mjs +83 -14
- package/src/runtime/memory/lib/memory-process-lock.mjs +159 -36
- package/src/runtime/memory/lib/memory-text-utils.mjs +6 -1
- package/src/runtime/memory/lib/memory.mjs +17 -0
- package/src/runtime/memory/lib/pg/process.mjs +1 -1
- package/src/runtime/memory/lib/pg/supervisor.mjs +16 -96
- package/src/runtime/memory/lib/recall-hybrid/hybrid-sql.mjs +12 -3
- package/src/runtime/memory/tool-defs.mjs +1 -1
- package/src/runtime/office/authoring/docx-html-runner.mjs +1 -1
- package/src/runtime/office/authoring/pptx-author-action.mjs +1 -1
- package/src/runtime/office/authoring/xlsx-html-build.mjs +1 -1
- package/src/runtime/office/authoring/xlsx-html-runner.mjs +1 -1
- package/src/runtime/office/capabilities.mjs +1 -1
- package/src/runtime/office/core/office-core.mjs +1 -1
- package/src/runtime/office/design/content-model.mjs +3 -3
- package/src/runtime/office/design/docx/design-docx/section.mjs +6 -6
- package/src/runtime/office/design/xlsx/design-xlsx-components.mjs +1 -1
- package/src/runtime/office/design/xlsx/design-xlsx.mjs +1 -1
- package/src/runtime/office/pdf/ocr-engine.mjs +1 -1
- package/src/runtime/office/pdf/pdf-writer.mjs +4 -4
- package/src/runtime/office/portable/portable-docx-operations.mjs +2 -2
- package/src/runtime/office/portable/portable-soffice.mjs +8 -6
- package/src/runtime/office/portable/xlsx-contract.mjs +1 -1
- package/src/runtime/shared/atomic-file.d.mts +8 -0
- package/src/runtime/shared/background-tasks.mjs +22 -4
- package/src/runtime/shared/background-wait.mjs +66 -0
- package/src/runtime/shared/child-guardian.mjs +17 -7
- package/src/runtime/shared/config.mjs +313 -16
- package/src/runtime/shared/connector-catalog.d.mts +4 -5
- package/src/runtime/shared/connector-catalog.mjs +11 -1
- package/src/runtime/shared/file-lock.mjs +8 -3
- package/src/runtime/shared/git-runner.mjs +7 -2
- package/src/runtime/shared/idle-gc.mjs +30 -7
- package/src/runtime/shared/llm/http-agent.mjs +8 -5
- package/src/runtime/shared/llm/system-proxy.mjs +2 -1
- package/src/runtime/shared/llm/usage-accounting.mjs +110 -19
- package/src/runtime/shared/llm/usage-context.mjs +1 -1
- package/src/runtime/shared/llm/usage-ledger-quota.mjs +33 -12
- package/src/runtime/shared/llm/usage-ledger-requests.mjs +183 -0
- package/src/runtime/shared/llm/usage-ledger-rollup.mjs +90 -10
- package/src/runtime/shared/llm/usage-ledger-worker.mjs +2 -0
- package/src/runtime/shared/llm/usage-ledger.mjs +60 -1
- package/src/runtime/shared/llm/usage-request-status.mjs +48 -0
- package/src/runtime/shared/llm/usage-rollup.mjs +48 -0
- package/src/runtime/shared/maintenance-schedule.mjs +109 -0
- package/src/runtime/shared/process-runner.mjs +8 -4
- package/src/runtime/shared/routine-trigger.d.mts +13 -0
- package/src/runtime/shared/routine-trigger.mjs +34 -0
- package/src/runtime/shared/run-child.d.mts +2 -1
- package/src/runtime/shared/run-child.mjs +70 -18
- package/src/runtime/shared/session-scratch.mjs +14 -2
- package/src/runtime/shared/shipped-definitions.mjs +7 -1
- package/src/runtime/shared/tool-card-model.golden.json +3 -12
- package/src/runtime/shared/tool-execution-contract.mjs +2 -0
- package/src/runtime/shared/tool-result-summary.mjs +1 -1
- package/src/runtime/shared/tool-work-units.mjs +31 -6
- package/src/runtime/shared/turn-snapshot.mjs +26 -4
- package/src/runtime/shared/turn-worktree-snapshot.mjs +6 -11
- package/src/runtime/shared/worker-requests.mjs +17 -3
- package/src/runtime/shared/worktrees/branch-management.mjs +1 -5
- package/src/runtime/shared/worktrees/contract.mjs +16 -6
- package/src/runtime/shared/worktrees/dependencies.mjs +127 -89
- package/src/runtime/shared/worktrees/disk.mjs +79 -2
- package/src/runtime/shared/worktrees/git.mjs +44 -11
- package/src/runtime/shared/worktrees/include.mjs +6 -4
- package/src/runtime/shared/worktrees/maintenance.mjs +422 -30
- package/src/runtime/shared/worktrees/manager.mjs +772 -75
- package/src/runtime/shared/worktrees/settings.mjs +33 -7
- package/src/runtime/shared/worktrees/test-support.mjs +5 -1
- package/src/runtime/shared/worktrees/worker-snapshots.mjs +82 -0
- package/src/runtime/tidy/process.mjs +2 -1
- package/src/runtime/web-search/index.mjs +3 -22
- package/src/runtime/web-search/lib/web-tools.mjs +2 -2
- package/src/runtime/web-search/tool-defs.mjs +17 -26
- package/src/session-runtime/agent-home-delivery.mjs +76 -8
- package/src/session-runtime/agent-profile-changes.mjs +55 -4
- package/src/session-runtime/agent-task-sessions.mjs +63 -22
- package/src/session-runtime/boot/apis.mjs +42 -4
- package/src/session-runtime/boot/begin.mjs +2 -0
- package/src/session-runtime/boot/config.mjs +10 -1
- package/src/session-runtime/boot/facade.mjs +1 -0
- package/src/session-runtime/boot/providers.mjs +70 -3
- package/src/session-runtime/boot/session.mjs +2 -0
- package/src/session-runtime/boot/tools.mjs +75 -25
- package/src/session-runtime/channel-config-api.mjs +1 -0
- package/src/session-runtime/config-change-effects.mjs +179 -0
- package/src/session-runtime/config-lifecycle/config-writers.mjs +1 -0
- package/src/session-runtime/config-lifecycle.mjs +160 -24
- package/src/session-runtime/conversation-import/discovery.mjs +86 -7
- package/src/session-runtime/conversation-import/service.mjs +3 -2
- package/src/session-runtime/goal-facade-api.mjs +49 -3
- package/src/session-runtime/internal-tool-executor/ask-user-tool.mjs +5 -57
- package/src/session-runtime/internal-tool-executor/bridge-tools.mjs +3 -2
- package/src/session-runtime/internal-tool-executor/feature-tools.mjs +3 -11
- package/src/session-runtime/internal-tool-executor/workspace-tools.mjs +18 -4
- package/src/session-runtime/internal-tool-executor.mjs +12 -19
- package/src/session-runtime/lifecycle/cold-heir.mjs +7 -0
- package/src/session-runtime/lifecycle/memory-ingest.mjs +3 -3
- package/src/session-runtime/lifecycle/session-switch/session-delete.mjs +53 -5
- package/src/session-runtime/lifecycle/session-switch.mjs +13 -2
- package/src/session-runtime/lifecycle/teardown/session-close.mjs +4 -4
- package/src/session-runtime/lifecycle-api.mjs +1 -0
- package/src/session-runtime/mcp-glue/server-catalog.mjs +14 -3
- package/src/session-runtime/mcp-glue/server-connection.mjs +34 -8
- package/src/session-runtime/model-route/route-persist.mjs +12 -4
- package/src/session-runtime/model-route/set-route.mjs +40 -7
- package/src/session-runtime/native-web-search/routes.mjs +3 -3
- package/src/session-runtime/provider-auth/refresh.mjs +6 -3
- package/src/session-runtime/provider-auth/setup.mjs +1 -1
- package/src/session-runtime/provider-models/row-hydration.mjs +2 -0
- package/src/session-runtime/provider-readiness.mjs +53 -4
- package/src/session-runtime/resource-api.mjs +1 -1
- package/src/session-runtime/resource-extension-sync.mjs +4 -8
- package/src/session-runtime/resource-mcp-connector-accounts.mjs +5 -1
- package/src/session-runtime/resource-mcp-secrets.mjs +3 -3
- package/src/session-runtime/resource-plugins-api.mjs +4 -0
- package/src/session-runtime/routine-executor.mjs +152 -0
- package/src/session-runtime/routine-home-turn.mjs +46 -5
- package/src/session-runtime/routine-owner.mjs +9 -3
- package/src/session-runtime/runtime-facade.mjs +5 -0
- package/src/session-runtime/runtime-feature-gates.mjs +2 -11
- package/src/session-runtime/schedule-session-run.mjs +1 -0
- package/src/session-runtime/services/agent-task-status.mjs +29 -1
- package/src/session-runtime/services/agent-tool/job-task-reconcile.mjs +6 -1
- package/src/session-runtime/services/agent-tool/job-views/session-progress.mjs +10 -0
- package/src/session-runtime/services/agent-tool/render.mjs +6 -1
- package/src/session-runtime/services/agent-tool/send-flow.mjs +110 -6
- package/src/session-runtime/services/agent-tool/spawn-flow/job-start.mjs +12 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-plan.mjs +5 -0
- package/src/session-runtime/services/agent-tool/spawn-flow/spawn-run.mjs +24 -6
- package/src/session-runtime/services/agent-tool.mjs +51 -1
- package/src/session-runtime/services/channel-admin.mjs +62 -3
- package/src/session-runtime/services/hook-bus/command-handler.mjs +7 -11
- package/src/session-runtime/services/plugin-admin.mjs +50 -7
- package/src/session-runtime/services/provider-admin.mjs +5 -0
- package/src/session-runtime/services/seeds.mjs +7 -0
- package/src/session-runtime/services/usage-stats-model.mjs +32 -11
- package/src/session-runtime/session-create/materialize.mjs +4 -2
- package/src/session-runtime/session-create/session-options.mjs +2 -0
- package/src/session-runtime/settings-builtin-tools-api.mjs +1 -9
- package/src/session-runtime/setup-tool/agent-settings-actions.mjs +1 -1
- package/src/session-runtime/setup-tool/connector-widen-approval.mjs +1 -1
- package/src/session-runtime/setup-tool/executor.mjs +9 -2
- package/src/session-runtime/setup-tool/extended-actions.mjs +3 -1
- package/src/session-runtime/setup-tool/settings-contract.mjs +30 -2
- package/src/session-runtime/setup-tool/tool-defs.mjs +26 -1
- package/src/session-runtime/tool-policy/agent-profile-fold.mjs +40 -43
- package/src/session-runtime/tool-policy/mode-switch.mjs +1 -1
- package/src/session-runtime/tool-policy/policy-stage.mjs +106 -8
- package/src/session-runtime/tool-policy/workflow-overlay.mjs +2 -1
- package/src/session-runtime/tool-policy-refresh.mjs +182 -5
- package/src/session-runtime/tool-surface.mjs +38 -1
- package/src/session-runtime/turn/agent-ops.mjs +10 -2
- package/src/session-runtime/turn/session-ops.mjs +2 -0
- package/src/session-runtime/turn/turn-run/turn-prepare.mjs +5 -0
- package/src/session-runtime/turn/turn-run.mjs +1 -1
- package/src/session-runtime/usage-stats-api.mjs +117 -1
- package/src/session-runtime/webhook-session-run.mjs +2 -0
- package/src/session-runtime/workflow-agents-api/agent-connectors.mjs +37 -33
- package/src/session-runtime/workflow-agents-api/agent-editor.mjs +183 -23
- package/src/session-runtime/workflow-agents-api/agent-route.mjs +3 -10
- package/src/session-runtime/workflow-agents-api/instruction-files.mjs +165 -0
- package/src/session-runtime/workflow-agents-api/style-and-mode.mjs +5 -4
- package/src/session-runtime/workflow-agents-api/workflow-packs.mjs +2 -3
- package/src/session-runtime/workflow-agents-api.mjs +2 -0
- package/src/session-runtime/workspace/project-branches.mjs +1 -1
- package/src/session-runtime/workspace/session-view.mjs +1 -1
- package/src/session-runtime/workspace/transitions.mjs +20 -4
- package/src/session-runtime/workspace/worktree-maintenance.mjs +126 -6
- package/src/session-runtime/workspace/worktree-setup.mjs +13 -1
- package/src/session-runtime/workspace/worktree-tool.mjs +16 -0
- package/src/standalone/daemon-agent-control.mjs +25 -8
- package/src/standalone/daemon-desktop-runtime.mjs +6 -2
- package/src/standalone/daemon-lag-profiler.mjs +7 -7
- package/src/standalone/daemon.mjs +54 -2
- package/src/standalone/local-session-runtime.mjs +16 -0
- package/src/standalone/session-client/daemon-unavailable.mjs +1 -1
- package/src/standalone/session-protocol.mjs +12 -0
- package/src/standalone/session-service/agent-route-follow.mjs +23 -20
- package/src/standalone/session-service/agent-tree/agent-turns.mjs +18 -6
- package/src/standalone/session-service/quota-resume.mjs +9 -0
- package/src/standalone/session-service/retention/busy.mjs +3 -2
- package/src/standalone/session-service/session-calls/session-action.mjs +51 -1
- package/src/standalone/session-service/session-calls/session-turns.mjs +37 -18
- package/src/standalone/session-service/session-calls/turn-gate.mjs +34 -0
- package/src/standalone/session-service/session-calls.mjs +2 -1
- package/src/tui/App.jsx +8 -0
- package/src/tui/app/clipboard.mjs +1 -1
- package/src/tui/app/create-app-pickers.mjs +2 -0
- package/src/tui/app/doctor.mjs +2 -2
- package/src/tui/app/model-picker/model-footer.mjs +1 -1
- package/src/tui/app/model-picker/provider-models-list.mjs +7 -3
- package/src/tui/app/model-picker/route-selection/fast-parameters.mjs +23 -3
- package/src/tui/app/model-picker/route-selection.mjs +1 -0
- package/src/tui/app/panel-signature.mjs +1 -1
- package/src/tui/app/settings-picker.mjs +53 -8
- package/src/tui/app/shell-layout/row-budgets.mjs +2 -2
- package/src/tui/app/slash-commands.mjs +1 -1
- package/src/tui/app/slash-dispatch/route-commands.mjs +1 -1
- package/src/tui/app/slash-dispatch/session-commands.mjs +1 -1
- package/src/tui/app/use-prompt-queue-history.mjs +2 -2
- package/src/tui/app/use-transcript-activity.mjs +1 -1
- package/src/tui/app/use-transcript-window/geometry.mjs +1 -1
- package/src/tui/components/prompt-input/escape-policy.d.mts +0 -1
- package/src/tui/components/prompt-input/escape-policy.mjs +1 -1
- package/src/tui/components/question-panel-model.mjs +4 -4
- package/src/tui/components/tool-execution/standard-card.jsx +3 -4
- package/src/tui/components/user-message-skills.mjs +1 -1
- package/src/tui/dist/index.mjs +350 -37
- package/src/tui/markdown/render-ansi.mjs +1 -1
- package/src/tui/session/agent-job-feed/notification-router.mjs +10 -0
- package/src/tui/session/agent-job-feed.mjs +2 -0
- package/src/tui/session/context-state.mjs +3 -0
- package/src/tui/session/quota-resume.mjs +1 -1
- package/src/tui/session/session-api/integrations.mjs +3 -0
- package/src/tui/session/session-api/lifecycle/dispose.mjs +1 -0
- package/src/tui/session/session-api/lifecycle/session-reset.mjs +7 -0
- package/src/tui/session/session-api/routes-agent-definitions.mjs +5 -0
- package/src/tui/session/session-api/worktree.mjs +13 -1
- package/src/tui/session/session-flow/drain.mjs +11 -14
- package/src/tui/session/tool-approval-settle.mjs +24 -4
- package/src/tui/session/tool-approval.mjs +35 -10
- package/src/tui/session/tool-card-results/grouped-result.mjs +2 -2
- package/src/tui/session/turn-quiet.mjs +1 -1
- package/src/tui/session/turn.mjs +3 -0
- package/src/tui/session/worktree-setup-notice.mjs +1 -1
- package/src/tui/spinner-meta.mjs +3 -3
- package/src/tui/spinner-verbs.mjs +2 -2
- package/src/defaults/skills/goal-management/SKILL.md +0 -169
- package/src/runtime/agent/orchestrator/runtime-core/goal-tasks.mjs +0 -156
- package/src/session-runtime/goal-tasks.mjs +0 -1
|
@@ -198,7 +198,13 @@ function failDispatch(handler, error) {
|
|
|
198
198
|
else handler.onError?.(error);
|
|
199
199
|
}
|
|
200
200
|
|
|
201
|
-
const RESPONSE_CALLBACKS = [
|
|
201
|
+
const RESPONSE_CALLBACKS = [
|
|
202
|
+
'onRequestUpgrade',
|
|
203
|
+
'onResponseStart',
|
|
204
|
+
'onResponseData',
|
|
205
|
+
'onResponseEnd',
|
|
206
|
+
'onResponseError',
|
|
207
|
+
];
|
|
202
208
|
|
|
203
209
|
/**
|
|
204
210
|
* Start a request whose leg is not known yet: its handler gets a controller at
|
|
@@ -309,10 +315,7 @@ export function createRoutedProxyDispatcher({
|
|
|
309
315
|
}
|
|
310
316
|
|
|
311
317
|
async destroy(error) {
|
|
312
|
-
await Promise.all([
|
|
313
|
-
directLeg().destroy(error),
|
|
314
|
-
...[...this.#proxied.values()].map((leg) => leg.destroy(error)),
|
|
315
|
-
]);
|
|
318
|
+
await Promise.all([directLeg().destroy(error), ...[...this.#proxied.values()].map((leg) => leg.destroy(error))]);
|
|
316
319
|
}
|
|
317
320
|
}
|
|
318
321
|
return new SystemProxyRouter();
|
|
@@ -280,7 +280,8 @@ export function routeFromChromium(answer) {
|
|
|
280
280
|
socks = true;
|
|
281
281
|
continue;
|
|
282
282
|
}
|
|
283
|
-
const url =
|
|
283
|
+
const url =
|
|
284
|
+
(kind === 'PROXY' || kind === 'HTTPS') && proxyUrl(`${kind === 'HTTPS' ? 'https' : 'http'}://${hostPort}`);
|
|
284
285
|
if (url) return { proxy: url, socks: false };
|
|
285
286
|
}
|
|
286
287
|
return { proxy: null, socks };
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { getUsageLedger, makeUsageRecord } from './usage-ledger.mjs';
|
|
3
|
-
import { isNotedUsage, withUsageContext } from './usage-context.mjs';
|
|
3
|
+
import { currentUsageContext, isNotedUsage, withUsageContext } from './usage-context.mjs';
|
|
4
|
+
import { servedModelSubstituted, usageRequestStatus } from './usage-request-status.mjs';
|
|
4
5
|
import { ACCOUNT_PROVIDERS } from '../provider-accounts.mjs';
|
|
5
6
|
import { currentProviderAccountId } from '../provider-auth-binding.mjs';
|
|
6
7
|
|
|
@@ -8,7 +9,31 @@ import { currentProviderAccountId } from '../provider-auth-binding.mjs';
|
|
|
8
9
|
// fallback, catalog retry) runs its own accounting and its result or error
|
|
9
10
|
// then returns through the enclosing send, which must not write it again.
|
|
10
11
|
const recorded = new WeakSet();
|
|
12
|
+
// The accounting identity of the send whose options carry it; object spread
|
|
13
|
+
// keeps it on every option set a provider derives for its own re-send.
|
|
14
|
+
const SEND_IDENTITY = Symbol('usageSendIdentity');
|
|
15
|
+
// Providers whose answering stream's generation window (`generationMs`,
|
|
16
|
+
// providers/lib/generation-window.mjs) starts when generation does, read
|
|
17
|
+
// from the stream code: Anthropic opens every content block, a thinking
|
|
18
|
+
// block included even when its text is omitted; OpenAI's Responses streams
|
|
19
|
+
// add every output item, an encrypted reasoning item included, as it starts;
|
|
20
|
+
// the local llama.cpp server streams every generated token, reasoning
|
|
21
|
+
// included. Any other provider may reason before its first streamed token
|
|
22
|
+
// (hidden reasoning on chat-compat gateways, Gemini thought summaries,
|
|
23
|
+
// Cursor, Devin, compat Responses gateways), so a speed from it could be
|
|
24
|
+
// inflated: it records no first-output time.
|
|
25
|
+
const TIMED_PROVIDERS = new Set(['anthropic', 'anthropic-oauth', 'openai', 'openai-oauth', 'mixdog-local']);
|
|
26
|
+
|
|
27
|
+
/** The answering stream's own first-output time within the request, when its
|
|
28
|
+
* provider is timed: never an abandoned attempt's or a retry backoff's. */
|
|
29
|
+
function firstOutputMs(provider, result, streamMs) {
|
|
30
|
+
const generationMs = Number(result?.generationMs);
|
|
31
|
+
if (!TIMED_PROVIDERS.has(provider) || !Number.isFinite(generationMs)) return null;
|
|
32
|
+
if (generationMs < 0 || generationMs > streamMs) return null;
|
|
33
|
+
return streamMs - generationMs;
|
|
34
|
+
}
|
|
11
35
|
const UNMEASURED_USAGE = Object.freeze({ inputTokens: null, inputTokensKnown: false });
|
|
36
|
+
const FAILED_USAGE = Object.freeze({ inputTokens: 0, outputTokens: 0, costUsd: 0 });
|
|
12
37
|
const hasTokens = (usage) =>
|
|
13
38
|
['inputTokens', 'outputTokens', 'cachedTokens', 'cacheWriteTokens'].some((key) => Number(usage?.[key]) > 0);
|
|
14
39
|
// One rule for every reported usage object: tokens, or a provider-reported
|
|
@@ -41,17 +66,24 @@ export async function accountProviderSend(provider, instance, send, model, opts
|
|
|
41
66
|
} catch (error) {
|
|
42
67
|
openingError = error;
|
|
43
68
|
}
|
|
69
|
+
// A provider's own re-send on another model (an overload or retired-model
|
|
70
|
+
// fallback) still answers the model the outer send was asked for. Only a
|
|
71
|
+
// re-send built from the outer send's own options is one: any other send
|
|
72
|
+
// that merely runs inside that async context (a tool or agent started
|
|
73
|
+
// while the outer stream was live) asks for its own model.
|
|
74
|
+
const outer = currentUsageContext();
|
|
44
75
|
const identity = {
|
|
45
76
|
provider,
|
|
46
|
-
requestedModel: model,
|
|
77
|
+
requestedModel: (outer && opts[SEND_IDENTITY] === outer && outer.requestedModel) || model,
|
|
47
78
|
sessionId,
|
|
48
79
|
sourceType,
|
|
49
80
|
inputTokensInclusive,
|
|
50
81
|
};
|
|
82
|
+
const sendOpts = { ...opts, [SEND_IDENTITY]: identity };
|
|
51
83
|
// `timed`: only a send's completed result owns the request's wall time. An
|
|
52
84
|
// abandoned attempt or a failure shares that clock with the final attempt,
|
|
53
85
|
// so timing it too would count the same seconds twice and understate speed.
|
|
54
|
-
const record = async (result, id, owner, timed) => {
|
|
86
|
+
const record = async (result, id, owner, timed, outcome = null) => {
|
|
55
87
|
// A completed call that reported no usage is still a call: it is recorded
|
|
56
88
|
// as unmeasured (unknown input, unpriced) instead of vanishing from totals.
|
|
57
89
|
if (!result?.usage && !(timed && result && typeof result === 'object')) return;
|
|
@@ -64,6 +96,21 @@ export async function accountProviderSend(provider, instance, send, model, opts
|
|
|
64
96
|
recorded.add(owner);
|
|
65
97
|
const usage = result.usage || UNMEASURED_USAGE;
|
|
66
98
|
const durationMs = timed ? Date.now() - startedAt : 0;
|
|
99
|
+
const servedModel = result.model || model;
|
|
100
|
+
const attempts = outcome ? outcome.attempts : 1;
|
|
101
|
+
let status = 'completed';
|
|
102
|
+
if (outcome?.cancelled) status = 'cancelled';
|
|
103
|
+
else if (outcome)
|
|
104
|
+
status = usageRequestStatus({
|
|
105
|
+
failed: outcome.failed,
|
|
106
|
+
attempts,
|
|
107
|
+
substituted: servedModelSubstituted({
|
|
108
|
+
provider,
|
|
109
|
+
requestedModel: identity.requestedModel,
|
|
110
|
+
servedModel,
|
|
111
|
+
fallback: Boolean(result.providerMetadata?.anthropicFallbacks?.length),
|
|
112
|
+
}),
|
|
113
|
+
});
|
|
67
114
|
// The one measured request time: the loop's speed figures read it, so
|
|
68
115
|
// the composer and the ledger show the same span.
|
|
69
116
|
if (timed && result && typeof result === 'object') {
|
|
@@ -73,8 +120,15 @@ export async function accountProviderSend(provider, instance, send, model, opts
|
|
|
73
120
|
id: result.responseId ? undefined : id,
|
|
74
121
|
ts: Date.now(),
|
|
75
122
|
provider,
|
|
76
|
-
model:
|
|
77
|
-
requestedModel: model,
|
|
123
|
+
model: servedModel,
|
|
124
|
+
requestedModel: outcome ? identity.requestedModel : model,
|
|
125
|
+
status,
|
|
126
|
+
attempts,
|
|
127
|
+
// Measured to the moment the stream returned, not to this write: the
|
|
128
|
+
// abandoned attempts' writes awaited before it are not first-output wait.
|
|
129
|
+
ttftMs: timed ? firstOutputMs(provider, result, streamEndedAt - startedAt) : null,
|
|
130
|
+
// The request log shows how long a failure took; statistics never time it.
|
|
131
|
+
elapsedMs: outcome?.failed ? Date.now() - startedAt : 0,
|
|
78
132
|
pricingModel: result.pricingModel,
|
|
79
133
|
sessionId,
|
|
80
134
|
// The session this one runs for (an agent's Lead), kept with its spend.
|
|
@@ -101,34 +155,71 @@ export async function accountProviderSend(provider, instance, send, model, opts
|
|
|
101
155
|
// SQLite write no longer runs on the event loop.
|
|
102
156
|
await ledger.recordQueued(row);
|
|
103
157
|
};
|
|
104
|
-
const save = async (result, id = requestId, owner = result, timed = false) => {
|
|
158
|
+
const save = async (result, id = requestId, owner = result, timed = false, outcome = null) => {
|
|
105
159
|
try {
|
|
106
|
-
await record(result, id, owner, timed);
|
|
160
|
+
await record(result, id, owner, timed, outcome);
|
|
107
161
|
} catch (error) {
|
|
108
162
|
result.usageAccountingError = String(error?.message || error);
|
|
109
163
|
process.stderr.write(`[usage-ledger] RECORD NOT SAVED: ${result.usageAccountingError}\n`);
|
|
110
164
|
}
|
|
111
165
|
};
|
|
112
|
-
const saveAbandoned = async () => {
|
|
166
|
+
const saveAbandoned = async (skip = -1) => {
|
|
113
167
|
for (const [index, attempt] of (identity.abandonedUsage || []).entries()) {
|
|
114
|
-
if (recordable(attempt.usage)) await save(attempt, `${requestId}:abandoned:${index}`);
|
|
168
|
+
if (index !== skip && recordable(attempt.usage)) await save(attempt, `${requestId}:abandoned:${index}`);
|
|
115
169
|
}
|
|
116
170
|
};
|
|
117
171
|
let result;
|
|
172
|
+
let streamEndedAt;
|
|
118
173
|
try {
|
|
119
|
-
result = await withUsageContext(identity, send);
|
|
174
|
+
result = await withUsageContext(identity, () => send(sendOpts));
|
|
175
|
+
streamEndedAt = Date.now();
|
|
120
176
|
} catch (error) {
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
//
|
|
124
|
-
//
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
177
|
+
const abandoned = identity.abandonedUsage || [];
|
|
178
|
+
const cancelled = opts.signal?.aborted === true || error?.name === 'AbortError';
|
|
179
|
+
// Only provider-reported usage is recordable; never invent tokens for a
|
|
180
|
+
// failed request or reinterpret an error as a success.
|
|
181
|
+
const reported = error?.usage || (recordable(error?.partialUsage) ? error.partialUsage : null);
|
|
182
|
+
if (cancelled) {
|
|
183
|
+
// A user's cancel is not a request outcome: it records exactly what it
|
|
184
|
+
// always did, under the same ids (noted attempts as abandoned rows, the
|
|
185
|
+
// cancel's own unnoted usage as the request's row, response-keyed when
|
|
186
|
+
// it names a response), and that row is marked `cancelled` so the
|
|
187
|
+
// request log leaves it out.
|
|
188
|
+
await saveAbandoned();
|
|
189
|
+
const outcome = { cancelled: true, attempts: abandoned.length + 1 };
|
|
190
|
+
if (error?.usage) {
|
|
191
|
+
if (!isNotedUsage(error.usage)) await save(error, requestId, error, false, outcome);
|
|
192
|
+
} else if (reported && !isNotedUsage(reported)) {
|
|
193
|
+
await save({ usage: reported, model: error.partialModel }, requestId, error, false, outcome);
|
|
194
|
+
}
|
|
195
|
+
throw error;
|
|
196
|
+
}
|
|
197
|
+
// The failing attempt's usage may already be noted as abandoned (the
|
|
198
|
+
// error carries that same usage): that attempt is the request's own row,
|
|
199
|
+
// not an abandoned one. Any other failure without usage is an attempt of
|
|
200
|
+
// its own.
|
|
201
|
+
const last = reported
|
|
202
|
+
? abandoned.findLastIndex((attempt) => attempt.source === reported || attempt.usage === reported)
|
|
203
|
+
: -1;
|
|
204
|
+
await saveAbandoned(last);
|
|
205
|
+
const failure = { failed: true, attempts: last >= 0 ? abandoned.length : abandoned.length + 1 };
|
|
206
|
+
const owner = error && typeof error === 'object' ? error : {};
|
|
207
|
+
if (last >= 0) {
|
|
208
|
+
const attempt = abandoned[last];
|
|
209
|
+
// Owned by the attempt, as when it was stored as abandoned: one error
|
|
210
|
+
// may end several concurrent sends (a shared cancel reason).
|
|
211
|
+
await save({ usage: attempt.usage, model: attempt.model || error?.model }, requestId, attempt, false, failure);
|
|
212
|
+
} else if (reported) {
|
|
213
|
+
// Usage noted by a nested send was recorded there.
|
|
214
|
+
const failed = error.usage ? error : { usage: reported, model: error.partialModel };
|
|
215
|
+
if (!isNotedUsage(reported)) await save(failed, requestId, owner, false, failure);
|
|
216
|
+
} else {
|
|
217
|
+
// A failure that reported nothing is still a request: zero tokens.
|
|
218
|
+
await save({ usage: FAILED_USAGE, model: error?.model }, requestId, owner, false, failure);
|
|
219
|
+
}
|
|
129
220
|
throw error;
|
|
130
221
|
}
|
|
131
222
|
await saveAbandoned();
|
|
132
|
-
await save(result, requestId, result, true);
|
|
223
|
+
await save(result, requestId, result, true, { failed: false, attempts: (identity.abandonedUsage?.length || 0) + 1 });
|
|
133
224
|
return result;
|
|
134
225
|
}
|
|
@@ -25,5 +25,5 @@ export const noteAbandonedUsage = (usage, model) => {
|
|
|
25
25
|
notedUsage.add(usage);
|
|
26
26
|
notedUsage.add(stored);
|
|
27
27
|
identity.abandonedUsage ||= [];
|
|
28
|
-
identity.abandonedUsage.push({ usage: stored, model });
|
|
28
|
+
identity.abandonedUsage.push({ usage: stored, model, source: usage });
|
|
29
29
|
};
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
* is an estimate: providers do not publish what a request costs the meter.
|
|
14
14
|
*/
|
|
15
15
|
import { normalizeUsageMeasurement } from './usage-measurement.mjs';
|
|
16
|
-
import {
|
|
16
|
+
import { NO_USAGE_COST_SOURCE } from './usage-ledger-requests.mjs';
|
|
17
|
+
import { FAST_KEY, fastRouteSql, sortFastBesideModel, usageRollupDayKey } from './usage-rollup.mjs';
|
|
17
18
|
import { estimateOutsideQuota, estimateQuotaValue, outsideSpans } from './quota-value-estimate.mjs';
|
|
18
19
|
|
|
19
20
|
export const QUOTA_SCHEMA = `
|
|
@@ -397,18 +398,21 @@ function readQuotaEvents(db, { provider, account, label = '', fromMs, toMs }) {
|
|
|
397
398
|
const rows = db
|
|
398
399
|
.prepare(`
|
|
399
400
|
WITH routes AS (
|
|
400
|
-
SELECT id,json_extract(signature,'$[1]') AS model,json_extract(signature,'$[7]') AS rank
|
|
401
|
+
SELECT id,json_extract(signature,'$[1]') AS model,json_extract(signature,'$[7]') AS rank,
|
|
402
|
+
${fastRouteSql('signature')} AS fast
|
|
401
403
|
FROM usage_routes
|
|
402
404
|
WHERE json_extract(signature,'$[0]')=? AND COALESCE(json_extract(signature,'$[8]'),'') IN (?,?)
|
|
405
|
+
AND json_extract(signature,'$[4]')<>'${NO_USAGE_COST_SOURCE}'
|
|
403
406
|
)
|
|
404
407
|
SELECT e.ts,e.day,r.model,r.rank,COUNT(*) AS turns,
|
|
405
408
|
SUM(e.input) AS input,SUM(e.output) AS output,SUM(e.cache_read) AS cacheRead,
|
|
406
409
|
SUM(e.cache_write) AS cacheWrite,SUM(e.cost_usd) AS costUsd,COUNT(e.cost_usd) AS priced,
|
|
407
410
|
SUM(CASE WHEN e.duration_ms>0 AND e.output>0 THEN e.output ELSE 0 END) AS speedOutput,
|
|
408
|
-
SUM(CASE WHEN e.duration_ms>0 AND e.output>0 THEN e.duration_ms ELSE 0 END) AS speedMs
|
|
411
|
+
SUM(CASE WHEN e.duration_ms>0 AND e.output>0 THEN e.duration_ms ELSE 0 END) AS speedMs,
|
|
412
|
+
r.fast
|
|
409
413
|
FROM usage_events e JOIN routes r ON r.id=e.route
|
|
410
414
|
WHERE e.ts>=? AND e.ts<=?
|
|
411
|
-
GROUP BY e.ts,e.day,r.model,r.rank
|
|
415
|
+
GROUP BY e.ts,e.day,r.model,r.rank,r.fast
|
|
412
416
|
ORDER BY e.ts`)
|
|
413
417
|
.all(provider, account, unlabeled, fromMs, toMs);
|
|
414
418
|
const best = new Map();
|
|
@@ -433,7 +437,8 @@ function readQuotaEvents(db, { provider, account, label = '', fromMs, toMs }) {
|
|
|
433
437
|
});
|
|
434
438
|
const event = {
|
|
435
439
|
ts: row.ts,
|
|
436
|
-
model
|
|
440
|
+
// A model's Fast calls are keyed apart from its normal ones.
|
|
441
|
+
model: row.fast ? row.model + FAST_KEY : row.model,
|
|
437
442
|
turns: row.turns,
|
|
438
443
|
input: usage.input || 0,
|
|
439
444
|
output: usage.output || 0,
|
|
@@ -686,7 +691,6 @@ function addUsage(target, event, share) {
|
|
|
686
691
|
}
|
|
687
692
|
|
|
688
693
|
const tokensOf = (usage) => usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
|
|
689
|
-
const byConsumption = (a, b) => b.consumed - a.consumed || b.tokens - a.tokens;
|
|
690
694
|
|
|
691
695
|
/** Route-shaped totals, so the token table's cells render them unchanged. */
|
|
692
696
|
function exportUsage(usage) {
|
|
@@ -708,6 +712,16 @@ function exportUsage(usage) {
|
|
|
708
712
|
};
|
|
709
713
|
}
|
|
710
714
|
|
|
715
|
+
/** What a Fast key stands for: `modelId` is the model itself, never the internal key. */
|
|
716
|
+
const modelIdentity = (key) => (key.endsWith(FAST_KEY) ? { fast: true, modelId: key.slice(0, -FAST_KEY.length) } : {});
|
|
717
|
+
|
|
718
|
+
/** A model row: its key is unique per mode. */
|
|
719
|
+
function exportModel(key, usage) {
|
|
720
|
+
return { model: key, ...modelIdentity(key), ...exportUsage(usage) };
|
|
721
|
+
}
|
|
722
|
+
|
|
723
|
+
const modelOfRow = (row) => row.modelId ?? row.model;
|
|
724
|
+
|
|
711
725
|
function windowPeriod(listed, anchor) {
|
|
712
726
|
if (!listed.length) return null;
|
|
713
727
|
let index = listed.findIndex((instance) => instance.key === anchor);
|
|
@@ -750,7 +764,7 @@ function forecastFor(instance, points) {
|
|
|
750
764
|
/** Each model's running share of its window, sampled at slot ends; the slot
|
|
751
765
|
* running now is sampled at now, as far as it has run. */
|
|
752
766
|
function modelSeries(slots, instances, keys, now) {
|
|
753
|
-
const series = keys.map((key) => ({ key, points: [] }));
|
|
767
|
+
const series = keys.map((key) => ({ key, ...modelIdentity(key), points: [] }));
|
|
754
768
|
const running = new Map();
|
|
755
769
|
let owner;
|
|
756
770
|
for (const slot of slots) {
|
|
@@ -933,7 +947,11 @@ export function readQuotaHistory(
|
|
|
933
947
|
? null
|
|
934
948
|
: slots.reduce((sum, slot) => sum + slot.outsideCostUsd, 0);
|
|
935
949
|
|
|
936
|
-
const exportedModels =
|
|
950
|
+
const exportedModels = sortFastBesideModel(
|
|
951
|
+
[...models].map(([key, usage]) => exportModel(key, usage)),
|
|
952
|
+
modelOfRow,
|
|
953
|
+
['consumed', 'tokens']
|
|
954
|
+
);
|
|
937
955
|
const seriesKeys = exportedModels
|
|
938
956
|
.filter((model) => model.consumed > 0)
|
|
939
957
|
.slice(0, SERIES_LIMIT)
|
|
@@ -995,14 +1013,17 @@ export function readQuotaHistory(
|
|
|
995
1013
|
: slot.outsideCostUsd,
|
|
996
1014
|
slot.usage.costKnownTurns < slot.usage.turns
|
|
997
1015
|
),
|
|
998
|
-
models:
|
|
999
|
-
.map(([model, usage]) => ({
|
|
1016
|
+
models: sortFastBesideModel(
|
|
1017
|
+
[...slot.models].map(([model, usage]) => ({
|
|
1000
1018
|
model,
|
|
1019
|
+
...modelIdentity(model),
|
|
1001
1020
|
consumed: round(usage.consumed),
|
|
1002
1021
|
tokens: tokensOf(usage),
|
|
1003
1022
|
costUsd: round(usage.costUsd, 6),
|
|
1004
|
-
}))
|
|
1005
|
-
|
|
1023
|
+
})),
|
|
1024
|
+
modelOfRow,
|
|
1025
|
+
['consumed', 'tokens']
|
|
1026
|
+
),
|
|
1006
1027
|
})),
|
|
1007
1028
|
modelSeries: modelSeries(slots, shown, seriesKeys, now),
|
|
1008
1029
|
// A period over several windows marks where each of them peaked.
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The request log: individual requests, newest first, a page at a time. The
|
|
3
|
+
* ledger keeps every record forever, so each page is read through an index
|
|
4
|
+
* ordered by time (all requests, one status, or one route) and stops after
|
|
5
|
+
* the page: a page of "all history" costs what a page of today does.
|
|
6
|
+
*
|
|
7
|
+
* The request facts (requested model, status, attempts) sit in
|
|
8
|
+
* `usage_requests` and the first-output time in `usage_request_first_output`,
|
|
9
|
+
* beside `usage_events` and keyed by the record id, so the record table keeps
|
|
10
|
+
* the exact shape every earlier build writes: an older app still opens and
|
|
11
|
+
* writes a ledger this one touched. A record without a request row is a
|
|
12
|
+
* completed single attempt (every record from before).
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
export const REQUEST_STATUSES = ['completed', 'substituted', 'retried', 'failed'];
|
|
16
|
+
// `cancelled`: usage of a user's cancel, kept under its own record id (and so
|
|
17
|
+
// response-deduplicated) but never listed: a cancel is not a request outcome.
|
|
18
|
+
export const STORED_REQUEST_STATUSES = [...REQUEST_STATUSES, 'cancelled'];
|
|
19
|
+
|
|
20
|
+
// Almost every request completes: the status index holds only the others,
|
|
21
|
+
// and "completed" is read off the time index, where nearly every row matches.
|
|
22
|
+
// The model index lets a model filter find its routes without a scan.
|
|
23
|
+
export const REQUEST_LOG_SCHEMA = `
|
|
24
|
+
CREATE TABLE IF NOT EXISTS usage_requests (
|
|
25
|
+
id BLOB PRIMARY KEY, ts INTEGER NOT NULL, requested_model TEXT, status TEXT NOT NULL,
|
|
26
|
+
attempts INTEGER NOT NULL, ttft_ms REAL, elapsed_ms REAL
|
|
27
|
+
) WITHOUT ROWID;
|
|
28
|
+
CREATE TABLE IF NOT EXISTS usage_request_first_output (
|
|
29
|
+
id BLOB PRIMARY KEY, ttft_ms REAL NOT NULL
|
|
30
|
+
) WITHOUT ROWID;
|
|
31
|
+
CREATE INDEX IF NOT EXISTS usage_requests_status_time ON usage_requests(status, ts) WHERE status<>'completed';
|
|
32
|
+
CREATE INDEX IF NOT EXISTS usage_events_route_time ON usage_events(route, ts);
|
|
33
|
+
CREATE INDEX IF NOT EXISTS usage_routes_model ON usage_routes(json_extract(signature,'$[1]'));
|
|
34
|
+
`;
|
|
35
|
+
|
|
36
|
+
// The cost source of a failure that reported no usage: the request log lists
|
|
37
|
+
// it, but statistics and quota totals add no turn for it.
|
|
38
|
+
export const NO_USAGE_COST_SOURCE = 'none';
|
|
39
|
+
|
|
40
|
+
const DEFAULT_PAGE = 50;
|
|
41
|
+
const MAX_PAGE = 200;
|
|
42
|
+
// A provider-local retry's abandoned attempts are stored as
|
|
43
|
+
// `<requestId>:abandoned:N` (UTF-8 ids carry tag 0x01). They are part of
|
|
44
|
+
// their request, counted in its attempts, never a request of their own.
|
|
45
|
+
const NOT_ABANDONED = `NOT (substr(e.id,1,1)=X'01' AND instr(e.id, CAST(':abandoned:' AS BLOB))>0)`;
|
|
46
|
+
// The first-output time is read only from usage_request_first_output, which
|
|
47
|
+
// only a build that times the answering stream's first output of any kind
|
|
48
|
+
// writes. `usage_requests.ttft_ms` is never read: the build that added it
|
|
49
|
+
// (e544d62a5) timed visible text only, so a thinking or tool turn read as
|
|
50
|
+
// generated in a few milliseconds, and an older process may still write it.
|
|
51
|
+
const COLUMNS = `e.id,e.ts,e.route,e.session,e.input,e.output,e.cache_read,e.cache_write,e.cost_usd,e.duration_ms,
|
|
52
|
+
r.requested_model,r.status,r.attempts,r.elapsed_ms,
|
|
53
|
+
(SELECT f.ttft_ms FROM usage_request_first_output f WHERE f.id=e.id) AS first_output_ms`;
|
|
54
|
+
const COMPLETED = `(r.status IS NULL OR r.status='completed')`;
|
|
55
|
+
// Checked on the row the time-ordered read already joined: no other index.
|
|
56
|
+
const LISTED = `(r.status IS NULL OR r.status<>'cancelled')`;
|
|
57
|
+
|
|
58
|
+
function decodeCursor(cursor) {
|
|
59
|
+
const match = typeof cursor === 'string' ? /^(\d+):([0-9a-f]+)$/.exec(cursor) : null;
|
|
60
|
+
return match ? { ts: Number(match[1]), id: Buffer.from(match[2], 'hex') } : null;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
const encodeCursor = (row) => `${row.ts}:${Buffer.from(row.id).toString('hex')}`;
|
|
64
|
+
|
|
65
|
+
const newestFirst = (a, b) => b.ts - a.ts || Buffer.compare(Buffer.from(b.id), Buffer.from(a.id));
|
|
66
|
+
|
|
67
|
+
/** The SQL of one page; `source` is the table whose index orders the read. */
|
|
68
|
+
export function requestPageQuery({ source, cursor = false, completed = false, routes = 0 }) {
|
|
69
|
+
const alias = source === 'status' ? 'r' : 'e';
|
|
70
|
+
const from =
|
|
71
|
+
source === 'status'
|
|
72
|
+
? 'usage_requests r INDEXED BY usage_requests_status_time CROSS JOIN usage_events e ON e.id=r.id'
|
|
73
|
+
: `usage_events e INDEXED BY ${source === 'route' ? 'usage_events_route_time' : 'usage_events_time'}
|
|
74
|
+
LEFT JOIN usage_requests r ON r.id=e.id`;
|
|
75
|
+
const where = [
|
|
76
|
+
...(source === 'status' ? [`r.status=? AND r.status<>'completed'`] : []),
|
|
77
|
+
...(source === 'route' ? ['e.route=?'] : []),
|
|
78
|
+
`${alias}.ts>=?`,
|
|
79
|
+
`${alias}.ts<=?`,
|
|
80
|
+
...(cursor ? [`(${alias}.ts<? OR ${alias}.id<?)`] : []),
|
|
81
|
+
NOT_ABANDONED,
|
|
82
|
+
...(source !== 'status' ? [completed ? COMPLETED : LISTED] : []),
|
|
83
|
+
...(routes ? [`e.route IN (${Array(routes).fill('?').join(',')})`] : []),
|
|
84
|
+
];
|
|
85
|
+
return `SELECT ${COLUMNS} FROM ${from} WHERE ${where.join(' AND ')}
|
|
86
|
+
ORDER BY ${alias}.ts DESC, ${alias}.id DESC LIMIT ?`;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* `{ fromMs, toMs, status?, model?, cursor?, limit? }` → `{ requests,
|
|
91
|
+
* nextCursor, models }`. `model` is the model that answered (the route's).
|
|
92
|
+
* `models`, every model that answered within the period, comes with the
|
|
93
|
+
* first page only (no cursor): it is the one read that visits every route.
|
|
94
|
+
*/
|
|
95
|
+
export function readUsageRequests(db, options = {}) {
|
|
96
|
+
const fromMs = Number(options.fromMs) || 0;
|
|
97
|
+
const toMs = Number.isFinite(Number(options.toMs)) ? Number(options.toMs) : Date.now();
|
|
98
|
+
const requested = Math.floor(Number(options.limit));
|
|
99
|
+
const limit = requested > 0 ? Math.min(requested, MAX_PAGE) : DEFAULT_PAGE;
|
|
100
|
+
const status = REQUEST_STATUSES.includes(options.status) ? options.status : '';
|
|
101
|
+
const cursor = decodeCursor(options.cursor);
|
|
102
|
+
const range = [fromMs, cursor ? Math.min(toMs, cursor.ts) : toMs, ...(cursor ? [cursor.ts, cursor.id] : [])];
|
|
103
|
+
const modelRoutes = options.model
|
|
104
|
+
? db
|
|
105
|
+
.prepare(`SELECT id FROM usage_routes WHERE json_extract(signature,'$[1]')=?`)
|
|
106
|
+
.all(String(options.model))
|
|
107
|
+
.map((route) => route.id)
|
|
108
|
+
: null;
|
|
109
|
+
const run = (shape, params) =>
|
|
110
|
+
db.prepare(requestPageQuery({ cursor: Boolean(cursor), ...shape })).all(...params, limit + 1);
|
|
111
|
+
let rows;
|
|
112
|
+
if (modelRoutes && !modelRoutes.length) rows = [];
|
|
113
|
+
else if (status && status !== 'completed') {
|
|
114
|
+
// Rare statuses: their own index, the model's routes filtered within it.
|
|
115
|
+
rows = run({ source: 'status', routes: modelRoutes?.length || 0 }, [status, ...range, ...(modelRoutes || [])]);
|
|
116
|
+
} else if (modelRoutes) {
|
|
117
|
+
// One ordered read per route of that model, merged: never every record of it.
|
|
118
|
+
rows = modelRoutes
|
|
119
|
+
.flatMap((route) => run({ source: 'route', completed: Boolean(status) }, [route, ...range]))
|
|
120
|
+
.sort(newestFirst)
|
|
121
|
+
.slice(0, limit + 1);
|
|
122
|
+
} else {
|
|
123
|
+
rows = run({ source: 'time', completed: Boolean(status) }, range);
|
|
124
|
+
}
|
|
125
|
+
const more = rows.length > limit;
|
|
126
|
+
rows = rows.slice(0, limit);
|
|
127
|
+
|
|
128
|
+
const routeOf = db.prepare(
|
|
129
|
+
`SELECT json_extract(signature,'$[0]') AS provider,json_extract(signature,'$[1]') AS model,
|
|
130
|
+
json_extract(signature,'$[2]') AS kind,json_extract(signature,'$[3]') AS source_type,
|
|
131
|
+
json_extract(signature,'$[4]') AS cost_source
|
|
132
|
+
FROM usage_routes WHERE id=?`
|
|
133
|
+
);
|
|
134
|
+
const sessionOf = db.prepare('SELECT value FROM usage_sessions WHERE id=?');
|
|
135
|
+
const ownerOf = db.prepare(
|
|
136
|
+
'SELECT s.value FROM usage_session_owners o JOIN usage_sessions s ON s.id=o.owner WHERE o.session=?'
|
|
137
|
+
);
|
|
138
|
+
const routes = new Map();
|
|
139
|
+
const requests = rows.map((row) => {
|
|
140
|
+
if (!routes.has(row.route)) routes.set(row.route, routeOf.get(row.route) || {});
|
|
141
|
+
const route = routes.get(row.route);
|
|
142
|
+
const rowStatus = row.status || 'completed';
|
|
143
|
+
const durationMs = row.duration_ms || row.elapsed_ms || 0;
|
|
144
|
+
const ttftMs = row.first_output_ms;
|
|
145
|
+
return {
|
|
146
|
+
id: Buffer.from(row.id).toString('hex'),
|
|
147
|
+
ts: row.ts,
|
|
148
|
+
provider: route.provider || '',
|
|
149
|
+
model: route.model || '',
|
|
150
|
+
requestedModel: row.requested_model || route.model || '',
|
|
151
|
+
kind: route.kind || '',
|
|
152
|
+
sourceType: route.source_type || '',
|
|
153
|
+
costSource: route.cost_source || '',
|
|
154
|
+
sessionId: sessionOf.get(row.session)?.value || '',
|
|
155
|
+
ownerSessionId: ownerOf.get(row.session)?.value || '',
|
|
156
|
+
input: row.input,
|
|
157
|
+
output: row.output,
|
|
158
|
+
cacheRead: row.cache_read,
|
|
159
|
+
cacheWrite: row.cache_write,
|
|
160
|
+
tokens: row.input + row.output + row.cache_read + row.cache_write,
|
|
161
|
+
costUsd: row.cost_usd,
|
|
162
|
+
durationMs,
|
|
163
|
+
ttftMs: ttftMs ?? null,
|
|
164
|
+
attempts: row.attempts || 1,
|
|
165
|
+
status: rowStatus,
|
|
166
|
+
};
|
|
167
|
+
});
|
|
168
|
+
|
|
169
|
+
let models = null;
|
|
170
|
+
if (!cursor) {
|
|
171
|
+
// One indexed probe per route: does any request of it fall in the period?
|
|
172
|
+
const probe = db.prepare(
|
|
173
|
+
`SELECT 1 FROM usage_events e INDEXED BY usage_events_route_time LEFT JOIN usage_requests r ON r.id=e.id
|
|
174
|
+
WHERE e.route=? AND e.ts>=? AND e.ts<=? AND ${NOT_ABANDONED} AND ${LISTED} LIMIT 1`
|
|
175
|
+
);
|
|
176
|
+
const found = new Set();
|
|
177
|
+
for (const route of db.prepare(`SELECT id,json_extract(signature,'$[1]') AS model FROM usage_routes`).all()) {
|
|
178
|
+
if (route.model && !found.has(route.model) && probe.get(route.id, fromMs, toMs)) found.add(route.model);
|
|
179
|
+
}
|
|
180
|
+
models = [...found].sort((a, b) => a.localeCompare(b));
|
|
181
|
+
}
|
|
182
|
+
return { requests, nextCursor: more && rows.length ? encodeCursor(rows.at(-1)) : null, models };
|
|
183
|
+
}
|