@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -21,15 +21,16 @@
|
|
|
21
21
|
*/
|
|
22
22
|
import { homedir } from "node:os";
|
|
23
23
|
import { gentleShellPaths } from "./gentle-shell-path";
|
|
24
|
-
import { absoluteClientPath, ClientPathError, piAgentDir } from "./client-path";
|
|
24
|
+
import { absoluteClientPath, ClientPathError, isAbsoluteClientPath, piAgentDir } from "./client-path";
|
|
25
25
|
export { ClientPathError, piAgentDir } from "./client-path";
|
|
26
26
|
import { existsSync, lstatSync, readFileSync, realpathSync, statSync } from "node:fs";
|
|
27
|
-
import { basename, dirname,
|
|
27
|
+
import { basename, dirname, join, resolve } from "node:path";
|
|
28
28
|
import { shouldInjectApiAuthHeader, standaloneCodexRoutingTarget } from "../codex/inject";
|
|
29
29
|
import { FORMAT_MEDIA_TYPE, serializeDocument, type ConfigFormat } from "../integrations/serialize";
|
|
30
30
|
import { fileIO } from "../integrations/config-io";
|
|
31
31
|
import { canonicalizeReasoningEfforts } from "../reasoning-effort";
|
|
32
32
|
import { expandFastExportModels } from "./config-export/fast-models";
|
|
33
|
+
import { namedExportContext } from "./config-export/alias-selectors";
|
|
33
34
|
import { probeHostname } from "../server/proxy-liveness";
|
|
34
35
|
import type { OcxConfig } from "../types";
|
|
35
36
|
|
|
@@ -88,6 +89,8 @@ export { buildCommandCodeClientConfig, summarizeCommandCode, buildCommandCodeCon
|
|
|
88
89
|
import { agentConfigPath, buildQoderCnClientConfig, buildQoderCnContribution, buildWorkbuddyClientConfig, buildWorkbuddyContribution, summarizeWorkbuddy, workbuddyApplyRefusal } from "./config-export/agent-clients";
|
|
89
90
|
import { buildQoderClientConfig, summarizeQoder, buildQoderContribution, qoderConfigPath } from "./config-export/qoder";
|
|
90
91
|
export { buildQoderClientConfig, qoderConfigPath, qoderHomeDir, type QoderGeneratedConfig } from "./config-export/qoder";
|
|
92
|
+
import { buildT3CodeClientConfig, summarizeT3Code, buildT3CodeContribution, t3codeApplyRefusal, t3codeConfigPath } from "./config-export/t3code";
|
|
93
|
+
export { buildT3CodeClientConfig, t3codeConfigPath, t3codeHomeDir, type T3CodeGeneratedConfig } from "./config-export/t3code";
|
|
91
94
|
|
|
92
95
|
|
|
93
96
|
|
|
@@ -133,6 +136,18 @@ export interface OpencodeProviderConnection {
|
|
|
133
136
|
baseURL: string;
|
|
134
137
|
apiKey?: string;
|
|
135
138
|
headers?: Record<string, string>;
|
|
139
|
+
/**
|
|
140
|
+
* opencode's own client-side wait for the proxy's first response header, in ms, or `false`
|
|
141
|
+
* to disable it. Emitted only when `opencodeClientExport.headerTimeoutMs` is set. opencode's
|
|
142
|
+
* default is 300000 (5 min); a slow local model's prompt prefill behind a non-streaming turn
|
|
143
|
+
* can exceed it, so the proxy sends no bytes and opencode's header wait fires ("Timed out
|
|
144
|
+
* waiting for response headers").
|
|
145
|
+
*/
|
|
146
|
+
headerTimeout?: number | false;
|
|
147
|
+
/** opencode's wait between streamed response chunks (ms) or `false`; emitted from `chunkTimeoutMs`. */
|
|
148
|
+
chunkTimeout?: number | false;
|
|
149
|
+
/** opencode's whole-request bound (ms) or `false`; emitted from `timeoutMs`. opencode has no default. */
|
|
150
|
+
timeout?: number | false;
|
|
136
151
|
}
|
|
137
152
|
|
|
138
153
|
/** opencode V1 provider block: `npm` + `options`. */
|
|
@@ -395,10 +410,10 @@ export function dshHomeDir(env: OpencodeLaunchEnv = process.env, home: string =
|
|
|
395
410
|
if (raw === undefined || raw.trim().length === 0) return join(home, ".dsh");
|
|
396
411
|
if (raw === "~") return home;
|
|
397
412
|
if (raw.startsWith("~/") || raw.startsWith("~\\")) return join(home, raw.slice(2));
|
|
398
|
-
if (!
|
|
413
|
+
if (!isAbsoluteClientPath(raw)) {
|
|
399
414
|
throw new ClientPathError(
|
|
400
415
|
`DSH_HOME must be an absolute path or start with ~; "${raw}" depends on the working directory, `
|
|
401
|
-
+ "so opencodex and DSH would disagree about which settings file it names.",
|
|
416
|
+
+ "so opencodex and DSH would disagree about which settings file it names. Use a drive letter or UNC share on Windows.",
|
|
402
417
|
);
|
|
403
418
|
}
|
|
404
419
|
// DSH calls node:path.resolve after tilde expansion. Preserve the raw value
|
|
@@ -470,7 +485,7 @@ export function zcodeHomeDir(env: OpencodeLaunchEnv = process.env, home: string
|
|
|
470
485
|
if (base === undefined) return join(home, ".zcode");
|
|
471
486
|
// Match the native path's value, without cwd or tilde expansion. The native
|
|
472
487
|
// ZCODE_DATA_BASE_DIR selector is not an alias for our ZCODE_DATA_DIR.
|
|
473
|
-
if (typeof base !== "string" || !
|
|
488
|
+
if (typeof base !== "string" || !isAbsoluteClientPath(base) || base.includes("\0")) throw unknown();
|
|
474
489
|
return join(base, ".zcode");
|
|
475
490
|
}
|
|
476
491
|
|
|
@@ -492,7 +507,7 @@ export function zcodeConfigPath(env: OpencodeLaunchEnv = process.env, home: stri
|
|
|
492
507
|
export function commandCodeUserHome(env: OpencodeLaunchEnv = process.env, home: string = homedir(), platform: NodeJS.Platform = process.platform): string {
|
|
493
508
|
if (platform !== "win32" || home !== homedir()) return home;
|
|
494
509
|
const value = env.HOME ?? env.USERPROFILE;
|
|
495
|
-
return typeof value === "string" && value.trim() &&
|
|
510
|
+
return typeof value === "string" && value.trim() && isAbsoluteClientPath(value, platform) ? value : home;
|
|
496
511
|
}
|
|
497
512
|
|
|
498
513
|
/**
|
|
@@ -710,6 +725,17 @@ export function raycastConfigPath(env: OpencodeLaunchEnv = process.env, home: st
|
|
|
710
725
|
/** Endpoint plus admission, identical for the V1 `options` and V2 `settings` field. */
|
|
711
726
|
function opencodeProviderConnection(baseURL: string, config: OcxConfig): OpencodeProviderConnection {
|
|
712
727
|
const options: OpencodeProviderConnection = { baseURL };
|
|
728
|
+
// Opt-in opencode-side timeout overrides. Omitted by default so opencode keeps its native
|
|
729
|
+
// header/chunk waits for every upstream routed through the proxy (current V2 defaults the
|
|
730
|
+
// header wait to 5 min and the longer chunk wait to 15 min, but this repo pins no opencode
|
|
731
|
+
// release); a user fronting a slow local model sets these to extend or disable the wait that
|
|
732
|
+
// otherwise cuts a long prefill.
|
|
733
|
+
const timeouts = config.opencodeClientExport;
|
|
734
|
+
if (timeouts) {
|
|
735
|
+
if (timeouts.headerTimeoutMs !== undefined) options.headerTimeout = timeouts.headerTimeoutMs;
|
|
736
|
+
if (timeouts.chunkTimeoutMs !== undefined) options.chunkTimeout = timeouts.chunkTimeoutMs;
|
|
737
|
+
if (timeouts.timeoutMs !== undefined) options.timeout = timeouts.timeoutMs;
|
|
738
|
+
}
|
|
713
739
|
// Non-loopback binds accept proxy admission only via x-opencodex-api-key so Authorization
|
|
714
740
|
// stays free for Codex Direct upstream credentials when applicable.
|
|
715
741
|
if (shouldInjectApiAuthHeader(config)) {
|
|
@@ -1615,11 +1641,8 @@ export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
|
|
|
1615
1641
|
loopbackOnly: true,
|
|
1616
1642
|
},
|
|
1617
1643
|
/*
|
|
1618
|
-
*
|
|
1619
|
-
*
|
|
1620
|
-
* insertion order IS the public order, and three tests assert it exactly. The
|
|
1621
|
-
* existing sequence is landing order — `pi` second, `prime` eleventh — not a
|
|
1622
|
-
* grouping, so appending is the edit that leaves the other thirteen alone.
|
|
1644
|
+
* The shared client roster preserves public landing order, not family grouping.
|
|
1645
|
+
* Keep this registry in the same order so its iteration agrees with the roster.
|
|
1623
1646
|
*/
|
|
1624
1647
|
omo: {
|
|
1625
1648
|
id: "omo",
|
|
@@ -1697,9 +1720,22 @@ export const EXPORT_CLIENTS: Record<ExportClientId, ExportClientSpec> = {
|
|
|
1697
1720
|
},
|
|
1698
1721
|
loopbackOnly: true,
|
|
1699
1722
|
},
|
|
1723
|
+
t3code: {
|
|
1724
|
+
id: "t3code",
|
|
1725
|
+
filename: "t3code-settings.json",
|
|
1726
|
+
destination: env => t3codeConfigPath(env),
|
|
1727
|
+
apiKeyEnv: "",
|
|
1728
|
+
exportHint: "Merge providerInstances.opencodex into T3 Code's settings.json; it reloads the file. Loopback needs no key.",
|
|
1729
|
+
build: buildT3CodeClientConfig,
|
|
1730
|
+
format: "json",
|
|
1731
|
+
summarize: summarizeT3Code,
|
|
1732
|
+
validateApply: t3codeApplyRefusal,
|
|
1733
|
+
buildContribution: buildT3CodeContribution,
|
|
1734
|
+
loopbackOnly: true,
|
|
1735
|
+
},
|
|
1700
1736
|
};
|
|
1701
1737
|
|
|
1702
|
-
export
|
|
1738
|
+
export { EXPORT_CLIENT_IDS } from "./client-ids";
|
|
1703
1739
|
|
|
1704
1740
|
export function isExportClientId(value: string): value is ExportClientId {
|
|
1705
1741
|
return Object.prototype.hasOwnProperty.call(EXPORT_CLIENTS, value);
|
|
@@ -1707,7 +1743,7 @@ export function isExportClientId(value: string): value is ExportClientId {
|
|
|
1707
1743
|
|
|
1708
1744
|
/** Single entry point every export surface calls. */
|
|
1709
1745
|
export function buildClientConfig(client: ExportClientId, ctx: ExportContext): unknown {
|
|
1710
|
-
return EXPORT_CLIENTS[client].build(ctx);
|
|
1746
|
+
return EXPORT_CLIENTS[client].build(namedExportContext(client, ctx));
|
|
1711
1747
|
}
|
|
1712
1748
|
|
|
1713
1749
|
/**
|
|
@@ -1721,7 +1757,7 @@ export function buildClientConfigText(
|
|
|
1721
1757
|
ctx: ExportContext,
|
|
1722
1758
|
): { document: unknown; text: string; format: ConfigFormat; mediaType: string } {
|
|
1723
1759
|
const spec = EXPORT_CLIENTS[client];
|
|
1724
|
-
const document = spec.build(ctx);
|
|
1760
|
+
const document = spec.build(namedExportContext(client, ctx));
|
|
1725
1761
|
return {
|
|
1726
1762
|
document,
|
|
1727
1763
|
text: serializeDocument(document, spec.format),
|
|
@@ -1732,5 +1768,5 @@ export function buildClientConfigText(
|
|
|
1732
1768
|
|
|
1733
1769
|
/** The fragments opencodex owns in a client's config (writer-side). */
|
|
1734
1770
|
export function buildClientContribution(client: ExportClientId, ctx: ExportContext): ManagedContribution {
|
|
1735
|
-
return EXPORT_CLIENTS[client].buildContribution(ctx);
|
|
1771
|
+
return EXPORT_CLIENTS[client].buildContribution(namedExportContext(client, ctx));
|
|
1736
1772
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { realpathSync, statSync } from "node:fs";
|
|
2
2
|
import { homedir } from "node:os";
|
|
3
|
-
import { basename, dirname,
|
|
3
|
+
import { basename, dirname, join, resolve } from "node:path";
|
|
4
4
|
import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
|
|
5
|
-
import { ClientPathError, piAgentDir } from "./client-path";
|
|
5
|
+
import { ClientPathError, isAbsoluteClientPath, piAgentDir } from "./client-path";
|
|
6
6
|
|
|
7
7
|
interface BootstrapIO {
|
|
8
8
|
readText(path: string): { kind: "text"; text: string } | { kind: "missing" } | { kind: "failed" };
|
|
@@ -10,7 +10,7 @@ interface BootstrapIO {
|
|
|
10
10
|
|
|
11
11
|
function absolute(raw: string, label: string): string {
|
|
12
12
|
// Unlike Pi's resolver, the Shell launcher does not expand a literal '~'.
|
|
13
|
-
if (!
|
|
13
|
+
if (!isAbsoluteClientPath(raw)) throw new ClientPathError(`${label} must be an absolute path (a drive letter or UNC share on Windows); the proxy cannot infer the launcher's working directory or current drive.`);
|
|
14
14
|
return resolve(raw);
|
|
15
15
|
}
|
|
16
16
|
|
|
@@ -12,7 +12,7 @@ import { removeCodexAccountCredential } from "./account-store";
|
|
|
12
12
|
import { clearAccountNeedsReauth } from "./account-runtime-state";
|
|
13
13
|
import { readMainAuth } from "./auth-collision";
|
|
14
14
|
import { MAIN_CODEX_ACCOUNT_ID, setMainAccountPlan } from "./main-account";
|
|
15
|
-
import { clearAccountQuota } from "./quota";
|
|
15
|
+
import { clearAccountQuota, discardMismatchedMainQuota } from "./quota";
|
|
16
16
|
import { forgetManualPreference } from "./routing/active-account";
|
|
17
17
|
import { deleteAllHealthForAccount } from "./routing/health-store";
|
|
18
18
|
import { forgetCodexFailureWindow } from "./routing/failure-window";
|
|
@@ -20,7 +20,7 @@ import { clearThreadAccountMapForAccount } from "./routing/thread-affinity";
|
|
|
20
20
|
|
|
21
21
|
import { clearCodexPoolRefreshFailure } from "./pool-refresh-backoff";
|
|
22
22
|
import { invalidateCodexWebSocketsForAccount } from "./websocket-registry";
|
|
23
|
-
import { clearMainAccountCredentialPresence, clearMainAccountInfoCache, observeMainQuotaCredential, observeMainQuotaIdentity } from "./main-account-cache";
|
|
23
|
+
import { clearMainAccountCredentialPresence, clearMainAccountInfoCache, observeMainQuotaCredential, observeMainQuotaIdentity, type MainQuotaWriter } from "./main-account-cache";
|
|
24
24
|
import { extractAccountId, extractAccountIdClaims } from "../oauth/chatgpt";
|
|
25
25
|
import { forgetCodexAccountPause } from "./account-pause";
|
|
26
26
|
import { forgetCodexAccountCreditUse } from "./account-credit-use";
|
|
@@ -73,6 +73,28 @@ function purgeMainCodexAccountRuntimeState(): void {
|
|
|
73
73
|
invalidateCodexWebSocketsForAccount(MAIN_CODEX_ACCOUNT_ID);
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
+
function observeMainCodexAccountIdentity(accountId: string): boolean {
|
|
77
|
+
const previousAccountId = observedMainChatgptAccountId;
|
|
78
|
+
observedMainChatgptAccountId = accountId;
|
|
79
|
+
const changed = previousAccountId !== undefined && previousAccountId !== accountId;
|
|
80
|
+
if (changed) purgeMainCodexAccountRuntimeState();
|
|
81
|
+
observeMainQuotaIdentity(accountId);
|
|
82
|
+
discardMismatchedMainQuota();
|
|
83
|
+
return changed;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/** Only the pinned-home, exclusively claimed Codex RPC may supply this credential. */
|
|
87
|
+
export function observeCodexOwnedMainAccountCredential(accessToken: string): MainQuotaWriter | undefined {
|
|
88
|
+
const identity = extractAccountIdClaims(accessToken);
|
|
89
|
+
// An opaque or conflicting answer cannot retire a previously verified identity or its policy.
|
|
90
|
+
if (!identity.accountId || identity.conflict) return undefined;
|
|
91
|
+
observeMainCodexAccountIdentity(identity.accountId);
|
|
92
|
+
const tokens = { access_token: accessToken, account_id: identity.accountId };
|
|
93
|
+
observeSignedInCodexIdentity(tokens);
|
|
94
|
+
observeMainCodexCollisionIdentity(tokens);
|
|
95
|
+
return observeMainQuotaCredential(accessToken, identity.accountId);
|
|
96
|
+
}
|
|
97
|
+
|
|
76
98
|
/**
|
|
77
99
|
* The main Codex login is stored under the stable `__main__` alias, while
|
|
78
100
|
* `~/.codex/auth.json` can be replaced with credentials for another physical
|
|
@@ -89,18 +111,9 @@ export function reconcileMainCodexAccountRuntimeState(): boolean {
|
|
|
89
111
|
// A missing/malformed auth.json is an unknown identity, not a confirmed account switch. Keep the
|
|
90
112
|
// prior observation and its safety state until a real account id can be read again.
|
|
91
113
|
if (currentAccountId === null) return false;
|
|
92
|
-
const
|
|
93
|
-
observedMainChatgptAccountId = currentAccountId;
|
|
94
|
-
if (previousAccountId === undefined || previousAccountId === currentAccountId) {
|
|
95
|
-
observeMainQuotaIdentity(currentAccountId);
|
|
96
|
-
if (read.status === "ok") observeMainCodexCollisionIdentity(read.tokens);
|
|
97
|
-
return false;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
purgeMainCodexAccountRuntimeState();
|
|
101
|
-
observeMainQuotaIdentity(currentAccountId);
|
|
114
|
+
const changed = observeMainCodexAccountIdentity(currentAccountId);
|
|
102
115
|
if (read.status === "ok") observeMainCodexCollisionIdentity(read.tokens);
|
|
103
|
-
return
|
|
116
|
+
return changed;
|
|
104
117
|
}
|
|
105
118
|
|
|
106
119
|
/**
|
|
@@ -134,6 +147,7 @@ export function initializeMainAccountPolicyBinding(authPath: string): boolean {
|
|
|
134
147
|
if (previousAccountId !== undefined && previousAccountId !== accountId) purgeMainCodexAccountRuntimeState();
|
|
135
148
|
observeSignedInCodexIdentity(tokens);
|
|
136
149
|
observeMainQuotaIdentity(accountId);
|
|
150
|
+
discardMismatchedMainQuota();
|
|
137
151
|
observeMainCodexCollisionIdentity(tokens);
|
|
138
152
|
return observeMainQuotaCredential(tokens.access_token, accountId) !== undefined;
|
|
139
153
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { publishCredentialSync } from "../local-credentials/generation";
|
|
1
2
|
import { classifyChatgptRefreshFailure, noteChatgptRefreshFailure, type ChatgptRefreshDiagnosticCode } from "./chatgpt-refresh-failure";
|
|
2
3
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
3
4
|
export { classifyChatgptRefreshFailure } from "./chatgpt-refresh-failure";
|
|
@@ -58,6 +59,25 @@ function isObject(value: unknown): value is Record<string, unknown> {
|
|
|
58
59
|
return !!value && typeof value === "object" && !Array.isArray(value);
|
|
59
60
|
}
|
|
60
61
|
|
|
62
|
+
export function inspectLocalCodexCredentialSlots(raw: Record<string, unknown> | null): { count: number; sourcePaths: string[] } {
|
|
63
|
+
if (raw === null) return { count: 0, sourcePaths: [] };
|
|
64
|
+
let count = 0;
|
|
65
|
+
const sourcePaths: string[] = [];
|
|
66
|
+
for (const value of Object.values(raw)) {
|
|
67
|
+
let credential: CodexAccountCredentials | undefined;
|
|
68
|
+
if (isCredentialRecord(value)) {
|
|
69
|
+
credential = value.credential;
|
|
70
|
+
if (!credential && value.deletedAt === undefined) throw new Error("Unrecognized Codex credential record");
|
|
71
|
+
} else if (isCredential(value)) credential = value;
|
|
72
|
+
else throw new Error("Invalid Codex credential record");
|
|
73
|
+
if (credential) {
|
|
74
|
+
count += 1;
|
|
75
|
+
if (credential.sourceAuthPath) sourcePaths.push(credential.sourceAuthPath);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return { count, sourcePaths };
|
|
79
|
+
}
|
|
80
|
+
|
|
61
81
|
function isCredential(value: unknown): value is CodexAccountCredentials {
|
|
62
82
|
const hasNoSource = isObject(value)
|
|
63
83
|
&& value.sourceAuthPath === undefined
|
|
@@ -176,7 +196,7 @@ function persist(store: CodexAccountStore): void {
|
|
|
176
196
|
const dir = getConfigDir();
|
|
177
197
|
assertNotRealHomeUnderTest(dir);
|
|
178
198
|
if (!existsSync(dir)) mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
179
|
-
atomicWriteFile(codexAccountsPath(), JSON.stringify(store, null, 2) + "\n");
|
|
199
|
+
publishCredentialSync(() => atomicWriteFile(codexAccountsPath(), JSON.stringify(store, null, 2) + "\n"));
|
|
180
200
|
notifyCodexStoreLoaded(store);
|
|
181
201
|
}
|
|
182
202
|
|
|
@@ -1377,12 +1397,15 @@ async function resolveCodexToken(
|
|
|
1377
1397
|
}
|
|
1378
1398
|
const res = await fetch(CHATGPT_TOKEN_URL, {
|
|
1379
1399
|
method: "POST",
|
|
1380
|
-
headers: {
|
|
1381
|
-
|
|
1382
|
-
|
|
1400
|
+
headers: {
|
|
1401
|
+
"Content-Type": "application/json",
|
|
1402
|
+
Accept: "application/json",
|
|
1403
|
+
},
|
|
1404
|
+
body: JSON.stringify({
|
|
1383
1405
|
client_id: CHATGPT_CLIENT_ID,
|
|
1406
|
+
grant_type: "refresh_token",
|
|
1384
1407
|
refresh_token: lockedCred.refreshToken,
|
|
1385
|
-
})
|
|
1408
|
+
}),
|
|
1386
1409
|
signal,
|
|
1387
1410
|
});
|
|
1388
1411
|
if (!res.ok) {
|
|
@@ -1393,7 +1416,10 @@ async function resolveCodexToken(
|
|
|
1393
1416
|
noteChatgptRefreshFailure("pool", res.status, failure, poolAccountLogLabel(id));
|
|
1394
1417
|
throw new TokenRefreshError(reason, `Codex token refresh failed (${reason}); reauthenticate the account.`, res.status, failure.code);
|
|
1395
1418
|
}
|
|
1396
|
-
const data = (await res.json()) as { access_token
|
|
1419
|
+
const data = (await res.json()) as { access_token?: unknown; refresh_token?: string; expires_in?: unknown };
|
|
1420
|
+
if (!data || typeof data !== "object" || typeof data.access_token !== "string" || !data.access_token.trim()) {
|
|
1421
|
+
throw new Error("Codex token refresh response missing access_token");
|
|
1422
|
+
}
|
|
1397
1423
|
// Guard against a missing/non-finite/negative expires_in (malformed upstream
|
|
1398
1424
|
// response): a NaN expiry would never compare as expired, and a negative
|
|
1399
1425
|
// duration would stamp an already-past expiry — both block refresh semantics.
|
|
@@ -395,7 +395,6 @@ function listUnixProcSnapshots(uid: number | undefined, requireComplete = true):
|
|
|
395
395
|
}
|
|
396
396
|
|
|
397
397
|
function listDarwinSnapshots(uid: number | undefined): ProcessSnapshot[] {
|
|
398
|
-
const out: ProcessSnapshot[] = [];
|
|
399
398
|
const commandOutput = uid !== undefined
|
|
400
399
|
? execFileSync("/bin/ps", ["-u", String(uid), "-o", "pid=,command="], {
|
|
401
400
|
encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"], timeout: 5_000,
|
|
@@ -410,6 +409,28 @@ function listDarwinSnapshots(uid: number | undefined): ProcessSnapshot[] {
|
|
|
410
409
|
: execFileSync("/bin/ps", ["-axo", "pid=,comm="], {
|
|
411
410
|
encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"], timeout: 5_000,
|
|
412
411
|
});
|
|
412
|
+
return parseDarwinSnapshotOutputs(commandOutput, executableOutput, uid);
|
|
413
|
+
}
|
|
414
|
+
|
|
415
|
+
/**
|
|
416
|
+
* Request-path twin of {@link listDarwinSnapshots}: the two `ps` children run off the
|
|
417
|
+
* event loop, so a stalled process-table read cannot park the proxy. Failure still
|
|
418
|
+
* propagates as a rejected read, matching the synchronous contract.
|
|
419
|
+
*/
|
|
420
|
+
async function listDarwinSnapshotsAsync(uid: number | undefined): Promise<ProcessSnapshot[]> {
|
|
421
|
+
const [commandOutput, executableOutput] = await Promise.all([
|
|
422
|
+
uid !== undefined
|
|
423
|
+
? execFileTextAsync("/bin/ps", ["-u", String(uid), "-o", "pid=,command="], 5_000)
|
|
424
|
+
: execFileTextAsync("/bin/ps", ["-axo", "pid=,uid=,command="], 5_000),
|
|
425
|
+
uid !== undefined
|
|
426
|
+
? execFileTextAsync("/bin/ps", ["-u", String(uid), "-o", "pid=,comm="], 5_000)
|
|
427
|
+
: execFileTextAsync("/bin/ps", ["-axo", "pid=,comm="], 5_000),
|
|
428
|
+
]);
|
|
429
|
+
return parseDarwinSnapshotOutputs(commandOutput, executableOutput, uid);
|
|
430
|
+
}
|
|
431
|
+
|
|
432
|
+
function parseDarwinSnapshotOutputs(commandOutput: string, executableOutput: string, uid: number | undefined): ProcessSnapshot[] {
|
|
433
|
+
const out: ProcessSnapshot[] = [];
|
|
413
434
|
const executableByPid = new Map<number, string>();
|
|
414
435
|
for (const raw of executableOutput.split(/\r?\n/)) {
|
|
415
436
|
const match = /^\s*(\d+)\s+(.+)$/.exec(raw);
|
|
@@ -552,6 +573,22 @@ function defaultListSnapshots(platform: NodeJS.Platform, getuid: () => number |
|
|
|
552
573
|
return listUnixProcSnapshots(getuid(), requireComplete);
|
|
553
574
|
}
|
|
554
575
|
|
|
576
|
+
/**
|
|
577
|
+
* Request-path twin of {@link defaultListSnapshots}: the child-process enumerations
|
|
578
|
+
* (Windows PowerShell, darwin ps) wait off the event loop. Linux /proc reads are
|
|
579
|
+
* bounded filesystem I/O rather than a subprocess deadline, so they stay synchronous
|
|
580
|
+
* underneath without reintroducing a multi-second park.
|
|
581
|
+
*/
|
|
582
|
+
async function defaultListSnapshotsAsync(
|
|
583
|
+
platform: NodeJS.Platform,
|
|
584
|
+
getuid: () => number | undefined,
|
|
585
|
+
requireComplete = true,
|
|
586
|
+
): Promise<ProcessSnapshot[]> {
|
|
587
|
+
if (platform === "win32") return listWindowsSnapshotsAsync();
|
|
588
|
+
if (platform === "darwin") return listDarwinSnapshotsAsync(getuid());
|
|
589
|
+
return listUnixProcSnapshots(getuid(), requireComplete);
|
|
590
|
+
}
|
|
591
|
+
|
|
555
592
|
export interface ListProcessSnapshotsOptions {
|
|
556
593
|
platform?: NodeJS.Platform;
|
|
557
594
|
getuid?: () => number | undefined;
|
|
@@ -639,6 +676,43 @@ function scanProcessSnapshots(
|
|
|
639
676
|
} catch {
|
|
640
677
|
return Object.freeze({ kind: "unavailable" as const });
|
|
641
678
|
}
|
|
679
|
+
return matchProcessSnapshots(snapshots, matches);
|
|
680
|
+
}
|
|
681
|
+
|
|
682
|
+
/**
|
|
683
|
+
* Request-path twin of {@link scanProcessSnapshots}: an injected async source, or the
|
|
684
|
+
* real enumeration's child processes, resolve off the event loop. The fail-closed
|
|
685
|
+
* contract is unchanged — an unreadable process table is still `unavailable`.
|
|
686
|
+
*/
|
|
687
|
+
async function scanProcessSnapshotsAsync(
|
|
688
|
+
io: CodexAppServerProcessIo,
|
|
689
|
+
matches: (commandLine: string, executable?: string) => boolean,
|
|
690
|
+
): Promise<CodexAppServerProcessScan> {
|
|
691
|
+
const platform = io.platform ?? process.platform;
|
|
692
|
+
const getuid = io.getuid ?? (() => {
|
|
693
|
+
try {
|
|
694
|
+
return typeof process.getuid === "function" ? process.getuid() : undefined;
|
|
695
|
+
} catch {
|
|
696
|
+
return undefined;
|
|
697
|
+
}
|
|
698
|
+
});
|
|
699
|
+
let snapshots: ProcessSnapshot[];
|
|
700
|
+
try {
|
|
701
|
+
snapshots = io.listSnapshotsAsync
|
|
702
|
+
? await io.listSnapshotsAsync()
|
|
703
|
+
: io.listSnapshots
|
|
704
|
+
? io.listSnapshots()
|
|
705
|
+
: await defaultListSnapshotsAsync(platform, getuid);
|
|
706
|
+
} catch {
|
|
707
|
+
return Object.freeze({ kind: "unavailable" as const });
|
|
708
|
+
}
|
|
709
|
+
return matchProcessSnapshots(snapshots, matches);
|
|
710
|
+
}
|
|
711
|
+
|
|
712
|
+
function matchProcessSnapshots(
|
|
713
|
+
snapshots: readonly ProcessSnapshot[],
|
|
714
|
+
matches: (commandLine: string, executable?: string) => boolean,
|
|
715
|
+
): CodexAppServerProcessScan {
|
|
642
716
|
const seen = new Set<number>();
|
|
643
717
|
const matched: CodexAppServerProcess[] = [];
|
|
644
718
|
for (const snapshot of snapshots) {
|
|
@@ -671,6 +745,15 @@ export function scanCodexSessionProcesses(io: CodexAppServerProcessIo = {}): Cod
|
|
|
671
745
|
return scanProcessSnapshots({ ...io, getuid: io.getuid ?? (() => undefined) }, isCodexSessionCommandLine);
|
|
672
746
|
}
|
|
673
747
|
|
|
748
|
+
/**
|
|
749
|
+
* Async twin of {@link scanCodexSessionProcesses} for request paths: planning and the
|
|
750
|
+
* apply re-scan must not park the proxy event loop on a process-table child wait.
|
|
751
|
+
* Same broader read-only scope, same fail-closed contract.
|
|
752
|
+
*/
|
|
753
|
+
export function scanCodexSessionProcessesAsync(io: CodexAppServerProcessIo = {}): Promise<CodexAppServerProcessScan> {
|
|
754
|
+
return scanProcessSnapshotsAsync({ ...io, getuid: io.getuid ?? (() => undefined) }, isCodexSessionCommandLine);
|
|
755
|
+
}
|
|
756
|
+
|
|
674
757
|
export function formatStaleCodexAppServerWarning(
|
|
675
758
|
processes: readonly { pid: number }[],
|
|
676
759
|
): string {
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
1
3
|
import { parseCodexCredits, rememberCodexCredits } from "../credits";
|
|
2
4
|
import { fetchCodexUsage } from "../quota-query-backoff";
|
|
3
5
|
import type { CodexUsageOwner } from "../quota-query-backoff";
|
|
@@ -11,8 +13,9 @@ import type { StoredAccountQuota, WhamUsageResponse } from "../quota";
|
|
|
11
13
|
import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
12
14
|
import { getMainChatgptAccountId, readCodexTokensResult } from "../auth-collision";
|
|
13
15
|
import { clearAccountNeedsReauth, markAccountNeedsReauth } from "../account-runtime-state";
|
|
14
|
-
import { extractAccountId } from "../../oauth/chatgpt";
|
|
15
|
-
import { getMainAccountPlan, isMainAccountTokenVerifiablyLive, MAIN_CODEX_ACCOUNT_ID, setMainAccountPlan } from "../main-account";
|
|
16
|
+
import { decodeJwtPayload, extractAccountId } from "../../oauth/chatgpt";
|
|
17
|
+
import { getMainAccountPlan, getValidMainAccountToken, isMainAccountTokenVerifiablyLive, mainAccountTokenIsCurrent, mainAccountTokenQuotaWriter, MainAccountTokenRefreshError, MAIN_CODEX_ACCOUNT_ID, setMainAccountPlan, type MainAccountToken } from "../main-account";
|
|
18
|
+
import { resolveCodexHomeDir } from "../home";
|
|
16
19
|
import { captureConfigGeneration } from "../../lib/state-store-sweeper";
|
|
17
20
|
import { captureMainAccountIdentityGeneration, clearMainAccountInfoCache, getMainAccountInfoCache, getMainQuotaCredentialGeneration, isMainAccountIdentityGenerationLive, isMainQuotaWriterLive, matchesMainQuotaCredential, observeMainQuotaCredential, setMainAccountCredentialPresence, setMainAccountInfoCache } from "../main-account-cache";
|
|
18
21
|
import type { MainQuotaWriter, MainAccountInfo } from "../main-account-cache";
|
|
@@ -149,10 +152,19 @@ export async function fetchMainAccountInfo(forceRefresh = false, config?: OcxCon
|
|
|
149
152
|
export interface MainAccountInfoProbeOptions {
|
|
150
153
|
/** Metadata-only renewal never sets or clears the traffic reauth quarantine. */
|
|
151
154
|
passive?: boolean;
|
|
155
|
+
/** Exact owned result obtained before entering WHAM's shared credential claim. Never serialized. */
|
|
156
|
+
preparedToken?: MainAccountToken | null;
|
|
152
157
|
}
|
|
153
158
|
|
|
154
159
|
export const EMPTY_MAIN_ACCOUNT_INFO: MainAccountInfo = { email: null, plan: null, quota: null };
|
|
155
160
|
|
|
161
|
+
/** Caller holds the runtime lease, but no shared credential claim: Codex may need an exclusive claim. */
|
|
162
|
+
export async function prepareMainAccountInfoToken(): Promise<MainAccountToken | null | undefined> {
|
|
163
|
+
const home = resolveCodexHomeDir();
|
|
164
|
+
if (!existsSync(home) || existsSync(join(home, "auth.json"))) return undefined;
|
|
165
|
+
return getValidMainAccountToken({ preserveReauth: true });
|
|
166
|
+
}
|
|
167
|
+
|
|
156
168
|
export async function retryMainAccountInfoIfIdentityChanged(
|
|
157
169
|
requestAccountId: string | null,
|
|
158
170
|
retriesRemaining: number,
|
|
@@ -189,9 +201,23 @@ export async function fetchMainAccountInfoAttempt(
|
|
|
189
201
|
};
|
|
190
202
|
}
|
|
191
203
|
try {
|
|
204
|
+
let preparedToken = options.preparedToken;
|
|
205
|
+
if (!nativeMainSharedClaimHeld && preparedToken === undefined) {
|
|
206
|
+
const home = resolveCodexHomeDir();
|
|
207
|
+
const generation = captureMainAccountIdentityGeneration();
|
|
208
|
+
try { preparedToken = await prepareMainAccountInfoToken(); }
|
|
209
|
+
catch (error) {
|
|
210
|
+
const absent = error instanceof MainAccountTokenRefreshError && (error.reason === "reauth" || error.credentialObservedAbsent)
|
|
211
|
+
&& home === resolveCodexHomeDir() && isMainAccountIdentityGenerationLive(generation);
|
|
212
|
+
if (absent) setMainAccountCredentialPresence(false);
|
|
213
|
+
return { info: getMainAccountInfoCache() ?? EMPTY_MAIN_ACCOUNT_INFO,
|
|
214
|
+
credentialChecked: absent, hasCredential: false, identityGeneration: captureMainAccountIdentityGeneration() };
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
const probeOptions = preparedToken === undefined ? options : { ...options, preparedToken };
|
|
192
218
|
const paced = sharedMainQuotaPacingEnabled(config ?? loadConfig());
|
|
193
219
|
const operation = async () => ({
|
|
194
|
-
...await fetchMainAccountInfoWhileOwned(forceRefresh, retriesRemaining, nativeMainLease, explicitRefresh, postReset, paced,
|
|
220
|
+
...await fetchMainAccountInfoWhileOwned(forceRefresh, retriesRemaining, nativeMainLease, explicitRefresh, postReset, paced, probeOptions),
|
|
195
221
|
identityGeneration: captureMainAccountIdentityGeneration(),
|
|
196
222
|
});
|
|
197
223
|
if (nativeMainSharedClaimHeld) return await operation();
|
|
@@ -235,20 +261,28 @@ export async function fetchMainAccountInfoWhileOwned(
|
|
|
235
261
|
options: MainAccountInfoProbeOptions = {},
|
|
236
262
|
): Promise<MainAccountInfoFetchResult> {
|
|
237
263
|
const writerGeneration = captureConfigGeneration();
|
|
238
|
-
reconcileMainCodexAccountRuntimeState();
|
|
239
264
|
const tokenRead = readCodexTokensResult();
|
|
240
|
-
|
|
241
|
-
|
|
265
|
+
if (tokenRead.status === "missing" && options.preparedToken && !mainAccountTokenIsCurrent(options.preparedToken)) {
|
|
266
|
+
// A stale/copy handoff proves nothing about the current login, including its presence.
|
|
267
|
+
return { info: getMainAccountInfoCache() ?? EMPTY_MAIN_ACCOUNT_INFO, credentialChecked: false, hasCredential: false };
|
|
268
|
+
}
|
|
269
|
+
const owned = tokenRead.status === "missing" && options.preparedToken
|
|
270
|
+
&& mainAccountTokenIsCurrent(options.preparedToken) ? options.preparedToken : undefined;
|
|
271
|
+
// The owned RPC already reconciled identity; a missing file must not erase that observation.
|
|
272
|
+
if (!owned) reconcileMainCodexAccountRuntimeState();
|
|
273
|
+
const tokens = tokenRead.status === "ok" ? tokenRead.tokens : owned
|
|
274
|
+
? { access_token: owned.accessToken, account_id: owned.chatgptAccountId, id_token: undefined } : null;
|
|
275
|
+
setMainAccountCredentialPresence(tokens !== null);
|
|
276
|
+
if (!tokens) {
|
|
242
277
|
// A local read failure is NOT proof of sign-out: a missing file can be a non-atomic rewrite
|
|
243
278
|
// gap, and malformed JSON can be a half-written file. Clearing the cache and marking the
|
|
244
279
|
// account for reauth here destroyed healthy email/plan/quota state and pinned a working
|
|
245
280
|
// account as unusable. Preserve what we already know and let the caller retry; request
|
|
246
|
-
// routing stays fail-closed
|
|
247
|
-
//
|
|
281
|
+
// routing stays fail-closed through its owned credential resolver, and the account DTO
|
|
282
|
+
// reports hasCredential=false without either a readable file or a verified keyring handoff.
|
|
248
283
|
const preserved = getMainAccountInfoCache();
|
|
249
284
|
return { info: preserved ?? EMPTY_MAIN_ACCOUNT_INFO, credentialChecked: true, hasCredential: false };
|
|
250
285
|
}
|
|
251
|
-
const tokens = tokenRead.tokens;
|
|
252
286
|
const requestAccountId = extractAccountId(tokens.id_token, tokens.access_token) ?? (tokens.account_id || null);
|
|
253
287
|
const cached = getMainAccountInfoCache();
|
|
254
288
|
if (!forceRefresh && cached && Date.now() - cached.ts < MAIN_CACHE_TTL) {
|
|
@@ -256,13 +290,15 @@ export async function fetchMainAccountInfoWhileOwned(
|
|
|
256
290
|
}
|
|
257
291
|
// Bind quota to the owned credential and the account actually selected by WHAM's header.
|
|
258
292
|
// A conflicting legacy token/account tuple is not evidence for the new policy.
|
|
259
|
-
const mainQuotaWriter = requestAccountId === tokens.account_id
|
|
293
|
+
const mainQuotaWriter = owned ? mainAccountTokenQuotaWriter(owned) : requestAccountId === tokens.account_id
|
|
260
294
|
? observeMainQuotaCredential(tokens.access_token, tokens.account_id)
|
|
261
295
|
: undefined;
|
|
262
296
|
const mainQuotaCredentialGeneration = getMainQuotaCredentialGeneration();
|
|
263
297
|
/** A disk replacement may have no second probe to advance the credential generation. */
|
|
264
298
|
const credentialIsCurrent = (): boolean => {
|
|
265
299
|
const current = readCodexTokensResult(undefined, { bounded: true });
|
|
300
|
+
if (owned) return current.status === "missing" && mainAccountTokenIsCurrent(owned)
|
|
301
|
+
&& mainQuotaCredentialGeneration === getMainQuotaCredentialGeneration();
|
|
266
302
|
if (current.status !== "ok") return false;
|
|
267
303
|
const effectiveAccountId = extractAccountId(current.tokens.id_token, current.tokens.access_token)
|
|
268
304
|
?? (current.tokens.account_id || null);
|
|
@@ -313,7 +349,10 @@ export async function fetchMainAccountInfoWhileOwned(
|
|
|
313
349
|
const resp = admission.response;
|
|
314
350
|
quotaPhase = "publish";
|
|
315
351
|
if (!resp.ok) {
|
|
316
|
-
const
|
|
352
|
+
const ownedExpiry = owned ? decodeJwtPayload(owned.accessToken)?.exp : undefined;
|
|
353
|
+
const authFailure = await classifyMainAuthResponse(resp, owned
|
|
354
|
+
? typeof ownedExpiry === "number" && ownedExpiry * 1000 > Date.now()
|
|
355
|
+
: isMainAccountTokenVerifiablyLive());
|
|
317
356
|
const terminalAuthFailure = authFailure.terminal;
|
|
318
357
|
const retried = await retryMainAccountInfoIfIdentityChanged(requestAccountId, retriesRemaining, nativeMainLease, explicitRefresh, paced, options);
|
|
319
358
|
if (retried) return retried;
|
|
@@ -10,7 +10,7 @@ import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
|
|
|
10
10
|
import { claimDueCodexQuotaRecoveryProbes, settleCodexQuotaRecoveryProbe } from "../routing";
|
|
11
11
|
import { readCodexTokens } from "../auth-collision";
|
|
12
12
|
import { isAccountNeedsReauth } from "../account-runtime-state";
|
|
13
|
-
import { getValidMainAccountToken, MAIN_CODEX_ACCOUNT_ID, getMainAccountPlan } from "../main-account";
|
|
13
|
+
import { getValidMainAccountToken, mainAccountTokenIsCurrent, mainAccountTokenQuotaWriter, MAIN_CODEX_ACCOUNT_ID, getMainAccountPlan } from "../main-account";
|
|
14
14
|
import { captureConfigGeneration, registerStateSweepAfterTick } from "../../lib/state-store-sweeper";
|
|
15
15
|
import { observeMainQuotaCredential, getMainQuotaCredentialGeneration, captureMainAccountIdentityGeneration, isMainAccountIdentityGenerationLive } from "../main-account-cache";
|
|
16
16
|
import { getMainAccountHardLockStatus, latestMainBlockingResetAt } from "../main-account-hard-lock";
|
|
@@ -22,7 +22,7 @@ import type { AdmissionLease } from "../../lib/admission";
|
|
|
22
22
|
import { tryAcquireNativeMainProfileClaim } from "../native-main-admission";
|
|
23
23
|
import { withNativeMainCredentialClaim, isNativeMainClaimUnavailable } from "./http";
|
|
24
24
|
import type { PoolQuotaResult } from "./pool-quota-probe";
|
|
25
|
-
import { fetchMainAccountInfoAttempt, fetchMainAccountInfo, MAIN_CACHE_TTL } from "./main-account-probe";
|
|
25
|
+
import { fetchMainAccountInfoAttempt, fetchMainAccountInfo, prepareMainAccountInfoToken, MAIN_CACHE_TTL } from "./main-account-probe";
|
|
26
26
|
import { fetchPoolAccountQuota, PoolQuotaProbeBusyError, POOL_CACHE_TTL, POOL_QUOTA_REFRESH_CONCURRENCY } from "./pool-quota-probe";
|
|
27
27
|
import { getRuntimeConfig, configuredPoolAccount, mapWithConcurrency } from "./runtime-config";
|
|
28
28
|
import { trackBackgroundWork } from "../../lib/background-work";
|
|
@@ -183,12 +183,15 @@ export async function runMainAccountHardLockRecovery(config: OcxConfig): Promise
|
|
|
183
183
|
|| isAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID)) return;
|
|
184
184
|
const identityGeneration = captureMainAccountIdentityGeneration();
|
|
185
185
|
const passive = getMainAccountHardLockStatus(config).state !== "blocked";
|
|
186
|
+
let prepared: Awaited<ReturnType<typeof getValidMainAccountToken>>;
|
|
186
187
|
try {
|
|
187
188
|
// Refresh can require an exclusive credential claim: never hold WHAM's shared
|
|
188
189
|
// claim while obtaining a valid token. The runtime lease spans both operations.
|
|
189
|
-
|
|
190
|
+
prepared = await getValidMainAccountToken({ preserveReauth: true });
|
|
190
191
|
if (!prepared) return;
|
|
191
|
-
|
|
192
|
+
if (mainAccountTokenQuotaWriter(prepared)) {
|
|
193
|
+
if (!mainAccountTokenIsCurrent(prepared)) return;
|
|
194
|
+
} else observeMainQuotaCredential(prepared.accessToken, prepared.chatgptAccountId);
|
|
192
195
|
} catch {
|
|
193
196
|
// Native refresh retains its own grant-scoped refusal; global quarantine would outlive it.
|
|
194
197
|
return;
|
|
@@ -214,7 +217,7 @@ export async function runMainAccountHardLockRecovery(config: OcxConfig): Promise
|
|
|
214
217
|
after: currentQueryAfter };
|
|
215
218
|
return;
|
|
216
219
|
}
|
|
217
|
-
const result = await fetchMainAccountInfoAttempt(true, 1, lease, false, false, false, config, { passive });
|
|
220
|
+
const result = await fetchMainAccountInfoAttempt(true, 1, lease, false, false, false, config, { passive, preparedToken: prepared });
|
|
218
221
|
// Never charge a replacement credential for a late result from its predecessor.
|
|
219
222
|
if (isMainAccountIdentityGenerationLive(identityGeneration)
|
|
220
223
|
&& credential === getMainQuotaCredentialGeneration()) {
|
|
@@ -359,21 +362,26 @@ export async function primeCodexPoolQuotas(
|
|
|
359
362
|
if (!mainLease) return;
|
|
360
363
|
try {
|
|
361
364
|
try {
|
|
365
|
+
// The Codex RPC owns an exclusive claim; finish it before WHAM's shared claim.
|
|
366
|
+
const preparedToken = await prepareMainAccountInfoToken();
|
|
362
367
|
await withNativeMainCredentialClaim(async () => {
|
|
363
368
|
// Keep one local owner and one cross-process reader from physical
|
|
364
369
|
// identity reconciliation through WHAM and all quota publication.
|
|
365
|
-
|
|
370
|
+
if (preparedToken) {
|
|
371
|
+
if (!mainAccountTokenIsCurrent(preparedToken)) return;
|
|
372
|
+
} else (options.reconcileMainAccount ?? reconcileMainCodexAccountRuntimeState)();
|
|
366
373
|
const quota = getAccountQuota(MAIN_CODEX_ACCOUNT_ID);
|
|
367
374
|
const observationStale = reason === "priority-failback" && quota
|
|
368
375
|
&& !codexQuotaHasFreshUsage(quota, getMainAccountPlan(), Date.now(), CODEX_PRIORITY_FAILBACK_REFRESH_MS);
|
|
369
376
|
if (quota && (reason !== "priority-failback"
|
|
370
377
|
|| (!observationStale && Date.now() - quota.updatedAt < MAIN_CACHE_TTL))) return;
|
|
371
|
-
if (!(options.readMainTokens ?? readCodexTokens)()
|
|
378
|
+
if (!(options.readMainTokens ?? readCodexTokens)()
|
|
379
|
+
&& !(preparedToken && mainAccountTokenIsCurrent(preparedToken))) return;
|
|
372
380
|
const bypassCachedQuota = !!observationStale;
|
|
373
381
|
if (options.fetchMainInfo) await options.fetchMainInfo(bypassCachedQuota);
|
|
374
382
|
// Cache bypass is passive observation, never an explicit reauthentication recovery.
|
|
375
383
|
else await fetchMainAccountInfoAttempt(bypassCachedQuota, 1, mainLease, true,
|
|
376
|
-
false, false, config);
|
|
384
|
+
false, false, config, { preparedToken });
|
|
377
385
|
});
|
|
378
386
|
} catch (error) {
|
|
379
387
|
if (!isNativeMainClaimUnavailable(error)) throw error;
|