@bitkyc08/opencodex 2.100.1 → 2.100.3
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 +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/oauth/store.ts
CHANGED
|
@@ -21,6 +21,7 @@ import { publishCredentialSync } from "../local-credentials/generation";
|
|
|
21
21
|
* both append distinct identified accounts under multiauth.
|
|
22
22
|
*/
|
|
23
23
|
import { notifyAuthStoreLoaded } from "../lib/decision-quota-sink";
|
|
24
|
+
import { isPassiveRead } from "../lib/passive-read";
|
|
24
25
|
import { accountPauseDetailsSchema } from "../config/schema/account-auto-pause";
|
|
25
26
|
import { normalizeOAuthPlan, mergeOAuthPlan } from "./plan";
|
|
26
27
|
import { normalizeAnthropicIdentity, matchesAnthropicImport, mergeAnthropicIdentity } from "./anthropic-identity";
|
|
@@ -380,6 +381,12 @@ function loadAuthStoreInternal(): { store: AuthStore; hadLegacy: boolean } {
|
|
|
380
381
|
}
|
|
381
382
|
|
|
382
383
|
export function loadAuthStore(): AuthStore {
|
|
384
|
+
// A passive ownership check (a Remote Link Child, #6959) must see an external replacement
|
|
385
|
+
// without repairing, hardening, or publishing a roster. It cannot establish ownership of an
|
|
386
|
+
// unreadable store, so a corrupt file reads as empty rather than being backed up here.
|
|
387
|
+
if (isPassiveRead()) {
|
|
388
|
+
try { return peekAuthStore(); } catch { return {}; }
|
|
389
|
+
}
|
|
383
390
|
return loadAuthStoreInternal().store;
|
|
384
391
|
}
|
|
385
392
|
|
|
@@ -643,6 +650,21 @@ function newAccountId(cred: OAuthCredentials): string {
|
|
|
643
650
|
return createHash("sha256").update(identity).digest("hex").slice(0, 32);
|
|
644
651
|
}
|
|
645
652
|
|
|
653
|
+
/**
|
|
654
|
+
* An explicit login or reauthentication clears an AUTOMATIC pause (one that recorded
|
|
655
|
+
* `pauseDetails`), because the evidence behind it described the replaced credential (#8398).
|
|
656
|
+
* An operator pause carries no details and stays. Eligibility changed, so the selection revision
|
|
657
|
+
* moves with a fresh pause revision, which also retires any auto-pause proposal captured before.
|
|
658
|
+
*/
|
|
659
|
+
function clearAutomaticPauseForLogin(set: ProviderAccountSet, account: ProviderAccount): boolean {
|
|
660
|
+
if (account.paused !== true || !account.pauseDetails) return false;
|
|
661
|
+
delete account.paused;
|
|
662
|
+
delete account.pauseDetails;
|
|
663
|
+
account.pauseRevision = randomUUID();
|
|
664
|
+
set.selectionRevision = randomUUID();
|
|
665
|
+
return true;
|
|
666
|
+
}
|
|
667
|
+
|
|
646
668
|
/** Allocate a persisted slot id without reusing any existing account's ownership key. */
|
|
647
669
|
function distinctAccountId(cred: OAuthCredentials, accounts: readonly ProviderAccount[]): string {
|
|
648
670
|
const base = newAccountId(cred);
|
|
@@ -946,7 +968,10 @@ export async function saveCredentialWithReceipt(
|
|
|
946
968
|
if (isAnthropicInstanceId(provider)) assertAnthropicCredentialSource(provider, cred);
|
|
947
969
|
const safe = normalizeCredential(cred);
|
|
948
970
|
if (!safe) return null;
|
|
971
|
+
// A login that clears an automatic pause publishes it once the write commits (#8398).
|
|
972
|
+
let pauseCleared = false;
|
|
949
973
|
const receipt = await mutateStore(store => {
|
|
974
|
+
pauseCleared = false;
|
|
950
975
|
if (provider === "anthropic2") assertAnthropicInstanceLoginConfig(loadConfig(), provider);
|
|
951
976
|
if (isAnthropicInstanceId(provider)) assertNoCrossAnthropicRegistration(store, provider, safe);
|
|
952
977
|
const set = store[provider];
|
|
@@ -973,6 +998,7 @@ export async function saveCredentialWithReceipt(
|
|
|
973
998
|
delete existing.needsReauth;
|
|
974
999
|
delete existing.needsReauthReason;
|
|
975
1000
|
delete existing.refreshAttentionGeneration;
|
|
1001
|
+
if (clearAutomaticPauseForLogin(set, existing)) pauseCleared = true;
|
|
976
1002
|
accountId = existing.id;
|
|
977
1003
|
} else {
|
|
978
1004
|
const id = distinctAccountId(safe, set.accounts);
|
|
@@ -995,6 +1021,7 @@ export async function saveCredentialWithReceipt(
|
|
|
995
1021
|
delete existing.needsReauth;
|
|
996
1022
|
delete existing.needsReauthReason;
|
|
997
1023
|
delete existing.refreshAttentionGeneration;
|
|
1024
|
+
if (clearAutomaticPauseForLogin(set, existing)) pauseCleared = true;
|
|
998
1025
|
if (existing.paused !== true) set.activeAccountId = existing.id;
|
|
999
1026
|
accountId = existing.id;
|
|
1000
1027
|
} else {
|
|
@@ -1014,6 +1041,7 @@ export async function saveCredentialWithReceipt(
|
|
|
1014
1041
|
delete active.needsReauth;
|
|
1015
1042
|
delete active.needsReauthReason;
|
|
1016
1043
|
delete active.refreshAttentionGeneration;
|
|
1044
|
+
if (clearAutomaticPauseForLogin(set, active)) pauseCleared = true;
|
|
1017
1045
|
accountId = active.id;
|
|
1018
1046
|
} else {
|
|
1019
1047
|
const id = distinctAccountId(safe, set.accounts);
|
|
@@ -1035,6 +1063,7 @@ export async function saveCredentialWithReceipt(
|
|
|
1035
1063
|
delete active.needsReauth;
|
|
1036
1064
|
delete active.needsReauthReason;
|
|
1037
1065
|
delete active.refreshAttentionGeneration;
|
|
1066
|
+
if (clearAutomaticPauseForLogin(set, active)) pauseCleared = true;
|
|
1038
1067
|
accountId = active.id;
|
|
1039
1068
|
} else {
|
|
1040
1069
|
const id = distinctAccountId(safe, set.accounts);
|
|
@@ -1046,6 +1075,12 @@ export async function saveCredentialWithReceipt(
|
|
|
1046
1075
|
const updatedSet = store[provider];
|
|
1047
1076
|
const savedAccount = updatedSet?.accounts.find(account => account.id === accountId);
|
|
1048
1077
|
const activeAccount = updatedSet?.accounts.find(account => account.id === updatedSet.activeAccountId);
|
|
1078
|
+
// A login that cleared this account's automatic pause hands it a selection still parked on a
|
|
1079
|
+
// paused row (the local-cli import branch does not select on its own), as reauth does below.
|
|
1080
|
+
if (pauseCleared && updatedSet && savedAccount && savedAccount.paused !== true && savedAccount.needsReauth !== true
|
|
1081
|
+
&& activeAccount?.id !== accountId && (!activeAccount || activeAccount.paused === true || activeAccount.needsReauth === true)) {
|
|
1082
|
+
updatedSet.activeAccountId = accountId;
|
|
1083
|
+
}
|
|
1049
1084
|
if (savedAccount?.paused === true
|
|
1050
1085
|
&& (!activeAccount || activeAccount.paused === true || activeAccount.needsReauth === true)) {
|
|
1051
1086
|
const fallback = updatedSet.accounts.find(account => account.id !== accountId
|
|
@@ -1068,6 +1103,7 @@ export async function saveCredentialWithReceipt(
|
|
|
1068
1103
|
receipt.selectionRevision = store[provider]?.selectionRevision;
|
|
1069
1104
|
},
|
|
1070
1105
|
});
|
|
1106
|
+
if (pauseCleared) publishOAuthAccountPauseChange(provider);
|
|
1071
1107
|
// An explicit login retires that account's failover evidence: a cooldown recorded
|
|
1072
1108
|
// against the old grant must not hold out the fresh credential. Dynamic import
|
|
1073
1109
|
// keeps the store free of a static edge into the failover module, which reads the
|
|
@@ -1302,14 +1338,20 @@ export async function saveAccountCredential(
|
|
|
1302
1338
|
provider: string,
|
|
1303
1339
|
accountId: string,
|
|
1304
1340
|
cred: OAuthCredentials,
|
|
1305
|
-
|
|
1341
|
+
/**
|
|
1342
|
+
* `clearAutomaticPause`: only an operator's explicit reauthentication of this account may clear a
|
|
1343
|
+
* pause auto-pause recorded (#8398); other writers (Kiro's pre-login identity binding) leave it.
|
|
1344
|
+
*/
|
|
1345
|
+
opts: { assertBeforePersist?: () => void; rotateLoginId?: boolean; clearAutomaticPause?: boolean } = {},
|
|
1306
1346
|
): Promise<boolean> {
|
|
1307
1347
|
if (isAnthropicInstanceId(provider)) assertAnthropicCredentialSource(provider, cred);
|
|
1308
1348
|
const safe = normalizeCredential(cred);
|
|
1309
1349
|
if (!safe) return false;
|
|
1310
1350
|
let written = false;
|
|
1351
|
+
let pauseCleared = false;
|
|
1311
1352
|
await mutateStore(store => {
|
|
1312
1353
|
written = false;
|
|
1354
|
+
pauseCleared = false;
|
|
1313
1355
|
if (provider === "anthropic2") assertAnthropicInstanceLoginConfig(loadConfig(), provider);
|
|
1314
1356
|
if (isAnthropicInstanceId(provider)) assertNoCrossAnthropicRegistration(store, provider, safe);
|
|
1315
1357
|
const set = store[provider];
|
|
@@ -1321,6 +1363,7 @@ export async function saveAccountCredential(
|
|
|
1321
1363
|
delete account.needsReauth;
|
|
1322
1364
|
delete account.needsReauthReason;
|
|
1323
1365
|
delete account.refreshAttentionGeneration;
|
|
1366
|
+
if (opts.clearAutomaticPause === true && clearAutomaticPauseForLogin(set, account)) pauseCleared = true;
|
|
1324
1367
|
// A pause that found no usable fallback leaves the active id on a paused row. Once this
|
|
1325
1368
|
// reauthentication makes an unpaused account usable, hand the selection to it.
|
|
1326
1369
|
const active = set.accounts.find(a => a.id === set.activeAccountId);
|
|
@@ -1329,6 +1372,7 @@ export async function saveAccountCredential(
|
|
|
1329
1372
|
set.selectionRevision = randomUUID();
|
|
1330
1373
|
}
|
|
1331
1374
|
}, [provider, accountId, safe], { assertBeforePersist: registrationPersistGuard(provider, opts.assertBeforePersist) });
|
|
1375
|
+
if (pauseCleared) publishOAuthAccountPauseChange(provider);
|
|
1332
1376
|
return written;
|
|
1333
1377
|
}
|
|
1334
1378
|
|
|
@@ -1401,6 +1445,8 @@ export async function setAccountAlias(provider: string, accountId: string, alias
|
|
|
1401
1445
|
export type SetAccountPausedResult =
|
|
1402
1446
|
| { status: "updated"; activeAccountId: string; activeAccountChanged: boolean }
|
|
1403
1447
|
| { status: "unchanged"; activeAccountId: string; activeAccountChanged: boolean }
|
|
1448
|
+
/** A guarded resume found the pause or credential replaced since its health check. */
|
|
1449
|
+
| { status: "changed" }
|
|
1404
1450
|
| { status: "not-found" };
|
|
1405
1451
|
|
|
1406
1452
|
/** Serialize policy with refresh/removal; stale pre-wait selection proposals must retry. */
|
|
@@ -1449,6 +1495,8 @@ export async function setAccountPaused(
|
|
|
1449
1495
|
accountId: string,
|
|
1450
1496
|
paused: boolean,
|
|
1451
1497
|
automatic?: { generation: string; pauseRevision?: string; details: import("../types/account-auto-pause").AccountPauseDetails; isCurrent?: () => boolean; assertPolicyBeforePersist?: () => void },
|
|
1498
|
+
/** Resume only while the pause and credential are the ones a health check observed (#8398). */
|
|
1499
|
+
resumeGuard?: { generation: string; pauseRevision: string | undefined },
|
|
1452
1500
|
): Promise<SetAccountPausedResult> {
|
|
1453
1501
|
const result = await mutateStore(store => {
|
|
1454
1502
|
const set = store[provider];
|
|
@@ -1456,6 +1504,8 @@ export async function setAccountPaused(
|
|
|
1456
1504
|
if (!set || !account) return { status: "not-found" } as const;
|
|
1457
1505
|
if (automatic && (automatic.isCurrent?.() === false || credentialGeneration(account.credential) !== automatic.generation
|
|
1458
1506
|
|| account.pauseRevision !== automatic.pauseRevision)) return { status: "not-found" } as const;
|
|
1507
|
+
if (resumeGuard && (paused || account.paused !== true || account.pauseRevision !== resumeGuard.pauseRevision
|
|
1508
|
+
|| credentialGeneration(account.credential) !== resumeGuard.generation)) return { status: "changed" } as const;
|
|
1459
1509
|
if (paused && account.paused === true) {
|
|
1460
1510
|
return { status: "unchanged", activeAccountId: set.activeAccountId, activeAccountChanged: false } as const;
|
|
1461
1511
|
}
|
package/src/oauth/xai.ts
CHANGED
|
@@ -22,11 +22,14 @@ export const XAI_LOCAL_CLI_DETACH_WARNING =
|
|
|
22
22
|
interface XaiDiscovery {
|
|
23
23
|
authorizationEndpoint: string;
|
|
24
24
|
tokenEndpoint: string;
|
|
25
|
+
/** RFC 8628 endpoint, when the issuer advertises one. */
|
|
26
|
+
deviceAuthorizationEndpoint?: string;
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
interface XaiDiscoveryPayload {
|
|
28
30
|
authorization_endpoint?: unknown;
|
|
29
31
|
token_endpoint?: unknown;
|
|
32
|
+
device_authorization_endpoint?: unknown;
|
|
30
33
|
}
|
|
31
34
|
|
|
32
35
|
export interface XaiTokenPayload {
|
|
@@ -69,12 +72,17 @@ function validateXaiEndpoint(rawUrl: string): string {
|
|
|
69
72
|
}
|
|
70
73
|
|
|
71
74
|
export async function discoverXaiOAuthEndpoints(signal?: AbortSignal): Promise<XaiDiscovery> {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
75
|
+
let response: Response;
|
|
76
|
+
try {
|
|
77
|
+
response = await fetch(XAI_OAUTH_DISCOVERY_URL, {
|
|
78
|
+
headers: { Accept: "application/json" },
|
|
79
|
+
signal: requestSignal(signal),
|
|
80
|
+
});
|
|
81
|
+
} catch (error) {
|
|
82
|
+
throw new XaiTokenRequestError(undefined, undefined, "xAI OAuth discovery failed: network error", { cause: error });
|
|
83
|
+
}
|
|
76
84
|
if (!response.ok) {
|
|
77
|
-
throw new
|
|
85
|
+
throw new XaiTokenRequestError(response.status, undefined, `xAI OAuth discovery failed: ${response.status} ${await response.text()}`);
|
|
78
86
|
}
|
|
79
87
|
|
|
80
88
|
const payload = (await response.json()) as XaiDiscoveryPayload;
|
|
@@ -85,6 +93,9 @@ export async function discoverXaiOAuthEndpoints(signal?: AbortSignal): Promise<X
|
|
|
85
93
|
return {
|
|
86
94
|
authorizationEndpoint: validateXaiEndpoint(payload.authorization_endpoint),
|
|
87
95
|
tokenEndpoint: validateXaiEndpoint(payload.token_endpoint),
|
|
96
|
+
...(typeof payload.device_authorization_endpoint === "string"
|
|
97
|
+
? { deviceAuthorizationEndpoint: validateXaiEndpoint(payload.device_authorization_endpoint) }
|
|
98
|
+
: {}),
|
|
88
99
|
};
|
|
89
100
|
}
|
|
90
101
|
|
|
@@ -107,8 +118,56 @@ function getTokenIdentity(accessToken: string, idToken: string | undefined): { a
|
|
|
107
118
|
return { accountId, email };
|
|
108
119
|
}
|
|
109
120
|
|
|
110
|
-
export class XaiTokenRequestError extends Error {
|
|
111
|
-
|
|
121
|
+
export class XaiTokenRequestError extends Error {
|
|
122
|
+
constructor(
|
|
123
|
+
public readonly status?: number,
|
|
124
|
+
public readonly oauthError?: string,
|
|
125
|
+
message = "xAI token request failed",
|
|
126
|
+
options?: { cause?: unknown },
|
|
127
|
+
/** Server-requested throttle from a retryable response, already floored and finite. */
|
|
128
|
+
public readonly retryAfterMs?: number,
|
|
129
|
+
) {
|
|
130
|
+
super(message, options);
|
|
131
|
+
this.name = "XaiTokenRequestError";
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* The endpoint answered with a redirect while the caller asked `redirect: "error"`.
|
|
137
|
+
*
|
|
138
|
+
* Non-retriable by construction: replaying the request would send the same body to a host
|
|
139
|
+
* `validateXaiEndpoint` never approved. The message is fixed on purpose. Bun's redirect
|
|
140
|
+
* `TypeError` embeds the target URL in its text, and the poll body carries the
|
|
141
|
+
* bearer-equivalent `device_code`, so neither may reach a log, an error `cause`, a login
|
|
142
|
+
* status payload, or the terminal.
|
|
143
|
+
*/
|
|
144
|
+
export class XaiRedirectRefusedError extends XaiTokenRequestError {
|
|
145
|
+
constructor() {
|
|
146
|
+
super(undefined, undefined, "xAI token request refused a redirect");
|
|
147
|
+
this.name = "XaiRedirectRefusedError";
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* True when `fetch` refused a redirect because this caller passed `redirect: "error"`.
|
|
153
|
+
*
|
|
154
|
+
* The two runtimes signal it differently and both were checked against a real local server:
|
|
155
|
+
* Bun throws `TypeError` with `code: "UnexpectedRedirect"`; Node/undici throws
|
|
156
|
+
* `TypeError("fetch failed")` whose `cause` is `Error("unexpected redirect")`. Matching exactly
|
|
157
|
+
* keeps a programming `TypeError` (no marker) and a real connection failure (Bun
|
|
158
|
+
* `ECONNREFUSED`/`ENOTFOUND`, undici's own cause text) retriable.
|
|
159
|
+
*/
|
|
160
|
+
function isRedirectRefusal(error: unknown): boolean {
|
|
161
|
+
if (!(error instanceof TypeError)) return false;
|
|
162
|
+
if ((error as { code?: unknown }).code === "UnexpectedRedirect") return true;
|
|
163
|
+
const cause = (error as { cause?: unknown }).cause;
|
|
164
|
+
return cause instanceof Error && cause.message === "unexpected redirect";
|
|
165
|
+
}
|
|
166
|
+
export interface XaiTokenRetryDeps { sleep?:(ms:number)=>Promise<void>; random?:()=>number; /** Default 3; the device poll sends one request per interval. */ maxAttempts?:number; /**
|
|
167
|
+
* Fetch redirect policy. Inherited callers keep the runtime default (follow); the device poll sets
|
|
168
|
+
* `error` because its body carries the RFC 8628 `device_code`, a bearer-equivalent secret that must
|
|
169
|
+
* not be re-POSTed to a redirect target. A 307/308 preserves the method and body.
|
|
170
|
+
*/ redirect?:RequestRedirect }
|
|
112
171
|
const IMF_FIXDATE_RE = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun), (\d{2}) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\d{4}) (\d{2}):(\d{2}):(\d{2}) GMT$/i;
|
|
113
172
|
const RFC850_DATE_RE = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (\d{2})-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d{2}) (\d{2}):(\d{2}):(\d{2}) GMT$/i;
|
|
114
173
|
const ASCTIME_DATE_RE = /^(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ( \d|\d{2}) (\d{2}):(\d{2}):(\d{2}) (\d{4})$/i;
|
|
@@ -185,7 +244,7 @@ function parseRetryAfterMs(retryAfter: string | null): number | undefined {
|
|
|
185
244
|
const text = retryAfter?.trim();
|
|
186
245
|
if (!text) return undefined;
|
|
187
246
|
if (/^\d+(?:\.\d+)?$/.test(text)) {
|
|
188
|
-
const ms = Math.ceil(Number(text) * 1000);
|
|
247
|
+
const ms = Math.min(Number.MAX_SAFE_INTEGER, Math.ceil(Number(text) * 1000));
|
|
189
248
|
return ms > 0 ? ms : undefined;
|
|
190
249
|
}
|
|
191
250
|
const now = Date.now();
|
|
@@ -231,30 +290,34 @@ async function sleepAbortable(
|
|
|
231
290
|
signal.removeEventListener("abort", onAbort);
|
|
232
291
|
}
|
|
233
292
|
}
|
|
234
|
-
async function readTokenError(response:Response):Promise<XaiTokenRequestError>{let oauthError:string|undefined,detail="";try{const body=await response.json() as {error?:unknown;error_description?:unknown};if(typeof body.error==="string")oauthError=body.error;if(typeof body.error_description==="string")detail=body.error_description;}catch{/* non-JSON error body: fall through to the generic message */}const suffix=detail?`: ${detail}`:oauthError?`: ${oauthError}`:"";return new XaiTokenRequestError(response.status,oauthError,`xAI token request failed: ${response.status}${suffix}
|
|
293
|
+
async function readTokenError(response:Response):Promise<XaiTokenRequestError>{let oauthError:string|undefined,detail="";try{const body=await response.json() as {error?:unknown;error_description?:unknown};if(typeof body.error==="string")oauthError=body.error;if(typeof body.error_description==="string")detail=body.error_description;}catch{/* non-JSON error body: fall through to the generic message */}const suffix=detail?`: ${detail}`:oauthError?`: ${oauthError}`:"";const retryAfterMs=response.status===429||response.status>=500||(response.status===400&&oauthError==="slow_down")?parseRetryAfterMs(response.headers.get("retry-after")):undefined;return new XaiTokenRequestError(response.status,oauthError,`xAI token request failed: ${response.status}${suffix}`,undefined,retryAfterMs!==undefined&&Number.isFinite(retryAfterMs)?retryAfterMs:undefined);}
|
|
235
294
|
export async function postXaiToken(
|
|
236
295
|
tokenEndpoint: string,
|
|
237
296
|
body: Record<string, string>,
|
|
238
297
|
signal?: AbortSignal, deps:XaiTokenRetryDeps={},
|
|
239
298
|
): Promise<XaiTokenPayload> {
|
|
240
|
-
const sleep=deps.sleep??((ms:number)=>sleepWithAbort(ms,signal)),random=deps.random??Math.random;let last:unknown;
|
|
241
|
-
for(let attempt=1;attempt<=
|
|
299
|
+
const sleep=deps.sleep??((ms:number)=>sleepWithAbort(ms,signal)),random=deps.random??Math.random,max=deps.maxAttempts??3,redirect=deps.redirect;let last:unknown;
|
|
300
|
+
for(let attempt=1;attempt<=max;attempt++){let response:Response;try{response=await fetch(tokenEndpoint, {
|
|
242
301
|
method: "POST",
|
|
243
302
|
headers: {
|
|
244
303
|
Accept: "application/json",
|
|
245
304
|
"Content-Type": "application/x-www-form-urlencoded",
|
|
246
305
|
},
|
|
247
306
|
body: new URLSearchParams(body).toString(),
|
|
307
|
+
...(redirect === undefined ? {} : { redirect }),
|
|
248
308
|
signal: requestSignal(signal),
|
|
249
309
|
});}catch(error){
|
|
250
310
|
if(signal?.aborted)throw error;
|
|
251
311
|
const name=(error as {name?:string}|undefined)?.name;
|
|
252
312
|
if(name==="AbortError"||name==="TimeoutError")throw error;
|
|
313
|
+
// A refused redirect is deterministic: the same body replayed reaches the same answer, and
|
|
314
|
+
// the caller asked for `error` precisely so the request never leaves the approved endpoint.
|
|
315
|
+
if(redirect==="error"&&isRedirectRefusal(error))throw new XaiRedirectRefusedError();
|
|
253
316
|
last=error;
|
|
254
|
-
if(attempt===
|
|
317
|
+
if(attempt===max)throw new XaiTokenRequestError(undefined,undefined,"xAI token request failed: network error",{cause:error});
|
|
255
318
|
await sleepAbortable(jitterDelay(attempt,random),sleep,signal);
|
|
256
319
|
continue;
|
|
257
|
-
}if(response.ok)return await response.json() as XaiTokenPayload;const error=await readTokenError(response);last=error;if(!(response.status===429||response.status>=500)||attempt===
|
|
320
|
+
}if(response.ok)return await response.json() as XaiTokenPayload;const error=await readTokenError(response);last=error;if(!(response.status===429||response.status>=500)||attempt===max)throw error;if(signal?.aborted)throw error;const delay=retryDelay(attempt,response.headers.get("retry-after"),random);if(delay===undefined)throw error;await sleepAbortable(delay,sleep,signal);}throw last;
|
|
258
321
|
}
|
|
259
322
|
|
|
260
323
|
function credentialsFromTokenPayload(payload: XaiTokenPayload, refreshFallback = ""): OAuthCredentials {
|
|
@@ -336,10 +399,181 @@ export class XaiOAuthFlow extends OAuthCallbackFlow {
|
|
|
336
399
|
}
|
|
337
400
|
}
|
|
338
401
|
|
|
402
|
+
const XAI_DEVICE_GRANT = "urn:ietf:params:oauth:grant-type:device_code";
|
|
403
|
+
/** RFC 8628 §3.2 `expires_in` default when the issuer omits it; also the fallback `interval`. */
|
|
404
|
+
const XAI_DEVICE_DEFAULT_TTL_S = 900;
|
|
405
|
+
const XAI_DEVICE_DEFAULT_INTERVAL_S = 5;
|
|
406
|
+
/**
|
|
407
|
+
* Hard ceilings on values the issuer supplies, so a hostile or corrupt response cannot turn the
|
|
408
|
+
* poll into a hot loop or an unbounded login.
|
|
409
|
+
*
|
|
410
|
+
* `setTimeout` stores its delay in a 32-bit signed int. A larger value overflows and fires on the
|
|
411
|
+
* next tick, which is exactly a hot loop against the auth endpoint; a `0`/negative/fractional
|
|
412
|
+
* `interval` floors to ~1 ms for the same effect. So the interval is clamped into
|
|
413
|
+
* [MIN, TTL] and the grant lifetime into (0, MAX_TTL]. RFC 8628 §3.2 says the issuer supplies
|
|
414
|
+
* `interval` and `expires_in`, but sets no ceiling on either, so the values below are this client's
|
|
415
|
+
* policy rather than an RFC rule: a grant that outlives a plausible human approval at another
|
|
416
|
+
* machine is not worth holding a login open for. A grant the issuer would still honour past the
|
|
417
|
+
* ceiling ends here: pending approval reports `expired_token`, while a final transport or server
|
|
418
|
+
* failure retains its cause.
|
|
419
|
+
*/
|
|
420
|
+
const XAI_DEVICE_MIN_INTERVAL_MS = 1_000;
|
|
421
|
+
const XAI_DEVICE_MAX_TTL_S = 30 * 60;
|
|
422
|
+
|
|
423
|
+
interface XaiDeviceAuthorization {
|
|
424
|
+
device_code?: unknown;
|
|
425
|
+
user_code?: unknown;
|
|
426
|
+
verification_uri?: unknown;
|
|
427
|
+
verification_uri_complete?: unknown;
|
|
428
|
+
expires_in?: unknown;
|
|
429
|
+
interval?: unknown;
|
|
430
|
+
}
|
|
431
|
+
|
|
432
|
+
/** Coerce a provider-supplied seconds value to a finite, positive number, or undefined. */
|
|
433
|
+
function secondsToPositive(value: unknown): number | undefined {
|
|
434
|
+
const seconds = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
|
|
435
|
+
return Number.isFinite(seconds) && seconds > 0 ? seconds : undefined;
|
|
436
|
+
}
|
|
437
|
+
|
|
438
|
+
/**
|
|
439
|
+
* Poll wait in ms: floored at 1s and capped at the grant lifetime.
|
|
440
|
+
*
|
|
441
|
+
* The lifetime cap is also the overflow guard. `setTimeout` stores its delay in a 32-bit signed
|
|
442
|
+
* int, so anything above 2^31-1 ms fires on the next tick instead of waiting; a 30-minute ceiling
|
|
443
|
+
* is 1.8e6 ms, three orders of magnitude below that, and the floor keeps a `0`, negative or
|
|
444
|
+
* fractional `interval` from becoming a tight loop.
|
|
445
|
+
*/
|
|
446
|
+
function deviceIntervalMs(raw: unknown, ttlMs: number): number {
|
|
447
|
+
const seconds = secondsToPositive(raw) ?? XAI_DEVICE_DEFAULT_INTERVAL_S;
|
|
448
|
+
return Math.min(ttlMs, Math.max(XAI_DEVICE_MIN_INTERVAL_MS, Math.round(seconds * 1000)));
|
|
449
|
+
}
|
|
450
|
+
|
|
451
|
+
/** Grant lifetime in ms: defaulted when absent, capped so a login cannot run unbounded. */
|
|
452
|
+
function deviceGrantTtlMs(raw: unknown): number {
|
|
453
|
+
const seconds = Math.min(secondsToPositive(raw) ?? XAI_DEVICE_DEFAULT_TTL_S, XAI_DEVICE_MAX_TTL_S);
|
|
454
|
+
return Math.round(seconds * 1000);
|
|
455
|
+
}
|
|
456
|
+
|
|
457
|
+
/**
|
|
458
|
+
* RFC 8628 device login, for a host whose browser cannot reach the 127.0.0.1:56121 callback:
|
|
459
|
+
* the user opens the URL in any browser, confirms the short code, and this polls for the token.
|
|
460
|
+
*/
|
|
461
|
+
export async function loginXaiDevice(
|
|
462
|
+
ctrl: OAuthController,
|
|
463
|
+
deps: { sleep?: (ms: number) => Promise<void> } = {},
|
|
464
|
+
): Promise<OAuthCredentials> {
|
|
465
|
+
const signal = ctrl.signal;
|
|
466
|
+
const sleep = deps.sleep ?? ((ms: number) => sleepWithAbort(ms, signal));
|
|
467
|
+
const discovery = await discoverXaiOAuthEndpoints(signal);
|
|
468
|
+
if (!discovery.deviceAuthorizationEndpoint) {
|
|
469
|
+
throw new Error("xAI OAuth discovery does not advertise device authorization");
|
|
470
|
+
}
|
|
471
|
+
let response: Response;
|
|
472
|
+
try {
|
|
473
|
+
response = await fetch(discovery.deviceAuthorizationEndpoint, {
|
|
474
|
+
method: "POST",
|
|
475
|
+
headers: { Accept: "application/json", "Content-Type": "application/x-www-form-urlencoded" },
|
|
476
|
+
body: new URLSearchParams({ client_id: XAI_OAUTH_CLIENT_ID, scope: XAI_OAUTH_SCOPE }).toString(),
|
|
477
|
+
// The request carries the client id in its body and lands on a vetted issuer; a redirect would
|
|
478
|
+
// replay it somewhere `validateXaiEndpoint` never saw. Discovery already refused to produce a
|
|
479
|
+
// non-x.ai endpoint, so a redirect here can only be a downgrade, never a legitimate hop.
|
|
480
|
+
redirect: "error",
|
|
481
|
+
signal: requestSignal(signal),
|
|
482
|
+
});
|
|
483
|
+
} catch (error) {
|
|
484
|
+
if (isRedirectRefusal(error)) throw new XaiRedirectRefusedError();
|
|
485
|
+
throw error;
|
|
486
|
+
}
|
|
487
|
+
if (!response.ok) throw await readTokenError(response);
|
|
488
|
+
const device = (await response.json()) as XaiDeviceAuthorization;
|
|
489
|
+
const verificationUri = typeof device.verification_uri_complete === "string"
|
|
490
|
+
? device.verification_uri_complete
|
|
491
|
+
: device.verification_uri;
|
|
492
|
+
if (
|
|
493
|
+
typeof device.device_code !== "string" || !device.device_code
|
|
494
|
+
|| typeof device.user_code !== "string" || !device.user_code
|
|
495
|
+
|| typeof verificationUri !== "string"
|
|
496
|
+
) {
|
|
497
|
+
throw new Error("xAI device authorization response is incomplete");
|
|
498
|
+
}
|
|
499
|
+
// Validate before the optional call: `onAuth?.(…)` skips evaluating its argument when unset.
|
|
500
|
+
// `validateXaiEndpoint` parses the URL, which percent-encodes control characters out of the
|
|
501
|
+
// path/query. The user code is kept exact here: `deviceCode` is structured data that every login
|
|
502
|
+
// surface renders, and escaping belongs at the terminal boundary that prints it.
|
|
503
|
+
const url = validateXaiEndpoint(verificationUri);
|
|
504
|
+
ctrl.onAuth?.({
|
|
505
|
+
url,
|
|
506
|
+
instructions: `Open this URL in any browser and confirm the code ${device.user_code}.`,
|
|
507
|
+
deviceCode: device.user_code,
|
|
508
|
+
});
|
|
509
|
+
// Both bounds come from the issuer, so both are clamped before they reach a timer: an oversized
|
|
510
|
+
// `expires_in` would make `AbortSignal.timeout` and the deadline meaningless, and a tiny
|
|
511
|
+
// `interval` would poll the auth endpoint in a tight loop.
|
|
512
|
+
const ttlMs = deviceGrantTtlMs(device.expires_in);
|
|
513
|
+
const deadline = Date.now() + ttlMs;
|
|
514
|
+
let waitMs = deviceIntervalMs(device.interval, ttlMs);
|
|
515
|
+
// Wait for the next iteration. `slow_down` raises the grant interval itself; a 429/5xx
|
|
516
|
+
// `Retry-After` applies to the response that carried it, so it is held for one poll.
|
|
517
|
+
let nextWaitMs = waitMs;
|
|
518
|
+
let lastFailure: unknown;
|
|
519
|
+
for (let remaining = deadline - Date.now(); remaining > 0; remaining = deadline - Date.now()) {
|
|
520
|
+
await sleep(Math.min(nextWaitMs, remaining));
|
|
521
|
+
nextWaitMs = waitMs;
|
|
522
|
+
const left = deadline - Date.now();
|
|
523
|
+
if (left <= 0) break;
|
|
524
|
+
// One request per interval, cut off at the grant deadline; the loop owns every retry.
|
|
525
|
+
const pollSignal = signal ? AbortSignal.any([signal, AbortSignal.timeout(left)]) : AbortSignal.timeout(left);
|
|
526
|
+
try {
|
|
527
|
+
const payload = await postXaiToken(
|
|
528
|
+
discovery.tokenEndpoint,
|
|
529
|
+
{ grant_type: XAI_DEVICE_GRANT, client_id: XAI_OAUTH_CLIENT_ID, device_code: device.device_code },
|
|
530
|
+
pollSignal,
|
|
531
|
+
// The device code is a bearer-equivalent secret; it must not survive a redirect hop.
|
|
532
|
+
{ maxAttempts: 1, redirect: "error" },
|
|
533
|
+
);
|
|
534
|
+
return credentialsFromTokenPayload(payload);
|
|
535
|
+
} catch (error) {
|
|
536
|
+
if (signal?.aborted) throw error;
|
|
537
|
+
// Checked before the retriable branches: it subclasses `XaiTokenRequestError` with no
|
|
538
|
+
// status, which they would otherwise read as a transient network failure and poll on
|
|
539
|
+
// until the grant expires.
|
|
540
|
+
if (error instanceof XaiRedirectRefusedError) throw error;
|
|
541
|
+
if (error instanceof XaiTokenRequestError) {
|
|
542
|
+
if (error.oauthError === "slow_down") {
|
|
543
|
+
lastFailure = error.status === 400 ? undefined : error;
|
|
544
|
+
// RFC 8628 §3.5: lengthen the interval by 5s and never poll faster than before. Kept
|
|
545
|
+
// under the same ceiling so the sleep cannot overflow into an immediate retry.
|
|
546
|
+
waitMs = Math.min(ttlMs, waitMs + 5_000);
|
|
547
|
+
nextWaitMs = Math.min(ttlMs, Math.max(waitMs, error.retryAfterMs ?? 0));
|
|
548
|
+
continue;
|
|
549
|
+
}
|
|
550
|
+
// Still waiting for approval, or a network or server failure the grant can outlast.
|
|
551
|
+
const status = error.status;
|
|
552
|
+
if (error.oauthError === "authorization_pending" || status === undefined || status === 429 || status >= 500) {
|
|
553
|
+
// Only an ordinary pending answer clears the cause; a 429/5xx carrying that body is still an outage.
|
|
554
|
+
lastFailure = error.oauthError === "authorization_pending" && status === 400 ? undefined : error;
|
|
555
|
+
// The server's own throttle wins over this client's interval, but never over the
|
|
556
|
+
// grant deadline: the loop still sleeps at most what the grant has left.
|
|
557
|
+
if (error.retryAfterMs !== undefined) nextWaitMs = Math.min(ttlMs, Math.max(waitMs, error.retryAfterMs));
|
|
558
|
+
continue;
|
|
559
|
+
}
|
|
560
|
+
throw error;
|
|
561
|
+
}
|
|
562
|
+
// A timed-out poll (Bun reports it as TimeoutError or AbortError) is retried; the deadline still holds.
|
|
563
|
+
const name = (error as { name?: string } | undefined)?.name;
|
|
564
|
+
if (name === "TimeoutError" || name === "AbortError") { lastFailure = error; continue; }
|
|
565
|
+
throw error;
|
|
566
|
+
}
|
|
567
|
+
}
|
|
568
|
+
if (lastFailure) throw lastFailure;
|
|
569
|
+
throw new XaiTokenRequestError(undefined, "expired_token", "xAI device authorization expired");
|
|
570
|
+
}
|
|
571
|
+
|
|
339
572
|
export async function loginXai(
|
|
340
573
|
ctrl: OAuthController,
|
|
341
|
-
opts?: { importLocal?: LocalTokenImportMode },
|
|
574
|
+
opts?: { importLocal?: LocalTokenImportMode; device?: boolean },
|
|
342
575
|
): Promise<OAuthCredentials> {
|
|
576
|
+
if (opts?.device) return loginXaiDevice(ctrl);
|
|
343
577
|
const importLocal = opts?.importLocal ?? "off";
|
|
344
578
|
if (importLocal !== "off") {
|
|
345
579
|
const { detectGrokCliToken } = await import("./local-token-detect");
|
|
@@ -80,6 +80,10 @@ export const PROTOCOL_REASON_CODES = [
|
|
|
80
80
|
"anthropic-beta-dropped",
|
|
81
81
|
/** Thinking signatures or `redacted_thinking` removed for a destination that cannot verify them. */
|
|
82
82
|
"opaque-state-stripped",
|
|
83
|
+
/** Claude Code's typed Advisor tool was not forwarded: the proxy Advisor's synthetic `advisor` owns the name this turn. */
|
|
84
|
+
"advisor-tool-shadowed-by-proxy-advisor",
|
|
85
|
+
/** A typed Advisor declaration named a model outside the caller's admission scope and was not forwarded. */
|
|
86
|
+
"advisor-tool-outside-model-scope",
|
|
83
87
|
] as const;
|
|
84
88
|
export type ProtocolReasonCode = (typeof PROTOCOL_REASON_CODES)[number];
|
|
85
89
|
|
|
@@ -368,6 +368,7 @@ function createAnthropicMessageWriter(
|
|
|
368
368
|
...(search.sources.length > 0 ? { sources: search.sources } : {}),
|
|
369
369
|
...(search.anthropic ? { anthropic_blocks: search.anthropic } : {}),
|
|
370
370
|
});
|
|
371
|
+
if (!pair) return;
|
|
371
372
|
const toolIndex = blockIndex++;
|
|
372
373
|
emit("content_block_start", {
|
|
373
374
|
type: "content_block_start", index: toolIndex,
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Opt-in per-provider alias templates (#7705). Pure: no config reads or writes, no expression
|
|
3
|
+
* evaluation. A template is literal text plus the two placeholders `{providerAlias}` and
|
|
4
|
+
* `{modelBasename}`; anything else in braces makes the template invalid. The basename is required,
|
|
5
|
+
* because a template without it would give every model of the provider the same name.
|
|
6
|
+
*/
|
|
7
|
+
/** Defined here so default-aliases can import this module without a cycle; it re-exports it. */
|
|
8
|
+
export const MODEL_ALIAS_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
|
|
9
|
+
|
|
10
|
+
const PLACEHOLDER = /\{([^{}]*)\}/g;
|
|
11
|
+
const KNOWN = new Set(["providerAlias", "modelBasename"]);
|
|
12
|
+
/** The same reserved prefixes the config loader refuses for manual model aliases. */
|
|
13
|
+
export const RESERVED_ALIAS_PREFIX = /^(?:gpt-|o1-|o3-|o4-|codex-)/i;
|
|
14
|
+
export const MAX_ALIAS_TEMPLATE_LENGTH = 128;
|
|
15
|
+
|
|
16
|
+
export type AliasTemplateSkip = "no_provider_alias" | "invalid_alias" | "reserved_prefix";
|
|
17
|
+
|
|
18
|
+
/** Null for a usable template, otherwise a short reason fit for an API error. */
|
|
19
|
+
export function aliasTemplateError(template: string): string | null {
|
|
20
|
+
if (typeof template !== "string" || !template.trim()) return "template must be a non-empty string";
|
|
21
|
+
if (template.length > MAX_ALIAS_TEMPLATE_LENGTH) return `template must be at most ${MAX_ALIAS_TEMPLATE_LENGTH} characters`;
|
|
22
|
+
const stripped = template.replace(PLACEHOLDER, "");
|
|
23
|
+
if (/[{}]/.test(stripped)) return "template has an unbalanced or nested brace";
|
|
24
|
+
for (const match of template.matchAll(PLACEHOLDER)) {
|
|
25
|
+
if (!KNOWN.has(match[1]!)) return `unknown placeholder {${match[1]}}; use {providerAlias} and {modelBasename}`;
|
|
26
|
+
}
|
|
27
|
+
if (!template.includes("{modelBasename}")) return "template must include {modelBasename}";
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Final `/` segment of a model id, with `:` written as `-` (`a/b/beam:free` -> `beam-free`). */
|
|
32
|
+
export function modelBasename(id: string): string {
|
|
33
|
+
return id.slice(id.lastIndexOf("/") + 1).replaceAll(":", "-");
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** One model's candidate, or why it has none. Assumes a template `aliasTemplateError` accepted. */
|
|
37
|
+
export function expandAliasTemplate(
|
|
38
|
+
template: string,
|
|
39
|
+
providerAlias: string | undefined,
|
|
40
|
+
id: string,
|
|
41
|
+
): { alias: string } | { skip: AliasTemplateSkip } {
|
|
42
|
+
if (template.includes("{providerAlias}") && !providerAlias) return { skip: "no_provider_alias" };
|
|
43
|
+
const alias = template.replace(PLACEHOLDER, (_whole, name: string) =>
|
|
44
|
+
name === "providerAlias" ? providerAlias ?? "" : modelBasename(id));
|
|
45
|
+
if (!MODEL_ALIAS_PATTERN.test(alias)) return { skip: "invalid_alias" };
|
|
46
|
+
if (RESERVED_ALIAS_PREFIX.test(alias)) return { skip: "reserved_prefix" };
|
|
47
|
+
return { alias };
|
|
48
|
+
}
|
|
@@ -5,6 +5,7 @@ import { hasKeyPoolFailover } from "./key-failover";
|
|
|
5
5
|
import type { OcxConfig } from "../types";
|
|
6
6
|
import { registerProviderResponseProvenance } from "./request-pacing";
|
|
7
7
|
import { isEgressTransparentExecutor, markEgressTransparentExecutor } from "../lib/provider-egress";
|
|
8
|
+
import { inheritPassiveKeyProof } from "../lib/passive-key-fetch-proof";
|
|
8
9
|
|
|
9
10
|
interface BillingSendOwnership {
|
|
10
11
|
readonly providerName: string;
|
|
@@ -45,6 +46,7 @@ export function anthropicBillingPhysicalFetch(
|
|
|
45
46
|
responseOwners.set(response, responseOwners.has(response) ? null : owner);
|
|
46
47
|
return response;
|
|
47
48
|
}) as typeof globalThis.fetch;
|
|
49
|
+
inheritPassiveKeyProof(wrapped, physicalFetch);
|
|
48
50
|
return isEgressTransparentExecutor(physicalFetch) ? markEgressTransparentExecutor(wrapped) : wrapped;
|
|
49
51
|
}
|
|
50
52
|
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { OcxProviderConfig } from "../types";
|
|
2
|
+
import { mapFill } from "./resolved-model-policy-merge";
|
|
3
|
+
import {
|
|
4
|
+
ANTHROPIC_DEFAULT_MAX_OUTPUT_TOKENS,
|
|
5
|
+
ANTHROPIC_MODEL_MAX_OUTPUT_TOKENS,
|
|
6
|
+
ANTHROPIC_MODELS,
|
|
7
|
+
} from "./registry/model-seeds";
|
|
8
|
+
|
|
9
|
+
/** Every seeded Claude id with its documented synchronous output maximum. */
|
|
10
|
+
const CLAUDE_MODEL_OUTPUT_CAPS: Readonly<Record<string, number>> = Object.fromEntries(
|
|
11
|
+
ANTHROPIC_MODELS.map(id => [id, ANTHROPIC_MODEL_MAX_OUTPUT_TOKENS[id] ?? ANTHROPIC_DEFAULT_MAX_OUTPUT_TOKENS]),
|
|
12
|
+
);
|
|
13
|
+
|
|
14
|
+
function isDirectAnthropicDestination(baseUrl: string): boolean {
|
|
15
|
+
try {
|
|
16
|
+
return new URL(baseUrl).hostname === "api.anthropic.com";
|
|
17
|
+
} catch {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Output caps for an Anthropic-adapter row, keyed by the Claude model id rather than the row name
|
|
24
|
+
* (#8525). Codex never sends `max_output_tokens`, so a row without any cap fell back to the
|
|
25
|
+
* adapter's conservative 8192 even when it served a Claude model whose documented maximum is
|
|
26
|
+
* 64K-128K — every custom-named row and every registry row that seeds no cap.
|
|
27
|
+
*
|
|
28
|
+
* Precedence, highest first: an operator per-model cap; any provider default, operator-set or
|
|
29
|
+
* registry-seeded (a row carrying one gets nothing filled, so seeded rows resolve exactly as
|
|
30
|
+
* before); the registry cap of a seeded Claude id; the Anthropic default on api.anthropic.com
|
|
31
|
+
* itself; the adapter's 8192. A gateway id the registry does not list — a vendor namespace, a
|
|
32
|
+
* dated suffix, a non-Claude model — keeps the 8192 fallback.
|
|
33
|
+
*
|
|
34
|
+
* Runtime-only: applied to the routed copy and never persisted, so the caps cannot follow a row
|
|
35
|
+
* that is later pointed somewhere else. A row that reaches the Anthropic wire only through a
|
|
36
|
+
* per-model `modelAdapters` switch is not covered, because the routed row's adapter differs.
|
|
37
|
+
*/
|
|
38
|
+
export function withAnthropicModelOutputCaps(provider: OcxProviderConfig): OcxProviderConfig {
|
|
39
|
+
if (provider.adapter !== "anthropic" || provider.defaultMaxOutputTokens !== undefined) return provider;
|
|
40
|
+
const [modelMaxOutputTokens] = mapFill(CLAUDE_MODEL_OUTPUT_CAPS, provider.modelMaxOutputTokens);
|
|
41
|
+
return {
|
|
42
|
+
...provider,
|
|
43
|
+
...(modelMaxOutputTokens ? { modelMaxOutputTokens } : {}),
|
|
44
|
+
...(isDirectAnthropicDestination(provider.baseUrl) ? { defaultMaxOutputTokens: ANTHROPIC_DEFAULT_MAX_OUTPUT_TOKENS } : {}),
|
|
45
|
+
};
|
|
46
|
+
}
|