@vellumai/assistant 0.7.0 → 0.7.1
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/ARCHITECTURE.md +6 -7
- package/Dockerfile +1 -0
- package/README.md +2 -2
- package/__tests__/permissions/gateway-threshold-reader.test.ts +79 -139
- package/bun.lock +3 -0
- package/docs/architecture/security.md +18 -16
- package/knip.json +1 -0
- package/node_modules/@vellumai/skill-host-contracts/__tests__/client.test.ts +1 -5
- package/node_modules/@vellumai/skill-host-contracts/src/assistant-event.ts +0 -5
- package/node_modules/@vellumai/skill-host-contracts/src/client.ts +10 -16
- package/node_modules/@vellumai/skill-host-contracts/src/skill-host.ts +1 -9
- package/node_modules/@vellumai/skill-host-contracts/src/tool-types.ts +12 -12
- package/node_modules/@vellumai/slack-text/bun.lock +24 -0
- package/node_modules/@vellumai/slack-text/package.json +18 -0
- package/node_modules/@vellumai/slack-text/src/index.test.ts +153 -0
- package/node_modules/@vellumai/slack-text/src/index.ts +235 -0
- package/node_modules/@vellumai/slack-text/tsconfig.json +20 -0
- package/openapi.yaml +294 -107
- package/package.json +4 -2
- package/scripts/generate-openapi.ts +16 -111
- package/src/__tests__/agent-wake-override-profile.test.ts +23 -1
- package/src/__tests__/anthropic-provider.test.ts +56 -13
- package/src/__tests__/app-conversation-ids-backfill.test.ts +278 -0
- package/src/__tests__/app-conversation-ids.test.ts +151 -0
- package/src/__tests__/approval-cascade.test.ts +0 -15
- package/src/__tests__/approval-routes-http.test.ts +6 -17
- package/src/__tests__/assistant-event-hub.test.ts +126 -77
- package/src/__tests__/assistant-event.test.ts +0 -5
- package/src/__tests__/assistant-events-sse-hardening.test.ts +37 -15
- package/src/__tests__/assistant-feature-flags-integration.test.ts +0 -29
- package/src/__tests__/background-shell-host-bash.test.ts +34 -43
- package/src/__tests__/call-controller.test.ts +1 -1
- package/src/__tests__/call-site-routing-provider.test.ts +193 -0
- package/src/__tests__/channel-approval-routes.test.ts +10 -296
- package/src/__tests__/channel-approvals.test.ts +25 -17
- package/src/__tests__/channel-guardian.test.ts +100 -146
- package/src/__tests__/checker.test.ts +20 -34
- package/src/__tests__/compact-event-conversation-id-guard.test.ts +50 -0
- package/src/__tests__/compaction-events.test.ts +2 -0
- package/src/__tests__/config-schema.test.ts +6 -48
- package/src/__tests__/config-watcher.test.ts +12 -0
- package/src/__tests__/connection-policy.test.ts +1 -52
- package/src/__tests__/contacts-write.test.ts +2 -64
- package/src/__tests__/context-image-dimensions.test.ts +1 -1
- package/src/__tests__/context-search-memory-source.test.ts +120 -1
- package/src/__tests__/context-search-memory-v2-source.test.ts +383 -0
- package/src/__tests__/context-search-pkb-source.test.ts +49 -0
- package/src/__tests__/context-search-workspace-source.test.ts +9 -22
- package/src/__tests__/context-window-manager.test.ts +46 -0
- package/src/__tests__/conversation-agent-loop-inference-profile.test.ts +2 -0
- package/src/__tests__/conversation-agent-loop-overflow.test.ts +102 -29
- package/src/__tests__/conversation-agent-loop.test.ts +980 -13
- package/src/__tests__/conversation-analysis-routes.test.ts +12 -10
- package/src/__tests__/conversation-attention-telegram.test.ts +11 -3
- package/src/__tests__/conversation-confirmation-signals.test.ts +0 -291
- package/src/__tests__/conversation-history-web-search.test.ts +4 -3
- package/src/__tests__/conversation-inference-profile-route.test.ts +12 -23
- package/src/__tests__/conversation-lifecycle.test.ts +4 -4
- package/src/__tests__/conversation-process-callsite.test.ts +79 -2
- package/src/__tests__/conversation-queue.test.ts +3 -8
- package/src/__tests__/conversation-routes-disk-view.test.ts +1 -161
- package/src/__tests__/conversation-routes-guardian-reply.test.ts +0 -32
- package/src/__tests__/conversation-routes-slash-commands.test.ts +75 -66
- package/src/__tests__/conversation-runtime-assembly.test.ts +257 -3
- package/src/__tests__/conversation-slash-commands.test.ts +24 -4
- package/src/__tests__/conversation-slash-queue.test.ts +2 -0
- package/src/__tests__/conversation-speed-override.test.ts +0 -3
- package/src/__tests__/conversation-starter-routes.test.ts +79 -2
- package/src/__tests__/conversation-surfaces-standalone-payloads.test.ts +12 -5
- package/src/__tests__/conversation-surfaces-standalone.test.ts +18 -14
- package/src/__tests__/conversation-surfaces-state-update.test.ts +3 -2
- package/src/__tests__/conversation-tool-setup-app-refresh.test.ts +8 -46
- package/src/__tests__/conversation-usage.test.ts +253 -3
- package/src/__tests__/credential-execution-shell-lockdown.test.ts +0 -39
- package/src/__tests__/credential-health-service.test.ts +68 -0
- package/src/__tests__/credential-security-e2e.test.ts +4 -3
- package/src/__tests__/credential-security-invariants.test.ts +1 -5
- package/src/__tests__/credential-token-resolver.test.ts +180 -0
- package/src/__tests__/cu-unified-flow.test.ts +33 -16
- package/src/__tests__/daemon-assistant-events.test.ts +34 -21
- package/src/__tests__/daemon-credential-client.test.ts +4 -1
- package/src/__tests__/db-connection-isolation.test.ts +125 -0
- package/src/__tests__/db-migration-rollback.test.ts +101 -0
- package/src/__tests__/db-slack-compaction-watermark-migration.test.ts +169 -0
- package/src/__tests__/deterministic-verification-control-plane.test.ts +7 -80
- package/src/__tests__/document-conversations.test.ts +332 -0
- package/src/__tests__/embedding-managed-proxy-selection.test.ts +2 -2
- package/src/__tests__/emit-event-signal.test.ts +4 -6
- package/src/__tests__/events-client-registration.test.ts +193 -49
- package/src/__tests__/filing-service.test.ts +58 -7
- package/src/__tests__/first-greeting.test.ts +156 -150
- package/src/__tests__/fixtures/mock-chrome-extension.ts +108 -66
- package/src/__tests__/get-skill-detail-audit.test.ts +3 -8
- package/src/__tests__/guardian-binding-drift-heal.test.ts +1 -1
- package/src/__tests__/guardian-dispatch.test.ts +1 -1
- package/src/__tests__/guardian-grant-minting.test.ts +7 -2
- package/src/__tests__/guardian-routing-invariants.test.ts +7 -2
- package/src/__tests__/guardian-routing-state.test.ts +1 -1
- package/src/__tests__/handlers-skills-memory-v2-reseed.test.ts +32 -11
- package/src/__tests__/handlers-user-message-approval-consumption.test.ts +2 -83
- package/src/__tests__/headless-browser-mode.test.ts +4 -9
- package/src/__tests__/headless-browser-navigate.test.ts +21 -20
- package/src/__tests__/heartbeat-service.test.ts +289 -7
- package/src/__tests__/helpers/channel-test-adapter.ts +2 -2
- package/src/__tests__/helpers/create-guardian-binding.ts +91 -0
- package/src/__tests__/host-bash-proxy.test.ts +46 -122
- package/src/__tests__/host-browser-e2e-cloud.test.ts +36 -497
- package/src/__tests__/host-browser-e2e-self-hosted-capability.test.ts +26 -96
- package/src/__tests__/host-browser-proxy.test.ts +111 -185
- package/src/__tests__/host-browser-routes.test.ts +45 -75
- package/src/__tests__/host-browser-ws-events-e2e.test.ts +26 -30
- package/src/__tests__/host-cu-proxy.test.ts +56 -111
- package/src/__tests__/host-file-proxy.test.ts +44 -98
- package/src/__tests__/host-file-read-tool.test.ts +42 -21
- package/src/__tests__/host-shell-tool.test.ts +33 -68
- package/src/__tests__/host-transfer-pending-interactions.test.ts +2 -18
- package/src/__tests__/host-transfer-proxy.test.ts +43 -53
- package/src/__tests__/http-user-message-parity.test.ts +0 -6
- package/src/__tests__/inbound-slack-persistence.test.ts +31 -0
- package/src/__tests__/injector-chain.test.ts +10 -5
- package/src/__tests__/injector-pkb-v2-silenced.test.ts +124 -0
- package/src/__tests__/inline-command-runner.test.ts +0 -66
- package/src/__tests__/inline-skill-load-permissions.test.ts +0 -2
- package/src/__tests__/install-skill-routing.test.ts +1 -13
- package/src/__tests__/llm-callsite-catalog.test.ts +34 -0
- package/src/__tests__/llm-catalog-parity.test.ts +90 -0
- package/src/__tests__/llm-context-resolution.test.ts +180 -0
- package/src/__tests__/llm-resolver.test.ts +80 -12
- package/src/__tests__/llm-usage-store.test.ts +269 -4
- package/src/__tests__/log-export-routes.test.ts +89 -0
- package/src/__tests__/managed-profile-guard.test.ts +225 -0
- package/src/__tests__/managed-skill-lifecycle.test.ts +0 -10
- package/src/__tests__/manual-token-reconciliation.test.ts +334 -0
- package/src/__tests__/memory-v2-static-injector.test.ts +95 -0
- package/src/__tests__/migration-cross-version-compatibility.test.ts +197 -291
- package/src/__tests__/migration-export-http.test.ts +33 -26
- package/src/__tests__/migration-export-streaming.test.ts +18 -10
- package/src/__tests__/migration-export-to-gcs.test.ts +49 -9
- package/src/__tests__/migration-import-commit-http.test.ts +66 -21
- package/src/__tests__/migration-import-from-gcs.test.ts +50 -9
- package/src/__tests__/migration-import-from-url.test.ts +20 -6
- package/src/__tests__/migration-import-preflight-http.test.ts +95 -95
- package/src/__tests__/migration-parity-persistence.test.ts +62 -25
- package/src/__tests__/migration-transport.test.ts +115 -23
- package/src/__tests__/migration-validate-http.test.ts +105 -80
- package/src/__tests__/migration-wizard.test.ts +133 -27
- package/src/__tests__/non-member-access-request.test.ts +1 -1
- package/src/__tests__/notification-guardian-path.test.ts +1 -1
- package/src/__tests__/oauth-store.test.ts +19 -0
- package/src/__tests__/platform-bash-auto-approve.test.ts +21 -12
- package/src/__tests__/prechat-onboarding-contract.test.ts +31 -7
- package/src/__tests__/pricing.test.ts +68 -4
- package/src/__tests__/process-message-background-slack.test.ts +331 -0
- package/src/__tests__/provider-managed-proxy-integration.test.ts +153 -17
- package/src/__tests__/provider-send-message-override-profile.test.ts +50 -0
- package/src/__tests__/provider-usage-tracking.test.ts +208 -0
- package/src/__tests__/reaction-persistence.test.ts +9 -6
- package/src/__tests__/rebind-secrets-screen.test.ts +53 -16
- package/src/__tests__/recording-handler.test.ts +64 -81
- package/src/__tests__/regenerate-fire-and-forget-trace.test.ts +4 -3
- package/src/__tests__/relay-server.test.ts +18 -13
- package/src/__tests__/require-fresh-approval.test.ts +13 -22
- package/src/__tests__/runtime-attachment-metadata.test.ts +1 -1
- package/src/__tests__/runtime-events-sse-parity.test.ts +3 -4
- package/src/__tests__/runtime-events-sse.test.ts +3 -12
- package/src/__tests__/search-skills-unified.test.ts +9 -15
- package/src/__tests__/secret-ingress-cli.test.ts +2 -5
- package/src/__tests__/secret-ingress-http.test.ts +0 -4
- package/src/__tests__/secret-onetime-send.test.ts +4 -2
- package/src/__tests__/secret-prompt-log-hygiene.test.ts +24 -7
- package/src/__tests__/secret-prompter-channel-fallback.test.ts +42 -47
- package/src/__tests__/secret-response-routing.test.ts +29 -15
- package/src/__tests__/secret-routes-managed-proxy.test.ts +5 -1
- package/src/__tests__/secret-scanner.test.ts +2 -545
- package/src/__tests__/send-endpoint-busy.test.ts +9 -24
- package/src/__tests__/settings-routes.test.ts +1 -1
- package/src/__tests__/shell-credential-ref.test.ts +0 -8
- package/src/__tests__/shell-tool-proxy-mode.test.ts +0 -56
- package/src/__tests__/skill-script-runner-sandbox.test.ts +0 -11
- package/src/__tests__/skill-tool-factory.test.ts +97 -0
- package/src/__tests__/skills-file-content-endpoint.test.ts +9 -30
- package/src/__tests__/skills-files-catalog-fallback.test.ts +11 -17
- package/src/__tests__/slack-inbound-verification.test.ts +1 -62
- package/src/__tests__/subagent-fork-notifications.test.ts +57 -47
- package/src/__tests__/subagent-manager-notify.test.ts +70 -70
- package/src/__tests__/subagent-notify-parent.test.ts +80 -83
- package/src/__tests__/system-prompt.test.ts +115 -13
- package/src/__tests__/terminal-tools.test.ts +0 -89
- package/src/__tests__/thread-backfill.test.ts +945 -31
- package/src/__tests__/tool-domain-event-publisher.test.ts +0 -36
- package/src/__tests__/tool-execute-pipeline.test.ts +0 -6
- package/src/__tests__/tool-execution-abort-cleanup.test.ts +0 -16
- package/src/__tests__/tool-execution-pipeline.benchmark.test.ts +9 -19
- package/src/__tests__/tool-executor-lifecycle-events.test.ts +4 -7
- package/src/__tests__/tool-executor.test.ts +12 -19
- package/src/__tests__/tool-metrics-listener.test.ts +0 -35
- package/src/__tests__/tool-side-effects-slack-dm.test.ts +1 -0
- package/src/__tests__/tool-trace-listener.test.ts +0 -17
- package/src/__tests__/transfer-progress-screen.test.ts +63 -26
- package/src/__tests__/trusted-contact-lifecycle-notifications.test.ts +2 -149
- package/src/__tests__/trusted-contact-multichannel.test.ts +2 -4
- package/src/__tests__/trusted-contact-verification.test.ts +1 -1
- package/src/__tests__/tts-catalog-parity.test.ts +16 -5
- package/src/__tests__/usage-attribution.test.ts +247 -0
- package/src/__tests__/usage-cli.test.ts +143 -0
- package/src/__tests__/usage-grouped-buckets.test.ts +155 -0
- package/src/__tests__/usage-routes.test.ts +150 -0
- package/src/__tests__/validation-results-screen.test.ts +39 -16
- package/src/__tests__/vbundle-pax-and-symlink.test.ts +12 -3
- package/src/__tests__/vellum-self-knowledge-inline-command.test.ts +49 -137
- package/src/__tests__/verification-control-plane-policy.test.ts +4 -7
- package/src/__tests__/voice-session-bridge.test.ts +5 -5
- package/src/__tests__/workspace-migration-062-drop-memory-v2-edges-json.test.ts +103 -0
- package/src/__tests__/workspace-migration-063-release-notes-dynamic-model-context.test.ts +77 -0
- package/src/__tests__/workspace-migration-064-unwind-main-agent-opus-seed.test.ts +225 -0
- package/src/__tests__/workspace-migration-memory-v2-init.test.ts +8 -30
- package/src/acp/index.ts +0 -15
- package/src/acp/session-manager.ts +37 -34
- package/src/agent/loop.ts +16 -1
- package/src/approvals/AGENTS.md +4 -0
- package/src/approvals/__tests__/guardian-feed-event.test.ts +10 -3
- package/src/approvals/guardian-request-resolvers.ts +10 -2
- package/src/backup/__tests__/backup-worker.test.ts +36 -8
- package/src/backup/__tests__/paths.test.ts +2 -2
- package/src/backup/__tests__/restore.test.ts +45 -28
- package/src/backup/backup-worker.ts +36 -2
- package/src/backup/paths.ts +9 -6
- package/src/browser-session/events.ts +0 -9
- package/src/calls/call-store.ts +1 -34
- package/src/calls/guardian-question-copy.ts +0 -108
- package/src/calls/relay-server.ts +0 -24
- package/src/calls/twilio-rest.ts +0 -38
- package/src/calls/twilio-routes.ts +1 -1
- package/src/calls/voice-session-bridge.ts +7 -38
- package/src/channels/types.ts +1 -36
- package/src/cli/commands/__tests__/cache.test.ts +152 -5
- package/src/cli/commands/__tests__/memory-v2.test.ts +14 -28
- package/src/cli/commands/__tests__/trust.test.ts +21 -387
- package/src/cli/commands/backup.ts +4 -4
- package/src/cli/commands/cache-fs.ts +8 -0
- package/src/cli/commands/cache.ts +153 -82
- package/src/cli/commands/clients.ts +63 -5
- package/src/cli/commands/completions.ts +3 -3
- package/src/cli/commands/contacts.ts +231 -76
- package/src/cli/commands/keys.ts +4 -1
- package/src/cli/commands/memory-v2.ts +24 -52
- package/src/cli/commands/oauth/shared.ts +2 -29
- package/src/cli/commands/pending.ts +102 -0
- package/src/cli/commands/skills.ts +77 -35
- package/src/cli/commands/trust.ts +70 -430
- package/src/cli/commands/usage.ts +25 -16
- package/src/cli/lib/daemon-credential-client.ts +14 -0
- package/src/cli/program.ts +2 -0
- package/src/cli.ts +0 -21
- package/src/config/__tests__/feature-flag-registry-guard.test.ts +2 -2
- package/src/config/bundled-skills/messaging/TOOLS.json +14 -4
- package/src/config/env-registry.ts +12 -2
- package/src/config/env.ts +3 -14
- package/src/config/feature-flag-registry.json +30 -30
- package/src/config/llm-callsite-catalog.ts +12 -0
- package/src/config/llm-context-resolution.ts +80 -0
- package/src/config/llm-resolver.ts +58 -22
- package/src/config/loader.ts +3 -3
- package/src/config/schema.ts +2 -158
- package/src/config/schemas/__tests__/memory-v2.test.ts +1 -0
- package/src/config/schemas/call-site-catalog.ts +271 -0
- package/src/config/schemas/calls.ts +5 -5
- package/src/config/schemas/inference.ts +1 -1
- package/src/config/schemas/ingress.ts +1 -1
- package/src/config/schemas/llm.ts +31 -3
- package/src/config/schemas/memory-retrieval.ts +2 -2
- package/src/config/schemas/memory-v2.ts +9 -0
- package/src/config/schemas/security.ts +1 -42
- package/src/config/schemas/services.ts +6 -6
- package/src/config/schemas/skills.ts +5 -5
- package/src/config/schemas/tts.ts +1 -1
- package/src/config/seed-inference-profiles.ts +117 -0
- package/src/config/skills.ts +0 -90
- package/src/config/types.ts +3 -6
- package/src/contacts/contact-store.ts +0 -17
- package/src/contacts/contacts-write.ts +1 -105
- package/src/context/window-manager.ts +44 -5
- package/src/credential-execution/process-manager.ts +34 -10
- package/src/credential-health/credential-health-service.ts +21 -16
- package/src/daemon/__tests__/conversation-surfaces-launch.test.ts +75 -82
- package/src/daemon/__tests__/daemon-skill-host.test.ts +2 -9
- package/src/daemon/connection-policy.ts +1 -26
- package/src/daemon/conversation-agent-loop-handlers.ts +53 -4
- package/src/daemon/conversation-agent-loop.ts +277 -36
- package/src/daemon/conversation-history.ts +8 -8
- package/src/daemon/conversation-launch.ts +20 -135
- package/src/daemon/conversation-lifecycle.ts +1 -1
- package/src/daemon/conversation-messaging.ts +1 -0
- package/src/daemon/conversation-process.ts +83 -163
- package/src/daemon/conversation-runtime-assembly.ts +219 -76
- package/src/daemon/conversation-slash.ts +47 -5
- package/src/daemon/conversation-store.ts +7 -31
- package/src/daemon/conversation-surfaces.ts +22 -28
- package/src/daemon/conversation-tool-setup.ts +3 -33
- package/src/daemon/conversation-usage.ts +36 -0
- package/src/daemon/conversation.ts +117 -233
- package/src/daemon/daemon-control.ts +3 -71
- package/src/daemon/daemon-skill-host.ts +8 -11
- package/src/daemon/dictation-profile-store.ts +2 -26
- package/src/daemon/first-greeting.ts +44 -156
- package/src/daemon/handlers/config-channels.ts +12 -12
- package/src/daemon/handlers/config-ingress.ts +4 -165
- package/src/daemon/handlers/config-model.ts +1 -1
- package/src/daemon/handlers/config-voice.ts +0 -42
- package/src/daemon/handlers/conversations.ts +11 -190
- package/src/daemon/handlers/recording.ts +26 -158
- package/src/daemon/handlers/shared.ts +23 -71
- package/src/daemon/handlers/skills.ts +42 -93
- package/src/daemon/host-bash-proxy.ts +67 -45
- package/src/daemon/host-browser-proxy.ts +65 -27
- package/src/daemon/host-cu-proxy.ts +40 -39
- package/src/daemon/host-file-proxy.ts +58 -37
- package/src/daemon/host-transfer-proxy.ts +84 -46
- package/src/daemon/lifecycle.ts +49 -15
- package/src/daemon/message-types/conversations.ts +7 -0
- package/src/daemon/message-types/host-bash.ts +1 -0
- package/src/daemon/message-types/host-cu.ts +1 -0
- package/src/daemon/message-types/host-file.ts +1 -0
- package/src/daemon/message-types/host-transfer.ts +1 -0
- package/src/daemon/message-types/messages.ts +10 -9
- package/src/daemon/message-types/workspace.ts +1 -1
- package/src/daemon/process-message.ts +102 -239
- package/src/daemon/server.ts +13 -462
- package/src/daemon/shutdown-handlers.ts +2 -2
- package/src/daemon/tool-side-effects.ts +125 -107
- package/src/daemon/trust-context.ts +13 -0
- package/src/daemon/wake-target-adapter.ts +4 -9
- package/src/events/domain-events.ts +0 -8
- package/src/events/tool-audit-listener.ts +3 -1
- package/src/events/tool-domain-event-publisher.ts +0 -10
- package/src/events/tool-metrics-listener.ts +0 -17
- package/src/events/tool-trace-listener.ts +0 -14
- package/src/filing/filing-service.ts +13 -1
- package/src/heartbeat/__tests__/heartbeat-feed-event.test.ts +6 -2
- package/src/heartbeat/heartbeat-service.ts +23 -5
- package/src/home/__tests__/feed-writer.test.ts +0 -4
- package/src/home/__tests__/relationship-state-writer.test.ts +30 -0
- package/src/home/feed-writer.ts +1 -2
- package/src/home/relationship-state-writer.ts +16 -3
- package/src/ipc/__tests__/browser-ipc.test.ts +2 -12
- package/src/ipc/__tests__/skill-server-bidirectional.test.ts +0 -1
- package/src/ipc/assistant-server.ts +3 -10
- package/src/ipc/routes/__tests__/memory-v2-backfill.test.ts +39 -20
- package/src/ipc/routes/route-adapter.ts +1 -1
- package/src/ipc/routes/trust-rules.test.ts +0 -95
- package/src/ipc/skill-ipc-types.ts +41 -0
- package/src/ipc/skill-routes/__tests__/events-ipc.test.ts +13 -27
- package/src/ipc/skill-routes/__tests__/identity.test.ts +4 -23
- package/src/ipc/skill-routes/events.ts +12 -23
- package/src/ipc/skill-routes/identity.ts +4 -17
- package/src/ipc/skill-routes/index.ts +1 -1
- package/src/ipc/skill-server.ts +6 -39
- package/src/live-voice/__tests__/runtime-websocket-shell.test.ts +0 -8
- package/src/live-voice/protocol.ts +4 -13
- package/src/mcp/manager.ts +0 -5
- package/src/memory/__tests__/fixtures/memory-v2-activation-fixtures.ts +55 -0
- package/src/memory/__tests__/memory-v2-activation-log-store.test.ts +127 -0
- package/src/memory/app-git-service.ts +0 -32
- package/src/memory/app-store.ts +154 -0
- package/src/memory/attachments-store.ts +6 -0
- package/src/memory/context-search/sources/memory-v2.ts +578 -0
- package/src/memory/context-search/sources/memory.ts +5 -0
- package/src/memory/context-search/sources/pkb.ts +10 -1
- package/src/memory/context-search/sources/workspace.ts +3 -2
- package/src/memory/conversation-crud.ts +29 -4
- package/src/memory/conversation-disk-view.ts +1 -5
- package/src/memory/conversation-starter-checkpoints.ts +63 -0
- package/src/memory/db-connection.ts +62 -0
- package/src/memory/db-init.ts +14 -0
- package/src/memory/embedding-backend.ts +3 -21
- package/src/memory/embedding-gemini.ts +0 -2
- package/src/memory/embedding-local.ts +6 -6
- package/src/memory/embedding-ollama.ts +6 -6
- package/src/memory/embedding-openai.ts +6 -6
- package/src/memory/embedding-types.ts +21 -0
- package/src/memory/graph/__tests__/conversation-graph-memory-v2-routing.test.ts +3 -7
- package/src/memory/graph/conversation-graph-memory.ts +35 -13
- package/src/memory/graph/injection.test.ts +2 -2
- package/src/memory/graph/injection.ts +1 -1
- package/src/memory/guardian-action-store.ts +0 -83
- package/src/memory/guardian-approvals.ts +0 -48
- package/src/memory/indexer.ts +1 -15
- package/src/memory/job-handlers/conversation-starters.ts +36 -53
- package/src/memory/job-utils.ts +0 -6
- package/src/memory/jobs-store.ts +0 -1
- package/src/memory/jobs-worker.ts +2 -16
- package/src/memory/llm-request-log-store.ts +0 -41
- package/src/memory/llm-usage-store.ts +129 -43
- package/src/memory/memory-v2-activation-log-store.ts +115 -0
- package/src/memory/migrations/233-document-conversations.ts +54 -0
- package/src/memory/migrations/234-memory-v2-activation-logs.ts +55 -0
- package/src/memory/migrations/235-llm-usage-attribution.ts +31 -0
- package/src/memory/migrations/235-slack-compaction-watermark.ts +44 -0
- package/src/memory/migrations/236-tool-invocations-matched-rule-id.ts +26 -0
- package/src/memory/migrations/__tests__/234-memory-v2-activation-logs.test.ts +182 -0
- package/src/memory/migrations/index.ts +14 -0
- package/src/memory/migrations/registry.ts +24 -0
- package/src/memory/raw-query.ts +2 -68
- package/src/memory/schema/conversations.ts +7 -0
- package/src/memory/schema/infrastructure.ts +25 -0
- package/src/memory/search/semantic.ts +5 -16
- package/src/memory/tool-usage-store.ts +2 -0
- package/src/memory/usage-buckets.ts +40 -1
- package/src/memory/usage-grouped-buckets.ts +127 -0
- package/src/memory/v2/__tests__/activation.test.ts +289 -90
- package/src/memory/v2/__tests__/backfill-jobs.test.ts +2 -129
- package/src/memory/v2/__tests__/consolidation-job.test.ts +28 -11
- package/src/memory/v2/__tests__/edge-index.test.ts +278 -0
- package/src/memory/v2/__tests__/injection.test.ts +384 -15
- package/src/memory/v2/__tests__/migration.test.ts +64 -36
- package/src/memory/v2/__tests__/page-store.test.ts +191 -8
- package/src/memory/v2/__tests__/prompts-consolidation.test.ts +181 -0
- package/src/memory/v2/__tests__/skill-store.test.ts +115 -3
- package/src/memory/v2/__tests__/static-context.test.ts +153 -0
- package/src/memory/v2/activation.ts +168 -97
- package/src/memory/v2/backfill-jobs.ts +15 -100
- package/src/memory/v2/consolidation-job.ts +14 -12
- package/src/memory/v2/edge-index.ts +191 -0
- package/src/memory/v2/injection.ts +182 -58
- package/src/memory/v2/migration.ts +57 -64
- package/src/memory/v2/now-text.ts +2 -3
- package/src/memory/v2/page-store.ts +168 -31
- package/src/memory/v2/prompts/consolidation.ts +118 -42
- package/src/memory/v2/prompts/sweep.ts +3 -3
- package/src/memory/v2/skill-store.ts +55 -7
- package/src/memory/v2/static-context.ts +62 -0
- package/src/memory/v2/types.ts +10 -20
- package/src/memory/validation.ts +0 -11
- package/src/messaging/draft-store.ts +0 -6
- package/src/messaging/provider-types.ts +8 -0
- package/src/messaging/provider.ts +7 -0
- package/src/messaging/providers/gmail/client.ts +1 -121
- package/src/messaging/providers/outlook/client.ts +0 -73
- package/src/messaging/providers/slack/__tests__/adapter-mention-rendering.test.ts +226 -0
- package/src/messaging/providers/slack/adapter.ts +122 -21
- package/src/messaging/providers/slack/backfill.test.ts +95 -6
- package/src/messaging/providers/slack/backfill.ts +89 -11
- package/src/messaging/providers/slack/client.ts +10 -124
- package/src/messaging/providers/slack/message-metadata.ts +12 -2
- package/src/messaging/providers/slack/render-transcript.test.ts +56 -0
- package/src/messaging/providers/slack/render-transcript.ts +126 -25
- package/src/messaging/providers/slack/types.ts +1 -0
- package/src/oauth/connection-resolver.test.ts +8 -0
- package/src/oauth/connection-resolver.ts +8 -16
- package/src/oauth/credential-token-resolver.ts +97 -0
- package/src/oauth/manual-token-connection.ts +30 -34
- package/src/oauth/oauth-store.ts +6 -4
- package/src/outbound-proxy/certs.ts +0 -7
- package/src/outbound-proxy/config.ts +0 -74
- package/src/outbound-proxy/health.ts +0 -44
- package/src/outbound-proxy/index.ts +0 -22
- package/src/permissions/approval-provenance.test.ts +184 -0
- package/src/permissions/approval-provenance.ts +70 -0
- package/src/permissions/checker.ts +4 -1
- package/src/permissions/gateway-threshold-reader.ts +4 -1
- package/src/permissions/prompter.ts +9 -2
- package/src/permissions/secret-prompter.ts +21 -48
- package/src/permissions/types.ts +33 -0
- package/src/permissions/workspace-policy.ts +0 -5
- package/src/platform/sync-identity.ts +0 -8
- package/src/plugins/defaults/injectors.ts +69 -2
- package/src/plugins/defaults/overflow-reduce.ts +3 -2
- package/src/plugins/types.ts +8 -0
- package/src/prompts/system-prompt.ts +34 -70
- package/src/prompts/templates/BOOTSTRAP.md +52 -6
- package/src/prompts/update-bulletin-job.ts +2 -0
- package/src/providers/__tests__/retry-callsite.test.ts +138 -1
- package/src/providers/anthropic/client.ts +72 -33
- package/src/providers/call-site-routing.ts +42 -3
- package/src/providers/gemini/client.ts +18 -2
- package/src/providers/managed-proxy/context.ts +0 -5
- package/src/providers/model-catalog.ts +105 -19
- package/src/providers/openai/chat-completions-provider.ts +6 -0
- package/src/providers/openai/responses-provider.ts +7 -1
- package/src/providers/provider-send-message.ts +45 -2
- package/src/providers/ratelimit.ts +7 -2
- package/src/providers/registry.ts +14 -9
- package/src/providers/retry.ts +96 -8
- package/src/providers/types.ts +13 -0
- package/src/providers/usage-tracking.ts +96 -0
- package/src/runtime/AGENTS.md +10 -6
- package/src/runtime/__tests__/agent-wake.test.ts +89 -0
- package/src/runtime/agent-wake.ts +39 -2
- package/src/runtime/assistant-event-hub.ts +541 -45
- package/src/runtime/assistant-event.ts +1 -6
- package/src/runtime/auth/context.ts +0 -9
- package/src/runtime/auth/middleware.ts +1 -1
- package/src/runtime/auth/route-policy.ts +11 -9
- package/src/runtime/auth/token-service.ts +0 -11
- package/src/runtime/channel-approvals.ts +6 -2
- package/src/runtime/channel-verification-service.ts +3 -5
- package/src/runtime/http-errors.ts +0 -34
- package/src/runtime/http-router.ts +6 -3
- package/src/runtime/http-server.ts +22 -82
- package/src/runtime/http-types.ts +5 -0
- package/src/runtime/interactive-ui.ts +0 -1
- package/src/runtime/middleware/auth.ts +0 -20
- package/src/runtime/migrations/__tests__/v1-test-helpers.ts +112 -0
- package/src/runtime/migrations/__tests__/vbundle-builder-credentials.test.ts +11 -4
- package/src/runtime/migrations/__tests__/vbundle-builder-v1-shape.test.ts +253 -0
- package/src/runtime/migrations/__tests__/vbundle-import-credentials.test.ts +19 -6
- package/src/runtime/migrations/__tests__/vbundle-legacy-user-md.test.ts +71 -27
- package/src/runtime/migrations/__tests__/vbundle-metadata-merge-integration.test.ts +41 -2
- package/src/runtime/migrations/__tests__/vbundle-streaming-importer.test.ts +143 -79
- package/src/runtime/migrations/__tests__/vbundle-streaming-validator.test.ts +143 -23
- package/src/runtime/migrations/__tests__/vbundle-tar-stream.test.ts +2 -2
- package/src/runtime/migrations/__tests__/vbundle-validator-v1-schema.test.ts +371 -0
- package/src/runtime/migrations/migration-transport.ts +46 -13
- package/src/runtime/migrations/migration-wizard.ts +2 -2
- package/src/runtime/migrations/origin-mode.ts +40 -0
- package/src/runtime/migrations/vbundle-builder.ts +133 -79
- package/src/runtime/migrations/vbundle-import-analyzer.ts +9 -7
- package/src/runtime/migrations/vbundle-importer.ts +7 -7
- package/src/runtime/migrations/vbundle-metadata-merge.ts +1 -1
- package/src/runtime/migrations/vbundle-streaming-importer.ts +3 -3
- package/src/runtime/migrations/vbundle-streaming-validator.ts +48 -26
- package/src/runtime/migrations/vbundle-validator.ts +214 -41
- package/src/runtime/pending-interactions.ts +13 -4
- package/src/runtime/routes/__tests__/acp-routes.test.ts +0 -1
- package/src/runtime/routes/__tests__/backup-routes.test.ts +28 -19
- package/src/runtime/routes/__tests__/conversation-query-routes.test.ts +235 -0
- package/src/runtime/routes/__tests__/llm-call-sites-routes.test.ts +58 -0
- package/src/runtime/routes/__tests__/migration-export-secrets-redacted.test.ts +54 -0
- package/src/runtime/routes/__tests__/migration-import-credential-filter.test.ts +19 -6
- package/src/runtime/routes/__tests__/user-route-dispatcher.test.ts +7 -7
- package/src/runtime/routes/acp-routes.test.ts +0 -3
- package/src/runtime/routes/acp-routes.ts +3 -7
- package/src/runtime/routes/app-management-routes.ts +18 -9
- package/src/runtime/routes/approval-routes.ts +55 -14
- package/src/runtime/routes/avatar-routes.ts +3 -5
- package/src/runtime/routes/browser-routes.ts +1 -15
- package/src/runtime/routes/channel-guardian-routes.ts +1 -5
- package/src/runtime/routes/channel-readiness-routes.ts +3 -7
- package/src/runtime/routes/channel-route-shared.ts +2 -28
- package/src/runtime/routes/client-routes.ts +45 -12
- package/src/runtime/routes/consolidation-routes.ts +115 -0
- package/src/runtime/routes/conversation-list-routes.ts +12 -29
- package/src/runtime/routes/conversation-management-routes.ts +14 -51
- package/src/runtime/routes/conversation-query-routes.ts +120 -8
- package/src/runtime/routes/conversation-routes.ts +44 -528
- package/src/runtime/routes/conversation-starter-routes.ts +19 -40
- package/src/runtime/routes/documents-routes.ts +53 -18
- package/src/runtime/routes/events-routes.ts +59 -91
- package/src/runtime/routes/filing-routes.ts +18 -1
- package/src/runtime/routes/guardian-action-routes.ts +4 -9
- package/src/runtime/routes/host-bash-routes.ts +3 -2
- package/src/runtime/routes/host-browser-routes.ts +9 -33
- package/src/runtime/routes/host-cu-routes.ts +6 -1
- package/src/runtime/routes/host-file-routes.ts +3 -2
- package/src/runtime/routes/host-transfer-routes.ts +11 -15
- package/src/runtime/routes/identity-routes.ts +78 -6
- package/src/runtime/routes/inbound-message-handler.ts +580 -137
- package/src/runtime/routes/inbound-stages/acl-enforcement.ts +2 -88
- package/src/runtime/routes/inbound-stages/background-dispatch.ts +3 -0
- package/src/runtime/routes/index.ts +4 -0
- package/src/runtime/routes/integrations/slack/channel.ts +0 -24
- package/src/runtime/routes/llm-call-sites-routes.ts +22 -0
- package/src/runtime/routes/memory-v2-routes.ts +10 -15
- package/src/runtime/routes/migration-routes.ts +188 -31
- package/src/runtime/routes/playground/guard.ts +1 -1
- package/src/runtime/routes/playground/index.ts +0 -2
- package/src/runtime/routes/recording-routes.ts +4 -24
- package/src/runtime/routes/rename-conversation-routes.ts +2 -6
- package/src/runtime/routes/schedule-routes.ts +3 -6
- package/src/runtime/routes/secret-routes.ts +87 -18
- package/src/runtime/routes/settings-routes.ts +29 -28
- package/src/runtime/routes/skills-routes.ts +12 -31
- package/src/runtime/routes/suggest-trust-rule-routes.ts +32 -1
- package/src/runtime/routes/task-routes.ts +6 -6
- package/src/runtime/routes/trust-rules-routes.ts +3 -94
- package/src/runtime/routes/types.ts +4 -4
- package/src/runtime/routes/upgrade-broadcast-routes.ts +3 -10
- package/src/runtime/routes/usage-routes.ts +87 -10
- package/src/runtime/routes/user-routes.ts +17 -31
- package/src/runtime/routes/work-items-routes.ts +1 -4
- package/src/runtime/services/__tests__/analyze-conversation.test.ts +2 -2
- package/src/runtime/services/analyze-conversation.ts +7 -17
- package/src/runtime/services/conversation-serializer.ts +2 -4
- package/src/runtime/verification-outbound-actions.ts +1 -1
- package/src/runtime/verification-rate-limiter.ts +1 -1
- package/src/schedule/schedule-store.ts +0 -16
- package/src/security/secret-scanner.ts +14 -547
- package/src/security/secure-keys.ts +31 -11
- package/src/security/token-manager.ts +7 -3
- package/src/signals/cancel.ts +16 -25
- package/src/signals/conversation-undo.ts +2 -27
- package/src/signals/emit-event.ts +1 -2
- package/src/signals/user-message.ts +108 -22
- package/src/skills/catalog-install.ts +1 -0
- package/src/skills/clawhub.ts +2 -2
- package/src/skills/inline-command-runner.ts +1 -7
- package/src/subagent/manager.ts +67 -84
- package/src/tasks/task-store.ts +1 -28
- package/src/telemetry/types.ts +6 -0
- package/src/telemetry/usage-telemetry-reporter.test.ts +38 -15
- package/src/telemetry/usage-telemetry-reporter.ts +3 -5
- package/src/tools/acp/spawn.test.ts +1 -2
- package/src/tools/acp/steer.test.ts +1 -2
- package/src/tools/browser/__tests__/browser-status.test.ts +44 -127
- package/src/tools/browser/browser-execution.ts +31 -147
- package/src/tools/browser/cdp-client/__tests__/factory.test.ts +92 -68
- package/src/tools/browser/cdp-client/factory.ts +48 -76
- package/src/tools/browser/cdp-client/index.ts +1 -14
- package/src/tools/executor.ts +44 -31
- package/src/tools/host-filesystem/edit.ts +3 -2
- package/src/tools/host-filesystem/read.ts +3 -2
- package/src/tools/host-filesystem/transfer.test.ts +45 -42
- package/src/tools/host-filesystem/transfer.ts +4 -3
- package/src/tools/host-filesystem/write.ts +3 -2
- package/src/tools/host-terminal/host-shell.ts +4 -3
- package/src/tools/network/script-proxy/index.ts +1 -10
- package/src/tools/permission-checker.ts +66 -1
- package/src/tools/skills/sandbox-runner.ts +1 -6
- package/src/tools/skills/skill-tool-factory.ts +32 -0
- package/src/tools/terminal/safe-env.ts +1 -0
- package/src/tools/terminal/shell.ts +2 -78
- package/src/tools/types.ts +12 -39
- package/src/tts/__tests__/provider-catalog.test.ts +2 -2
- package/src/tts/provider-catalog.ts +1 -1
- package/src/usage/actors.ts +2 -1
- package/src/usage/attribution.ts +185 -0
- package/src/usage/pricing.ts +166 -0
- package/src/usage/types.ts +14 -0
- package/src/util/json.ts +13 -0
- package/src/util/logger.ts +3 -3
- package/src/util/pricing.ts +50 -3
- package/src/work-items/work-item-runner.ts +15 -42
- package/src/workspace/migrations/050-seed-main-agent-opus-callsite.ts +4 -3
- package/src/workspace/migrations/052-seed-default-inference-profiles.ts +3 -3
- package/src/workspace/migrations/060-memory-v2-init.ts +2 -18
- package/src/workspace/migrations/061-move-backup-key-to-workspace.ts +59 -0
- package/src/workspace/migrations/062-drop-memory-v2-edges-json.ts +27 -0
- package/src/workspace/migrations/063-release-notes-dynamic-model-context.ts +70 -0
- package/src/workspace/migrations/064-unwind-main-agent-opus-seed.ts +64 -0
- package/src/workspace/migrations/registry.ts +8 -0
- package/src/workspace/provider-commit-message-generator.ts +3 -3
- package/src/__tests__/sandbox-diagnostics.test.ts +0 -138
- package/src/__tests__/sandbox-host-parity.test.ts +0 -1024
- package/src/__tests__/secret-detection-handler.test.ts +0 -67
- package/src/__tests__/secret-scanner-executor.test.ts +0 -450
- package/src/__tests__/tcc-sandbox-deny.test.ts +0 -198
- package/src/__tests__/terminal-sandbox.test.ts +0 -374
- package/src/__tests__/tool-notification-listener.test.ts +0 -65
- package/src/context/__tests__/microcompact.test.ts +0 -805
- package/src/context/microcompact.ts +0 -443
- package/src/daemon/handlers/slack-channel-oauth-install.ts +0 -197
- package/src/events/tool-notification-listener.ts +0 -17
- package/src/ipc/routes/__tests__/memory-v2-validate.test.ts +0 -219
- package/src/memory/v2/__tests__/edges.test.ts +0 -435
- package/src/memory/v2/edges.ts +0 -217
- package/src/prompts/__tests__/system-prompt-memory-v2.test.ts +0 -197
- package/src/runtime/__tests__/chrome-extension-registry.test.ts +0 -518
- package/src/runtime/__tests__/client-registry.test.ts +0 -271
- package/src/runtime/chrome-extension-registry.ts +0 -368
- package/src/runtime/client-registry.ts +0 -254
- package/src/runtime/routes/inbound-stages/verification-intercept.ts +0 -329
- package/src/tools/secret-detection-handler.ts +0 -269
- package/src/tools/terminal/backends/native.ts +0 -327
- package/src/tools/terminal/backends/types.ts +0 -37
- package/src/tools/terminal/sandbox-diagnostics.ts +0 -87
- package/src/tools/terminal/sandbox.ts +0 -40
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import { Database } from "bun:sqlite";
|
|
2
|
+
import { describe, expect, test } from "bun:test";
|
|
3
|
+
|
|
4
|
+
import { drizzle } from "drizzle-orm/bun-sqlite";
|
|
5
|
+
|
|
6
|
+
import { getSqliteFrom } from "../../db-connection.js";
|
|
7
|
+
import * as schema from "../../schema.js";
|
|
8
|
+
import {
|
|
9
|
+
downMemoryV2ActivationLogs,
|
|
10
|
+
migrateMemoryV2ActivationLogs,
|
|
11
|
+
} from "../234-memory-v2-activation-logs.js";
|
|
12
|
+
|
|
13
|
+
interface TableRow {
|
|
14
|
+
name: string;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
interface IndexRow {
|
|
18
|
+
name: string;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
interface ColumnRow {
|
|
22
|
+
name: string;
|
|
23
|
+
type: string;
|
|
24
|
+
notnull: number;
|
|
25
|
+
dflt_value: string | null;
|
|
26
|
+
pk: number;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
function createTestDb() {
|
|
30
|
+
const sqlite = new Database(":memory:");
|
|
31
|
+
sqlite.exec("PRAGMA journal_mode=WAL");
|
|
32
|
+
sqlite.exec("PRAGMA foreign_keys = ON");
|
|
33
|
+
return drizzle(sqlite, { schema });
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function bootstrapCheckpointsTable(raw: Database): void {
|
|
37
|
+
raw.exec(/*sql*/ `
|
|
38
|
+
CREATE TABLE IF NOT EXISTS memory_checkpoints (
|
|
39
|
+
key TEXT PRIMARY KEY,
|
|
40
|
+
value TEXT NOT NULL,
|
|
41
|
+
updated_at INTEGER NOT NULL
|
|
42
|
+
)
|
|
43
|
+
`);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const EXPECTED_INDEXES = [
|
|
47
|
+
"idx_memory_v2_activation_logs_message_id",
|
|
48
|
+
"idx_memory_v2_activation_logs_conversation_id",
|
|
49
|
+
"idx_memory_v2_activation_logs_created_at",
|
|
50
|
+
];
|
|
51
|
+
|
|
52
|
+
describe("memory_v2_activation_logs migration", () => {
|
|
53
|
+
test("creates table with expected columns and indexes", () => {
|
|
54
|
+
const db = createTestDb();
|
|
55
|
+
const raw = getSqliteFrom(db);
|
|
56
|
+
bootstrapCheckpointsTable(raw);
|
|
57
|
+
|
|
58
|
+
migrateMemoryV2ActivationLogs(db);
|
|
59
|
+
|
|
60
|
+
const tableRow = raw
|
|
61
|
+
.query(
|
|
62
|
+
`SELECT name FROM sqlite_master WHERE type='table' AND name='memory_v2_activation_logs'`,
|
|
63
|
+
)
|
|
64
|
+
.get() as TableRow | null;
|
|
65
|
+
expect(tableRow?.name).toBe("memory_v2_activation_logs");
|
|
66
|
+
|
|
67
|
+
const columns = raw
|
|
68
|
+
.query(`PRAGMA table_info(memory_v2_activation_logs)`)
|
|
69
|
+
.all() as ColumnRow[];
|
|
70
|
+
const byName = new Map(columns.map((c) => [c.name, c]));
|
|
71
|
+
|
|
72
|
+
expect(byName.get("id")?.pk).toBe(1);
|
|
73
|
+
expect(byName.get("id")?.type).toBe("TEXT");
|
|
74
|
+
expect(byName.get("conversation_id")?.notnull).toBe(1);
|
|
75
|
+
expect(byName.get("conversation_id")?.type).toBe("TEXT");
|
|
76
|
+
expect(byName.get("message_id")?.notnull).toBe(0);
|
|
77
|
+
expect(byName.get("message_id")?.type).toBe("TEXT");
|
|
78
|
+
expect(byName.get("turn")?.notnull).toBe(1);
|
|
79
|
+
expect(byName.get("turn")?.type).toBe("INTEGER");
|
|
80
|
+
expect(byName.get("mode")?.notnull).toBe(1);
|
|
81
|
+
expect(byName.get("mode")?.type).toBe("TEXT");
|
|
82
|
+
expect(byName.get("concepts_json")?.notnull).toBe(1);
|
|
83
|
+
expect(byName.get("concepts_json")?.type).toBe("TEXT");
|
|
84
|
+
expect(byName.get("skills_json")?.notnull).toBe(1);
|
|
85
|
+
expect(byName.get("skills_json")?.type).toBe("TEXT");
|
|
86
|
+
expect(byName.get("config_json")?.notnull).toBe(1);
|
|
87
|
+
expect(byName.get("config_json")?.type).toBe("TEXT");
|
|
88
|
+
expect(byName.get("created_at")?.notnull).toBe(1);
|
|
89
|
+
expect(byName.get("created_at")?.type).toBe("INTEGER");
|
|
90
|
+
|
|
91
|
+
const indexes = raw
|
|
92
|
+
.query(
|
|
93
|
+
`SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='memory_v2_activation_logs'`,
|
|
94
|
+
)
|
|
95
|
+
.all() as IndexRow[];
|
|
96
|
+
const indexNames = new Set(indexes.map((r) => r.name));
|
|
97
|
+
for (const expected of EXPECTED_INDEXES) {
|
|
98
|
+
expect(indexNames.has(expected)).toBe(true);
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
test("re-running the migration is a no-op", () => {
|
|
103
|
+
const db = createTestDb();
|
|
104
|
+
const raw = getSqliteFrom(db);
|
|
105
|
+
bootstrapCheckpointsTable(raw);
|
|
106
|
+
|
|
107
|
+
migrateMemoryV2ActivationLogs(db);
|
|
108
|
+
|
|
109
|
+
raw
|
|
110
|
+
.query(
|
|
111
|
+
/*sql*/ `
|
|
112
|
+
INSERT INTO memory_v2_activation_logs (
|
|
113
|
+
id,
|
|
114
|
+
conversation_id,
|
|
115
|
+
message_id,
|
|
116
|
+
turn,
|
|
117
|
+
mode,
|
|
118
|
+
concepts_json,
|
|
119
|
+
skills_json,
|
|
120
|
+
config_json,
|
|
121
|
+
created_at
|
|
122
|
+
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
123
|
+
`,
|
|
124
|
+
)
|
|
125
|
+
.run(
|
|
126
|
+
"log-1",
|
|
127
|
+
"conv-abc",
|
|
128
|
+
"msg-xyz",
|
|
129
|
+
3,
|
|
130
|
+
"per-turn",
|
|
131
|
+
"[]",
|
|
132
|
+
"[]",
|
|
133
|
+
"{}",
|
|
134
|
+
1000,
|
|
135
|
+
);
|
|
136
|
+
|
|
137
|
+
expect(() => migrateMemoryV2ActivationLogs(db)).not.toThrow();
|
|
138
|
+
|
|
139
|
+
const row = raw
|
|
140
|
+
.query(`SELECT id FROM memory_v2_activation_logs WHERE id = 'log-1'`)
|
|
141
|
+
.get() as { id: string } | null;
|
|
142
|
+
expect(row?.id).toBe("log-1");
|
|
143
|
+
|
|
144
|
+
const indexes = raw
|
|
145
|
+
.query(
|
|
146
|
+
`SELECT name FROM sqlite_master WHERE type='index' AND tbl_name='memory_v2_activation_logs'`,
|
|
147
|
+
)
|
|
148
|
+
.all() as IndexRow[];
|
|
149
|
+
const indexNames = new Set(indexes.map((r) => r.name));
|
|
150
|
+
for (const expected of EXPECTED_INDEXES) {
|
|
151
|
+
expect(indexNames.has(expected)).toBe(true);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
test("down() drops the table and is idempotent", () => {
|
|
156
|
+
const db = createTestDb();
|
|
157
|
+
const raw = getSqliteFrom(db);
|
|
158
|
+
bootstrapCheckpointsTable(raw);
|
|
159
|
+
|
|
160
|
+
migrateMemoryV2ActivationLogs(db);
|
|
161
|
+
|
|
162
|
+
expect(
|
|
163
|
+
raw
|
|
164
|
+
.query(
|
|
165
|
+
`SELECT name FROM sqlite_master WHERE type='table' AND name='memory_v2_activation_logs'`,
|
|
166
|
+
)
|
|
167
|
+
.get(),
|
|
168
|
+
).toBeTruthy();
|
|
169
|
+
|
|
170
|
+
downMemoryV2ActivationLogs(db);
|
|
171
|
+
|
|
172
|
+
expect(
|
|
173
|
+
raw
|
|
174
|
+
.query(
|
|
175
|
+
`SELECT name FROM sqlite_master WHERE type='table' AND name='memory_v2_activation_logs'`,
|
|
176
|
+
)
|
|
177
|
+
.get(),
|
|
178
|
+
).toBeNull();
|
|
179
|
+
|
|
180
|
+
expect(() => downMemoryV2ActivationLogs(db)).not.toThrow();
|
|
181
|
+
});
|
|
182
|
+
});
|
|
@@ -181,6 +181,20 @@ export {
|
|
|
181
181
|
downActivationState,
|
|
182
182
|
migrateActivationState,
|
|
183
183
|
} from "./232-activation-state.js";
|
|
184
|
+
export { migrateCreateDocumentConversations } from "./233-document-conversations.js";
|
|
185
|
+
export {
|
|
186
|
+
downMemoryV2ActivationLogs,
|
|
187
|
+
migrateMemoryV2ActivationLogs,
|
|
188
|
+
} from "./234-memory-v2-activation-logs.js";
|
|
189
|
+
export { migrateLlmUsageAttribution } from "./235-llm-usage-attribution.js";
|
|
190
|
+
export {
|
|
191
|
+
downSlackCompactionWatermark,
|
|
192
|
+
migrateSlackCompactionWatermark,
|
|
193
|
+
} from "./235-slack-compaction-watermark.js";
|
|
194
|
+
export {
|
|
195
|
+
downToolInvocationsMatchedRuleId,
|
|
196
|
+
migrateToolInvocationsMatchedRuleId,
|
|
197
|
+
} from "./236-tool-invocations-matched-rule-id.js";
|
|
184
198
|
export {
|
|
185
199
|
MIGRATION_REGISTRY,
|
|
186
200
|
type MigrationRegistryEntry,
|
|
@@ -44,6 +44,9 @@ import { migrateScrubCorruptedImageAttachmentsDown } from "./206-scrub-corrupted
|
|
|
44
44
|
import { downConversationHostAccess } from "./217-conversation-host-access.js";
|
|
45
45
|
import { downNormalizeUserFileByPrincipal } from "./220-normalize-user-file-by-principal.js";
|
|
46
46
|
import { downActivationState } from "./232-activation-state.js";
|
|
47
|
+
import { downMemoryV2ActivationLogs } from "./234-memory-v2-activation-logs.js";
|
|
48
|
+
import { downSlackCompactionWatermark } from "./235-slack-compaction-watermark.js";
|
|
49
|
+
import { downToolInvocationsMatchedRuleId } from "./236-tool-invocations-matched-rule-id.js";
|
|
47
50
|
|
|
48
51
|
export interface MigrationRegistryEntry {
|
|
49
52
|
/** The checkpoint key written to memory_checkpoints on completion. */
|
|
@@ -380,6 +383,27 @@ export const MIGRATION_REGISTRY: MigrationRegistryEntry[] = [
|
|
|
380
383
|
description: "Create activation_state table for memory v2",
|
|
381
384
|
down: downActivationState,
|
|
382
385
|
},
|
|
386
|
+
{
|
|
387
|
+
key: "migration_memory_v2_activation_logs_v1",
|
|
388
|
+
version: 44,
|
|
389
|
+
description:
|
|
390
|
+
"Create memory_v2_activation_logs table for per-turn v2 activation telemetry consumed by the LLM Context Inspector",
|
|
391
|
+
down: downMemoryV2ActivationLogs,
|
|
392
|
+
},
|
|
393
|
+
{
|
|
394
|
+
key: "migration_slack_compaction_watermark_v1",
|
|
395
|
+
version: 45,
|
|
396
|
+
description:
|
|
397
|
+
"Add Slack-specific compaction watermark columns to conversations",
|
|
398
|
+
down: downSlackCompactionWatermark,
|
|
399
|
+
},
|
|
400
|
+
{
|
|
401
|
+
key: "migration_tool_invocations_matched_trust_rule_id_v1",
|
|
402
|
+
version: 46,
|
|
403
|
+
description:
|
|
404
|
+
"Add matched_trust_rule_id column to tool_invocations for trust rule audit and rule editor UI",
|
|
405
|
+
down: downToolInvocationsMatchedRuleId,
|
|
406
|
+
},
|
|
383
407
|
];
|
|
384
408
|
|
|
385
409
|
export function getMaxMigrationVersion(): number {
|
package/src/memory/raw-query.ts
CHANGED
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
* filtering, ordering, pagination — use Drizzle.
|
|
31
31
|
*/
|
|
32
32
|
|
|
33
|
-
import type {
|
|
33
|
+
import type { SQLQueryBindings } from "bun:sqlite";
|
|
34
34
|
|
|
35
|
-
import {
|
|
35
|
+
import { getSqlite } from "./db-connection.js";
|
|
36
36
|
|
|
37
37
|
type SqlParam = SQLQueryBindings;
|
|
38
38
|
|
|
@@ -82,72 +82,6 @@ export function rawChanges(): number {
|
|
|
82
82
|
return (getSqlite().query("SELECT changes() AS c").get() as { c: number }).c;
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
// ---------------------------------------------------------------------------
|
|
86
|
-
// Typed query helpers (explicit Drizzle instance)
|
|
87
|
-
//
|
|
88
|
-
// Used by migrations and tests that receive the Drizzle instance as a
|
|
89
|
-
// parameter rather than using the global singleton.
|
|
90
|
-
// ---------------------------------------------------------------------------
|
|
91
|
-
|
|
92
|
-
/** Execute a raw SQL query against a specific Drizzle instance and return a single typed row. */
|
|
93
|
-
export function rawGetFrom<T>(
|
|
94
|
-
db: DrizzleDb,
|
|
95
|
-
sql: string,
|
|
96
|
-
...params: SqlParam[]
|
|
97
|
-
): T | null {
|
|
98
|
-
return (
|
|
99
|
-
(getSqliteFrom(db)
|
|
100
|
-
.query(sql)
|
|
101
|
-
.get(...params) as T) ?? null
|
|
102
|
-
);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
/** Execute a raw SQL query against a specific Drizzle instance and return all matching rows. */
|
|
106
|
-
export function rawAllFrom<T>(
|
|
107
|
-
db: DrizzleDb,
|
|
108
|
-
sql: string,
|
|
109
|
-
...params: SqlParam[]
|
|
110
|
-
): T[] {
|
|
111
|
-
return getSqliteFrom(db)
|
|
112
|
-
.query(sql)
|
|
113
|
-
.all(...params) as T[];
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
/**
|
|
117
|
-
* Execute a raw SQL statement against a specific Drizzle instance and return
|
|
118
|
-
* affected row count.
|
|
119
|
-
*/
|
|
120
|
-
export function rawRunFrom(
|
|
121
|
-
db: DrizzleDb,
|
|
122
|
-
sql: string,
|
|
123
|
-
...params: SqlParam[]
|
|
124
|
-
): number {
|
|
125
|
-
const sqlite = getSqliteFrom(db);
|
|
126
|
-
sqlite.query(sql).run(...params);
|
|
127
|
-
return (sqlite.query("SELECT changes() AS c").get() as { c: number }).c;
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
/** Execute batch SQL against a specific Drizzle instance. */
|
|
131
|
-
export function rawExecFrom(db: DrizzleDb, sql: string): void {
|
|
132
|
-
getSqliteFrom(db).exec(sql);
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
/**
|
|
136
|
-
* Create a prepared statement from the raw SQLite client.
|
|
137
|
-
* Useful when you need to execute the same parameterized query in a loop.
|
|
138
|
-
*/
|
|
139
|
-
export function rawPrepare(sql: string): ReturnType<Database["prepare"]> {
|
|
140
|
-
return getSqlite().prepare(sql);
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
/** Create a prepared statement from a specific Drizzle instance. */
|
|
144
|
-
export function rawPrepareFrom(
|
|
145
|
-
db: DrizzleDb,
|
|
146
|
-
sql: string,
|
|
147
|
-
): ReturnType<Database["prepare"]> {
|
|
148
|
-
return getSqliteFrom(db).prepare(sql);
|
|
149
|
-
}
|
|
150
|
-
|
|
151
85
|
/**
|
|
152
86
|
* Delete all rows from the given tables in a single transaction.
|
|
153
87
|
*
|
|
@@ -21,6 +21,12 @@ export const conversations = sqliteTable(
|
|
|
21
21
|
.notNull()
|
|
22
22
|
.default(0),
|
|
23
23
|
contextCompactedAt: integer("context_compacted_at"),
|
|
24
|
+
slackContextCompactionWatermarkTs: text(
|
|
25
|
+
"slack_context_compaction_watermark_ts",
|
|
26
|
+
),
|
|
27
|
+
slackContextCompactionWatermarkAt: integer(
|
|
28
|
+
"slack_context_compaction_watermark_at",
|
|
29
|
+
),
|
|
24
30
|
conversationType: text("conversation_type").notNull().default("standard"),
|
|
25
31
|
source: text("source").notNull().default("user"),
|
|
26
32
|
memoryScopeId: text("memory_scope_id").notNull().default("default"),
|
|
@@ -72,6 +78,7 @@ export const toolInvocations = sqliteTable(
|
|
|
72
78
|
result: text("result").notNull(),
|
|
73
79
|
decision: text("decision").notNull(),
|
|
74
80
|
riskLevel: text("risk_level").notNull(),
|
|
81
|
+
matchedTrustRuleId: text("matched_trust_rule_id"),
|
|
75
82
|
durationMs: integer("duration_ms").notNull(),
|
|
76
83
|
createdAt: integer("created_at").notNull(),
|
|
77
84
|
},
|
|
@@ -161,6 +161,28 @@ export const memoryRecallLogs = sqliteTable(
|
|
|
161
161
|
],
|
|
162
162
|
);
|
|
163
163
|
|
|
164
|
+
export const memoryV2ActivationLogs = sqliteTable(
|
|
165
|
+
"memory_v2_activation_logs",
|
|
166
|
+
{
|
|
167
|
+
id: text("id").primaryKey(),
|
|
168
|
+
conversationId: text("conversation_id").notNull(),
|
|
169
|
+
messageId: text("message_id"),
|
|
170
|
+
turn: integer("turn").notNull(),
|
|
171
|
+
mode: text("mode").notNull(), // "context-load" | "per-turn"
|
|
172
|
+
conceptsJson: text("concepts_json").notNull(),
|
|
173
|
+
skillsJson: text("skills_json").notNull(),
|
|
174
|
+
configJson: text("config_json").notNull(),
|
|
175
|
+
createdAt: integer("created_at").notNull(),
|
|
176
|
+
},
|
|
177
|
+
(table) => [
|
|
178
|
+
index("idx_memory_v2_activation_logs_message_id").on(table.messageId),
|
|
179
|
+
index("idx_memory_v2_activation_logs_conversation_id").on(
|
|
180
|
+
table.conversationId,
|
|
181
|
+
),
|
|
182
|
+
index("idx_memory_v2_activation_logs_created_at").on(table.createdAt),
|
|
183
|
+
],
|
|
184
|
+
);
|
|
185
|
+
|
|
164
186
|
export const llmUsageEvents = sqliteTable(
|
|
165
187
|
"llm_usage_events",
|
|
166
188
|
{
|
|
@@ -170,6 +192,9 @@ export const llmUsageEvents = sqliteTable(
|
|
|
170
192
|
runId: text("run_id"),
|
|
171
193
|
requestId: text("request_id"),
|
|
172
194
|
actor: text("actor").notNull(),
|
|
195
|
+
callSite: text("call_site"),
|
|
196
|
+
inferenceProfile: text("inference_profile"),
|
|
197
|
+
inferenceProfileSource: text("inference_profile_source"),
|
|
173
198
|
provider: text("provider").notNull(),
|
|
174
199
|
model: text("model").notNull(),
|
|
175
200
|
inputTokens: integer("input_tokens").notNull(),
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { inArray } from "drizzle-orm";
|
|
2
2
|
|
|
3
|
-
import { getLogger } from "../../util/logger.js";
|
|
4
3
|
import { getDb } from "../db-connection.js";
|
|
5
4
|
import { withQdrantBreaker } from "../qdrant-circuit-breaker.js";
|
|
6
5
|
import type {
|
|
@@ -45,8 +44,6 @@ function computeRecencyScore(createdAt: number): number {
|
|
|
45
44
|
return 1 / (1 + Math.log2(1 + ageDays));
|
|
46
45
|
}
|
|
47
46
|
|
|
48
|
-
const _log = getLogger("semantic-search");
|
|
49
|
-
|
|
50
47
|
export async function semanticSearch(
|
|
51
48
|
queryVector: number[],
|
|
52
49
|
_provider: string,
|
|
@@ -54,7 +51,7 @@ export async function semanticSearch(
|
|
|
54
51
|
limit: number,
|
|
55
52
|
excludedMessageIds: string[] = [],
|
|
56
53
|
scopeIds?: string[],
|
|
57
|
-
sparseVector?: QdrantSparseVector
|
|
54
|
+
sparseVector?: QdrantSparseVector,
|
|
58
55
|
): Promise<Candidate[]> {
|
|
59
56
|
if (limit <= 0) return [];
|
|
60
57
|
|
|
@@ -79,7 +76,7 @@ export async function semanticSearch(
|
|
|
79
76
|
filter,
|
|
80
77
|
limit: fetchLimit,
|
|
81
78
|
prefetchLimit: fetchLimit,
|
|
82
|
-
})
|
|
79
|
+
}),
|
|
83
80
|
);
|
|
84
81
|
} else {
|
|
85
82
|
results = await withQdrantBreaker(() =>
|
|
@@ -88,8 +85,8 @@ export async function semanticSearch(
|
|
|
88
85
|
fetchLimit,
|
|
89
86
|
["summary", "segment", "media"],
|
|
90
87
|
excludedMessageIds,
|
|
91
|
-
scopeIds
|
|
92
|
-
)
|
|
88
|
+
scopeIds,
|
|
89
|
+
),
|
|
93
90
|
);
|
|
94
91
|
}
|
|
95
92
|
|
|
@@ -145,7 +142,6 @@ export async function semanticSearch(
|
|
|
145
142
|
for (const row of rows) mediaScopeMap.set(row.id, row.memoryScopeId);
|
|
146
143
|
}
|
|
147
144
|
|
|
148
|
-
|
|
149
145
|
const candidates: Candidate[] = [];
|
|
150
146
|
for (const result of results) {
|
|
151
147
|
const { payload, score } = result;
|
|
@@ -258,7 +254,7 @@ export async function semanticSearch(
|
|
|
258
254
|
*/
|
|
259
255
|
function buildHybridFilter(
|
|
260
256
|
excludeMessageIds: string[],
|
|
261
|
-
scopeIds?: string[]
|
|
257
|
+
scopeIds?: string[],
|
|
262
258
|
): Record<string, unknown> {
|
|
263
259
|
const mustConditions: Array<Record<string, unknown>> = [
|
|
264
260
|
{
|
|
@@ -298,10 +294,3 @@ function buildHybridFilter(
|
|
|
298
294
|
function mapCosineToUnit(value: number): number {
|
|
299
295
|
return Math.max(0, Math.min(1, (value + 1) / 2));
|
|
300
296
|
}
|
|
301
|
-
|
|
302
|
-
export function isQdrantConnectionError(err: unknown): boolean {
|
|
303
|
-
if (!(err instanceof Error)) return false;
|
|
304
|
-
return /ECONNREFUSED|ECONNRESET|ETIMEDOUT|ENETUNREACH|fetch failed/i.test(
|
|
305
|
-
err.message
|
|
306
|
-
);
|
|
307
|
-
}
|
|
@@ -12,6 +12,7 @@ export interface ToolInvocationRecord {
|
|
|
12
12
|
result: string;
|
|
13
13
|
decision: string;
|
|
14
14
|
riskLevel: string;
|
|
15
|
+
matchedTrustRuleId?: string;
|
|
15
16
|
durationMs: number;
|
|
16
17
|
}
|
|
17
18
|
|
|
@@ -26,6 +27,7 @@ export function recordToolInvocation(record: ToolInvocationRecord): void {
|
|
|
26
27
|
result: record.result,
|
|
27
28
|
decision: record.decision,
|
|
28
29
|
riskLevel: record.riskLevel,
|
|
30
|
+
matchedTrustRuleId: record.matchedTrustRuleId,
|
|
29
31
|
durationMs: record.durationMs,
|
|
30
32
|
createdAt: Date.now(),
|
|
31
33
|
})
|
|
@@ -215,7 +215,10 @@ function formatHourLabel(epochMillis: number, tz: string): string {
|
|
|
215
215
|
hour12: true,
|
|
216
216
|
});
|
|
217
217
|
// "3 PM" → "3pm"
|
|
218
|
-
return formatter
|
|
218
|
+
return formatter
|
|
219
|
+
.format(new Date(epochMillis))
|
|
220
|
+
.replace(/\s/g, "")
|
|
221
|
+
.toLowerCase();
|
|
219
222
|
}
|
|
220
223
|
|
|
221
224
|
/** Format a short human-readable day label in `tz`, e.g. "Apr 11". */
|
|
@@ -282,6 +285,42 @@ function finalize(buckets: Map<string, MutableBucket>): UsageDayBucket[] {
|
|
|
282
285
|
}));
|
|
283
286
|
}
|
|
284
287
|
|
|
288
|
+
const HOURLY_BUCKET_ID_RE = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):00\|(-?\d+)$/;
|
|
289
|
+
const DAILY_BUCKET_ID_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
|
|
290
|
+
|
|
291
|
+
function usageBucketSortKey(
|
|
292
|
+
bucket: Pick<UsageDayBucket, "bucketId">,
|
|
293
|
+
): number | null {
|
|
294
|
+
const hourlyMatch = HOURLY_BUCKET_ID_RE.exec(bucket.bucketId);
|
|
295
|
+
if (hourlyMatch) {
|
|
296
|
+
const [, year, month, day, hour, offsetMinutes] = hourlyMatch;
|
|
297
|
+
return (
|
|
298
|
+
Date.UTC(Number(year), Number(month) - 1, Number(day), Number(hour)) -
|
|
299
|
+
Number(offsetMinutes) * 60_000
|
|
300
|
+
);
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
const dailyMatch = DAILY_BUCKET_ID_RE.exec(bucket.bucketId);
|
|
304
|
+
if (dailyMatch) {
|
|
305
|
+
const [, year, month, day] = dailyMatch;
|
|
306
|
+
return Date.UTC(Number(year), Number(month) - 1, Number(day));
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
return null;
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
export function compareUsageBuckets(
|
|
313
|
+
a: Pick<UsageDayBucket, "bucketId">,
|
|
314
|
+
b: Pick<UsageDayBucket, "bucketId">,
|
|
315
|
+
): number {
|
|
316
|
+
const aSortKey = usageBucketSortKey(a);
|
|
317
|
+
const bSortKey = usageBucketSortKey(b);
|
|
318
|
+
if (aSortKey !== null && bSortKey !== null && aSortKey !== bSortKey) {
|
|
319
|
+
return aSortKey - bSortKey;
|
|
320
|
+
}
|
|
321
|
+
return a.bucketId.localeCompare(b.bucketId);
|
|
322
|
+
}
|
|
323
|
+
|
|
285
324
|
/** Options for bucketing behavior. */
|
|
286
325
|
export interface BucketingOptions {
|
|
287
326
|
/**
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { getLLMCallSiteLabel } from "../config/llm-callsite-catalog.js";
|
|
2
|
+
import type {
|
|
3
|
+
GroupByDimension,
|
|
4
|
+
UsageBucketOptions,
|
|
5
|
+
UsageDayBucket,
|
|
6
|
+
UsageTimeRange,
|
|
7
|
+
} from "./llm-usage-store.js";
|
|
8
|
+
import {
|
|
9
|
+
bucketEventsByDay,
|
|
10
|
+
bucketEventsByHour,
|
|
11
|
+
compareUsageBuckets,
|
|
12
|
+
type UsageEventBucketRow,
|
|
13
|
+
} from "./usage-buckets.js";
|
|
14
|
+
|
|
15
|
+
export interface UsageSeriesGroupValue {
|
|
16
|
+
group: string;
|
|
17
|
+
groupKey: string | null;
|
|
18
|
+
totalInputTokens: number;
|
|
19
|
+
totalOutputTokens: number;
|
|
20
|
+
totalEstimatedCostUsd: number;
|
|
21
|
+
eventCount: number;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export interface UsageGroupedSeriesBucket extends UsageDayBucket {
|
|
25
|
+
groups: Record<string, UsageSeriesGroupValue>;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export interface UsageGroupedBucketRow extends UsageEventBucketRow {
|
|
29
|
+
group_key: string | null;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const VALUE_GROUP_PREFIX = "value:";
|
|
33
|
+
const NULL_GROUP_PREFIX = "null:";
|
|
34
|
+
|
|
35
|
+
export function displayUsageGroup(
|
|
36
|
+
groupBy: GroupByDimension,
|
|
37
|
+
groupKey: string | null,
|
|
38
|
+
): string {
|
|
39
|
+
if (groupBy === "call_site") {
|
|
40
|
+
return groupKey === null ? "Unknown Task" : getLLMCallSiteLabel(groupKey);
|
|
41
|
+
}
|
|
42
|
+
if (groupBy === "inference_profile") {
|
|
43
|
+
return groupKey === null ? "Default / Unset" : groupKey;
|
|
44
|
+
}
|
|
45
|
+
return groupKey ?? "Other";
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export function stableUsageSeriesGroupKey(
|
|
49
|
+
groupBy: GroupByDimension,
|
|
50
|
+
groupKey: string | null,
|
|
51
|
+
): string {
|
|
52
|
+
if (groupKey !== null) return `${VALUE_GROUP_PREFIX}${groupKey}`;
|
|
53
|
+
return `${NULL_GROUP_PREFIX}${groupBy}`;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function createEmptyGroupedBucket(
|
|
57
|
+
bucket: UsageDayBucket,
|
|
58
|
+
): UsageGroupedSeriesBucket {
|
|
59
|
+
return {
|
|
60
|
+
bucketId: bucket.bucketId,
|
|
61
|
+
date: bucket.date,
|
|
62
|
+
displayLabel: bucket.displayLabel,
|
|
63
|
+
totalInputTokens: 0,
|
|
64
|
+
totalOutputTokens: 0,
|
|
65
|
+
totalEstimatedCostUsd: 0,
|
|
66
|
+
eventCount: 0,
|
|
67
|
+
groups: {},
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export function bucketGroupedUsageEvents(
|
|
72
|
+
rows: UsageGroupedBucketRow[],
|
|
73
|
+
range: UsageTimeRange,
|
|
74
|
+
tz: string,
|
|
75
|
+
options: UsageBucketOptions & {
|
|
76
|
+
granularity: "daily" | "hourly";
|
|
77
|
+
groupBy: GroupByDimension;
|
|
78
|
+
},
|
|
79
|
+
): UsageGroupedSeriesBucket[] {
|
|
80
|
+
const bucketEvents =
|
|
81
|
+
options.granularity === "hourly" ? bucketEventsByHour : bucketEventsByDay;
|
|
82
|
+
const baseBuckets = bucketEvents([], range, tz, {
|
|
83
|
+
fillEmpty: options.fillEmpty,
|
|
84
|
+
});
|
|
85
|
+
const buckets = new Map<string, UsageGroupedSeriesBucket>();
|
|
86
|
+
|
|
87
|
+
for (const bucket of baseBuckets) {
|
|
88
|
+
buckets.set(bucket.bucketId, createEmptyGroupedBucket(bucket));
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
for (const row of rows) {
|
|
92
|
+
const [bucket] = bucketEvents([row], range, tz);
|
|
93
|
+
if (!bucket) continue;
|
|
94
|
+
|
|
95
|
+
let groupedBucket = buckets.get(bucket.bucketId);
|
|
96
|
+
if (!groupedBucket) {
|
|
97
|
+
groupedBucket = createEmptyGroupedBucket(bucket);
|
|
98
|
+
buckets.set(bucket.bucketId, groupedBucket);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
const seriesKey = stableUsageSeriesGroupKey(options.groupBy, row.group_key);
|
|
102
|
+
let group = groupedBucket.groups[seriesKey];
|
|
103
|
+
if (!group) {
|
|
104
|
+
group = {
|
|
105
|
+
group: displayUsageGroup(options.groupBy, row.group_key),
|
|
106
|
+
groupKey: row.group_key,
|
|
107
|
+
totalInputTokens: 0,
|
|
108
|
+
totalOutputTokens: 0,
|
|
109
|
+
totalEstimatedCostUsd: 0,
|
|
110
|
+
eventCount: 0,
|
|
111
|
+
};
|
|
112
|
+
groupedBucket.groups[seriesKey] = group;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
group.totalInputTokens += row.input_tokens;
|
|
116
|
+
group.totalOutputTokens += row.output_tokens;
|
|
117
|
+
group.totalEstimatedCostUsd += row.estimated_cost_usd ?? 0;
|
|
118
|
+
group.eventCount += row.llm_call_count ?? 1;
|
|
119
|
+
|
|
120
|
+
groupedBucket.totalInputTokens += row.input_tokens;
|
|
121
|
+
groupedBucket.totalOutputTokens += row.output_tokens;
|
|
122
|
+
groupedBucket.totalEstimatedCostUsd += row.estimated_cost_usd ?? 0;
|
|
123
|
+
groupedBucket.eventCount += row.llm_call_count ?? 1;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
return Array.from(buckets.values()).sort(compareUsageBuckets);
|
|
127
|
+
}
|