@bitkyc08/opencodex 2.93.0 → 2.95.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getConfigDir as configRoot, withConfigDirHardeningSettled as settleConfigRoot } from "../config/paths";
|
|
1
2
|
/**
|
|
2
3
|
* Align Grok and Claude Desktop files with the durable switches during `ocx ensure`.
|
|
3
4
|
*
|
|
@@ -9,6 +10,7 @@
|
|
|
9
10
|
* each external-file mutation, and use that current config for sync inputs.
|
|
10
11
|
*/
|
|
11
12
|
import { loadConfig } from "../config";
|
|
13
|
+
import { readConfigForAdmittedMutation } from "../config/persisted-mutation";
|
|
12
14
|
import { cliFirstPartyDesired, firstPartyDesired, reconcileClaudeFirstPartySettings } from "../claude/first-party-settings";
|
|
13
15
|
import { getConfigDir } from "../config/paths";
|
|
14
16
|
import { claudeInterceptEnabled } from "../claude/intercept/runtime";
|
|
@@ -46,7 +48,7 @@ export interface EnsureDesiredIntegrationsDeps {
|
|
|
46
48
|
syncGrokConfig: (
|
|
47
49
|
port: number,
|
|
48
50
|
config: OcxConfig,
|
|
49
|
-
opts?: { hostname?: string },
|
|
51
|
+
opts?: { hostname?: string; probeHostname?: string },
|
|
50
52
|
) => Promise<GrokInjectResult>;
|
|
51
53
|
removeDesktop3pStandardPivot: typeof removeDesktop3pStandardPivot;
|
|
52
54
|
removeDesktopFirstParty?: typeof removeDesktopFirstParty;
|
|
@@ -65,7 +67,7 @@ export interface EnsureDesiredIntegrationsDeps {
|
|
|
65
67
|
async function defaultSyncGrokConfig(
|
|
66
68
|
port: number,
|
|
67
69
|
config: OcxConfig,
|
|
68
|
-
opts: { hostname?: string } = {},
|
|
70
|
+
opts: { hostname?: string; probeHostname?: string } = {},
|
|
69
71
|
): Promise<GrokInjectResult> {
|
|
70
72
|
const { syncGrokConfig } = await import("../grok/sync");
|
|
71
73
|
return syncGrokConfig(port, config, opts);
|
|
@@ -98,7 +100,7 @@ function io(deps: EnsureDesiredIntegrationsDeps): {
|
|
|
98
100
|
*/
|
|
99
101
|
export async function ensureGrokFenceMatchesDesired(
|
|
100
102
|
port: number,
|
|
101
|
-
opts: { hostname?: string } = {},
|
|
103
|
+
opts: { hostname?: string; probeHostname?: string } = {},
|
|
102
104
|
deps: EnsureDesiredIntegrationsDeps = productionDeps,
|
|
103
105
|
): Promise<void> {
|
|
104
106
|
const config = deps.loadConfig();
|
|
@@ -130,7 +132,8 @@ export async function ensureGrokFenceMatchesDesired(
|
|
|
130
132
|
const g = await deps.syncGrokConfig(
|
|
131
133
|
port,
|
|
132
134
|
config,
|
|
133
|
-
hostname !== undefined ? { hostname } : {},
|
|
135
|
+
{ ...(hostname !== undefined ? { hostname } : {}),
|
|
136
|
+
...(opts.probeHostname !== undefined ? { probeHostname: opts.probeHostname } : {}) },
|
|
134
137
|
);
|
|
135
138
|
if (g.changed) log(" + Grok Build config updated (~/.grok/config.toml)");
|
|
136
139
|
else if (!g.ok) error(`⚠️ ${g.message}`);
|
|
@@ -151,13 +154,16 @@ export async function ensureClaudeDesktopMatchesDesired(
|
|
|
151
154
|
deps: EnsureDesiredIntegrationsDeps = productionDeps,
|
|
152
155
|
): Promise<void> {
|
|
153
156
|
const config = deps.loadConfig();
|
|
157
|
+
const readCurrent = () => deps.loadConfig === loadConfig ? readConfigForAdmittedMutation() : deps.loadConfig();
|
|
154
158
|
const { log, error } = io(deps);
|
|
155
159
|
if (cliFirstPartyDesired(config)) {
|
|
156
160
|
const seen = (deps.inspectDesktopFirstParty ?? inspectDesktopFirstParty)(config);
|
|
157
161
|
if (seen.settings.kind === "absent" || seen.stale || !claudeInterceptEnabled(config)) {
|
|
158
|
-
const result = await withFirstPartySecretsSettled(getConfigDir(), () =>
|
|
159
|
-
|
|
160
|
-
|
|
162
|
+
const result = await withFirstPartySecretsSettled(getConfigDir(), () => {
|
|
163
|
+
const current = readCurrent();
|
|
164
|
+
return (deps.reconcileClaudeFirstPartySettings ?? reconcileClaudeFirstPartySettings)(current,
|
|
165
|
+
firstPartyDesired(current, (deps.observeClaudeDesktopMode ?? observeClaudeDesktopMode)(current)));
|
|
166
|
+
});
|
|
161
167
|
if (result.ok && result.changed) log(` + Claude CLI first-party env refreshed (${result.path})`);
|
|
162
168
|
else if (!result.ok) error(`⚠️ Claude CLI first-party env refresh skipped: ${result.reason}.`);
|
|
163
169
|
}
|
|
@@ -175,7 +181,7 @@ export async function ensureClaudeDesktopMatchesDesired(
|
|
|
175
181
|
}
|
|
176
182
|
const seen = (deps.inspectDesktopFirstParty ?? inspectDesktopFirstParty)(config);
|
|
177
183
|
if (!seen.stale) return;
|
|
178
|
-
const applied = await withFirstPartySecretsSettled(getConfigDir(), () => (deps.applyDesktopFirstParty ?? applyDesktopFirstParty)(
|
|
184
|
+
const applied = await withFirstPartySecretsSettled(getConfigDir(), () => (deps.applyDesktopFirstParty ?? applyDesktopFirstParty)(readCurrent()));
|
|
179
185
|
if (applied.ok && applied.changed) log(` + Claude Desktop first-party env refreshed (${applied.path})`);
|
|
180
186
|
else if (!applied.ok) error(`⚠️ Claude Desktop first-party env refresh skipped: ${applied.reason}.`);
|
|
181
187
|
return;
|
|
@@ -207,9 +213,9 @@ export async function ensureClaudeDesktopMatchesDesired(
|
|
|
207
213
|
error(`⚠️ Claude Desktop first-party env cleanup failed: ${detail}.`);
|
|
208
214
|
}
|
|
209
215
|
try {
|
|
210
|
-
const removed = deps.removeDesktop3pStandardPivot({
|
|
211
|
-
appliedFingerprint:
|
|
212
|
-
});
|
|
216
|
+
const removed = await settleConfigRoot(configRoot(), () => deps.removeDesktop3pStandardPivot({
|
|
217
|
+
appliedFingerprint: readCurrent().claudeCode?.desktopProfile?.appliedFingerprint ?? null,
|
|
218
|
+
}));
|
|
213
219
|
if (removed.ok && removed.changed) {
|
|
214
220
|
log(" ↩️ Claude Desktop integration residue removed.");
|
|
215
221
|
} else if (!removed.ok) {
|
|
@@ -222,12 +228,12 @@ export async function ensureClaudeDesktopMatchesDesired(
|
|
|
222
228
|
}
|
|
223
229
|
|
|
224
230
|
export type EnsureDesiredIntegrationsBranch =
|
|
225
|
-
| { kind: "live"; hostname?: string }
|
|
231
|
+
| { kind: "live"; hostname?: string; probeHostname?: string }
|
|
226
232
|
| { kind: "spawned" };
|
|
227
233
|
|
|
228
234
|
/**
|
|
229
235
|
* Reconcile the two external integration files after either ensure race window.
|
|
230
|
-
*
|
|
236
|
+
* The live proxy's bind scope and responding address cross this boundary; persisted
|
|
231
237
|
* config is deliberately loaded inside each mutation helper.
|
|
232
238
|
*/
|
|
233
239
|
export async function reconcileEnsureDesiredIntegrations(
|
|
@@ -238,7 +244,8 @@ export async function reconcileEnsureDesiredIntegrations(
|
|
|
238
244
|
const liveHost = branch.kind === "live" ? branch.hostname : undefined;
|
|
239
245
|
await ensureGrokFenceMatchesDesired(
|
|
240
246
|
port,
|
|
241
|
-
liveHost ? { hostname: liveHost } : {},
|
|
247
|
+
{ ...(liveHost ? { hostname: liveHost } : {}),
|
|
248
|
+
...(branch.kind === "live" && branch.probeHostname !== undefined ? { probeHostname: branch.probeHostname } : {}) },
|
|
242
249
|
deps,
|
|
243
250
|
);
|
|
244
251
|
await ensureClaudeDesktopMatchesDesired(deps);
|
|
@@ -9,14 +9,27 @@
|
|
|
9
9
|
* Desktop.
|
|
10
10
|
*
|
|
11
11
|
* Rules, in order:
|
|
12
|
-
* -
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
12
|
+
* - Facts re-observed after the asynchronous recovery inspection keep first refusal:
|
|
13
|
+
* ownership or the process list that cannot be read is not evidence of absence.
|
|
14
|
+
* - Verified native intent wins over every other signal: an independently verified recovery
|
|
15
|
+
* keeps its replacement, including without a claim, while a verified stop refuses. The
|
|
16
|
+
* current bundled CLI (or protected system installation) anchors the executable; the
|
|
17
|
+
* accepted socket, process incarnation and fresh native intent bind the recovery proof.
|
|
18
|
+
* - Conflicting native evidence — drift, contradiction or an unprovable observation on a
|
|
19
|
+
* platform that can verify — refuses even under a durable claim. A claim outranks only
|
|
20
|
+
* the structurally unsupported verdict of a platform with no live-image binding.
|
|
21
|
+
* - An unclaimed start cannot be authorized or suppressed by a name, locator file or
|
|
22
|
+
* unverifiable observation: unknown still refuses; otherwise the ordinary CLI cold start
|
|
23
|
+
* runs. Unsupported per-user installations do not acquire authority from their
|
|
24
|
+
* self-reported identity; use their bundled CLI.
|
|
25
|
+
* - A running Desktop app with a durable Desktop claim is the supervisor. Wait for its proxy;
|
|
26
|
+
* never start a competing one. A process name alone is not ownership evidence. A durable
|
|
27
|
+
* Desktop claim with no running app: start Desktop (hidden, by the path its own login
|
|
28
|
+
* registration recorded — LaunchServices never picks the bundle) where that is verifiable,
|
|
29
|
+
* then wait. Elsewhere, fail with guidance. A missing Desktop process never authorizes a
|
|
30
|
+
* CLI proxy by itself; an unsupported verdict beside an absent observation is
|
|
31
|
+
* contradictory and refuses. Handing ownership to the CLI stays an explicit
|
|
17
32
|
* `ocx service install` consent step.
|
|
18
|
-
* - Ownership or the process list that cannot be read is not evidence of absence: refuse.
|
|
19
|
-
* - No claim and no running app: the ordinary CLI cold start.
|
|
20
33
|
*
|
|
21
34
|
* Concurrent shim launches share one Desktop launch through a lease file held by a live process;
|
|
22
35
|
* every caller then waits on the same readiness probe.
|
|
@@ -28,6 +41,7 @@ import { homedir } from "node:os";
|
|
|
28
41
|
import { basename, dirname, join, posix, win32 } from "node:path";
|
|
29
42
|
import { getConfigDir } from "../config/paths";
|
|
30
43
|
import { resolveServiceOwnership } from "../service/state";
|
|
44
|
+
import { inspectDesktopRecovery, type DesktopRecoveryEvidence } from "../service/desktop-recovery";
|
|
31
45
|
|
|
32
46
|
export type DesktopProcessState = "running" | "absent" | "unknown";
|
|
33
47
|
export type DesktopOwnershipState = "desktop" | "other" | "unknown";
|
|
@@ -36,16 +50,28 @@ export type EnsureColdStartPlan =
|
|
|
36
50
|
| { kind: "spawn-cli" }
|
|
37
51
|
| { kind: "wait-desktop" }
|
|
38
52
|
| { kind: "launch-desktop" }
|
|
39
|
-
| { kind: "refuse"; reason: "desktop-unlaunchable" | "unverified" };
|
|
53
|
+
| { kind: "refuse"; reason: "desktop-unlaunchable" | "desktop-stopped" | "unverified" };
|
|
40
54
|
|
|
41
55
|
export function planEnsureColdStart(facts: {
|
|
42
56
|
ownership: DesktopOwnershipState;
|
|
43
57
|
desktopProcess: DesktopProcessState;
|
|
44
58
|
platform: NodeJS.Platform;
|
|
59
|
+
recovery?: DesktopRecoveryEvidence;
|
|
45
60
|
}): EnsureColdStartPlan {
|
|
46
|
-
if (facts.desktopProcess === "running") return { kind: "wait-desktop" };
|
|
47
61
|
if (facts.ownership === "unknown" || facts.desktopProcess === "unknown") return { kind: "refuse", reason: "unverified" };
|
|
48
|
-
if (facts.
|
|
62
|
+
if (facts.recovery?.kind === "recovering") return { kind: "wait-desktop" };
|
|
63
|
+
if (facts.recovery?.kind === "stopped") return { kind: "refuse", reason: "desktop-stopped" };
|
|
64
|
+
// Drifted or contradictory native evidence refuses even under a durable claim; the claim
|
|
65
|
+
// outranks only the structurally unsupported verdict of a platform with no image binding.
|
|
66
|
+
if (facts.recovery?.kind === "unknown" && facts.recovery.unsupported !== true) return { kind: "refuse", reason: "unverified" };
|
|
67
|
+
if (facts.ownership === "other") {
|
|
68
|
+
// An unclaimed start cannot be authorized or suppressed by an unverifiable observation.
|
|
69
|
+
return facts.recovery?.kind === "unknown" ? { kind: "refuse", reason: "unverified" } : { kind: "spawn-cli" };
|
|
70
|
+
}
|
|
71
|
+
if (facts.desktopProcess === "running") return { kind: "wait-desktop" };
|
|
72
|
+
// A matched native process beside an absent observation is contradictory; refuse rather
|
|
73
|
+
// than launch a new app or guess at the supervisor's state.
|
|
74
|
+
if (facts.recovery?.kind === "unknown") return { kind: "refuse", reason: "unverified" };
|
|
49
75
|
return facts.platform === "darwin" ? { kind: "launch-desktop" } : { kind: "refuse", reason: "desktop-unlaunchable" };
|
|
50
76
|
}
|
|
51
77
|
|
|
@@ -61,6 +87,7 @@ export interface DesktopColdStartDeps<T> {
|
|
|
61
87
|
platform: NodeJS.Platform;
|
|
62
88
|
ownership: () => DesktopOwnershipState;
|
|
63
89
|
desktopProcess: () => DesktopProcessState;
|
|
90
|
+
desktopRecovery?: () => Promise<DesktopRecoveryEvidence>;
|
|
64
91
|
/** Start the Desktop app hidden. Returns false when the request could not be made. */
|
|
65
92
|
launchDesktop: () => boolean;
|
|
66
93
|
/** Returns a release function when this caller should launch, or null when another caller already did. */
|
|
@@ -72,15 +99,18 @@ export interface DesktopColdStartDeps<T> {
|
|
|
72
99
|
const QUIT_HINT = "To run the proxy from this CLI instead, quit OpenCodex and run `ocx service install` or `ocx start`.";
|
|
73
100
|
|
|
74
101
|
export async function runDesktopColdStart<T>(deps: DesktopColdStartDeps<T>): Promise<DesktopColdStartResult<T>> {
|
|
102
|
+
const recovery = await deps.desktopRecovery?.();
|
|
75
103
|
const plan = planEnsureColdStart({
|
|
76
104
|
ownership: deps.ownership(),
|
|
77
105
|
desktopProcess: deps.desktopProcess(),
|
|
78
106
|
platform: deps.platform,
|
|
107
|
+
recovery,
|
|
79
108
|
});
|
|
80
109
|
if (plan.kind === "spawn-cli") return { kind: "cli" };
|
|
81
110
|
if (plan.kind === "refuse") {
|
|
82
111
|
return { kind: "failed", message: plan.reason === "unverified"
|
|
83
112
|
? "Could not verify whether OpenCodex Desktop manages this proxy, so no CLI proxy was started. Run `ocx doctor`, or start the proxy explicitly with `ocx start`."
|
|
113
|
+
: plan.reason === "desktop-stopped" ? `OpenCodex Desktop has stopped its proxy. Use Start Proxy in the OpenCodex menu. ${QUIT_HINT}`
|
|
84
114
|
: `OpenCodex Desktop manages this proxy but is not running. Open OpenCodex to start it. ${QUIT_HINT}` };
|
|
85
115
|
}
|
|
86
116
|
if (plan.kind === "launch-desktop") {
|
|
@@ -374,6 +404,7 @@ export function productionDesktopColdStartDeps<T>(waitForProxy: (timeoutMs: numb
|
|
|
374
404
|
} catch { return "unknown"; }
|
|
375
405
|
},
|
|
376
406
|
desktopProcess: () => inspectDesktopProcess(),
|
|
407
|
+
desktopRecovery: () => inspectDesktopRecovery(),
|
|
377
408
|
launchDesktop: () => launchDesktopApp(),
|
|
378
409
|
acquireLaunchLease: () => acquireDesktopLaunchLease(getConfigDir()),
|
|
379
410
|
waitForProxy,
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
*/
|
|
29
29
|
import { writeFileSync } from "node:fs";
|
|
30
30
|
import { loadConfig } from "../config";
|
|
31
|
+
import { ClientPathError } from "../clients/client-path";
|
|
31
32
|
import {
|
|
32
|
-
ClientPathError,
|
|
33
33
|
EXPORT_CLIENTS,
|
|
34
34
|
EXPORT_CLIENT_IDS,
|
|
35
35
|
buildClientConfigText,
|
|
@@ -39,6 +39,7 @@ import {
|
|
|
39
39
|
type ExportModel,
|
|
40
40
|
} from "../clients/config-export";
|
|
41
41
|
import { opencodeCatalogFromProxyRows, type OpencodeProxyModelRow } from "./opencode";
|
|
42
|
+
import { integrationModelNames } from "./integration-input";
|
|
42
43
|
import type { OcxConfig } from "../types";
|
|
43
44
|
import {
|
|
44
45
|
CliUsageError,
|
|
@@ -54,7 +55,7 @@ import {
|
|
|
54
55
|
} from "./runtime-api";
|
|
55
56
|
|
|
56
57
|
const USAGE = `Usage:
|
|
57
|
-
ocx export --client <${EXPORT_CLIENT_IDS.join("|")}> [--json] [--out <path>] [--force]`;
|
|
58
|
+
ocx export --client <${EXPORT_CLIENT_IDS.join("|")}> [--model-names <alias|routed>] [--json] [--out <path>] [--force]`;
|
|
58
59
|
|
|
59
60
|
export interface ExportCommandDeps extends RuntimeApiDeps {
|
|
60
61
|
/** Live config seam; tests inject a fixture instead of reading the user's config. */
|
|
@@ -164,6 +165,7 @@ export async function handleExportCommand(argv: string[], deps: ExportCommandDep
|
|
|
164
165
|
return runCliAction(async () => {
|
|
165
166
|
const args = [...argv];
|
|
166
167
|
const client = parseClient(args);
|
|
168
|
+
const modelNames = integrationModelNames(args, client, "export", USAGE);
|
|
167
169
|
const wantsJson = takeFlag(args, "--json");
|
|
168
170
|
const force = takeFlag(args, "--force");
|
|
169
171
|
const out = takeOption(args, "--out");
|
|
@@ -172,13 +174,15 @@ export async function handleExportCommand(argv: string[], deps: ExportCommandDep
|
|
|
172
174
|
const spec = EXPORT_CLIENTS[client];
|
|
173
175
|
const root = await runtimeBaseUrl(deps);
|
|
174
176
|
let built: { document: unknown; text: string };
|
|
175
|
-
if (client === "raycast" || client === "droid" || client === "qoder" || client === "qoder-cn" || client === "workbuddy" || client === "workbuddy-ai") {
|
|
177
|
+
if (modelNames !== undefined || client === "t3code" || client === "raycast" || client === "droid" || client === "qoder" || client === "qoder-cn" || client === "workbuddy" || client === "workbuddy-ai") {
|
|
176
178
|
// The dial address alone cannot distinguish a wildcard authenticated bind
|
|
177
179
|
// from loopback. Let the live server resolve its admission/listener policy;
|
|
178
180
|
// saved config can differ from the process serving this request.
|
|
181
|
+
const passive = client === "hermes" || client === "commandcode";
|
|
182
|
+
const query = `client=${client}${passive ? "&preview=1" : ""}${modelNames === undefined ? "" : `&modelNames=${modelNames}`}`;
|
|
179
183
|
const exported = await runtimeRequest<{
|
|
180
184
|
client: string; format: string; config: unknown; text: string;
|
|
181
|
-
}>(`/api/client-config
|
|
185
|
+
}>(`/api/client-config?${query}`, {}, { ...deps, baseUrl: root });
|
|
182
186
|
if (!exported || exported.client !== client || exported.format !== spec.format
|
|
183
187
|
|| typeof exported.text !== "string" || exported.config === undefined) {
|
|
184
188
|
throw new RuntimeApiError(`Management API returned an unexpected ${client} export payload.`, 502, null);
|
package/src/cli/help.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { EXPORT_CLIENT_IDS } from "../clients/client-ids";
|
|
1
2
|
import { resolveHelpPath } from "./help-catalog";
|
|
2
3
|
import type { Capability } from "./capabilities";
|
|
3
4
|
import { MODELS_CONTEXT_DETAILS, MODELS_CONTEXT_USAGE } from "./help-models-context";
|
|
@@ -94,7 +95,7 @@ Usage:
|
|
|
94
95
|
ocx api-key <sub> Alias of ocx access key
|
|
95
96
|
ocx access <sub> External API keys and endpoint information
|
|
96
97
|
ocx api <sub> Protocol paths: vocabulary, request-path preview, and policy
|
|
97
|
-
ocx export --client <id> Print a client config wired to the running proxy (
|
|
98
|
+
ocx export --client <id> Print a client config wired to the running proxy (${EXPORT_CLIENT_IDS.length} clients)
|
|
98
99
|
ocx integration client <sub> Enable, disable, inspect or roll back a client integration
|
|
99
100
|
ocx grok <sub> Grok Build model selection and apply
|
|
100
101
|
ocx system <sub> Runtime settings, startup, sync, OpenCodex updates, and Codex CLI inspection
|
|
@@ -106,6 +107,7 @@ Usage:
|
|
|
106
107
|
ocx chatgpt <sub> Experimental app-server shim: launch|restore|status (macOS)
|
|
107
108
|
ocx claude [args...] Launch Claude Code wired to the proxy (model discovery on)
|
|
108
109
|
ocx claude desktop [sub] Manage and apply Claude Desktop's four-family profile
|
|
110
|
+
ocx codex [args...] Launch Codex through the proxy's routing (pass-through when disabled)
|
|
109
111
|
ocx opencode [args...] Launch opencode wired to the proxy (runtime provider config)
|
|
110
112
|
ocx mcode [args...] Launch MiniMax Code through its managed provider
|
|
111
113
|
ocx mmx text <sub> [args] Launch MiniMax CLI text through the proxy
|
package/src/cli/index.ts
CHANGED
|
@@ -49,7 +49,7 @@ import {
|
|
|
49
49
|
resolveCodexHistoryJobTarget,
|
|
50
50
|
runCodexHistoryJob,
|
|
51
51
|
} from "../codex/history-job";
|
|
52
|
-
import { findCrossHomeOwner, markCrossHomeSibling, markLiveHomeSibling
|
|
52
|
+
import { findCrossHomeOwner, markCrossHomeSibling, markLiveHomeSibling } from "./cross-home-owner";
|
|
53
53
|
import { inspectClientRotationRecoveryGate, readClientConnectionState } from "../client/state";
|
|
54
54
|
import {
|
|
55
55
|
codexAutoStartEnabled,
|
|
@@ -69,9 +69,9 @@ import {
|
|
|
69
69
|
writePid,
|
|
70
70
|
writeRuntimePort,
|
|
71
71
|
} from "../config/process-state";
|
|
72
|
+
import { describeTrackedRuntimeTarget } from "../config/tracked-runtime-inspection";
|
|
72
73
|
import {
|
|
73
74
|
claimPendingTeardown,
|
|
74
|
-
clearPendingTeardown,
|
|
75
75
|
isPendingTeardownAbandoned,
|
|
76
76
|
listPendingTeardowns,
|
|
77
77
|
pendingTeardownPathFor,
|
|
@@ -128,7 +128,6 @@ import { inspectGuardedManagerTarget, observeGuardedManagerStopped } from "../se
|
|
|
128
128
|
import { summarizeStopRun, type StopOutcome, type StopRunRecord } from "./stop-report";
|
|
129
129
|
import { runCli } from "./root";
|
|
130
130
|
import { isProcessAlive, ProxyOwnershipRefusedError, refusalNextStep, stopProxy } from "../lib/process-control";
|
|
131
|
-
import { directLocalHttpFetch } from "../server/direct-local-http";
|
|
132
131
|
import { startupDataPlaneToken } from "../lib/service-secrets";
|
|
133
132
|
import { assertNotAdminToken, diagnoseService, isServiceOwnershipError, proxyStillLiveAfterStop, serviceCommand, serviceEnvironmentOwnedHere, serviceStartableFromTray, serviceStatePaths, serviceStatusSummary, stopServiceIfInstalledDetailed, uninstallServiceIfInstalled, uninstallServiceDetailed } from "../service";
|
|
134
133
|
import { acquireOwnershipMutationLease } from "../service/ownership-mutation-lease.mjs";
|
|
@@ -164,9 +163,10 @@ import { removeOwnedConfigAfterDesktopCleanup } from "./uninstall-client-state";
|
|
|
164
163
|
import { withProcessRuntimeProvenance } from "../lib/bun-runtime";
|
|
165
164
|
import { startArgv } from "../lib/self-launch-argv";
|
|
166
165
|
import { initializeNodeLauncherContext } from "./launcher-context";
|
|
167
|
-
import { assertConnectedClientStopSupported, connectedClientStopSkipLine, preflightConnectedClientStop, preserveConnectedClientRoutingOnExit, restoreSharedClientStateAfterStop } from "./stop-restore";
|
|
166
|
+
import { assertConnectedClientStopSupported, clearRestoredStopReceipts, connectedClientStopSkipLine, notOwnedTeardownIsAcceptable, preflightConnectedClientStop, preserveConnectedClientRoutingOnExit, restoreBoundaryOwnership, restoreSharedClientStateAfterStop, settleUnrestoredStopBoundary } from "./stop-restore";
|
|
167
|
+
import { stopRestoreWriteGuard } from "./stop-restore-guard";
|
|
168
168
|
import { startClientRuntimeUnderOwnershipLease } from "./client-start-fence";
|
|
169
|
-
import { recoverStartStateUnderOwnershipLease } from "./start-owner-fence";
|
|
169
|
+
import { recoverStartJournalAfterOwnerRecheck, recoverStartStateUnderOwnershipLease } from "./start-owner-fence";
|
|
170
170
|
import { handledSignalExitCode } from "../lib/handled-signal-exit";
|
|
171
171
|
import { createLocalAttestationSecret } from "../lib/local-management-attestation";
|
|
172
172
|
import { MEMORY_DRAIN_RESTART_MS, REPLACEMENT_READY_TIMEOUT_MS, RESTART_REOBSERVE_RESERVE_MS } from "../lib/system-restart-contract";
|
|
@@ -372,7 +372,7 @@ async function findProxyOwnerBeforeJournalRecovery(
|
|
|
372
372
|
const hasRuntimeOwner = readRuntimePort() !== null;
|
|
373
373
|
const shouldProbe = pidSnapshot !== null || hasRuntimeOwner || options.probeConfiguredPort === true;
|
|
374
374
|
// A negative answer lets the caller walk past a proxy it was supposed to find and
|
|
375
|
-
// deletes this home's stale pid record.
|
|
375
|
+
// deletes this home's stale pid record. Start and ensure defer that write to the
|
|
376
376
|
// lease-held owner recheck; journal recovery follows cross-home discovery.
|
|
377
377
|
// One 750ms probe is not enough evidence for that (#5004) — a transport
|
|
378
378
|
// failure is indistinguishable from an empty port, and the reported Windows duplicate
|
|
@@ -440,7 +440,14 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
440
440
|
let siblingStart = honorSiblingMarker(process.env, consumeSiblingHandoff) !== null;
|
|
441
441
|
// A restart replacement waits out its draining parent instead of refusing it, and bounds its handoff log (restart-handoff.ts).
|
|
442
442
|
const restartParent = { restartParentPid: takeRestartHandoffMarkers(process.env), requestedPort, ocxService: process.env.OCX_SERVICE };
|
|
443
|
-
const owner = await probeOwnerPastRestartParent(() => findProxyOwnerBeforeJournalRecovery({ probeConfiguredPort: true, deferPidCleanup:
|
|
443
|
+
const owner = await probeOwnerPastRestartParent(() => findProxyOwnerBeforeJournalRecovery({ probeConfiguredPort: true, deferPidCleanup: true }), restartParent);
|
|
444
|
+
if (!owner.live) siblingStart = await recoverStartStateUnderOwnershipLease({
|
|
445
|
+
supervised: supervisedServiceChild,
|
|
446
|
+
acquireLease: () => acquireOwnershipMutationLease(serviceStatePaths()),
|
|
447
|
+
decide: () => serviceChildOwnershipDecisionForClassifiedChild(supervisedServiceChild),
|
|
448
|
+
stayOut: refusal => { console.error("❌ " + refusal); process.exit(serviceStayOutExitCode()); },
|
|
449
|
+
recover: () => recoverStartJournalAfterOwnerRecheck(owner, siblingStart),
|
|
450
|
+
});
|
|
444
451
|
if (owner.live) {
|
|
445
452
|
// Rationale and the full decision table live on `decideStartWithLiveOwner`.
|
|
446
453
|
const decision = decideStartWithLiveOwner({
|
|
@@ -469,18 +476,6 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
469
476
|
+ `Startup continues only for an independent OPENCODEX_HOME; one state directory has one spend-ledger writer.`,
|
|
470
477
|
);
|
|
471
478
|
}
|
|
472
|
-
siblingStart = await recoverStartStateUnderOwnershipLease({
|
|
473
|
-
supervised: supervisedServiceChild,
|
|
474
|
-
acquireLease: () => acquireOwnershipMutationLease(serviceStatePaths()),
|
|
475
|
-
decide: () => serviceChildOwnershipDecisionForClassifiedChild(supervisedServiceChild),
|
|
476
|
-
stayOut: refusal => { console.error("❌ " + refusal); process.exit(serviceStayOutExitCode()); },
|
|
477
|
-
recover: async () => {
|
|
478
|
-
if (!owner.live && supervisedServiceChild) removePidIfValueIs(owner.pidSnapshot);
|
|
479
|
-
if (!owner.live && !siblingStart) siblingStart = await markCrossHomeSibling();
|
|
480
|
-
if (!siblingStart) reconcileStartupJournal();
|
|
481
|
-
return siblingStart;
|
|
482
|
-
},
|
|
483
|
-
});
|
|
484
479
|
|
|
485
480
|
updateRestartChild?.check();
|
|
486
481
|
const clientState = readClientConnectionState();
|
|
@@ -532,7 +527,7 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
532
527
|
console.error("❌ " + leasedChildOwnership.refusal);
|
|
533
528
|
throw new StartCommandExit(serviceStayOutExitCode());
|
|
534
529
|
}
|
|
535
|
-
//
|
|
530
|
+
// Recovery rechecked liveness under its lease. This fence owns the bind decision: an
|
|
536
531
|
// updater may have stopped the old runtime and acquired this lease for replacement.
|
|
537
532
|
const fencedLive = await findLiveProxy(START_OWNERSHIP_LIVENESS);
|
|
538
533
|
if (fencedLive) {
|
|
@@ -658,6 +653,7 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
658
653
|
// Dashboard drain-and-restart (#563) must not tear down injection: the replacement
|
|
659
654
|
// process expects Codex/Grok/env fences to still be in place. A sibling owns none of them.
|
|
660
655
|
const teardown = preserveConnectedClientRoutingOnExit(decideStartExitTeardown({ sibling: siblingStart, recycling: isRecyclingForExit(), ocxService: process.env.OCX_SERVICE }));
|
|
656
|
+
const restoreGuard = stopRestoreWriteGuard();
|
|
661
657
|
if (teardown.revertSystemEnv) {
|
|
662
658
|
try { revertSystemEnv(); } catch { /* best-effort */ }
|
|
663
659
|
}
|
|
@@ -666,15 +662,17 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
666
662
|
if (teardown.restoreNativeCodex) {
|
|
667
663
|
try {
|
|
668
664
|
if (!codexHomeIsAbsent(getCodexHome())) {
|
|
669
|
-
const restored = restoreNativeCodex();
|
|
665
|
+
const restored = restoreNativeCodex({ withWriteGuard: restoreGuard.run });
|
|
670
666
|
if (!restored.success) {
|
|
671
667
|
cleanupSucceeded = false;
|
|
672
668
|
console.error(`⚠️ Native Codex restore failed during shutdown: ${restored.message}`);
|
|
673
669
|
}
|
|
674
670
|
}
|
|
675
671
|
} catch (error) {
|
|
676
|
-
|
|
677
|
-
|
|
672
|
+
if (restoreGuard.boundary() !== "hub-owned") {
|
|
673
|
+
cleanupSucceeded = false;
|
|
674
|
+
console.error(`⚠️ Native Codex restore failed during shutdown: ${error instanceof Error ? error.message : String(error)}`);
|
|
675
|
+
}
|
|
678
676
|
}
|
|
679
677
|
}
|
|
680
678
|
// Same ownership rule as `ocx stop`: if the installed service belongs to another home, the
|
|
@@ -682,7 +680,8 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
682
680
|
// left pointing nowhere. This guard also covers signal-driven exits, which is the path that
|
|
683
681
|
// would otherwise bypass handleStop's gate entirely.
|
|
684
682
|
if (teardown.stripGrokConfig && serviceEnvironmentOwnedHere()) {
|
|
685
|
-
try { stripGrokConfig(); }
|
|
683
|
+
try { restoreGuard.run(() => stripGrokConfig()); }
|
|
684
|
+
catch { if (restoreGuard.boundary() !== "hub-owned") cleanupSucceeded = false; }
|
|
686
685
|
}
|
|
687
686
|
return cleanupSucceeded;
|
|
688
687
|
};
|
|
@@ -709,7 +708,7 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
709
708
|
void (async () => {
|
|
710
709
|
let shutdownSucceeded = false;
|
|
711
710
|
try {
|
|
712
|
-
shutdownSucceeded = await drainAndShutdown(server, config.shutdownTimeoutMs ?? 5000);
|
|
711
|
+
shutdownSucceeded = await drainAndShutdown(server, config.shutdownTimeoutMs ?? 5000, () => { syncCleanup(); return undefined; });
|
|
713
712
|
} finally {
|
|
714
713
|
const restored = syncCleanup(); // idempotent (cleaned-guard); also re-run by process.on("exit")
|
|
715
714
|
process.exit(restored && shutdownSucceeded ? handledSignalExitCode(signal) : 1);
|
|
@@ -814,8 +813,14 @@ function detachedStartEnvironment(): NodeJS.ProcessEnv {
|
|
|
814
813
|
}
|
|
815
814
|
|
|
816
815
|
async function handleEnsure(options: { existingIsSuccess?: boolean; forceStart?: boolean; onSpawn?: (child: ReturnType<typeof spawn>) => void } = {}): Promise<boolean> {
|
|
817
|
-
const owner = await findProxyOwnerBeforeJournalRecovery({ probeConfiguredPort: true });
|
|
818
|
-
if (!owner.live
|
|
816
|
+
const owner = await findProxyOwnerBeforeJournalRecovery({ probeConfiguredPort: true, deferPidCleanup: true });
|
|
817
|
+
if (!owner.live) await recoverStartStateUnderOwnershipLease({
|
|
818
|
+
supervised: false,
|
|
819
|
+
acquireLease: () => acquireOwnershipMutationLease(serviceStatePaths()),
|
|
820
|
+
decide: () => ({ kind: "proceed" }),
|
|
821
|
+
stayOut: () => { throw new Error("ordinary ensure has no service stay-out decision"); },
|
|
822
|
+
recover: () => recoverStartJournalAfterOwnerRecheck(owner),
|
|
823
|
+
});
|
|
819
824
|
// A later ensure can find this home's sibling alive; the other port still owns shared clients.
|
|
820
825
|
if (owner.live) await markLiveHomeSibling(owner.live);
|
|
821
826
|
const config = loadConfig();
|
|
@@ -850,13 +855,13 @@ async function handleEnsure(options: { existingIsSuccess?: boolean; forceStart?:
|
|
|
850
855
|
const systemEnv = await injectSystemEnv(live.port, config).catch(() => ({ injected: false }));
|
|
851
856
|
if (siblingOfLivePort() === null) reportShellHookFailure(reconcileShellHook(systemEnv.injected));
|
|
852
857
|
if (!systemEnv.injected) await syncClaudeAgentDefsAtProxyStartup(config, live.port);
|
|
853
|
-
// Refresh the Grok Build fence too (same contract as start).
|
|
854
|
-
//
|
|
855
|
-
// The reconciler re-reads immediately before each client-file mutation;
|
|
856
|
-
// the
|
|
858
|
+
// Refresh the Grok Build fence too (same contract as start). Keep the observed
|
|
859
|
+
// bind scope for admission and its responding address for the destination.
|
|
860
|
+
// The reconciler re-reads immediately before each client-file mutation;
|
|
861
|
+
// config.hostname may have drifted from the running proxy's bind scope.
|
|
857
862
|
if (siblingOfLivePort() === null) await reconcileEnsureDesiredIntegrations(
|
|
858
863
|
live.port,
|
|
859
|
-
{ kind: "live", hostname: live.hostname },
|
|
864
|
+
{ kind: "live", hostname: live.hostname, probeHostname: live.probeHostname },
|
|
860
865
|
);
|
|
861
866
|
console.log(`✅ Proxy running on port ${live.port}`);
|
|
862
867
|
return true;
|
|
@@ -1016,13 +1021,7 @@ async function handleStop(approval?: StopApproval) {
|
|
|
1016
1021
|
try { return JSON.parse(lines[0]!) as ResolveJson; }
|
|
1017
1022
|
catch { return null; }
|
|
1018
1023
|
},
|
|
1019
|
-
|
|
1020
|
-
const pid = readPid();
|
|
1021
|
-
const runtime = pid === null ? null : readRuntimePort(pid);
|
|
1022
|
-
return pid && runtime?.port ? {
|
|
1023
|
-
pid, port: runtime.port, hostname: runtime.hostname ?? "",
|
|
1024
|
-
} : null;
|
|
1025
|
-
},
|
|
1024
|
+
describeTrackedRuntimeTarget,
|
|
1026
1025
|
() => inspectGuardedManagerTarget(approval.pid, approval.port),
|
|
1027
1026
|
snapshot => handleStopUnlocked(snapshot),
|
|
1028
1027
|
);
|
|
@@ -1159,8 +1158,12 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1159
1158
|
if (connectedClientSkip) await assertConnectedClientStopSupported(exact ? { ...exact, pid } : null);
|
|
1160
1159
|
claimTeardown(exact ?? configuredEndpoint(), exact ? "exact" : "guessed");
|
|
1161
1160
|
const graceful = await stopProxy(pid, {
|
|
1162
|
-
fetchFn: connectedClientSkip ? directLocalHttpFetch as typeof fetch : undefined,
|
|
1163
1161
|
deferSharedTeardownNonce: teardownNonce,
|
|
1162
|
+
// "not-owned" is refused only for a positively identified Link connection, read at the
|
|
1163
|
+
// POST: an old build answers it while preserving the loopback route this stop must
|
|
1164
|
+
// restore. A connect committed mid-stop can make this a hub client whose answer is
|
|
1165
|
+
// truthful, so the entry-time skip snapshot cannot stand in for this check.
|
|
1166
|
+
acceptNotOwnedTeardown: notOwnedTeardownIsAcceptable(readClientConnectionState(), stoppingSibling),
|
|
1164
1167
|
// Only an exact endpoint may direct the request; the configured fallback is a guess
|
|
1165
1168
|
// good enough to record an obligation against, not to POST a stop to.
|
|
1166
1169
|
runtimeEndpoint: exact ?? undefined,
|
|
@@ -1438,44 +1441,30 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1438
1441
|
const restoreBlocked = ownershipBlocked || inheritedBlocks || nativeRestoreHandledByProxy || stoppingSibling || connectedClientSkip !== null;
|
|
1439
1442
|
const handedOver = stopHandsTeardownOver({ requested: handoverRequested, restoreBlocked, nonce: teardownNonce,
|
|
1440
1443
|
stopFailed, recoveredCount: recoveredNonces.length, proxy: record.proxy, service: record.service, deferralHonored: deferralHonoredByProxy });
|
|
1444
|
+
// Ownership can change while the stop awaits; only the state at the restore boundary decides (#7736).
|
|
1445
|
+
const boundary = restoreBlocked || handedOver ? "restore" : restoreBoundaryOwnership();
|
|
1446
|
+
if (boundary !== "restore") stopFailed = settleUnrestoredStopBoundary(boundary, record, teardownNonce ? [teardownNonce, ...recoveredNonces] : recoveredNonces) || stopFailed;
|
|
1441
1447
|
if (handedOver) announceStopHandover();
|
|
1442
|
-
else if (!restoreBlocked) {
|
|
1448
|
+
else if (!restoreBlocked && boundary === "restore") {
|
|
1443
1449
|
if (recoveredNonces.length > 0) {
|
|
1444
1450
|
// A previous deferred stop died before restoring, and the probe says its endpoint is
|
|
1445
1451
|
// not answering. That is the whole point of leaving the receipt behind.
|
|
1446
1452
|
console.log("↩️ Finishing a shared teardown left unfinished by an earlier stop.");
|
|
1447
1453
|
}
|
|
1448
1454
|
const restore = await restoreSharedClientStateAfterStop(reportRetainedCodexProviderTable);
|
|
1449
|
-
|
|
1450
|
-
|
|
1451
|
-
|
|
1452
|
-
|
|
1453
|
-
|
|
1454
|
-
|
|
1455
|
-
|
|
1456
|
-
|
|
1457
|
-
|
|
1458
|
-
|
|
1459
|
-
|
|
1460
|
-
|
|
1461
|
-
|
|
1462
|
-
// leave the client config pointing at a proxy that is gone, with nothing on disk
|
|
1463
|
-
// saying so — which is the whole failure the receipt exists to prevent (#4718).
|
|
1464
|
-
if (restore.historyDeferred) {
|
|
1465
|
-
console.error(" The shared teardown was refused before it changed anything, so it is still owed.");
|
|
1466
|
-
console.error(" Its receipt is preserved; run 'ocx stop' again once Codex is closed to retry the restore.");
|
|
1467
|
-
}
|
|
1468
|
-
if (!restore.other && !restore.historyDeferred) {
|
|
1469
|
-
const discharged = teardownNonce ? [teardownNonce, ...recoveredNonces] : recoveredNonces;
|
|
1470
|
-
for (const nonce of discharged) {
|
|
1471
|
-
// A receipt that survives its discharge re-triggers recovery forever, so a failed
|
|
1472
|
-
// removal is surfaced rather than swallowed.
|
|
1473
|
-
if (!clearPendingTeardown(nonce)) {
|
|
1474
|
-
stopFailed = true;
|
|
1475
|
-
record.receiptClearFailed = true;
|
|
1476
|
-
console.error(`❌ The shared teardown finished, but its receipt could not be removed: ${pendingTeardownPathFor(nonce)}`);
|
|
1477
|
-
console.error(" Remove it manually; otherwise every later stop and update will try to recover it again.");
|
|
1478
|
-
}
|
|
1455
|
+
if (restore.boundary) stopFailed = settleUnrestoredStopBoundary(restore.boundary, record, teardownNonce ? [teardownNonce, ...recoveredNonces] : recoveredNonces) || stopFailed;
|
|
1456
|
+
else {
|
|
1457
|
+
record.sharedTeardown = restore.historyDeferred ? "refused" : restore.other ? "failed" : "restored";
|
|
1458
|
+
if (restore.other) stopFailed = true;
|
|
1459
|
+
else if (restore.historyDeferred) historyDeferredNonces = teardownNonce ? [teardownNonce, ...recoveredNonces] : recoveredNonces;
|
|
1460
|
+
else if (restore.historyOnly) historyOnlyFailure = true;
|
|
1461
|
+
// A history preflight refusal restored nothing, so the obligation survives (#4718).
|
|
1462
|
+
if (restore.historyDeferred) {
|
|
1463
|
+
console.error(" The shared teardown was refused before it changed anything, so it is still owed.");
|
|
1464
|
+
console.error(" Its receipt is preserved; run 'ocx stop' again once Codex is closed to retry the restore.");
|
|
1465
|
+
}
|
|
1466
|
+
if (!restore.other && !restore.historyDeferred) {
|
|
1467
|
+
stopFailed = clearRestoredStopReceipts(record, teardownNonce ? [teardownNonce, ...recoveredNonces] : recoveredNonces) || stopFailed;
|
|
1479
1468
|
}
|
|
1480
1469
|
}
|
|
1481
1470
|
}
|
|
@@ -1685,8 +1674,8 @@ async function handleUninstall() {
|
|
|
1685
1674
|
});
|
|
1686
1675
|
|
|
1687
1676
|
try {
|
|
1688
|
-
const {
|
|
1689
|
-
const r =
|
|
1677
|
+
const { uninstallCodexShimAsync } = await import("../codex/shim");
|
|
1678
|
+
const r = await uninstallCodexShimAsync();
|
|
1690
1679
|
console.log(r.removed ? "✅ Codex autostart shim removed" : "- Codex autostart shim removed: not installed");
|
|
1691
1680
|
} catch (err) {
|
|
1692
1681
|
failures.push("Codex autostart shim removed");
|
package/src/cli/init.ts
CHANGED
|
@@ -257,9 +257,9 @@ export async function runInit(): Promise<void> {
|
|
|
257
257
|
prompt.throwIfCancelled();
|
|
258
258
|
if (shimAnswer.trim().toLowerCase() !== "n") {
|
|
259
259
|
try {
|
|
260
|
-
const {
|
|
260
|
+
const { installCodexShimAsync } = await import("../codex/shim");
|
|
261
261
|
prompt.throwIfCancelled();
|
|
262
|
-
const result =
|
|
262
|
+
const result = await installCodexShimAsync();
|
|
263
263
|
console.log(result.installed ? `✅ ${result.message}` : `⚠️ ${result.message}`);
|
|
264
264
|
} catch (err) {
|
|
265
265
|
if (err instanceof InitCancelledError) throw err;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/** Input shared by integration preview and journal commands; no writer imports. */
|
|
2
2
|
import { CliUsageError, takeOptionWithSyntax } from "./runtime-api";
|
|
3
|
+
import { isExportModelNames, supportsAliasModelNames, type ExportModelNames } from "../clients/config-export/model-names";
|
|
3
4
|
|
|
4
5
|
export function validateAsideProfile(profile: string | undefined, client: string | undefined, usage: string): void {
|
|
5
6
|
if (profile === undefined) return;
|
|
@@ -18,6 +19,17 @@ export function integrationOption(args: string[], flag: string): string | undefi
|
|
|
18
19
|
return takeOptionWithSyntax(args, flag)?.value;
|
|
19
20
|
}
|
|
20
21
|
|
|
22
|
+
/** Explicit intent only: callers preserve omission instead of inserting a default. */
|
|
23
|
+
export function integrationModelNames(args: string[], client: string | undefined, operation: string, usage: string): ExportModelNames | undefined {
|
|
24
|
+
const value = integrationOption(args, "--model-names");
|
|
25
|
+
if (value === undefined) return undefined;
|
|
26
|
+
if (!isExportModelNames(value)) throw new CliUsageError("--model-names must be alias or routed", usage);
|
|
27
|
+
if (!supportsAliasModelNames(client ?? "") || !["export", "apply", "overwrite"].includes(operation)) {
|
|
28
|
+
throw new CliUsageError("--model-names requires Hermes or Command Code export, enable, or apply/overwrite preview", usage);
|
|
29
|
+
}
|
|
30
|
+
return value;
|
|
31
|
+
}
|
|
32
|
+
|
|
21
33
|
export function integrationFlag(args: string[], flag: string): boolean {
|
|
22
34
|
const occurrences = args.filter(arg => arg === flag || arg.startsWith(`${flag}=`));
|
|
23
35
|
if (occurrences.length > 1) throw new CliUsageError(`${flag} was given more than once`);
|
|
@@ -31,6 +31,7 @@ export const FILE_INTEGRATION_CLIENTS = [
|
|
|
31
31
|
"workbuddy",
|
|
32
32
|
"workbuddy-ai",
|
|
33
33
|
"gentle-shell",
|
|
34
|
+
"t3code",
|
|
34
35
|
] as const;
|
|
35
36
|
|
|
36
37
|
export const INTEGRATION_REFUSAL_REASONS: ReadonlySet<string> = new Set<IntegrationRefusalReason>([
|
|
@@ -72,6 +73,7 @@ const PLAN_SCHEMA_PATHS = new Set([
|
|
|
72
73
|
"catalog.providers.opencodex",
|
|
73
74
|
"customModels.*",
|
|
74
75
|
"modelConfigs.customModels.*",
|
|
76
|
+
"providerInstances.opencodex",
|
|
75
77
|
// ZCode reads its providers from a second file; a plan for it publishes that
|
|
76
78
|
// file's templates, and a path missing here is rejected as an invalid preview.
|
|
77
79
|
"config.providerConfigRules.providerRules.[providerId=opencodex]",
|