@bitkyc08/opencodex 2.100.2 → 2.100.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,26 +1,39 @@
|
|
|
1
|
+
import { isResumeProfile } from "../messaging/resume-permissions";
|
|
1
2
|
import { isAbsolute } from "node:path";
|
|
2
3
|
import type { QueueMcpOptions } from "../messaging/mcp-queue-rpc";
|
|
3
4
|
|
|
4
5
|
/** Validate all syntax before importing the MCP host or resolving any executable/home. */
|
|
5
6
|
export function parseQueueMcpArgs(argv: readonly string[]): QueueMcpOptions | null {
|
|
6
|
-
|
|
7
|
-
if (reads > 1) return null;
|
|
8
|
-
const paths = argv.filter(arg => arg !== "--allow-reply-read");
|
|
9
|
-
if (paths.length !== 4) return null;
|
|
7
|
+
let reads = false, resume = false;
|
|
10
8
|
const values: Record<string, string> = {};
|
|
11
|
-
for (let i = 0; i <
|
|
12
|
-
const flag =
|
|
13
|
-
if (
|
|
14
|
-
|
|
9
|
+
for (let i = 0; i < argv.length; i++) {
|
|
10
|
+
const flag = argv[i]!;
|
|
11
|
+
if (flag === "--allow-reply-read") {
|
|
12
|
+
if (reads) return null;
|
|
13
|
+
reads = true;
|
|
14
|
+
continue;
|
|
15
|
+
}
|
|
16
|
+
if (flag === "--allow-resume") {
|
|
17
|
+
if (resume) return null;
|
|
18
|
+
resume = true;
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
const value = argv[++i];
|
|
22
|
+
if (!["--codex", "--codex-home", "--resume-socket", "--resume-permissions"].includes(flag) || values[flag] !== undefined
|
|
23
|
+
|| !value || (flag === "--resume-permissions" ? !isResumeProfile(value) : !isAbsolute(value)) || /[\x00-\x1f]/.test(value)) return null;
|
|
15
24
|
values[flag] = value;
|
|
16
25
|
}
|
|
17
|
-
|
|
26
|
+
if (!values["--codex"] || !values["--codex-home"] || (resume
|
|
27
|
+
? !values["--resume-socket"] || !values["--resume-permissions"]
|
|
28
|
+
: values["--resume-socket"] || values["--resume-permissions"])) return null;
|
|
29
|
+
return { codex: values["--codex"], codexHome: values["--codex-home"], ...(reads ? { allowReplyRead: true } : {}),
|
|
30
|
+
...(resume ? { allowResume: true, resumeSocket: values["--resume-socket"], resumePermissions: values["--resume-permissions"] } : {}) };
|
|
18
31
|
}
|
|
19
32
|
|
|
20
33
|
export async function runMessageMcpCommand(argv: readonly string[]): Promise<number> {
|
|
21
34
|
const options = parseQueueMcpArgs(argv);
|
|
22
35
|
if (!options) {
|
|
23
|
-
console.error("Usage: ocx message mcp --codex <absolute-cli-path> --codex-home <absolute-existing-home> [--allow-reply-read]");
|
|
36
|
+
console.error("Usage: ocx message mcp --codex <absolute-cli-path> --codex-home <absolute-existing-home> [--allow-reply-read] [--allow-resume --resume-socket <absolute-existing-unix-socket> --resume-permissions <profile-id>]");
|
|
24
37
|
return 64;
|
|
25
38
|
}
|
|
26
39
|
if (process.platform === "win32") {
|
|
@@ -44,7 +44,7 @@ const USAGE = `Usage:
|
|
|
44
44
|
ocx models selected <provider> [--set <id,id...>|--clear] [--json]
|
|
45
45
|
ocx models preset show [--provider <name>] [--json]
|
|
46
46
|
ocx models preset apply <provider> [--all] [--json]
|
|
47
|
-
ocx models new-policy [on|off] [--provider <name>] [--json]
|
|
47
|
+
ocx models new-policy [on|off|admit] [--provider <name>] [--json]
|
|
48
48
|
ocx models new-arrivals [--json]
|
|
49
49
|
${MODELS_CONTEXT_USAGE}
|
|
50
50
|
ocx models shadow <status|set> [model|-] [--enabled <on|off>] [--json]
|
|
@@ -355,7 +355,7 @@ async function setModelSettings(argv: string[], deps: RuntimeApiDeps): Promise<v
|
|
|
355
355
|
if (Object.keys(patch).length > 0) {
|
|
356
356
|
throw new CliUsageError("--reset clears every override and cannot be combined with other options", USAGE);
|
|
357
357
|
}
|
|
358
|
-
for (const key of ["contextWindow", "inputModalities", "reasoningEfforts", "defaultReasoningEffort"]) patch[key] = null;
|
|
358
|
+
for (const key of ["contextWindow", "inputModalities", "responsesCustomTools", "reasoningEfforts", "defaultReasoningEffort"]) patch[key] = null;
|
|
359
359
|
}
|
|
360
360
|
if (Object.keys(patch).length === 0) throw new CliUsageError("at least one setting or --reset is required", USAGE);
|
|
361
361
|
const result = await runtimeRequest<{ changed?: boolean; hasOverrides?: boolean; saved?: boolean; catalogRefresh?: { status?: string; retryable?: boolean } }>("/api/model-settings", {
|
|
@@ -507,7 +507,7 @@ async function newPolicy(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
|
507
507
|
const state = args[0] && !args[0].startsWith("--") ? args.shift()!.toLowerCase() : undefined;
|
|
508
508
|
const provider = takeOption(args, "--provider")?.trim();
|
|
509
509
|
const wantsJson = takeFlag(args, "--json");
|
|
510
|
-
if (state !== undefined && state !== "on" && state !== "off") throw new CliUsageError("new policy must be on or
|
|
510
|
+
if (state !== undefined && state !== "on" && state !== "off" && state !== "admit") throw new CliUsageError("new policy must be on, off or admit", USAGE);
|
|
511
511
|
rejectArgs(args, USAGE);
|
|
512
512
|
if (!state) {
|
|
513
513
|
const result = await runtimeRequest<{ policy: string; providers: Record<string, string> }>("/api/model-discovery", {}, deps);
|
package/src/cli/opencode.ts
CHANGED
|
@@ -54,6 +54,7 @@ import { withProcessRuntimeProvenance } from "../lib/bun-runtime";
|
|
|
54
54
|
import { selfLaunchArgv } from "../lib/self-launch-argv";
|
|
55
55
|
import { withoutSiblingMarker } from "../codex/sibling-start";
|
|
56
56
|
import { parseJsonc } from "../lib/jsonc";
|
|
57
|
+
import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
|
|
57
58
|
export { parseJsonc };
|
|
58
59
|
|
|
59
60
|
/**
|
|
@@ -575,7 +576,8 @@ export function opencodeProxyStartEnv(base: OpencodeLaunchEnv = process.env): Op
|
|
|
575
576
|
const withTokenFile = base.OPENCODEX_API_AUTH_TOKEN?.trim()
|
|
576
577
|
? base
|
|
577
578
|
: serviceTokenLookupEnv(base);
|
|
578
|
-
|
|
579
|
+
// A shell a supervised runtime handed to a tool carries its supervisor's markers; this proxy is not its.
|
|
580
|
+
return withoutSupervisorMarkers({ ...withTokenFile, OCX_SERVICE: "1" });
|
|
579
581
|
}
|
|
580
582
|
|
|
581
583
|
/**
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import type { OwnedIntegrationRefreshOutcome } from "../integrations/owned-refresh";
|
|
2
|
+
import { createIntegrationStateStore, type IntegrationStateStore } from "../integrations/store";
|
|
3
|
+
import { runtimeRequest, type RuntimeApiDeps } from "./runtime-api";
|
|
4
|
+
|
|
5
|
+
/** Kept in step with `PI_SYNC_PATH` in src/server/management/integration-routes.ts. */
|
|
6
|
+
export const PI_SYNC_ROUTE = "/api/client-integrations/pi/sync";
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Refresh an already-connected Pi file through the running proxy.
|
|
10
|
+
*
|
|
11
|
+
* Pi may carry raw nested selectors, and only the proxy that serves them can prove each one
|
|
12
|
+
* routes to the same model (#8172). The CLI's saved configuration and its in-process router
|
|
13
|
+
* cache are not that proof, so there is deliberately no local fallback: a refusal or an older
|
|
14
|
+
* proxy without the route is reported as a Pi outcome and the file is left as it is.
|
|
15
|
+
*/
|
|
16
|
+
export async function refreshPiThroughServer(
|
|
17
|
+
deps: RuntimeApiDeps & { store?: IntegrationStateStore; request?: typeof runtimeRequest } = {},
|
|
18
|
+
): Promise<OwnedIntegrationRefreshOutcome[]> {
|
|
19
|
+
// The ownership record is the user's opt-in; an unconnected Pi never reaches the server.
|
|
20
|
+
const record = (deps.store ?? createIntegrationStateStore()).readRecords().pi;
|
|
21
|
+
if (!record || record.clientId !== "pi") return [];
|
|
22
|
+
try {
|
|
23
|
+
const result = await (deps.request ?? runtimeRequest)<{ results?: OwnedIntegrationRefreshOutcome[] }>(
|
|
24
|
+
PI_SYNC_ROUTE,
|
|
25
|
+
{ method: "POST", headers: { "content-type": "application/json" }, body: "{}" },
|
|
26
|
+
deps,
|
|
27
|
+
);
|
|
28
|
+
if (!Array.isArray(result.results)) {
|
|
29
|
+
return [{ client: "pi", ok: false, reason: "The running proxy does not support Pi synchronization; restart it to refresh Pi." }];
|
|
30
|
+
}
|
|
31
|
+
return result.results.filter(outcome => outcome.client === "pi");
|
|
32
|
+
} catch (error) {
|
|
33
|
+
return [{ client: "pi", ok: false, reason: error instanceof Error ? error.message : String(error) }];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { isOrchestratedUpdateArgv } from "../update/orchestrated-arguments.mjs";
|
|
2
|
+
|
|
3
|
+
/** Identify command namespaces whose execution must not trigger automatic shim repair. */
|
|
4
|
+
export function skipsCodexShimAutoRestore(command: string | undefined, args: string[]): boolean {
|
|
5
|
+
if (command === "uninstall" || command === "remove") return true;
|
|
6
|
+
// Contract discovery and orchestrated update must validate before any repair.
|
|
7
|
+
if (command === "capabilities") return true;
|
|
8
|
+
// Reading the bounded link diagnostics file must not repair, harden or create anything first.
|
|
9
|
+
if (command === "link" && args[1] === "diagnostics") return true;
|
|
10
|
+
if (command === "update" && isOrchestratedUpdateArgv(args)) return true;
|
|
11
|
+
// The headless Desktop updater validates its installation before anything changes; with or
|
|
12
|
+
// without --json it must not repair a shim first.
|
|
13
|
+
if (command === "update" && args.includes("--desktop")) return true;
|
|
14
|
+
if (command === "sync") return true;
|
|
15
|
+
if (command === "status" || command === "doctor") return true;
|
|
16
|
+
// Explicit orphan-token recovery must not mutate Codex before its guards run.
|
|
17
|
+
if (command === "disconnect" && args.includes("--orphaned-token")) return true;
|
|
18
|
+
// A Home's link-bound disconnect (--expect-link) must refuse a mismatch with nothing changed, repairs included.
|
|
19
|
+
if (command === "disconnect" && args.some(arg => arg === "--expect-link" || arg.startsWith("--expect-link="))) return true;
|
|
20
|
+
// The launcher owns shim handoff after classifying routing, including native fast paths.
|
|
21
|
+
if (command === "codex") return true;
|
|
22
|
+
// Exec admission only observes the selected target; it must never repair a shim first.
|
|
23
|
+
if (command === "internal" && args[1] === "codex-exec-target") return true;
|
|
24
|
+
// `lab` is read-only inspection; it must not trigger shim side effects.
|
|
25
|
+
if (command === "lab") return true;
|
|
26
|
+
// Local messaging owns its helpers; even malformed usage must not repair/start anything.
|
|
27
|
+
if (command === "message") return true;
|
|
28
|
+
// `resolve` is read-only inspection for embedding shells: a lookup made to populate
|
|
29
|
+
// a consent surface must not trigger a shim repair side effect first.
|
|
30
|
+
if (command === "resolve") return true;
|
|
31
|
+
// Local model inventory is read-only; mutations and live commands keep preflight.
|
|
32
|
+
if (command === "models" || command === "model") {
|
|
33
|
+
const subcommand = args[1];
|
|
34
|
+
if (!subcommand || subcommand.startsWith("-") || subcommand === "list" || subcommand === "list-custom") return true;
|
|
35
|
+
}
|
|
36
|
+
// `service status --json` is a passive inventory read for peers such as GOAT: a shim repair
|
|
37
|
+
// before dispatch would change the installation it was asked only to describe.
|
|
38
|
+
// Flags may precede the verb (`ocx service --json status`), exactly as parseServiceArgs reads it.
|
|
39
|
+
if (command === "service" && args.includes("--json")
|
|
40
|
+
&& args.slice(1).find(arg => !arg.startsWith("--")) === "status") return true;
|
|
41
|
+
// The desktop's approval-bound stop must validate its snapshot before any unrelated
|
|
42
|
+
// CLI repair changes the installation it was approved against.
|
|
43
|
+
if (command === "stop" && args.some(arg => arg.startsWith("--expect-"))) return true;
|
|
44
|
+
// The entire updater-inspection namespace is zero-effect, including malformed
|
|
45
|
+
// or future actions. A later `apply` implementation must own its preflight.
|
|
46
|
+
if (command === "system" && args[1] === "codex-cli-update") return true;
|
|
47
|
+
if (command === "__update-badge") return true;
|
|
48
|
+
return command === "codex-shim" && ["install", "status", "uninstall", "remove"].includes(args[1] ?? "");
|
|
49
|
+
}
|
package/src/cli/registry.ts
CHANGED
|
@@ -51,11 +51,12 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
51
51
|
},
|
|
52
52
|
{
|
|
53
53
|
name: "stop",
|
|
54
|
-
usage: "ocx stop [--json]",
|
|
54
|
+
usage: "ocx stop [--json] [--deadline-ms <ms>]",
|
|
55
55
|
summary: "Stop the proxy; preserve connected-client integrations, restore native Codex config for standalone owners.",
|
|
56
56
|
details: [
|
|
57
57
|
"--json keeps the stop path unchanged and prints one structured summary document on stdout; human output moves to stderr.",
|
|
58
58
|
"Exit codes are identical with and without --json: 0, 1, 79 (history cleanup incomplete), 80 (teardown deferred).",
|
|
59
|
+
"--deadline-ms <ms> Windows: finish the service stop within <ms> of this command's start, or refuse up front with nothing changed (default 60000; OCX_STOP_DEADLINE_MS is read when the flag is absent).",
|
|
59
60
|
],
|
|
60
61
|
},
|
|
61
62
|
{
|
|
@@ -152,17 +153,27 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
152
153
|
},
|
|
153
154
|
{
|
|
154
155
|
name: "link",
|
|
155
|
-
usage: "ocx link <port|issue|status|revoke|reconnect|cleanup|check>",
|
|
156
|
+
usage: "ocx link <port|issue|status|diagnostics|revoke|reconnect|cleanup|check|update|sync|restart-codex|capture|policy>",
|
|
156
157
|
summary: "Allocate and manage a loopback remote home link.",
|
|
157
158
|
details: [
|
|
158
159
|
"Port: ocx link port [--json]",
|
|
159
160
|
"Issue: ocx link issue --alias <alias> --tunnel-port <port> [--json]",
|
|
160
161
|
"Status: ocx link status [--json]",
|
|
162
|
+
"Diagnostics: ocx link diagnostics [--limit <n>] [--since <iso-time|epoch-ms>] [--json]",
|
|
161
163
|
"Revoke: ocx link revoke --link-id <id> [--force --yes] [--json]",
|
|
162
164
|
"Reconnect: ocx link reconnect --link-id <id> [--json]",
|
|
163
165
|
"Cleanup: ocx link cleanup [--link-id <id>] [--json]",
|
|
164
166
|
"Check: ocx link check (--link-id <id> | --all) [--no-wait] [--json]",
|
|
165
|
-
"
|
|
167
|
+
"Update: ocx link update (--link-id <id> | --all) --yes [--no-wait] [--json]",
|
|
168
|
+
"Sync: ocx link sync (--link-id <id> | --all) [--no-wait] [--json]",
|
|
169
|
+
"Sync with a restart: ocx link sync --link-id <id> (--restart-app-server-only | --restart-codex --yes) [--ignore-activity] [--no-wait] [--json]",
|
|
170
|
+
"Restart Codex: ocx link restart-codex --link-id <id> [--scope app-server|codex] --yes [--ignore-activity] [--no-wait] [--json]",
|
|
171
|
+
"Capture: ocx link capture <start [--minutes <1-60>]|stop|status> [--json]",
|
|
172
|
+
"Policy: ocx link policy [--updates off|notify|auto-when-idle] [--catalog-fanout auto|manual] [--child-codex-restart never|app-server-when-idle] [--idle-after-minutes <1-60>] [--json]",
|
|
173
|
+
"Activity holds: ocx link activity clear --link-id <id> [--json]",
|
|
174
|
+
"Issue, status, revoke, reconnect, check, update, sync, restart-codex, policy and activity use the running proxy's loopback management API and admin token; update, sync and restart-codex act only on Home-initiated links.",
|
|
175
|
+
"Capture is a local file operation on this machine; it needs no running proxy, works on a Home and a Child, and no sync or remote input can start it.",
|
|
176
|
+
"Diagnostics reads this computer's link diagnostics file directly and needs no running proxy.",
|
|
166
177
|
],
|
|
167
178
|
},
|
|
168
179
|
{
|
|
@@ -179,16 +190,19 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
179
190
|
},
|
|
180
191
|
{
|
|
181
192
|
name: "disconnect",
|
|
182
|
-
usage: "ocx disconnect [--keep-catalog] [--json]",
|
|
193
|
+
usage: "ocx disconnect [--keep-catalog] [--recover-config --yes] [--json] [--expect-link <linkId>]",
|
|
183
194
|
summary: "Restore local client state offline and clear the remote-hub connection.",
|
|
195
|
+
details: [
|
|
196
|
+
"--expect-link <linkId> disconnects only when this machine is a connected Remote Link Child of that link, or, once its connection is already cleared, finishes the unfinished disconnect. A Home's revoke sends it so a delayed revoke of an old link cannot disconnect a newer one. Any other state (disconnected with no unfinished disconnect, another link or key, a hub client, a pending key rotation or connect, another connection's unfinished disconnect while connected, unreadable state) changes nothing, exits 5, and prints {\"phase\":\"child_link_mismatch\",\"reason\":...} as the last stderr line. A client-initiated link (this machine joined its Home itself, shown by its sidecar or by the marker that outlives a lost sidecar) is refused the same way (reason client_initiated_link); disconnect it without --expect-link. A malformed or repeated flag, or one combined with --orphaned-token or --recover-config, exits 2.",
|
|
197
|
+
],
|
|
184
198
|
},
|
|
185
199
|
{
|
|
186
200
|
name: "sync",
|
|
187
|
-
usage: "ocx sync [--expect-link <linkId> | --expect-hub-key <apiKeyId>] [--local-only] [--json] [--restart-codex] [--restart-app-server-only]",
|
|
201
|
+
usage: "ocx sync [--expect-link <linkId> | --expect-hub-key <apiKeyId>] [--overwrite-conflict [--overwrite-client <id>]] [--local-only] [--json] [--restart-codex] [--restart-app-server-only] [--child <linkId>]... [--restart-children[=app-server] | --restart-children=codex --yes]",
|
|
188
202
|
summary: "Fetch provider models and inject them into Codex config.",
|
|
189
203
|
details: [
|
|
190
204
|
"A current Home catalog fans out to linked Children; --local-only disables fan-out and --json emits the result. Partial fan-out exits 6.",
|
|
191
|
-
"
|
|
205
|
+
"--child <linkId> (repeatable) limits fan-out to those links; the others report not-selected. A Child held by a Child operation is skipped as child-busy. Fan-out requests no Codex restart on a Child unless --restart-children[=app-server] or --restart-children=codex --yes is given; the Home then skips the restart, never the sync, for a Child with a model request in flight (restart-skipped:link-active), on Windows Children, and on ocx-child, and exits 6. The Child's pinned sync may restart its OpenCodex client runtime after applying changed Home settings.",
|
|
192
206
|
"After writing the catalog, warns if long-lived Codex app-server processes are still running.",
|
|
193
207
|
"An update in flight or an unavailable update/sync mutex refuses without changes: update-in-flight, exit 7. Another sync reports sync-in-progress, exit 1.",
|
|
194
208
|
"--restart-codex restarts the app-servers AND fully quits and relaunches the Codex desktop app on macOS, Linux and Windows, after catalog/cache writes or a committed configuration change. It ends live conversations.",
|
|
@@ -241,10 +255,12 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
241
255
|
},
|
|
242
256
|
{
|
|
243
257
|
name: "login",
|
|
244
|
-
usage: "ocx login <provider> [--headless]",
|
|
258
|
+
usage: "ocx login <provider> [--headless] [--accept-antigravity-risk]",
|
|
245
259
|
summary: "OAuth or API-key login for a provider.",
|
|
246
260
|
details: [
|
|
247
261
|
"--headless (anthropic, anthropic2): no browser and no local port; approve in any browser and paste the displayed code.",
|
|
262
|
+
"--headless (xai): device authorization instead of the loopback callback; no local port, confirm the printed short code in any browser, nothing to paste.",
|
|
263
|
+
"google-antigravity: Google can disable the whole Google account for this sign-in. The warning always prints; a terminal must answer y, and a non-interactive run needs --accept-antigravity-risk or is refused. Runs driven by a coding agent or CI are always refused.",
|
|
248
264
|
"Codex/ChatGPT: ocx login codex runs the Codex account-pool login (same flow as ocx account login codex).",
|
|
249
265
|
"That one needs a running proxy; the OAuth and API-key providers log in locally.",
|
|
250
266
|
"'chatgpt' and 'openai' are the same route; an OpenAI platform API key is 'ocx login openai-apikey'.",
|
|
@@ -253,10 +269,11 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
253
269
|
{ name: "logout", usage: "ocx logout <provider>", summary: "Remove a stored provider login." },
|
|
254
270
|
{
|
|
255
271
|
name: "gui",
|
|
256
|
-
usage: "ocx gui [pair --origin <browser-origin> [--json]]",
|
|
272
|
+
usage: "ocx gui [pair [--desktop] --origin <browser-origin> [--json]]",
|
|
257
273
|
summary: "Open the opencodex dashboard or create a secret single-use remote pairing grant.",
|
|
258
274
|
details: [
|
|
259
275
|
"Pairing requires an explicit allowed --origin; there is no localhost or config-derived default.",
|
|
276
|
+
"--desktop authorizes only Desktop compatibility actions in an existing standalone local dashboard session, for at most five minutes; it does not authorize Remote Link or key disclosure.",
|
|
260
277
|
"The printed grant is secret, single-use, short-lived, and must not be persisted.",
|
|
261
278
|
],
|
|
262
279
|
},
|
|
@@ -294,11 +311,13 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
294
311
|
},
|
|
295
312
|
{
|
|
296
313
|
name: "update",
|
|
297
|
-
usage: "ocx update [--tag latest|preview] | --plan --json [--tag latest|preview | --version <version>] | --yes --json [--tag latest|preview | --version <version>] [--expect-plan <token>] [--not-after <unix-ms>]",
|
|
314
|
+
usage: "ocx update [--tag latest|preview] | --plan --json [--tag latest|preview | --version <version>] | --yes --json [--tag latest|preview | --version <version>] [--expect-plan <token>] [--not-after <unix-ms>] | --desktop [--check] [--json]",
|
|
298
315
|
summary: "Update opencodex. Preview installs stay on the preview tag unless overridden.",
|
|
299
316
|
details: [
|
|
300
317
|
"--plan --json previews an orchestrated update; --yes --json applies it. --expect-plan binds apply to the returned planToken; --not-after sets a Unix millisecond mutation deadline.",
|
|
301
318
|
"Orchestrated exit codes: 0 verified or up-to-date; 10 refused; 11 failed with previous version verified; 12 unverified or still running; 64 invalid usage.",
|
|
319
|
+
"--desktop updates a Windows OpenCodex Desktop installation without its window: it verifies the published MSI with the app's updater key, installs it silently and restarts the runtime that still serves the old version. Run it with that installation's ocx.exe from an elevated terminal. --check only reports.",
|
|
320
|
+
"Desktop exit codes: 0 done or up to date; 1 nothing installed; 2 installed but the old runtime still serves (or a reboot is pending); 3 installer outcome uncertain; 64 invalid usage or not a Desktop installation.",
|
|
302
321
|
],
|
|
303
322
|
},
|
|
304
323
|
{
|
|
@@ -407,9 +426,9 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
407
426
|
details: [
|
|
408
427
|
"ocx advisor and ocx advisor status read the resolved settings; use --json for machine-readable output.",
|
|
409
428
|
"ocx advisor on requires current context-sharing consent. Pass --ack-context-sharing to record consent v1 and enable. ocx advisor off disables the sidecar without granting consent.",
|
|
410
|
-
"ocx advisor consent records consent v1 after printing the disclosure. ocx advisor consent --revoke removes it and
|
|
411
|
-
"ocx advisor set updates --model, --effort, --policy and --timeout-ms; the model may be any routable model string (bare native, provider/model, or account-qualified). set does not grant consent.",
|
|
412
|
-
"policy manual consults only when the worker calls the synthetic advisor tool; policy preflight also attempts one automatic consultation per task with a stable conversation identity, once the task shows orientation evidence. Without a stable identity, each eligible request may trigger another consultation. Both require current consent before any task context is sent.",
|
|
429
|
+
"ocx advisor consent records consent v1 after printing the disclosure. ocx advisor consent --revoke removes it: consultations not yet dispatched are blocked, while a dispatched consultation cannot be cancelled and task content already sent cannot be retracted.",
|
|
430
|
+
"ocx advisor set updates --model, --effort, --policy, --context-mode, --max-consultations and --timeout-ms; the model may be any routable model string (bare native, provider/model, or account-qualified). set does not grant consent.",
|
|
431
|
+
"In the default context mode, policy manual consults only when the worker calls the synthetic advisor tool; policy preflight also attempts one automatic consultation per task with a stable conversation identity, once the task shows orientation evidence. Without a stable identity, each eligible request may trigger another consultation. Both require current consent before any task context is sent. The question-only mode pauses automatic consultations.",
|
|
413
432
|
],
|
|
414
433
|
},
|
|
415
434
|
{
|
|
@@ -432,8 +451,8 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
|
|
|
432
451
|
},
|
|
433
452
|
{
|
|
434
453
|
name: "route",
|
|
435
|
-
usage: "ocx route <combo|policy> <subcommand>",
|
|
436
|
-
summary: "Manage combo routing and
|
|
454
|
+
usage: "ocx route <combo|policy|to> <subcommand>",
|
|
455
|
+
summary: "Manage combo routing, routing profiles and per-device client intent.",
|
|
437
456
|
},
|
|
438
457
|
{
|
|
439
458
|
name: "effort",
|
package/src/cli/resolve.ts
CHANGED
|
@@ -21,6 +21,8 @@
|
|
|
21
21
|
* - exit 1 when the CLI cannot resolve: an invalid config.json must NOT be answered
|
|
22
22
|
* with `loadConfig`'s repair-to-defaults behaviour, because that hands the caller
|
|
23
23
|
* a guessed port; and unknown liveness must not be answered as absence.
|
|
24
|
+
* Under `--json` that exit still prints its one document: a `ResolveFailureJson`
|
|
25
|
+
* (`ok: false` plus a fixed `reason`) beside the unchanged stderr line (#8318).
|
|
24
26
|
* - exit 64 for any argument, pre-parsed in src/cli/root.ts before preflight side
|
|
25
27
|
* effects, mirroring `ocx ready`. The verb is read-only and listed in
|
|
26
28
|
* skipsCodexShimAutoRestore, so a lookup made to populate a consent surface never
|
|
@@ -136,6 +138,18 @@ export type ResolveTakeover =
|
|
|
136
138
|
| { kind: "supported"; protocolVersion: number; minimumCliVersion: string; token: string }
|
|
137
139
|
| { kind: "blocked"; reason: string; detail: string; minimumCliVersion: string };
|
|
138
140
|
|
|
141
|
+
/**
|
|
142
|
+
* The document `--json` prints when resolve exits 1 (#8318). It carries no liveness, port or
|
|
143
|
+
* ownership field, so nothing in it can be read as absence; `error` repeats the stderr line.
|
|
144
|
+
* A shell that keys on the exit status, as the desktop does, can ignore it.
|
|
145
|
+
*/
|
|
146
|
+
export interface ResolveFailureJson {
|
|
147
|
+
schema: typeof RESOLVE_SCHEMA;
|
|
148
|
+
ok: false;
|
|
149
|
+
reason: "config_unreadable" | "config_invalid" | "discovery_failed" | "liveness_unknown";
|
|
150
|
+
error: string;
|
|
151
|
+
}
|
|
152
|
+
|
|
139
153
|
export interface ResolveArgs {
|
|
140
154
|
json: boolean;
|
|
141
155
|
}
|
|
@@ -273,28 +287,30 @@ export async function runResolve(args: ResolveArgs, io: ResolveIo = {}): Promise
|
|
|
273
287
|
const resolveState = io.resolveState ?? resolveServiceState;
|
|
274
288
|
const observeManagers = io.observeManagers ?? observeManagingClis;
|
|
275
289
|
const configHome = configDir();
|
|
290
|
+
const fail = (reason: ResolveFailureJson["reason"], error: string): number => {
|
|
291
|
+
stderr.error(error);
|
|
292
|
+
if (args.json) stdout.log(JSON.stringify({ schema: RESOLVE_SCHEMA, ok: false, reason, error } satisfies ResolveFailureJson));
|
|
293
|
+
return 1;
|
|
294
|
+
};
|
|
276
295
|
let diagnostics: ConfigDiagnostics;
|
|
277
296
|
try {
|
|
278
297
|
diagnostics = readDiagnostics();
|
|
279
298
|
} catch (error) {
|
|
280
299
|
// A resolution that could not run must not read as "no proxy": the caller has to
|
|
281
300
|
// refuse to guess (D5) rather than treat this as a proven-absent verdict.
|
|
282
|
-
|
|
283
|
-
return 1;
|
|
301
|
+
return fail("config_unreadable", `resolve failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
284
302
|
}
|
|
285
303
|
if (diagnostics.source === "fallback") {
|
|
286
304
|
// An invalid config must not resolve to defaults: the effective port would be a
|
|
287
305
|
// guess at 10100 while the operator's config.port is unread. The repair-to-defaults
|
|
288
306
|
// policy in loadConfig is for interactive recovery, not for a shell contract.
|
|
289
|
-
|
|
290
|
-
return 1;
|
|
307
|
+
return fail("config_invalid", `resolve failed: the config in ${configHome} is invalid (${diagnostics.error ?? "unknown error"}); refusing to guess.`);
|
|
291
308
|
}
|
|
292
309
|
let live: LiveProxy | null;
|
|
293
310
|
try {
|
|
294
311
|
live = await findLive();
|
|
295
312
|
} catch (error) {
|
|
296
|
-
|
|
297
|
-
return 1;
|
|
313
|
+
return fail("discovery_failed", `resolve failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
298
314
|
}
|
|
299
315
|
if (!live) {
|
|
300
316
|
// findLiveProxy collapses "definitely nothing" and "could not tell" into the same
|
|
@@ -310,8 +326,7 @@ export async function runResolve(args: ResolveArgs, io: ResolveIo = {}): Promise
|
|
|
310
326
|
provenDown = false;
|
|
311
327
|
}
|
|
312
328
|
if (!provenDown) {
|
|
313
|
-
|
|
314
|
-
return 1;
|
|
329
|
+
return fail("liveness_unknown", "resolve: liveness is unknown (a probe timed out or a listener withheld /healthz); refusing to treat unknown as absent.");
|
|
315
330
|
}
|
|
316
331
|
}
|
|
317
332
|
let ownership: ServiceOwnershipResolution;
|
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
import type { ProxyRestartResult } from "./tray-proxy";
|
|
2
2
|
|
|
3
|
-
export type RestartSupervisor = "desktop" | "service";
|
|
3
|
+
export type RestartSupervisor = "desktop" | "service" | "service-unproven" | "legacy-flag";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Why a client runtime with only a bare OCX_SERVICE=1 is kept (#8545 owner decision, 2026-11-16), and the one-time fix.
|
|
7
|
+
* `ocx service repair` rewrites a legacy registration with the current ownership marker (OCX_SERVICE_MANAGED or the
|
|
8
|
+
* Windows wrapper marker) and reloads it, after which restart, disconnect and sync hand the runtime to that service.
|
|
9
|
+
*/
|
|
10
|
+
export const LEGACY_FLAG_OWNER_ADVICE = "It carries only the bare OCX_SERVICE=1 flag, which a background service registered before OpenCodex 2.49 and the proxies started by ocx claude, ocx codex and ocx opencode all share, so its owner cannot be proven. If a background service runs it, re-register the service once with `ocx service repair` (this writes the current ownership marker and restarts it). If ocx claude, ocx codex or ocx opencode started it, run `ocx stop` and start it again.";
|
|
4
11
|
|
|
5
12
|
/** Only the bound client's explicit refusal establishes a supervisor for sync. */
|
|
6
13
|
export function supervisedRestartRefusal(result: ProxyRestartResult): RestartSupervisor | null {
|
|
7
14
|
if (result.ok || result.phase !== "request" || !(result.error instanceof Error)) return null;
|
|
8
15
|
if (result.error.message === "restart_supervised_desktop") return "desktop";
|
|
9
16
|
if (result.error.message === "restart_supervised_service") return "service";
|
|
17
|
+
if (result.error.message === "restart_supervised_service-unproven") return "service-unproven";
|
|
18
|
+
if (result.error.message === "restart_supervised_legacy-flag") return "legacy-flag";
|
|
10
19
|
return null;
|
|
11
20
|
}
|
|
12
21
|
|
|
@@ -35,8 +44,12 @@ export function reportRestartFailure(result: Extract<ProxyRestartResult, { ok: f
|
|
|
35
44
|
console.error(`The proxy's package files are unsettled. Wait for the install to finish, then run \`ocx restart\`. ${INCOMPLETE_INSTALL_RECOVERY}`);
|
|
36
45
|
} else if (code === "restart_supervised_service") {
|
|
37
46
|
console.error("Restart not performed; the running client runtime was kept. Its background service owns it: run `ocx service restart`.");
|
|
47
|
+
} else if (code === "restart_supervised_service-unproven") {
|
|
48
|
+
console.error("Restart not performed; the running client runtime was kept. A service manager started it (systemd opencodex-proxy.service, launchd com.opencodex.proxy or the Windows OpenCodex service), but it is not enabled or its relaunch could not be verified: restart it through the manager with 'ocx service restart', or check 'ocx service status'.");
|
|
49
|
+
} else if (code === "restart_supervised_legacy-flag") {
|
|
50
|
+
console.error(`Restart not performed; the running client runtime was kept and nothing was stopped. ${LEGACY_FLAG_OWNER_ADVICE}`);
|
|
38
51
|
} else if (code === "restart_supervised_desktop") {
|
|
39
|
-
console.error("Restart not performed; the running client runtime was kept. The OpenCodex desktop app owns it: restart it
|
|
52
|
+
console.error("Restart not performed; the running client runtime was kept. The OpenCodex desktop app owns it while its connection is current: use Quit in the OpenCodex tray menu, then reopen it. After `ocx disconnect`, `ocx restart` hands it to the app.");
|
|
40
53
|
} else {
|
|
41
54
|
console.error("Proxy restart request could not be confirmed; no fallback stop/start was attempted. Run `ocx status` to inspect ownership and runtime state.");
|
|
42
55
|
}
|
package/src/cli/root.ts
CHANGED
|
@@ -19,6 +19,7 @@ import { findCommand } from "./registry";
|
|
|
19
19
|
import { printUnknownCommand } from "./help-recovery";
|
|
20
20
|
import { noteCredentialArgv, redactSecretArgs } from "./secret-args";
|
|
21
21
|
import { maybeNoticeVersionSkew } from "./version-skew-notice";
|
|
22
|
+
import { settleConfigRootForCli } from "./config-root-startup";
|
|
22
23
|
import { isOrchestratedUpdateArgv } from "../update/orchestrated-arguments.mjs";
|
|
23
24
|
|
|
24
25
|
export interface CliHead {
|
|
@@ -140,7 +141,7 @@ export async function runCli(argv: string[]): Promise<CliHead> {
|
|
|
140
141
|
process.exit(1);
|
|
141
142
|
}
|
|
142
143
|
if (head.command === "stop" && !parseStopApproval(head.args.slice(1)).ok) {
|
|
143
|
-
console.error("Usage: ocx stop [--json [--expect-pid <pid> --expect-port <port> --expect-hostname <host> --expect-config-home <home> --expect-cli-version <version> --expect-compatibility-token <hex>]]");
|
|
144
|
+
console.error("Usage: ocx stop [--deadline-ms <ms>] [--json [--expect-pid <pid> --expect-port <port> --expect-hostname <host> --expect-config-home <home> --expect-cli-version <version> --expect-compatibility-token <hex>]]");
|
|
144
145
|
process.exit(64);
|
|
145
146
|
}
|
|
146
147
|
const uninstallError = uninstallArgsError(head.command, head.args);
|
|
@@ -161,6 +162,9 @@ export async function runCli(argv: string[]): Promise<CliHead> {
|
|
|
161
162
|
process.exit(SYNC_EXPECTATION_USAGE_EXIT);
|
|
162
163
|
}
|
|
163
164
|
}
|
|
165
|
+
// Before any preflight or command write: wait once for the config-root ACL flight (#7815).
|
|
166
|
+
// Commands skipsCodexShimAutoRestore exempts are skipped there too; see config-root-startup.
|
|
167
|
+
await settleConfigRootForCli(head.command, head.args);
|
|
164
168
|
await maybeNoticeVersionSkew(head.command, head.args);
|
|
165
169
|
await maybeAutoRestoreCodexShimAsync(head.command, head.args);
|
|
166
170
|
return head;
|