@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
package/src/cli/stop-approval.ts
CHANGED
|
@@ -20,6 +20,17 @@ export interface GuardedStopSnapshot {
|
|
|
20
20
|
manager: Exclude<GuardedManagerTarget, { kind: "unknown" }>;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
+
/**
|
|
24
|
+
* What the tracked-record check can report: the verified target, null when the
|
|
25
|
+
* caller cannot name a cause (the pre-diagnostics shape), or the fixed cause of
|
|
26
|
+
* the single check that failed. The cause is a fixed sentence fragment from the
|
|
27
|
+
* inspection probe -- it carries no path, command line, stderr, or token.
|
|
28
|
+
*/
|
|
29
|
+
export type TrackedRuntimeCheck =
|
|
30
|
+
| { pid: number; port: number; hostname: string }
|
|
31
|
+
| { untracked: string }
|
|
32
|
+
| null;
|
|
33
|
+
|
|
23
34
|
function sameGuardedManager(
|
|
24
35
|
expected: GuardedStopSnapshot["manager"],
|
|
25
36
|
current: GuardedManagerTarget,
|
|
@@ -117,7 +128,7 @@ export function managerStillActive(
|
|
|
117
128
|
export async function runApprovedStop(
|
|
118
129
|
expected: StopApproval,
|
|
119
130
|
read: () => Promise<ResolveJson | null>,
|
|
120
|
-
tracked: () =>
|
|
131
|
+
tracked: () => TrackedRuntimeCheck,
|
|
121
132
|
managerTarget: () => GuardedManagerTarget,
|
|
122
133
|
stop: (snapshot: GuardedStopSnapshot) => Promise<StopOutcome>,
|
|
123
134
|
): Promise<StopOutcome> {
|
|
@@ -130,6 +141,9 @@ export async function runApprovedStop(
|
|
|
130
141
|
const mismatch = stopApprovalMismatch(expected, now);
|
|
131
142
|
if (mismatch !== null) return approvalChanged(mismatch);
|
|
132
143
|
if (target === null) return approvalChanged("the tracked runtime record could not be verified");
|
|
144
|
+
if ("untracked" in target) {
|
|
145
|
+
return approvalChanged(`the tracked runtime record could not be verified (${target.untracked})`);
|
|
146
|
+
}
|
|
133
147
|
if (target.pid !== expected.pid || target.port !== expected.port
|
|
134
148
|
|| target.hostname !== expected.hostname) {
|
|
135
149
|
return approvalChanged("the tracked runtime record changed");
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { withConfigMutationLockSync } from "../config";
|
|
2
|
+
import { inspectStopRestoreOwnership } from "../client/restore-ownership";
|
|
3
|
+
export { inspectStopRestoreOwnership, stopRestoreWriteGuard } from "../client/restore-ownership";
|
|
4
|
+
import type { StopRunRecord } from "./stop-report";
|
|
5
|
+
import { clearPendingTeardown, pendingTeardownPathFor } from "../config/pending-teardown";
|
|
6
|
+
|
|
7
|
+
type RestoreRecord = Pick<StopRunRecord, "sharedTeardown" | "receiptClearFailed">;
|
|
8
|
+
|
|
9
|
+
function refuse(record: RestoreRecord): true {
|
|
10
|
+
record.sharedTeardown = "refused";
|
|
11
|
+
console.error("❌ The client connection could not be confirmed (it may be changing); restoration stopped and the obligation is kept. Rerun 'ocx stop'.");
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/** Only the named, discharged nonces are removed; C covers both ownership and unlink. */
|
|
16
|
+
export function clearRestoredStopReceipts(record: RestoreRecord, nonces: string[], restored = true): boolean {
|
|
17
|
+
let entered = false;
|
|
18
|
+
try {
|
|
19
|
+
return withConfigMutationLockSync(() => {
|
|
20
|
+
entered = true;
|
|
21
|
+
const boundary = inspectStopRestoreOwnership();
|
|
22
|
+
if (boundary === "unproven" || boundary === "restore" && !restored) return refuse(record);
|
|
23
|
+
if (boundary === "hub-owned") {
|
|
24
|
+
record.sharedTeardown = "skipped";
|
|
25
|
+
console.log("↩️ A hub connection was committed while this stop ran; it owns Codex routing, its catalog and the Grok config, so restoration stopped.");
|
|
26
|
+
}
|
|
27
|
+
let failed = false;
|
|
28
|
+
for (const nonce of nonces) {
|
|
29
|
+
if (!clearPendingTeardown(nonce)) {
|
|
30
|
+
failed = true;
|
|
31
|
+
record.receiptClearFailed = true;
|
|
32
|
+
console.error(`❌ The shared teardown was discharged, but its receipt could not be removed: ${pendingTeardownPathFor(nonce)}`);
|
|
33
|
+
console.error(" Remove it manually; otherwise every later stop and update will try to recover it again.");
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return failed;
|
|
37
|
+
});
|
|
38
|
+
} catch {
|
|
39
|
+
if (entered) record.receiptClearFailed = true;
|
|
40
|
+
return refuse(record);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export function settleUnrestoredStopBoundary(
|
|
45
|
+
boundary: "hub-owned" | "unproven", record: RestoreRecord, nonces: string[],
|
|
46
|
+
): boolean {
|
|
47
|
+
return boundary === "unproven" ? refuse(record) : clearRestoredStopReceipts(record, nonces, false);
|
|
48
|
+
}
|
package/src/cli/stop-restore.ts
CHANGED
|
@@ -2,20 +2,32 @@ import { restoreNativeCodexAsync } from "../codex/inject";
|
|
|
2
2
|
import type { RetainedCodexProviderTable } from "../codex/inject/restore";
|
|
3
3
|
import { stripGrokConfig } from "../grok/inject";
|
|
4
4
|
import { readClientConnectionState, type ClientConnectionState } from "../client/state";
|
|
5
|
+
import { withClientLifecycleSync } from "../client/lifecycle-lock";
|
|
6
|
+
import type { RestoreBoundaryOwnership } from "../client/restore-ownership";
|
|
7
|
+
export type { RestoreBoundaryOwnership } from "../client/restore-ownership";
|
|
8
|
+
import { inspectStopRestoreOwnership, stopRestoreWriteGuard } from "./stop-restore-guard";
|
|
9
|
+
export { clearRestoredStopReceipts, settleUnrestoredStopBoundary } from "./stop-restore-guard";
|
|
5
10
|
import { readPid, readRuntimePort } from "../config/process-state";
|
|
6
11
|
import { loadConfig } from "../config";
|
|
7
|
-
import { configuredAdminToken } from "../lib/admin-secrets";
|
|
8
12
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
9
|
-
import {
|
|
13
|
+
import { createLocalAttestationChallenge, LOCAL_ATTESTATION_CHALLENGE_HEADER, LOCAL_ATTESTATION_PROOF_HEADER, verifyLocalAttestationProof } from "../lib/local-management-attestation";
|
|
14
|
+
import { LOCAL_MANAGEMENT_READ_PATHS } from "../lib/local-management-capability";
|
|
15
|
+
import { gracefulStopHost, isProcessAlive, ProxyOwnershipRefusedError, stopRequestFetch as directStopRequestFetch } from "../lib/process-control";
|
|
10
16
|
import { directLocalHttpFetch } from "../server/direct-local-http";
|
|
17
|
+
import { fetchBoundLocalManagementRead } from "../server/local-management-read-client";
|
|
18
|
+
import { isSharedTeardownDeferredOnExit } from "../server/stop-teardown";
|
|
11
19
|
import { findLiveProxy, probeEndpointLiveness, proveLiveProxyOwnedByHome } from "../server/proxy-liveness";
|
|
12
20
|
import { observeGuardedManagerStopped } from "../service/guarded-manager-target";
|
|
13
21
|
import type { StartExitTeardown } from "./dispatch";
|
|
14
22
|
import type { StopOutcome } from "./stop-report";
|
|
15
23
|
|
|
16
|
-
/**
|
|
24
|
+
/** Honor accepted API deferral, otherwise re-read connection ownership on ordinary exit. */
|
|
17
25
|
export function preserveConnectedClientRoutingOnExit(teardown: StartExitTeardown): StartExitTeardown {
|
|
18
|
-
|
|
26
|
+
if (isSharedTeardownDeferredOnExit()) {
|
|
27
|
+
return { ...teardown, restoreNativeCodex: false, stripGrokConfig: false };
|
|
28
|
+
}
|
|
29
|
+
const connection = readClientConnectionState();
|
|
30
|
+
return connection.kind === "connected" && connection.value.transport !== "link"
|
|
19
31
|
? { ...teardown, restoreNativeCodex: false, stripGrokConfig: false }
|
|
20
32
|
: teardown;
|
|
21
33
|
}
|
|
@@ -27,34 +39,53 @@ const unsupportedConnectedStop = () => new ProxyOwnershipRefusedError(
|
|
|
27
39
|
"connected_client_stop_unsupported",
|
|
28
40
|
);
|
|
29
41
|
|
|
30
|
-
/**
|
|
42
|
+
/** Require the pinned runtime's proof before accepting its shutdown contract. */
|
|
31
43
|
export async function assertConnectedClientStopSupported(target: ConnectedStopTarget | null): Promise<void> {
|
|
32
44
|
if (!target) throw unsupportedConnectedStop();
|
|
33
45
|
if (!isProcessAlive(target.pid)) return; // A manager may already have ended this exact target.
|
|
34
|
-
const
|
|
46
|
+
const runtime = readRuntimePort(target.pid);
|
|
47
|
+
if (!runtime?.attestationSecret || runtime.pid !== target.pid || runtime.port !== target.port
|
|
48
|
+
|| gracefulStopHost(runtime.hostname) !== gracefulStopHost(target.hostname)) throw unsupportedConnectedStop();
|
|
49
|
+
const endpoint = { ...target, hostname: gracefulStopHost(runtime.hostname) };
|
|
50
|
+
const readPinnedRuntime = () => {
|
|
51
|
+
const current = readRuntimePort(target.pid);
|
|
52
|
+
return current?.pid === runtime.pid && current.port === runtime.port && current.hostname === runtime.hostname
|
|
53
|
+
&& current.attestationSecret === runtime.attestationSecret ? current : null;
|
|
54
|
+
};
|
|
55
|
+
const origin = `http://${endpoint.hostname}:${endpoint.port}`;
|
|
56
|
+
const deadline = Date.now() + CONNECTED_STOP_PROBE_MS;
|
|
35
57
|
const signal = AbortSignal.timeout(CONNECTED_STOP_PROBE_MS);
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
const response = await directLocalHttpFetch(`${origin}${path}`, { method: "GET", headers, redirect: "error", signal },
|
|
44
|
-
{ timeoutMs: CONNECTED_STOP_PROBE_MS });
|
|
45
|
-
if (!response.ok) { void response.body?.cancel().catch(() => {}); return null; }
|
|
46
|
-
const body = await readBoundedResponseBody(response, { maxBytes: 4096, signal, fatalUtf8: true });
|
|
47
|
-
if (body.truncated) return null;
|
|
48
|
-
const parsed: unknown = JSON.parse(body.text);
|
|
49
|
-
return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed as Record<string, unknown> : null;
|
|
50
|
-
} catch { return null; }
|
|
58
|
+
const readDocument = async (response: Response): Promise<Record<string, unknown> | null> => {
|
|
59
|
+
if (!response.ok) { void response.body?.cancel().catch(() => {}); return null; }
|
|
60
|
+
const body = await readBoundedResponseBody(response, { maxBytes: 4096, signal, fatalUtf8: true });
|
|
61
|
+
if (body.truncated) return null;
|
|
62
|
+
const parsed: unknown = JSON.parse(body.text);
|
|
63
|
+
return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed as Record<string, unknown> : null;
|
|
51
64
|
};
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
65
|
+
try {
|
|
66
|
+
const nonce = createLocalAttestationChallenge();
|
|
67
|
+
const response = await directLocalHttpFetch(`${origin}/healthz`, {
|
|
68
|
+
method: "GET", headers: { [LOCAL_ATTESTATION_CHALLENGE_HEADER]: nonce }, redirect: "error", signal,
|
|
69
|
+
}, { timeoutMs: CONNECTED_STOP_PROBE_MS });
|
|
70
|
+
if (!readPinnedRuntime() || !verifyLocalAttestationProof(runtime.attestationSecret, nonce, target.pid, target.port,
|
|
71
|
+
response.headers.get(LOCAL_ATTESTATION_PROOF_HEADER))) {
|
|
72
|
+
void response.body?.cancel().catch(() => {});
|
|
73
|
+
throw unsupportedConnectedStop();
|
|
74
|
+
}
|
|
75
|
+
const health = await readDocument(response);
|
|
76
|
+
if (!readPinnedRuntime() || health?.service !== "opencodex" || health.pid !== target.pid) throw unsupportedConnectedStop();
|
|
77
|
+
// Native machine listeners preserve integrations on signal and have no /api/stop route.
|
|
78
|
+
if (health.role === "client") return;
|
|
79
|
+
const remaining = deadline - Date.now();
|
|
80
|
+
if (remaining <= 0) throw unsupportedConnectedStop();
|
|
81
|
+
const read = await fetchBoundLocalManagementRead({ ...endpoint, source: "runtime" }, LOCAL_MANAGEMENT_READ_PATHS.stop, {
|
|
82
|
+
readRuntime: readPinnedRuntime, timeoutMs: remaining, requireResponseProof: true,
|
|
83
|
+
});
|
|
84
|
+
if (read.kind !== "response") throw unsupportedConnectedStop();
|
|
85
|
+
const capability = await readDocument(read.response);
|
|
86
|
+
if (readPinnedRuntime() && capability?.schema === "ocx-stop-capabilities/1"
|
|
87
|
+
&& capability.pid === target.pid && capability.connectedClientOwnership === true) return;
|
|
88
|
+
} catch { /* A missing or replaced runtime never grants shutdown authority. */ }
|
|
58
89
|
throw unsupportedConnectedStop();
|
|
59
90
|
}
|
|
60
91
|
|
|
@@ -102,17 +133,61 @@ export async function preflightConnectedClientStop(approved?: ConnectedStopTarge
|
|
|
102
133
|
* The line `ocx stop` prints in place of the shared teardown on a connected client, or null
|
|
103
134
|
* when this home is not one (#7563).
|
|
104
135
|
*
|
|
105
|
-
* A hub client
|
|
106
|
-
*
|
|
136
|
+
* A hub client gets its Codex routing and catalog from `ocx connect` / `ocx sync`, and its
|
|
137
|
+
* client runtime never writes them on start. The standalone teardown
|
|
107
138
|
* restored native Codex, rewrote the catalog and stripped the Grok block, and nothing on the
|
|
108
139
|
* client put any of it back: `ocx start` brought the runtime up with Codex still native and
|
|
109
140
|
* Grok unconfigured. Leaving them in place makes stop/start a round trip; `ocx disconnect`
|
|
110
|
-
* remains the teardown that owns them, with its own ownership checks.
|
|
141
|
+
* remains the teardown that owns them, with its own ownership checks. A Remote Link Child
|
|
142
|
+
* is deliberately excluded: its unauthenticated loopback route is unsafe after the listener exits.
|
|
111
143
|
*/
|
|
112
144
|
export function connectedClientStopSkipLine(state: ClientConnectionState): string | null {
|
|
113
|
-
if (state.kind !== "connected") return null;
|
|
114
|
-
|
|
115
|
-
|
|
145
|
+
if (state.kind !== "connected" || state.value.transport === "link") return null;
|
|
146
|
+
return `↩️ Codex routing, its catalog and the Grok config stay as they are: this hub client's connection owns them, and 'ocx start' serves them again. To hand Codex back to its own account, run 'ocx disconnect'.`;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* Transport for the authenticated `POST /api/stop`. The target is always this machine's own
|
|
151
|
+
* runtime, so the request never consults HTTP(S)_PROXY/ALL_PROXY, whatever the connection
|
|
152
|
+
* state is or becomes while the stop awaits: an environment proxy must never receive the admin
|
|
153
|
+
* token. Restoration ownership is decided separately.
|
|
154
|
+
*/
|
|
155
|
+
export function stopRequestFetch(): typeof fetch {
|
|
156
|
+
return directStopRequestFetch as typeof fetch;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/**
|
|
160
|
+
* Whether the stop caller may accept `sharedTeardown: "not-owned"` as teardown confirmation.
|
|
161
|
+
*
|
|
162
|
+
* Refused only for a positively identified Link connection: its unauthenticated loopback
|
|
163
|
+
* route is unsafe once the listener exits, only an old build answers `not-owned` for one,
|
|
164
|
+
* and it says so while preserving the route this stop must restore. Everything else — a
|
|
165
|
+
* sibling, a hub connection, or no connection at all — has nothing that answer skipped.
|
|
166
|
+
* Callers pass the state read at the POST, not at stop entry: a connect or disconnect
|
|
167
|
+
* committed while the stop is still awaiting decides the ownership the answer describes.
|
|
168
|
+
*/
|
|
169
|
+
export function notOwnedTeardownIsAcceptable(state: ClientConnectionState, stoppingSibling: boolean): boolean {
|
|
170
|
+
return stoppingSibling || state.kind !== "connected" || state.value.transport !== "link";
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
/**
|
|
174
|
+
* Re-read connection ownership at the parent restore boundary (#7736). A hub connection
|
|
175
|
+
* committed while the stop was in flight owns Codex routing, the catalog and Grok, so the
|
|
176
|
+
* stop must not restore over it. `ocx connect`/`ocx disconnect` publish connection state
|
|
177
|
+
* under the client lifecycle lock (L), so this early read takes L. Each subsequent write
|
|
178
|
+
* repeats the check under C via stopRestoreWriteGuard; the early read grants no write authority.
|
|
179
|
+
* A busy or failing lock proves nothing either way.
|
|
180
|
+
*/
|
|
181
|
+
export function restoreBoundaryOwnership(deps: {
|
|
182
|
+
read?: typeof readClientConnectionState;
|
|
183
|
+
withLifecycle?: typeof withClientLifecycleSync;
|
|
184
|
+
} = {}): RestoreBoundaryOwnership {
|
|
185
|
+
const read = deps.read ?? readClientConnectionState;
|
|
186
|
+
try {
|
|
187
|
+
return (deps.withLifecycle ?? withClientLifecycleSync)(() => inspectStopRestoreOwnership(read));
|
|
188
|
+
} catch {
|
|
189
|
+
return "unproven";
|
|
190
|
+
}
|
|
116
191
|
}
|
|
117
192
|
|
|
118
193
|
/**
|
|
@@ -134,12 +209,14 @@ export function connectedClientStopSkipLine(state: ClientConnectionState): strin
|
|
|
134
209
|
*/
|
|
135
210
|
export async function restoreSharedClientStateAfterStop(
|
|
136
211
|
reportRetainedCodexProviderTable: (retained: RetainedCodexProviderTable) => void,
|
|
137
|
-
): Promise<{ historyOnly: boolean; historyDeferred: boolean; other: boolean }> {
|
|
212
|
+
): Promise<{ historyOnly: boolean; historyDeferred: boolean; other: boolean; boundary?: "hub-owned" | "unproven" }> {
|
|
138
213
|
let historyOnly = false;
|
|
139
214
|
let historyDeferred = false;
|
|
140
215
|
let other = false;
|
|
216
|
+
const guard = stopRestoreWriteGuard();
|
|
141
217
|
try {
|
|
142
|
-
const result = await restoreNativeCodexAsync();
|
|
218
|
+
const result = await restoreNativeCodexAsync({ withWriteGuard: guard.run });
|
|
219
|
+
if (guard.boundary() !== "restore") throw new Error("stop_restore_ownership_changed");
|
|
143
220
|
if (result.success) {
|
|
144
221
|
console.log(`↩️ ${result.message}`);
|
|
145
222
|
if (result.retainedCodexProviderTable) {
|
|
@@ -169,16 +246,20 @@ export async function restoreSharedClientStateAfterStop(
|
|
|
169
246
|
console.error(`⚠️ ${result.message}`);
|
|
170
247
|
}
|
|
171
248
|
} catch (error) {
|
|
249
|
+
const boundary = guard.boundary();
|
|
250
|
+
if (boundary !== "restore") return { historyOnly: false, historyDeferred: false, other: false, boundary };
|
|
172
251
|
other = true;
|
|
173
252
|
console.error(`⚠️ Native Codex restore failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
174
253
|
}
|
|
175
254
|
|
|
176
255
|
// A refused or thrown Grok strip is actionable because it would point Grok at a dead proxy.
|
|
177
256
|
try {
|
|
178
|
-
const grok = stripGrokConfig();
|
|
257
|
+
const grok = guard.run(() => stripGrokConfig());
|
|
179
258
|
if (grok.changed) console.log(`↩️ ${grok.message}`);
|
|
180
259
|
else if (!grok.ok) { other = true; console.error(`⚠️ ${grok.message}`); }
|
|
181
260
|
} catch (error) {
|
|
261
|
+
const boundary = guard.boundary();
|
|
262
|
+
if (boundary !== "restore") return { historyOnly, historyDeferred, other, boundary };
|
|
182
263
|
other = true;
|
|
183
264
|
console.error(`⚠️ Grok config restore failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
184
265
|
}
|
|
@@ -29,6 +29,8 @@ const USAGE = `Usage:
|
|
|
29
29
|
ocx system codex-cli-update attest [--json]
|
|
30
30
|
ocx system codex-cli-update attest --candidate <absolute-path> --npm-prefix <absolute-path> --npm-cli <absolute-path> --node <absolute-path> [--json]
|
|
31
31
|
ocx system codex-cli-update plan [--channel latest] [--json]
|
|
32
|
+
ocx system codex-cli-update apply --plan-id <32-hex> --yes [--request-id <key>] [--json]
|
|
33
|
+
ocx system codex-cli-update status <job-id> [--json]
|
|
32
34
|
ocx system update check [--channel <latest|preview>] [--json]
|
|
33
35
|
ocx system update run [--channel <latest|preview>] [--restart <on|off>] --yes [--json]
|
|
34
36
|
ocx system update status <job-id> [--json]
|
package/src/cli/v2.ts
CHANGED
|
@@ -17,9 +17,11 @@ import { localV2State, v2LocalSyncResult, type V2LocalSync } from "./v2-local-ou
|
|
|
17
17
|
import { execFileSync } from "node:child_process";
|
|
18
18
|
import { getAgentsEnabled, getAgentsMaxDepth, getLogicalMaxThreads, getMultiAgentModeHintText, getSubagentDeveloperInstructions, hasAgentsMaxThreads, isMultiAgentV2Enabled, setMultiAgentModeHintText, transitionMultiAgentV2 } from "../codex/features";
|
|
19
19
|
|
|
20
|
-
import {
|
|
20
|
+
import type { ResolveDeps, SpawnInvocation } from "../lib/win-exec";
|
|
21
|
+
import { validatedCodexExecInvocation } from "../codex/exec-boundary";
|
|
21
22
|
import { deleteConfigTopLevelKey, loadConfig, saveConfig } from "../config";
|
|
22
23
|
import { resolveAndPersistCodexRuntime, type ResolveCodexRuntimeDeps } from "../codex/runtime";
|
|
24
|
+
import { withCodexCliSelectionParentWriteAsync } from "../codex/cli-update-selection-gate";
|
|
23
25
|
|
|
24
26
|
export interface V2CliDeps {
|
|
25
27
|
execFile?: (file: string, args: string[], options?: SpawnInvocation["options"] & { env?: NodeJS.ProcessEnv }) => void;
|
|
@@ -33,8 +35,9 @@ export interface V2CliDeps {
|
|
|
33
35
|
}
|
|
34
36
|
|
|
35
37
|
export type CodexFeaturesInvocationDeps =
|
|
36
|
-
&
|
|
37
|
-
& Pick<ResolveCodexRuntimeDeps, "existsSync" | "execFileSync" | "configDir" | "readFileSync"
|
|
38
|
+
& ResolveDeps
|
|
39
|
+
& Pick<ResolveCodexRuntimeDeps, "existsSync" | "execFileSync" | "configDir" | "readFileSync"
|
|
40
|
+
| "readBundleIdentifier" | "macBundleTrustReason" | "executable" | "realpath">
|
|
38
41
|
& { requireAvailable?: boolean };
|
|
39
42
|
|
|
40
43
|
/**
|
|
@@ -58,12 +61,28 @@ export function codexFeaturesInvocation(
|
|
|
58
61
|
execFileSync: deps.execFileSync,
|
|
59
62
|
configDir: deps.configDir,
|
|
60
63
|
readFileSync: deps.readFileSync,
|
|
64
|
+
readBundleIdentifier: deps.readBundleIdentifier,
|
|
65
|
+
macBundleTrustReason: deps.macBundleTrustReason,
|
|
66
|
+
executable: deps.executable,
|
|
67
|
+
realpath: deps.realpath,
|
|
61
68
|
});
|
|
62
69
|
if (deps.requireAvailable && resolved.runtime.source === "fallback" && resolved.runtime.version === null) {
|
|
63
70
|
throw Object.assign(new Error("spawn codex ENOENT"), { code: "ENOENT" });
|
|
64
71
|
}
|
|
65
72
|
const command = resolved.runtime.command || "codex";
|
|
66
|
-
return
|
|
73
|
+
return validatedCodexExecInvocation(command, ["features", action, feature], {
|
|
74
|
+
env: deps.env,
|
|
75
|
+
platform,
|
|
76
|
+
exists: deps.exists,
|
|
77
|
+
executable: deps.executable,
|
|
78
|
+
realpath: deps.realpath,
|
|
79
|
+
macBundleTrustReason: deps.macBundleTrustReason,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
export async function codexFeaturesInvocationAsync(action: "enable" | "disable", feature = "multi_agent_v2",
|
|
84
|
+
platform: NodeJS.Platform = process.platform, deps: CodexFeaturesInvocationDeps = {}): Promise<SpawnInvocation> {
|
|
85
|
+
return withCodexCliSelectionParentWriteAsync(() => codexFeaturesInvocation(action, feature, platform, deps), { configDir: deps.configDir });
|
|
67
86
|
}
|
|
68
87
|
|
|
69
88
|
/**
|
|
@@ -182,45 +201,77 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
|
|
|
182
201
|
return emit(true, []);
|
|
183
202
|
}
|
|
184
203
|
if (parsed.verb === "mode-hint") {
|
|
185
|
-
const result =
|
|
204
|
+
const result = parsed.value === null ? setMultiAgentModeHintText(null)
|
|
205
|
+
: await withCodexCliSelectionParentWriteAsync(() => setMultiAgentModeHintText(parsed.value));
|
|
186
206
|
if (!result.ok) return emit(false, ["Unable to write the native mode hint. Check Codex support and ownership, then read ocx v2 status."]);
|
|
187
207
|
changed = result.changed;
|
|
188
208
|
return emit(true, [result.changed ? "multi_agent_mode_hint_text saved — applies to new sessions." : "multi_agent_mode_hint_text already set — nothing to do."]);
|
|
189
209
|
}
|
|
190
210
|
if (parsed.verb === "threads") {
|
|
191
|
-
|
|
192
|
-
|
|
211
|
+
// Admission can wait on recovery ACL checks; the feature state is read once admitted, in
|
|
212
|
+
// the same synchronous turn as the transition, so a change made meanwhile is not undone.
|
|
213
|
+
let enabled = false;
|
|
214
|
+
const result = await withCodexCliSelectionParentWriteAsync(() => {
|
|
215
|
+
enabled = (deps.isEnabled ?? isMultiAgentV2Enabled)();
|
|
216
|
+
return transitionMultiAgentV2(enabled, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate), { threadLimit: parsed.value });
|
|
217
|
+
});
|
|
193
218
|
if (!result.ok) return emit(false, ["Unable to update the native thread limit. Read ocx v2 status before retrying."]);
|
|
194
219
|
changed = result.changed;
|
|
195
220
|
return emit(true, [changed ? `max_threads = ${parsed.value} (${enabled ? "v2" : "v1"}) — applies to new sessions.` : `max_threads already ${parsed.value} — nothing to do.`]);
|
|
196
221
|
}
|
|
197
|
-
|
|
222
|
+
// Every awaited admission below re-reads, decides and saves the config inside its
|
|
223
|
+
// synchronous callback, so a setting changed while admission waited is neither
|
|
224
|
+
// overruled by a stale decision nor overwritten by a stale save.
|
|
225
|
+
let config = loadConfig();
|
|
198
226
|
let successLines: string[];
|
|
199
227
|
let unchangedKeep: boolean | undefined;
|
|
200
228
|
if (parsed.verb === "mode") {
|
|
201
|
-
|
|
229
|
+
const persistMode = (): boolean => {
|
|
230
|
+
const before = config.multiAgentMode ?? "default";
|
|
231
|
+
if (parsed.value === "default") deleteConfigTopLevelKey(config, "multiAgentMode");
|
|
232
|
+
else config.multiAgentMode = parsed.value;
|
|
233
|
+
saveConfig(config);
|
|
234
|
+
return before !== parsed.value;
|
|
235
|
+
};
|
|
202
236
|
if (parsed.value !== "default") {
|
|
203
|
-
|
|
204
|
-
const transition =
|
|
237
|
+
let modeChanged = false;
|
|
238
|
+
const transition = await withCodexCliSelectionParentWriteAsync(() => {
|
|
239
|
+
config = loadConfig();
|
|
240
|
+
const target = parsed.value === "v2" && config.keepNativeChatGptOnV1 !== true;
|
|
241
|
+
const result = transitionMultiAgentV2(target, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
|
|
242
|
+
if (result.ok) modeChanged = persistMode();
|
|
243
|
+
return result;
|
|
244
|
+
});
|
|
205
245
|
if (!transition.ok) { changed = false; return emit(false, ["Native mode transition failed. Read ocx v2 status before retrying."]); }
|
|
206
|
-
changed
|
|
246
|
+
changed = modeChanged || transition.changed;
|
|
247
|
+
} else {
|
|
248
|
+
changed = persistMode();
|
|
207
249
|
}
|
|
208
|
-
if (parsed.value === "default") deleteConfigTopLevelKey(config, "multiAgentMode");
|
|
209
|
-
else config.multiAgentMode = parsed.value;
|
|
210
|
-
saveConfig(config);
|
|
211
250
|
successLines = [multiAgentModeLine(parsed.value, config.keepNativeChatGptOnV1 === true),
|
|
212
251
|
"Applies to NEW sessions; running sessions keep their pinned multi-agent version."];
|
|
213
252
|
} else if (parsed.verb === "keep-native-v1") {
|
|
214
|
-
|
|
215
|
-
|
|
253
|
+
const persistKeep = (): void => {
|
|
254
|
+
unchangedKeep = (config.keepNativeChatGptOnV1 === true) === parsed.value;
|
|
255
|
+
if (parsed.value) config.keepNativeChatGptOnV1 = true;
|
|
256
|
+
else deleteConfigTopLevelKey(config, "keepNativeChatGptOnV1");
|
|
257
|
+
saveConfig(config);
|
|
258
|
+
};
|
|
216
259
|
if (parsed.value && requiresGlobalV2Disabled(config.multiAgentMode, true)) {
|
|
217
|
-
const transition =
|
|
260
|
+
const transition = await withCodexCliSelectionParentWriteAsync(() => {
|
|
261
|
+
config = loadConfig();
|
|
262
|
+
// Revalidated once admitted: mode may have left v2 while admission waited.
|
|
263
|
+
const result = requiresGlobalV2Disabled(config.multiAgentMode, true)
|
|
264
|
+
? transitionMultiAgentV2(false, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate))
|
|
265
|
+
: { ok: true as const, changed: false };
|
|
266
|
+
if (result.ok) persistKeep();
|
|
267
|
+
return result;
|
|
268
|
+
});
|
|
218
269
|
if (!transition.ok) { changed = false; return emit(false, ["Native hybrid-mode transition failed. Read ocx v2 status before retrying."]); }
|
|
219
|
-
changed
|
|
270
|
+
changed = !unchangedKeep || transition.changed;
|
|
271
|
+
} else {
|
|
272
|
+
persistKeep();
|
|
273
|
+
changed = !unchangedKeep;
|
|
220
274
|
}
|
|
221
|
-
if (parsed.value) config.keepNativeChatGptOnV1 = true;
|
|
222
|
-
else deleteConfigTopLevelKey(config, "keepNativeChatGptOnV1");
|
|
223
|
-
saveConfig(config);
|
|
224
275
|
successLines = [parsed.value
|
|
225
276
|
? "keep_native_chatgpt_on_v1: ON — ChatGPT-native rows stay v1 when mode is v2 (new sessions)."
|
|
226
277
|
: "keep_native_chatgpt_on_v1: OFF — ChatGPT-native rows follow v1/base/v2 (new sessions)."];
|
|
@@ -229,7 +280,19 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
|
|
|
229
280
|
if (want && requiresGlobalV2Disabled(config.multiAgentMode, config.keepNativeChatGptOnV1 === true)) {
|
|
230
281
|
return emit(false, ["v2 on: incompatible with keep-native-v1 while mode is v2 — Codex's global multi_agent_v2 overrides the native v1 catalog pin. Run 'ocx v2 keep-native-v1 off' first."]);
|
|
231
282
|
}
|
|
232
|
-
|
|
283
|
+
let incompatible = false;
|
|
284
|
+
const transition = await withCodexCliSelectionParentWriteAsync(() => {
|
|
285
|
+
// Revalidated once admitted: keep-native-v1 or mode v2 may have been set meanwhile.
|
|
286
|
+
const current = loadConfig();
|
|
287
|
+
if (want && requiresGlobalV2Disabled(current.multiAgentMode, current.keepNativeChatGptOnV1 === true)) {
|
|
288
|
+
incompatible = true;
|
|
289
|
+
return { ok: true as const, changed: false };
|
|
290
|
+
}
|
|
291
|
+
return transitionMultiAgentV2(want, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
|
|
292
|
+
});
|
|
293
|
+
if (incompatible) {
|
|
294
|
+
return emit(false, ["v2 on: incompatible with keep-native-v1 while mode is v2 — Codex's global multi_agent_v2 overrides the native v1 catalog pin. Run 'ocx v2 keep-native-v1 off' first."]);
|
|
295
|
+
}
|
|
233
296
|
if (!transition.ok) return emit(false, ["Native feature transition failed. Read ocx v2 status before retrying."]);
|
|
234
297
|
changed = transition.changed;
|
|
235
298
|
if (!changed) return emit(true, [`multi_agent_v2 already ${want ? "ON" : "OFF"} — nothing to do.`]);
|
|
@@ -42,7 +42,7 @@ function preparePath(lockPath: string): void {
|
|
|
42
42
|
mkdirSync(directory, { recursive: true, mode: 0o700 });
|
|
43
43
|
assertPath(directory, true);
|
|
44
44
|
if (process.platform !== "win32") chmodSync(directory, 0o700);
|
|
45
|
-
hardenSecretDir(directory, { required: true });
|
|
45
|
+
hardenSecretDir(directory, { required: true, verifyExistingRuntimeDirectory: true });
|
|
46
46
|
// Create privately before SQLite opens it; refuse an existing symlink or hardlink
|
|
47
47
|
// before chmod/ACL operations or the database constructor can follow it.
|
|
48
48
|
try { closeSync(openSync(lockPath, "wx", 0o600)); }
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The last tunnel connection a Home-initiated link's Home proved to this Child (relay-auth.ts).
|
|
3
|
+
* Every authenticated relay answer replaces it: a bound generation records it, and an answer
|
|
4
|
+
* without one (an older Home, a missing or mismatched proof) makes it unknown. Process memory
|
|
5
|
+
* only, so a restart forgets it.
|
|
6
|
+
*/
|
|
7
|
+
const verified = new Map<string, string>();
|
|
8
|
+
|
|
9
|
+
export function recordVerifiedHomeConnection(linkId: string, generation: string): void {
|
|
10
|
+
verified.set(linkId, generation);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function forgetVerifiedHomeConnection(linkId: string): void {
|
|
14
|
+
verified.delete(linkId);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export function verifiedHomeConnection(linkId: string): string | undefined {
|
|
18
|
+
return verified.get(linkId);
|
|
19
|
+
}
|
|
@@ -8,9 +8,11 @@ import { packageVersion } from "../lib/package-version";
|
|
|
8
8
|
import { linkPeerReportHeaders } from "../link/peer-report";
|
|
9
9
|
import { buildPeerFeatures } from "../remote/features";
|
|
10
10
|
import {
|
|
11
|
-
LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION,
|
|
12
|
-
LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER,
|
|
11
|
+
LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION, LINK_RELAY_CONNECTION_HEADER,
|
|
12
|
+
LINK_RELAY_CONNECTION_PROOF_HEADER, LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER, linkConnectionProof,
|
|
13
|
+
linkRelayChallenge, linkRelayProofMatches,
|
|
13
14
|
} from "../link/relay-auth";
|
|
15
|
+
import { forgetVerifiedHomeConnection, recordVerifiedHomeConnection } from "./link-connection";
|
|
14
16
|
|
|
15
17
|
export interface BoundLinkRelayTarget {
|
|
16
18
|
tunnelPort: number;
|
|
@@ -172,6 +174,22 @@ function relayChallenge(target: BoundLinkRelayTarget, origin: URL) {
|
|
|
172
174
|
return { challenge, probe, headers: peerReport };
|
|
173
175
|
}
|
|
174
176
|
|
|
177
|
+
/**
|
|
178
|
+
* Called only after the Home's relay proof verified. Keep its connection generation when its own
|
|
179
|
+
* proof binds it to this nonce and key; otherwise the connection is unknown, never the old value.
|
|
180
|
+
*/
|
|
181
|
+
function noteHomeConnection(target: BoundLinkRelayTarget, nonce: string, headers: IncomingMessage["headers"]): void {
|
|
182
|
+
if (!target.linkId || !target.apiKeyId) return;
|
|
183
|
+
const generation = headers[LINK_RELAY_CONNECTION_HEADER];
|
|
184
|
+
const proof = headers[LINK_RELAY_CONNECTION_PROOF_HEADER];
|
|
185
|
+
const expected = typeof generation === "string"
|
|
186
|
+
? linkConnectionProof(serviceApiTokenFingerprint(target.admissionKey), target.apiKeyId, target.linkId, nonce, generation)
|
|
187
|
+
: null;
|
|
188
|
+
if (typeof generation === "string" && typeof proof === "string" && linkRelayProofMatches(proof, expected)) {
|
|
189
|
+
recordVerifiedHomeConnection(target.linkId, generation);
|
|
190
|
+
} else forgetVerifiedHomeConnection(target.linkId);
|
|
191
|
+
}
|
|
192
|
+
|
|
175
193
|
/**
|
|
176
194
|
* The outcome of the credential-free preflight alone: `ok` when the Home answered with a proof
|
|
177
195
|
* only the holder of the link key can make, `unrecognized` for a peer without the route (404),
|
|
@@ -201,7 +219,10 @@ export async function probeLinkRelayPreflight(
|
|
|
201
219
|
method: "GET", signal: deadline.signal, headers: { ...request.headers, [LINK_RELAY_PROBE_HEADER]: "1" },
|
|
202
220
|
}, agent);
|
|
203
221
|
const proof = response.headers["x-opencodex-link-proof"];
|
|
204
|
-
if (response.statusCode === 204 && typeof proof === "string" && linkRelayProofMatches(proof, request.challenge.expected))
|
|
222
|
+
if (response.statusCode === 204 && typeof proof === "string" && linkRelayProofMatches(proof, request.challenge.expected)) {
|
|
223
|
+
noteHomeConnection(target, request.challenge.nonce, response.headers);
|
|
224
|
+
return "ok";
|
|
225
|
+
}
|
|
205
226
|
return response.statusCode === 404 ? "unrecognized" : "auth_failed";
|
|
206
227
|
} catch {
|
|
207
228
|
return "unreachable";
|
|
@@ -236,6 +257,7 @@ export async function fetchBoundLinkRelay(
|
|
|
236
257
|
if (response.statusCode !== 204 || typeof proof !== "string" || !linkRelayProofMatches(proof, challenge.expected)) {
|
|
237
258
|
throw new LinkRelayAuthenticationError(response.statusCode === 404);
|
|
238
259
|
}
|
|
260
|
+
noteHomeConnection(target, challenge.nonce, response.headers);
|
|
239
261
|
// Drain the credential-free response before the Agent can reuse its socket.
|
|
240
262
|
for await (const chunk of response) {
|
|
241
263
|
if (chunk.length) throw new LinkRelayAuthenticationError();
|
|
@@ -26,6 +26,7 @@ import type { LinkDiagnosticSink } from "../link/diagnostics";
|
|
|
26
26
|
import { isLinkConnection, readClientConnectionState } from "./state";
|
|
27
27
|
import { clientLinkStatePath, readClientLinkState, type ClientLinkState } from "./link-state";
|
|
28
28
|
import type { LinkTunnelGate, LinkAdmissionResult } from "./link-relay";
|
|
29
|
+
import { nextLinkConnectionGeneration } from "../link/relay-auth";
|
|
29
30
|
|
|
30
31
|
/**
|
|
31
32
|
* The client-owned `ssh -N -L 127.0.0.1:<tunnelPort>:127.0.0.1:<peerListenerPort> <alias>`
|
|
@@ -106,6 +107,8 @@ export interface ClientLinkSupervisor extends LinkTunnelGate {
|
|
|
106
107
|
/** Stops the tunnel (TERM, up to 5 s, KILL). The runtime calls this before stopping its listener. */
|
|
107
108
|
stop(): Promise<void>;
|
|
108
109
|
status(): ClientLinkSupervisorStatus;
|
|
110
|
+
/** Changes on every transition into connected, initial or recovery; undefined while not connected. */
|
|
111
|
+
connectionGeneration(): string | undefined;
|
|
109
112
|
}
|
|
110
113
|
|
|
111
114
|
/** Read-only status bridge for a client whose persisted sidecar cannot be trusted. */
|
|
@@ -601,6 +604,8 @@ export function createClientLinkSupervisor(deps: ClientLinkSupervisorDeps = {}):
|
|
|
601
604
|
let adoptedRecord: ClientTunnelPidfile | null = null;
|
|
602
605
|
let tunnelPort: number | null = null;
|
|
603
606
|
let ownerGeneration = 0;
|
|
607
|
+
/** Minted on every transition into connected from the process-wide sequence (relay-auth.ts). */
|
|
608
|
+
let connection: string | undefined;
|
|
604
609
|
let state: TunnelState = IDLE;
|
|
605
610
|
let linkId: string | null = null;
|
|
606
611
|
let failure: ClientLinkSupervisorStatus | undefined;
|
|
@@ -685,6 +690,7 @@ export function createClientLinkSupervisor(deps: ClientLinkSupervisorDeps = {}):
|
|
|
685
690
|
};
|
|
686
691
|
|
|
687
692
|
const setState = (next: TunnelState): void => {
|
|
693
|
+
if (next.kind === "connected" && state.kind !== "connected") connection = nextLinkConnectionGeneration();
|
|
688
694
|
state = next;
|
|
689
695
|
settleWaiters();
|
|
690
696
|
};
|
|
@@ -984,6 +990,10 @@ export function createClientLinkSupervisor(deps: ClientLinkSupervisorDeps = {}):
|
|
|
984
990
|
await stopTunnel();
|
|
985
991
|
failure = undefined;
|
|
986
992
|
},
|
|
993
|
+
connectionGeneration(): string | undefined {
|
|
994
|
+
if (!started || stopping || failure !== undefined || state.kind !== "connected") return undefined;
|
|
995
|
+
return connection;
|
|
996
|
+
},
|
|
987
997
|
status(): ClientLinkSupervisorStatus {
|
|
988
998
|
if (failure) return failure;
|
|
989
999
|
if (!child && !linkId && adopted === null) return { kind: "stopped" };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { journalOwner } from "../codex/journal";
|
|
2
|
-
import { diagnoseCodexShim,
|
|
2
|
+
import { diagnoseCodexShim, installCodexShimAsync, uninstallCodexShimAsync } from "../codex/shim";
|
|
3
3
|
import { readManagementJsonBody } from "../server/management/body";
|
|
4
4
|
import type { OcxClientConnectionConfig } from "../types";
|
|
5
5
|
import { disconnectClient, syncConnectedClient } from "./connect";
|
|
@@ -130,7 +130,7 @@ export async function handleMachineApi(
|
|
|
130
130
|
return Response.json({ error: "action must be install, repair, or uninstall" }, { status: 400 });
|
|
131
131
|
}
|
|
132
132
|
try {
|
|
133
|
-
const result = input.action === "uninstall" ?
|
|
133
|
+
const result = input.action === "uninstall" ? await uninstallCodexShimAsync() : await installCodexShimAsync();
|
|
134
134
|
return Response.json({ success: true, action: input.action, result, shim: diagnoseCodexShim() });
|
|
135
135
|
} catch (error) {
|
|
136
136
|
return Response.json({ success: false, error: error instanceof Error ? error.message : "shim action failed" }, { status: 409 });
|