@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
|
@@ -173,9 +173,9 @@ export const PROVIDER_MODEL_CAPABILITIES: readonly Capability[] = [
|
|
|
173
173
|
},
|
|
174
174
|
{
|
|
175
175
|
command: ["models", "new-policy"], summary: "Read or set the policy for newly discovered models.",
|
|
176
|
-
usage: "ocx models new-policy [on|off] [--provider <name>] [--json]", routes: [{ method: "GET", path: "/api/model-discovery" }, { method: "PUT", path: "/api/model-discovery" }], mutates: true, json: "payload",
|
|
176
|
+
usage: "ocx models new-policy [on|off|admit] [--provider <name>] [--json]", routes: [{ method: "GET", path: "/api/model-discovery" }, { method: "PUT", path: "/api/model-discovery" }], mutates: true, json: "payload",
|
|
177
177
|
flags: [{ name: "--provider", value: "string", summary: "Scope the read/write to a provider; omitted means global." }, { name: "--json", value: "boolean", summary: "Emit the policy view or receipt." }],
|
|
178
|
-
details: ["No state operand means read only.
|
|
178
|
+
details: ["No state operand means read only. Writes on, off or admit; admit appends new arrivals to a provider's custom selectedModels and never widens a preset-derived selection. No inherit/clear operand is implemented."],
|
|
179
179
|
},
|
|
180
180
|
{
|
|
181
181
|
command: ["models", "new-arrivals"], summary: "Read recent model discoveries.",
|
|
@@ -248,6 +248,22 @@ export const PROVIDER_MODEL_CAPABILITIES: readonly Capability[] = [
|
|
|
248
248
|
usage: "ocx alias defaults <on|off> [--provider <name>] [--json]", routes: [{ method: "PUT", path: "/api/default-aliases" }], mutates: true, json: "payload",
|
|
249
249
|
flags: [{ name: "--provider", value: "string", summary: "Limit the toggle to one provider." }, { name: "--json", value: "boolean", summary: "Emit the alias settings receipt." }],
|
|
250
250
|
},
|
|
251
|
+
{
|
|
252
|
+
command: ["alias", "template", "set"], summary: "Set a provider's opt-in alias template for models without an alias.",
|
|
253
|
+
usage: "ocx alias template set <provider> <template> [--json]", routes: [{ method: "PUT", path: "/api/providers/{provider}/alias-template" }], mutates: true, json: "payload",
|
|
254
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit the receipt with the generated and skipped preview." }],
|
|
255
|
+
details: ["Only the literal {providerAlias} and {modelBasename} placeholders are allowed, and {modelBasename} is required. Aliases are derived when models resolve and never written to config. Manual and built-in aliases win; a generated name that collides with anything already claimed is skipped, never renamed."],
|
|
256
|
+
},
|
|
257
|
+
{
|
|
258
|
+
command: ["alias", "template", "rm"], summary: "Remove a provider's alias template; its generated aliases disappear at once.",
|
|
259
|
+
usage: "ocx alias template rm <provider> [--json]", routes: [{ method: "PUT", path: "/api/providers/{provider}/alias-template" }], mutates: true, json: "payload",
|
|
260
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit the receipt." }],
|
|
261
|
+
},
|
|
262
|
+
{
|
|
263
|
+
command: ["alias", "template", "show"], summary: "Read configured alias templates.",
|
|
264
|
+
usage: "ocx alias template show [<provider>] [--json]", routes: [{ method: "GET", path: "/api/aliases" }], mutates: false, json: "payload",
|
|
265
|
+
flags: [{ name: "--json", value: "boolean", summary: "Emit the template map, or one provider's template." }],
|
|
266
|
+
},
|
|
251
267
|
{
|
|
252
268
|
command: ["provider","pacing"],
|
|
253
269
|
usage: "ocx provider pacing <name> [--json]; ocx provider pacing <name> [--enabled <on|off>] [--rpm <number>] [--min-interval-ms <integer>] [--max-concurrent <integer>] [--json]; ocx provider pacing <name> --file <FILE|-> [--json]",
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { Capability, CapabilityFlag } from "./capability-types";
|
|
2
|
+
|
|
3
|
+
const device: CapabilityFlag = { name: "--device", value: "string", summary: "Home: alias, id, all or this. Child: this or its own link id only." };
|
|
4
|
+
const json: CapabilityFlag = { name: "--json", value: "boolean", summary: "Emit the ocx.route-to/1 status matrix." };
|
|
5
|
+
const overwrite: CapabilityFlag = { name: "--overwrite-conflict", value: "boolean", summary: "Explicitly permit replacing conflicting managed blocks." };
|
|
6
|
+
const local: CapabilityFlag = { name: "--local", value: "boolean", summary: "Child only: opt out with off, or clear the opt-out with inherit." };
|
|
7
|
+
|
|
8
|
+
export const ROUTE_TO_CAPABILITIES: readonly Capability[] = [
|
|
9
|
+
{
|
|
10
|
+
command: ["route", "to"],
|
|
11
|
+
usage: "ocx route to <client> <on|off|inherit> [--device <alias|id|this>] [--accounts <all|none|userId,...>] [--model-names <alias|routed>] [--overwrite-conflict] [--local] [--json]",
|
|
12
|
+
summary: "Set Home-default or per-device route intent, or opt out locally on a Child.",
|
|
13
|
+
routes: [{ method: "PUT", path: "/api/route-to" }],
|
|
14
|
+
flags: [device, json, overwrite, local,
|
|
15
|
+
{ name: "--accounts", value: "string", summary: "Aside on only: all, none, or comma-separated stable userIds; never u/N slots." },
|
|
16
|
+
{ name: "--model-names", value: "string", summary: "Hermes/Command Code on only: alias or routed model names." },
|
|
17
|
+
],
|
|
18
|
+
mutates: true, json: "payload",
|
|
19
|
+
details: ["Clients: codex, claude, claude-desktop, grok and the supported file integrations. Without --device a Home updates its default and materializes itself; all is only for status/sync.",
|
|
20
|
+
"inherit requires --device unless clearing a Child --local opt-out. Child writes print the exact Home command with the Child link id; --local supports off/inherit only. --overwrite-conflict applies only to on or sync.",
|
|
21
|
+
"On the Home, codex, claude, grok and claude-desktop follow the Home's own native switches: a Home default or --device home write for them writes that switch (Home inherit sets it to the default)."],
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
command: ["route", "to", "status"],
|
|
25
|
+
usage: "ocx route to status [--device <alias|id|all|this>] [--json]",
|
|
26
|
+
summary: "Read per-device route intent, its source and actual client apply outcomes.",
|
|
27
|
+
routes: [{ method: "GET", path: "/api/route-to" }],
|
|
28
|
+
flags: [device, json], mutates: false, json: "payload",
|
|
29
|
+
details: ["On a Child this reads local receipts without a Home management relay. Intent and applied state are distinct; null applied means no recorded outcome.",
|
|
30
|
+
"Sources: builtin, default, device, local (Child opt-out) and native (a Home row governed by the Home's own switch). An outcome recorded for an earlier intent reads stale.",
|
|
31
|
+
"Intent unresolved appears only for Aside, while the Home's existing Aside profiles have no stable userIds and nothing decided Aside; warnings[] then names the fix (ocx route to aside on|off --device home)."],
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
command: ["route", "to", "sync"],
|
|
35
|
+
usage: "ocx route to sync [--device <alias|id|all|this>] [--overwrite-conflict] [--json]",
|
|
36
|
+
summary: "Reapply route intent on selected devices, or locally on a Child.",
|
|
37
|
+
routes: [{ method: "POST", path: "/api/route-to/sync" }],
|
|
38
|
+
flags: [device, overwrite, json], mutates: true, json: "payload",
|
|
39
|
+
details: ["No conflict retry or implicit overwrite. Child sync calls its local materializer and sends no Home management write.",
|
|
40
|
+
"Home sync never changes the Home's native switches for codex, claude, grok or claude-desktop; it refreshes what each switch says.",
|
|
41
|
+
"On a Home whose Aside ownership is unresolved, sync applies every other client, leaves Aside unchanged, reports it unresolved and prints the warning; that alone does not fail the sync."],
|
|
42
|
+
},
|
|
43
|
+
];
|
package/src/cli/capabilities.ts
CHANGED
|
@@ -13,6 +13,7 @@ import { INTEGRATION_CAPABILITIES } from "./capabilities-integrations";
|
|
|
13
13
|
import { OBSERVE_SYSTEM_CAPABILITIES } from "./capabilities-observe-system";
|
|
14
14
|
import { ACCESS_REMOTE_CAPABILITIES } from "./capabilities-access-remote";
|
|
15
15
|
import { LAB_CAPABILITIES } from "./capabilities-lab";
|
|
16
|
+
import { ROUTE_TO_CAPABILITIES } from "./capabilities-route-to";
|
|
16
17
|
|
|
17
18
|
export const CAPABILITIES: readonly Capability[] = [
|
|
18
19
|
...BASE_CAPABILITIES,
|
|
@@ -23,6 +24,7 @@ export const CAPABILITIES: readonly Capability[] = [
|
|
|
23
24
|
...OBSERVE_SYSTEM_CAPABILITIES,
|
|
24
25
|
...ACCESS_REMOTE_CAPABILITIES,
|
|
25
26
|
...LAB_CAPABILITIES,
|
|
27
|
+
...ROUTE_TO_CAPABILITIES,
|
|
26
28
|
];
|
|
27
29
|
|
|
28
30
|
export { HEAD_CAPABILITIES } from "./capabilities-base";
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/** Versioned machine contracts implemented by this CLI. */
|
|
2
|
-
export const CAPABILITY_CONTRACTS = ["sync.home-fanout/1", "update.orchestrated/1"] as const;
|
|
2
|
+
export const CAPABILITY_CONTRACTS = ["sync.home-fanout/1", "update.orchestrated/1", "link.child-ops/1", "link.route/1", "link.route/2", "link.operation/1", "link.recover/1"] as const;
|
|
@@ -7,11 +7,12 @@ import { resolve } from "node:path";
|
|
|
7
7
|
import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
8
8
|
import { loadConfig, mutatePersistedConfig, withConfigMutationLockSync } from "../config";
|
|
9
9
|
import { claudeDesktopIntegrationEnabledNow, setIntegrationEnabled } from "../codex/desired-state";
|
|
10
|
+
import { setHomeIntegrationEnabled } from "../routing/home-route-capture";
|
|
10
11
|
import { readClientConnectionState, assertClientConnectionUnchanged, assertNoClientDisconnectPending, type ClientConnectionState } from "../client/state";
|
|
11
12
|
import { downloadDesktop3pModels, HubClientError, normalizeHubOrigin } from "../client/hub-client";
|
|
12
13
|
import { readServiceApiTokenState } from "../lib/service-secrets";
|
|
13
14
|
import { applyRemoteDesktopStore, type DesktopStoreResult } from "../claude/desktop-remote-store";
|
|
14
|
-
import { withClientLifecycleSync, type ClientLifecycleLockDeps } from "../client/lifecycle-lock";
|
|
15
|
+
import { assertClientLifecycleHeld, withClientLifecycle, withClientLifecycleSync, type ClientLifecycleHeld, type ClientLifecycleLockDeps } from "../client/lifecycle-lock";
|
|
15
16
|
import {
|
|
16
17
|
DESKTOP_FAMILIES,
|
|
17
18
|
moveDesktopRoute,
|
|
@@ -305,12 +306,16 @@ async function applyConnectedDesktopProfile(
|
|
|
305
306
|
}
|
|
306
307
|
|
|
307
308
|
/** Persist the operator's Desktop mode choice; a failed marker save never undoes the apply. */
|
|
308
|
-
async function saveDesktopMode(mode: ClaudeDesktopMode, deps: ApplyProfileDeps): Promise<boolean> {
|
|
309
|
+
async function saveDesktopMode(mode: ClaudeDesktopMode, deps: ApplyProfileDeps, held?: ClientLifecycleHeld): Promise<boolean> {
|
|
309
310
|
try {
|
|
310
|
-
return await settleConfigRoot(configRoot(), () =>
|
|
311
|
-
const
|
|
312
|
-
|
|
313
|
-
|
|
311
|
+
return await settleConfigRoot(configRoot(), () => {
|
|
312
|
+
const save = () => {
|
|
313
|
+
const outcome = mutatePersistedConfig(current => recordClaudeDesktopMode(current, mode));
|
|
314
|
+
return outcome.status !== "unavailable";
|
|
315
|
+
};
|
|
316
|
+
if (held) { assertClientLifecycleHeld(held); return save(); }
|
|
317
|
+
return withClientLifecycleSync(save, deps.lifecycleLockDeps);
|
|
318
|
+
});
|
|
314
319
|
} catch {
|
|
315
320
|
return false;
|
|
316
321
|
}
|
|
@@ -435,8 +440,21 @@ async function applyFirstPartyDesktop(
|
|
|
435
440
|
return { ok: false, path: "", reason: error instanceof Error ? error.message : "daemon apply failed" };
|
|
436
441
|
}
|
|
437
442
|
}
|
|
443
|
+
// The offline path has no picker controller to serialize CLI/server writers. Keep L
|
|
444
|
+
// across settings, gateway retirement, mode publication and any conditional rollback.
|
|
445
|
+
try { return await withClientLifecycle(held => applyFirstPartyDesktopOffline(deps, held), deps.lifecycleLockDeps); }
|
|
446
|
+
catch (error) {
|
|
447
|
+
return { ok: false, path: "", reason: error instanceof Error && error.message === "client_lifecycle_busy"
|
|
448
|
+
? "client_lifecycle_busy" : "desktop_apply_failed" };
|
|
449
|
+
}
|
|
450
|
+
}
|
|
451
|
+
|
|
452
|
+
async function applyFirstPartyDesktopOffline(deps: ApplyProfileDeps, held: ClientLifecycleHeld): Promise<DesktopApplyResult> {
|
|
453
|
+
assertClientLifecycleHeld(held);
|
|
454
|
+
assertNoClientDisconnectPending();
|
|
455
|
+
if (readClientConnectionState().kind !== "disconnected") return { ok: false, path: "", reason: "client_connection_invalid" };
|
|
438
456
|
const config = loadConfig();
|
|
439
|
-
const desired = await withFirstPartySecretsSettled(getConfigDir(), () =>
|
|
457
|
+
const desired = await withFirstPartySecretsSettled(getConfigDir(), () => setHomeIntegrationEnabled("claude-desktop", true));
|
|
440
458
|
if (!desired.ok) return "path" in desired ? desired : { ok: false, path: "", reason: desired.message };
|
|
441
459
|
// Establish the replacement before deleting the working gateway. A refused
|
|
442
460
|
// cleanup restores only our managed env keys, preserving unrelated settings.
|
|
@@ -452,7 +470,8 @@ async function applyFirstPartyDesktop(
|
|
|
452
470
|
const library = inspectDesktop3pConfigLibrary({ appliedFingerprint });
|
|
453
471
|
if (library.kind === "gateway_ours" || library.kind === "gateway_drifted") {
|
|
454
472
|
let removed: ReturnType<typeof removeDesktop3pStandardPivot>;
|
|
455
|
-
try { removed = await settleConfigRoot(configRoot(), () => removeDesktop3pStandardPivot({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null, replaceWhileEnabled: true
|
|
473
|
+
try { removed = await settleConfigRoot(configRoot(), () => removeDesktop3pStandardPivot({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null, replaceWhileEnabled: true,
|
|
474
|
+
lifecycleLockDeps: deps.lifecycleLockDeps, lifecycleHeld: held })); }
|
|
456
475
|
catch (error) {
|
|
457
476
|
removed = { ok: false, changed: false, kind: "write_failed", libraryPath: library.libraryPath,
|
|
458
477
|
reason: error instanceof WindowsSecretAclSettleTimeoutError ? "acl_settlement_timeout" : "desktop_mutation_failed" };
|
|
@@ -460,7 +479,7 @@ async function applyFirstPartyDesktop(
|
|
|
460
479
|
gatewayRemoved = removed.changed;
|
|
461
480
|
if (!removed.ok) {
|
|
462
481
|
const restored = removed.changed || !applied.changed || await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false);
|
|
463
|
-
const modeSaved = !removed.changed || await saveDesktopMode("first-party", deps);
|
|
482
|
+
const modeSaved = !removed.changed || await saveDesktopMode("first-party", deps, held);
|
|
464
483
|
const warning = [restored ? "" : "first-party settings rollback did not complete",
|
|
465
484
|
modeSaved ? "" : "first-party is active but its mode marker was not saved"].filter(Boolean).join("; ");
|
|
466
485
|
return { ok: false, path: library.selectedProfilePath ?? "", reason: removed.kind === "cleanup_incomplete" ? "gateway_cleanup_incomplete" : `gateway_profile_active:${removed.reason ?? removed.kind}`,
|
|
@@ -468,7 +487,7 @@ async function applyFirstPartyDesktop(
|
|
|
468
487
|
...(warning ? { warning } : {}) };
|
|
469
488
|
}
|
|
470
489
|
}
|
|
471
|
-
const saved = await saveDesktopMode("first-party", deps);
|
|
490
|
+
const saved = await saveDesktopMode("first-party", deps, held);
|
|
472
491
|
modeCommitted = saved;
|
|
473
492
|
return {
|
|
474
493
|
ok: true,
|
|
@@ -521,7 +540,7 @@ export async function applyProfile(
|
|
|
521
540
|
// so a process crash cannot leave a gateway profile that startup immediately removes.
|
|
522
541
|
let committedIntent = false, savedProfile = false, gatewayApplied = false;
|
|
523
542
|
try {
|
|
524
|
-
const desired = await settleConfigRoot(configRoot(), () =>
|
|
543
|
+
const desired = await settleConfigRoot(configRoot(), () => setHomeIntegrationEnabled("claude-desktop", true));
|
|
525
544
|
if (!desired.ok) return { ok: false, path: "", reason: desired.message };
|
|
526
545
|
committedIntent = true;
|
|
527
546
|
const config = loadConfig();
|
package/src/cli/claude.ts
CHANGED
|
@@ -20,7 +20,7 @@ import { findLiveProxy } from "../server/proxy-liveness";
|
|
|
20
20
|
import type { OcxConfig } from "../types";
|
|
21
21
|
import { configuredAdminToken } from "../lib/admin-secrets";
|
|
22
22
|
import { localAdmissionToken, localInferenceDestination, localLoopbackInferencePorts, localManagementOrigin } from "../lib/local-destinations";
|
|
23
|
-
import { PROXY_MARKER, ownAdmissionTokens, defaultAuthDetectDeps, detectClaudeAuth, type AuthDetectDeps } from "../claude/auth-detect";
|
|
23
|
+
import { PROXY_MARKER, ownAdmissionTokens, defaultAuthDetectDeps, detectClaudeAuth, resolveClaudeKeychainPresence, type AuthDetectDeps } from "../claude/auth-detect";
|
|
24
24
|
import { resolveClaudeAuthMode } from "../claude/auth-mode";
|
|
25
25
|
import { withProcessRuntimeProvenance } from "../lib/bun-runtime";
|
|
26
26
|
import { selfLaunchArgv } from "../lib/self-launch-argv";
|
|
@@ -37,6 +37,17 @@ import { desktopProfileWireAlias, legacyDesktopProfileWireAlias } from "../claud
|
|
|
37
37
|
import { inspectDesktopFirstParty } from "../claude/desktop-first-party";
|
|
38
38
|
import { isClaudeInterceptProxyUrl, type ClaudeInterceptSettingsState } from "../claude/intercept/settings";
|
|
39
39
|
import { withoutSiblingMarker } from "../codex/sibling-start";
|
|
40
|
+
import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* The environment of the detached `ocx start` that `ocx claude` launches (the spawn adds the runtime
|
|
44
|
+
* provenance stamp): an ordinary owner. It carries OCX_SERVICE=1 but no service manager's marker, so a
|
|
45
|
+
* manager-launched process is told apart from it; a client runtime cannot tell it from a service registered before
|
|
46
|
+
* the marker existed, and its restart is refused as legacy-flag (src/client/runtime-restart.ts, #8545).
|
|
47
|
+
*/
|
|
48
|
+
export function claudeProxyStartEnv(base: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
|
|
49
|
+
return withoutSupervisorMarkers(withoutSiblingMarker({ ...base, OCX_SERVICE: "1" }));
|
|
50
|
+
}
|
|
40
51
|
|
|
41
52
|
export interface ClaudeLaunchEnv {
|
|
42
53
|
[key: string]: string | undefined;
|
|
@@ -532,7 +543,7 @@ export async function ensureProxyForClaude(deps: ClaudeProxyEnsureDeps = {}): Pr
|
|
|
532
543
|
stdio: "ignore",
|
|
533
544
|
windowsHide: true,
|
|
534
545
|
// An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
|
|
535
|
-
env: withProcessRuntimeProvenance(
|
|
546
|
+
env: withProcessRuntimeProvenance(claudeProxyStartEnv()),
|
|
536
547
|
});
|
|
537
548
|
child.unref();
|
|
538
549
|
const deadline = Date.now() + 8_000;
|
|
@@ -866,7 +877,10 @@ export async function cmdClaude(args: string[]): Promise<number> {
|
|
|
866
877
|
const gateway = await fetchGatewayModels(route, { admissionConfig: config });
|
|
867
878
|
const forceAvailableSelectors = typeof route === "number" ? undefined : gateway?.models.map(model => model.id) ?? [];
|
|
868
879
|
const allowRootSkipPermissions = shouldAllowRootSkipPermissions(args);
|
|
869
|
-
const
|
|
880
|
+
const keychainPresence = await resolveClaudeKeychainPresence(config.claudeCode?.authMode);
|
|
881
|
+
const env = buildClaudeEnv(config, route, process.env, contextWindows, {
|
|
882
|
+
allowRootSkipPermissions, forceAvailable, forceAvailableSelectors, authDetect: { keychainProbe: () => keychainPresence },
|
|
883
|
+
});
|
|
870
884
|
if (allowRootSkipPermissions) {
|
|
871
885
|
console.error(rootSkipPermissionsNotice(env));
|
|
872
886
|
}
|
|
@@ -38,6 +38,7 @@ import { attestCodexRuntime, codexCredentialDestinationIsTrusted, resolveCodexLa
|
|
|
38
38
|
import { codexCommandCanBypass, CODEX_UNVERIFIED_SHIM } from "./codex-launch-command";
|
|
39
39
|
import { codexTokenArgsAreSafe, codexTokenEnvironmentIsSafe } from "./codex-launch-policy";
|
|
40
40
|
import { codexTokenWithheldDiagnostic, type CodexTokenRefusal, type CodexTokenRefusalReporter } from "./codex-launch-diagnostics";
|
|
41
|
+
import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
|
|
41
42
|
|
|
42
43
|
export interface CodexLaunchEnv {
|
|
43
44
|
[key: string]: string | undefined;
|
|
@@ -115,7 +116,8 @@ export function codexProxyStartEnv(base: CodexLaunchEnv = process.env): CodexLau
|
|
|
115
116
|
const withTokenFile = stripped.OPENCODEX_API_AUTH_TOKEN?.trim()
|
|
116
117
|
? stripped
|
|
117
118
|
: { ...stripped, OCX_API_TOKEN_FILE: serviceApiTokenFilePath() };
|
|
118
|
-
|
|
119
|
+
// A shell a supervised runtime handed to a tool carries its supervisor's markers; this proxy is not its.
|
|
120
|
+
return withoutSupervisorMarkers({ ...withTokenFile, OCX_SERVICE: "1" }) as CodexLaunchEnv;
|
|
119
121
|
}
|
|
120
122
|
|
|
121
123
|
export type CodexProxyEnsureDeps = {
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { autoRestoreCodexShim, autoRestoreCodexShimAsync } from "../codex/shim";
|
|
2
2
|
import { codexShimAutoRestoreEnabled, readConfigDiagnostics } from "../config";
|
|
3
|
-
import {
|
|
3
|
+
import { skipsCodexShimAutoRestore } from "./preflight-exemptions";
|
|
4
|
+
|
|
5
|
+
// Re-exported for existing importers; the list itself lives in a leaf module so a caller that
|
|
6
|
+
// only needs it (the config-root startup wait) does not link the shim repair machinery.
|
|
7
|
+
export { skipsCodexShimAutoRestore };
|
|
4
8
|
|
|
5
9
|
export interface CodexShimAutoRestoreCliDeps {
|
|
6
10
|
env: NodeJS.ProcessEnv;
|
|
@@ -16,47 +20,6 @@ const DEFAULT_DEPS: CodexShimAutoRestoreCliDeps = {
|
|
|
16
20
|
readConfig: readConfigDiagnostics,
|
|
17
21
|
};
|
|
18
22
|
|
|
19
|
-
/** Identify command namespaces whose execution must not trigger automatic shim repair. */
|
|
20
|
-
export function skipsCodexShimAutoRestore(command: string | undefined, args: string[]): boolean {
|
|
21
|
-
if (command === "uninstall" || command === "remove") return true;
|
|
22
|
-
// Contract discovery and orchestrated update must validate before any repair.
|
|
23
|
-
if (command === "capabilities") return true;
|
|
24
|
-
if (command === "update" && isOrchestratedUpdateArgv(args)) return true;
|
|
25
|
-
if (command === "sync") return true;
|
|
26
|
-
if (command === "status" || command === "doctor") return true;
|
|
27
|
-
// Explicit orphan-token recovery must not mutate Codex before its guards run.
|
|
28
|
-
if (command === "disconnect" && args.includes("--orphaned-token")) return true;
|
|
29
|
-
// The launcher owns shim handoff after classifying routing, including native fast paths.
|
|
30
|
-
if (command === "codex") return true;
|
|
31
|
-
// Exec admission only observes the selected target; it must never repair a shim first.
|
|
32
|
-
if (command === "internal" && args[1] === "codex-exec-target") return true;
|
|
33
|
-
// `lab` is read-only inspection; it must not trigger shim side effects.
|
|
34
|
-
if (command === "lab") return true;
|
|
35
|
-
// Local messaging owns its helpers; even malformed usage must not repair/start anything.
|
|
36
|
-
if (command === "message") return true;
|
|
37
|
-
// `resolve` is read-only inspection for embedding shells: a lookup made to populate
|
|
38
|
-
// a consent surface must not trigger a shim repair side effect first.
|
|
39
|
-
if (command === "resolve") return true;
|
|
40
|
-
// Local model inventory is read-only; mutations and live commands keep preflight.
|
|
41
|
-
if (command === "models" || command === "model") {
|
|
42
|
-
const subcommand = args[1];
|
|
43
|
-
if (!subcommand || subcommand.startsWith("-") || subcommand === "list" || subcommand === "list-custom") return true;
|
|
44
|
-
}
|
|
45
|
-
// `service status --json` is a passive inventory read for peers such as GOAT: a shim repair
|
|
46
|
-
// before dispatch would change the installation it was asked only to describe.
|
|
47
|
-
// Flags may precede the verb (`ocx service --json status`), exactly as parseServiceArgs reads it.
|
|
48
|
-
if (command === "service" && args.includes("--json")
|
|
49
|
-
&& args.slice(1).find(arg => !arg.startsWith("--")) === "status") return true;
|
|
50
|
-
// The desktop's approval-bound stop must validate its snapshot before any unrelated
|
|
51
|
-
// CLI repair changes the installation it was approved against.
|
|
52
|
-
if (command === "stop" && args.some(arg => arg.startsWith("--expect-"))) return true;
|
|
53
|
-
// The entire updater-inspection namespace is zero-effect, including malformed
|
|
54
|
-
// or future actions. A later `apply` implementation must own its preflight.
|
|
55
|
-
if (command === "system" && args[1] === "codex-cli-update") return true;
|
|
56
|
-
if (command === "__update-badge") return true;
|
|
57
|
-
return command === "codex-shim" && ["install", "status", "uninstall", "remove"].includes(args[1] ?? "");
|
|
58
|
-
}
|
|
59
|
-
|
|
60
23
|
export function maybeAutoRestoreCodexShim(
|
|
61
24
|
command: string | undefined,
|
|
62
25
|
args: string[],
|
|
@@ -18,7 +18,8 @@ const USAGE = `Usage:
|
|
|
18
18
|
ocx config unset <dot.path> [--json]
|
|
19
19
|
ocx config validate [path|-] [--json]
|
|
20
20
|
ocx config export <path|-> [--json]
|
|
21
|
-
ocx config import <path|-> --yes [--json]
|
|
21
|
+
ocx config import <path|-> --yes [--json]
|
|
22
|
+
Entering v2-plaintext requires: ocx v2 mode v2-plaintext --acknowledge-plaintext-agent-messages`;
|
|
22
23
|
|
|
23
24
|
/**
|
|
24
25
|
* Keys whose VALUE is a credential and must never be printed by display commands.
|
|
@@ -230,6 +231,12 @@ function validate(value: unknown): OcxConfig {
|
|
|
230
231
|
return normalizeVisionConfig(result.config);
|
|
231
232
|
}
|
|
232
233
|
|
|
234
|
+
function requireDedicatedPlaintextTransition(current: OcxConfig, candidate: OcxConfig): void {
|
|
235
|
+
if (candidate.multiAgentMode === "v2-plaintext" && current.multiAgentMode !== "v2-plaintext") {
|
|
236
|
+
throw new CliUsageError("Entering v2-plaintext requires ocx v2 mode v2-plaintext --acknowledge-plaintext-agent-messages. Task text may remain in history, provider requests and debug state. Complete that transition before restoring a config with this mode.");
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
233
240
|
export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
234
241
|
let outcome = 0;
|
|
235
242
|
const status = await runCliAction(async () => {
|
|
@@ -293,6 +300,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
293
300
|
const candidate = structuredClone(fresh) as unknown as Record<string, unknown>;
|
|
294
301
|
setPath(candidate, path, raw === undefined ? undefined : parseValue(raw), action === "unset");
|
|
295
302
|
const config = validate(candidate);
|
|
303
|
+
requireDedicatedPlaintextTransition(fresh, config);
|
|
296
304
|
savedValue = action === "unset" ? null : getPath(config, path);
|
|
297
305
|
// Setting the order here is the operator restating it, exactly as through
|
|
298
306
|
// `ocx account priority` or the management route, so it releases the manual pin
|
|
@@ -357,6 +365,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
357
365
|
if (!yes) throw new CliUsageError("import requires --yes", USAGE);
|
|
358
366
|
rejectArgs(args, USAGE);
|
|
359
367
|
await withConfigDirHardeningSettled(getConfigDir(), () => {
|
|
368
|
+
// Reject invalid authority before lock preparation creates coordination files.
|
|
360
369
|
const current = readCliConfigForMutation();
|
|
361
370
|
const rawInput = loadInput(path);
|
|
362
371
|
if (rawInput && typeof rawInput === "object" && !Array.isArray(rawInput) && Object.hasOwn(rawInput, "telemetry")) {
|
|
@@ -364,6 +373,9 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
364
373
|
console.warn("Note: ignored telemetry block during config import; use `ocx telemetry` to manage telemetry consent.");
|
|
365
374
|
}
|
|
366
375
|
const imported = validate(rawInput);
|
|
376
|
+
// Do not hold the shared lock while reading stdin. Recheck the live mode and
|
|
377
|
+
// the active client connection, then save in the same synchronous transaction;
|
|
378
|
+
// saveConfig reuses this transaction.
|
|
367
379
|
withConfigMutationLockSync(() => {
|
|
368
380
|
const client = readClientConnectionState();
|
|
369
381
|
if (client.kind === "connected" && (imported.runtimeRole !== "client"
|
|
@@ -376,6 +388,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
|
|
|
376
388
|
} else {
|
|
377
389
|
delete imported.telemetry;
|
|
378
390
|
}
|
|
391
|
+
requireDedicatedPlaintextTransition(readCliConfigForMutation(), imported);
|
|
379
392
|
saveConfig(imported);
|
|
380
393
|
});
|
|
381
394
|
});
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { getConfigDir, hardenConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
2
|
+
import { WindowsSecretAclSettleTimeoutError, windowsSecretAclApplies } from "../lib/windows-secret-acl";
|
|
3
|
+
import { skipsCodexShimAutoRestore } from "./preflight-exemptions";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Wait once, before a CLI command does its first write, for the optional config-root ACL flight
|
|
7
|
+
* (#7815). On Windows, loadConfig() starts an unawaited icacls harden of the config root, and its
|
|
8
|
+
* inheritance work can drop a grant a concurrent writer just applied. Admitted writers already
|
|
9
|
+
* wait for it themselves; this covers the synchronous writers a CLI command reaches before them.
|
|
10
|
+
*
|
|
11
|
+
* Skipped where waiting would itself be the side effect or the delay matters:
|
|
12
|
+
* - the commands skipsCodexShimAutoRestore exempts from preflight repair (read-only, hot-path
|
|
13
|
+
* and validate-first commands). Adding a command there also removes this wait for it;
|
|
14
|
+
* - every "internal" helper and every hidden "__*" helper, launched by other processes under their
|
|
15
|
+
* own budgets (startup health, tray start/restart/host, version refresh, the GUI update worker);
|
|
16
|
+
* - "start", the long-lived server, and "ensure", which the Windows Codex shim runs before every
|
|
17
|
+
* launch to start it: the wait would run before Bun.serve and spend up to one ACL deadline of
|
|
18
|
+
* fixed budgets (update-restart marker, ensure readiness, Desktop cold start, service start
|
|
19
|
+
* timeouts, each Codex launch). The server's synchronous writers are documented residual.
|
|
20
|
+
*
|
|
21
|
+
* Bounded by one ACL deadline, which also drains timed-out icacls children. A timeout lets the
|
|
22
|
+
* command proceed: writers that admit through withConfigDirHardeningSettled still refuse alone.
|
|
23
|
+
*/
|
|
24
|
+
export async function settleConfigRootForCli(command: string | undefined, args: readonly string[]): Promise<void> {
|
|
25
|
+
if (!windowsSecretAclApplies()) return;
|
|
26
|
+
if (command === undefined || command === "start" || command === "ensure" || command === "internal"
|
|
27
|
+
|| command.startsWith("__") || skipsCodexShimAutoRestore(command, [...args])) return;
|
|
28
|
+
hardenConfigDir();
|
|
29
|
+
try {
|
|
30
|
+
await withConfigDirHardeningSettled(getConfigDir(), () => undefined);
|
|
31
|
+
} catch (error) {
|
|
32
|
+
if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
|
|
33
|
+
}
|
|
34
|
+
}
|