@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* `usage.jsonl` stays canonical; this module maintains a rebuildable SQLite
|
|
5
5
|
* projection (ADR-1, ADR-8). On every open/query it verifies schema version,
|
|
6
|
-
* file identity
|
|
6
|
+
* file identity and byte offset, then appends whatever complete
|
|
7
7
|
* JSONL rows arrived since the last index. Missing/corrupt/stale index or a
|
|
8
8
|
* replaced/truncated source triggers an automatic full rebuild; canonical
|
|
9
9
|
* history is never touched.
|
|
@@ -12,6 +12,8 @@
|
|
|
12
12
|
* runs on a worker thread (#6990): the worker writes a private build file and
|
|
13
13
|
* this thread swaps it in once complete. Async readers wait for it; the
|
|
14
14
|
* routing-time sync entry never waits and throws `RequestHistoryIndexBusyError`.
|
|
15
|
+
* Full integrity scans run on that worker at open and periodically while in
|
|
16
|
+
* use, never synchronously on the serving thread (#7966).
|
|
15
17
|
*/
|
|
16
18
|
|
|
17
19
|
import { Database } from "bun:sqlite";
|
|
@@ -48,6 +50,8 @@ import {
|
|
|
48
50
|
} from "./ingest";
|
|
49
51
|
import { buildFilePath, removeBuildFiles } from "./build-file";
|
|
50
52
|
import { RebuildWorkerJob } from "./rebuild-job";
|
|
53
|
+
import { RequestHistoryIntegrityMonitor, type RequestHistoryIntegrityOptions } from "./integrity";
|
|
54
|
+
import { isHistoryIndexCorruption } from "./sqlite-errors";
|
|
51
55
|
|
|
52
56
|
export {
|
|
53
57
|
REQUEST_HISTORY_INSERT_BATCH,
|
|
@@ -138,9 +142,15 @@ class RebuildHandedOff {
|
|
|
138
142
|
constructor(readonly rebuild: WorkerRebuild) {}
|
|
139
143
|
}
|
|
140
144
|
|
|
145
|
+
/** An initial integrity check, or a scanner draining before index replacement. */
|
|
146
|
+
class IntegrityHandedOff {
|
|
147
|
+
constructor(readonly promise: Promise<void>) {}
|
|
148
|
+
}
|
|
149
|
+
|
|
141
150
|
let db: Database | null = null;
|
|
142
151
|
let dbPath = "";
|
|
143
152
|
let openPromise: Promise<RequestHistoryIndexMeta> | null = null;
|
|
153
|
+
let manualRebuild: Promise<RequestHistoryIndexMeta> | null = null;
|
|
144
154
|
let workerRebuild: WorkerRebuild | null = null;
|
|
145
155
|
let workerFailure: { at: number; error: unknown } | null = null;
|
|
146
156
|
let workerRebuildMinBytes = REQUEST_HISTORY_WORKER_REBUILD_MIN_BYTES;
|
|
@@ -148,6 +158,33 @@ let maxAsyncRefreshBuilds = MAX_ASYNC_REFRESH_BUILDS;
|
|
|
148
158
|
let buildSequence = 0;
|
|
149
159
|
// Bumped by closeRequestHistoryIndex, so a rebuild finishing after a close is discarded.
|
|
150
160
|
let indexLifetime = 0;
|
|
161
|
+
let integrity = new RequestHistoryIntegrityMonitor();
|
|
162
|
+
let integrityDrain: Promise<void> | null = null;
|
|
163
|
+
let corruptHandle: Database | null = null;
|
|
164
|
+
let validatedBuildPath: string | null = null;
|
|
165
|
+
|
|
166
|
+
/** Test seam: replace integrity scheduling without leaving a scanner on an old file. */
|
|
167
|
+
export function setRequestHistoryIntegrityOptionsForTests(options?: RequestHistoryIntegrityOptions): void {
|
|
168
|
+
closeRequestHistoryIndex();
|
|
169
|
+
integrity = new RequestHistoryIntegrityMonitor(options);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
function stopIntegrityScan(): Promise<void> | null {
|
|
173
|
+
const pending = integrity.quiesce();
|
|
174
|
+
if (pending && !integrityDrain) {
|
|
175
|
+
const drained = pending.finally(() => {
|
|
176
|
+
if (integrityDrain === drained) integrityDrain = null;
|
|
177
|
+
});
|
|
178
|
+
integrityDrain = drained;
|
|
179
|
+
}
|
|
180
|
+
return integrityDrain;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
/** Never delete/rename a database that a cancelled scanner may still hold on Windows. */
|
|
184
|
+
function prepareIndexReplacement(): void {
|
|
185
|
+
const pending = stopIntegrityScan();
|
|
186
|
+
if (pending) throw new IntegrityHandedOff(pending);
|
|
187
|
+
}
|
|
151
188
|
|
|
152
189
|
/** Test seam: move the worker threshold; `undefined` restores the default. */
|
|
153
190
|
export function setRequestHistoryWorkerRebuildMinBytesForTests(bytes: number | undefined): void {
|
|
@@ -210,15 +247,6 @@ export function sourceIdentityMatches(dbHandle: Database, revision: UsageLogRevi
|
|
|
210
247
|
&& storedBirthtimeMs === Number(revision.birthtimeMs);
|
|
211
248
|
}
|
|
212
249
|
|
|
213
|
-
function isHealthy(dbHandle: Database): boolean {
|
|
214
|
-
try {
|
|
215
|
-
const row = dbHandle.query("PRAGMA quick_check").get() as { quick_check?: string } | undefined;
|
|
216
|
-
return row?.quick_check === "ok";
|
|
217
|
-
} catch {
|
|
218
|
-
return false;
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
|
|
222
250
|
/** Remove the index file and its WAL side files. */
|
|
223
251
|
function removeIndexFiles(path: string): void {
|
|
224
252
|
// Windows: a partially-opened handle from a failed `new Database` can hold
|
|
@@ -238,6 +266,7 @@ function removeIndexFiles(path: string): void {
|
|
|
238
266
|
}
|
|
239
267
|
|
|
240
268
|
function destroyAndRecreate(path: string, reason: string): Database {
|
|
269
|
+
prepareIndexReplacement();
|
|
241
270
|
if (db) {
|
|
242
271
|
try { db.close(); } catch { /* already closed */ }
|
|
243
272
|
db = null;
|
|
@@ -249,10 +278,13 @@ function destroyAndRecreate(path: string, reason: string): Database {
|
|
|
249
278
|
resetAndCreateSchema(fresh);
|
|
250
279
|
setMeta(fresh, HISTORY_META_KEYS.lastError, reason);
|
|
251
280
|
db = fresh;
|
|
281
|
+
corruptHandle = null;
|
|
282
|
+
validatedBuildPath = null;
|
|
252
283
|
return fresh;
|
|
253
284
|
}
|
|
254
285
|
|
|
255
286
|
function openIndexDb(): Database {
|
|
287
|
+
if (integrityDrain) throw new IntegrityHandedOff(integrityDrain);
|
|
256
288
|
const path = indexDbPath();
|
|
257
289
|
if (db) return db;
|
|
258
290
|
let handle: Database | undefined;
|
|
@@ -270,45 +302,64 @@ function openIndexDb(): Database {
|
|
|
270
302
|
setMeta(handle, HISTORY_META_KEYS.builtAtMs, Date.now());
|
|
271
303
|
setMeta(handle, HISTORY_META_KEYS.lastError, "created");
|
|
272
304
|
}
|
|
273
|
-
} catch {
|
|
305
|
+
} catch (error) {
|
|
274
306
|
// A partially-opened handle on a corrupt file can hold the OS lock on
|
|
275
307
|
// Windows; close it before the destructive recreate.
|
|
276
308
|
if (handle) {
|
|
277
309
|
try { handle.close(); } catch { /* already unusable */ }
|
|
278
310
|
}
|
|
311
|
+
if (!isHistoryIndexCorruption(error)) throw error;
|
|
279
312
|
handle = destroyAndRecreate(path, "unreadable database recreated");
|
|
280
313
|
}
|
|
281
314
|
dbPath = path;
|
|
282
315
|
db = handle;
|
|
316
|
+
if (validatedBuildPath === path) {
|
|
317
|
+
integrity.acceptRebuilt(handle, path);
|
|
318
|
+
validatedBuildPath = null;
|
|
319
|
+
}
|
|
283
320
|
return handle;
|
|
284
321
|
}
|
|
285
322
|
|
|
286
323
|
function ensureSchemaAndIdentity(dbHandle: Database): "ready" | "rebuilt" {
|
|
287
324
|
try {
|
|
325
|
+
if (corruptHandle === dbHandle) {
|
|
326
|
+
destroyAndRecreate(dbPath, "integrity check failed; index rebuilt");
|
|
327
|
+
return "rebuilt";
|
|
328
|
+
}
|
|
288
329
|
const storedVersion = metaValue(dbHandle, HISTORY_META_KEYS.schemaVersion);
|
|
289
330
|
if (storedVersion !== String(HISTORY_SCHEMA_VERSION)) {
|
|
290
331
|
destroyAndRecreate(dbPath, `schema version ${storedVersion ?? "missing"} -> ${HISTORY_SCHEMA_VERSION}`);
|
|
291
332
|
return "rebuilt";
|
|
292
333
|
}
|
|
293
|
-
if (!isHealthy(dbHandle)) {
|
|
294
|
-
destroyAndRecreate(dbPath, "integrity check failed; index rebuilt");
|
|
295
|
-
return "rebuilt";
|
|
296
|
-
}
|
|
297
334
|
const revision = sourceIdentity();
|
|
298
335
|
if (!sourceIdentityMatches(dbHandle, revision)) {
|
|
299
336
|
destroyAndRecreate(dbPath, "source identity changed; index rebuilt");
|
|
300
337
|
return "rebuilt";
|
|
301
338
|
}
|
|
339
|
+
const check = integrity.inspect(dbHandle, dbPath);
|
|
340
|
+
if (check.state === "pending") throw new IntegrityHandedOff(check.promise);
|
|
341
|
+
if (check.state === "unavailable") {
|
|
342
|
+
throw new RequestHistoryIndexBusyError("request-history integrity check unavailable");
|
|
343
|
+
}
|
|
344
|
+
if (check.state === "corrupt") {
|
|
345
|
+
corruptHandle = dbHandle;
|
|
346
|
+
destroyAndRecreate(dbPath, "integrity check failed; index rebuilt");
|
|
347
|
+
return "rebuilt";
|
|
348
|
+
}
|
|
302
349
|
return "ready";
|
|
303
|
-
} catch {
|
|
350
|
+
} catch (error) {
|
|
351
|
+
if (!isHistoryIndexCorruption(error)) throw error;
|
|
304
352
|
// A file that opens but is not actually SQLite (or is mid-corruption)
|
|
305
353
|
// throws on the first statement; treat it as corrupt and rebuild.
|
|
354
|
+
corruptHandle = dbHandle;
|
|
355
|
+
integrity.markCorrupt(dbHandle);
|
|
306
356
|
destroyAndRecreate(dbPath, "index unreadable; rebuilt");
|
|
307
357
|
return "rebuilt";
|
|
308
358
|
}
|
|
309
359
|
}
|
|
310
360
|
|
|
311
361
|
function fullRebuild(dbHandle: Database, reason: string): void {
|
|
362
|
+
prepareIndexReplacement();
|
|
312
363
|
resetAndCreateSchema(dbHandle);
|
|
313
364
|
setMeta(dbHandle, HISTORY_META_KEYS.lastError, reason);
|
|
314
365
|
const path = usageLogPath();
|
|
@@ -319,6 +370,8 @@ function fullRebuild(dbHandle: Database, reason: string): void {
|
|
|
319
370
|
setMeta(dbHandle, HISTORY_META_KEYS.indexedOffset, 0);
|
|
320
371
|
setMeta(dbHandle, HISTORY_META_KEYS.indexedRows, 0);
|
|
321
372
|
setMeta(dbHandle, HISTORY_META_KEYS.builtAtMs, Date.now());
|
|
373
|
+
integrity.acceptRebuilt(dbHandle, dbPath);
|
|
374
|
+
corruptHandle = null;
|
|
322
375
|
return;
|
|
323
376
|
}
|
|
324
377
|
const inserted = ingestSourceTail(dbHandle, path, 0);
|
|
@@ -326,6 +379,8 @@ function fullRebuild(dbHandle: Database, reason: string): void {
|
|
|
326
379
|
setMeta(dbHandle, HISTORY_META_KEYS.indexedRows, inserted);
|
|
327
380
|
setMeta(dbHandle, HISTORY_META_KEYS.indexedOffset, Math.max(current.indexedOffset, 0));
|
|
328
381
|
setMeta(dbHandle, HISTORY_META_KEYS.builtAtMs, Date.now());
|
|
382
|
+
integrity.acceptRebuilt(dbHandle, dbPath);
|
|
383
|
+
corruptHandle = null;
|
|
329
384
|
}
|
|
330
385
|
|
|
331
386
|
/**
|
|
@@ -372,12 +427,15 @@ function startWorkerRebuild(reason: string, revision: UsageLogRevision): WorkerR
|
|
|
372
427
|
|
|
373
428
|
/** Swap a complete worker build in for the current index file. */
|
|
374
429
|
function installBuild(buildPath: string, indexPath: string): void {
|
|
430
|
+
prepareIndexReplacement();
|
|
375
431
|
if (db) {
|
|
376
432
|
try { db.close(); } catch { /* already closed */ }
|
|
377
433
|
db = null;
|
|
378
434
|
}
|
|
379
435
|
removeIndexFiles(indexPath);
|
|
380
436
|
renameSync(buildPath, indexPath);
|
|
437
|
+
corruptHandle = null;
|
|
438
|
+
validatedBuildPath = indexPath;
|
|
381
439
|
}
|
|
382
440
|
|
|
383
441
|
/**
|
|
@@ -389,6 +447,7 @@ type RefreshCaller = "routing" | "reader";
|
|
|
389
447
|
|
|
390
448
|
/** Full rebuild, on the worker when the ledger is large enough to stall the event loop. */
|
|
391
449
|
function rebuildFromLedger(handle: Database, reason: string, caller: RefreshCaller): void {
|
|
450
|
+
prepareIndexReplacement();
|
|
392
451
|
const revision = sourceIdentity();
|
|
393
452
|
if (revision !== null && Number(revision.size) >= workerRebuildMinBytes) {
|
|
394
453
|
if (workerCoolingDown()) {
|
|
@@ -405,7 +464,7 @@ function rebuildFromLedger(handle: Database, reason: string, caller: RefreshCall
|
|
|
405
464
|
fullRebuild(handle, reason);
|
|
406
465
|
}
|
|
407
466
|
|
|
408
|
-
function
|
|
467
|
+
function refreshOnceLockedSync(caller: RefreshCaller): RequestHistoryIndexMeta {
|
|
409
468
|
if (workerRebuild) throw new RebuildHandedOff(workerRebuild);
|
|
410
469
|
openIndexDb();
|
|
411
470
|
const state = ensureSchemaAndIdentity(db!);
|
|
@@ -436,27 +495,55 @@ function refreshLockedSync(caller: RefreshCaller): RequestHistoryIndexMeta {
|
|
|
436
495
|
return metaFor(handle);
|
|
437
496
|
}
|
|
438
497
|
|
|
498
|
+
function refreshLockedSync(caller: RefreshCaller): RequestHistoryIndexMeta {
|
|
499
|
+
try {
|
|
500
|
+
return refreshOnceLockedSync(caller);
|
|
501
|
+
} catch (error) {
|
|
502
|
+
// Metadata reads and incremental writes can encounter damage even between
|
|
503
|
+
// scheduled checks. Operational failures (busy, locked, I/O, full) propagate.
|
|
504
|
+
if (!isHistoryIndexCorruption(error)) throw error;
|
|
505
|
+
if (db) {
|
|
506
|
+
corruptHandle = db;
|
|
507
|
+
integrity.markCorrupt(db);
|
|
508
|
+
}
|
|
509
|
+
const handle = destroyAndRecreate(dbPath, "SQLite corruption; index rebuilt");
|
|
510
|
+
rebuildFromLedger(handle, "SQLite corruption; index rebuilt", caller);
|
|
511
|
+
return metaFor(handle);
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
|
|
439
515
|
/**
|
|
440
516
|
* Synchronous refresh for routing-time evidence reads (RI-06+). Never waits
|
|
441
517
|
* for a worker rebuild: while one runs (this call may start it), throws
|
|
442
518
|
* `RequestHistoryIndexBusyError`, which health scoring reads as unknown evidence.
|
|
443
519
|
*/
|
|
444
520
|
export function openRequestHistoryIndexSync(): RequestHistoryIndexMeta {
|
|
521
|
+
if (manualRebuild) throw new RequestHistoryIndexBusyError();
|
|
445
522
|
try {
|
|
446
523
|
return refreshLockedSync("routing");
|
|
447
524
|
} catch (error) {
|
|
448
|
-
if (error instanceof RebuildHandedOff) throw new RequestHistoryIndexBusyError();
|
|
525
|
+
if (error instanceof RebuildHandedOff || error instanceof IntegrityHandedOff) throw new RequestHistoryIndexBusyError();
|
|
449
526
|
throw error;
|
|
450
527
|
}
|
|
451
528
|
}
|
|
452
529
|
|
|
453
|
-
async function refreshWaitingForWorker(): Promise<RequestHistoryIndexMeta> {
|
|
530
|
+
async function refreshWaitingForWorker(fromManualRebuild = false): Promise<RequestHistoryIndexMeta> {
|
|
454
531
|
const lifetime = indexLifetime;
|
|
455
532
|
for (let builds = 0; ; ) {
|
|
533
|
+
if (manualRebuild && !fromManualRebuild) {
|
|
534
|
+
await manualRebuild;
|
|
535
|
+
if (lifetime !== indexLifetime) throw new RequestHistoryIndexClosedError();
|
|
536
|
+
continue;
|
|
537
|
+
}
|
|
456
538
|
let handedOff: RebuildHandedOff;
|
|
457
539
|
try {
|
|
458
540
|
return refreshLockedSync("reader");
|
|
459
541
|
} catch (error) {
|
|
542
|
+
if (error instanceof IntegrityHandedOff) {
|
|
543
|
+
await error.promise;
|
|
544
|
+
if (lifetime !== indexLifetime) throw new RequestHistoryIndexClosedError();
|
|
545
|
+
continue;
|
|
546
|
+
}
|
|
460
547
|
if (!(error instanceof RebuildHandedOff)) throw error;
|
|
461
548
|
handedOff = error;
|
|
462
549
|
}
|
|
@@ -480,15 +567,19 @@ async function refreshWaitingForWorker(): Promise<RequestHistoryIndexMeta> {
|
|
|
480
567
|
*/
|
|
481
568
|
export function openRequestHistoryIndex(): Promise<RequestHistoryIndexMeta> {
|
|
482
569
|
if (!openPromise) {
|
|
483
|
-
|
|
484
|
-
openPromise = null;
|
|
570
|
+
const pending = refreshWaitingForWorker().finally(() => {
|
|
571
|
+
if (openPromise === pending) openPromise = null;
|
|
485
572
|
});
|
|
573
|
+
openPromise = pending;
|
|
486
574
|
}
|
|
487
575
|
return openPromise;
|
|
488
576
|
}
|
|
489
577
|
|
|
490
578
|
export function closeRequestHistoryIndex(): void {
|
|
491
579
|
indexLifetime += 1;
|
|
580
|
+
stopIntegrityScan();
|
|
581
|
+
corruptHandle = null;
|
|
582
|
+
validatedBuildPath = null;
|
|
492
583
|
const rebuild = workerRebuild;
|
|
493
584
|
workerRebuild = null;
|
|
494
585
|
workerFailure = null;
|
|
@@ -499,21 +590,36 @@ export function closeRequestHistoryIndex(): void {
|
|
|
499
590
|
db = null;
|
|
500
591
|
}
|
|
501
592
|
openPromise = null;
|
|
593
|
+
manualRebuild = null;
|
|
502
594
|
}
|
|
503
595
|
|
|
504
596
|
/** Force a full rebuild from the canonical ledger (CLI / tests). */
|
|
505
|
-
export
|
|
597
|
+
export function rebuildRequestHistoryIndex(): Promise<RequestHistoryIndexMeta> {
|
|
598
|
+
if (!manualRebuild) {
|
|
599
|
+
const pending = rebuildManually(indexLifetime).finally(() => {
|
|
600
|
+
if (manualRebuild === pending) manualRebuild = null;
|
|
601
|
+
});
|
|
602
|
+
manualRebuild = pending;
|
|
603
|
+
}
|
|
604
|
+
return manualRebuild;
|
|
605
|
+
}
|
|
606
|
+
|
|
607
|
+
async function rebuildManually(lifetime: number): Promise<RequestHistoryIndexMeta> {
|
|
608
|
+
const draining = stopIntegrityScan();
|
|
609
|
+
if (draining) await draining;
|
|
610
|
+
if (lifetime !== indexLifetime) throw new RequestHistoryIndexClosedError();
|
|
506
611
|
while (workerRebuild) await workerRebuild.promise.catch(() => undefined);
|
|
612
|
+
if (lifetime !== indexLifetime) throw new RequestHistoryIndexClosedError();
|
|
507
613
|
const handle = openIndexDb();
|
|
508
614
|
const revision = sourceIdentity();
|
|
509
615
|
if (revision !== null && Number(revision.size) >= workerRebuildMinBytes) {
|
|
510
616
|
workerFailure = null;
|
|
511
617
|
const rebuild = startWorkerRebuild("manual rebuild requested", revision);
|
|
512
618
|
if (rebuild) {
|
|
513
|
-
const lifetime = indexLifetime;
|
|
514
619
|
try {
|
|
515
620
|
await rebuild.promise;
|
|
516
|
-
|
|
621
|
+
if (lifetime !== indexLifetime) throw new RequestHistoryIndexClosedError();
|
|
622
|
+
return refreshWaitingForWorker(true);
|
|
517
623
|
} catch (error) {
|
|
518
624
|
// A close is final; any other worker failure falls back to the inline rebuild below.
|
|
519
625
|
if (lifetime !== indexLifetime || error instanceof RequestHistoryIndexClosedError) throw error;
|
|
@@ -575,6 +681,29 @@ function requireDb(): Database {
|
|
|
575
681
|
return handle;
|
|
576
682
|
}
|
|
577
683
|
|
|
684
|
+
/** Invalidate only the live generation, including errors from routing's synchronous reads. */
|
|
685
|
+
export function reportRequestHistoryCorruption(error: unknown, handle: Database): boolean {
|
|
686
|
+
if (!isHistoryIndexCorruption(error)) return false;
|
|
687
|
+
if (db === handle) {
|
|
688
|
+
corruptHandle = handle;
|
|
689
|
+
integrity.markCorrupt(handle);
|
|
690
|
+
}
|
|
691
|
+
return true;
|
|
692
|
+
}
|
|
693
|
+
|
|
694
|
+
/** Read-only operations may retry once after repair; ordinary SQLite failures propagate. */
|
|
695
|
+
export async function withRequestHistoryRead<T>(read: (handle: Database, meta: RequestHistoryIndexMeta) => T): Promise<T> {
|
|
696
|
+
for (let attempt = 0; ; attempt++) {
|
|
697
|
+
const meta = await openRequestHistoryIndex();
|
|
698
|
+
const handle = requireDb();
|
|
699
|
+
try {
|
|
700
|
+
return read(handle, meta);
|
|
701
|
+
} catch (error) {
|
|
702
|
+
if (!reportRequestHistoryCorruption(error, handle) || attempt > 0) throw error;
|
|
703
|
+
}
|
|
704
|
+
}
|
|
705
|
+
}
|
|
706
|
+
|
|
578
707
|
function hydrateRow(row: HistoryQueryRow | undefined): PersistedUsageEntry | null {
|
|
579
708
|
if (!row) return null;
|
|
580
709
|
try {
|
|
@@ -593,7 +722,6 @@ export async function queryRequestHistory(
|
|
|
593
722
|
rawCursor: string | null | undefined,
|
|
594
723
|
pageSize: number | undefined,
|
|
595
724
|
): Promise<RequestHistoryPage> {
|
|
596
|
-
const meta = await openRequestHistoryIndex();
|
|
597
725
|
const cursor = decodeHistoryCursor(rawCursor);
|
|
598
726
|
if (rawCursor !== null && rawCursor !== undefined && cursor === null) {
|
|
599
727
|
throw new InvalidCursorError();
|
|
@@ -602,8 +730,9 @@ export async function queryRequestHistory(
|
|
|
602
730
|
Math.max(1, Math.trunc(pageSize ?? REQUEST_HISTORY_DEFAULT_PAGE_SIZE)),
|
|
603
731
|
REQUEST_HISTORY_MAX_PAGE_SIZE,
|
|
604
732
|
);
|
|
605
|
-
const
|
|
606
|
-
|
|
733
|
+
const { rows, fetched, meta } = await withRequestHistoryRead((handle, meta) => ({
|
|
734
|
+
...queryRows(handle, filters, cursor, limit), meta,
|
|
735
|
+
}));
|
|
607
736
|
const hasMore = fetched > limit;
|
|
608
737
|
const pageRows = rows.slice(0, limit);
|
|
609
738
|
const entries: PersistedUsageEntry[] = [];
|
|
@@ -620,11 +749,9 @@ export async function queryRequestHistory(
|
|
|
620
749
|
}
|
|
621
750
|
|
|
622
751
|
export async function requestHistoryRowById(requestId: string): Promise<PersistedUsageEntry | null> {
|
|
623
|
-
await
|
|
624
|
-
const handle = requireDb();
|
|
625
|
-
const row = handle.query("SELECT row_json FROM requests WHERE request_id = ?").get(requestId) as
|
|
752
|
+
const row = await withRequestHistoryRead(handle => handle.query("SELECT row_json FROM requests WHERE request_id = ?").get(requestId) as
|
|
626
753
|
| { row_json: string }
|
|
627
|
-
| undefined;
|
|
754
|
+
| undefined);
|
|
628
755
|
return hydrateRow(row);
|
|
629
756
|
}
|
|
630
757
|
|
|
@@ -25,7 +25,7 @@ export const REQUEST_HISTORY_MAX_RECORD_BYTES = 1024 * 1024;
|
|
|
25
25
|
|
|
26
26
|
// One small observation per live database handle, never retained ledger bytes. An
|
|
27
27
|
// unterminated tail cannot advance indexedOffset, but need not be reread until its
|
|
28
|
-
// exact file revision changes.
|
|
28
|
+
// exact file revision changes. Schema/identity gates and lifecycle integrity checks still apply.
|
|
29
29
|
const tailObservations = new WeakMap<Database, {
|
|
30
30
|
path: string;
|
|
31
31
|
revision: string;
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Lifecycle integrity checks for the derived history index (#7966).
|
|
3
|
+
*
|
|
4
|
+
* SQLite's quick_check is synchronous even behind a timer. A disposable
|
|
5
|
+
* worker performs it at first use and, while the index is in use, periodically.
|
|
6
|
+
* A verified handle remains readable during later checks. No idle timer or
|
|
7
|
+
* serving-thread scan is needed, and operational failures only delay retry.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { RebuildWorkerJob } from "./rebuild-job";
|
|
11
|
+
|
|
12
|
+
export const REQUEST_HISTORY_INTEGRITY_INTERVAL_MS = 5 * 60_000;
|
|
13
|
+
export const REQUEST_HISTORY_INTEGRITY_FAILURE_COOLDOWN_MS = 30_000;
|
|
14
|
+
export const REQUEST_HISTORY_INTEGRITY_CHECK_TIMEOUT_MS = 30_000;
|
|
15
|
+
|
|
16
|
+
type IntegrityJob = Pick<RebuildWorkerJob, "check" | "dispose" | "afterExit">;
|
|
17
|
+
|
|
18
|
+
export interface RequestHistoryIntegrityOptions {
|
|
19
|
+
createJob?: () => IntegrityJob;
|
|
20
|
+
now?: () => number;
|
|
21
|
+
intervalMs?: number;
|
|
22
|
+
failureCooldownMs?: number;
|
|
23
|
+
checkTimeoutMs?: number;
|
|
24
|
+
scheduleTimeout?: (callback: () => void, ms: number) => () => void;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export type RequestHistoryIntegrityState =
|
|
28
|
+
| { state: "ready" }
|
|
29
|
+
| { state: "corrupt" }
|
|
30
|
+
| { state: "unavailable"; error: unknown }
|
|
31
|
+
// Never rejects. Inspect again for the verdict or operational failure.
|
|
32
|
+
| { state: "pending"; promise: Promise<void> };
|
|
33
|
+
|
|
34
|
+
interface Generation {
|
|
35
|
+
handle: object;
|
|
36
|
+
path: string;
|
|
37
|
+
verified: boolean;
|
|
38
|
+
corrupt: boolean;
|
|
39
|
+
nextCheckAt: number;
|
|
40
|
+
failure: { error: unknown } | null;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
interface ActiveCheck {
|
|
44
|
+
generation: Generation;
|
|
45
|
+
cancelled: boolean;
|
|
46
|
+
cancel: () => void;
|
|
47
|
+
promise: Promise<void>;
|
|
48
|
+
barrier: Promise<void>;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
type CheckOutcome =
|
|
52
|
+
| { kind: "checked"; healthy: boolean }
|
|
53
|
+
| { kind: "failed"; error: unknown }
|
|
54
|
+
| { kind: "timeout"; error: Error }
|
|
55
|
+
| { kind: "cancelled" };
|
|
56
|
+
|
|
57
|
+
export class RequestHistoryIntegrityMonitor {
|
|
58
|
+
private readonly createJob: () => IntegrityJob;
|
|
59
|
+
private readonly now: () => number;
|
|
60
|
+
private readonly intervalMs: number;
|
|
61
|
+
private readonly failureCooldownMs: number;
|
|
62
|
+
private readonly checkTimeoutMs: number;
|
|
63
|
+
private readonly scheduleTimeout: (callback: () => void, ms: number) => () => void;
|
|
64
|
+
private current: Generation | null = null;
|
|
65
|
+
private active: ActiveCheck | null = null;
|
|
66
|
+
private readonly draining = new Set<ActiveCheck>();
|
|
67
|
+
|
|
68
|
+
constructor(options: RequestHistoryIntegrityOptions = {}) {
|
|
69
|
+
this.createJob = options.createJob ?? (() => new RebuildWorkerJob());
|
|
70
|
+
this.now = options.now ?? Date.now;
|
|
71
|
+
this.intervalMs = options.intervalMs ?? REQUEST_HISTORY_INTEGRITY_INTERVAL_MS;
|
|
72
|
+
this.failureCooldownMs = options.failureCooldownMs ?? REQUEST_HISTORY_INTEGRITY_FAILURE_COOLDOWN_MS;
|
|
73
|
+
this.checkTimeoutMs = options.checkTimeoutMs ?? REQUEST_HISTORY_INTEGRITY_CHECK_TIMEOUT_MS;
|
|
74
|
+
this.scheduleTimeout = options.scheduleTimeout ?? ((callback, ms) => {
|
|
75
|
+
const timer = setTimeout(callback, ms);
|
|
76
|
+
return () => clearTimeout(timer);
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
inspect(handle: object, path: string): RequestHistoryIntegrityState {
|
|
81
|
+
if (this.current?.handle !== handle || this.current.path !== path) {
|
|
82
|
+
this.quiesce();
|
|
83
|
+
this.current = { handle, path, verified: false, corrupt: false, nextCheckAt: -Infinity, failure: null };
|
|
84
|
+
}
|
|
85
|
+
const generation = this.current;
|
|
86
|
+
if (generation.corrupt) return { state: "corrupt" };
|
|
87
|
+
const old = [...this.draining].filter(check => check.generation !== generation);
|
|
88
|
+
if (old.length) return { state: "pending", promise: Promise.all(old.map(check => check.barrier)).then(() => {}) };
|
|
89
|
+
if (this.active) {
|
|
90
|
+
if (this.active.generation === generation && !this.active.cancelled && generation.verified) {
|
|
91
|
+
return { state: "ready" };
|
|
92
|
+
}
|
|
93
|
+
return { state: "pending", promise: this.active.promise };
|
|
94
|
+
}
|
|
95
|
+
if (this.now() >= generation.nextCheckAt) {
|
|
96
|
+
const check = this.start(generation);
|
|
97
|
+
if (check && !generation.verified) return { state: "pending", promise: check.promise };
|
|
98
|
+
}
|
|
99
|
+
if (generation.verified) return { state: "ready" };
|
|
100
|
+
return { state: "unavailable", error: generation.failure?.error ?? new Error("history integrity check unavailable") };
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/** A statement detected corruption; an in-flight healthy verdict cannot erase it. */
|
|
104
|
+
markCorrupt(handle: object): void {
|
|
105
|
+
if (this.current?.handle === handle) this.current.corrupt = true;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/**
|
|
109
|
+
* Accept a newly reconstructed projection after successful inline ingest or
|
|
110
|
+
* validation of a private worker build. Existing persisted databases must
|
|
111
|
+
* use inspect instead. The caller drains scans before rebuilding/swapping.
|
|
112
|
+
*/
|
|
113
|
+
acceptRebuilt(handle: object, path: string): void {
|
|
114
|
+
if (this.draining.size) throw new Error("history integrity worker must exit before accepting a rebuilt index");
|
|
115
|
+
this.current = {
|
|
116
|
+
handle, path, verified: true, corrupt: false,
|
|
117
|
+
nextCheckAt: this.now() + this.intervalMs, failure: null,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* Invalidate and stop the current check. Null means the index can be replaced
|
|
123
|
+
* now; otherwise await the returned barrier before deleting or renaming it.
|
|
124
|
+
* The barrier survives reset/reopen and resolves only after actual worker
|
|
125
|
+
* exit, including Windows' OS-thread settling, not the bounded disposal wait.
|
|
126
|
+
*/
|
|
127
|
+
quiesce(): Promise<void> | null {
|
|
128
|
+
this.current = null;
|
|
129
|
+
this.active?.cancel();
|
|
130
|
+
return this.draining.size ? Promise.all([...this.draining].map(check => check.barrier)).then(() => {}) : null;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
reset(): void {
|
|
134
|
+
this.quiesce();
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
private start(generation: Generation): ActiveCheck | null {
|
|
138
|
+
let job: IntegrityJob;
|
|
139
|
+
try {
|
|
140
|
+
job = this.createJob();
|
|
141
|
+
} catch (error) {
|
|
142
|
+
this.recordFailure(generation, error);
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
let cancel!: () => void;
|
|
146
|
+
const cancelled = new Promise<CheckOutcome>(resolve => { cancel = () => resolve({ kind: "cancelled" }); });
|
|
147
|
+
let release!: () => void;
|
|
148
|
+
const check: ActiveCheck = {
|
|
149
|
+
generation,
|
|
150
|
+
cancelled: false,
|
|
151
|
+
cancel: () => { check.cancelled = true; cancel(); },
|
|
152
|
+
promise: new Promise(resolve => { release = resolve; }),
|
|
153
|
+
barrier: Promise.resolve(),
|
|
154
|
+
};
|
|
155
|
+
this.active = check;
|
|
156
|
+
this.draining.add(check);
|
|
157
|
+
check.barrier = this.run(check, job, cancelled, release);
|
|
158
|
+
return check;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
private recordFailure(generation: Generation, error: unknown): void {
|
|
162
|
+
generation.failure = { error: error ?? new Error("history integrity check failed") };
|
|
163
|
+
generation.nextCheckAt = this.now() + this.failureCooldownMs;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
private async run(check: ActiveCheck, job: IntegrityJob, cancelled: Promise<CheckOutcome>, release: () => void): Promise<void> {
|
|
167
|
+
let expire!: (outcome: CheckOutcome) => void;
|
|
168
|
+
const timeout = new Promise<CheckOutcome>(resolve => { expire = resolve; });
|
|
169
|
+
const clear = this.scheduleTimeout(() => expire({ kind: "timeout", error: new Error("request-history integrity check timed out") }), this.checkTimeoutMs);
|
|
170
|
+
const observed = Promise.resolve().then(async (): Promise<CheckOutcome> => {
|
|
171
|
+
if (check.cancelled) return { kind: "cancelled" };
|
|
172
|
+
try {
|
|
173
|
+
return { kind: "checked", healthy: await job.check(check.generation.path) };
|
|
174
|
+
} catch (error) {
|
|
175
|
+
return { kind: "failed", error };
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
const outcome = await Promise.race([observed, cancelled, timeout]);
|
|
179
|
+
clear();
|
|
180
|
+
if (outcome.kind === "timeout") {
|
|
181
|
+
if (this.current === check.generation && !check.cancelled && !check.generation.corrupt) {
|
|
182
|
+
this.recordFailure(check.generation, outcome.error);
|
|
183
|
+
}
|
|
184
|
+
if (this.active === check) this.active = null;
|
|
185
|
+
void job.dispose().catch(() => undefined);
|
|
186
|
+
release();
|
|
187
|
+
}
|
|
188
|
+
await new Promise<void>(resolve => {
|
|
189
|
+
// afterExit may return at its disposal timeout, before native I/O lets
|
|
190
|
+
// the worker exit. Only its callback releases the file replacement gate.
|
|
191
|
+
void job.afterExit(resolve).catch(() => undefined);
|
|
192
|
+
});
|
|
193
|
+
const generation = check.generation;
|
|
194
|
+
if (this.current === generation && !check.cancelled && !generation.corrupt) {
|
|
195
|
+
if (outcome.kind === "checked") {
|
|
196
|
+
generation.verified = outcome.healthy;
|
|
197
|
+
generation.corrupt = !outcome.healthy;
|
|
198
|
+
generation.failure = null;
|
|
199
|
+
generation.nextCheckAt = this.now() + this.intervalMs;
|
|
200
|
+
} else if (outcome.kind === "failed") {
|
|
201
|
+
this.recordFailure(generation, outcome.error);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
if (this.active === check) this.active = null;
|
|
205
|
+
this.draining.delete(check);
|
|
206
|
+
release();
|
|
207
|
+
}
|
|
208
|
+
}
|