@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
|
@@ -1,22 +1,31 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Claude Code Keychain
|
|
2
|
+
* Claude Code Keychain lookups that never kill a blocked `security` child.
|
|
3
3
|
*
|
|
4
|
-
* With a locked login keychain, `security find-generic-password
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
4
|
+
* With a locked login keychain, `security find-generic-password` blocks on the SecurityAgent
|
|
5
|
+
* unlock prompt. Killing it while that prompt is pending hits a race in Apple's `securityd`,
|
|
6
|
+
* which aborts and re-locks the keychain, so the next lookup prompts again (#8161). Every lookup
|
|
7
|
+
* here is asynchronous: a slow one is given up without signalling its child, at most one child
|
|
8
|
+
* runs per process, and a timeout backs off so a locked keychain does not get one prompt per
|
|
9
|
+
* request. A synchronous lookup cannot be bounded without killing its child, so there is none.
|
|
10
10
|
*/
|
|
11
|
-
import {
|
|
11
|
+
import { spawn } from "node:child_process";
|
|
12
12
|
|
|
13
13
|
export const CLAUDE_KEYCHAIN_SERVICE = "Claude Code-credentials";
|
|
14
14
|
export const CLAUDE_KEYCHAIN_TIMEOUT_MS = 5_000;
|
|
15
|
+
/** The metadata probe answers a settings page and a launch, so it waits less than a read. */
|
|
16
|
+
export const CLAUDE_KEYCHAIN_PROBE_TIMEOUT_MS = 1_500;
|
|
15
17
|
export const CLAUDE_KEYCHAIN_BACKOFF_MS = 60_000;
|
|
16
|
-
const
|
|
18
|
+
const READ_ARGS = ["find-generic-password", "-s", CLAUDE_KEYCHAIN_SERVICE, "-w"] as const;
|
|
19
|
+
/** Metadata only: no `-w` and no `-g`, because those print the secret. Only the exit code matters. */
|
|
20
|
+
const PROBE_ARGS = ["find-generic-password", "-s", CLAUDE_KEYCHAIN_SERVICE] as const;
|
|
21
|
+
/** `security` exit code for "the item does not exist": a real absent, not a failure. */
|
|
22
|
+
const ITEM_NOT_FOUND = 44;
|
|
17
23
|
/** The credential is a small JSON blob; anything larger is not a credential. */
|
|
18
24
|
const MAX_STDOUT_BYTES = 1024 * 1024;
|
|
19
25
|
|
|
26
|
+
/** present/absent from the exit code; unknown when the lookup did not answer. Never absent on doubt. */
|
|
27
|
+
export type ClaudeKeychainPresence = "present" | "absent" | "unknown";
|
|
28
|
+
|
|
20
29
|
interface UnrefHandle { unref?(): unknown }
|
|
21
30
|
|
|
22
31
|
/** The subset of a spawned child the reader relies on. */
|
|
@@ -30,13 +39,13 @@ export interface KeychainChild extends UnrefHandle {
|
|
|
30
39
|
|
|
31
40
|
export interface ClaudeKeychainReaderDeps {
|
|
32
41
|
platform: string;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
execSync(command: string, args: readonly string[], timeoutMs: number): string;
|
|
42
|
+
/** `captureStdout` is false for the metadata probe: its stdout and stderr are discarded. */
|
|
43
|
+
spawn(command: string, args: readonly string[], captureStdout: boolean): KeychainChild;
|
|
36
44
|
now(): number;
|
|
37
45
|
/** Runs `fn` after `ms`; returns a cancel function. */
|
|
38
46
|
schedule(ms: number, fn: () => void): () => void;
|
|
39
47
|
timeoutMs?: number;
|
|
48
|
+
probeTimeoutMs?: number;
|
|
40
49
|
backoffMs?: number;
|
|
41
50
|
}
|
|
42
51
|
|
|
@@ -44,60 +53,54 @@ export interface ClaudeKeychainReader {
|
|
|
44
53
|
/** Resolves the item's secret, or null on absence, failure, timeout, backoff or a non-darwin host. */
|
|
45
54
|
readAsync(): Promise<string | null>;
|
|
46
55
|
/**
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*/
|
|
50
|
-
readSync(): string | null;
|
|
51
|
-
/** True while a child is still running or a timeout backoff is active. */
|
|
52
|
-
syncReadBlocked(): boolean;
|
|
53
|
-
/**
|
|
54
|
-
* Record a timeout of another synchronous Keychain lookup (the metadata probe), so it starts
|
|
55
|
-
* the same backoff and no read or probe spawns again inside that window.
|
|
56
|
+
* Whether the item exists, from `security`'s exit code alone: absent on a non-darwin host,
|
|
57
|
+
* unknown on a timeout, a busy slot, an active backoff or any other failure.
|
|
56
58
|
*/
|
|
57
|
-
|
|
59
|
+
probe(): Promise<ClaudeKeychainPresence>;
|
|
58
60
|
}
|
|
59
61
|
|
|
62
|
+
type LookupOutcome = { code: number | null; stdout: Buffer | null } | null;
|
|
63
|
+
|
|
60
64
|
export function createClaudeKeychainReader(deps: ClaudeKeychainReaderDeps): ClaudeKeychainReader {
|
|
61
65
|
const timeoutMs = deps.timeoutMs ?? CLAUDE_KEYCHAIN_TIMEOUT_MS;
|
|
66
|
+
const probeTimeoutMs = deps.probeTimeoutMs ?? CLAUDE_KEYCHAIN_PROBE_TIMEOUT_MS;
|
|
62
67
|
const backoffMs = deps.backoffMs ?? CLAUDE_KEYCHAIN_BACKOFF_MS;
|
|
63
68
|
let backoffUntil = 0;
|
|
64
|
-
// Held until the child exits, not until the
|
|
65
|
-
// outlives its deadline is still blocked on the prompt
|
|
66
|
-
// owning child may release it, so a late event from an
|
|
69
|
+
// The one admission slot for reads and probes alike. Held until the child exits, not until the
|
|
70
|
+
// caller's promise settles: a child that outlives its deadline is still blocked on the prompt
|
|
71
|
+
// and must not get a sibling. Only the owning child may release it, so a late event from an
|
|
72
|
+
// earlier child cannot free the slot.
|
|
67
73
|
let runningChild: KeychainChild | undefined;
|
|
68
|
-
let
|
|
74
|
+
let pendingRead: Promise<string | null> | undefined;
|
|
75
|
+
let pendingProbe: Promise<ClaudeKeychainPresence> | undefined;
|
|
69
76
|
|
|
70
77
|
const backingOff = (): boolean => deps.now() < backoffUntil;
|
|
71
|
-
const startBackoff = (): void => { backoffUntil = deps.now() + backoffMs; };
|
|
72
78
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
if (pending) return pending;
|
|
79
|
+
/** One lookup under the slot; null when it was not admitted, failed to start, or timed out. */
|
|
80
|
+
function lookup(args: readonly string[], captureStdout: boolean, deadlineMs: number): Promise<LookupOutcome> {
|
|
76
81
|
if (runningChild || backingOff()) return Promise.resolve(null);
|
|
77
|
-
|
|
78
82
|
let child: KeychainChild;
|
|
79
83
|
try {
|
|
80
|
-
child = deps.spawn("security",
|
|
84
|
+
child = deps.spawn("security", args, captureStdout);
|
|
81
85
|
} catch {
|
|
82
86
|
return Promise.resolve(null);
|
|
83
87
|
}
|
|
84
88
|
runningChild = child;
|
|
85
89
|
const release = (): void => { if (runningChild === child) runningChild = undefined; };
|
|
86
|
-
|
|
90
|
+
return new Promise<LookupOutcome>(resolve => {
|
|
87
91
|
let settled = false;
|
|
88
92
|
const chunks: Buffer[] = [];
|
|
89
93
|
let stdoutBytes = 0;
|
|
90
|
-
const settle = (value:
|
|
94
|
+
const settle = (value: LookupOutcome): void => {
|
|
91
95
|
if (settled) return;
|
|
92
96
|
settled = true;
|
|
93
97
|
cancelDeadline();
|
|
94
|
-
pending = undefined;
|
|
95
98
|
resolve(value);
|
|
96
99
|
};
|
|
97
|
-
const cancelDeadline = deps.schedule(
|
|
98
|
-
// Give up without signalling the child, and let it exit on its own once the
|
|
99
|
-
//
|
|
100
|
-
|
|
100
|
+
const cancelDeadline = deps.schedule(deadlineMs, () => {
|
|
101
|
+
// Give up without signalling the child, and let it exit on its own once the prompt is
|
|
102
|
+
// answered or dismissed. Unref it so it cannot hold this process open.
|
|
103
|
+
backoffUntil = deps.now() + backoffMs;
|
|
101
104
|
child.unref?.();
|
|
102
105
|
child.stdout?.unref?.();
|
|
103
106
|
settle(null);
|
|
@@ -113,49 +116,56 @@ export function createClaudeKeychainReader(deps: ClaudeKeychainReaderDeps): Clau
|
|
|
113
116
|
if (child.pid === undefined) release();
|
|
114
117
|
settle(null);
|
|
115
118
|
});
|
|
116
|
-
// `close`, not `exit`: `exit` can fire before stdout is drained, which would truncate
|
|
117
|
-
//
|
|
119
|
+
// `close`, not `exit`: `exit` can fire before stdout is drained, which would truncate the
|
|
120
|
+
// credential. Decode once so a multi-byte character split across chunks survives.
|
|
118
121
|
child.once("close", code => {
|
|
119
122
|
release();
|
|
120
|
-
|
|
121
|
-
settle(Buffer.concat(chunks).toString("utf8").trim() || null);
|
|
123
|
+
settle({ code, stdout: !captureStdout || stdoutBytes > MAX_STDOUT_BYTES ? null : Buffer.concat(chunks) });
|
|
122
124
|
});
|
|
123
125
|
});
|
|
124
|
-
pending = read;
|
|
125
|
-
return read;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
function
|
|
129
|
-
if (deps.platform !== "darwin"
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
128
|
+
function readAsync(): Promise<string | null> {
|
|
129
|
+
if (deps.platform !== "darwin") return Promise.resolve(null);
|
|
130
|
+
if (pendingRead) return pendingRead;
|
|
131
|
+
// A probe holding the slot is waited out (it settles within its own deadline) instead of
|
|
132
|
+
// making this read look like an absent credential; a probe that timed out leaves its child
|
|
133
|
+
// running and the backoff active, so the read then declines exactly as it would under backoff.
|
|
134
|
+
// Do not wait for that child too: it may be blocked on an unlock prompt indefinitely, and a
|
|
135
|
+
// second child beside it is what the single slot exists to prevent.
|
|
136
|
+
const started = pendingProbe
|
|
137
|
+
? pendingProbe.then(() => lookup(READ_ARGS, true, timeoutMs))
|
|
138
|
+
: lookup(READ_ARGS, true, timeoutMs);
|
|
139
|
+
const read = started.then(outcome => {
|
|
140
|
+
pendingRead = undefined;
|
|
141
|
+
if (outcome?.code !== 0 || !outcome.stdout) return null;
|
|
142
|
+
return outcome.stdout.toString("utf8").trim() || null;
|
|
143
|
+
});
|
|
144
|
+
pendingRead = read;
|
|
145
|
+
return read;
|
|
136
146
|
}
|
|
137
147
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
148
|
+
function probe(): Promise<ClaudeKeychainPresence> {
|
|
149
|
+
if (deps.platform !== "darwin") return Promise.resolve("absent");
|
|
150
|
+
if (pendingProbe) return pendingProbe;
|
|
151
|
+
const probed = lookup(PROBE_ARGS, false, probeTimeoutMs).then((outcome): ClaudeKeychainPresence => {
|
|
152
|
+
pendingProbe = undefined;
|
|
153
|
+
if (outcome?.code === 0) return "present";
|
|
154
|
+
if (outcome?.code === ITEM_NOT_FOUND) return "absent";
|
|
155
|
+
return "unknown";
|
|
156
|
+
});
|
|
157
|
+
pendingProbe = probed;
|
|
158
|
+
return probed;
|
|
159
|
+
}
|
|
145
160
|
|
|
146
|
-
|
|
147
|
-
export function isSyncTimeout(error: unknown): boolean {
|
|
148
|
-
if (!error || typeof error !== "object") return false;
|
|
149
|
-
const { code, signal } = error as { code?: unknown; signal?: unknown };
|
|
150
|
-
return code === "ETIMEDOUT" || (typeof signal === "string" && signal.length > 0);
|
|
161
|
+
return { readAsync, probe };
|
|
151
162
|
}
|
|
152
163
|
|
|
153
164
|
/** The process-wide reader: one Keychain child and one backoff window per process. */
|
|
154
165
|
export const claudeKeychainReader = createClaudeKeychainReader({
|
|
155
166
|
platform: process.platform,
|
|
156
|
-
spawn: (command, args) =>
|
|
157
|
-
|
|
158
|
-
execFileSync(command, [...args], { encoding: "utf8", timeout: timeoutMs, stdio: ["pipe", "pipe", "pipe"] }),
|
|
167
|
+
spawn: (command, args, captureStdout) =>
|
|
168
|
+
spawn(command, [...args], { stdio: ["ignore", captureStdout ? "pipe" : "ignore", "ignore"] }),
|
|
159
169
|
now: () => Date.now(),
|
|
160
170
|
schedule(ms, fn) {
|
|
161
171
|
const timer = setTimeout(fn, ms);
|
package/src/oauth/index.ts
CHANGED
|
@@ -96,7 +96,7 @@ export { OAUTH_REFRESH_LOCK_WAIT_MS, peekAuthStore, peekOAuthRefreshIntent } fro
|
|
|
96
96
|
import { codexAccountNamespaceProviderCollisionError } from "../codex/account-namespace-match";
|
|
97
97
|
|
|
98
98
|
import { REFRESH_SKEW_MS } from "./refresh-policy";
|
|
99
|
-
import { newerClaudeCredentialForInstance, captureAnthropicCredentialOwnerForInstance } from "./anthropic-continuity";
|
|
99
|
+
import { newerClaudeCredentialForInstance, captureAnthropicCredentialOwnerForInstance, claudeCredentialGenerationCurrent } from "./anthropic-continuity";
|
|
100
100
|
import { anthropicSubscriptionLabel } from "../providers/anthropic-subscription";
|
|
101
101
|
import { normalizeOAuthPlan, mergeOAuthPlan } from "./plan";
|
|
102
102
|
import { mergeAnthropicIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
|
|
@@ -201,8 +201,8 @@ export interface LoginOpts {
|
|
|
201
201
|
/** When set, persist into this account slot and require matching identity. */
|
|
202
202
|
reauthAccountId?: string;
|
|
203
203
|
/**
|
|
204
|
-
* ChatGPT
|
|
205
|
-
* localhost
|
|
204
|
+
* ChatGPT and xAI: `device` selects the device grant instead of the
|
|
205
|
+
* localhost callback flow, for hosts with no browser or no loopback
|
|
206
206
|
* listener (#3366). Ignored by every other provider.
|
|
207
207
|
*/
|
|
208
208
|
flow?: ChatGPTLoginFlow;
|
|
@@ -238,6 +238,8 @@ export interface OAuthProviderDef {
|
|
|
238
238
|
defaultRefreshPolicy?: RefreshPolicy;
|
|
239
239
|
/** Provider-hosted page that DISPLAYS the code; its presence enables `codeMode`. */
|
|
240
240
|
codeRedirectUri?: string;
|
|
241
|
+
/** Has an RFC 8628 device grant besides its browser login; `flow: "device"` selects it. */
|
|
242
|
+
deviceLogin?: true;
|
|
241
243
|
}
|
|
242
244
|
|
|
243
245
|
function oauthConfig(id: string): OcxProviderConfig {
|
|
@@ -294,7 +296,8 @@ export const OAUTH_PROVIDERS: Record<string, OAuthProviderDef> = {
|
|
|
294
296
|
},
|
|
295
297
|
xai: {
|
|
296
298
|
// forceLogin skips the local grok-cli import so a SECOND account can be chosen in the browser.
|
|
297
|
-
login: (ctrl, opts) => loginXai(ctrl, { importLocal: opts?.forceLogin ? "off" : "fallback" }),
|
|
299
|
+
login: (ctrl, opts) => loginXai(ctrl, { importLocal: opts?.forceLogin ? "off" : "fallback", device: opts?.flow === "device" }),
|
|
300
|
+
deviceLogin: true,
|
|
298
301
|
refresh: refreshXaiToken,
|
|
299
302
|
providerConfig: oauthConfig("xai"),
|
|
300
303
|
defaultModel: oauthDefaultModel("xai"),
|
|
@@ -416,6 +419,11 @@ export function supportsCodeLoginMode(name: string): boolean {
|
|
|
416
419
|
return OAUTH_PROVIDERS[name]?.codeRedirectUri !== undefined;
|
|
417
420
|
}
|
|
418
421
|
|
|
422
|
+
/** Providers that can log in with a device grant: a URL and a short code, approved in any browser. */
|
|
423
|
+
export function supportsDeviceLoginMode(name: string): boolean {
|
|
424
|
+
return OAUTH_PROVIDERS[name]?.deviceLogin === true;
|
|
425
|
+
}
|
|
426
|
+
|
|
419
427
|
function isRefreshPolicy(value: unknown): value is RefreshPolicy {
|
|
420
428
|
return value === "proactive" || value === "lazy-only" || value === "disabled";
|
|
421
429
|
}
|
|
@@ -865,18 +873,28 @@ export async function refreshAnthropicAccountWithLock(
|
|
|
865
873
|
const generation = credentialGeneration(stored);
|
|
866
874
|
let pendingIntent = readOAuthRefreshIntent(provider, accountId);
|
|
867
875
|
const observed = await newerClaudeCredentialForInstance(provider, stored, now(), deps.signal, deps.resolveIdentity);
|
|
876
|
+
// A write that depends on the CLI credential re-reads it: the non-adopting checks below run
|
|
877
|
+
// now, and adoption re-reads again inside the serialized writer (afterPrePersistRead), so a CLI
|
|
878
|
+
// rotation while the writer was queued is still caught. The read is async and never kills the
|
|
879
|
+
// Keychain child (#8161); the writer's predicate only consumes its result.
|
|
880
|
+
let diskVerified = observed.kind === "absent" || observed.kind === "adopt"
|
|
881
|
+
? undefined : await claudeCredentialGenerationCurrent(observed.diskGeneration, now);
|
|
868
882
|
const assertOwner = (store: AuthStore, checkDisk = true) => {
|
|
869
883
|
if (observed.kind !== "absent" && deps.signal?.aborted) throw new OAuthTokenRefreshStaleError();
|
|
870
|
-
if (!owns(store, checkDisk
|
|
884
|
+
if (!owns(store, checkDisk ? diskVerified : undefined)) {
|
|
871
885
|
if (store[provider]?.accounts.find(a => a.id === accountId)?.paused) throw new OAuthAccountPausedError();
|
|
872
886
|
throw new OAuthTokenRefreshStaleError();
|
|
873
887
|
}
|
|
874
888
|
};
|
|
875
889
|
assertOwner({ [provider]: getAccountSet(provider)! }, observed.kind !== "adopt");
|
|
876
890
|
if (observed.kind === "adopt") {
|
|
891
|
+
const diskGeneration = observed.diskGeneration;
|
|
877
892
|
const outcome = await mergeAccountCredential(provider, accountId, observed.credential, {
|
|
878
893
|
expectedGeneration: generation,
|
|
879
|
-
afterPrePersistRead:
|
|
894
|
+
afterPrePersistRead: async () => {
|
|
895
|
+
await deps.afterPrePersistRead?.();
|
|
896
|
+
diskVerified = await claudeCredentialGenerationCurrent(diskGeneration, now);
|
|
897
|
+
},
|
|
880
898
|
assertOwnership: assertOwner,
|
|
881
899
|
});
|
|
882
900
|
// A superseding write did not adopt our candidate. Its pending intent remains owned by it.
|
|
@@ -1671,6 +1689,7 @@ export async function runLogin(
|
|
|
1671
1689
|
const written = await (deps.saveAccountCredential ?? saveAccountCredential)(provider, opts.reauthAccountId, reauthCred, {
|
|
1672
1690
|
assertBeforePersist: deps.assertCurrentOwner,
|
|
1673
1691
|
rotateLoginId: true,
|
|
1692
|
+
clearAutomaticPause: true,
|
|
1674
1693
|
});
|
|
1675
1694
|
// A reauth whose account was deleted meanwhile wrote nothing and owns no row to report.
|
|
1676
1695
|
if (written) deps.onAccountPersisted?.(opts.reauthAccountId);
|
|
@@ -72,16 +72,6 @@ function claudeConfigDir(): string {
|
|
|
72
72
|
return explicit ? explicit : join(homedir(), ".claude");
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
-
/**
|
|
76
|
-
* Read the Claude Code OAuth credential from the macOS Keychain (darwin only). A synchronous
|
|
77
|
-
* read cannot time out without killing `security`, which can crash `securityd` while an unlock
|
|
78
|
-
* prompt is pending (#8161), so it does not spawn while a read is still running or backing off,
|
|
79
|
-
* and its own timeout starts that backoff (`claude-keychain-read.ts`).
|
|
80
|
-
*/
|
|
81
|
-
function readClaudeKeychain(): string | null {
|
|
82
|
-
return claudeKeychainReader.readSync();
|
|
83
|
-
}
|
|
84
|
-
|
|
85
75
|
/**
|
|
86
76
|
* Read the Claude Code credential file (`<config-dir>/.credentials.json`).
|
|
87
77
|
* Claude Code writes this on Linux/Windows (and on macOS when the Keychain is
|
|
@@ -98,26 +88,21 @@ export function readClaudeCredentialsFile(): string | null {
|
|
|
98
88
|
}
|
|
99
89
|
}
|
|
100
90
|
|
|
101
|
-
/** Keychain first on macOS, then the cross-platform credentials file. */
|
|
102
|
-
function readClaudeSecureStorage(): string | null {
|
|
103
|
-
// An explicit config-dir override identifies a separate Claude installation/profile.
|
|
104
|
-
// Do not let the default macOS Keychain entry shadow that requested credential file.
|
|
105
|
-
if (process.env.CLAUDE_CONFIG_DIR?.trim()) return readClaudeCredentialsFile() ?? readClaudeKeychain();
|
|
106
|
-
return readClaudeKeychain() ?? readClaudeCredentialsFile();
|
|
107
|
-
}
|
|
108
|
-
|
|
109
91
|
/**
|
|
110
|
-
*
|
|
111
|
-
*
|
|
112
|
-
*
|
|
92
|
+
* The Claude Code OAuth credential from the macOS Keychain (darwin only). There is no synchronous
|
|
93
|
+
* variant: a synchronous read cannot time out without killing `security`, which can crash
|
|
94
|
+
* `securityd` while an unlock prompt is pending (#8161). A timed-out child is left to exit on its
|
|
95
|
+
* own, concurrent reads share one child, and a timeout backs off before the next spawn
|
|
96
|
+
* (`claude-keychain-read.ts`).
|
|
113
97
|
*/
|
|
114
98
|
function readClaudeKeychainAsync(): Promise<string | null> {
|
|
115
99
|
return claudeKeychainReader.readAsync();
|
|
116
100
|
}
|
|
117
101
|
|
|
118
102
|
/**
|
|
119
|
-
*
|
|
120
|
-
*
|
|
103
|
+
* The Claude Code sign-in: Keychain first on macOS, then the cross-platform credentials file. An
|
|
104
|
+
* explicit `CLAUDE_CONFIG_DIR` names a separate Claude profile, so its credentials file wins and
|
|
105
|
+
* the default Keychain entry cannot shadow it.
|
|
121
106
|
*/
|
|
122
107
|
export async function detectClaudeCodeTokenAsync(): Promise<OAuthCredentials | null> {
|
|
123
108
|
const raw = process.env.CLAUDE_CONFIG_DIR?.trim()
|
|
@@ -140,12 +125,6 @@ export function parseClaudeOauthPayload(raw: string): OAuthCredentials | null {
|
|
|
140
125
|
}
|
|
141
126
|
}
|
|
142
127
|
|
|
143
|
-
export function detectClaudeCodeToken(): OAuthCredentials | null {
|
|
144
|
-
const raw = readClaudeSecureStorage();
|
|
145
|
-
if (!raw) return null;
|
|
146
|
-
return parseClaudeOauthPayload(raw);
|
|
147
|
-
}
|
|
148
|
-
|
|
149
128
|
/** Shared-token continuity for opaque Claude tokens; fully rotated pairs need authenticated account proof. */
|
|
150
129
|
export function hasClaudeCredentialContinuity(stored: OAuthCredentials, disk: OAuthCredentials): boolean {
|
|
151
130
|
const sameToken = (left: string, right: string): boolean =>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnthropicTokenError } from "./anthropic";
|
|
2
2
|
import { OAuthProviderNamespaceCollisionError, OAuthProviderPublicationError, publicOAuthAuthenticationErrorMessage } from "./index";
|
|
3
|
-
import { XaiTokenRequestError } from "./xai";
|
|
3
|
+
import { XaiRedirectRefusedError, XaiTokenRequestError } from "./xai";
|
|
4
4
|
import { AnthropicInstanceCollisionError, AnthropicInstanceConfigReadError } from "./store-anthropic-instance";
|
|
5
5
|
|
|
6
6
|
// Standard RFC 6749 / RFC 6750 / RFC 8628 error codes. A provider's `error` field is printed only
|
|
@@ -18,6 +18,10 @@ export function oauthLoginFailureDiagnostic(error: unknown): string {
|
|
|
18
18
|
|| error instanceof AnthropicInstanceCollisionError || error instanceof AnthropicInstanceConfigReadError) {
|
|
19
19
|
return "configuration_error";
|
|
20
20
|
}
|
|
21
|
+
// A refused redirect is a definitive server answer, not a transport fault: the request was
|
|
22
|
+
// not delivered anywhere it was allowed to go. Reporting it as `network_error` would invite a
|
|
23
|
+
// retry that can only be refused again.
|
|
24
|
+
if (error instanceof XaiRedirectRefusedError) return "oauth_authentication_failed";
|
|
21
25
|
const status = error instanceof AnthropicTokenError ? error.httpStatus
|
|
22
26
|
: error instanceof XaiTokenRequestError ? error.status : undefined;
|
|
23
27
|
const oauthError = error instanceof AnthropicTokenError || error instanceof XaiTokenRequestError
|
package/src/oauth/login-cli.ts
CHANGED
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
requestBoundLocalProviderReload,
|
|
10
10
|
type LocalProviderReloadResult,
|
|
11
11
|
} from "../server/local-provider-reload-client";
|
|
12
|
-
import { DEPRECATED_OAUTH_PROVIDER_ALIASES, isPublicOAuthProvider, listOAuthProviders, publicOAuthAuthenticationErrorMessage, runLogin, supportsCodeLoginMode } from "./index";
|
|
12
|
+
import { DEPRECATED_OAUTH_PROVIDER_ALIASES, isPublicOAuthProvider, listOAuthProviders, publicOAuthAuthenticationErrorMessage, runLogin, supportsCodeLoginMode, supportsDeviceLoginMode } from "./index";
|
|
13
13
|
import { classifyLoginCodeError } from "./login-flow-state";
|
|
14
14
|
import { KEY_LOGIN_PROVIDERS, isKeyLoginProvider, validateApiKey, type KeyLoginProvider } from "./key-providers";
|
|
15
15
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
@@ -17,6 +17,7 @@ import { configuredAdminToken } from "../lib/admin-secrets";
|
|
|
17
17
|
import { codexAccountNamespaceProviderCollisionError } from "../codex/account-namespace-match";
|
|
18
18
|
import { assertAnthropicInstanceLoginConfig } from "./store-anthropic-instance";
|
|
19
19
|
import { reportOAuthLoginError } from "./login-cli-errors";
|
|
20
|
+
import { terminalSafeText } from "../lib/terminal-safe-text";
|
|
20
21
|
|
|
21
22
|
/**
|
|
22
23
|
* Seams a test drives in place of a browser, a terminal and a real provider. Production passes
|
|
@@ -116,7 +117,8 @@ export function warnIfLiveReloadSkipped(result: LocalProviderReloadResult | null
|
|
|
116
117
|
*/
|
|
117
118
|
export function loginUsageMessage(): string {
|
|
118
119
|
return `Usage: ocx login <provider> [--headless]\n`
|
|
119
|
-
+ ` --headless: no browser and no local port — approve in any browser, paste the code\n`
|
|
120
|
+
+ ` --headless: no browser and no local port — approve in any browser, then paste the code\n`
|
|
121
|
+
+ ` it shows or confirm the device code printed here\n`
|
|
120
122
|
+ ` (${listCodeLoginProviders().join(", ")})\n`
|
|
121
123
|
+ ` Codex / ChatGPT: ocx login codex (account pool, needs a running proxy; 'chatgpt' and\n`
|
|
122
124
|
+ ` 'openai' are the same route. An OpenAI platform key is 'openai-apikey'.)\n`
|
|
@@ -147,7 +149,7 @@ export async function handleLogin(provider?: string, deps: LoginCliDeps = {}, op
|
|
|
147
149
|
}
|
|
148
150
|
if (isPublicOAuthProvider(name)) return handleOAuthLogin(name, deps, opts);
|
|
149
151
|
if (opts.codeMode) {
|
|
150
|
-
console.error(`--headless needs a provider with a code-display login: ${listCodeLoginProviders().join(", ")}`);
|
|
152
|
+
console.error(`--headless needs a provider with a code-display or device login: ${listCodeLoginProviders().join(", ")}`);
|
|
151
153
|
process.exit(1);
|
|
152
154
|
}
|
|
153
155
|
if (isKeyLoginProvider(name)) return handleKeyLogin(name, deps);
|
|
@@ -155,36 +157,49 @@ export async function handleLogin(provider?: string, deps: LoginCliDeps = {}, op
|
|
|
155
157
|
process.exit(1);
|
|
156
158
|
}
|
|
157
159
|
|
|
158
|
-
/** OAuth providers that accept `ocx login <provider> --headless
|
|
160
|
+
/** OAuth providers that accept `ocx login <provider> --headless`: a code-display or a device login. */
|
|
159
161
|
export function listCodeLoginProviders(): string[] {
|
|
160
|
-
return listOAuthProviders().filter(supportsCodeLoginMode);
|
|
162
|
+
return listOAuthProviders().filter(name => supportsCodeLoginMode(name) || supportsDeviceLoginMode(name));
|
|
161
163
|
}
|
|
162
164
|
|
|
163
165
|
/**
|
|
164
|
-
* `--headless`:
|
|
165
|
-
*
|
|
166
|
+
* `--headless`: nothing is launched and nothing listens, because the browser is on another machine.
|
|
167
|
+
* A code-display provider shows the authorization code to paste back here; a provider with only a
|
|
168
|
+
* device grant (xAI) shows a short code to confirm in that browser and settles on its own, so the
|
|
169
|
+
* same branch serves both and only the paste step differs (see `device` below).
|
|
166
170
|
*/
|
|
167
171
|
async function handleCodeLogin(name: string, deps: LoginCliDeps): Promise<void> {
|
|
168
172
|
const login = deps.runLogin ?? runLogin;
|
|
169
|
-
|
|
170
|
-
|
|
173
|
+
// A provider without a code-display page but with a device grant (xAI) is headless the same
|
|
174
|
+
// way: the browser is elsewhere and nothing listens here. It shows a code instead of asking for one.
|
|
175
|
+
const device = !supportsCodeLoginMode(name) && supportsDeviceLoginMode(name);
|
|
176
|
+
if (!device && !supportsCodeLoginMode(name)) {
|
|
177
|
+
console.error(`${name} has no headless login (code-display or device). Providers that have one: ${listCodeLoginProviders().join(", ")}`);
|
|
171
178
|
process.exit(1);
|
|
172
179
|
}
|
|
173
180
|
try {
|
|
174
181
|
await withPrompt(deps.ask, async (ask) => {
|
|
175
182
|
await login(name, {
|
|
176
183
|
onAuth: ({ url, instructions }) => {
|
|
177
|
-
|
|
178
|
-
|
|
184
|
+
// Both are provider-supplied. `--headless` for xAI is the device grant, whose instructions
|
|
185
|
+
// quote the provider's user code; a control sequence there would drive this tty.
|
|
186
|
+
console.log(`\n🔐 Open this URL in any browser to approve ${name}:\n${terminalSafeText(url)}\n`);
|
|
187
|
+
if (instructions) console.log(terminalSafeText(instructions));
|
|
179
188
|
},
|
|
180
|
-
|
|
189
|
+
// The Meta Muse device flow's last line quotes an action URL from the provider payload, so
|
|
190
|
+
// this is not a fixed sentence: it is provider-derived text on its way to a tty.
|
|
191
|
+
onProgress: (m) => console.log(` ${terminalSafeText(m)}`),
|
|
181
192
|
onManualCodeInput: async () => await ask("Paste the code shown after approval: "),
|
|
182
|
-
}, { codeMode: true });
|
|
193
|
+
}, device ? { flow: "device" } : { codeMode: true });
|
|
183
194
|
});
|
|
184
195
|
} catch (error) {
|
|
185
196
|
// Never let the raw error reach stderr: a token endpoint's error body can quote the pasted
|
|
186
197
|
// code back. Only fixed, allowlisted text and the machine-readable reason are printed.
|
|
187
|
-
|
|
198
|
+
// The reason comes from the same classifier the management API reports, so a definitive
|
|
199
|
+
// refusal (a redirect the client will not follow) reads as `oauth_authentication_failed`
|
|
200
|
+
// here and in `GET /api/oauth/status` rather than as a bad code or a network fault.
|
|
201
|
+
const reason = classifyLoginCodeError(error);
|
|
202
|
+
console.error(`\n❌ ${name} login failed (${reason}): ${publicOAuthAuthenticationErrorMessage(error)}`);
|
|
188
203
|
process.exit(1);
|
|
189
204
|
}
|
|
190
205
|
const reload = await notifyRunningProxyAfterOAuthLogin(name);
|
|
@@ -203,17 +218,17 @@ export async function handleOAuthLogin(name: string, deps: LoginCliDeps = {}, op
|
|
|
203
218
|
await login(name, {
|
|
204
219
|
onAuth: ({ url, instructions }) => {
|
|
205
220
|
if (!url) {
|
|
206
|
-
if (instructions) console.log(instructions);
|
|
221
|
+
if (instructions) console.log(terminalSafeText(instructions));
|
|
207
222
|
return;
|
|
208
223
|
}
|
|
209
|
-
console.log(`\n🔐 Opening browser for ${name} login...\n${url}\n`);
|
|
210
|
-
if (instructions) console.log(instructions);
|
|
224
|
+
console.log(`\n🔐 Opening browser for ${name} login...\n${terminalSafeText(url)}\n`);
|
|
225
|
+
if (instructions) console.log(terminalSafeText(instructions));
|
|
211
226
|
// The controller does not await onAuth, so the launcher's answer cannot be reported from
|
|
212
227
|
// here — this returns long before it arrives. It reports itself instead, and the one
|
|
213
228
|
// thing that could collide with it waits below (#5261).
|
|
214
229
|
browser.track(launch(url));
|
|
215
230
|
},
|
|
216
|
-
onProgress: (m) => console.log(` ${m}`),
|
|
231
|
+
onProgress: (m) => console.log(` ${terminalSafeText(m)}`),
|
|
217
232
|
onManualCodeInput: async () => {
|
|
218
233
|
// "or wait for browser" is a lie if nothing opened, and a warning printed after readline
|
|
219
234
|
// has drawn the prompt lands on the line the user is typing on.
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AnthropicTokenError } from "./anthropic";
|
|
2
2
|
import { parseCallbackInput } from "./callback-server";
|
|
3
|
+
import { XaiRedirectRefusedError, XaiTokenRequestError } from "./xai";
|
|
3
4
|
import { retainedUtf8Bytes } from "../lib/admission";
|
|
4
5
|
import type { GenerationContext } from "../lib/state-store-sweeper";
|
|
5
6
|
|
|
@@ -35,7 +36,14 @@ export type LoginCodeError =
|
|
|
35
36
|
| "no_pending_login"
|
|
36
37
|
| "provider_unreachable"
|
|
37
38
|
| "malformed_input"
|
|
38
|
-
| "code_mode_unsupported"
|
|
39
|
+
| "code_mode_unsupported"
|
|
40
|
+
/**
|
|
41
|
+
* The provider answered definitively and the client will not retry: today, a redirect the
|
|
42
|
+
* device poll refused to follow. Distinct from `invalid_or_expired_code` (the input was
|
|
43
|
+
* wrong) and `provider_unreachable` (the request never got an answer), because both of those
|
|
44
|
+
* invite a retry that can only fail the same way. Same spelling as the CLI's terminal reason.
|
|
45
|
+
*/
|
|
46
|
+
| "oauth_authentication_failed";
|
|
39
47
|
|
|
40
48
|
export interface LoginFlowState {
|
|
41
49
|
error?: string;
|
|
@@ -176,12 +184,27 @@ export class CodeLoginUnsupportedError extends Error {
|
|
|
176
184
|
* forwarded: a provider body can quote the submitted code back, and this response is the one
|
|
177
185
|
* surface a hosted caller renders to a user.
|
|
178
186
|
*
|
|
179
|
-
*
|
|
180
|
-
*
|
|
187
|
+
* Anthropic code exchanges and xAI device grants carry typed provider failures; other
|
|
188
|
+
* providers retain the generic branches.
|
|
189
|
+
*
|
|
190
|
+
* This is the single source of truth for the machine-readable reason: the code-mode paste
|
|
191
|
+
* response, `GET /api/oauth/status` and the headless CLI all read it, so a new terminal cause is
|
|
192
|
+
* added here once rather than special-cased at each surface.
|
|
181
193
|
*/
|
|
182
194
|
export function classifyLoginCodeError(error: unknown): LoginCodeError {
|
|
183
195
|
const message = error instanceof Error ? error.message : "";
|
|
184
196
|
if (message.startsWith("OAuth callback cancelled")) return "no_pending_login";
|
|
197
|
+
// A refused redirect is a definitive server answer, not a transport fault and not a bad code:
|
|
198
|
+
// the request was never delivered anywhere it was allowed to go, and replaying it would be
|
|
199
|
+
// refused identically. Checked before the status-less branches, which would otherwise read it
|
|
200
|
+
// as a retriable network failure or as an invalid code.
|
|
201
|
+
if (error instanceof XaiRedirectRefusedError) return "oauth_authentication_failed";
|
|
202
|
+
if (error instanceof XaiTokenRequestError) {
|
|
203
|
+
if (error.status === 429 || (error.status !== undefined && error.status >= 500)) return "provider_unreachable";
|
|
204
|
+
if (error.oauthError === "expired_token" || error.oauthError === "invalid_grant") return "invalid_or_expired_code";
|
|
205
|
+
if (error.status === undefined) return "provider_unreachable";
|
|
206
|
+
return "oauth_authentication_failed";
|
|
207
|
+
}
|
|
185
208
|
if (error instanceof AnthropicTokenError) {
|
|
186
209
|
return error.httpStatus !== undefined && error.httpStatus >= 500
|
|
187
210
|
? "provider_unreachable"
|
package/src/oauth/meta-muse.ts
CHANGED
|
@@ -37,7 +37,7 @@ const VALIDATE_TIMEOUT_MS = 10_000;
|
|
|
37
37
|
/**
|
|
38
38
|
* Shown BEFORE any credential is read.
|
|
39
39
|
*
|
|
40
|
-
* `login-cli.ts`
|
|
40
|
+
* `login-cli.ts` turns `onProgress` into a prefixed `console.log` line and never reads the
|
|
41
41
|
* registry note, so this is the CLI's only warning surface. The GUI ignores it because
|
|
42
42
|
* `OAuthTosWarningModal` has already been acknowledged by then.
|
|
43
43
|
*/
|