@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- 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/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +43 -8
- package/src/claude/auth-detect.ts +21 -33
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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 -15
- package/src/cli/sync-fanout.ts +74 -19
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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-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.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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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 +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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.ts +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- 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-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- 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 +12 -3
- 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/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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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 +172 -24
- 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 +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -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/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- 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-billing-refusal.ts +27 -3
- 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.ts +3 -0
- 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.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- 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-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/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- 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 +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -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/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- 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/effort-history.ts +732 -0
- 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 +2 -2
- package/src/routing/history/integrity.ts +41 -4
- 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 +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -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 +97 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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 +39 -3
- 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 +145 -43
- 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 +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -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 +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -37,7 +37,7 @@ export async function startRemoteForwardPair(options: RemoteForwardOptions, budg
|
|
|
37
37
|
for (let attempt = 0; attempt < FORWARD_SETUP_ATTEMPTS; attempt++) {
|
|
38
38
|
budget.throwIfEnded();
|
|
39
39
|
if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
40
|
-
const result = exactRecord(JSON.parse(await (deps.run ?? runRemoteHelper)(buildExecArgv({ alias: options.ssh,
|
|
40
|
+
const result = exactRecord(JSON.parse(await (deps.run ?? runRemoteHelper)(buildExecArgv({ alias: options.ssh, route: null,
|
|
41
41
|
knownHostsFile: options.knownHosts, argv: remoteOcxArgv(["message", "_port"]) }), budget, capacity)), ["port"]);
|
|
42
42
|
budget.throwIfEnded();
|
|
43
43
|
if (!validPort(result.port)) throw remoteError("remote_incompatible", "Remote node did not offer an unprivileged return port.");
|
|
@@ -83,7 +83,7 @@ async function startAttempt(options: RemoteForwardOptions, reservation: RemotePo
|
|
|
83
83
|
budget.throwIfEnded(); if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
84
84
|
for (const [direction, bindPort, targetPort] of [["L", localPort, options.peerPort], ["R", returnPort, options.ownerPort]] as const) {
|
|
85
85
|
budget.throwIfEnded();
|
|
86
|
-
const argv = buildTunnelArgv({ alias: options.ssh, knownHostsFile: options.knownHosts, direction, bindPort, targetPort });
|
|
86
|
+
const argv = buildTunnelArgv({ alias: options.ssh, knownHostsFile: options.knownHosts, direction, bindPort, targetPort, route: null });
|
|
87
87
|
if (direction === "L") reservation.handoff();
|
|
88
88
|
const helper = (deps.spawn ?? spawnRemoteHelper)(argv, capacity, ownerSignal);
|
|
89
89
|
helpers.push(helper);
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { isAbsolute } from "node:path";
|
|
2
|
+
import { isRecord, LocalMessagingError } from "./types";
|
|
3
|
+
|
|
4
|
+
/** Profile names are bounded opaque native identifiers, never file paths or tool-controlled grants. */
|
|
5
|
+
export const isResumeProfile = (value: unknown): value is string => typeof value === "string"
|
|
6
|
+
&& value.length > 0 && value.length <= 128 && !/[\s\x00-\x1f]/.test(value);
|
|
7
|
+
|
|
8
|
+
type PermissionRead = (method: "configRequirements/read" | "permissionProfile/list", params: Record<string, unknown>) => Promise<unknown>;
|
|
9
|
+
|
|
10
|
+
/** Verify the host-selected grant before execution; do not inherit a persisted fallback selection. */
|
|
11
|
+
export async function verifyResumeProfile(read: PermissionRead, profile: string, cwd: unknown): Promise<void> {
|
|
12
|
+
function refuse(code: string): never { throw new LocalMessagingError(code, "The explicitly selected resume permission profile could not be verified."); }
|
|
13
|
+
if (!isResumeProfile(profile) || typeof cwd !== "string" || !isAbsolute(cwd) || cwd.length > 4096 || /[\x00-\x1f]/.test(cwd)) refuse("resume_permissions_unverified");
|
|
14
|
+
const requirements = await read("configRequirements/read", {});
|
|
15
|
+
if (!isRecord(requirements) || !Object.hasOwn(requirements, "requirements")) refuse("resume_permissions_unverified");
|
|
16
|
+
// Native managed requirements can substitute their default even for an explicit profile.
|
|
17
|
+
if (requirements.requirements !== null) refuse("resume_managed_policy_unsupported");
|
|
18
|
+
const page = await read("permissionProfile/list", { cwd, limit: 50, cursor: null });
|
|
19
|
+
if (!isRecord(page) || !Array.isArray(page.data) || page.data.length > 50
|
|
20
|
+
|| !(page.nextCursor === null || (typeof page.nextCursor === "string" && page.nextCursor.length > 0 && page.nextCursor.length <= 4096))) refuse("resume_permissions_unverified");
|
|
21
|
+
const seen = new Set<string>();
|
|
22
|
+
for (const item of page.data) {
|
|
23
|
+
if (!isRecord(item) || !isResumeProfile(item.id) || typeof item.allowed !== "boolean" || seen.has(item.id)) refuse("resume_permissions_unverified");
|
|
24
|
+
seen.add(item.id);
|
|
25
|
+
}
|
|
26
|
+
if (!page.data.some((item: Record<string, unknown>) => item.id === profile && item.allowed === true)) refuse("resume_profile_unavailable");
|
|
27
|
+
}
|
package/src/messaging/rpc.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { isAbsolute } from "node:path";
|
|
2
|
+
import { realpathSync, statSync } from "node:fs";
|
|
1
3
|
import { MessageBudget } from "./budget";
|
|
4
|
+
import { isResumeProfile, verifyResumeProfile } from "./resume-permissions";
|
|
2
5
|
import { localSocket, type LocalSocket } from "./socket";
|
|
3
6
|
import { isRecord, isThreadId, LocalMessagingError, type LocalMetadataClient, type LocalThread } from "./types";
|
|
4
7
|
|
|
5
|
-
type Method = "initialize" | "thread/loaded/list" | "thread/read" | "thread/queue/add";
|
|
8
|
+
type Method = "initialize" | "thread/loaded/list" | "thread/read" | "thread/queue/add" | "configRequirements/read" | "permissionProfile/list";
|
|
6
9
|
interface QueueResult {
|
|
7
10
|
status: "not_sent" | "queued" | "unknown";
|
|
8
11
|
error?: { code: string; message: string };
|
|
@@ -16,9 +19,11 @@ interface Pending {
|
|
|
16
19
|
method: Method;
|
|
17
20
|
}
|
|
18
21
|
|
|
19
|
-
/**
|
|
22
|
+
/** Default metadata/queue connection; lifecycle access requires a separate explicit factory. */
|
|
20
23
|
export class LocalMessageRpc implements LocalMetadataClient {
|
|
21
24
|
private nextId = 0;
|
|
25
|
+
private allowResume = false;
|
|
26
|
+
private serverHome: unknown;
|
|
22
27
|
private readonly pending = new Map<number, Pending>();
|
|
23
28
|
private closed = false;
|
|
24
29
|
private readonly abort: () => void;
|
|
@@ -48,9 +53,9 @@ export class LocalMessageRpc implements LocalMetadataClient {
|
|
|
48
53
|
socket.onopen = socket.onerror = socket.onclose = null;
|
|
49
54
|
};
|
|
50
55
|
const abort = () => { cleanup(); reject(budget.signal.reason); };
|
|
51
|
-
const timer =
|
|
56
|
+
const timer = budget.stageTimer(rpcTimeoutMs, () => {
|
|
52
57
|
cleanup(); reject(new LocalMessagingError("daemon_unavailable", "Local Codex connection timed out; no daemon was started."));
|
|
53
|
-
}
|
|
58
|
+
});
|
|
54
59
|
budget.signal.addEventListener("abort", abort, { once: true });
|
|
55
60
|
socket.onopen = () => { cleanup(); resolve(); };
|
|
56
61
|
socket.onerror = socket.onclose = () => {
|
|
@@ -76,12 +81,46 @@ export class LocalMessageRpc implements LocalMetadataClient {
|
|
|
76
81
|
capabilities: { experimentalApi: true },
|
|
77
82
|
});
|
|
78
83
|
if (!isRecord(result)) throw rpc.invalidMetadata();
|
|
84
|
+
rpc.serverHome = result.codexHome;
|
|
79
85
|
budget.throwIfEnded();
|
|
80
86
|
socket.send(JSON.stringify({ method: "initialized", params: {} }));
|
|
81
87
|
return rpc;
|
|
82
88
|
} catch (error) { rpc.close(); throw error; }
|
|
83
89
|
}
|
|
84
90
|
|
|
91
|
+
/** Grant only resume preflight on an explicitly selected trusted local server. */
|
|
92
|
+
static async connectForResume(url: string, budget: MessageBudget, codexHome: string): Promise<LocalMessageRpc> {
|
|
93
|
+
const rpc = await LocalMessageRpc.connect(url, budget);
|
|
94
|
+
try {
|
|
95
|
+
if (typeof rpc.serverHome !== "string" || !isAbsolute(rpc.serverHome) || !statSync(codexHome).isDirectory() || realpathSync(rpc.serverHome) !== realpathSync(codexHome)) {
|
|
96
|
+
throw new LocalMessagingError("resume_home_mismatch", "The selected server must report the configured Codex home.");
|
|
97
|
+
}
|
|
98
|
+
rpc.allowResume = true;
|
|
99
|
+
return rpc;
|
|
100
|
+
} catch (error) {
|
|
101
|
+
rpc.close();
|
|
102
|
+
throw error instanceof LocalMessagingError ? error : new LocalMessagingError("resume_home_unverified", "The selected server home could not be verified.");
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/** Inspect the target but refuse execution until native conditional resume is available. */
|
|
107
|
+
async resumeThread(threadId: string, permissionProfile: string) {
|
|
108
|
+
try {
|
|
109
|
+
if (!this.allowResume || !isThreadId(threadId) || !isResumeProfile(permissionProfile)) throw new LocalMessagingError("resume_disabled", "An explicit resume grant, thread UUID and permission profile are required.");
|
|
110
|
+
const state = await this.request("thread/read", { threadId, includeTurns: false });
|
|
111
|
+
const target = this.projectThread(state, threadId);
|
|
112
|
+
if (target.status === "systemError") throw new LocalMessagingError("resume_target_unhealthy", "The target is unhealthy.");
|
|
113
|
+
if (target.status !== "notLoaded") return { status: "already_loaded" as const, observedStatus: target.status };
|
|
114
|
+
await verifyResumeProfile((method, params) => this.request(method, params), permissionProfile, (state as {thread: Record<string, unknown>}).thread.cwd);
|
|
115
|
+
// Codex 0.166.0 can replace an unsubscribed idle thread loaded after preflight.
|
|
116
|
+
// No atomic not-loaded condition exists in its resume API; never send an unconditional resume.
|
|
117
|
+
throw new LocalMessagingError("resume_atomicity_unsupported", "The server cannot enforce an unloaded-only resume; no resume was submitted.");
|
|
118
|
+
} catch (error) {
|
|
119
|
+
return { status: "not_resumed" as const,
|
|
120
|
+
error: error instanceof LocalMessagingError ? { code: error.code } : { code: "resume_unavailable" } };
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
|
|
85
124
|
/** Read up to 50 loaded UUIDs, rejecting malformed IDs and unbounded pagination cursors. */
|
|
86
125
|
async loadedPage(cursor?: string): Promise<{ data: string[]; nextCursor: string | null }> {
|
|
87
126
|
const raw = await this.request("thread/loaded/list", { limit: 50, ...(cursor ? { cursor } : {}) });
|
|
@@ -97,6 +136,11 @@ export class LocalMessageRpc implements LocalMetadataClient {
|
|
|
97
136
|
async readThread(id: string): Promise<LocalThread> {
|
|
98
137
|
if (!isThreadId(id)) throw new LocalMessagingError("invalid_selector", "A valid Codex thread ID is required.");
|
|
99
138
|
const raw = await this.request("thread/read", { threadId: id, includeTurns: false });
|
|
139
|
+
return this.projectThread(raw, id);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** Metadata projection shared by normal reads and the resume-only preflight. */
|
|
143
|
+
private projectThread(raw: unknown, id: string): LocalThread {
|
|
100
144
|
const thread = isRecord(raw) ? raw.thread : null;
|
|
101
145
|
if (!isRecord(thread) || thread.id !== id || (thread.name !== undefined && thread.name !== null
|
|
102
146
|
&& (typeof thread.name !== "string" || thread.name.length > 4096)) || !isRecord(thread.status)
|
|
@@ -164,8 +208,8 @@ export class LocalMessageRpc implements LocalMetadataClient {
|
|
|
164
208
|
if (this.pending.size >= 4) throw new LocalMessagingError("rpc_limit", "Local Codex metadata concurrency limit exceeded.");
|
|
165
209
|
const id = ++this.nextId;
|
|
166
210
|
return new Promise((resolve, reject) => {
|
|
167
|
-
const timer =
|
|
168
|
-
this.
|
|
211
|
+
const timer = this.budget.stageTimer(this.rpcTimeoutMs,
|
|
212
|
+
() => this.close(new LocalMessagingError("rpc_timeout", "Local Codex request timed out.")));
|
|
169
213
|
this.pending.set(id, { resolve, reject, timer, method });
|
|
170
214
|
try { this.socket.send(JSON.stringify({ id, method, params })); onWritten?.(); } catch { this.close(); }
|
|
171
215
|
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { detectClaudeCodeTokenAsync, hasClaudeCredentialContinuity } from "./local-token-detect";
|
|
2
2
|
import { normalizeAnthropicIdentity, resolveAnthropicAccountIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
|
|
3
3
|
import { credentialGeneration, type AuthStore } from "./store";
|
|
4
4
|
import { mergeOAuthPlan } from "./plan";
|
|
@@ -24,7 +24,7 @@ export async function newerClaudeCredentialForInstance(
|
|
|
24
24
|
): Promise<ClaudeCredentialObservation> {
|
|
25
25
|
if (instance === "anthropic2") return { kind: "absent" };
|
|
26
26
|
if (stored.source !== "local-cli") return { kind: "absent" };
|
|
27
|
-
const disk =
|
|
27
|
+
const disk = await detectClaudeCodeTokenAsync();
|
|
28
28
|
if (!disk || !Number.isFinite(disk.expires) || disk.expires <= now + REFRESH_SKEW_MS
|
|
29
29
|
|| credentialGeneration(disk) === credentialGeneration(stored)) return { kind: "absent" };
|
|
30
30
|
const diskGeneration = credentialGeneration(disk);
|
|
@@ -47,7 +47,24 @@ export async function newerClaudeCredentialForInstance(
|
|
|
47
47
|
} };
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
/**
|
|
50
|
+
/**
|
|
51
|
+
* Fresh re-read of the Claude CLI credential for a write that depends on it. Adoption awaits it
|
|
52
|
+
* inside the serialized writer (afterPrePersistRead) so a rotation while the writer was queued is
|
|
53
|
+
* caught; the read is asynchronous (a Keychain lookup must never be killed, #8161), so the writer's
|
|
54
|
+
* synchronous ownership predicate only consumes its result. Fails closed: a missing, unreadable,
|
|
55
|
+
* near-expiry or different generation is not current.
|
|
56
|
+
*/
|
|
57
|
+
export async function claudeCredentialGenerationCurrent(diskGeneration: string, now: () => number = Date.now): Promise<boolean> {
|
|
58
|
+
const disk = await detectClaudeCodeTokenAsync();
|
|
59
|
+
return disk !== null && disk.expires > now() + REFRESH_SKEW_MS && credentialGeneration(disk) === diskGeneration;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Capture primitives before network awaits; check them again inside the serialized writer.
|
|
64
|
+
* `diskVerified` marks a write that depends on the CLI credential and carries the caller's
|
|
65
|
+
* {@link claudeCredentialGenerationCurrent} result: undefined for a write that does not depend on
|
|
66
|
+
* it, and false fails closed. Store-side generation and selection checks stay in the predicate.
|
|
67
|
+
*/
|
|
51
68
|
export function captureAnthropicCredentialOwner(set: ProviderAccountSet, accountId: string) {
|
|
52
69
|
return captureAnthropicCredentialOwnerForInstance("anthropic", set, accountId);
|
|
53
70
|
}
|
|
@@ -59,17 +76,16 @@ export function captureAnthropicCredentialOwnerForInstance(instance: AnthropicIn
|
|
|
59
76
|
const metadata = identityMetadata(row.credential);
|
|
60
77
|
const needsReauth = row.needsReauth;
|
|
61
78
|
const selection = { id: set.activeAccountId, revision: set.selectionRevision };
|
|
62
|
-
return (store: AuthStore,
|
|
79
|
+
return (store: AuthStore, diskVerified?: boolean, allowPaused = false): boolean => {
|
|
63
80
|
const current = store[instance];
|
|
64
81
|
const account = current?.accounts.find(candidate => candidate.id === accountId);
|
|
65
82
|
if (!account || (!allowPaused && account.paused) || account.loginId !== loginId
|
|
66
83
|
|| account.needsReauth !== needsReauth || credentialGeneration(account.credential) !== generation
|
|
67
84
|
|| identityMetadata(account.credential) !== metadata) return false;
|
|
68
|
-
if (
|
|
85
|
+
if (diskVerified !== undefined) {
|
|
69
86
|
if (instance === "anthropic2") return false;
|
|
70
87
|
if (current?.activeAccountId !== selection.id || current?.selectionRevision !== selection.revision) return false;
|
|
71
|
-
|
|
72
|
-
if (!disk || disk.expires <= Date.now() + REFRESH_SKEW_MS || credentialGeneration(disk) !== diskGeneration) return false;
|
|
88
|
+
if (!diskVerified) return false;
|
|
73
89
|
}
|
|
74
90
|
return true;
|
|
75
91
|
};
|
|
@@ -274,6 +274,8 @@ export type AnthropicCooldownRecoveryClaim = Readonly<{
|
|
|
274
274
|
accountId: string;
|
|
275
275
|
cooldownGeneration: number;
|
|
276
276
|
claimedAt: number;
|
|
277
|
+
/** False for a reset-derived refusal that named no window: a usage read can only retain it. */
|
|
278
|
+
namesRejectedWindow: boolean;
|
|
277
279
|
}>;
|
|
278
280
|
|
|
279
281
|
export type AnthropicCooldownRecoverySettlement = "cleared" | "retained" | "superseded";
|
|
@@ -434,8 +436,9 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
434
436
|
now = Date.now(),
|
|
435
437
|
): AnthropicCooldownRecoveryClaim | null {
|
|
436
438
|
const entry = upstreamHealth.get(accountId);
|
|
437
|
-
|
|
438
|
-
|
|
439
|
+
const windows = entry && entry.cooldownUntil > now ? recoverableQuotaWindows(entry) : null;
|
|
440
|
+
if (!entry || windows === null) return null;
|
|
441
|
+
return { instance, accountId, cooldownGeneration: entry.cooldownGeneration, claimedAt: now, namesRejectedWindow: windows.length > 0 };
|
|
439
442
|
}
|
|
440
443
|
|
|
441
444
|
/**
|
package/src/oauth/anthropic.ts
CHANGED
|
@@ -62,6 +62,22 @@ export class AnthropicTokenError extends Error {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
+
/**
|
|
66
|
+
* The TCP connect that would have carried the token request was refused, so no byte of it was
|
|
67
|
+
* sent (#8577). Two transports can report that, and only in these exact shapes:
|
|
68
|
+
* - Bun's native fetch (direct, or through an HTTP(S) proxy): `code: "ECONNREFUSED"` with `path`
|
|
69
|
+
* naming this request's URL. A reachable proxy that cannot open the upstream tunnel reports
|
|
70
|
+
* `ERR_PROXY_TUNNEL` instead, and a response that is lost later is a reset or timeout.
|
|
71
|
+
* - The SOCKS5 transport (src/lib/socks5-fetch.ts), which only ever connects to the configured
|
|
72
|
+
* proxy: node:net's `code: "ECONNREFUSED"` with `syscall: "connect"`.
|
|
73
|
+
* Message text, another URL, or a refusal outside connect proves nothing and keeps the replay guard.
|
|
74
|
+
*/
|
|
75
|
+
function connectionRefusedBeforeSend(error: unknown, url: string): boolean {
|
|
76
|
+
if (typeof error !== "object" || error === null || !("code" in error) || error.code !== "ECONNREFUSED") return false;
|
|
77
|
+
if ("path" in error) return error.path === url;
|
|
78
|
+
return "syscall" in error && error.syscall === "connect";
|
|
79
|
+
}
|
|
80
|
+
|
|
65
81
|
async function postJson(url: string, body: Record<string, string | number>): Promise<string> {
|
|
66
82
|
const direct = !startupOutboundProxyConfigured && !outboundProxyConfigured();
|
|
67
83
|
const init: RequestInit & { protocol: "http1.1" } = {
|
|
@@ -85,6 +101,9 @@ async function postJson(url: string, body: Record<string, string | number>): Pro
|
|
|
85
101
|
&& "hostname" in error && error.hostname === new URL(url).hostname) {
|
|
86
102
|
throw new AnthropicTokenError("Anthropic OAuth DNS lookup failed before connection", undefined, undefined, true);
|
|
87
103
|
}
|
|
104
|
+
if (connectionRefusedBeforeSend(error, url)) {
|
|
105
|
+
throw new AnthropicTokenError("Anthropic OAuth connection refused before the request was sent", undefined, undefined, true);
|
|
106
|
+
}
|
|
88
107
|
throw error;
|
|
89
108
|
}
|
|
90
109
|
if (response.status >= 300 && response.status < 400) {
|
|
@@ -227,8 +246,9 @@ export async function loginAnthropic(
|
|
|
227
246
|
const importLocal = opts?.codeMode ? "off" : opts?.importLocal ?? "off";
|
|
228
247
|
if (opts?.instance === "anthropic2" && importLocal !== "off") throw new AnthropicLocalCliImportError();
|
|
229
248
|
if (importLocal !== "off") {
|
|
230
|
-
const {
|
|
231
|
-
const local =
|
|
249
|
+
const { detectClaudeCodeTokenAsync } = await import("./local-token-detect");
|
|
250
|
+
const local = await detectClaudeCodeTokenAsync();
|
|
251
|
+
ctrl.signal?.throwIfAborted();
|
|
232
252
|
if (local) {
|
|
233
253
|
ctrl.onProgress?.("Found Claude Code token, importing automatically");
|
|
234
254
|
if (local.expires >= Date.now() + 60_000) {
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Google Antigravity sign-in can get the Google account disabled.
|
|
3
|
+
*
|
|
4
|
+
* Antigravity's OAuth login is issued for Google's own Antigravity app. Reaching Cloud Code
|
|
5
|
+
* Assist through a third-party proxy with it is the pattern behind the account bans reported
|
|
6
|
+
* against Gemini CLI (google-gemini/gemini-cli #19501, #20813, #27199, #27388), where the
|
|
7
|
+
* account answers every request with {@link ANTIGRAVITY_TOS_BAN_MESSAGE}. The auto-pause policy
|
|
8
|
+
* (`account-auto-pause-policy.ts`) recognises that message once it happens; this module is the
|
|
9
|
+
* other half, making sure nobody reaches it without having been told first.
|
|
10
|
+
*
|
|
11
|
+
* Every way of adding an Antigravity account goes through the management API, except
|
|
12
|
+
* `ocx login`, which runs the flow in-process. The API therefore refuses an Antigravity login
|
|
13
|
+
* or import whose body does not carry {@link ANTIGRAVITY_RISK_ACK_FIELD} set to `true`, and each
|
|
14
|
+
* client sets it only after a person acknowledged the warning: the dashboard through its
|
|
15
|
+
* checkbox, the CLI through a y/N prompt or the explicit {@link ANTIGRAVITY_RISK_CLI_FLAG}.
|
|
16
|
+
* The field is consent evidence from the client, the same weight a dashboard checkbox has; it
|
|
17
|
+
* cannot prove a human read anything, and it is not meant to.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
export const ANTIGRAVITY_RISK_PROVIDER = "google-antigravity";
|
|
21
|
+
|
|
22
|
+
/** Request-body field that carries the acknowledgement. Only the literal `true` counts. */
|
|
23
|
+
export const ANTIGRAVITY_RISK_ACK_FIELD = "acknowledgeAntigravityRisk";
|
|
24
|
+
|
|
25
|
+
/** CLI flag for non-interactive use. Without it, a CLI that cannot prompt refuses. */
|
|
26
|
+
export const ANTIGRAVITY_RISK_CLI_FLAG = "--accept-antigravity-risk";
|
|
27
|
+
|
|
28
|
+
/** Machine-readable refusal returned by the management API and printed by the CLI. */
|
|
29
|
+
export const ANTIGRAVITY_RISK_REFUSAL_CODE = "antigravity_risk_not_acknowledged";
|
|
30
|
+
|
|
31
|
+
/** The error Cloud Code Assist returns for a disabled account (see account-auto-pause-policy.ts). */
|
|
32
|
+
export const ANTIGRAVITY_TOS_BAN_MESSAGE = "This service has been disabled in this account for violation of Terms of Service.";
|
|
33
|
+
|
|
34
|
+
export function requiresAntigravityRiskAcknowledgement(provider: string): boolean {
|
|
35
|
+
return provider.trim().toLowerCase() === ANTIGRAVITY_RISK_PROVIDER;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export function hasAntigravityRiskAcknowledgement(body: unknown): boolean {
|
|
39
|
+
return typeof body === "object" && body !== null
|
|
40
|
+
&& (body as Record<string, unknown>)[ANTIGRAVITY_RISK_ACK_FIELD] === true;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** The API refusal body, shared by every route that can add an Antigravity account. */
|
|
44
|
+
export function antigravityRiskRefusalBody(): { error: string; code: typeof ANTIGRAVITY_RISK_REFUSAL_CODE } {
|
|
45
|
+
return {
|
|
46
|
+
error: "Google Antigravity sign-in can get Gemini and Antigravity access disabled on the Google account. Acknowledge the risk in the OpenCodex dashboard, or pass "
|
|
47
|
+
+ ANTIGRAVITY_RISK_CLI_FLAG + " to the CLI.",
|
|
48
|
+
code: ANTIGRAVITY_RISK_REFUSAL_CODE,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** Terminal warning shown before every CLI Antigravity sign-in or import, flag or not. */
|
|
53
|
+
export const ANTIGRAVITY_RISK_WARNING = [
|
|
54
|
+
"",
|
|
55
|
+
"WARNING: Google may permanently disable Gemini and Antigravity access on the Google account you sign in with.",
|
|
56
|
+
" The Antigravity login is meant for Google's own Antigravity app. OpenCodex is a third-party",
|
|
57
|
+
" proxy, and users of third-party tools have reported that access being disabled with:",
|
|
58
|
+
" \"" + ANTIGRAVITY_TOS_BAN_MESSAGE + "\"",
|
|
59
|
+
" - The ban applies to the Google account: its Gemini Code Assist and Antigravity access can",
|
|
60
|
+
" stop everywhere, including in Google's own tools.",
|
|
61
|
+
" - Getting access back depends on Google's appeal process and is not guaranteed.",
|
|
62
|
+
" - Use only a separate Google account you can afford to lose. Never use your main, personal,",
|
|
63
|
+
" school, or work account.",
|
|
64
|
+
" Safer option: use a Gemini API key (Google AI Studio or Vertex AI) instead.",
|
|
65
|
+
"",
|
|
66
|
+
].join("\n");
|
|
67
|
+
|
|
68
|
+
export const ANTIGRAVITY_RISK_PROMPT = "Continue with Google Antigravity and accept the risk? [y/N]: ";
|
|
69
|
+
|
|
70
|
+
export type AntigravityRiskDecision = "accepted" | "declined" | "noninteractive" | "agent";
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Test and platform seams for the CLI gate. Production reads the environment: a coding agent or
|
|
74
|
+
* CI runner is detected by {@link isAgentDriven}, and a prompt counts as visible only when the
|
|
75
|
+
* stream it is written to is a terminal.
|
|
76
|
+
*/
|
|
77
|
+
export interface AntigravityRiskSeams {
|
|
78
|
+
agentDriven?: () => boolean;
|
|
79
|
+
promptVisible?: () => boolean;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/**
|
|
83
|
+
* The CLI gate. The warning is always shown, even with the flag, so a script's log records what
|
|
84
|
+
* was accepted. Adding an Antigravity account spends the user's Google identity, so the repository
|
|
85
|
+
* rule for such actions applies (AGENTS.md, "User-consent actions"; AGENTS_INSTALL.md): a process
|
|
86
|
+
* driven by a coding agent or CI runner is refused outright, flag or not, because the agent would
|
|
87
|
+
* be the one answering. Otherwise the flag accepts, an interactive terminal may answer, and only
|
|
88
|
+
* an explicit "y" or "yes" accepts: an empty line, EOF, a timeout or a read error all decline.
|
|
89
|
+
*/
|
|
90
|
+
export async function resolveAntigravityRiskAcknowledgement(opts: {
|
|
91
|
+
flag: boolean;
|
|
92
|
+
interactive: boolean;
|
|
93
|
+
agentDriven: boolean;
|
|
94
|
+
warn: (text: string) => void;
|
|
95
|
+
ask: (question: string) => Promise<string>;
|
|
96
|
+
}): Promise<AntigravityRiskDecision> {
|
|
97
|
+
opts.warn(ANTIGRAVITY_RISK_WARNING);
|
|
98
|
+
if (opts.agentDriven) return "agent";
|
|
99
|
+
if (opts.flag) return "accepted";
|
|
100
|
+
if (!opts.interactive) return "noninteractive";
|
|
101
|
+
let answer: string;
|
|
102
|
+
try {
|
|
103
|
+
answer = await opts.ask(ANTIGRAVITY_RISK_PROMPT);
|
|
104
|
+
} catch {
|
|
105
|
+
return "declined";
|
|
106
|
+
}
|
|
107
|
+
const normalized = answer.trim().toLowerCase();
|
|
108
|
+
return normalized === "y" || normalized === "yes" ? "accepted" : "declined";
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
export function antigravityRiskDecisionMessage(decision: Exclude<AntigravityRiskDecision, "accepted">): string {
|
|
112
|
+
switch (decision) {
|
|
113
|
+
case "agent":
|
|
114
|
+
return "Refusing Google Antigravity (" + ANTIGRAVITY_RISK_REFUSAL_CODE + "): this run is driven by a coding agent or CI runner, "
|
|
115
|
+
+ "and only the account owner can accept the risk. Run the command yourself in a terminal, or use the OpenCodex dashboard.";
|
|
116
|
+
case "noninteractive":
|
|
117
|
+
return "Refusing Google Antigravity without acknowledgement (" + ANTIGRAVITY_RISK_REFUSAL_CODE + "): no interactive terminal to confirm. "
|
|
118
|
+
+ "Re-run in a terminal, or pass " + ANTIGRAVITY_RISK_CLI_FLAG + " to accept the risk explicitly.";
|
|
119
|
+
case "declined":
|
|
120
|
+
return "Google Antigravity cancelled: the risk was not accepted. Nothing was changed.";
|
|
121
|
+
default: {
|
|
122
|
+
const exhaustive: never = decision;
|
|
123
|
+
return exhaustive;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
@@ -1,22 +1,31 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Claude Code Keychain
|
|
2
|
+
* Claude Code Keychain lookups that never kill a blocked `security` child.
|
|
3
3
|
*
|
|
4
|
-
* With a locked login keychain, `security find-generic-password
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
4
|
+
* With a locked login keychain, `security find-generic-password` blocks on the SecurityAgent
|
|
5
|
+
* unlock prompt. Killing it while that prompt is pending hits a race in Apple's `securityd`,
|
|
6
|
+
* which aborts and re-locks the keychain, so the next lookup prompts again (#8161). Every lookup
|
|
7
|
+
* here is asynchronous: a slow one is given up without signalling its child, at most one child
|
|
8
|
+
* runs per process, and a timeout backs off so a locked keychain does not get one prompt per
|
|
9
|
+
* request. A synchronous lookup cannot be bounded without killing its child, so there is none.
|
|
10
10
|
*/
|
|
11
|
-
import {
|
|
11
|
+
import { spawn } from "node:child_process";
|
|
12
12
|
|
|
13
13
|
export const CLAUDE_KEYCHAIN_SERVICE = "Claude Code-credentials";
|
|
14
14
|
export const CLAUDE_KEYCHAIN_TIMEOUT_MS = 5_000;
|
|
15
|
+
/** The metadata probe answers a settings page and a launch, so it waits less than a read. */
|
|
16
|
+
export const CLAUDE_KEYCHAIN_PROBE_TIMEOUT_MS = 1_500;
|
|
15
17
|
export const CLAUDE_KEYCHAIN_BACKOFF_MS = 60_000;
|
|
16
|
-
const
|
|
18
|
+
const READ_ARGS = ["find-generic-password", "-s", CLAUDE_KEYCHAIN_SERVICE, "-w"] as const;
|
|
19
|
+
/** Metadata only: no `-w` and no `-g`, because those print the secret. Only the exit code matters. */
|
|
20
|
+
const PROBE_ARGS = ["find-generic-password", "-s", CLAUDE_KEYCHAIN_SERVICE] as const;
|
|
21
|
+
/** `security` exit code for "the item does not exist": a real absent, not a failure. */
|
|
22
|
+
const ITEM_NOT_FOUND = 44;
|
|
17
23
|
/** The credential is a small JSON blob; anything larger is not a credential. */
|
|
18
24
|
const MAX_STDOUT_BYTES = 1024 * 1024;
|
|
19
25
|
|
|
26
|
+
/** present/absent from the exit code; unknown when the lookup did not answer. Never absent on doubt. */
|
|
27
|
+
export type ClaudeKeychainPresence = "present" | "absent" | "unknown";
|
|
28
|
+
|
|
20
29
|
interface UnrefHandle { unref?(): unknown }
|
|
21
30
|
|
|
22
31
|
/** The subset of a spawned child the reader relies on. */
|
|
@@ -30,13 +39,13 @@ export interface KeychainChild extends UnrefHandle {
|
|
|
30
39
|
|
|
31
40
|
export interface ClaudeKeychainReaderDeps {
|
|
32
41
|
platform: string;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
execSync(command: string, args: readonly string[], timeoutMs: number): string;
|
|
42
|
+
/** `captureStdout` is false for the metadata probe: its stdout and stderr are discarded. */
|
|
43
|
+
spawn(command: string, args: readonly string[], captureStdout: boolean): KeychainChild;
|
|
36
44
|
now(): number;
|
|
37
45
|
/** Runs `fn` after `ms`; returns a cancel function. */
|
|
38
46
|
schedule(ms: number, fn: () => void): () => void;
|
|
39
47
|
timeoutMs?: number;
|
|
48
|
+
probeTimeoutMs?: number;
|
|
40
49
|
backoffMs?: number;
|
|
41
50
|
}
|
|
42
51
|
|
|
@@ -44,60 +53,54 @@ export interface ClaudeKeychainReader {
|
|
|
44
53
|
/** Resolves the item's secret, or null on absence, failure, timeout, backoff or a non-darwin host. */
|
|
45
54
|
readAsync(): Promise<string | null>;
|
|
46
55
|
/**
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*/
|
|
50
|
-
readSync(): string | null;
|
|
51
|
-
/** True while a child is still running or a timeout backoff is active. */
|
|
52
|
-
syncReadBlocked(): boolean;
|
|
53
|
-
/**
|
|
54
|
-
* Record a timeout of another synchronous Keychain lookup (the metadata probe), so it starts
|
|
55
|
-
* the same backoff and no read or probe spawns again inside that window.
|
|
56
|
+
* Whether the item exists, from `security`'s exit code alone: absent on a non-darwin host,
|
|
57
|
+
* unknown on a timeout, a busy slot, an active backoff or any other failure.
|
|
56
58
|
*/
|
|
57
|
-
|
|
59
|
+
probe(): Promise<ClaudeKeychainPresence>;
|
|
58
60
|
}
|
|
59
61
|
|
|
62
|
+
type LookupOutcome = { code: number | null; stdout: Buffer | null } | null;
|
|
63
|
+
|
|
60
64
|
export function createClaudeKeychainReader(deps: ClaudeKeychainReaderDeps): ClaudeKeychainReader {
|
|
61
65
|
const timeoutMs = deps.timeoutMs ?? CLAUDE_KEYCHAIN_TIMEOUT_MS;
|
|
66
|
+
const probeTimeoutMs = deps.probeTimeoutMs ?? CLAUDE_KEYCHAIN_PROBE_TIMEOUT_MS;
|
|
62
67
|
const backoffMs = deps.backoffMs ?? CLAUDE_KEYCHAIN_BACKOFF_MS;
|
|
63
68
|
let backoffUntil = 0;
|
|
64
|
-
// Held until the child exits, not until the
|
|
65
|
-
// outlives its deadline is still blocked on the prompt
|
|
66
|
-
// owning child may release it, so a late event from an
|
|
69
|
+
// The one admission slot for reads and probes alike. Held until the child exits, not until the
|
|
70
|
+
// caller's promise settles: a child that outlives its deadline is still blocked on the prompt
|
|
71
|
+
// and must not get a sibling. Only the owning child may release it, so a late event from an
|
|
72
|
+
// earlier child cannot free the slot.
|
|
67
73
|
let runningChild: KeychainChild | undefined;
|
|
68
|
-
let
|
|
74
|
+
let pendingRead: Promise<string | null> | undefined;
|
|
75
|
+
let pendingProbe: Promise<ClaudeKeychainPresence> | undefined;
|
|
69
76
|
|
|
70
77
|
const backingOff = (): boolean => deps.now() < backoffUntil;
|
|
71
|
-
const startBackoff = (): void => { backoffUntil = deps.now() + backoffMs; };
|
|
72
78
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
if (pending) return pending;
|
|
79
|
+
/** One lookup under the slot; null when it was not admitted, failed to start, or timed out. */
|
|
80
|
+
function lookup(args: readonly string[], captureStdout: boolean, deadlineMs: number): Promise<LookupOutcome> {
|
|
76
81
|
if (runningChild || backingOff()) return Promise.resolve(null);
|
|
77
|
-
|
|
78
82
|
let child: KeychainChild;
|
|
79
83
|
try {
|
|
80
|
-
child = deps.spawn("security",
|
|
84
|
+
child = deps.spawn("security", args, captureStdout);
|
|
81
85
|
} catch {
|
|
82
86
|
return Promise.resolve(null);
|
|
83
87
|
}
|
|
84
88
|
runningChild = child;
|
|
85
89
|
const release = (): void => { if (runningChild === child) runningChild = undefined; };
|
|
86
|
-
|
|
90
|
+
return new Promise<LookupOutcome>(resolve => {
|
|
87
91
|
let settled = false;
|
|
88
92
|
const chunks: Buffer[] = [];
|
|
89
93
|
let stdoutBytes = 0;
|
|
90
|
-
const settle = (value:
|
|
94
|
+
const settle = (value: LookupOutcome): void => {
|
|
91
95
|
if (settled) return;
|
|
92
96
|
settled = true;
|
|
93
97
|
cancelDeadline();
|
|
94
|
-
pending = undefined;
|
|
95
98
|
resolve(value);
|
|
96
99
|
};
|
|
97
|
-
const cancelDeadline = deps.schedule(
|
|
98
|
-
// Give up without signalling the child, and let it exit on its own once the
|
|
99
|
-
//
|
|
100
|
-
|
|
100
|
+
const cancelDeadline = deps.schedule(deadlineMs, () => {
|
|
101
|
+
// Give up without signalling the child, and let it exit on its own once the prompt is
|
|
102
|
+
// answered or dismissed. Unref it so it cannot hold this process open.
|
|
103
|
+
backoffUntil = deps.now() + backoffMs;
|
|
101
104
|
child.unref?.();
|
|
102
105
|
child.stdout?.unref?.();
|
|
103
106
|
settle(null);
|
|
@@ -113,49 +116,56 @@ export function createClaudeKeychainReader(deps: ClaudeKeychainReaderDeps): Clau
|
|
|
113
116
|
if (child.pid === undefined) release();
|
|
114
117
|
settle(null);
|
|
115
118
|
});
|
|
116
|
-
// `close`, not `exit`: `exit` can fire before stdout is drained, which would truncate
|
|
117
|
-
//
|
|
119
|
+
// `close`, not `exit`: `exit` can fire before stdout is drained, which would truncate the
|
|
120
|
+
// credential. Decode once so a multi-byte character split across chunks survives.
|
|
118
121
|
child.once("close", code => {
|
|
119
122
|
release();
|
|
120
|
-
|
|
121
|
-
settle(Buffer.concat(chunks).toString("utf8").trim() || null);
|
|
123
|
+
settle({ code, stdout: !captureStdout || stdoutBytes > MAX_STDOUT_BYTES ? null : Buffer.concat(chunks) });
|
|
122
124
|
});
|
|
123
125
|
});
|
|
124
|
-
pending = read;
|
|
125
|
-
return read;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
function
|
|
129
|
-
if (deps.platform !== "darwin"
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
128
|
+
function readAsync(): Promise<string | null> {
|
|
129
|
+
if (deps.platform !== "darwin") return Promise.resolve(null);
|
|
130
|
+
if (pendingRead) return pendingRead;
|
|
131
|
+
// A probe holding the slot is waited out (it settles within its own deadline) instead of
|
|
132
|
+
// making this read look like an absent credential; a probe that timed out leaves its child
|
|
133
|
+
// running and the backoff active, so the read then declines exactly as it would under backoff.
|
|
134
|
+
// Do not wait for that child too: it may be blocked on an unlock prompt indefinitely, and a
|
|
135
|
+
// second child beside it is what the single slot exists to prevent.
|
|
136
|
+
const started = pendingProbe
|
|
137
|
+
? pendingProbe.then(() => lookup(READ_ARGS, true, timeoutMs))
|
|
138
|
+
: lookup(READ_ARGS, true, timeoutMs);
|
|
139
|
+
const read = started.then(outcome => {
|
|
140
|
+
pendingRead = undefined;
|
|
141
|
+
if (outcome?.code !== 0 || !outcome.stdout) return null;
|
|
142
|
+
return outcome.stdout.toString("utf8").trim() || null;
|
|
143
|
+
});
|
|
144
|
+
pendingRead = read;
|
|
145
|
+
return read;
|
|
136
146
|
}
|
|
137
147
|
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
148
|
+
function probe(): Promise<ClaudeKeychainPresence> {
|
|
149
|
+
if (deps.platform !== "darwin") return Promise.resolve("absent");
|
|
150
|
+
if (pendingProbe) return pendingProbe;
|
|
151
|
+
const probed = lookup(PROBE_ARGS, false, probeTimeoutMs).then((outcome): ClaudeKeychainPresence => {
|
|
152
|
+
pendingProbe = undefined;
|
|
153
|
+
if (outcome?.code === 0) return "present";
|
|
154
|
+
if (outcome?.code === ITEM_NOT_FOUND) return "absent";
|
|
155
|
+
return "unknown";
|
|
156
|
+
});
|
|
157
|
+
pendingProbe = probed;
|
|
158
|
+
return probed;
|
|
159
|
+
}
|
|
145
160
|
|
|
146
|
-
|
|
147
|
-
export function isSyncTimeout(error: unknown): boolean {
|
|
148
|
-
if (!error || typeof error !== "object") return false;
|
|
149
|
-
const { code, signal } = error as { code?: unknown; signal?: unknown };
|
|
150
|
-
return code === "ETIMEDOUT" || (typeof signal === "string" && signal.length > 0);
|
|
161
|
+
return { readAsync, probe };
|
|
151
162
|
}
|
|
152
163
|
|
|
153
164
|
/** The process-wide reader: one Keychain child and one backoff window per process. */
|
|
154
165
|
export const claudeKeychainReader = createClaudeKeychainReader({
|
|
155
166
|
platform: process.platform,
|
|
156
|
-
spawn: (command, args) =>
|
|
157
|
-
|
|
158
|
-
execFileSync(command, [...args], { encoding: "utf8", timeout: timeoutMs, stdio: ["pipe", "pipe", "pipe"] }),
|
|
167
|
+
spawn: (command, args, captureStdout) =>
|
|
168
|
+
spawn(command, [...args], { stdio: ["ignore", captureStdout ? "pipe" : "ignore", "ignore"] }),
|
|
159
169
|
now: () => Date.now(),
|
|
160
170
|
schedule(ms, fn) {
|
|
161
171
|
const timer = setTimeout(fn, ms);
|