@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
package/src/cli/claude.ts
CHANGED
|
@@ -20,7 +20,7 @@ import { findLiveProxy } from "../server/proxy-liveness";
|
|
|
20
20
|
import type { OcxConfig } from "../types";
|
|
21
21
|
import { configuredAdminToken } from "../lib/admin-secrets";
|
|
22
22
|
import { localAdmissionToken, localInferenceDestination, localLoopbackInferencePorts, localManagementOrigin } from "../lib/local-destinations";
|
|
23
|
-
import { PROXY_MARKER, ownAdmissionTokens, defaultAuthDetectDeps, detectClaudeAuth, type AuthDetectDeps } from "../claude/auth-detect";
|
|
23
|
+
import { PROXY_MARKER, ownAdmissionTokens, defaultAuthDetectDeps, detectClaudeAuth, resolveClaudeKeychainPresence, type AuthDetectDeps } from "../claude/auth-detect";
|
|
24
24
|
import { resolveClaudeAuthMode } from "../claude/auth-mode";
|
|
25
25
|
import { withProcessRuntimeProvenance } from "../lib/bun-runtime";
|
|
26
26
|
import { selfLaunchArgv } from "../lib/self-launch-argv";
|
|
@@ -37,6 +37,17 @@ import { desktopProfileWireAlias, legacyDesktopProfileWireAlias } from "../claud
|
|
|
37
37
|
import { inspectDesktopFirstParty } from "../claude/desktop-first-party";
|
|
38
38
|
import { isClaudeInterceptProxyUrl, type ClaudeInterceptSettingsState } from "../claude/intercept/settings";
|
|
39
39
|
import { withoutSiblingMarker } from "../codex/sibling-start";
|
|
40
|
+
import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* The environment of the detached `ocx start` that `ocx claude` launches (the spawn adds the runtime
|
|
44
|
+
* provenance stamp): an ordinary owner. It
|
|
45
|
+
* carries OCX_SERVICE=1 but no service manager's marker, which is how a restart tells it apart from
|
|
46
|
+
* a manager-launched process (src/client/runtime-restart.ts classifyClientRestartSupervisor).
|
|
47
|
+
*/
|
|
48
|
+
export function claudeProxyStartEnv(base: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
|
|
49
|
+
return withoutSupervisorMarkers(withoutSiblingMarker({ ...base, OCX_SERVICE: "1" }));
|
|
50
|
+
}
|
|
40
51
|
|
|
41
52
|
export interface ClaudeLaunchEnv {
|
|
42
53
|
[key: string]: string | undefined;
|
|
@@ -377,21 +388,26 @@ export function buildClaudeEnv(
|
|
|
377
388
|
if (config.claudeCode?.alwaysEnableEffort === true) {
|
|
378
389
|
setDefault("CLAUDE_CODE_ALWAYS_ENABLE_EFFORT", "1");
|
|
379
390
|
}
|
|
380
|
-
// Tool-search deferral (#4838). Claude Code
|
|
381
|
-
//
|
|
382
|
-
//
|
|
383
|
-
//
|
|
384
|
-
//
|
|
391
|
+
// Tool-search deferral (#4838, #7963). Claude Code v2.1.304 and later turn tool
|
|
392
|
+
// search ON by default behind an ANTHROPIC_BASE_URL gateway, so MCP tools are
|
|
393
|
+
// deferred and requests carry defer_loading fields and tool_reference blocks.
|
|
394
|
+
// Earlier versions kept it off behind a gateway unless ENABLE_TOOL_SEARCH was
|
|
395
|
+
// true / auto / auto:N (code.claude.com/docs/en/mcp#tool-search-through-a-gateway).
|
|
396
|
+
//
|
|
397
|
+
// The native Anthropic passthrough route forwards those fields. A translated
|
|
398
|
+
// route cannot honour them server-side: deferred tools still carry input_schema
|
|
399
|
+
// on the wire (deferral is a server-side context optimisation, not a smaller
|
|
400
|
+
// request), toolsToResponses drops the tool_search server tool and ignores
|
|
401
|
+
// defer_loading, and compatibility.ts lists tool_search/tool_reference/
|
|
402
|
+
// deferred_tools as unsupported. On a translated Chat route each client
|
|
403
|
+
// ToolSearch load also changes the tool list and the catalog nudge, so the next
|
|
404
|
+
// request re-misses the provider's prompt cache (#7963);
|
|
405
|
+
// claudeCode.appendOnlyToolLoadingModels covers verified Responses destinations
|
|
406
|
+
// and claudeCode.chatToolDispatchModels verified direct Chat routes.
|
|
385
407
|
//
|
|
386
|
-
// We
|
|
387
|
-
//
|
|
388
|
-
//
|
|
389
|
-
// toolsToResponses drops the tool_search server tool and ignores defer_loading,
|
|
390
|
-
// and compatibility.ts lists tool_search/tool_reference/deferred_tools as
|
|
391
|
-
// unsupported. Turning it on there leaves the routed provider holding every
|
|
392
|
-
// schema while Claude Code stops counting them and stops compacting, which is
|
|
393
|
-
// worse than the problem. So this stays opt-in per config rather than
|
|
394
|
-
// unconditional, and setDefault keeps an operator's own export.
|
|
408
|
+
// We inject only when claudeCode.toolSearch is set, so an unset value leaves the
|
|
409
|
+
// client's own version default in place, and setDefault keeps an operator's own
|
|
410
|
+
// export (ENABLE_TOOL_SEARCH=false restores upfront loading).
|
|
395
411
|
setDefault("ENABLE_TOOL_SEARCH", claudeToolSearchEnv(config.claudeCode?.toolSearch));
|
|
396
412
|
const maxCtx = config.claudeCode?.maxContextTokens;
|
|
397
413
|
if (typeof maxCtx === "number" && Number.isFinite(maxCtx) && maxCtx > 0) {
|
|
@@ -527,7 +543,7 @@ export async function ensureProxyForClaude(deps: ClaudeProxyEnsureDeps = {}): Pr
|
|
|
527
543
|
stdio: "ignore",
|
|
528
544
|
windowsHide: true,
|
|
529
545
|
// An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
|
|
530
|
-
env: withProcessRuntimeProvenance(
|
|
546
|
+
env: withProcessRuntimeProvenance(claudeProxyStartEnv()),
|
|
531
547
|
});
|
|
532
548
|
child.unref();
|
|
533
549
|
const deadline = Date.now() + 8_000;
|
|
@@ -861,7 +877,10 @@ export async function cmdClaude(args: string[]): Promise<number> {
|
|
|
861
877
|
const gateway = await fetchGatewayModels(route, { admissionConfig: config });
|
|
862
878
|
const forceAvailableSelectors = typeof route === "number" ? undefined : gateway?.models.map(model => model.id) ?? [];
|
|
863
879
|
const allowRootSkipPermissions = shouldAllowRootSkipPermissions(args);
|
|
864
|
-
const
|
|
880
|
+
const keychainPresence = await resolveClaudeKeychainPresence(config.claudeCode?.authMode);
|
|
881
|
+
const env = buildClaudeEnv(config, route, process.env, contextWindows, {
|
|
882
|
+
allowRootSkipPermissions, forceAvailable, forceAvailableSelectors, authDetect: { keychainProbe: () => keychainPresence },
|
|
883
|
+
});
|
|
865
884
|
if (allowRootSkipPermissions) {
|
|
866
885
|
console.error(rootSkipPermissionsNotice(env));
|
|
867
886
|
}
|
|
@@ -38,6 +38,7 @@ import { attestCodexRuntime, codexCredentialDestinationIsTrusted, resolveCodexLa
|
|
|
38
38
|
import { codexCommandCanBypass, CODEX_UNVERIFIED_SHIM } from "./codex-launch-command";
|
|
39
39
|
import { codexTokenArgsAreSafe, codexTokenEnvironmentIsSafe } from "./codex-launch-policy";
|
|
40
40
|
import { codexTokenWithheldDiagnostic, type CodexTokenRefusal, type CodexTokenRefusalReporter } from "./codex-launch-diagnostics";
|
|
41
|
+
import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
|
|
41
42
|
|
|
42
43
|
export interface CodexLaunchEnv {
|
|
43
44
|
[key: string]: string | undefined;
|
|
@@ -115,7 +116,8 @@ export function codexProxyStartEnv(base: CodexLaunchEnv = process.env): CodexLau
|
|
|
115
116
|
const withTokenFile = stripped.OPENCODEX_API_AUTH_TOKEN?.trim()
|
|
116
117
|
? stripped
|
|
117
118
|
: { ...stripped, OCX_API_TOKEN_FILE: serviceApiTokenFilePath() };
|
|
118
|
-
|
|
119
|
+
// A shell a supervised runtime handed to a tool carries its supervisor's markers; this proxy is not its.
|
|
120
|
+
return withoutSupervisorMarkers({ ...withTokenFile, OCX_SERVICE: "1" }) as CodexLaunchEnv;
|
|
119
121
|
}
|
|
120
122
|
|
|
121
123
|
export type CodexProxyEnsureDeps = {
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { autoRestoreCodexShim, autoRestoreCodexShimAsync } from "../codex/shim";
|
|
2
2
|
import { codexShimAutoRestoreEnabled, readConfigDiagnostics } from "../config";
|
|
3
|
-
import {
|
|
3
|
+
import { skipsCodexShimAutoRestore } from "./preflight-exemptions";
|
|
4
|
+
|
|
5
|
+
// Re-exported for existing importers; the list itself lives in a leaf module so a caller that
|
|
6
|
+
// only needs it (the config-root startup wait) does not link the shim repair machinery.
|
|
7
|
+
export { skipsCodexShimAutoRestore };
|
|
4
8
|
|
|
5
9
|
export interface CodexShimAutoRestoreCliDeps {
|
|
6
10
|
env: NodeJS.ProcessEnv;
|
|
@@ -16,47 +20,6 @@ const DEFAULT_DEPS: CodexShimAutoRestoreCliDeps = {
|
|
|
16
20
|
readConfig: readConfigDiagnostics,
|
|
17
21
|
};
|
|
18
22
|
|
|
19
|
-
/** Identify command namespaces whose execution must not trigger automatic shim repair. */
|
|
20
|
-
export function skipsCodexShimAutoRestore(command: string | undefined, args: string[]): boolean {
|
|
21
|
-
if (command === "uninstall" || command === "remove") return true;
|
|
22
|
-
// Contract discovery and orchestrated update must validate before any repair.
|
|
23
|
-
if (command === "capabilities") return true;
|
|
24
|
-
if (command === "update" && isOrchestratedUpdateArgv(args)) return true;
|
|
25
|
-
if (command === "sync") return true;
|
|
26
|
-
if (command === "status" || command === "doctor") return true;
|
|
27
|
-
// Explicit orphan-token recovery must not mutate Codex before its guards run.
|
|
28
|
-
if (command === "disconnect" && args.includes("--orphaned-token")) return true;
|
|
29
|
-
// The launcher owns shim handoff after classifying routing, including native fast paths.
|
|
30
|
-
if (command === "codex") return true;
|
|
31
|
-
// Exec admission only observes the selected target; it must never repair a shim first.
|
|
32
|
-
if (command === "internal" && args[1] === "codex-exec-target") return true;
|
|
33
|
-
// `lab` is read-only inspection; it must not trigger shim side effects.
|
|
34
|
-
if (command === "lab") return true;
|
|
35
|
-
// Local messaging owns its helpers; even malformed usage must not repair/start anything.
|
|
36
|
-
if (command === "message") return true;
|
|
37
|
-
// `resolve` is read-only inspection for embedding shells: a lookup made to populate
|
|
38
|
-
// a consent surface must not trigger a shim repair side effect first.
|
|
39
|
-
if (command === "resolve") return true;
|
|
40
|
-
// Local model inventory is read-only; mutations and live commands keep preflight.
|
|
41
|
-
if (command === "models" || command === "model") {
|
|
42
|
-
const subcommand = args[1];
|
|
43
|
-
if (!subcommand || subcommand.startsWith("-") || subcommand === "list" || subcommand === "list-custom") return true;
|
|
44
|
-
}
|
|
45
|
-
// `service status --json` is a passive inventory read for peers such as GOAT: a shim repair
|
|
46
|
-
// before dispatch would change the installation it was asked only to describe.
|
|
47
|
-
// Flags may precede the verb (`ocx service --json status`), exactly as parseServiceArgs reads it.
|
|
48
|
-
if (command === "service" && args.includes("--json")
|
|
49
|
-
&& args.slice(1).find(arg => !arg.startsWith("--")) === "status") return true;
|
|
50
|
-
// The desktop's approval-bound stop must validate its snapshot before any unrelated
|
|
51
|
-
// CLI repair changes the installation it was approved against.
|
|
52
|
-
if (command === "stop" && args.some(arg => arg.startsWith("--expect-"))) return true;
|
|
53
|
-
// The entire updater-inspection namespace is zero-effect, including malformed
|
|
54
|
-
// or future actions. A later `apply` implementation must own its preflight.
|
|
55
|
-
if (command === "system" && args[1] === "codex-cli-update") return true;
|
|
56
|
-
if (command === "__update-badge") return true;
|
|
57
|
-
return command === "codex-shim" && ["install", "status", "uninstall", "remove"].includes(args[1] ?? "");
|
|
58
|
-
}
|
|
59
|
-
|
|
60
23
|
export function maybeAutoRestoreCodexShim(
|
|
61
24
|
command: string | undefined,
|
|
62
25
|
args: string[],
|
|
@@ -18,7 +18,8 @@ const USAGE = `Usage:
|
|
|
18
18
|
ocx config unset <dot.path> [--json]
|
|
19
19
|
ocx config validate [path|-] [--json]
|
|
20
20
|
ocx config export <path|-> [--json]
|
|
21
|
-
ocx config import <path|-> --yes [--json]
|
|
21
|
+
ocx config import <path|-> --yes [--json]
|
|
22
|
+
Entering v2-plaintext requires: ocx v2 mode v2-plaintext --acknowledge-plaintext-agent-messages`;
|
|
22
23
|
|
|
23
24
|
/**
|
|
24
25
|
* Keys whose VALUE is a credential and must never be printed by display commands.
|
|
@@ -142,6 +143,26 @@ function pathSegments(path: string): string[] {
|
|
|
142
143
|
return segments;
|
|
143
144
|
}
|
|
144
145
|
|
|
146
|
+
/**
|
|
147
|
+
* #8319: `config set` writes the file, but a running proxy keeps checking pairing and CORS origins
|
|
148
|
+
* against the config it is running with. `hub` is live topology and is applied only at start, including the
|
|
149
|
+
* management listener (`hub.managementIngress`)
|
|
150
|
+
* (`LIVE_TOPOLOGY_KEYS`); `corsAllowOrigins` reaches the running config only when some later live
|
|
151
|
+
* save adopts the file. Saying only "Set <path>." left an operator retrying a refused
|
|
152
|
+
* `ocx hub invite` against the old list. Limited to these keys, so the note never claims a restart
|
|
153
|
+
* that is not needed.
|
|
154
|
+
*/
|
|
155
|
+
export function startupOnlyConfigNotes(path: string): string[] {
|
|
156
|
+
const segments = pathSegments(path);
|
|
157
|
+
if (segments[0] === "corsAllowOrigins") {
|
|
158
|
+
return ["A running OpenCodex may keep using its previous corsAllowOrigins until it restarts; restart it to apply the new value now."];
|
|
159
|
+
}
|
|
160
|
+
if (segments[0] === "hub" && (segments.length === 1 || segments[1] === "managementPublicOrigin" || segments[1] === "managementIngress")) {
|
|
161
|
+
return [`A running OpenCodex applies ${segments.join(".")} only when it starts; restart it to use the new value.`];
|
|
162
|
+
}
|
|
163
|
+
return [];
|
|
164
|
+
}
|
|
165
|
+
|
|
145
166
|
function getPath(root: unknown, path: string): unknown {
|
|
146
167
|
let current = root;
|
|
147
168
|
for (const segment of pathSegments(path)) {
|
|
@@ -210,6 +231,12 @@ function validate(value: unknown): OcxConfig {
|
|
|
210
231
|
return normalizeVisionConfig(result.config);
|
|
211
232
|
}
|
|
212
233
|
|
|
234
|
+
function requireDedicatedPlaintextTransition(current: OcxConfig, candidate: OcxConfig): void {
|
|
235
|
+
if (candidate.multiAgentMode === "v2-plaintext" && current.multiAgentMode !== "v2-plaintext") {
|
|
236
|
+
throw new CliUsageError("Entering v2-plaintext requires ocx v2 mode v2-plaintext --acknowledge-plaintext-agent-messages. Task text may remain in history, provider requests and debug state. Complete that transition before restoring a config with this mode.");
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
213
240
|
export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
214
241
|
let outcome = 0;
|
|
215
242
|
const status = await runCliAction(async () => {
|
|
@@ -273,6 +300,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
273
300
|
const candidate = structuredClone(fresh) as unknown as Record<string, unknown>;
|
|
274
301
|
setPath(candidate, path, raw === undefined ? undefined : parseValue(raw), action === "unset");
|
|
275
302
|
const config = validate(candidate);
|
|
303
|
+
requireDedicatedPlaintextTransition(fresh, config);
|
|
276
304
|
savedValue = action === "unset" ? null : getPath(config, path);
|
|
277
305
|
// Setting the order here is the operator restating it, exactly as through
|
|
278
306
|
// `ocx account priority` or the management route, so it releases the manual pin
|
|
@@ -298,7 +326,10 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
298
326
|
: `config is ${outcome.reason}`);
|
|
299
327
|
}
|
|
300
328
|
printData({ ok: true, path, value: redact(savedValue, pathSegments(path).at(-1)) }, wantsJson,
|
|
301
|
-
[
|
|
329
|
+
[
|
|
330
|
+
`${action === "unset" ? "Unset" : "Set"} ${path}.`,
|
|
331
|
+
...(outcome.status === "committed" ? startupOnlyConfigNotes(path) : []),
|
|
332
|
+
]);
|
|
302
333
|
return;
|
|
303
334
|
}
|
|
304
335
|
if (action === "validate") {
|
|
@@ -334,6 +365,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
334
365
|
if (!yes) throw new CliUsageError("import requires --yes", USAGE);
|
|
335
366
|
rejectArgs(args, USAGE);
|
|
336
367
|
await withConfigDirHardeningSettled(getConfigDir(), () => {
|
|
368
|
+
// Reject invalid authority before lock preparation creates coordination files.
|
|
337
369
|
const current = readCliConfigForMutation();
|
|
338
370
|
const rawInput = loadInput(path);
|
|
339
371
|
if (rawInput && typeof rawInput === "object" && !Array.isArray(rawInput) && Object.hasOwn(rawInput, "telemetry")) {
|
|
@@ -341,6 +373,9 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
341
373
|
console.warn("Note: ignored telemetry block during config import; use `ocx telemetry` to manage telemetry consent.");
|
|
342
374
|
}
|
|
343
375
|
const imported = validate(rawInput);
|
|
376
|
+
// Do not hold the shared lock while reading stdin. Recheck the live mode and
|
|
377
|
+
// the active client connection, then save in the same synchronous transaction;
|
|
378
|
+
// saveConfig reuses this transaction.
|
|
344
379
|
withConfigMutationLockSync(() => {
|
|
345
380
|
const client = readClientConnectionState();
|
|
346
381
|
if (client.kind === "connected" && (imported.runtimeRole !== "client"
|
|
@@ -353,6 +388,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
353
388
|
} else {
|
|
354
389
|
delete imported.telemetry;
|
|
355
390
|
}
|
|
391
|
+
requireDedicatedPlaintextTransition(readCliConfigForMutation(), imported);
|
|
356
392
|
saveConfig(imported);
|
|
357
393
|
});
|
|
358
394
|
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { getConfigDir, hardenConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
2
|
+
import { WindowsSecretAclSettleTimeoutError, windowsSecretAclApplies } from "../lib/windows-secret-acl";
|
|
3
|
+
import { skipsCodexShimAutoRestore } from "./preflight-exemptions";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Wait once, before a CLI command does its first write, for the optional config-root ACL flight
|
|
7
|
+
* (#7815). On Windows, loadConfig() starts an unawaited icacls harden of the config root, and its
|
|
8
|
+
* inheritance work can drop a grant a concurrent writer just applied. Admitted writers already
|
|
9
|
+
* wait for it themselves; this covers the synchronous writers a CLI command reaches before them.
|
|
10
|
+
*
|
|
11
|
+
* Skipped where waiting would itself be the side effect or the delay matters:
|
|
12
|
+
* - the commands skipsCodexShimAutoRestore exempts from preflight repair (read-only, hot-path
|
|
13
|
+
* and validate-first commands). Adding a command there also removes this wait for it;
|
|
14
|
+
* - every "internal" helper and every hidden "__*" helper, launched by other processes under their
|
|
15
|
+
* own budgets (startup health, tray start/restart/host, version refresh, the GUI update worker);
|
|
16
|
+
* - "start", the long-lived server, and "ensure", which the Windows Codex shim runs before every
|
|
17
|
+
* launch to start it: the wait would run before Bun.serve and spend up to one ACL deadline of
|
|
18
|
+
* fixed budgets (update-restart marker, ensure readiness, Desktop cold start, service start
|
|
19
|
+
* timeouts, each Codex launch). The server's synchronous writers are documented residual.
|
|
20
|
+
*
|
|
21
|
+
* Bounded by one ACL deadline, which also drains timed-out icacls children. A timeout lets the
|
|
22
|
+
* command proceed: writers that admit through withConfigDirHardeningSettled still refuse alone.
|
|
23
|
+
*/
|
|
24
|
+
export async function settleConfigRootForCli(command: string | undefined, args: readonly string[]): Promise<void> {
|
|
25
|
+
if (!windowsSecretAclApplies()) return;
|
|
26
|
+
if (command === undefined || command === "start" || command === "ensure" || command === "internal"
|
|
27
|
+
|| command.startsWith("__") || skipsCodexShimAutoRestore(command, [...args])) return;
|
|
28
|
+
hardenConfigDir();
|
|
29
|
+
try {
|
|
30
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => undefined);
|
|
31
|
+
} catch (error) {
|
|
32
|
+
if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
|
|
33
|
+
}
|
|
34
|
+
}
|
package/src/cli/connect.ts
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
type ClientCatalogReadiness,
|
|
10
10
|
} from "../client/catalog-compatibility";
|
|
11
11
|
import {
|
|
12
|
+
assertDisconnectExpectation,
|
|
12
13
|
disconnectClient,
|
|
13
14
|
revokeConnectedClientKey,
|
|
14
15
|
rotateConnectedClientKey,
|
|
@@ -16,7 +17,10 @@ import {
|
|
|
16
17
|
} from "../client/connect";
|
|
17
18
|
import { inspectClientRotationRecoveryGate, readClientConnectionState } from "../client/state";
|
|
18
19
|
import { readClientLinkState } from "../client/link-state";
|
|
19
|
-
import {
|
|
20
|
+
import { probeLinkTunnelStatus, type LinkTunnelStatus } from "../client/link-tunnel-status";
|
|
21
|
+
import { teardownClientLink, type ClientLinkTeardownResult } from "../client/link-teardown";
|
|
22
|
+
import { ClientSyncExpectationError } from "../client/sync-expectation";
|
|
23
|
+
import { SYNC_EXPECTATION_MISMATCH_EXIT } from "./sync-expectation";
|
|
20
24
|
import { reapOrphanTunnel } from "../client/link-tunnel";
|
|
21
25
|
import { readServiceApiTokenState } from "../lib/service-secrets";
|
|
22
26
|
import type { ClientLifecycleLockDeps } from "../client/lifecycle-lock";
|
|
@@ -26,6 +30,7 @@ import { createSshRunner, type SshRunner } from "../link/ssh-runner";
|
|
|
26
30
|
import type { OrphanTunnelResult } from "../client/link-tunnel";
|
|
27
31
|
import { inspectRemoteDesktopStore } from "../claude/desktop-remote-store";
|
|
28
32
|
import type { OcxConnectedClientId } from "../types";
|
|
33
|
+
import { ROUTE_CLIENT_IDS, isRouteClientId } from "../link/route-intent";
|
|
29
34
|
import {
|
|
30
35
|
CliUsageError,
|
|
31
36
|
csv,
|
|
@@ -55,6 +60,8 @@ export interface ClientCommandDeps extends RuntimeApiDeps {
|
|
|
55
60
|
knownHostsFile?: string;
|
|
56
61
|
timeoutMs?: number;
|
|
57
62
|
};
|
|
63
|
+
/** Injected in tests; defaults to asking the running Child's /readyz. */
|
|
64
|
+
probeLinkTunnel?: () => Promise<LinkTunnelStatus>;
|
|
58
65
|
}
|
|
59
66
|
|
|
60
67
|
export interface ClientCatalogProbeDeps extends CatalogCompatibilityDeps {
|
|
@@ -73,7 +80,7 @@ export interface ClientCatalogProbeDeps extends CatalogCompatibilityDeps {
|
|
|
73
80
|
|
|
74
81
|
export const CONNECT_USAGE = `Usage:
|
|
75
82
|
ocx connect --link --key-stdin --tunnel-port <port> --link-id <id>
|
|
76
|
-
[--clients
|
|
83
|
+
[--clients <id,...>] [--catalog-timeout <seconds>] [--no-sync]
|
|
77
84
|
ocx connect <url> [--management-url <url>]
|
|
78
85
|
(--pairing-code-stdin | --admin-token-stdin)
|
|
79
86
|
[--clients codex,claude] [--management-transport direct|relay]
|
|
@@ -81,12 +88,32 @@ export const CONNECT_USAGE = `Usage:
|
|
|
81
88
|
ocx connect status [--json]
|
|
82
89
|
ocx connect rotate (--pairing-code-stdin | --admin-token-stdin)
|
|
83
90
|
[--json]
|
|
84
|
-
ocx connect revoke --admin-token-stdin [--json]
|
|
91
|
+
ocx connect revoke --admin-token-stdin [--json]
|
|
92
|
+
Link client ids: ${ROUTE_CLIENT_IDS.join(", ")}`;
|
|
85
93
|
|
|
86
94
|
export const DISCONNECT_USAGE = `Usage:
|
|
87
|
-
ocx disconnect [--keep-catalog] [--json]
|
|
95
|
+
ocx disconnect [--keep-catalog] [--recover-config --yes] [--json] [--expect-link <link id>]
|
|
88
96
|
ocx disconnect --orphaned-token --yes [--json]`;
|
|
89
97
|
|
|
98
|
+
const DISCONNECT_LINK_ID = /^lnk_[0-9a-f]{16}$/;
|
|
99
|
+
|
|
100
|
+
/** --expect-link <id> or --expect-link=<id>, given at most once; removed from args. */
|
|
101
|
+
function takeExpectLink(args: string[]): string | undefined {
|
|
102
|
+
let found: string | undefined;
|
|
103
|
+
for (let index = 0; index < args.length;) {
|
|
104
|
+
const arg = args[index]!;
|
|
105
|
+
let value: string | undefined;
|
|
106
|
+
if (arg === "--expect-link") { value = args[index + 1] ?? ""; args.splice(index, 2); }
|
|
107
|
+
else if (arg.startsWith("--expect-link=")) { value = arg.slice("--expect-link=".length); args.splice(index, 1); }
|
|
108
|
+
else { index += 1; continue; }
|
|
109
|
+
if (found !== undefined || !DISCONNECT_LINK_ID.test(value)) {
|
|
110
|
+
throw new CliUsageError("--expect-link needs one link id of the form lnk_ followed by 16 hex digits (see ocx connect status --json).", DISCONNECT_USAGE);
|
|
111
|
+
}
|
|
112
|
+
found = value;
|
|
113
|
+
}
|
|
114
|
+
return found;
|
|
115
|
+
}
|
|
116
|
+
|
|
90
117
|
export type ClientConnectionStatus = {
|
|
91
118
|
state: "disconnected" | "connected" | "invalid" | "mismatched";
|
|
92
119
|
reason?: string;
|
|
@@ -119,6 +146,12 @@ export type ClientConnectionStatus = {
|
|
|
119
146
|
readiness?: ClientCatalogReadiness["kind"];
|
|
120
147
|
/** Present whenever readiness is not `ready`; names the fault and the way out. */
|
|
121
148
|
readinessReason?: string;
|
|
149
|
+
/**
|
|
150
|
+
* A Remote Link Child's tunnel as its running runtime sees it (#8470). `state: "connected"` is
|
|
151
|
+
* the durable link record; this says whether a request can cross it now. Additive, and only on
|
|
152
|
+
* `ocx connect status` for `transport: "link"`.
|
|
153
|
+
*/
|
|
154
|
+
linkTunnel?: LinkTunnelStatus;
|
|
122
155
|
};
|
|
123
156
|
|
|
124
157
|
function readInstalledCatalogBody(): string | null {
|
|
@@ -242,8 +275,8 @@ export function collectClientConnectionStatus(
|
|
|
242
275
|
|
|
243
276
|
function parseClients(raw: string | undefined): OcxConnectedClientId[] {
|
|
244
277
|
const values = csv(raw) ?? ["codex", "claude"];
|
|
245
|
-
if (values.length < 1 || values.some(value => value
|
|
246
|
-
throw new CliUsageError(
|
|
278
|
+
if (values.length < 1 || values.some(value => !isRouteClientId(value))) {
|
|
279
|
+
throw new CliUsageError(`--clients must contain route client ids: ${ROUTE_CLIENT_IDS.join(", ")}`, CONNECT_USAGE);
|
|
247
280
|
}
|
|
248
281
|
return values as OcxConnectedClientId[];
|
|
249
282
|
}
|
|
@@ -342,7 +375,26 @@ export function connectCompletionReport(
|
|
|
342
375
|
};
|
|
343
376
|
}
|
|
344
377
|
|
|
345
|
-
|
|
378
|
+
/**
|
|
379
|
+
* Adds the tunnel verdict (#8470) only for a connected Remote Link Child, the one case with a
|
|
380
|
+
* runtime verdict to read; a hub client or a disconnected machine is returned untouched, unprobed.
|
|
381
|
+
*/
|
|
382
|
+
export async function withLinkTunnelStatus(
|
|
383
|
+
status: ClientConnectionStatus,
|
|
384
|
+
probe: () => Promise<LinkTunnelStatus>,
|
|
385
|
+
): Promise<ClientConnectionStatus> {
|
|
386
|
+
if (status.state !== "connected" || status.transport !== "link") return status;
|
|
387
|
+
// An optional diagnostic: a probe that fails must not take the durable status down with it.
|
|
388
|
+
let linkTunnel: LinkTunnelStatus;
|
|
389
|
+
try { linkTunnel = await probe(); } catch { linkTunnel = { state: "unknown", reason: "runtime_unreadable" }; }
|
|
390
|
+
return { ...status, linkTunnel };
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
function linkTunnelLine(tunnel: LinkTunnelStatus): string {
|
|
394
|
+
return tunnel.state === "up" ? "Link tunnel: up" : `Link tunnel: ${tunnel.state} (${terminalSafeText(tunnel.reason)})`;
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
export function clientConnectionStatusLines(status: ClientConnectionStatus): string[] {
|
|
346
398
|
if (status.state !== "connected") {
|
|
347
399
|
return [`Connection: ${status.state}${status.reason ? ` (${status.reason})` : ""}`];
|
|
348
400
|
}
|
|
@@ -351,6 +403,8 @@ function statusLines(status: ClientConnectionStatus): string[] {
|
|
|
351
403
|
// Second line on purpose. The whole of #4207 is that a reader stopped at "connected" and
|
|
352
404
|
// believed the client was usable, so the local verdict has to arrive before the hub detail.
|
|
353
405
|
readinessLine(status),
|
|
406
|
+
// #8470: the same holds for a link Child whose tunnel is down; say so before the detail.
|
|
407
|
+
...(status.linkTunnel ? [linkTunnelLine(status.linkTunnel)] : []),
|
|
354
408
|
`Transport: ${status.transport ?? "hub"}`,
|
|
355
409
|
...(status.link ? [`Link: ${status.link.linkId} via tunnel port ${status.link.tunnelPort}`] : []),
|
|
356
410
|
`Hub: ${status.serverUrl}`,
|
|
@@ -392,6 +446,9 @@ async function runHubConnect(argv: string[], deps: ClientCommandDeps): Promise<v
|
|
|
392
446
|
if (!serverUrl || serverUrl.startsWith("--")) throw new CliUsageError("hub URL is required", CONNECT_USAGE);
|
|
393
447
|
const managementUrl = takeOption(args, "--management-url");
|
|
394
448
|
const clients = parseClients(takeOption(args, "--clients"));
|
|
449
|
+
if (clients.some(client => client !== "codex" && client !== "claude")) {
|
|
450
|
+
throw new CliUsageError("Hub connections support only codex and claude; use Link for other clients", CONNECT_USAGE);
|
|
451
|
+
}
|
|
395
452
|
const catalogTimeoutSeconds = takeIntegerOption(args, "--catalog-timeout", { min: 1 });
|
|
396
453
|
if (catalogTimeoutSeconds !== undefined && catalogTimeoutSeconds > 120) {
|
|
397
454
|
throw new CliUsageError("--catalog-timeout must be an integer between 1 and 120", CONNECT_USAGE);
|
|
@@ -433,9 +490,9 @@ async function runHubConnect(argv: string[], deps: ClientCommandDeps): Promise<v
|
|
|
433
490
|
// only the first half is what #4207 was filed for, so the catalog now on disk is checked
|
|
434
491
|
// against the Codex CLI that will read it.
|
|
435
492
|
const readiness = inspectInstalledCatalogReadiness(installedCatalogFileState(), deps.catalogProbeDeps ?? {});
|
|
436
|
-
const report = connectCompletionReport(connection,
|
|
493
|
+
const report = connectCompletionReport(connection, connection.selectedClients, readiness);
|
|
437
494
|
for (const line of report.lines) console.log(line);
|
|
438
|
-
printCodexShimReadiness(
|
|
495
|
+
printCodexShimReadiness(connection.selectedClients);
|
|
439
496
|
if (report.failure) throw new Error(report.failure);
|
|
440
497
|
}
|
|
441
498
|
|
|
@@ -448,7 +505,8 @@ async function runLinkConnect(argv: string[], deps: ClientCommandDeps): Promise<
|
|
|
448
505
|
const managementTransport = takeOption(args, "--management-transport");
|
|
449
506
|
const pairing = takeFlag(args, "--pairing-code-stdin");
|
|
450
507
|
const admin = takeFlag(args, "--admin-token-stdin");
|
|
451
|
-
const
|
|
508
|
+
const rawClients = takeOption(args, "--clients");
|
|
509
|
+
const clients = parseClients(rawClients);
|
|
452
510
|
const catalogTimeoutSeconds = takeIntegerOption(args, "--catalog-timeout", { min: 1 });
|
|
453
511
|
if (catalogTimeoutSeconds !== undefined && catalogTimeoutSeconds > 120) {
|
|
454
512
|
throw new CliUsageError("--catalog-timeout must be an integer between 1 and 120", CONNECT_USAGE);
|
|
@@ -470,6 +528,7 @@ async function runLinkConnect(argv: string[], deps: ClientCommandDeps): Promise<
|
|
|
470
528
|
managementUrl: `http://127.0.0.1:${rawPort}`,
|
|
471
529
|
credential: { kind: "link", ...credential },
|
|
472
530
|
selectedClients: clients,
|
|
531
|
+
selectedClientsExplicit: rawClients !== undefined,
|
|
473
532
|
managementTransport: "direct",
|
|
474
533
|
transport: "link",
|
|
475
534
|
link: { tunnelPort: rawPort, linkId },
|
|
@@ -483,9 +542,9 @@ async function runLinkConnect(argv: string[], deps: ClientCommandDeps): Promise<
|
|
|
483
542
|
throw terminalSafeError(error);
|
|
484
543
|
});
|
|
485
544
|
const readiness = inspectInstalledCatalogReadiness(installedCatalogFileState(), deps.catalogProbeDeps ?? {});
|
|
486
|
-
const report = connectCompletionReport(connection,
|
|
545
|
+
const report = connectCompletionReport(connection, connection.selectedClients, readiness);
|
|
487
546
|
for (const line of report.lines) console.log(line);
|
|
488
|
-
printCodexShimReadiness(
|
|
547
|
+
printCodexShimReadiness(connection.selectedClients);
|
|
489
548
|
if (report.failure) throw new Error(report.failure);
|
|
490
549
|
}
|
|
491
550
|
|
|
@@ -515,8 +574,11 @@ export async function handleConnectCommand(argv: string[], deps: ClientCommandDe
|
|
|
515
574
|
const args = argv.slice(1);
|
|
516
575
|
const wantsJson = takeFlag(args, "--json");
|
|
517
576
|
rejectArgs(args, CONNECT_USAGE, { redactValues: true });
|
|
518
|
-
const status =
|
|
519
|
-
|
|
577
|
+
const status = await withLinkTunnelStatus(
|
|
578
|
+
collectClientConnectionStatus(Date.now(), deps.lifecycleLockDeps, deps.catalogProbeDeps ?? {}),
|
|
579
|
+
deps.probeLinkTunnel ?? probeLinkTunnelStatus,
|
|
580
|
+
);
|
|
581
|
+
printData(status, wantsJson, clientConnectionStatusLines(status));
|
|
520
582
|
return;
|
|
521
583
|
}
|
|
522
584
|
if (argv[0] === "revoke") {
|
|
@@ -535,15 +597,21 @@ export async function handleDisconnectCommand(
|
|
|
535
597
|
argv: string[],
|
|
536
598
|
deps: Pick<ClientCommandDeps, "lifecycleLockDeps" | "linkTeardownDeps"> & { orphanRecoveryDeps?: OrphanTokenRecoveryDeps } = {},
|
|
537
599
|
): Promise<number> {
|
|
538
|
-
|
|
600
|
+
let mismatch: { phase: string; reason: string } | null = null;
|
|
601
|
+
const code = await runCliAction(async () => {
|
|
539
602
|
const args = [...argv];
|
|
540
603
|
const keepCatalog = takeFlag(args, "--keep-catalog");
|
|
541
604
|
const wantsJson = takeFlag(args, "--json");
|
|
542
605
|
const orphanedToken = takeFlag(args, "--orphaned-token");
|
|
606
|
+
const recoverConfig = takeFlag(args, "--recover-config");
|
|
543
607
|
const yes = takeFlag(args, "--yes");
|
|
608
|
+
const expectLink = takeExpectLink(args);
|
|
544
609
|
rejectArgs(args, DISCONNECT_USAGE, { redactValues: true });
|
|
610
|
+
if (recoverConfig && (!yes || orphanedToken)) throw new CliUsageError("--recover-config requires --yes and cannot be combined with --orphaned-token", DISCONNECT_USAGE);
|
|
611
|
+
// A Home's link-bound disconnect never asks for config recovery; that stays a person's own plain disconnect.
|
|
612
|
+
if (recoverConfig && expectLink !== undefined) throw new CliUsageError("--recover-config cannot be combined with --expect-link", DISCONNECT_USAGE);
|
|
545
613
|
if (orphanedToken) {
|
|
546
|
-
if (!yes || keepCatalog) throw new CliUsageError("--orphaned-token requires --yes and cannot be combined with --keep-catalog", DISCONNECT_USAGE);
|
|
614
|
+
if (!yes || keepCatalog || expectLink !== undefined) throw new CliUsageError("--orphaned-token requires --yes and cannot be combined with --keep-catalog or --expect-link", DISCONNECT_USAGE);
|
|
547
615
|
const backup = await recoverOrphanedTokens({ ...deps.orphanRecoveryDeps, lifecycleLockDeps: deps.lifecycleLockDeps });
|
|
548
616
|
const restore = "Stop OpenCodex and move the saved files back into its config directory only if the destination names are absent.";
|
|
549
617
|
printData({ ...backup, restore }, wantsJson, [
|
|
@@ -552,8 +620,21 @@ export async function handleDisconnectCommand(
|
|
|
552
620
|
]);
|
|
553
621
|
return;
|
|
554
622
|
}
|
|
555
|
-
if (yes) throw new CliUsageError("--yes requires --orphaned-token", DISCONNECT_USAGE);
|
|
556
|
-
|
|
623
|
+
if (yes && !recoverConfig) throw new CliUsageError("--yes requires --orphaned-token or --recover-config", DISCONNECT_USAGE);
|
|
624
|
+
// A Home's revoke names the link it means; checked before the client-link teardown touches anything,
|
|
625
|
+
// and again inside disconnectClient under the locks it writes under. A client-initiated link (its sidecar, or the
|
|
626
|
+
// marker that survives a lost sidecar, names this link) needs the client-link teardown this path skips, so the
|
|
627
|
+
// same check refuses it before anything changes.
|
|
628
|
+
if (expectLink !== undefined) {
|
|
629
|
+
try { assertDisconnectExpectation(expectLink, deps); } catch (error) {
|
|
630
|
+
if (error instanceof ClientSyncExpectationError) { mismatch = error; return; }
|
|
631
|
+
throw error;
|
|
632
|
+
}
|
|
633
|
+
}
|
|
634
|
+
// A Home's link-bound disconnect (--expect-link) comes from the Home that owns that link's tunnel and record,
|
|
635
|
+
// and it is sent only for Home-initiated links, which have no client-link sidecar. Running this Child's
|
|
636
|
+
// client-link teardown there would only open a gap between the identity check and the locked disconnect.
|
|
637
|
+
const teardown: ClientLinkTeardownResult = expectLink !== undefined ? { linkId: null, homeRevoke: "not_applicable", tunnel: null } : await teardownClientLink({
|
|
557
638
|
readSidecar: readClientLinkState,
|
|
558
639
|
connectedLinkId: () => {
|
|
559
640
|
const state = readClientConnectionState();
|
|
@@ -566,7 +647,22 @@ export async function handleDisconnectCommand(
|
|
|
566
647
|
knownHostsFile: deps.linkTeardownDeps?.knownHostsFile ?? linkKnownHostsPath(),
|
|
567
648
|
timeoutMs: deps.linkTeardownDeps?.timeoutMs,
|
|
568
649
|
});
|
|
569
|
-
const result = await disconnectClient({ keepCatalog }, deps)
|
|
650
|
+
const result = await disconnectClient({ keepCatalog, recoverConfig, ...(expectLink !== undefined ? { expectLink } : {}) }, deps).catch((error: unknown) => {
|
|
651
|
+
if (error instanceof ClientSyncExpectationError) { mismatch = error; return null; }
|
|
652
|
+
// The bare code left a Home-driven leave with nothing to act on; the remedy already exists.
|
|
653
|
+
if (error instanceof Error && error.message === "client_catalog_ownership_changed") {
|
|
654
|
+
throw new Error("client_catalog_ownership_changed: the Codex model catalog (opencodex-catalog.json in the Codex home) matches neither the catalog this connection wrote nor the one recorded before it connected, so something changed it after connecting and disconnect will not overwrite it. To disconnect and leave that file as it is, run: ocx disconnect --keep-catalog");
|
|
655
|
+
}
|
|
656
|
+
throw error;
|
|
657
|
+
});
|
|
658
|
+
if (!result) return;
|
|
659
|
+
if (result.nativeIntentOnly) {
|
|
660
|
+
printData(result, wantsJson, [
|
|
661
|
+
"Not connected; restored the standalone native switches an interrupted Remote Link enrollment had changed.",
|
|
662
|
+
...(result.tokenRemoved ? ["Removed the service token that enrollment left behind."] : []),
|
|
663
|
+
]);
|
|
664
|
+
return;
|
|
665
|
+
}
|
|
570
666
|
const payload = {
|
|
571
667
|
...result,
|
|
572
668
|
homeRevoke: teardown.homeRevoke,
|
|
@@ -578,6 +674,7 @@ export async function handleDisconnectCommand(
|
|
|
578
674
|
};
|
|
579
675
|
printData(payload, wantsJson, [
|
|
580
676
|
"Disconnected locally; native Codex state was restored.",
|
|
677
|
+
...(result.recoveryBackupDir ? [`Codex recovery snapshot: ${result.recoveryBackupDir}/snapshot.json (private; retained for manual inspection).`] : []),
|
|
581
678
|
...(result.desktopRestoration === "standard_fallback"
|
|
582
679
|
? ["Previous Desktop settings were not recorded; the managed profile was switched to standard mode."] : []),
|
|
583
680
|
...(result.restartRequired ? ["Fully quit and reopen Claude Desktop; local cleanup cannot revoke an in-memory credential."] : []),
|
|
@@ -590,4 +687,12 @@ export async function handleDisconnectCommand(
|
|
|
590
687
|
: `The hub key ${result.apiKeyId} is still valid. Revoke it from Integrations → API Keys.`,
|
|
591
688
|
]);
|
|
592
689
|
});
|
|
690
|
+
if (mismatch) {
|
|
691
|
+
// As ocx sync --expect-link: one human line, then the JSON a Home parses as the last stderr line.
|
|
692
|
+
const refused: { phase: string; reason: string } = mismatch;
|
|
693
|
+
console.error(`Disconnect refused (${refused.phase}: ${refused.reason}); nothing was changed.${refused.reason === "client_initiated_link" ? " This machine joined its Home itself; run ocx disconnect without --expect-link." : ""}`);
|
|
694
|
+
console.error(JSON.stringify({ phase: refused.phase, reason: refused.reason }));
|
|
695
|
+
return SYNC_EXPECTATION_MISMATCH_EXIT;
|
|
696
|
+
}
|
|
697
|
+
return code;
|
|
593
698
|
}
|
|
@@ -19,7 +19,7 @@ export function duplicateRuntimeMessage(
|
|
|
19
19
|
if (pid != null && latch.observe(evidence)) {
|
|
20
20
|
const supervisor = evidence.kind === "desktop" ? `, ${evidence.app}` : "";
|
|
21
21
|
return `OpenCodex Desktop supervises the running proxy (pid ${pid}${supervisor}, port ${port}). `
|
|
22
|
-
+ "Use the running proxy, or quit OpenCodex before starting it from this CLI.";
|
|
22
|
+
+ "Use the running proxy (restart it with 'ocx restart', re-point Codex with 'ocx sync'), or quit OpenCodex before starting it from this CLI.";
|
|
23
23
|
}
|
|
24
24
|
return `⚠️ Proxy already running (PID ${pid ?? "unknown"}, port ${port}). Use 'ocx stop' first.`;
|
|
25
25
|
}
|