@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/bin/ocx.mjs
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { guardedRun, guardedSpawn, guardedSpawnSync, guardedExit, probeProcessAlive, relayOwnSignal } from "../src/update/mutation-guard.mjs";
|
|
2
3
|
/**
|
|
3
4
|
* opencodex published-package bin launcher.
|
|
4
5
|
*
|
|
@@ -8,13 +9,15 @@
|
|
|
8
9
|
* Node shim. (Dev still runs `bun run src/cli/index.ts` directly via the shebang on
|
|
9
10
|
* src/cli/index.ts — only the published npm/pnpm `bin` routes through here.)
|
|
10
11
|
*/
|
|
11
|
-
import {
|
|
12
|
+
import { probeSpawn, probeSpawnSync } from "../src/update/mutation-guard.mjs";
|
|
12
13
|
import { createSupervisionLatch, inspectDesktopSupervision } from "../src/service/desktop-supervision.mjs";
|
|
13
14
|
import { planDesktopCliHandoff, runDesktopCliHandoff } from "../src/lib/desktop-cli-handoff.mjs";
|
|
14
15
|
import { desktopCliRecordPath } from "../src/lib/desktop-cli-record.mjs";
|
|
15
16
|
import { STOP_HISTORY_INCOMPLETE_EXIT_CODE } from "../src/update/stop-contract.mjs";
|
|
16
17
|
import { probeProxyLiveness } from "../src/update/proxy-liveness-probe.mjs";
|
|
17
18
|
import { decidePostStopUpdate } from "../src/update/stop-decision.mjs";
|
|
19
|
+
import { createUpdateServiceHomePolicy, isUpdateHomeProbe, parseUpdateWorkerHome, UPDATE_HOME_LAUNCHER_PROTOCOL, UPDATE_PACKAGE_ONLY_EXIT_CODE, UPDATE_PACKAGE_ONLY_PROTOCOL_VERSION } from "../src/update/service-home-policy.mjs";
|
|
20
|
+
import { probeUpdateServiceHome, supportsUpdateHomeProbe, updateHomeProbeEnvironment } from "../src/update/service-home-probe.mjs";
|
|
18
21
|
import {
|
|
19
22
|
inspectPackageRuntimeLiveness,
|
|
20
23
|
planStoppedRuntimeRecovery,
|
|
@@ -64,6 +67,7 @@ import {
|
|
|
64
67
|
CODEX_CLI_TRANSPORT_ENV_KEYS,
|
|
65
68
|
CODEX_CLI_VERSION_MANAGER_ROOT_ENV_SLOTS,
|
|
66
69
|
codexCliInspectionLookupSeeds,
|
|
70
|
+
carriesCodexCliUpdateInspectionContext,
|
|
67
71
|
isCodexCliUpdateInspectionArgv,
|
|
68
72
|
} from "../src/update/codex-cli-update-launch-policy.mjs";
|
|
69
73
|
import {
|
|
@@ -84,7 +88,6 @@ try {
|
|
|
84
88
|
/* best-effort */
|
|
85
89
|
}
|
|
86
90
|
}
|
|
87
|
-
const require = createRequire(import.meta.url);
|
|
88
91
|
const here = dirname(fileURLToPath(import.meta.url));
|
|
89
92
|
const installOwnership = detectInstallOwnershipFromPath(here, { exists: existsSync });
|
|
90
93
|
const installMethod = installOwnership.installer;
|
|
@@ -108,9 +111,9 @@ function currentPackageVersion() {
|
|
|
108
111
|
}
|
|
109
112
|
}
|
|
110
113
|
|
|
111
|
-
function pinnedBunVersion() {
|
|
114
|
+
function pinnedBunVersion(launcherPath) {
|
|
112
115
|
try {
|
|
113
|
-
const pkg = JSON.parse(readFileSync(join(here, "..", "package.json"), "utf8"));
|
|
116
|
+
const pkg = JSON.parse(readFileSync(join(launcherPath ? dirname(launcherPath) : here, "..", "package.json"), "utf8"));
|
|
114
117
|
return typeof pkg.dependencies?.bun === "string" ? pkg.dependencies.bun : "";
|
|
115
118
|
} catch {
|
|
116
119
|
return "";
|
|
@@ -139,6 +142,19 @@ function configDir() {
|
|
|
139
142
|
return resolve(raw ? expandUserPath(raw) : join(homedir(), ".opencodex"));
|
|
140
143
|
}
|
|
141
144
|
|
|
145
|
+
// Direct Bun entry only: never recurse through another Node launcher or ordinary CLI startup.
|
|
146
|
+
function readNodeUpdateHome(launcherPath) {
|
|
147
|
+
if (!supportsUpdateHomeProbe(launcherPath)) return { kind: "unknown" };
|
|
148
|
+
const bun = resolveBun({ allowInstall: false, launcherPath, allowMissing: true });
|
|
149
|
+
if (!bun) return { kind: "unknown" };
|
|
150
|
+
const env = updateHomeProbeEnvironment(process.env, {
|
|
151
|
+
codexHome: process.env.CODEX_HOME ?? "", opencodexHome: configDir(),
|
|
152
|
+
});
|
|
153
|
+
return probeUpdateServiceHome(probeSpawnSync, bun.path,
|
|
154
|
+
["--no-env-file", join(dirname(launcherPath), "..", "src", "update", "service-home-probe-entry.ts")], { env });
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
|
|
142
158
|
function shouldRepairCodexShim() {
|
|
143
159
|
return existsSync(join(configDir(), "codex-shim.json"));
|
|
144
160
|
}
|
|
@@ -155,9 +171,10 @@ function historyRestoreIncomplete() {
|
|
|
155
171
|
}
|
|
156
172
|
}
|
|
157
173
|
|
|
158
|
-
function repairCodexShimIfNeeded(launcherPath
|
|
174
|
+
function repairCodexShimIfNeeded(launcherPath, authorizeMutation) {
|
|
159
175
|
if (!shouldRepairCodexShim()) return;
|
|
160
|
-
|
|
176
|
+
if (!authorizeMutation("shim")) return false;
|
|
177
|
+
const res = guardedSpawnSync(authorizeMutation, "shim", process.execPath, [launcherPath, "codex-shim", "install"], {
|
|
161
178
|
stdio: "inherit",
|
|
162
179
|
windowsHide: true,
|
|
163
180
|
});
|
|
@@ -173,15 +190,16 @@ function trayInstallState() {
|
|
|
173
190
|
try {
|
|
174
191
|
const heartbeat = JSON.parse(readFileSync(join(configDir(), "tray-heartbeat.json"), "utf8"));
|
|
175
192
|
if (Number.isSafeInteger(heartbeat.pid) && Date.now() - Number(heartbeat.timestamp) < 15_000) {
|
|
176
|
-
|
|
193
|
+
probeProcessAlive(heartbeat.pid);
|
|
177
194
|
running = true;
|
|
178
195
|
}
|
|
179
196
|
} catch { /* installed but not running */ }
|
|
180
197
|
return { installed: true, running };
|
|
181
198
|
}
|
|
182
199
|
|
|
183
|
-
function runTrayLifecycle(launcher, action) {
|
|
184
|
-
|
|
200
|
+
function runTrayLifecycle(launcher, action, authorizeMutation) {
|
|
201
|
+
if (!authorizeMutation(action === "start" ? "own-tray" : "tray")) return { status: 1 };
|
|
202
|
+
return guardedSpawnSync(authorizeMutation, action === "start" ? "own-tray" : "tray", process.execPath, [launcher, "tray", action], {
|
|
185
203
|
stdio: "inherit",
|
|
186
204
|
windowsHide: true,
|
|
187
205
|
});
|
|
@@ -227,7 +245,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
227
245
|
runPnpm: (commandPath, args, capture = false) => {
|
|
228
246
|
const invocation = pnpmInvocationForPath(commandPath, args);
|
|
229
247
|
if (!invocation) return { status: 1 };
|
|
230
|
-
return
|
|
248
|
+
return probeSpawnSync(invocation.file, invocation.args, {
|
|
231
249
|
stdio: capture ? "pipe" : "ignore",
|
|
232
250
|
encoding: "utf8",
|
|
233
251
|
timeout: 20_000,
|
|
@@ -270,7 +288,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
270
288
|
console.error(`opencodex: could not resolve ${manager} from a trusted absolute PATH entry; aborting before stopping the proxy.`);
|
|
271
289
|
process.exit(1);
|
|
272
290
|
}
|
|
273
|
-
const latestResult =
|
|
291
|
+
const latestResult = probeSpawnSync(latestInvocation.file, latestInvocation.args, readProbeOptions(latestInvocation));
|
|
274
292
|
const latest = latestResult.status === 0 && typeof latestResult.stdout === "string" ? latestResult.stdout.trim() : "";
|
|
275
293
|
|
|
276
294
|
console.log(`opencodex v${current} (installed via ${manager}, tag ${tag})`);
|
|
@@ -282,7 +300,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
282
300
|
const integrity = checkRegistryPackageIntegrity(PKG, latest || null, args => {
|
|
283
301
|
const invocation = managerInvocation(args);
|
|
284
302
|
if (!invocation) return { status: 1 };
|
|
285
|
-
return
|
|
303
|
+
return probeSpawnSync(invocation.file, invocation.args, readProbeOptions(invocation));
|
|
286
304
|
});
|
|
287
305
|
if (integrity.ok === false) {
|
|
288
306
|
console.error(`opencodex: ${integrity.reason}; aborting before stopping the proxy.`);
|
|
@@ -319,7 +337,10 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
319
337
|
const serviceStatePaths = process.env.OCX_TEST_HOME_GUARD === "1"
|
|
320
338
|
? allServiceStatePaths.slice(0, 1)
|
|
321
339
|
: allServiceStatePaths;
|
|
322
|
-
|
|
340
|
+
let authorityLauncher = fileURLToPath(import.meta.url);
|
|
341
|
+
const homePolicy = createUpdateServiceHomePolicy(() => readNodeUpdateHome(authorityLauncher), message => console.warn(message), process.argv.includes("--update-package-only"), parseUpdateWorkerHome(process.argv));
|
|
342
|
+
if (!homePolicy.authorizeMutation("package")) process.exit(1);
|
|
343
|
+
const serviceWasInstalled = homePolicy.serviceAllowed && serviceStatePaths.some(path => existsSync(path));
|
|
323
344
|
// What this update may do to the runtime. The same rule the Bun updater applies, from the
|
|
324
345
|
// same module: a desktop takeover vetoes both the stop and the service refresh below.
|
|
325
346
|
const readServiceState = () => selectAuthoritativeServiceState(
|
|
@@ -355,7 +376,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
355
376
|
process.exit(1);
|
|
356
377
|
}
|
|
357
378
|
const trayBeforeUpdate = planWindowsTrayUpdate(
|
|
358
|
-
process.platform === "win32" ? trayInstallState() : { installed: false, running: false },
|
|
379
|
+
!homePolicy.packageOnly && process.platform === "win32" ? trayInstallState() : { installed: false, running: false },
|
|
359
380
|
);
|
|
360
381
|
/**
|
|
361
382
|
* Refresh the existing service in place. `service repair` discovers the installed backend;
|
|
@@ -386,7 +407,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
386
407
|
*/
|
|
387
408
|
function readServiceInstalledFromStatus(launcherPath) {
|
|
388
409
|
try {
|
|
389
|
-
const st =
|
|
410
|
+
const st = probeSpawnSync(process.execPath, [launcherPath, "status", "--json"], {
|
|
390
411
|
encoding: "utf8",
|
|
391
412
|
timeout: 20_000,
|
|
392
413
|
windowsHide: true,
|
|
@@ -481,13 +502,20 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
481
502
|
|
|
482
503
|
/** Returns true, false, or "vetoed" when another owner holds the runtime (not a failure). */
|
|
483
504
|
function startProxyDirectly() {
|
|
505
|
+
try { reacquireUpdateLease(); } catch {
|
|
506
|
+
console.warn("opencodex: recovery could not acquire runtime ownership; run 'ocx service repair' or 'ocx start' manually after the other operation finishes.");
|
|
507
|
+
return false;
|
|
508
|
+
}
|
|
509
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
510
|
+
const currentOwnership = readOwnership();
|
|
484
511
|
const supervision = observeSupervision();
|
|
485
|
-
const plan = planUpdateRuntimeHandling({ ...
|
|
486
|
-
if (!
|
|
512
|
+
const plan = planUpdateRuntimeHandling({ ...currentOwnership, serviceInstalled: false, supervision });
|
|
513
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
514
|
+
if (ownershipIdentity(currentOwnership) !== ownershipIdentity(initialOwnership) || !plan.mayStopRuntime) {
|
|
487
515
|
console.warn(supervision
|
|
488
516
|
? "OpenCodex Desktop supervises the proxy; no CLI runtime was restored."
|
|
489
517
|
: plan.notice);
|
|
490
|
-
return "vetoed";
|
|
518
|
+
return homePolicy.authorizeMutation("publish") ? "vetoed" : "refused";
|
|
491
519
|
}
|
|
492
520
|
if (!postUpdateLauncherUsable || !existsSync(postUpdateLauncher)) {
|
|
493
521
|
console.error("opencodex: cannot restart the proxy because the launcher is missing; reinstall opencodex manually.");
|
|
@@ -499,7 +527,8 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
499
527
|
delete env.OCX_SIBLING_OF_PORT;
|
|
500
528
|
delete env.OCX_SIBLING_HANDOFF_NONCE;
|
|
501
529
|
console.log(`Attempting to restart the proxy on port ${bakePort}.`);
|
|
502
|
-
|
|
530
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
531
|
+
const child = guardedSpawn(homePolicy.authorizeMutation, "runtime", process.execPath, [postUpdateLauncher, "start", "--port", String(bakePort)], {
|
|
503
532
|
detached: true,
|
|
504
533
|
stdio: "ignore",
|
|
505
534
|
windowsHide: true,
|
|
@@ -513,7 +542,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
513
542
|
while (Date.now() < deadline) {
|
|
514
543
|
const current = readCurrentRuntimeTarget();
|
|
515
544
|
if (current.kind === "target"
|
|
516
|
-
&& probeProxyLiveness(current.target.port, current.target.hostname ?? bakeHostname) === "live") return true;
|
|
545
|
+
&& probeProxyLiveness(current.target.port, current.target.hostname ?? bakeHostname) === "live") return homePolicy.authorizeMutation("publish") ? true : "refused";
|
|
517
546
|
Atomics.wait(UPDATE_RECOVERY_SLEEP, 0, 0, UPDATE_RECOVERY_POLL_MS);
|
|
518
547
|
}
|
|
519
548
|
console.error("opencodex: the recovery proxy did not publish a healthy runtime before the recovery deadline.");
|
|
@@ -525,10 +554,19 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
525
554
|
// "supervised", "failed", or "unsettled" when the manager may still finish the restart.
|
|
526
555
|
function restartThroughServiceManager() {
|
|
527
556
|
if (!hasRestartableServiceManager()) return "failed";
|
|
557
|
+
releaseUpdateLease();
|
|
558
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
559
|
+
if (!homePolicy.serviceAllowed) return "failed";
|
|
560
|
+
const owner = readOwnership();
|
|
561
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
562
|
+
if (ownershipIdentity(owner) !== ownershipIdentity(initialOwnership)
|
|
563
|
+
|| !planUpdateRuntimeHandling({ ...owner, serviceInstalled: true, supervision: observeSupervision() }).mayRestoreService) return homePolicy.authorizeMutation("publish") ? "vetoed" : "refused";
|
|
528
564
|
console.log("opencodex: asking the service manager to restart the background service.");
|
|
529
565
|
const before = readCurrentRuntimeTarget();
|
|
530
566
|
const staleRecordPid = before.kind === "target" ? before.target.pid : null;
|
|
531
|
-
|
|
567
|
+
if (!homePolicy.authorizeMutation("service")) return homePolicy.authorizeMutation("runtime") ? "failed" : "refused";
|
|
568
|
+
const restarted = restartServiceManagerJob({}, homePolicy.authorizeMutation);
|
|
569
|
+
if (!restarted.ok && restarted.refused) return "refused";
|
|
532
570
|
const unsettled = !restarted.ok && restarted.unsettled === true;
|
|
533
571
|
let verdict;
|
|
534
572
|
if (!restarted.ok && !unsettled) {
|
|
@@ -549,7 +587,8 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
549
587
|
verdict = supervisionVerdict({ servingPid, managerPid: readServiceManagerPid(), parentPid: pid => readParentPid(pid) });
|
|
550
588
|
}
|
|
551
589
|
if (verdict.kind === "supervised") {
|
|
552
|
-
|
|
590
|
+
if (!homePolicy.authorizeMutation("publish")) return "refused";
|
|
591
|
+
guardedRun(homePolicy.authorizeMutation, "publish", console.log, [`opencodex: the proxy is healthy on port ${bakePort} under the service manager (pid ${verdict.managerPid}).`]);
|
|
553
592
|
return "supervised";
|
|
554
593
|
}
|
|
555
594
|
if (unsettled) {
|
|
@@ -565,21 +604,34 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
565
604
|
* manager may still finish its restart; callers exit non-zero for both.
|
|
566
605
|
*/
|
|
567
606
|
function refreshBackgroundServiceOrStartDirect() {
|
|
607
|
+
authorityLauncher = postUpdateLauncher;
|
|
608
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
609
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(startProxyDirectly()) ? undefined : "refused";
|
|
610
|
+
let homeRefused = false;
|
|
568
611
|
const mayRefresh = () => {
|
|
612
|
+
if (!homePolicy.authorizeMutation("runtime")) { homeRefused = true; return false; }
|
|
569
613
|
const supervision = observeSupervision();
|
|
570
614
|
const plan = planUpdateRuntimeHandling({ ...readOwnership(), serviceInstalled: true, supervision });
|
|
615
|
+
if (!homePolicy.authorizeMutation("runtime")) { homeRefused = true; return false; }
|
|
571
616
|
if (!plan.mayRestoreService) console.warn(supervision
|
|
572
617
|
? "OpenCodex Desktop supervises the proxy; CLI recovery was skipped. Use the app's updater (tray → Check for Updates)."
|
|
573
618
|
: plan.notice);
|
|
574
|
-
return plan.mayRestoreService;
|
|
619
|
+
return plan.mayRestoreService && homePolicy.serviceAllowed;
|
|
575
620
|
};
|
|
576
|
-
if (!mayRefresh())
|
|
621
|
+
if (!mayRefresh()) {
|
|
622
|
+
if (homeRefused) return "refused";
|
|
623
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(startProxyDirectly()) ? undefined : "refused";
|
|
624
|
+
return;
|
|
625
|
+
}
|
|
577
626
|
const prevBake = process.env.OCX_BAKE_PORT;
|
|
578
627
|
process.env.OCX_BAKE_PORT = String(bakePort);
|
|
579
628
|
try {
|
|
580
|
-
|
|
629
|
+
if (!homePolicy.authorizeMutation("service")) return homePolicy.authorizeMutation("runtime") && [true, "vetoed"].includes(startProxyDirectly()) ? undefined : "refused";
|
|
630
|
+
let svc = guardedSpawnSync(homePolicy.authorizeMutation, "service", process.execPath, serviceRefreshArgs(), {
|
|
581
631
|
stdio: "inherit", windowsHide: true, env: mutationChildEnvironment(),
|
|
582
632
|
});
|
|
633
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
634
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(startProxyDirectly()) ? undefined : "refused";
|
|
583
635
|
// `serviceWasInstalled` is inferred from service-state.json alone, which can be
|
|
584
636
|
// STALE — present while the registration is gone. Repair refuses that case by
|
|
585
637
|
// design, and its thrown Error is indistinguishable from any other failure at
|
|
@@ -589,18 +641,25 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
589
641
|
// failure would resurrect the elevation prompt this change exists to avoid, and
|
|
590
642
|
// could re-register a service the user just uninstalled.
|
|
591
643
|
if (svc.status !== 0 && readServiceInstalledFromStatus(postUpdateLauncher) === false) {
|
|
592
|
-
if (!mayRefresh())
|
|
644
|
+
if (!mayRefresh()) {
|
|
645
|
+
if (homeRefused) return "refused";
|
|
646
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(startProxyDirectly()) ? undefined : "refused";
|
|
647
|
+
return;
|
|
648
|
+
}
|
|
593
649
|
console.log("No registered service found — installing it instead.");
|
|
594
|
-
|
|
650
|
+
const serviceInstallArgsForSpawn = serviceInstallArgs();
|
|
651
|
+
if (!homePolicy.authorizeMutation("service")) return homePolicy.authorizeMutation("runtime") && [true, "vetoed"].includes(startProxyDirectly()) ? undefined : "refused";
|
|
652
|
+
svc = guardedSpawnSync(homePolicy.authorizeMutation, "service", process.execPath, serviceInstallArgsForSpawn, {
|
|
595
653
|
stdio: "inherit", windowsHide: true, env: mutationChildEnvironment(),
|
|
596
654
|
});
|
|
655
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
597
656
|
}
|
|
598
657
|
let needDirectStart = svc.status !== 0;
|
|
599
658
|
if (!needDirectStart) {
|
|
600
659
|
// Exit 0 can still leave stale/missing assets that never bring the proxy
|
|
601
660
|
// back — match the GUI/CLI fallthrough so /healthz is not left dead.
|
|
602
661
|
try {
|
|
603
|
-
const st =
|
|
662
|
+
const st = probeSpawnSync(process.execPath, [postUpdateLauncher, "status", "--json"], {
|
|
604
663
|
encoding: "utf8",
|
|
605
664
|
timeout: 20_000,
|
|
606
665
|
windowsHide: true,
|
|
@@ -624,6 +683,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
624
683
|
// just returned is indistinguishable from any other failure at this layer.
|
|
625
684
|
const supervision = observeSupervision();
|
|
626
685
|
const nowOwned = planUpdateRuntimeHandling({ ...readOwnership(), serviceInstalled: true, supervision });
|
|
686
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
627
687
|
if (!nowOwned.mayStopRuntime) {
|
|
628
688
|
console.warn(supervision
|
|
629
689
|
? "OpenCodex Desktop supervises the proxy; CLI recovery was skipped. Use the app's updater (tray → Check for Updates)."
|
|
@@ -631,9 +691,11 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
631
691
|
return;
|
|
632
692
|
}
|
|
633
693
|
// #7043: the manager first. Only a proxy it owns counts as recovered.
|
|
694
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
634
695
|
const managed = restartThroughServiceManager();
|
|
635
|
-
if (managed === "supervised") return;
|
|
696
|
+
if (managed === "supervised" || managed === "vetoed") return;
|
|
636
697
|
if (managed === "unsettled") return "unsettled";
|
|
698
|
+
if (managed === "refused") return "refused";
|
|
637
699
|
// Repair normally avoids elevation for a healthy registration, but a stale Windows
|
|
638
700
|
// scheduler definition can require it. It can also fail — or exit 0 while leaving
|
|
639
701
|
// a non-viable manager. Fall back to a direct detached proxy start so the
|
|
@@ -647,6 +709,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
647
709
|
const started = startProxyDirectly();
|
|
648
710
|
// An ownership veto is the correct outcome, not a degraded one.
|
|
649
711
|
if (started === "vetoed") return;
|
|
712
|
+
if (started === "refused") return "refused";
|
|
650
713
|
if (started) console.warn(unsupervisedRuntimeWarning(bakePort));
|
|
651
714
|
return "unsupervised";
|
|
652
715
|
}
|
|
@@ -656,7 +719,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
656
719
|
}
|
|
657
720
|
}
|
|
658
721
|
|
|
659
|
-
|
|
722
|
+
let updateLease = acquireOwnershipMutationLease(serviceStatePaths);
|
|
660
723
|
delegatedOwnershipMutationToken = updateLease.token;
|
|
661
724
|
let updateLeaseReleased = false;
|
|
662
725
|
const releaseUpdateLease = () => {
|
|
@@ -665,15 +728,22 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
665
728
|
delegatedOwnershipMutationToken = null;
|
|
666
729
|
updateLease.release();
|
|
667
730
|
};
|
|
731
|
+
const reacquireUpdateLease = () => {
|
|
732
|
+
if (!updateLeaseReleased) return;
|
|
733
|
+
updateLease = acquireOwnershipMutationLease(serviceStatePaths);
|
|
734
|
+
updateLeaseReleased = false;
|
|
735
|
+
delegatedOwnershipMutationToken = updateLease.token;
|
|
736
|
+
};
|
|
668
737
|
|
|
669
738
|
let res;
|
|
739
|
+
let stopAttempted = false;
|
|
670
740
|
let npmFailure = null;
|
|
671
741
|
try {
|
|
672
742
|
// Stop authority is decided under the same lease the child joins. A takeover between the
|
|
673
743
|
// earlier preflight and this boundary therefore blocks stop before it is sent.
|
|
674
744
|
const lockedOwnership = readOwnership();
|
|
675
745
|
const lockedPlan = planUpdateRuntimeHandling({ ...lockedOwnership, serviceInstalled: serviceWasInstalled, supervision: observeSupervision() });
|
|
676
|
-
if (lockedOwnership.subjectToken !== initialOwnership.subjectToken || !lockedPlan.mayReplacePackage) {
|
|
746
|
+
if (!homePolicy.authorizeMutation("package") || lockedOwnership.subjectToken !== initialOwnership.subjectToken || !lockedPlan.mayReplacePackage) {
|
|
677
747
|
releaseUpdateLease();
|
|
678
748
|
console.error(lockedPlan.notice
|
|
679
749
|
?? "opencodex: update stopped because runtime ownership changed before stop authorization; rerun from the beginning.");
|
|
@@ -686,15 +756,19 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
686
756
|
// semantics: graceful drain, service stop, native Codex restore). Gate on the service
|
|
687
757
|
// and the runtime-port record too: a service-managed or orphaned proxy can be live
|
|
688
758
|
// while ocx.pid is stale/missing.
|
|
689
|
-
if (trayBeforeUpdate.stopBeforeReplacement) {
|
|
759
|
+
if (!homePolicy.packageOnly && trayBeforeUpdate.stopBeforeReplacement) {
|
|
690
760
|
console.log("⏹ Handing off the Windows tray before updating...");
|
|
691
761
|
try {
|
|
762
|
+
if (!homePolicy.authorizeMutation("tray")) { releaseUpdateLease(); process.exit(1); }
|
|
763
|
+
let stopAttempted = false;
|
|
692
764
|
handoffWindowsTrayForUpdate(trayBeforeUpdate, {
|
|
693
765
|
stop: () => {
|
|
694
|
-
|
|
766
|
+
if (!homePolicy.authorizeMutation("tray")) throw new Error("Automatic update tray handoff refused.");
|
|
767
|
+
stopAttempted = true;
|
|
768
|
+
const stopped = runTrayLifecycle(launcher, "stop", homePolicy.authorizeMutation);
|
|
695
769
|
return { exitStatus: stopped.status, running: trayInstallState().running };
|
|
696
770
|
},
|
|
697
|
-
start: () => runTrayLifecycle(launcher, "start"),
|
|
771
|
+
start: () => { if (stopAttempted && homePolicy.authorizeMutation("own-tray")) return runTrayLifecycle(launcher, "start", homePolicy.authorizeMutation); },
|
|
698
772
|
});
|
|
699
773
|
} catch {
|
|
700
774
|
releaseUpdateLease();
|
|
@@ -704,9 +778,10 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
704
778
|
}
|
|
705
779
|
const hasRuntimeState =
|
|
706
780
|
existsSync(join(configDir(), "ocx.pid")) || existsSync(join(configDir(), "runtime-port.json"));
|
|
707
|
-
let stopAttempted = false;
|
|
708
781
|
|
|
709
782
|
function recoverStoppedRuntimeAfterFailure(reason) {
|
|
783
|
+
authorityLauncher = postUpdateLauncher;
|
|
784
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
710
785
|
const planRecovery = () => {
|
|
711
786
|
const recoveryOwnership = readOwnership();
|
|
712
787
|
const liveness = currentPackageRuntimeLiveness();
|
|
@@ -730,6 +805,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
730
805
|
// lease, and holding the lease through the repair's health wait keeps that proxy from
|
|
731
806
|
// starting (#5760). Release it as the successful path does, then decide again.
|
|
732
807
|
releaseUpdateLease();
|
|
808
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
733
809
|
({ liveness: recoveryLiveness, plan: recovery } = planRecovery());
|
|
734
810
|
}
|
|
735
811
|
if (recovery.reason === "desktop-supervised") {
|
|
@@ -759,7 +835,12 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
759
835
|
// is the whole test here — the launcher cannot parse it, and `ocx stop` is what decides
|
|
760
836
|
// whether the obligation is safe to finish.
|
|
761
837
|
const hasPendingTeardown = hasPendingTeardownIn(readdirSync, configDir());
|
|
762
|
-
|
|
838
|
+
if (homePolicy.packageOnly && hasPendingTeardown) {
|
|
839
|
+
releaseUpdateLease();
|
|
840
|
+
console.error("opencodex: pending teardown requires manual recovery before package replacement; run 'ocx stop' from the owning installation.");
|
|
841
|
+
process.exit(1);
|
|
842
|
+
}
|
|
843
|
+
const stopNeeded = !homePolicy.packageOnly && (serviceWasInstalled || hasRuntimeState || hasPendingTeardown);
|
|
763
844
|
if (stopNeeded && !runtimePlan.mayStopRuntime) {
|
|
764
845
|
releaseUpdateLease();
|
|
765
846
|
console.error(runtimePlan.notice
|
|
@@ -767,6 +848,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
767
848
|
process.exit(1);
|
|
768
849
|
}
|
|
769
850
|
if (stopNeeded) {
|
|
851
|
+
if (!homePolicy.authorizeMutation("runtime")) { releaseUpdateLease(); process.exit(1); }
|
|
770
852
|
const preStopPlan = planUpdateRuntimeHandling({
|
|
771
853
|
...readOwnership(), serviceInstalled: serviceWasInstalled, supervision: observeSupervision(),
|
|
772
854
|
});
|
|
@@ -775,9 +857,16 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
775
857
|
releaseUpdateLease();
|
|
776
858
|
process.exit(1);
|
|
777
859
|
}
|
|
860
|
+
if (!homePolicy.authorizeMutation("runtime")) { releaseUpdateLease(); process.exit(1); }
|
|
861
|
+
if (serviceWasInstalled && !homePolicy.serviceAllowed) {
|
|
862
|
+
console.warn("Service authority changed before proxy stop; check 'ocx service status' before retrying the update.");
|
|
863
|
+
releaseUpdateLease();
|
|
864
|
+
process.exit(1);
|
|
865
|
+
}
|
|
778
866
|
stopAttempted = true;
|
|
779
867
|
console.log("⏹ Stopping the running proxy before updating...");
|
|
780
|
-
|
|
868
|
+
if (!homePolicy.authorizeMutation(serviceWasInstalled ? "service" : "runtime")) { releaseUpdateLease(); process.exit(1); }
|
|
869
|
+
const stopRes = guardedSpawnSync(homePolicy.authorizeMutation, serviceWasInstalled ? "service" : "runtime", process.execPath, [launcher, "stop"], {
|
|
781
870
|
stdio: "inherit", windowsHide: true, env: mutationChildEnvironment(),
|
|
782
871
|
});
|
|
783
872
|
const stillHasRuntimeState =
|
|
@@ -801,7 +890,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
801
890
|
});
|
|
802
891
|
const historyOnlyStop = decision.reason === "history-only";
|
|
803
892
|
if (!decision.proceed) {
|
|
804
|
-
if (trayBeforeUpdate.restoreOnFailure) runTrayLifecycle(launcher, "start");
|
|
893
|
+
if (trayBeforeUpdate.restoreOnFailure && homePolicy.authorizeMutation("own-tray")) runTrayLifecycle(launcher, "start", homePolicy.authorizeMutation);
|
|
805
894
|
if (decision.reason === "teardown-outstanding") {
|
|
806
895
|
console.error("opencodex: a shared teardown from an earlier stop is still outstanding and needs manual review; aborting the update.");
|
|
807
896
|
console.error("opencodex: confirm no proxy is running, run 'ocx restore', then remove the pending-teardown file in the opencodex home.");
|
|
@@ -833,12 +922,12 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
833
922
|
const replacementOwnership = readOwnership();
|
|
834
923
|
const replacementPlan = planUpdateRuntimeHandling({ ...replacementOwnership, serviceInstalled: serviceWasInstalled, supervision: observeSupervision() });
|
|
835
924
|
const replacementLiveness = currentPackageRuntimeLiveness();
|
|
836
|
-
if (replacementOwnership.subjectToken !== initialOwnership.subjectToken
|
|
925
|
+
if (!homePolicy.authorizeMutation("package") || replacementOwnership.subjectToken !== initialOwnership.subjectToken
|
|
837
926
|
|| !replacementPlan.mayReplacePackage
|
|
838
927
|
|| replacementLiveness !== "dead") {
|
|
839
928
|
recoverStoppedRuntimeAfterFailure("replacement was refused");
|
|
840
929
|
releaseUpdateLease();
|
|
841
|
-
if (trayBeforeUpdate.restoreOnFailure) runTrayLifecycle(launcher, "start");
|
|
930
|
+
if (trayBeforeUpdate.restoreOnFailure && homePolicy.authorizeMutation("own-tray")) runTrayLifecycle(launcher, "start", homePolicy.authorizeMutation);
|
|
842
931
|
console.error(replacementPlan.notice
|
|
843
932
|
?? "opencodex: update stopped because runtime ownership or liveness changed after the stop decision; rerun from the beginning.");
|
|
844
933
|
process.exit(1);
|
|
@@ -852,19 +941,30 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
852
941
|
if (manager === "npm") {
|
|
853
942
|
const packageDir = resolve(here, "..");
|
|
854
943
|
const transactionalNpmUpdate = process.platform === "win32" ? transactionalNpmUpdateAsync : transactionalNpmUpdateSync;
|
|
944
|
+
if (!homePolicy.authorizeMutation("package")) throw new Error("Automatic package update refused.");
|
|
855
945
|
const tx = await transactionalNpmUpdate({
|
|
856
946
|
packageDir,
|
|
857
947
|
pkgName: PKG,
|
|
858
948
|
targetVersion: latest || undefined,
|
|
859
949
|
tag,
|
|
860
950
|
cachePath: npmCachePath,
|
|
951
|
+
mayReplacePackage: () => {
|
|
952
|
+
const ownership = readOwnership();
|
|
953
|
+
const plan = planUpdateRuntimeHandling({ ...ownership, serviceInstalled: serviceWasInstalled, supervision: observeSupervision() });
|
|
954
|
+
const liveness = currentPackageRuntimeLiveness();
|
|
955
|
+
return homePolicy.authorizeMutation("package") && ownership.subjectToken === initialOwnership.subjectToken
|
|
956
|
+
&& plan.mayReplacePackage && liveness === "dead";
|
|
957
|
+
},
|
|
861
958
|
runNpm: (args) => {
|
|
862
959
|
const invocation = npmInvocation(args);
|
|
960
|
+
if (!homePolicy.authorizeMutation("package")) return { status: 1 };
|
|
863
961
|
if (process.platform === "win32") return runNpmInstall(invocation, {
|
|
962
|
+
authorizeMutation: homePolicy.authorizeMutation,
|
|
864
963
|
env: unprivilegedOwnershipMutationEnvironment(invocation?.options?.env ?? process.env),
|
|
865
964
|
});
|
|
866
965
|
if (!invocation) return { status: 1 };
|
|
867
|
-
|
|
966
|
+
if (!homePolicy.authorizeMutation("package")) return { status: 1 };
|
|
967
|
+
return guardedSpawnSync(homePolicy.authorizeMutation, "package", invocation.file, invocation.args, {
|
|
868
968
|
...invocation.options,
|
|
869
969
|
stdio: "inherit",
|
|
870
970
|
timeout: 180000,
|
|
@@ -878,7 +978,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
878
978
|
if (!tx.ok) npmFailure = tx;
|
|
879
979
|
if (tx.ok) {
|
|
880
980
|
res = { status: 0 };
|
|
881
|
-
} else if (tx.phase === "stage" || tx.phase === "verify") {
|
|
981
|
+
} else if (tx.phase === "stage" || tx.phase === "verify" || tx.phase === "authorize") {
|
|
882
982
|
// Live tree untouched: report and stop. Nothing to roll back.
|
|
883
983
|
console.error(`opencodex: update aborted before touching the live install (${tx.phase}): ${tx.error}`);
|
|
884
984
|
res = { status: 1 };
|
|
@@ -887,6 +987,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
887
987
|
res = { status: 1 };
|
|
888
988
|
}
|
|
889
989
|
} else {
|
|
990
|
+
if (!homePolicy.authorizeMutation("package")) throw new Error("Automatic package update refused.");
|
|
890
991
|
const update = runPnpmGlobalUpdate({
|
|
891
992
|
packageName: PKG,
|
|
892
993
|
currentVersion: current,
|
|
@@ -897,7 +998,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
897
998
|
runPnpm: (args, capture = false) => {
|
|
898
999
|
const invocation = pnpmOwnerInvocation(owner, args);
|
|
899
1000
|
if (!invocation) return { status: 1 };
|
|
900
|
-
return withPnpmCommandCwd(args, cwd =>
|
|
1001
|
+
return withPnpmCommandCwd(args, cwd => homePolicy.authorizeMutation("package") ? guardedSpawnSync(homePolicy.authorizeMutation, "package", invocation.file, invocation.args, {
|
|
901
1002
|
...invocation.options,
|
|
902
1003
|
stdio: capture ? "pipe" : "inherit",
|
|
903
1004
|
encoding: "utf8",
|
|
@@ -907,7 +1008,7 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
907
1008
|
// keep a cwd handle inside the package Windows is replacing.
|
|
908
1009
|
cwd,
|
|
909
1010
|
env: pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(invocation.env ?? process.env)),
|
|
910
|
-
}));
|
|
1011
|
+
}) : { status: 1 });
|
|
911
1012
|
},
|
|
912
1013
|
log: line => console.log(line),
|
|
913
1014
|
});
|
|
@@ -944,31 +1045,63 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
944
1045
|
}
|
|
945
1046
|
const postInstallPlan = planUpdateRuntimeHandling({ ...readOwnership(), serviceInstalled: serviceWasInstalled, supervision: observeSupervision() });
|
|
946
1047
|
if (res.status === 0) {
|
|
947
|
-
|
|
1048
|
+
authorityLauncher = postUpdateLauncher;
|
|
1049
|
+
if (homePolicy.packageOnly) {
|
|
1050
|
+
if (!homePolicy.authorizeMutation("package-publish")) process.exit(1);
|
|
1051
|
+
guardedRun(homePolicy.authorizeMutation, "package-publish", console.log, [`\nUpdated${latest ? ` to v${latest}` : ""}.`]);
|
|
1052
|
+
homePolicy.check(homePolicy.initial);
|
|
1053
|
+
console.log(`Restart the proxy: ${launcherStartHint(postUpdateLauncher, bakePort)}`);
|
|
1054
|
+
if (!homePolicy.authorizeMutation("package-publish")) process.exit(1);
|
|
1055
|
+
guardedExit(homePolicy.authorizeMutation, "package-publish", process.argv.includes("--update-worker-result") ? UPDATE_PACKAGE_ONLY_EXIT_CODE : 0);
|
|
1056
|
+
}
|
|
1057
|
+
const restoreOwnStoppedTray = () => {
|
|
1058
|
+
if (trayBeforeUpdate.restoreOnFailure && postUpdateLauncherUsable && existsSync(postUpdateLauncher)) {
|
|
1059
|
+
try { if (homePolicy.authorizeMutation("own-tray")) runTrayLifecycle(postUpdateLauncher, "start", homePolicy.authorizeMutation); } catch { /* preserve the authority refusal */ }
|
|
1060
|
+
}
|
|
1061
|
+
};
|
|
1062
|
+
if (!homePolicy.authorizeMutation("publish")) {
|
|
1063
|
+
restoreOwnStoppedTray();
|
|
1064
|
+
process.exit(1);
|
|
1065
|
+
}
|
|
1066
|
+
guardedRun(homePolicy.authorizeMutation, "publish", console.log, [`\nUpdated${latest ? ` to v${latest}` : ""}.`]);
|
|
948
1067
|
if (!postInstallPlan.mayStopRuntime) console.warn("Runtime authority does not permit CLI recovery; no service was refreshed or proxy started.");
|
|
949
|
-
repairCodexShimIfNeeded(postUpdateLauncher);
|
|
1068
|
+
if (!homePolicy.authorizeMutation("shim") || repairCodexShimIfNeeded(postUpdateLauncher, homePolicy.authorizeMutation) === false) { restoreOwnStoppedTray(); process.exit(1); }
|
|
950
1069
|
if (trayBeforeUpdate.refreshAfterReplacement) {
|
|
951
|
-
|
|
1070
|
+
if (!homePolicy.authorizeMutation("tray")) {
|
|
1071
|
+
restoreOwnStoppedTray();
|
|
1072
|
+
process.exit(1);
|
|
1073
|
+
}
|
|
1074
|
+
const tray = guardedSpawnSync(homePolicy.authorizeMutation, "tray", process.execPath, [postUpdateLauncher, ...trayBeforeUpdate.installArgs], {
|
|
952
1075
|
stdio: "inherit",
|
|
953
1076
|
windowsHide: true,
|
|
954
1077
|
});
|
|
955
1078
|
if (tray.status !== 0) {
|
|
956
1079
|
console.warn("opencodex: Windows tray refresh failed. Run: ocx tray install");
|
|
957
|
-
if (trayBeforeUpdate.restoreOnFailure && postUpdateLauncherUsable) runTrayLifecycle(postUpdateLauncher, "start");
|
|
1080
|
+
if (trayBeforeUpdate.restoreOnFailure && postUpdateLauncherUsable && homePolicy.authorizeMutation("own-tray")) runTrayLifecycle(postUpdateLauncher, "start", homePolicy.authorizeMutation);
|
|
958
1081
|
}
|
|
959
1082
|
}
|
|
960
1083
|
// The stop above unloaded any managed service; refresh via the freshly-installed
|
|
961
1084
|
// launcher so the new files write the baked paths and the service restarts.
|
|
962
1085
|
if (postInstallPlan.mayRestoreService) {
|
|
963
1086
|
console.log("Refreshing the background service with the updated files...");
|
|
964
|
-
|
|
965
|
-
|
|
1087
|
+
let refreshed;
|
|
1088
|
+
try { refreshed = refreshBackgroundServiceOrStartDirect(); }
|
|
1089
|
+
finally { releaseUpdateLease(); }
|
|
1090
|
+
if (refreshed === "unsupervised" || refreshed === "unsettled" || refreshed === "refused") process.exit(1);
|
|
966
1091
|
} else if (postInstallPlan.mayStopRuntime) {
|
|
967
|
-
|
|
1092
|
+
if (!homePolicy.authorizeMutation("runtime")) process.exit(1);
|
|
1093
|
+
authorityLauncher = postUpdateLauncher;
|
|
1094
|
+
if (stopAttempted) {
|
|
1095
|
+
let started;
|
|
1096
|
+
try { started = startProxyDirectly(); }
|
|
1097
|
+
finally { releaseUpdateLease(); }
|
|
1098
|
+
if (started !== true && started !== "vetoed") process.exit(1);
|
|
1099
|
+
} else console.log(`Restart the proxy: ${launcherStartHint(postUpdateLauncher, bakePort)}`);
|
|
968
1100
|
}
|
|
969
|
-
process.exit(
|
|
1101
|
+
if (!homePolicy.authorizeMutation("publish")) process.exit(1);
|
|
1102
|
+
guardedExit(homePolicy.authorizeMutation, "publish", 0);
|
|
970
1103
|
}
|
|
971
|
-
if (trayBeforeUpdate.restoreOnFailure && postUpdateLauncherUsable) runTrayLifecycle(postUpdateLauncher, "start");
|
|
1104
|
+
if (trayBeforeUpdate.restoreOnFailure && postUpdateLauncherUsable && homePolicy.authorizeMutation("own-tray")) runTrayLifecycle(postUpdateLauncher, "start", homePolicy.authorizeMutation);
|
|
972
1105
|
if (npmFailure) {
|
|
973
1106
|
// Phase-specific next step (#5624): whether the previous version is still in place decides
|
|
974
1107
|
// between "retry" and "restore", and a bare reinstall must follow a stop (#5496).
|
|
@@ -987,10 +1120,11 @@ async function runPackageManagerSelfUpdate(manager) {
|
|
|
987
1120
|
process.exit(1);
|
|
988
1121
|
}
|
|
989
1122
|
|
|
990
|
-
function bunBinDir() {
|
|
1123
|
+
function bunBinDir(launcherPath) {
|
|
991
1124
|
// Resolve the `bun` dependency's directory without hardcoding the platform
|
|
992
1125
|
// package — the package manager's os/cpu/libc resolution already picked the right @oven/bun-*.
|
|
993
|
-
|
|
1126
|
+
const resolver = createRequire(launcherPath || import.meta.url);
|
|
1127
|
+
return dirname(resolver.resolve("bun/package.json"));
|
|
994
1128
|
}
|
|
995
1129
|
|
|
996
1130
|
const BUN_OVERRIDE_ENV = "OPENCODEX_BUN_PATH";
|
|
@@ -1039,7 +1173,7 @@ function fail(msg) {
|
|
|
1039
1173
|
process.exit(1);
|
|
1040
1174
|
}
|
|
1041
1175
|
|
|
1042
|
-
function resolveBun({ allowInstall = true } = {}) {
|
|
1176
|
+
function resolveBun({ allowInstall = true, launcherPath, allowMissing = false } = {}) {
|
|
1043
1177
|
// Keep direct package-launcher starts aligned with durable service/shim installs:
|
|
1044
1178
|
// a valid explicit runtime must win even when the bundled dependency exists.
|
|
1045
1179
|
const override = process.env[BUN_OVERRIDE_ENV]?.trim();
|
|
@@ -1053,7 +1187,7 @@ function resolveBun({ allowInstall = true } = {}) {
|
|
|
1053
1187
|
|
|
1054
1188
|
let bunDir = null;
|
|
1055
1189
|
try {
|
|
1056
|
-
bunDir = bunBinDir();
|
|
1190
|
+
bunDir = bunBinDir(launcherPath);
|
|
1057
1191
|
} catch { /* Missing dependency can still fall back to a validated PATH Bun. */ }
|
|
1058
1192
|
|
|
1059
1193
|
let bin = bunDir ? findBunBinary(bunDir) : null;
|
|
@@ -1063,7 +1197,7 @@ function resolveBun({ allowInstall = true } = {}) {
|
|
|
1063
1197
|
// ~450-byte placeholder stub. Run the bun package's own installer once.
|
|
1064
1198
|
const installJs = bunDir ? join(bunDir, "install.js") : null;
|
|
1065
1199
|
if (allowInstall && installJs && existsSync(installJs)) {
|
|
1066
|
-
const r =
|
|
1200
|
+
const r = probeSpawnSync(process.execPath, [installJs], { stdio: "inherit" });
|
|
1067
1201
|
if (r.status === 0) bin = findBunBinary(bunDir);
|
|
1068
1202
|
}
|
|
1069
1203
|
if (bin) return { path: bin, source: "bundled", version: bundledBunVersion(bunDir) };
|
|
@@ -1071,11 +1205,12 @@ function resolveBun({ allowInstall = true } = {}) {
|
|
|
1071
1205
|
// Reached only when the bundled runtime is unusable. The two probes start the candidate Bun
|
|
1072
1206
|
// cold, and on Windows a first run of a copied bun.exe is often held by an on-access scan for
|
|
1073
1207
|
// well over a second, so the total budget is generous rather than interactive-tight.
|
|
1074
|
-
const pathBun = findPathBun({ pinnedVersion: pinnedBunVersion(), deadlineMs: PATH_BUN_PROBE_BUDGET_MS });
|
|
1208
|
+
const pathBun = findPathBun({ pinnedVersion: pinnedBunVersion(launcherPath), deadlineMs: PATH_BUN_PROBE_BUDGET_MS });
|
|
1075
1209
|
if (pathBun) {
|
|
1076
1210
|
console.error(`opencodex: using PATH Bun ${pathBun.version}.`);
|
|
1077
1211
|
return { path: pathBun.path, source: "process", version: pathBun.version };
|
|
1078
1212
|
}
|
|
1213
|
+
if (allowMissing) return null;
|
|
1079
1214
|
fail(bunDir ? "Bun binary missing after install attempt." : "the `bun` dependency is not installed.");
|
|
1080
1215
|
}
|
|
1081
1216
|
|
|
@@ -1090,7 +1225,24 @@ if (updateHelpRequested) {
|
|
|
1090
1225
|
process.exit(0);
|
|
1091
1226
|
}
|
|
1092
1227
|
|
|
1228
|
+
// This intercept precedes Desktop handoff, boot restore and install-capable Bun resolution.
|
|
1229
|
+
// Capability only: no Bun lookup, home inspection, dotenv or ordinary bootstrap.
|
|
1230
|
+
if (process.argv[2] === "__update-package-only-probe") {
|
|
1231
|
+
if (process.argv.length !== 3) process.exit(2);
|
|
1232
|
+
console.log(JSON.stringify({ schemaVersion: 1, packageOnlyProtocolVersion: UPDATE_PACKAGE_ONLY_PROTOCOL_VERSION }));
|
|
1233
|
+
process.exit(0);
|
|
1234
|
+
}
|
|
1235
|
+
if (process.argv[2] === "__update-home-probe") {
|
|
1236
|
+
if (!isUpdateHomeProbe(process.argv.slice(2))) process.exit(1);
|
|
1237
|
+
console.log(JSON.stringify({ schemaVersion: 1, ...readNodeUpdateHome(fileURLToPath(import.meta.url)), launcherProtocolVersion: UPDATE_HOME_LAUNCHER_PROTOCOL }));
|
|
1238
|
+
process.exit(0);
|
|
1239
|
+
}
|
|
1240
|
+
|
|
1093
1241
|
const codexCliUpdateInspection = isCodexCliUpdateInspectionArgv(process.argv);
|
|
1242
|
+
// Windows inspection currently refuses before candidate I/O, so a long-lived
|
|
1243
|
+
// Windows server does not duplicate PATH into its inherited environment block.
|
|
1244
|
+
const codexCliUpdateInspectionContext = codexCliUpdateInspection
|
|
1245
|
+
|| (process.platform !== "win32" && carriesCodexCliUpdateInspectionContext(process.argv));
|
|
1094
1246
|
if (codexCliUpdateInspection && typeof process.versions.bun === "string") {
|
|
1095
1247
|
console.error("opencodex: codex-cli-update inspection must use the published Node launcher.");
|
|
1096
1248
|
process.exit(1);
|
|
@@ -1116,7 +1268,7 @@ if (desktopPlan.kind === "handoff") {
|
|
|
1116
1268
|
}
|
|
1117
1269
|
if (result.kind === "exit") {
|
|
1118
1270
|
if (result.signal) {
|
|
1119
|
-
|
|
1271
|
+
relayOwnSignal(result.signal);
|
|
1120
1272
|
} else {
|
|
1121
1273
|
process.exit(result.code);
|
|
1122
1274
|
}
|
|
@@ -1222,7 +1374,7 @@ function createNodeLaunchContext() {
|
|
|
1222
1374
|
version: 1,
|
|
1223
1375
|
proof: launchProof,
|
|
1224
1376
|
anthropicEnvSlots: preBunAnthropicSlots,
|
|
1225
|
-
codexCliInspectionEnv:
|
|
1377
|
+
codexCliInspectionEnv: codexCliUpdateInspectionContext ? {
|
|
1226
1378
|
codexCliPath: preBunCodexCliPath,
|
|
1227
1379
|
path: preBunPath,
|
|
1228
1380
|
pathExt: preBunPathExt,
|
|
@@ -1272,7 +1424,7 @@ function createNodeLaunchContext() {
|
|
|
1272
1424
|
return { launchProof, launchContext, inheritedEnv };
|
|
1273
1425
|
}
|
|
1274
1426
|
|
|
1275
|
-
const child =
|
|
1427
|
+
const child = probeSpawn(bun, [cliPath, `${NODE_LAUNCH_PROOF_PREFIX}${launchProof}`, ...process.argv.slice(2).filter(arg => !arg.startsWith(NODE_LAUNCH_PROOF_PREFIX))], {
|
|
1276
1428
|
stdio: "inherit",
|
|
1277
1429
|
// A headless Windows parent (Task Scheduler, dashboard restart, shortcut) has no
|
|
1278
1430
|
// console to inherit. Without this flag Windows allocates a visible console for
|
|
@@ -1314,7 +1466,7 @@ child.on("exit", (code, signal) => {
|
|
|
1314
1466
|
clearHandlers();
|
|
1315
1467
|
// Mirror the child's terminating signal/exit code so this launcher's status matches.
|
|
1316
1468
|
if (signal) {
|
|
1317
|
-
|
|
1469
|
+
relayOwnSignal(signal);
|
|
1318
1470
|
return;
|
|
1319
1471
|
}
|
|
1320
1472
|
process.exit(code ?? 1);
|