@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { MessageBudget } from "./budget";
|
|
3
|
+
import type { QueueMcpOptions } from "./mcp-queue-rpc";
|
|
4
|
+
import { decodeReplyCursor, replyInput, type ReplyInput } from "./mcp-reply-cursor";
|
|
5
|
+
import { queueMcpReadReply } from "./mcp-reply-tools";
|
|
6
|
+
|
|
7
|
+
export const replyWaitInput = { ...replyInput, waitMs: z.number().int().min(1).max(20_000).default(20_000) };
|
|
8
|
+
type Observation = Extract<Awaited<ReturnType<typeof queueMcpReadReply>>, { available: true }>;
|
|
9
|
+
|
|
10
|
+
/** Delay only between snapshots; cancellation always removes its timer and listener. */
|
|
11
|
+
function pause(signal: AbortSignal): Promise<void> {
|
|
12
|
+
return new Promise((resolve, reject) => {
|
|
13
|
+
const done = () => { signal.removeEventListener("abort", cancel); resolve(); };
|
|
14
|
+
const timer = setTimeout(done, 2_000);
|
|
15
|
+
const cancel = () => { clearTimeout(timer); signal.removeEventListener("abort", cancel); reject(signal.reason); };
|
|
16
|
+
signal.addEventListener("abort", cancel, { once: true });
|
|
17
|
+
if (signal.aborted) cancel();
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/** Wait for eligible stored final text, never for goal completion or exclusive/new reply ownership. */
|
|
22
|
+
export async function queueMcpWaitReply(options: QueueMcpOptions, raw: ReplyInput & { waitMs?: number }, signal?: AbortSignal) {
|
|
23
|
+
const unavailable = (code: string) => ({ available: false as const, error: { code } });
|
|
24
|
+
if (!options.allowReplyRead) return unavailable("reply_read_disabled");
|
|
25
|
+
const parsed = z.object(replyWaitInput).strict().safeParse(raw);
|
|
26
|
+
if (!parsed.success) return unavailable("reply_invalid_input");
|
|
27
|
+
const { waitMs, ...input } = parsed.data;
|
|
28
|
+
try { decodeReplyCursor(input); } catch { return unavailable("reply_invalid_cursor"); }
|
|
29
|
+
const budget = new MessageBudget(waitMs, signal);
|
|
30
|
+
let last: Observation | undefined, observedAt = 0, attempts = 0;
|
|
31
|
+
const finish = (observation: Observation, waitOutcome: "reply_observed" | "needs_pagination" | "ambiguous" | "wait_exhausted") =>
|
|
32
|
+
({ ...observation, waitOutcome, attempts, lastObservationAgeMs: Math.max(0, Math.floor(performance.now() - observedAt)) });
|
|
33
|
+
const exhausted = () => last ? finish(last, "wait_exhausted") : unavailable("reply_wait_timeout");
|
|
34
|
+
let position: ReplyInput = input;
|
|
35
|
+
try {
|
|
36
|
+
for (let index = 0; index < 3; index++) {
|
|
37
|
+
budget.throwIfEnded();
|
|
38
|
+
attempts++;
|
|
39
|
+
const snapshotStartedAt = performance.now();
|
|
40
|
+
let observedFailure = false, observedCompleteTimely = false;
|
|
41
|
+
const result = await queueMcpReadReply(options, position, budget.signal, {
|
|
42
|
+
onObservedFailure: () => { observedFailure = true; },
|
|
43
|
+
outcomeIsTimely: () => { try { budget.throwIfEnded(); return true; } catch { return false; } },
|
|
44
|
+
// Cleanup may outlive the deadline; what matters is when this snapshot's complete observation arrived.
|
|
45
|
+
onObservedSuccess: timely => { observedCompleteTimely = timely; },
|
|
46
|
+
});
|
|
47
|
+
if (signal?.aborted) return unavailable("reply_wait_cancelled");
|
|
48
|
+
if (!result.available) {
|
|
49
|
+
if (observedFailure) return result;
|
|
50
|
+
return budget.signal.aborted ? exhausted() : result;
|
|
51
|
+
}
|
|
52
|
+
// A completion observed after the deadline is not a valid success; a timely one survives cleanup.
|
|
53
|
+
if (!observedCompleteTimely) return exhausted();
|
|
54
|
+
// The reply page precedes later metadata reads and helper cleanup; age conservatively
|
|
55
|
+
// from the snapshot start so that delay cannot make an older observation appear fresh.
|
|
56
|
+
last = result; observedAt = snapshotStartedAt;
|
|
57
|
+
if (result.replies.length) return finish(result, "reply_observed");
|
|
58
|
+
if (result.status === "ambiguous") return finish(result, "ambiguous");
|
|
59
|
+
if (result.nextCursor) return finish(result, "needs_pagination");
|
|
60
|
+
if (index === 2) return exhausted();
|
|
61
|
+
// Stored summaries from another process are not authoritative live/terminal state.
|
|
62
|
+
if (result.status === "observed") position = { ...input, cursor: result.refreshCursor };
|
|
63
|
+
await pause(budget.signal);
|
|
64
|
+
}
|
|
65
|
+
return exhausted();
|
|
66
|
+
} catch {
|
|
67
|
+
if (signal?.aborted) return unavailable("reply_wait_cancelled");
|
|
68
|
+
return budget.signal.aborted ? exhausted() : unavailable("reply_wait_unavailable");
|
|
69
|
+
} finally { budget.dispose(); }
|
|
70
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { isAbsolute } from "node:path";
|
|
3
|
+
import { MessageBudget } from "./budget";
|
|
4
|
+
import { isResumeProfile } from "./resume-permissions";
|
|
5
|
+
import { LocalMessageRpc } from "./rpc";
|
|
6
|
+
import { isThreadId, LocalMessagingError } from "./types";
|
|
7
|
+
import type { QueueMcpOptions } from "./mcp-queue-rpc";
|
|
8
|
+
|
|
9
|
+
export const resumeThreadInput = { threadId: z.string().refine(isThreadId, "Use an exact thread UUID") };
|
|
10
|
+
|
|
11
|
+
/** Explicit resume preflight connects only to an existing trusted local Unix server; it creates nothing. */
|
|
12
|
+
export async function queueMcpResume(options: QueueMcpOptions, raw: { threadId: string }, signal?: AbortSignal) {
|
|
13
|
+
const failure = (code: string) => ({ status: "not_resumed" as const, executionVerified: false, error: { code } });
|
|
14
|
+
if (!options.allowResume || !options.resumeSocket || !isResumeProfile(options.resumePermissions)) return failure("resume_disabled");
|
|
15
|
+
const parsed = z.object(resumeThreadInput).strict().safeParse(raw);
|
|
16
|
+
if (!parsed.success || !isAbsolute(options.codexHome) || !isAbsolute(options.resumeSocket)) return failure("resume_invalid_input");
|
|
17
|
+
const budget = new MessageBudget(20_000, signal);
|
|
18
|
+
let rpc: LocalMessageRpc | undefined;
|
|
19
|
+
try {
|
|
20
|
+
rpc = await LocalMessageRpc.connectForResume(`ws+unix://${options.resumeSocket}:/`, budget, options.codexHome);
|
|
21
|
+
const threadId = parsed.data.threadId.toLowerCase();
|
|
22
|
+
return { ...await rpc.resumeThread(threadId, options.resumePermissions), threadId, executionVerified: false };
|
|
23
|
+
} catch (error) { return failure(error instanceof LocalMessagingError ? error.code : "resume_unavailable"); }
|
|
24
|
+
finally { rpc?.close(); budget.dispose(); }
|
|
25
|
+
}
|
|
@@ -39,7 +39,7 @@ export async function probeRemoteHost(ssh: string, budget: MessageBudget, capaci
|
|
|
39
39
|
const path = join(root, "known_hosts");
|
|
40
40
|
try {
|
|
41
41
|
writeRemoteFile(path, "");
|
|
42
|
-
await runner(buildProbeArgv({ alias: ssh, tempKnownHostsFile: path }), budget, capacity);
|
|
42
|
+
await runner(buildProbeArgv({ alias: ssh, tempKnownHostsFile: path, route: null }), budget, capacity);
|
|
43
43
|
const fingerprint = parseFingerprintLine((await runner(buildFingerprintArgv(path), budget, capacity)).trim()).fingerprint;
|
|
44
44
|
const hostKey = readRemoteFile(path);
|
|
45
45
|
if (!hostKey || hostKey.length > 8192 || hostKey.trim().split("\n").length !== 1
|
|
@@ -144,7 +144,7 @@ export async function enrollRemoteHost(store: RemoteMessageStore, alias: string,
|
|
|
144
144
|
});
|
|
145
145
|
let reply: Record<string, unknown>;
|
|
146
146
|
try {
|
|
147
|
-
const value = JSON.parse(await runner(buildExecArgv({ alias: ssh, knownHostsFile: hostsPath,
|
|
147
|
+
const value = JSON.parse(await runner(buildExecArgv({ alias: ssh, knownHostsFile: hostsPath, route: null,
|
|
148
148
|
argv: remoteOcxArgv(["message", "_control"]) }), budget, capacity, JSON.stringify(request)));
|
|
149
149
|
reply = exactRecord(value, value?.rejected !== undefined ? ["protocol", "transaction", "rejected"]
|
|
150
150
|
: ["protocol", "transaction", "machine", "port", "capability"]);
|
|
@@ -225,7 +225,7 @@ export async function removeRemoteHost(store: RemoteMessageStore, selector: stri
|
|
|
225
225
|
const path = join(store.directory, `revocation_known_hosts-${peer.transaction}-${crypto.randomUUID()}`);
|
|
226
226
|
try {
|
|
227
227
|
writeRemoteFile(path, peer.hostKey!);
|
|
228
|
-
const reply = exactRecord(JSON.parse(await runner(buildExecArgv({ alias: peer.ssh, knownHostsFile: path,
|
|
228
|
+
const reply = exactRecord(JSON.parse(await runner(buildExecArgv({ alias: peer.ssh, knownHostsFile: path, route: null,
|
|
229
229
|
argv: remoteOcxArgv(["message", "_control"]) }), budget, capacity, JSON.stringify({ protocol: REMOTE_PROTOCOL,
|
|
230
230
|
action: "remove", params: { machineId: state.machine.id, transaction: peer.transaction } }))), ["protocol", "removed"]);
|
|
231
231
|
if (reply.protocol === REMOTE_PROTOCOL && reply.removed === true) remote = "removed";
|
|
@@ -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;
|
|
@@ -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)
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import type { AccountPauseReason } from "../types/account-auto-pause";
|
|
2
|
+
import { isAnthropicInstanceId } from "../providers/anthropic-instance-id";
|
|
3
|
+
import { credentialGeneration, getAccountSet } from "./store";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Explicit, operator-requested health gate for `ocx account resume --if-healthy` (#8398).
|
|
7
|
+
*
|
|
8
|
+
* Owner decision: resume stays explicit (no background auto-resume). A pause whose recorded reason
|
|
9
|
+
* cannot clear remotely (organization disabled, permission denied, #7101) is never health-resumed.
|
|
10
|
+
* The check never refreshes a paused credential: every refresh path deliberately refuses a paused
|
|
11
|
+
* row, so an expired stored token reports `credential_expired` and the operator re-logs in, which
|
|
12
|
+
* clears an automatic pause. The usage read is the bare provider read, so it publishes no quota or
|
|
13
|
+
* routing evidence for an account that is still paused.
|
|
14
|
+
*/
|
|
15
|
+
export const PERMANENT_PAUSE_REASONS: ReadonlySet<AccountPauseReason> = new Set([
|
|
16
|
+
"oauth_organization_disabled", "account_permission_denied",
|
|
17
|
+
]);
|
|
18
|
+
|
|
19
|
+
export type ResumeHealthRefusal =
|
|
20
|
+
| "pause_not_remote_clearable" | "health_check_unsupported" | "credential_expired"
|
|
21
|
+
| "needs_reauth" | "usage_read_failed" | "account_changed";
|
|
22
|
+
|
|
23
|
+
export type ResumeHealthVerdict =
|
|
24
|
+
| { ok: true; generation: string; pauseRevision: string | undefined }
|
|
25
|
+
| { ok: false; reason: ResumeHealthRefusal };
|
|
26
|
+
|
|
27
|
+
export interface ResumeHealthDeps {
|
|
28
|
+
now?: () => number;
|
|
29
|
+
/** The provider's bare usage read for one bearer; resolves with a quota or null. */
|
|
30
|
+
readUsage?: (provider: string, accessToken: string) => Promise<{ quota: unknown | null }>;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
const EXPIRY_SKEW_MS = 60_000;
|
|
34
|
+
|
|
35
|
+
async function defaultUsageRead(_provider: string, accessToken: string): Promise<{ quota: unknown | null }> {
|
|
36
|
+
const { probeAnthropicUsageQuota } = await import("../providers/claude-cli-usage");
|
|
37
|
+
return await probeAnthropicUsageQuota(accessToken);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Whether one paused OAuth account may be resumed now; an unpaused account needs no check. */
|
|
41
|
+
export async function checkOAuthResumeHealth(provider: string, accountId: string, deps: ResumeHealthDeps = {}): Promise<ResumeHealthVerdict | null> {
|
|
42
|
+
const now = deps.now ?? Date.now;
|
|
43
|
+
const row = getAccountSet(provider)?.accounts.find(account => account.id === accountId);
|
|
44
|
+
if (!row || row.paused !== true) return null;
|
|
45
|
+
if (row.pauseDetails && PERMANENT_PAUSE_REASONS.has(row.pauseDetails.reason)) return { ok: false, reason: "pause_not_remote_clearable" };
|
|
46
|
+
if (!isAnthropicInstanceId(provider)) return { ok: false, reason: "health_check_unsupported" };
|
|
47
|
+
if (row.needsReauth === true) return { ok: false, reason: "needs_reauth" };
|
|
48
|
+
const credential = row.credential;
|
|
49
|
+
if (credential.expires <= now() + EXPIRY_SKEW_MS) return { ok: false, reason: "credential_expired" };
|
|
50
|
+
const generation = credentialGeneration(credential);
|
|
51
|
+
const pauseRevision = row.pauseRevision;
|
|
52
|
+
let quota: unknown | null = null;
|
|
53
|
+
try { quota = (await (deps.readUsage ?? defaultUsageRead)(provider, credential.access)).quota; } catch { quota = null; }
|
|
54
|
+
if (quota === null || quota === undefined) return { ok: false, reason: "usage_read_failed" };
|
|
55
|
+
const live = getAccountSet(provider)?.accounts.find(account => account.id === accountId);
|
|
56
|
+
if (!live || live.paused !== true || live.pauseRevision !== pauseRevision || credentialGeneration(live.credential) !== generation) {
|
|
57
|
+
return { ok: false, reason: "account_changed" };
|
|
58
|
+
}
|
|
59
|
+
return { ok: true, generation, pauseRevision };
|
|
60
|
+
}
|
|
@@ -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) {
|