@bitkyc08/opencodex 2.100.2 → 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-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.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-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- 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 +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/google-antigravity-wire.ts +7 -5
- 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/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 +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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- 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 +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- 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 +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 +168 -0
- package/src/cli/dispatch.ts +54 -12
- 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 +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 +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 +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -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 +28 -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 -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-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-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 +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 +22 -3
- 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-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- 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/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.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 +23 -1
- 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 +330 -2
- 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/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- 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/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/gui-pair-capability.ts +2 -1
- 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 +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 +50 -10
- 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 +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/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 +46 -2
- 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 +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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- 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-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 +510 -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 +3 -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-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/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/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/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 +98 -0
- 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 +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/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -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 +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/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 +173 -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 +36 -13
- 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 +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- 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/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 +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-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 +5 -7
- 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 +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 +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- 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 +6 -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 +74 -73
- 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 +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 +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/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -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/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/cli/dispatch.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ProxyRestartStartOutcome } from "./tray-proxy";
|
|
1
|
+
import type { ProxyRestartIo, ProxyRestartStartOutcome } from "./tray-proxy";
|
|
2
2
|
import type { RestartSupervisor } from "./restart-failure";
|
|
3
3
|
/**
|
|
4
4
|
* Registry-driven command dispatch (Phase 3 of the CLI deepening).
|
|
@@ -21,11 +21,11 @@ import { printUnknownCommand } from "./help-recovery";
|
|
|
21
21
|
import {
|
|
22
22
|
HUB_GATED_SKIP_MESSAGE,
|
|
23
23
|
localClientSkipMessage,
|
|
24
|
-
setIntegrationEnabled,
|
|
25
24
|
shouldSyncCodexOnStart,
|
|
26
25
|
type LocalClientSkipReason,
|
|
27
26
|
} from "../codex/desired-state";
|
|
28
27
|
import { siblingSkipMessage } from "../codex/sibling-start";
|
|
28
|
+
import { setHomeIntegrationEnabled, type HomeIntegrationResult } from "../routing/home-route-capture";
|
|
29
29
|
import { syncModelsToCodex } from "../codex/sync";
|
|
30
30
|
import { collectOrcaCodexHomeDiagnostic } from "../codex/home";
|
|
31
31
|
import { restoreNativeCodexAsync, type CodexNativeRestoreResult } from "../codex/inject";
|
|
@@ -35,6 +35,7 @@ import { normalizeUpdateChannel, runGuiUpdateWorker } from "../update/job";
|
|
|
35
35
|
import { isJsonOption, takeFlag } from "./runtime-api";
|
|
36
36
|
import { printStopSummary, type StopOutcome } from "./stop-report";
|
|
37
37
|
import { parseStopApproval, type StopApproval } from "./stop-approval";
|
|
38
|
+
import { resolveStopDeadlineMs, setStopDeadlineMs } from "../service/windows-stop-deadline";
|
|
38
39
|
import type { ResolveArgs } from "./resolve";
|
|
39
40
|
import type { ClientConnectionState } from "../client/state";
|
|
40
41
|
import { OCX_NATIVE_REPLAY_RECOVERY_NOTE } from "../responses/compaction";
|
|
@@ -60,7 +61,8 @@ export interface CliDispatchDeps {
|
|
|
60
61
|
handleTrayProxyStart: (existingIsSuccess?: boolean) => Promise<boolean>;
|
|
61
62
|
handleTrayProxyRestart: () => Promise<void>;
|
|
62
63
|
handleRestartStartWhenStopped: (recoveringLiveRestart?: boolean) => Promise<ProxyRestartStartOutcome>;
|
|
63
|
-
|
|
64
|
+
/** `bindIo` lets a caller bind the restart to one target (ocx disconnect: src/cli/disconnect-runtime.ts). */
|
|
65
|
+
handleProxyRestart: (startWhenStopped: (recoveringLiveRestart: boolean) => Promise<ProxyRestartStartOutcome>, onSupervised?: (supervisor: RestartSupervisor) => void, bindIo?: (io: ProxyRestartIo, deadlineAt: number) => ProxyRestartIo) => Promise<boolean>;
|
|
64
66
|
handleUninstall: () => Promise<void>;
|
|
65
67
|
handleStatus: () => Promise<void>;
|
|
66
68
|
handleRecoverHistory: () => Promise<void>;
|
|
@@ -89,6 +91,12 @@ export function selectDefaultGuiUrl(
|
|
|
89
91
|
return `http://${guiHost}:${live?.port ?? config.port ?? 10100}`;
|
|
90
92
|
}
|
|
91
93
|
|
|
94
|
+
/** An unavailable route-intent file names the file to repair; the other refusals keep their reason. */
|
|
95
|
+
function desiredStateRefusal(desired: Extract<HomeIntegrationResult, { ok: false }>): string {
|
|
96
|
+
return desired.reason === "unavailable" ? `Codex desired state was not saved (unavailable): ${desired.message}`
|
|
97
|
+
: `Codex desired state was not saved (${desired.reason}).`;
|
|
98
|
+
}
|
|
99
|
+
|
|
92
100
|
const commandRunners: Record<string, CommandRunner> = {
|
|
93
101
|
init: async () => {
|
|
94
102
|
const { runInit } = await import("./init");
|
|
@@ -110,9 +118,11 @@ const commandRunners: Record<string, CommandRunner> = {
|
|
|
110
118
|
stop: async deps => {
|
|
111
119
|
const parsed = parseStopApproval(deps.args.slice(1));
|
|
112
120
|
if (!parsed.ok) {
|
|
113
|
-
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>]]");
|
|
121
|
+
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>]]");
|
|
114
122
|
return 64;
|
|
115
123
|
}
|
|
124
|
+
// #7771: the Windows checked stop's deadline, from this process's start (flag, then env, then 60 s).
|
|
125
|
+
setStopDeadlineMs(resolveStopDeadlineMs(parsed.deadlineMs));
|
|
116
126
|
// Downtime warning lives HERE, not in handleStop: `restart`/tray-restart callers
|
|
117
127
|
// re-start the proxy immediately, so warning there would contradict the next line.
|
|
118
128
|
const warning = "⚠️ Codex/Claude requests through the proxy will fail until it is restarted ('ocx start' or 'ocx service start').";
|
|
@@ -173,13 +183,13 @@ const commandRunners: Record<string, CommandRunner> = {
|
|
|
173
183
|
if (!live) {
|
|
174
184
|
return emitBack(false, "No running proxy found. Run 'ocx start' — it injects opencodex automatically.", 1);
|
|
175
185
|
}
|
|
176
|
-
const desired =
|
|
186
|
+
const desired = setHomeIntegrationEnabled("codex", true);
|
|
177
187
|
if (!desired.ok) {
|
|
178
|
-
return emitBack(false,
|
|
188
|
+
return emitBack(false, desiredStateRefusal(desired), desired.reason === "conflict" ? 2 : 1);
|
|
179
189
|
}
|
|
180
190
|
const synced = await syncModelsToCodex(live.port);
|
|
181
191
|
if (synced.status === "skipped") {
|
|
182
|
-
// `
|
|
192
|
+
// `setHomeIntegrationEnabled` above just committed ON, so a skip here is NOT the toggle and
|
|
183
193
|
// is not a competing writer either — on a hub it is the role gate. Telling the operator
|
|
184
194
|
// to "retry after the competing integration change finishes" sent them waiting for a
|
|
185
195
|
// writer that does not exist (#4236).
|
|
@@ -200,15 +210,15 @@ const commandRunners: Record<string, CommandRunner> = {
|
|
|
200
210
|
if (removeProviderTable && !restoreJson) {
|
|
201
211
|
console.log("⚠️ Removing [model_providers.opencodex] means conversations already tagged opencodex will stop opening.");
|
|
202
212
|
}
|
|
203
|
-
const desired =
|
|
213
|
+
const desired = setHomeIntegrationEnabled("codex", false);
|
|
204
214
|
if (!desired.ok) {
|
|
205
215
|
if (restoreJson) {
|
|
206
216
|
// Machine-readable contract: every restore --json outcome emits one
|
|
207
217
|
// schema-complete envelope on stdout, including pre-machinery failures.
|
|
208
218
|
const { skippedRestoreEnvelope } = await import("../codex/inject");
|
|
209
|
-
console.log(JSON.stringify(skippedRestoreEnvelope(false,
|
|
219
|
+
console.log(JSON.stringify(skippedRestoreEnvelope(false, desiredStateRefusal(desired))));
|
|
210
220
|
} else {
|
|
211
|
-
console.error(
|
|
221
|
+
console.error(desiredStateRefusal(desired));
|
|
212
222
|
}
|
|
213
223
|
return desired.reason === "conflict" ? 2 : 1;
|
|
214
224
|
}
|
|
@@ -423,7 +433,35 @@ const commandRunners: Record<string, CommandRunner> = {
|
|
|
423
433
|
},
|
|
424
434
|
disconnect: async deps => {
|
|
425
435
|
const { handleDisconnectCommand } = await import("./connect");
|
|
426
|
-
|
|
436
|
+
const code = await handleDisconnectCommand(deps.args.slice(1));
|
|
437
|
+
// Token recovery refuses any live client runtime and leaves nothing to restart.
|
|
438
|
+
if (code !== 0 || deps.args.includes("--orphaned-token")) return code;
|
|
439
|
+
const { bindRestartToRuntime, restartRuntimeAfterDisconnect } = await import("./disconnect-runtime");
|
|
440
|
+
const { observeProxyLiveness } = await import("../server/proxy-liveness");
|
|
441
|
+
const { readClientConnectionStateWithEvidence } = await import("../client/state");
|
|
442
|
+
const { readRuntimePort } = await import("../config/process-state");
|
|
443
|
+
const { requestBoundSystemRestart } = await import("./system-restart-client");
|
|
444
|
+
return await restartRuntimeAfterDisconnect({
|
|
445
|
+
observe: () => observeProxyLiveness({ attempts: 2 }),
|
|
446
|
+
capture: live => {
|
|
447
|
+
if (live.pid === null) return null;
|
|
448
|
+
const record = readRuntimePort(live.pid);
|
|
449
|
+
return record?.attestationSecret && record.pid === live.pid && record.port === live.port
|
|
450
|
+
? { ...record, attestationSecret: record.attestationSecret } : null;
|
|
451
|
+
},
|
|
452
|
+
connectionState: () => {
|
|
453
|
+
const state = readClientConnectionStateWithEvidence();
|
|
454
|
+
return state.kind === "invalid" || state.kind === "mismatched" ? { kind: state.kind, reason: state.reason } : { kind: state.kind };
|
|
455
|
+
},
|
|
456
|
+
restart: async target => {
|
|
457
|
+
let refusedBy: "service-unproven" | undefined;
|
|
458
|
+
const ok = await deps.handleProxyRestart(deps.handleRestartStartWhenStopped, supervisor => { if (supervisor === "service-unproven") refusedBy = supervisor; }, (io, deadlineAt) =>
|
|
459
|
+
bindRestartToRuntime(io, target, (previous, readRuntime) =>
|
|
460
|
+
requestBoundSystemRestart(previous as Parameters<typeof requestBoundSystemRestart>[0], deadlineAt, { readRuntime: readRuntime as typeof readRuntimePort })));
|
|
461
|
+
return { ok, ...(refusedBy ? { refusedBy } : {}) };
|
|
462
|
+
},
|
|
463
|
+
json: deps.args.includes("--json"),
|
|
464
|
+
});
|
|
427
465
|
},
|
|
428
466
|
catalog: async deps => {
|
|
429
467
|
const { handleCatalogCommand } = await import("./catalog");
|
|
@@ -752,8 +790,12 @@ const commandRunners: Record<string, CommandRunner> = {
|
|
|
752
790
|
return await handleCompanionCommand(deps.args.slice(1), { findLiveProxy: deps.findLiveProxy });
|
|
753
791
|
},
|
|
754
792
|
route: async deps => {
|
|
793
|
+
if (deps.args[1] === "to") {
|
|
794
|
+
const { handleRouteToCommand } = await import("./route-to");
|
|
795
|
+
return await handleRouteToCommand(deps.args.slice(2), { findLiveProxy: deps.findLiveProxy });
|
|
796
|
+
}
|
|
755
797
|
if (deps.args[1] !== "combo" && deps.args[1] !== "policy") {
|
|
756
|
-
console.error("Usage: ocx route <combo|policy> <subcommand>");
|
|
798
|
+
console.error("Usage: ocx route <to|combo|policy> <subcommand>");
|
|
757
799
|
return 2;
|
|
758
800
|
}
|
|
759
801
|
if (deps.args[1] === "combo") {
|
|
@@ -174,7 +174,7 @@ export async function handleExportCommand(argv: string[], deps: ExportCommandDep
|
|
|
174
174
|
const spec = EXPORT_CLIENTS[client];
|
|
175
175
|
const root = await runtimeBaseUrl(deps);
|
|
176
176
|
let built: { document: unknown; text: string };
|
|
177
|
-
if (modelNames !== undefined || client === "t3code" || client === "raycast" || client === "droid" || client === "qoder" || client === "qoder-cn" || client === "workbuddy" || client === "workbuddy-ai") {
|
|
177
|
+
if (modelNames !== undefined || client === "pi" || client === "t3code" || client === "raycast" || client === "droid" || client === "qoder" || client === "qoder-cn" || client === "workbuddy" || client === "workbuddy-ai") {
|
|
178
178
|
// The dial address alone cannot distinguish a wildcard authenticated bind
|
|
179
179
|
// from loopback. Let the live server resolve its admission/listener policy;
|
|
180
180
|
// saved config can differ from the process serving this request.
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
GUI_PAIR_METHOD,
|
|
18
18
|
GUI_PAIR_NONCE_HEADER,
|
|
19
19
|
GUI_PAIR_PATH,
|
|
20
|
+
DESKTOP_GUI_PAIR_PATH,
|
|
20
21
|
canonicalGuiBrowserOrigin,
|
|
21
22
|
canonicalHttpOrigin,
|
|
22
23
|
createGuiPairCapability,
|
|
@@ -34,6 +35,7 @@ export type GuiPairRequestResult =
|
|
|
34
35
|
| { kind: "unavailable"; reason: "unattested-target" | "runtime-mismatch" | "attestation" | "capability" | "transport" | "rejected" | "local-intent" | "origin-refused" | "rate-limited" };
|
|
35
36
|
|
|
36
37
|
export interface GuiPairClientDeps {
|
|
38
|
+
desktopPurpose?: boolean;
|
|
37
39
|
fetchImpl?: typeof fetch;
|
|
38
40
|
readRuntime?: (pid: number) => RuntimePortState | null;
|
|
39
41
|
createChallenge?: () => string;
|
|
@@ -150,11 +152,12 @@ export async function requestBoundGuiPairingGrant(
|
|
|
150
152
|
return { kind: "unavailable", reason: "runtime-mismatch" };
|
|
151
153
|
}
|
|
152
154
|
const expiresAt = (deps.now ?? Date.now)() + GUI_PAIR_CAPABILITY_TTL_MS;
|
|
155
|
+
const path = deps.desktopPurpose ? DESKTOP_GUI_PAIR_PATH : GUI_PAIR_PATH;
|
|
153
156
|
const capability = createGuiPairCapability(
|
|
154
157
|
runtime.attestationSecret,
|
|
155
158
|
challenge,
|
|
156
159
|
GUI_PAIR_METHOD,
|
|
157
|
-
|
|
160
|
+
path,
|
|
158
161
|
browserOrigin,
|
|
159
162
|
target.pid,
|
|
160
163
|
target.port,
|
|
@@ -163,10 +166,10 @@ export async function requestBoundGuiPairingGrant(
|
|
|
163
166
|
if (!capability) return { kind: "unavailable", reason: "capability" };
|
|
164
167
|
let intent: GuiPairIntent | undefined;
|
|
165
168
|
try {
|
|
166
|
-
if (deps.requireLocalIntent !== false) intent = (deps.createIntent ?? createGuiPairIntent)(capability);
|
|
169
|
+
if (deps.desktopPurpose || deps.requireLocalIntent !== false) intent = (deps.createIntent ?? createGuiPairIntent)(capability);
|
|
167
170
|
} catch { return { kind: "unavailable", reason: "local-intent" }; }
|
|
168
171
|
try {
|
|
169
|
-
const response = await fetchImpl(`${baseUrl}${
|
|
172
|
+
const response = await fetchImpl(`${baseUrl}${path}`, {
|
|
170
173
|
method: GUI_PAIR_METHOD,
|
|
171
174
|
headers: {
|
|
172
175
|
"Content-Length": "0",
|
package/src/cli/gui.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { OcxConfig } from "../types";
|
|
2
|
+
import { desktopGuiOrigin } from "../lib/desktop-gui-origin";
|
|
2
3
|
import { canonicalGuiBrowserOrigin, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
3
4
|
import { findLiveProxy, type LiveProxy } from "../server/proxy-liveness";
|
|
4
5
|
import {
|
|
@@ -8,7 +9,7 @@ import {
|
|
|
8
9
|
} from "./gui-pair-client";
|
|
9
10
|
import type { RuntimeApiDeps } from "./runtime-api";
|
|
10
11
|
|
|
11
|
-
const GUI_USAGE = "ocx gui [pair --origin <browser-origin> [--json]]";
|
|
12
|
+
const GUI_USAGE = "ocx gui [pair [--desktop] --origin <browser-origin> [--json]]";
|
|
12
13
|
const PAIRING_WARNING = "Pairing grants are secret, single-use, and expire quickly. Do not save them.";
|
|
13
14
|
|
|
14
15
|
export interface GuiCommandDeps extends RuntimeApiDeps {
|
|
@@ -28,11 +29,13 @@ function allowedPairingOrigin(origin: string, config: OcxConfig): boolean {
|
|
|
28
29
|
return (config.corsAllowOrigins ?? []).some(value => canonicalGuiBrowserOrigin(value) === origin);
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
function parsePairArgs(args: string[]): { origin: string; json: boolean } | null {
|
|
32
|
+
function parsePairArgs(args: string[]): { origin: string; json: boolean; desktop: boolean } | null {
|
|
32
33
|
let origin: string | undefined;
|
|
33
34
|
let json = false;
|
|
35
|
+
let desktop = false;
|
|
34
36
|
for (let index = 0; index < args.length; index++) {
|
|
35
37
|
const arg = args[index]!;
|
|
38
|
+
if (arg === "--desktop" && !desktop) { desktop = true; continue; }
|
|
36
39
|
if (arg === "--json" && !json) {
|
|
37
40
|
json = true;
|
|
38
41
|
continue;
|
|
@@ -45,7 +48,7 @@ function parsePairArgs(args: string[]): { origin: string; json: boolean } | null
|
|
|
45
48
|
}
|
|
46
49
|
return null;
|
|
47
50
|
}
|
|
48
|
-
return origin ? { origin, json } : null;
|
|
51
|
+
return origin ? { origin, json, desktop } : null;
|
|
49
52
|
}
|
|
50
53
|
|
|
51
54
|
export async function runGuiCommand(args: string[], deps: GuiCommandDeps): Promise<number> {
|
|
@@ -61,8 +64,9 @@ export async function runGuiCommand(args: string[], deps: GuiCommandDeps): Promi
|
|
|
61
64
|
return 1;
|
|
62
65
|
}
|
|
63
66
|
const config = deps.loadConfig();
|
|
64
|
-
if (!allowedPairingOrigin(canonicalOrigin, config)) {
|
|
65
|
-
console.error("
|
|
67
|
+
if (!(parsed.desktop ? desktopGuiOrigin(config, canonicalOrigin) === canonicalOrigin : allowedPairingOrigin(canonicalOrigin, config))) {
|
|
68
|
+
console.error(parsed.desktop ? "Desktop authorization requires the standalone local dashboard origin and its exact listening port."
|
|
69
|
+
: "Pairing requires the standalone configured literal loopback origin, or an allowed hub origin.");
|
|
66
70
|
return 1;
|
|
67
71
|
}
|
|
68
72
|
const target = await (deps.findLiveProxy ?? findLiveProxy)();
|
|
@@ -78,6 +82,7 @@ export async function runGuiCommand(args: string[], deps: GuiCommandDeps): Promi
|
|
|
78
82
|
const result = await (deps.requestPairingGrant ?? requestBoundGuiPairingGrant)(target, canonicalOrigin, {
|
|
79
83
|
...(deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}),
|
|
80
84
|
requireLocalIntent: config.runtimeRole !== "hub",
|
|
85
|
+
desktopPurpose: parsed.desktop,
|
|
81
86
|
});
|
|
82
87
|
if (result.kind !== "created") {
|
|
83
88
|
console.error(result.reason === "local-intent"
|
package/src/cli/help-catalog.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { CAPABILITIES, type Capability } from "./capabilities";
|
|
2
2
|
import { CLI_COMMANDS, findCommand, type CliCommandEntry } from "./registry";
|
|
3
|
+
import { EXPORT_CLIENT_IDS } from "../clients/client-ids";
|
|
3
4
|
|
|
4
5
|
export type HelpResolution =
|
|
5
6
|
| { kind: "entry"; entry: CliCommandEntry; canonicalName: string; capability?: Capability; children: readonly Capability[] }
|
|
@@ -88,6 +89,16 @@ export function resolveHelpPath(requested: readonly string[]): HelpResolution {
|
|
|
88
89
|
const capability = declared.find(candidate => candidate.command.length === path.length && startsWithPath(candidate.command, path));
|
|
89
90
|
const children = declared.filter(candidate => candidate.command.length > path.length && startsWithPath(candidate.command, path));
|
|
90
91
|
if (capability) return { kind: "capability", path, capability, children };
|
|
92
|
+
// Clients and modes are operands of one capability, not registry leaves. Resolve their
|
|
93
|
+
// help without multiplying the generated operating surface by every client/action pair.
|
|
94
|
+
if (path[0] === "route" && path[1] === "to" && path.length >= 3
|
|
95
|
+
&& ["codex", "claude", "claude-desktop", "grok", ...EXPORT_CLIENT_IDS].includes(path[2])) {
|
|
96
|
+
const owner = declared.find(candidate => candidate.command.join(" ") === "route to");
|
|
97
|
+
if (owner && path.length === 3) return { kind: "prefix", path, children: ["on", "off", "inherit"].map(action => ({ ...owner, command: [...path, action] })) };
|
|
98
|
+
if (owner && path.length === 4 && ["on", "off", "inherit"].includes(path[3])) {
|
|
99
|
+
return { kind: "capability", path, capability: { ...owner, command: path }, children: [] };
|
|
100
|
+
}
|
|
101
|
+
}
|
|
91
102
|
if (children.length) return { kind: "prefix", path, children };
|
|
92
103
|
|
|
93
104
|
for (let length = Math.min(path.length - 1, MAX_DOCUMENTED_DEPTH); length > 1; length--) {
|
package/src/cli/help.ts
CHANGED
|
@@ -51,6 +51,7 @@ Usage:
|
|
|
51
51
|
ocx disconnect Restore local state and clear the hub connection
|
|
52
52
|
ocx sync [--local-only] [--json] [--restart-codex] Sync models and linked Children
|
|
53
53
|
--expect-link <id> | --expect-hub-key <id>: only from that Home/hub key (exit 5 otherwise)
|
|
54
|
+
--child <id>: only those Children; --restart-children[=app-server | =codex --yes]: restart their Codex
|
|
54
55
|
ocx sync-cache [--restart-codex]
|
|
55
56
|
Refresh Codex's model cache from the active catalog
|
|
56
57
|
ocx catalog pull <https-url> Install a validated remote catalog and refresh the Codex cache
|
|
@@ -63,8 +64,8 @@ Usage:
|
|
|
63
64
|
ocx debug <scope> provider/usage/injection/claude on|off|status|reset
|
|
64
65
|
ocx login <provider> OAuth or API-key provider login (ocx login codex for Codex/ChatGPT)
|
|
65
66
|
ocx logout <provider> Remove a stored OAuth login
|
|
66
|
-
ocx gui [pair --origin <browser-origin> [--json]]
|
|
67
|
-
Open the dashboard or
|
|
67
|
+
ocx gui [pair [--desktop] --origin <browser-origin> [--json]]
|
|
68
|
+
Open the dashboard, pair a remote GUI, or authorize local Desktop changes (--desktop)
|
|
68
69
|
ocx hub invite [--json] Print a ready-to-run \`ocx connect\` line for one more machine
|
|
69
70
|
(hub only; see \`ocx help hub\` for the one-port topology)
|
|
70
71
|
ocx link <sub> Machine links over SSH (port|issue|revoke|status|check)
|
|
@@ -86,7 +87,7 @@ Usage:
|
|
|
86
87
|
ocx fallback <sub> Turn model or provider fallback off per scope; per-device local fallback
|
|
87
88
|
ocx observe <sub> Logs, usage, storage, memory, and debug data
|
|
88
89
|
ocx inspect <sub> Effective config, catalog, analytics, pacing, client-config
|
|
89
|
-
ocx route <sub> Routing features (combo, policy)
|
|
90
|
+
ocx route <sub> Routing features (to, combo, policy)
|
|
90
91
|
ocx logs [filters] Alias of ocx observe logs
|
|
91
92
|
ocx usage [--range <today|1d|7d|30d|all>] [--provider <name>] [--model <id>] [--top <1-1000>]
|
|
92
93
|
Token and estimated-cost report (alias of ocx observe usage)
|