@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
|
@@ -52,6 +52,9 @@ function recordedGenerations(io: StoreIO, owner: DesktopRemoteOwner): string[] {
|
|
|
52
52
|
|
|
53
53
|
export function inspectRemoteDesktopStore(owner: DesktopRemoteOwner): {
|
|
54
54
|
kind: "absent" | "active" | "pending" | "restored" | "legacy_current_connection" | "conflict" | "unsafe";
|
|
55
|
+
/** Set for the one refusal a person can clear: the store folder exists with nothing in it OpenCodex reads. */
|
|
56
|
+
reason?: "root_without_state";
|
|
57
|
+
path?: string;
|
|
55
58
|
} {
|
|
56
59
|
try {
|
|
57
60
|
parseOwner(owner);
|
|
@@ -71,7 +74,7 @@ export function inspectRemoteDesktopStore(owner: DesktopRemoteOwner): {
|
|
|
71
74
|
if (projectionHash(file?.value ?? null) !== bundle.state.lastProjectionHash) return { kind: "conflict" };
|
|
72
75
|
return { kind: bundle.state.phase === "restored" ? "restored" : "active" };
|
|
73
76
|
}
|
|
74
|
-
if (existsSync(bundle.paths.root) && !receipt(io))
|
|
77
|
+
if (existsSync(bundle.paths.root) && !receipt(io)) return { kind: "unsafe", reason: "root_without_state", path: bundle.paths.root };
|
|
75
78
|
const legacy = locateLegacy(io, owner, serviceGenerations());
|
|
76
79
|
if (legacy) currentConnection(owner);
|
|
77
80
|
return { kind: legacy ? "legacy_current_connection" : "absent" };
|
|
@@ -81,24 +84,32 @@ export function inspectRemoteDesktopStore(owner: DesktopRemoteOwner): {
|
|
|
81
84
|
export function applyRemoteDesktopStore(held: ClientLifecycleHeld, options: {
|
|
82
85
|
owner: DesktopRemoteOwner; expectedTokenFingerprint: string;
|
|
83
86
|
baseUrl: string; apiKey: string; mode: Desktop3pConfigMode; models: Desktop3pModelEntry[];
|
|
87
|
+
/** Link-only local materialization: exact Child listener and a non-secret placeholder. */
|
|
88
|
+
localListener?: boolean;
|
|
89
|
+
/** One operation's consent to replace edited fields of this already-owned profile. */
|
|
90
|
+
overwriteConflict?: boolean;
|
|
84
91
|
}): DesktopStoreResult {
|
|
85
92
|
return mutation(held, io => {
|
|
86
93
|
const { config, client } = currentConnection(options.owner);
|
|
87
94
|
noDisconnect(io);
|
|
88
95
|
if (client.pendingOperation) throw new DesktopStoreError("conflict");
|
|
89
96
|
const token = readServiceApiTokenState();
|
|
97
|
+
const local = options.localListener === true;
|
|
98
|
+
const validDestination = local
|
|
99
|
+
? client.transport === "link" && !!client.link && options.baseUrl === `http://127.0.0.1:${config.port}` && options.apiKey === "opencodex-loopback"
|
|
100
|
+
: serviceApiTokenFingerprint(options.apiKey) === (token.kind === "present" ? token.fingerprint : "") && origin(options.baseUrl) === options.owner.serverUrl;
|
|
90
101
|
if (token.kind !== "present" || token.fingerprint !== options.expectedTokenFingerprint || token.fingerprint !== client.tokenFingerprint
|
|
91
|
-
||
|
|
102
|
+
|| !validDestination) throw new DesktopStoreError("conflict");
|
|
92
103
|
if (config.clientIntegrations?.["claude-desktop"] === false) throw new DesktopStoreError("desired_disabled");
|
|
93
104
|
if (!options.models.length || !["static", "hybrid", "discovery"].includes(options.mode)) throw new DesktopStoreError("unsafe");
|
|
94
105
|
assertDesktop3pModelsValid(options.models);
|
|
95
106
|
const bundle = establish(io, options.owner, [token.fingerprint, ...serviceGenerations()], false)!;
|
|
96
107
|
const value = {
|
|
97
|
-
inferenceProvider: "gateway", inferenceCredentialKind: "static", inferenceGatewayBaseUrl: options.owner.serverUrl,
|
|
108
|
+
inferenceProvider: "gateway", inferenceCredentialKind: "static", inferenceGatewayBaseUrl: local ? options.baseUrl : options.owner.serverUrl,
|
|
98
109
|
inferenceGatewayApiKey: options.apiKey, modelDiscoveryEnabled: options.mode !== "static",
|
|
99
110
|
...(options.mode === "discovery" ? {} : { inferenceModels: options.models }),
|
|
100
111
|
};
|
|
101
|
-
artifact(io, bundle, value, "apply", token.fingerprint, bundle.state!.targetId);
|
|
112
|
+
artifact(io, bundle, value, "apply", token.fingerprint, bundle.state!.targetId, options.overwriteConflict);
|
|
102
113
|
cleanBackup(io, bundle, [token.fingerprint, ...serviceGenerations()]);
|
|
103
114
|
return success(io, bundle, "applied");
|
|
104
115
|
});
|
|
@@ -123,6 +134,15 @@ export function replaceRemoteDesktopCredential(held: ClientLifecycleHeld, option
|
|
|
123
134
|
const file = io.read(profilePath(bundle.paths.library, bundle.state!.targetId));
|
|
124
135
|
if (!file) throw new DesktopStoreError("unsafe");
|
|
125
136
|
const credential = profileCredential(file.value);
|
|
137
|
+
const local = client.transport === "link" && !!client.link
|
|
138
|
+
&& file.value.inferenceGatewayBaseUrl === `http://127.0.0.1:${config.port}` && file.value.inferenceGatewayApiKey === "opencodex-loopback";
|
|
139
|
+
if (local) {
|
|
140
|
+
// artifact still verifies the recorded projection and selection. Only the service-key
|
|
141
|
+
// generation changes; the local file never receives that secret during rotation.
|
|
142
|
+
artifact(io, bundle, projection(file.value), "rotate", replacement);
|
|
143
|
+
cleanBackup(io, bundle, [options.expectedTokenFingerprint, ...generations]);
|
|
144
|
+
return success(io, bundle, "updated");
|
|
145
|
+
}
|
|
126
146
|
if (!credential || credential.origin !== options.owner.serverUrl
|
|
127
147
|
|| ![options.expectedTokenFingerprint, replacement].includes(credential.fingerprint)) throw new DesktopStoreError("conflict");
|
|
128
148
|
artifact(io, bundle, { ...projection(file.value), inferenceGatewayApiKey: options.replacementKey }, "rotate", replacement);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { markProxyError } from "../lib/client-error-body";
|
|
2
|
+
import { ADVISOR_SERVER_TOOL_NAME, advisorReplayBlock, isAdvisorCallInput, isAdvisorResultContent, isAdvisorServerToolType } from "../adapters/anthropic/advisor-tool";
|
|
2
3
|
import { isClaudeWebSearchToolName } from "./outbound";
|
|
3
4
|
import { AnthropicRequestError, isRec, type Rec } from "./inbound-records";
|
|
4
5
|
|
|
@@ -99,17 +100,23 @@ export function toolsToResponses(tools: unknown): Rec[] | undefined {
|
|
|
99
100
|
}
|
|
100
101
|
|
|
101
102
|
/**
|
|
102
|
-
* The caller's typed Anthropic
|
|
103
|
-
* Responses body has no slot for them — web_search becomes the hosted sidecar tool
|
|
104
|
-
* web_fetch
|
|
103
|
+
* The caller's typed Anthropic server tools (`web_search_*`, `web_fetch_*`, `advisor_*`), as
|
|
104
|
+
* declared. The Responses body has no slot for them — web_search becomes the hosted sidecar tool
|
|
105
|
+
* above, web_fetch and the Advisor are dropped — so an Anthropic destination receives them out of
|
|
106
|
+
* body, unchanged (`planAnthropicServerTools` picks which ones per destination).
|
|
105
107
|
*/
|
|
106
108
|
export function declaredAnthropicServerTools(raw: unknown): Rec[] | undefined {
|
|
107
109
|
if (!isRec(raw) || !Array.isArray(raw.tools)) return undefined;
|
|
108
|
-
const tools = raw.tools.filter((t): t is Rec => isRec(t) && typeof t.type === "string"
|
|
110
|
+
const tools = raw.tools.filter((t): t is Rec => isRec(t) && typeof t.type === "string"
|
|
111
|
+
&& (/^web_(search|fetch)_\d+$/.test(t.type) || isAdvisorServerToolType(t.type)));
|
|
109
112
|
return tools.length > 0 ? tools : undefined;
|
|
110
113
|
}
|
|
111
114
|
|
|
112
|
-
/**
|
|
115
|
+
/**
|
|
116
|
+
* A declared tool the translated body drops and no out-of-body lane carries (bash_*, text_editor_*, ...).
|
|
117
|
+
* The Advisor rides the out-of-body lane and is optional: a destination without it simply runs the
|
|
118
|
+
* turn unadvised, so it never makes a translated child native-only.
|
|
119
|
+
*/
|
|
113
120
|
export function hasNativeOnlyTool(raw: Rec): boolean {
|
|
114
121
|
return Array.isArray(raw.tools)
|
|
115
122
|
&& raw.tools.some(tool => !toolsToResponses([tool]) && !declaredAnthropicServerTools({ tools: [tool] }));
|
|
@@ -129,18 +136,24 @@ function replayableServerRun(run: readonly Rec[]): boolean {
|
|
|
129
136
|
if (block.type === "server_tool_use") {
|
|
130
137
|
const { id, name, input } = block;
|
|
131
138
|
if (typeof id !== "string" || !id.startsWith("srvtoolu_") || pending.has(id) || completed.has(id)
|
|
132
|
-
|| (name !== "web_search" && name !== "web_fetch") || !isRec(input)) return false;
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
139
|
+
|| (name !== "web_search" && name !== "web_fetch" && name !== ADVISOR_SERVER_TOOL_NAME) || !isRec(input)) return false;
|
|
140
|
+
if (name === ADVISOR_SERVER_TOOL_NAME) {
|
|
141
|
+
// Anthropic documents the Advisor's input as always empty.
|
|
142
|
+
if (!isAdvisorCallInput(input)) return false;
|
|
143
|
+
} else {
|
|
144
|
+
const prototype = Object.getPrototypeOf(input);
|
|
145
|
+
const required = input[name === "web_search" ? "query" : "url"];
|
|
146
|
+
if ((prototype !== Object.prototype && prototype !== null)
|
|
147
|
+
|| typeof required !== "string" || required.trim().length === 0) return false;
|
|
148
|
+
}
|
|
137
149
|
pending.set(id, block);
|
|
138
150
|
} else {
|
|
139
151
|
const id = block.tool_use_id;
|
|
140
152
|
if (typeof id !== "string") return false;
|
|
141
153
|
const call = pending.get(id);
|
|
142
|
-
if (!call || block.type !== `${call.name}_tool_result`
|
|
143
|
-
|
|
154
|
+
if (!call || block.type !== `${call.name}_tool_result`) return false;
|
|
155
|
+
if (call.name === ADVISOR_SERVER_TOOL_NAME ? !isAdvisorResultContent(block.content)
|
|
156
|
+
: Array.isArray(block.content) && !block.content.every(h => isRec(h) && typeof h.encrypted_content === "string")) return false;
|
|
144
157
|
pending.delete(id);
|
|
145
158
|
completed.add(id);
|
|
146
159
|
}
|
|
@@ -150,7 +163,7 @@ function replayableServerRun(run: readonly Rec[]): boolean {
|
|
|
150
163
|
|
|
151
164
|
/**
|
|
152
165
|
* Completed Anthropic server-tool exchanges (`server_tool_use` + `web_search_tool_result` /
|
|
153
|
-
* `web_fetch_tool_result`) in the caller's assistant history. The Responses body drops them, so
|
|
166
|
+
* `web_fetch_tool_result` / `advisor_tool_result`) in the caller's assistant history. The Responses body drops them, so
|
|
154
167
|
* an Anthropic destination re-inserts them out of body, keyed by the block that follows each run
|
|
155
168
|
* in its message: `call:<tool_use id>`, `text:<text>`, `thinking:<signature>` or
|
|
156
169
|
* `redacted:<data>`, all of which survive translation. An anchor that occurs more than once in the
|
|
@@ -169,9 +182,11 @@ export function replayedAnthropicServerBlocks(raw: unknown): Map<string, Rec[]>
|
|
|
169
182
|
if (!Array.isArray(message.content)) continue;
|
|
170
183
|
let run: Rec[] = [];
|
|
171
184
|
for (const block of message.content.filter(isRec)) {
|
|
172
|
-
if (block.type === "server_tool_use" || block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result"
|
|
173
|
-
|
|
174
|
-
|
|
185
|
+
if (block.type === "server_tool_use" || block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result"
|
|
186
|
+
|| block.type === "advisor_tool_result") {
|
|
187
|
+
// The caller's breakpoints are dropped on this lane, as for the declared tools above; an
|
|
188
|
+
// Advisor block keeps only its documented fields.
|
|
189
|
+
run.push(advisorReplayBlock(block) ?? { ...block, cache_control: undefined });
|
|
175
190
|
continue;
|
|
176
191
|
}
|
|
177
192
|
const anchor = block.type === "tool_use" ? `call:${String(block.id)}`
|
|
@@ -1,32 +1,41 @@
|
|
|
1
1
|
import { isRec, type Rec } from "./inbound-records";
|
|
2
2
|
|
|
3
|
-
/**
|
|
4
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Selector list shared by appendOnlyToolLoadingModels and chatToolDispatchModels: provider-qualified
|
|
5
|
+
* routes, optionally ending in one prefix wildcard; never a global wildcard.
|
|
6
|
+
*/
|
|
7
|
+
export function isToolLoadingModelSelectors(value: unknown): value is string[] {
|
|
5
8
|
return Array.isArray(value) && value.length <= 128 && value.every(entry =>
|
|
6
9
|
typeof entry === "string" && entry.length <= 512 && /^[^\s/*]+\/[^\s*]+\*?$/.test(entry));
|
|
7
10
|
}
|
|
8
11
|
|
|
9
|
-
|
|
10
|
-
|
|
12
|
+
/** Whether a resolved provider/model route matches a valid tool-loading selector list. */
|
|
13
|
+
export function toolLoadingModelMatches(value: unknown, model: string): boolean {
|
|
14
|
+
return isToolLoadingModelSelectors(value) && value.some(pattern =>
|
|
11
15
|
pattern.endsWith("*") ? model.startsWith(pattern.slice(0, -1)) : model === pattern);
|
|
12
16
|
}
|
|
13
17
|
|
|
14
|
-
/**
|
|
15
|
-
export
|
|
16
|
-
|
|
17
|
-
|
|
18
|
+
/** Client discovery evidence in the original Messages body (shared by the Responses and Chat projections). */
|
|
19
|
+
export interface ClientToolDiscovery {
|
|
20
|
+
/** Tools the client declared with `defer_loading: true`. */
|
|
21
|
+
deferred: Set<string>;
|
|
22
|
+
/** Every tool name the assistant has called. */
|
|
23
|
+
used: Set<string>;
|
|
24
|
+
/** Deferred tool -> the ToolSearch call id whose successful result first loaded it. */
|
|
25
|
+
loadAt: Map<string, string>;
|
|
26
|
+
}
|
|
18
27
|
|
|
19
|
-
|
|
28
|
+
/**
|
|
29
|
+
* Read discovery evidence: a successful structured ToolSearch `tool_reference` for a deferred tool
|
|
30
|
+
* this request still declares and has not called before that result. Returns null when the
|
|
31
|
+
* client body is not the expected shape or reuses a tool_use id, so callers send it unchanged.
|
|
32
|
+
*/
|
|
33
|
+
export function readClientToolDiscovery(raw: Rec, isDeclared: (name: string) => boolean): ClientToolDiscovery | null {
|
|
34
|
+
if (!Array.isArray(raw.tools) || !Array.isArray(raw.messages)) return null;
|
|
20
35
|
const deferred = new Set<string>();
|
|
21
|
-
for (const tool of body.tools) {
|
|
22
|
-
if (!isRec(tool) || tool.type !== "function" || typeof tool.name !== "string") continue;
|
|
23
|
-
if (declared.has(tool.name)) return body;
|
|
24
|
-
declared.set(tool.name, tool);
|
|
25
|
-
}
|
|
26
36
|
for (const tool of raw.tools) {
|
|
27
37
|
if (isRec(tool) && tool.defer_loading === true && typeof tool.name === "string") deferred.add(tool.name);
|
|
28
38
|
}
|
|
29
|
-
|
|
30
39
|
const calls = new Map<string, string>();
|
|
31
40
|
const used = new Set<string>();
|
|
32
41
|
const loadAt = new Map<string, string>();
|
|
@@ -36,7 +45,7 @@ export function appendLoadedToolDefinitions(body: Rec, raw: Rec): Rec {
|
|
|
36
45
|
if (!isRec(block)) continue;
|
|
37
46
|
if (message.role === "assistant" && block.type === "tool_use"
|
|
38
47
|
&& typeof block.id === "string" && typeof block.name === "string") {
|
|
39
|
-
if (calls.has(block.id)) return
|
|
48
|
+
if (calls.has(block.id)) return null;
|
|
40
49
|
calls.set(block.id, block.name);
|
|
41
50
|
used.add(block.name);
|
|
42
51
|
}
|
|
@@ -46,12 +55,28 @@ export function appendLoadedToolDefinitions(body: Rec, raw: Rec): Rec {
|
|
|
46
55
|
for (const reference of block.content) {
|
|
47
56
|
if (!isRec(reference) || reference.type !== "tool_reference" || typeof reference.tool_name !== "string") continue;
|
|
48
57
|
const name = reference.tool_name;
|
|
49
|
-
if (
|
|
58
|
+
if (isDeclared(name) && deferred.has(name) && !used.has(name) && !loadAt.has(name)) {
|
|
50
59
|
loadAt.set(name, block.tool_use_id);
|
|
51
60
|
}
|
|
52
61
|
}
|
|
53
62
|
}
|
|
54
63
|
}
|
|
64
|
+
return { deferred, used, loadAt };
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/** Replay client discovery in place, using only definitions still declared by this request. */
|
|
68
|
+
export function appendLoadedToolDefinitions(body: Rec, raw: Rec): Rec {
|
|
69
|
+
if (!Array.isArray(body.tools) || !Array.isArray(body.input)) return body;
|
|
70
|
+
|
|
71
|
+
const declared = new Map<string, Rec>();
|
|
72
|
+
for (const tool of body.tools) {
|
|
73
|
+
if (!isRec(tool) || tool.type !== "function" || typeof tool.name !== "string") continue;
|
|
74
|
+
if (declared.has(tool.name)) return body;
|
|
75
|
+
declared.set(tool.name, tool);
|
|
76
|
+
}
|
|
77
|
+
const discovery = readClientToolDiscovery(raw, name => declared.has(name));
|
|
78
|
+
if (!discovery) return body;
|
|
79
|
+
const { deferred, used, loadAt } = discovery;
|
|
55
80
|
// Discovery must remain callable; this optimization does not create a search capability.
|
|
56
81
|
if (!declared.has("ToolSearch") || deferred.has("ToolSearch")) return body;
|
|
57
82
|
|
package/src/claude/outbound.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { ownedAnthropicErrorPayload, messagesOverflowPresentation } from "../lib
|
|
|
3
3
|
import { proxyMessagePresentation, markProxyError, hasProxyErrorMessage, hasProxyIncomplete } from "../lib/client-error-body";
|
|
4
4
|
import { admitMessagesFailure, collectMessagesFailure, type MessagesFailureVerdictSink } from "./failure-verdict";
|
|
5
5
|
import { anthropicProgressEnvelope, isAnthropicProgressMirror } from "../responses/anthropic-progress";
|
|
6
|
+
import { ADVISOR_SERVER_TOOL_NAME, isAdvisorCallInput, isAdvisorResultContent } from "../adapters/anthropic/advisor-tool";
|
|
6
7
|
/**
|
|
7
8
|
* Claude Code outbound: internal /v1/responses output -> Anthropic Messages API shapes.
|
|
8
9
|
*
|
|
@@ -284,17 +285,24 @@ export function sanitizeWebSearchInput(input: unknown): Rec {
|
|
|
284
285
|
* input (query/queries) and the web_search_tool_result content (hits, or the error
|
|
285
286
|
* object when the search failed). An item carrying `anthropic_blocks` came from Anthropic's
|
|
286
287
|
* own server-side call and maps back to those blocks verbatim (`srvtoolu_` id,
|
|
287
|
-
* `encrypted_content`, web_fetch), so the client can replay
|
|
288
|
+
* `encrypted_content`, web_fetch, the Advisor's `advisor_tool_result`), so the client can replay
|
|
289
|
+
* them on its next turn.
|
|
288
290
|
* Shared by the SSE, JSON and direct translation paths.
|
|
289
291
|
*/
|
|
290
292
|
export function webSearchPairFromItem(item: Rec): {
|
|
291
293
|
id: string; name: string; resultType: string; input: Rec; resultContent: unknown; completed: boolean;
|
|
292
|
-
} {
|
|
294
|
+
} | undefined {
|
|
293
295
|
const action = isRec(item.action) ? item.action : {};
|
|
294
296
|
const completed = item.status !== "failed";
|
|
295
297
|
const { use, result } = isRec(item.anthropic_blocks) ? item.anthropic_blocks : {};
|
|
298
|
+
// An Advisor exchange is only ever emitted verbatim; one that fails validation is dropped rather
|
|
299
|
+
// than falling through to an empty web_search below.
|
|
300
|
+
if (isRec(use) && use.name === ADVISOR_SERVER_TOOL_NAME && !(isRec(result) && typeof use.id === "string"
|
|
301
|
+
&& isAdvisorCallInput(use.input) && isAdvisorResultContent(result.content)
|
|
302
|
+
&& result.tool_use_id === use.id && result.type === "advisor_tool_result")) return undefined;
|
|
296
303
|
if (isRec(use) && isRec(result) && typeof use.id === "string" && isRec(use.input)
|
|
297
|
-
&& (use.name === "web_search" || use.name === "web_fetch"
|
|
304
|
+
&& (use.name === "web_search" || use.name === "web_fetch"
|
|
305
|
+
|| (use.name === ADVISOR_SERVER_TOOL_NAME && isAdvisorCallInput(use.input) && isAdvisorResultContent(result.content)))
|
|
298
306
|
&& result.tool_use_id === use.id && result.type === `${use.name}_tool_result`) {
|
|
299
307
|
return { id: use.id, name: use.name, resultType: result.type, input: use.input, resultContent: result.content, completed };
|
|
300
308
|
}
|
|
@@ -793,6 +801,7 @@ export function responsesSseToAnthropicSse(
|
|
|
793
801
|
ensureStarted();
|
|
794
802
|
closeOpenBlock();
|
|
795
803
|
const pair = webSearchPairFromItem(item);
|
|
804
|
+
if (!pair) break;
|
|
796
805
|
const toolIndex = blockIndex++;
|
|
797
806
|
emit("content_block_start", {
|
|
798
807
|
type: "content_block_start", index: toolIndex,
|
|
@@ -1140,6 +1149,7 @@ export function responsesJsonToAnthropicMessage(json: unknown, model: string, tr
|
|
|
1140
1149
|
case "web_search_call": {
|
|
1141
1150
|
// Server-side search: emit the Anthropic pair. Does NOT set sawToolUse.
|
|
1142
1151
|
const pair = webSearchPairFromItem(raw);
|
|
1152
|
+
if (!pair) break;
|
|
1143
1153
|
content.push({ type: "server_tool_use", id: pair.id, name: pair.name, input: pair.input });
|
|
1144
1154
|
content.push({ type: pair.resultType, tool_use_id: pair.id, content: pair.resultContent });
|
|
1145
1155
|
if (pair.completed && pair.name === "web_search") webSearchRequests++;
|
package/src/cli/account-api.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { configuredAnthropicInstance, isAnthropicOAuthInstance } from "../providers/anthropic-instance";
|
|
2
|
-
import { parseQuotaFailureCode, type QuotaFailureCode, type ProviderQuota, type AccountQuotaMode } from "../providers/quota-types";
|
|
2
|
+
import { parseQuotaFailureCode, parseQuotaUnknownReason, type QuotaFailureCode, type QuotaUnknownReason, type ProviderQuota, type AccountQuotaMode } from "../providers/quota-types";
|
|
3
|
+
import { parseWeeklyWindowConflicts, type WeeklyWindowConflict } from "../codex/quota-window-conflict";
|
|
3
4
|
/**
|
|
4
5
|
* Data-access layer for `ocx account` (issue #180) — live-proxy HTTP client and
|
|
5
6
|
* per-family account readers. Kept separate from account.ts (command handlers)
|
|
@@ -57,6 +58,12 @@ export interface AccountRow {
|
|
|
57
58
|
quotaRefresh?: CodexQuotaRefreshOutcome;
|
|
58
59
|
quotaUnavailable?: boolean;
|
|
59
60
|
quotaFailure?: QuotaFailureCode;
|
|
61
|
+
/** Live weekly windows a Codex pool account reported in contradiction (#8574). */
|
|
62
|
+
weeklyQuotaConflicts?: WeeklyWindowConflict[];
|
|
63
|
+
/** Why the balance is unknown (#8397); reasons this CLI does not know are dropped. */
|
|
64
|
+
quotaUnknownReason?: QuotaUnknownReason;
|
|
65
|
+
/** When the server last read this balance, success or failure (epoch ms). */
|
|
66
|
+
quotaReadAt?: number;
|
|
60
67
|
/**
|
|
61
68
|
* Whether the pool is holding this account out of rotation.
|
|
62
69
|
*
|
|
@@ -309,15 +316,21 @@ export interface CodexQuotaDto {
|
|
|
309
316
|
|
|
310
317
|
export interface ProviderQuotaWindowDto {
|
|
311
318
|
label: string;
|
|
319
|
+
displayLabel?: string;
|
|
312
320
|
percent: number;
|
|
313
321
|
resetAt?: number;
|
|
314
322
|
modelId?: string;
|
|
323
|
+
/** Share of the weekly limit a model family may use, when upstream reports it. */
|
|
324
|
+
weeklyAllowancePercent?: number;
|
|
315
325
|
}
|
|
316
326
|
|
|
317
327
|
export interface ProviderQuotaDto extends CodexQuotaDto {
|
|
318
328
|
fiveHourPercent?: number;
|
|
319
329
|
fiveHourResetAt?: number;
|
|
320
330
|
customWindows?: ProviderQuotaWindowDto[];
|
|
331
|
+
/** Readings upstream reports as not in effect; shown, never routed on. */
|
|
332
|
+
displayWindows?: ProviderQuotaWindowDto[];
|
|
333
|
+
unknownBudgetWindows?: { label: string; resetAt?: number }[];
|
|
321
334
|
updatedAt?: number;
|
|
322
335
|
}
|
|
323
336
|
|
|
@@ -342,6 +355,7 @@ interface CodexAccountDto {
|
|
|
342
355
|
needsReauth?: boolean;
|
|
343
356
|
selectionExcludedReason?: "plan_excluded";
|
|
344
357
|
selectionExcludedPlan?: string;
|
|
358
|
+
weeklyQuotaConflicts?: unknown;
|
|
345
359
|
health?: { reason?: string };
|
|
346
360
|
healthLabel?: unknown;
|
|
347
361
|
creditsAfterLimit?: unknown;
|
|
@@ -434,11 +448,17 @@ export async function fetchCodexRows(
|
|
|
434
448
|
...(includeQuota ? {
|
|
435
449
|
quota: projectQuota(a.quota),
|
|
436
450
|
quotaRefresh: projectCodexQuotaRefreshOutcome(a.quotaRefresh),
|
|
451
|
+
...weeklyQuotaConflictsField(a.weeklyQuotaConflicts),
|
|
437
452
|
} : {}),
|
|
438
453
|
}));
|
|
439
454
|
return { rows, activeId, autoSwitchThreshold, status: 200 };
|
|
440
455
|
}
|
|
441
456
|
|
|
457
|
+
function weeklyQuotaConflictsField(value: unknown): { weeklyQuotaConflicts?: WeeklyWindowConflict[] } {
|
|
458
|
+
const weeklyQuotaConflicts = parseWeeklyWindowConflicts(value);
|
|
459
|
+
return weeklyQuotaConflicts ? { weeklyQuotaConflicts } : {};
|
|
460
|
+
}
|
|
461
|
+
|
|
442
462
|
interface OAuthAccountDto {
|
|
443
463
|
id: string;
|
|
444
464
|
alias?: string;
|
|
@@ -458,6 +478,7 @@ interface OAuthAccountDto {
|
|
|
458
478
|
quota?: CodexQuotaDto | null;
|
|
459
479
|
quotaUnavailable?: boolean;
|
|
460
480
|
quotaFailure?: unknown;
|
|
481
|
+
quotaUnknownReason?: unknown;
|
|
461
482
|
}
|
|
462
483
|
|
|
463
484
|
function isKiroSkipReason(value: unknown): value is NonNullable<AccountRow["skipReason"]> {
|
|
@@ -508,6 +529,7 @@ async function fetchOAuthRows(
|
|
|
508
529
|
...(a.quotaUnavailable !== undefined ? { quotaUnavailable: a.quotaUnavailable } : {}),
|
|
509
530
|
...(a.quotaUnavailable === true && parseQuotaFailureCode(a.quotaFailure)
|
|
510
531
|
? { quotaFailure: parseQuotaFailureCode(a.quotaFailure) } : {}),
|
|
532
|
+
...(parseQuotaUnknownReason(a.quotaUnknownReason) ? { quotaUnknownReason: parseQuotaUnknownReason(a.quotaUnknownReason) } : {}),
|
|
511
533
|
}));
|
|
512
534
|
return { rows, activeId, status: 200 };
|
|
513
535
|
}
|
package/src/cli/account-auth.ts
CHANGED
|
@@ -45,10 +45,13 @@ const USAGE = `Usage:
|
|
|
45
45
|
ocx account reset-credits <account-id|main> [--consume --yes [--operation-id <uuid>]] [--json]
|
|
46
46
|
ocx account grok-reset-coupons [<account-id>] [--consume --yes [--token-id <token-id>] [--operation-id <uuid>]] [--json]
|
|
47
47
|
|
|
48
|
-
--device runs the
|
|
49
|
-
it when the proxy has no browser or nothing can reach localhost
|
|
50
|
-
headless or remote hub.
|
|
51
|
-
|
|
48
|
+
--device runs the device-code login instead of the browser callback (codex and
|
|
49
|
+
xai): use it when the proxy has no browser or nothing can reach its localhost
|
|
50
|
+
callback, such as a headless or remote hub. Both print a URL and a short code;
|
|
51
|
+
confirm that code in any browser and the login finishes here, so nothing is
|
|
52
|
+
pasted back and no local port is used. Each flow polls until its own deadline:
|
|
53
|
+
Codex's 15-minute device grant, and xAI's provider-issued expires_in bounded to
|
|
54
|
+
30 minutes and to one poll a second.
|
|
52
55
|
|
|
53
56
|
The redirect URL or authorization code is a short-lived credential. Pipe it in
|
|
54
57
|
rather than passing it as an argument, where it lands in shell history and is
|
|
@@ -162,12 +165,23 @@ const STDIN_SENTINEL = "-";
|
|
|
162
165
|
|
|
163
166
|
/** Providers whose ONLY login is already a device flow; --device is redundant, not wrong. */
|
|
164
167
|
const DEVICE_NATIVE_PROVIDERS = new Set(["kimi", "nous", "github-copilot"]);
|
|
165
|
-
|
|
168
|
+
/** Providers with a device grant besides their browser login; --device selects it. */
|
|
169
|
+
const DEVICE_OPT_IN_PROVIDERS = new Set(["xai"]);
|
|
170
|
+
/**
|
|
171
|
+
* The native Kiro handoff, rendered for a terminal.
|
|
172
|
+
*
|
|
173
|
+
* Every field here is provider- or proxy-supplied, so they go through the same sanitizer as the
|
|
174
|
+
* OAuth CLI's instructions rather than a local strip regex: a narrower strip both left characters
|
|
175
|
+
* reachable (the Arabic letter mark, the line separators, the deprecated `U+206A`–`U+206F` bidi
|
|
176
|
+
* controls) and deleted ones that must survive (ZWNJ/ZWJ, which shape Persian and emoji). Escaping
|
|
177
|
+
* keeps the value readable in a pasted report and leaves the layout below intact, because a
|
|
178
|
+
* newline inside a field is escaped rather than allowed to add a line.
|
|
179
|
+
*/
|
|
166
180
|
export function formatKiroDeviceInstructions(start: { verificationUriComplete?: string; verificationUri?: string; userCode?: string; flowId?: string }): string {
|
|
167
181
|
return [
|
|
168
|
-
|
|
169
|
-
start.userCode ? `User code: ${
|
|
170
|
-
start.flowId ? `Flow: ${
|
|
182
|
+
terminalSafeText(start.verificationUriComplete ?? start.verificationUri ?? ""),
|
|
183
|
+
start.userCode ? `User code: ${terminalSafeText(start.userCode)}` : "",
|
|
184
|
+
start.flowId ? `Flow: ${terminalSafeText(start.flowId)}` : "",
|
|
171
185
|
].filter(Boolean).join("\n");
|
|
172
186
|
}
|
|
173
187
|
|
|
@@ -225,9 +239,14 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
225
239
|
// kimi, nous, and github-copilot are already device flows, so --device is a
|
|
226
240
|
// true statement about them and is accepted as a no-op rather than an error.
|
|
227
241
|
// Anything else has no device grant at all and must fail loudly.
|
|
228
|
-
if (device && !CODEX_NAMES.has(provider) && !DEVICE_NATIVE_PROVIDERS.has(provider)) {
|
|
242
|
+
if (device && !CODEX_NAMES.has(provider) && !DEVICE_NATIVE_PROVIDERS.has(provider) && !DEVICE_OPT_IN_PROVIDERS.has(provider)) {
|
|
229
243
|
throw new CliUsageError("--device is not supported for this provider", USAGE);
|
|
230
244
|
}
|
|
245
|
+
// A device grant never asks for a pasted code: the CLI would have spent the caller's stdin, and
|
|
246
|
+
// the proxy would have accepted the paste into a flow with nothing to do with it (the device flow
|
|
247
|
+
// is not a code flow, so `submitLoginCode` stashes it and the login still waits for approval).
|
|
248
|
+
if (device && suppliedCode) throw new CliUsageError("--code cannot be combined with --device", USAGE);
|
|
249
|
+
if (provider === "xai" && device && wantsJson && !noWait) throw new CliUsageError("xAI device login with --json requires --no-wait; use the returned handoff to complete authorization", USAGE);
|
|
231
250
|
if (addAccount !== undefined && (reauth || CODEX_NAMES.has(provider))) throw new CliUsageError("--add-account is only valid for fresh provider OAuth login", USAGE);
|
|
232
251
|
if (openBrowser !== undefined && (device || DEVICE_NATIVE_PROVIDERS.has(provider))) throw new CliUsageError("--open-browser is not supported for device login", USAGE);
|
|
233
252
|
if (!CODEX_NAMES.has(provider) && id && !reauth) throw new CliUsageError("--id is only valid with --reauth for provider OAuth accounts", USAGE);
|
|
@@ -274,11 +293,11 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
274
293
|
// One atomic pre-poll block, flushed synchronously so a piped parent
|
|
275
294
|
// reads the URL before the polling window starts (#1007).
|
|
276
295
|
writeLoginInstructions([
|
|
277
|
-
start.url ? `Open this URL to sign in:\n${start.url}` : "",
|
|
278
|
-
start.deviceCode ? `Device code: ${start.deviceCode}` : "",
|
|
296
|
+
start.url ? `Open this URL to sign in:\n${terminalSafeText(start.url)}` : "",
|
|
297
|
+
start.deviceCode ? `Device code: ${terminalSafeText(start.deviceCode)}` : "",
|
|
279
298
|
start.instructions ?? "",
|
|
280
299
|
start.browserLaunch === "failed" ? BROWSER_LAUNCH_FAILED_HINT : "",
|
|
281
|
-
start.flowId ? `Flow: ${start.flowId}` : "",
|
|
300
|
+
start.flowId ? `Flow: ${terminalSafeText(start.flowId)}` : "",
|
|
282
301
|
]);
|
|
283
302
|
}
|
|
284
303
|
if (code && !start.flowId) throw new Error("Code submission requires a returned flow id");
|
|
@@ -327,13 +346,24 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
327
346
|
|
|
328
347
|
const start = publicLoginStart(await runtimeRequest<unknown>("/api/oauth/login", {
|
|
329
348
|
method: "POST", redirect: "error",
|
|
330
|
-
body: JSON.stringify({ provider, addAccount: addAccount ?? !reauth, ...(openBrowser === undefined ? {} : { openBrowser }), ...(reauth && id ? { accountId: id, reauth: true } : {}) }),
|
|
349
|
+
body: JSON.stringify({ provider, addAccount: addAccount ?? !reauth, ...(device && DEVICE_OPT_IN_PROVIDERS.has(provider) ? { device: true } : {}), ...(openBrowser === undefined ? {} : { openBrowser }), ...(reauth && id ? { accountId: id, reauth: true } : {}) }),
|
|
331
350
|
}, pinned));
|
|
351
|
+
const xaiDevice = provider === "xai" && device;
|
|
352
|
+
if (xaiDevice && (!start.flowId?.trim() || !start.url?.trim() || !start.deviceCode?.trim())) {
|
|
353
|
+
let cleanupFailed = false;
|
|
354
|
+
try {
|
|
355
|
+
await runtimeRequest("/api/oauth/login/cancel", {
|
|
356
|
+
method: "POST", redirect: "error",
|
|
357
|
+
body: JSON.stringify({ provider, ...(start.flowId?.trim() ? { flowId: start.flowId } : {}) }),
|
|
358
|
+
}, pinned);
|
|
359
|
+
} catch { cleanupFailed = true; }
|
|
360
|
+
throw new CliUsageError(`Running proxy does not support xAI device login; restart or upgrade it.${cleanupFailed ? " Could not cancel the unintended login flow." : ""}`);
|
|
361
|
+
}
|
|
332
362
|
if (!wantsJson) {
|
|
333
363
|
writeLoginInstructions([
|
|
334
|
-
start.url ? `Open this URL to sign in:\n${start.url}` : "",
|
|
335
|
-
start.instructions ?? "",
|
|
336
|
-
start.deviceCode ? `Device code: ${start.deviceCode}` : "",
|
|
364
|
+
start.url ? `Open this URL to sign in:\n${terminalSafeText(start.url)}` : "",
|
|
365
|
+
provider === "xai" && device ? terminalSafeText(start.instructions ?? "") : start.instructions ?? "",
|
|
366
|
+
start.deviceCode ? `Device code: ${terminalSafeText(start.deviceCode)}` : "",
|
|
337
367
|
]);
|
|
338
368
|
}
|
|
339
369
|
if (code) {
|
|
@@ -347,13 +377,16 @@ async function login(argv: string[], deps: RuntimeApiDeps): Promise<number | voi
|
|
|
347
377
|
printData({ ...start, modelSelection: modelSelectionNextSteps(provider, true) }, wantsJson, modelSelectionGuidance(provider, true));
|
|
348
378
|
return;
|
|
349
379
|
}
|
|
350
|
-
|
|
380
|
+
// A device grant waits on a person at another machine: outlast xAI's 30-minute code.
|
|
381
|
+
for (let attempt = 0; attempt < (device ? 930 : 100); attempt++) {
|
|
351
382
|
await Bun.sleep(2_000);
|
|
352
|
-
const raw = await runtimeRequest<Record<string, unknown>>(`/api/oauth/status?provider=${encodeURIComponent(provider)}`, { redirect: "error" }, pinned);
|
|
383
|
+
const raw = await runtimeRequest<Record<string, unknown>>(`/api/oauth/status?provider=${encodeURIComponent(provider)}${xaiDevice ? `&flowId=${encodeURIComponent(start.flowId!)}` : ""}`, { redirect: "error" }, pinned);
|
|
353
384
|
if (loginObject(raw).error) throw new Error("Provider login failed");
|
|
385
|
+
if (xaiDevice && (raw.flowId !== start.flowId || raw.status === "idle")) throw new Error("Device login flow is unavailable");
|
|
354
386
|
const state = publicLoginStatus(raw);
|
|
355
|
-
if (state.done === true && state.loggedIn !== true) throw new Error("Provider login ended without authentication");
|
|
356
|
-
|
|
387
|
+
if (state.done === true && state.loggedIn !== true && !(xaiDevice && raw.status === "complete")) throw new Error("Provider login ended without authentication");
|
|
388
|
+
// A device login adds an account, so an already signed-in provider is not done until its flow is.
|
|
389
|
+
if ((xaiDevice && raw.status === "complete") || (state.loggedIn === true && (!device || (state.done === true && !xaiDevice)))) {
|
|
357
390
|
printData({ ...state, modelSelection: modelSelectionNextSteps(provider) }, wantsJson, [`Logged in to ${provider}.`, ...modelSelectionGuidance(provider)]);
|
|
358
391
|
return;
|
|
359
392
|
}
|
|
@@ -407,7 +440,7 @@ async function cancel(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
|
407
440
|
}
|
|
408
441
|
const result = await runtimeRequest(codex ? "/api/codex-auth/login/cancel" : "/api/oauth/login/cancel", {
|
|
409
442
|
method: "POST",
|
|
410
|
-
body: JSON.stringify(codex ? { flowId } : { provider, ...(provider === "kiro" && flowId ? { flowId } : {}) }),
|
|
443
|
+
body: JSON.stringify(codex ? { flowId } : { provider, ...((provider === "kiro" || provider === "xai") && flowId ? { flowId } : {}) }),
|
|
411
444
|
}, deps);
|
|
412
445
|
printData(result, wantsJson, [`Cancelled ${provider} login.`]);
|
|
413
446
|
}
|