@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
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
export const REPLAY_HISTORICAL_ITEM = Symbol.for("ocx.responses.replayHistoricalItem");
|
|
2
|
+
|
|
3
|
+
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
4
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Mark an input item object as belonging to the historical replay prefix.
|
|
9
|
+
* Uses an enumerable symbol so it is preserved across shallow object spreads (`{ ...item }`),
|
|
10
|
+
* but completely ignored by `JSON.stringify` and `Object.keys`.
|
|
11
|
+
*/
|
|
12
|
+
export function markHistoricalItem<T extends object>(item: T): T {
|
|
13
|
+
Object.defineProperty(item, REPLAY_HISTORICAL_ITEM, {
|
|
14
|
+
value: true,
|
|
15
|
+
enumerable: true,
|
|
16
|
+
configurable: true,
|
|
17
|
+
writable: true,
|
|
18
|
+
});
|
|
19
|
+
return item;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Check whether an input item originated in the historical replay.
|
|
24
|
+
*/
|
|
25
|
+
export function isHistoricalItem(item: unknown): boolean {
|
|
26
|
+
return (
|
|
27
|
+
typeof item === "object"
|
|
28
|
+
&& item !== null
|
|
29
|
+
&& (item as Record<string | symbol, unknown>)[REPLAY_HISTORICAL_ITEM] === true
|
|
30
|
+
);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** A live marker survives even when a rewrite removes every historical item. */
|
|
34
|
+
export function hasItemProvenance(item: unknown): boolean {
|
|
35
|
+
return typeof item === "object" && item !== null
|
|
36
|
+
&& typeof (item as Record<string | symbol, unknown>)[REPLAY_HISTORICAL_ITEM] === "boolean";
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Replacement and synthesized items inherit the source's historical or live tag. */
|
|
40
|
+
export function copyItemProvenance<T extends object>(source: unknown, target: T): T {
|
|
41
|
+
if (hasItemProvenance(source)) {
|
|
42
|
+
Object.assign(target, { [REPLAY_HISTORICAL_ITEM]: isHistoricalItem(source) });
|
|
43
|
+
}
|
|
44
|
+
return target;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Tag both historical and live items so an empty replay prefix remains distinguishable
|
|
49
|
+
* from an input that has never been tagged. Input that already carries provenance keeps it:
|
|
50
|
+
* an earlier rewrite (Zed lifting a replayed wrapper) may have shifted items past the
|
|
51
|
+
* numeric prefix, so re-tagging by index would mislabel current-turn items as history.
|
|
52
|
+
*/
|
|
53
|
+
export function tagHistoricalInputItems(input: unknown[], prefixLength: number): unknown[] {
|
|
54
|
+
if (!Array.isArray(input)) return input;
|
|
55
|
+
if (input.some(hasItemProvenance)) return input;
|
|
56
|
+
const prefix = Math.min(input.length, Math.max(0, Math.trunc(prefixLength)));
|
|
57
|
+
if (prefix <= 0) return input;
|
|
58
|
+
return input.map((item, index) => {
|
|
59
|
+
if (isPlainObject(item)) {
|
|
60
|
+
return { ...item, [REPLAY_HISTORICAL_ITEM]: index < prefix };
|
|
61
|
+
}
|
|
62
|
+
return item;
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Compute the current replay prefix length dynamically.
|
|
68
|
+
* If items carry provenance markers, the boundary is the index of the first non-historical item.
|
|
69
|
+
* Otherwise, falls back to the provided fallback prefix length.
|
|
70
|
+
*/
|
|
71
|
+
export function computeReplayPrefixLength(input: unknown[], fallback = 0): number {
|
|
72
|
+
if (!Array.isArray(input)) return fallback;
|
|
73
|
+
const hasProvenance = input.some(hasItemProvenance);
|
|
74
|
+
if (!hasProvenance) {
|
|
75
|
+
return Math.min(input.length, Math.max(0, Math.trunc(fallback)));
|
|
76
|
+
}
|
|
77
|
+
const firstLiveIndex = input.findIndex(item => !isHistoricalItem(item));
|
|
78
|
+
return firstLiveIndex === -1 ? input.length : firstLiveIndex;
|
|
79
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { dottedToolName, namespacedToolName } from "../types";
|
|
2
2
|
import { collectResponsesToolGroups } from "./tool-groups";
|
|
3
3
|
import { collectAmbiguousDottedAliases, dottedAliasIsUnambiguous } from "./tool-name-aliases";
|
|
4
|
+
import { hasItemProvenance, isHistoricalItem } from "./item-provenance";
|
|
4
5
|
|
|
5
6
|
export interface RoutedNamespaceToolIdentity {
|
|
6
7
|
namespace: string;
|
|
@@ -344,13 +345,25 @@ function rewriteInputItem(item: unknown, plan: NamespaceRewritePlan, emitted: Se
|
|
|
344
345
|
export function rewriteRoutedNamespaceToolsForUpstream(
|
|
345
346
|
body: unknown,
|
|
346
347
|
convertedCustomToolNames?: ReadonlySet<string>,
|
|
348
|
+
replayPrefixLength?: number,
|
|
347
349
|
): {
|
|
348
350
|
body: unknown;
|
|
349
351
|
aliases: Map<string, RoutedNamespaceToolIdentity>;
|
|
350
352
|
} {
|
|
351
353
|
if (!isPlainObject(body)) return { body, aliases: new Map() };
|
|
352
|
-
const
|
|
354
|
+
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
355
|
+
? Math.max(0, Math.trunc(replayPrefixLength!))
|
|
356
|
+
: 0;
|
|
357
|
+
const hasProvenance = Array.isArray(body.input) && body.input.some(hasItemProvenance);
|
|
358
|
+
const isHistorical = (item: unknown, index: number) =>
|
|
359
|
+
hasProvenance ? isHistoricalItem(item) : index < currentTurnStart;
|
|
360
|
+
const groups = collectResponsesToolGroups(Array.isArray(body.input)
|
|
361
|
+
? { ...body, input: body.input.filter((item, index) => !isHistorical(item, index)) }
|
|
362
|
+
: body);
|
|
353
363
|
const plan = buildRewritePlan(groups);
|
|
364
|
+
const historicalPlan = buildRewritePlan(collectResponsesToolGroups({
|
|
365
|
+
input: Array.isArray(body.input) ? body.input.filter(isHistorical) : [],
|
|
366
|
+
}));
|
|
354
367
|
|
|
355
368
|
// Deliberately not gated on the plan being non-empty: a turn whose catalog is absent can still
|
|
356
369
|
// replay call items carrying a private `namespace`.
|
|
@@ -360,8 +373,13 @@ export function rewriteRoutedNamespaceToolsForUpstream(
|
|
|
360
373
|
let input = body.input;
|
|
361
374
|
if (Array.isArray(body.input)) {
|
|
362
375
|
let inputChanged = false;
|
|
363
|
-
const
|
|
364
|
-
|
|
376
|
+
const historicalEmitted = new Set<string>();
|
|
377
|
+
const rewrittenInput = body.input.map((item, index) => {
|
|
378
|
+
const historicalCatalog = isHistorical(item, index) && isPlainObject(item) && item.type === "additional_tools";
|
|
379
|
+
const itemEmitted = historicalCatalog
|
|
380
|
+
? historicalEmitted
|
|
381
|
+
: emitted;
|
|
382
|
+
const next = rewriteInputItem(item, historicalCatalog ? historicalPlan : plan, itemEmitted);
|
|
365
383
|
if (next !== item) inputChanged = true;
|
|
366
384
|
return next;
|
|
367
385
|
});
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
/** Authenticated structural output-turn membership; never execution or opaque-state authority. */
|
|
2
|
+
import {createHmac,randomBytes,timingSafeEqual} from 'node:crypto';
|
|
3
|
+
type Item=Record<string,unknown>;
|
|
4
|
+
type Scope={principal:string;thread:string};
|
|
5
|
+
type Kind='message'|'function_call'|'custom_tool_call'|'tool_search_call'|'reasoning'|'web_search_call';
|
|
6
|
+
const kinds=new Map<Kind,{prefix:string;code:string}>([
|
|
7
|
+
['message',{prefix:'msg',code:'m'}],['function_call',{prefix:'fc',code:'f'}],['custom_tool_call',{prefix:'ctc',code:'c'}],['tool_search_call',{prefix:'tsc',code:'s'}],['reasoning',{prefix:'rs',code:'r'}],['web_search_call',{prefix:'ws',code:'w'}],
|
|
8
|
+
]);
|
|
9
|
+
const calls=new Set(['function_call','custom_tool_call','tool_search_call']);
|
|
10
|
+
const plain=(x:unknown):x is Item=>x!==null&&typeof x==='object'&&!Array.isArray(x)&&[Object.prototype,null].includes(Object.getPrototypeOf(x));
|
|
11
|
+
const text=(x:unknown):x is string=>typeof x==='string'&&x.trim().length>0&&x.length<=4096;
|
|
12
|
+
const reserved=/^(?:msg|fc|ctc|tsc|rs|ws)_ocxt/;
|
|
13
|
+
const pattern=/^(msg|fc|ctc|tsc|rs|ws)_ocxt1_([A-Za-z0-9]{1,12})_([A-Za-z0-9_-]{22})_([0-9a-z]{1,4})_([mfcsrw])_([A-Za-z0-9_-]{22})$/;
|
|
14
|
+
const resultTypes=new Set(['function_call_output','custom_tool_call_output','tool_search_output']);
|
|
15
|
+
const resultType=(type:unknown)=>type==='function_call'?'function_call_output':type==='custom_tool_call'?'custom_tool_call_output':'tool_search_output';
|
|
16
|
+
type Member={item:Item;position:number;ordinal:number};
|
|
17
|
+
/** Reorder only closed authenticated spans while retaining every original payload object. */
|
|
18
|
+
function normalizeGroups(input:unknown[],groups:Member[][]):unknown[]{
|
|
19
|
+
type Occurrence={item:Item;position:number;count:number};
|
|
20
|
+
const byCall=new Map<string,Occurrence>(),byResult=new Map<string,Occurrence>();
|
|
21
|
+
const index=(map:Map<string,Occurrence>,item:Item,position:number)=>{const key=item.call_id as string,old=map.get(key);if(old)old.count++;else map.set(key,{item,position,count:1});};
|
|
22
|
+
for(let i=0;i<input.length;i++){const item=input[i];if(!plain(item)||!text(item.call_id))continue;
|
|
23
|
+
if(calls.has(String(item.type)))index(byCall,item,i);else if(resultTypes.has(String(item.type)))index(byResult,item,i);
|
|
24
|
+
}
|
|
25
|
+
const spans:{first:number;last:number;items:unknown[]}[]=[];
|
|
26
|
+
for(const members of groups){
|
|
27
|
+
if(!members.some(m=>calls.has(String(m.item.type))))continue;
|
|
28
|
+
if(members.some((m,i)=>i>0&&m.ordinal<=members[i-1]!.ordinal))return input;
|
|
29
|
+
const memberIds=new Set(members.map(m=>m.item.id));if(memberIds.size!==members.length)return input;
|
|
30
|
+
const groupCalls=members.filter(m=>calls.has(String(m.item.type))),resultPositions:number[]=[];let valid=true;
|
|
31
|
+
for(const {item} of groupCalls){const call=byCall.get(item.call_id as string),result=byResult.get(item.call_id as string);
|
|
32
|
+
if(call?.count!==1||result?.count!==1||result.item.type!==resultType(item.type)
|
|
33
|
+
|| (item.type==='tool_search_call'
|
|
34
|
+
? result.item.execution!=='client'||!Array.isArray(result.item.tools)
|
|
35
|
+
: !Object.hasOwn(result.item,'output'))){valid=false;break;}
|
|
36
|
+
resultPositions.push(result.position);
|
|
37
|
+
}
|
|
38
|
+
if(!valid)return input;
|
|
39
|
+
const first=members[0]!.position,last=Math.max(members.at(-1)!.position,...resultPositions);
|
|
40
|
+
if(resultPositions.some(i=>i<first))return input;
|
|
41
|
+
const outputs:unknown[]=[],seenCalls=new Set<string>(),seenResults=new Set<string>();
|
|
42
|
+
for(let i=first;i<=last;i++){
|
|
43
|
+
const item=input[i];if(!plain(item)){valid=false;break;}
|
|
44
|
+
if(memberIds.has(item.id)){if(calls.has(String(item.type)))seenCalls.add(item.call_id as string);}
|
|
45
|
+
else if(resultTypes.has(String(item.type))&&text(item.call_id)&&seenCalls.has(item.call_id)&&!seenResults.has(item.call_id)){seenResults.add(item.call_id);outputs.push(item);}
|
|
46
|
+
else{valid=false;break;}
|
|
47
|
+
}
|
|
48
|
+
if(!valid)return input;
|
|
49
|
+
const items=[...members.filter(m=>!calls.has(String(m.item.type))).map(m=>m.item),...groupCalls.map(m=>m.item),...outputs];
|
|
50
|
+
if(items.some((item,index)=>item!==input[first+index]))spans.push({first,last,items});
|
|
51
|
+
}
|
|
52
|
+
if(!spans.length)return input;spans.sort((a,b)=>a.first-b.first);if(spans.some((s,i)=>i>0&&s.first<=spans[i-1]!.last))return input;
|
|
53
|
+
const output:unknown[]=[];let cursor=0;for(const s of spans){output.push(...input.slice(cursor,s.first),...s.items);cursor=s.last+1;}output.push(...input.slice(cursor));return output;
|
|
54
|
+
}
|
|
55
|
+
/** Authenticate structural replay membership without signing customer payload contents. */
|
|
56
|
+
export class TurnTokenCodec {
|
|
57
|
+
private readonly keys:ReadonlyMap<string,Uint8Array>;
|
|
58
|
+
/** Validate and own an independent copy of the bounded signing-key ring. */
|
|
59
|
+
constructor(keys:ReadonlyMap<string,Uint8Array>,private readonly activeKeyId:string){
|
|
60
|
+
if(keys.size<1||keys.size>8||!keys.has(activeKeyId))throw Error('Missing active turn-membership key');
|
|
61
|
+
const owned=new Map<string,Uint8Array>();for(const [id,key] of keys){if(!/^[A-Za-z0-9]{1,12}$/.test(id)||key.length<32||key.length>64)throw Error('Invalid turn-membership key');owned.set(id,Uint8Array.from(key));}this.keys=owned;
|
|
62
|
+
}
|
|
63
|
+
/** Accept only an explicit principal and own-thread scope. */
|
|
64
|
+
private scope(scope:unknown):Scope|undefined{if(!plain(scope)||!text(scope.principal)||!text(scope.thread))return;return{principal:scope.principal,thread:scope.thread};}
|
|
65
|
+
/** Bind the token header to its key, caller and thread using a domain-separated HMAC. */
|
|
66
|
+
private tag(keyId:string,scope:Scope,header:string):Buffer|undefined{
|
|
67
|
+
const key=this.keys.get(keyId);if(!key)return;
|
|
68
|
+
return createHmac('sha256',key).update('opencodex.response-turn-membership.v1\0'+JSON.stringify([scope.principal,scope.thread,header])).digest().subarray(0,16);
|
|
69
|
+
}
|
|
70
|
+
/** Mint at item start. This authenticates grouping, never completion or future payload bytes. */
|
|
71
|
+
begin(scope:unknown):{next:(kind:Kind)=>string}{
|
|
72
|
+
const bound=this.scope(scope);if(!bound)throw Error('Trusted caller/thread scope is required');
|
|
73
|
+
const nonce=randomBytes(16).toString('base64url'),keyId=this.activeKeyId;let ordinal=0;
|
|
74
|
+
return{next:(kind:Kind)=>{const descriptor=kinds.get(kind);if(!descriptor||ordinal>65535)throw Error('Invalid turn item kind or index');
|
|
75
|
+
const header=descriptor.prefix+'_ocxt1_'+keyId+'_'+nonce+'_'+(ordinal++).toString(36)+'_'+descriptor.code;
|
|
76
|
+
return header+'_'+this.tag(keyId,bound,header)!.toString('base64url');
|
|
77
|
+
}};
|
|
78
|
+
}
|
|
79
|
+
/** Verify bounded item membership; malformed or mismatched scopes have no authority. */
|
|
80
|
+
private verify(scope:Scope,item:Item):{group:string;ordinal:number}|undefined{
|
|
81
|
+
if(typeof item.id!=='string'||item.id.length>128)return;
|
|
82
|
+
const match=pattern.exec(item.id);if(!match)return;
|
|
83
|
+
const [_,prefix,keyId,nonce,index,code,encodedTag]=match;
|
|
84
|
+
if(!prefix||!keyId||!nonce||!index||!code||!encodedTag)return;
|
|
85
|
+
const descriptor=kinds.get(item.type as Kind);if(!descriptor||descriptor.prefix!==prefix||descriptor.code!==code)return;
|
|
86
|
+
const ordinal=Number.parseInt(index,36);if(!Number.isSafeInteger(ordinal)||ordinal>65535||ordinal.toString(36)!==index)return;
|
|
87
|
+
if(Buffer.from(nonce,'base64url').toString('base64url')!==nonce||Buffer.from(encodedTag,'base64url').toString('base64url')!==encodedTag)return;
|
|
88
|
+
const expected=this.tag(keyId,scope,item.id.slice(0,-23)),actual=Buffer.from(encodedTag,'base64url');
|
|
89
|
+
if(!expected||actual.length!==16||!timingSafeEqual(actual,expected))return;
|
|
90
|
+
if(item.status!==undefined&&item.status!=='completed')return;
|
|
91
|
+
if(item.type==='message'&&item.role!=='assistant')return;
|
|
92
|
+
if(calls.has(String(item.type))&&!text(item.call_id))return;
|
|
93
|
+
if((item.type==='function_call'||item.type==='custom_tool_call')&&!text(item.name))return;
|
|
94
|
+
if(item.type==='function_call'&&typeof item.arguments!=='string')return;
|
|
95
|
+
if(item.type==='custom_tool_call'&&typeof item.input!=='string')return;
|
|
96
|
+
if(item.type==='tool_search_call'&&(item.execution!=='client'||!plain(item.arguments)))return;
|
|
97
|
+
return{group:keyId+':'+nonce,ordinal};
|
|
98
|
+
}
|
|
99
|
+
normalize(scope:unknown,input:unknown[]):unknown[]{
|
|
100
|
+
const bound=this.scope(scope);if(!bound||input.length>65536)return input;
|
|
101
|
+
const groups=new Map<string,Member[]>();
|
|
102
|
+
for(let position=0;position<input.length;position++){
|
|
103
|
+
const item=input[position];if(!plain(item)||typeof item.id!=='string'||!reserved.test(item.id))continue;
|
|
104
|
+
const verified=this.verify(bound,item);if(!verified)return input;
|
|
105
|
+
const group=groups.get(verified.group)??[];
|
|
106
|
+
if(group.length&&verified.ordinal<=group.at(-1)!.ordinal)return input;
|
|
107
|
+
group.push({item,position,ordinal:verified.ordinal});groups.set(verified.group,group);
|
|
108
|
+
}
|
|
109
|
+
return normalizeGroups(input,[...groups.values()]);
|
|
110
|
+
}
|
|
111
|
+
}
|
package/src/router.ts
CHANGED
|
@@ -30,7 +30,7 @@ import {
|
|
|
30
30
|
LEGACY_OPENAI_MULTI_PROVIDER_ID,
|
|
31
31
|
OPENAI_CODEX_PROVIDER_ID,
|
|
32
32
|
} from "./providers/openai-tiers";
|
|
33
|
-
import { decodeRoutedModelIdOrThrow, encodeRoutedModelId } from "./providers/slug-codec";
|
|
33
|
+
import { decodeRoutedModelId, decodeRoutedModelIdOrThrow, encodeRoutedModelId } from "./providers/slug-codec";
|
|
34
34
|
import { effectiveProviderAliasDecision, resolveModelAlias } from "./providers/default-aliases";
|
|
35
35
|
import { resolveBlockedModelRedirect } from "./lib/shadow-call";
|
|
36
36
|
import { workBuddyCatalogIdentity } from "./providers/workbuddy";
|
|
@@ -200,6 +200,20 @@ export function knownModelIdsForProvider(
|
|
|
200
200
|
* (never a caller-supplied string), so the log carries no request content.
|
|
201
201
|
*/
|
|
202
202
|
const compactionFallbackWarnings = new Set<string>();
|
|
203
|
+
/**
|
|
204
|
+
* Last-resort decode for a direct provider-qualified slug the live roster cannot resolve yet.
|
|
205
|
+
* Retained ids win (an encoded slash-valued retained id included), then the operator-declared
|
|
206
|
+
* modelDisplayNames keys. Neither list feeds alias generation.
|
|
207
|
+
*/
|
|
208
|
+
function decodeDisplayNameFallback(prov: OcxProviderConfig, decoded: string): string {
|
|
209
|
+
const retained = prov.retainModels ?? [];
|
|
210
|
+
// Any retained claim, even an ambiguous one the codec refuses to guess, ends the fallback.
|
|
211
|
+
if (retained.some(id => id === decoded || encodeRoutedModelId(id) === decoded)) {
|
|
212
|
+
return decodeRoutedModelId(decoded, retained);
|
|
213
|
+
}
|
|
214
|
+
return decodeRoutedModelId(decoded, Object.keys(prov.modelDisplayNames ?? {}));
|
|
215
|
+
}
|
|
216
|
+
|
|
203
217
|
function warnCompactionDefaultProviderFallbackOnce(providerName: string): void {
|
|
204
218
|
if (compactionFallbackWarnings.has(providerName)) return;
|
|
205
219
|
compactionFallbackWarnings.add(providerName);
|
|
@@ -583,7 +597,12 @@ function routeModelInternal(
|
|
|
583
597
|
const decoded = decodeRoutedModelIdOrThrow(requestedModel, known);
|
|
584
598
|
const nativeModel = known.includes(decoded)
|
|
585
599
|
? decoded
|
|
586
|
-
: resolveModelAlias(config, prov, known, requestedModel)
|
|
600
|
+
: resolveModelAlias(config, prov, known, requestedModel)
|
|
601
|
+
// Last resort for direct requests while the live roster is cold: display-name keys are
|
|
602
|
+
// operator-declared native ids, consulted only here so they never claim aliases or shadow
|
|
603
|
+
// known or retained ids. Concrete policy/combo/redirect targets (bypassCombos) keep the
|
|
604
|
+
// exact model their evaluator selected, so evidence and eligibility describe what is sent.
|
|
605
|
+
?? (bypassCombos ? decoded : decodeDisplayNameFallback(prov, decoded));
|
|
587
606
|
return routeResult(
|
|
588
607
|
config,
|
|
589
608
|
provName,
|
package/src/routing/analytics.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
|
|
14
14
|
import { normalizePersistedUsageRow, type PersistedUsageEntry } from "../usage/log";
|
|
15
15
|
import { computeEntryCost } from "../usage/summary";
|
|
16
|
-
import {
|
|
16
|
+
import { withRequestHistoryRead } from "./history/indexer";
|
|
17
17
|
|
|
18
18
|
export const ANALYTICS_MAX_ROWS = 50_000;
|
|
19
19
|
/** Default row cap for the management API (full cap remains available via `limit`). */
|
|
@@ -168,8 +168,6 @@ export async function computeRoutingAnalytics(
|
|
|
168
168
|
filters: RoutingAnalyticsFilters,
|
|
169
169
|
options: { maxRows?: number } = {},
|
|
170
170
|
): Promise<RoutingAnalyticsResult> {
|
|
171
|
-
await openRequestHistoryIndex();
|
|
172
|
-
const handle = requestHistoryDb();
|
|
173
171
|
const maxRows = Math.min(
|
|
174
172
|
Math.max(1, Math.trunc(options.maxRows ?? ANALYTICS_MAX_ROWS)),
|
|
175
173
|
ANALYTICS_MAX_ROWS,
|
|
@@ -189,7 +187,7 @@ export async function computeRoutingAnalytics(
|
|
|
189
187
|
if (filters.to !== undefined) add("timestamp <= ?", filters.to);
|
|
190
188
|
const whereSql = where.length > 0 ? ` WHERE ${where.join(" AND ")}` : "";
|
|
191
189
|
|
|
192
|
-
const rows = handle.query(
|
|
190
|
+
const rows = await withRequestHistoryRead(handle => handle.query(
|
|
193
191
|
`SELECT provider, model, api_key_id AS apiKeyId, profile_id AS profileId,
|
|
194
192
|
profile_revision AS profileRevision, status,
|
|
195
193
|
duration_ms AS durationMs, first_output_ms AS firstOutputMs,
|
|
@@ -197,7 +195,7 @@ export async function computeRoutingAnalytics(
|
|
|
197
195
|
usage_status AS usageStatus, usage_json AS usageJson,
|
|
198
196
|
attempt_count AS attemptCount, fallback, row_json AS rowJson
|
|
199
197
|
FROM requests${whereSql} ORDER BY timestamp DESC LIMIT ?`,
|
|
200
|
-
).all(...values, maxRows + 1) as ScannedRow[];
|
|
198
|
+
).all(...values, maxRows + 1) as ScannedRow[]);
|
|
201
199
|
|
|
202
200
|
const scanned = rows.slice(0, maxRows);
|
|
203
201
|
const historyTruncated = rows.length > maxRows;
|
|
@@ -46,7 +46,7 @@ export interface FallbackEvent {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
/** The admission slice this module reads; a configured key is the only device identity. */
|
|
49
|
-
export type FallbackAdmission = { kind: string; keyId?: string } | null | undefined;
|
|
49
|
+
export type FallbackAdmission = { kind: string; keyId?: string; readonly callerPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy } | null | undefined;
|
|
50
50
|
|
|
51
51
|
const RING_SIZE = 20;
|
|
52
52
|
const ring: FallbackEvent[] = [];
|
|
@@ -210,9 +210,13 @@ export function guardFallbackHop(config: OcxConfig, hop: FallbackHop): FallbackG
|
|
|
210
210
|
const kind = fallbackHopKind(hop.from, hop.to);
|
|
211
211
|
if (kind === null) return { ok: true, kind: null, commit: NO_COMMIT };
|
|
212
212
|
const now = hop.now ?? Date.now();
|
|
213
|
-
|
|
213
|
+
let deviceIds = fallbackDeviceIds(config, hop.admission, now);
|
|
214
214
|
const routes = [hop.route, ...(hop.aliases ?? [])].filter((value, index, all) => value && all.indexOf(value) === index);
|
|
215
|
-
|
|
215
|
+
let decision = resolveFallbackPolicy(config, { kind, routes, provider: hop.from.provider, deviceIds });
|
|
216
|
+
for (const captured of hop.admission?.callerPolicy?.fallbackPolicies ?? []) {
|
|
217
|
+
const caller = resolveFallbackPolicy(captured.config, { kind, routes, provider: hop.from.provider, deviceIds: captured.deviceIds });
|
|
218
|
+
if (!caller.allowed) { decision = caller; deviceIds = [...captured.deviceIds]; break; }
|
|
219
|
+
}
|
|
216
220
|
const event: FallbackEvent = {
|
|
217
221
|
at: new Date(now).toISOString(),
|
|
218
222
|
site: hop.site,
|
package/src/routing/health.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
*/
|
|
18
18
|
|
|
19
19
|
import type { OcxConfig } from "../types";
|
|
20
|
-
import { openRequestHistoryIndexSync, requestHistoryDb } from "./history/indexer";
|
|
20
|
+
import { openRequestHistoryIndexSync, reportRequestHistoryCorruption, requestHistoryDb } from "./history/indexer";
|
|
21
21
|
import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
|
|
22
22
|
import {
|
|
23
23
|
getCodexAccountCooldownUntil,
|
|
@@ -251,9 +251,10 @@ function computeHistoricalHealthEvidence(
|
|
|
251
251
|
input: Pick<HealthEvidenceInput, "provider" | "model" | "accountRef">,
|
|
252
252
|
now: number,
|
|
253
253
|
): HistoricalHealthEvidence {
|
|
254
|
+
let handle: ReturnType<typeof requestHistoryDb> | undefined;
|
|
254
255
|
try {
|
|
255
256
|
openRequestHistoryIndexSync();
|
|
256
|
-
|
|
257
|
+
handle = requestHistoryDb();
|
|
257
258
|
const where: string[] = ["provider = ?", "model = ?", "timestamp >= ?"];
|
|
258
259
|
const values: Array<string | number> = [input.provider, input.model, now - HEALTH_WINDOW_MS];
|
|
259
260
|
if (input.accountRef) {
|
|
@@ -341,7 +342,8 @@ function computeHistoricalHealthEvidence(
|
|
|
341
342
|
out.recencyWeight = decayWeight(samples[0]!.timestamp, now);
|
|
342
343
|
}
|
|
343
344
|
return out;
|
|
344
|
-
} catch {
|
|
345
|
+
} catch (error) {
|
|
346
|
+
if (handle) reportRequestHistoryCorruption(error, handle);
|
|
345
347
|
/* index unreadable: evidence stays unknown */
|
|
346
348
|
return {};
|
|
347
349
|
}
|
|
@@ -79,6 +79,12 @@ export function buildIndexFile(buildPath: string, reason: string, revision: Usag
|
|
|
79
79
|
expected: revision,
|
|
80
80
|
endOffset: Number(revision.size),
|
|
81
81
|
});
|
|
82
|
+
// Validate before publication while still off the serving thread. The
|
|
83
|
+
// published handle can then be trusted until its periodic worker check.
|
|
84
|
+
const check = build.query("PRAGMA quick_check").get() as { quick_check?: string } | undefined;
|
|
85
|
+
if (check?.quick_check !== "ok") {
|
|
86
|
+
throw Object.assign(new Error("rebuilt history index failed integrity check"), { code: "SQLITE_CORRUPT" });
|
|
87
|
+
}
|
|
82
88
|
// The serving thread opens the published file in WAL mode; switching here
|
|
83
89
|
// keeps that first open from rewriting the database header.
|
|
84
90
|
build.exec("PRAGMA journal_mode = WAL");
|