@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- 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 +17 -4
- 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.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 +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- 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/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/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- 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 +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- 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 +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- 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 +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- 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 +58 -64
- 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/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.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- 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-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 +17 -4
- 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-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 +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- 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/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- 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 +257 -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 +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -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 +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -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 +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- 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 +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- 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/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- 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 +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- 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 +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- 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/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- 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-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/shadow-call.ts +55 -1
- 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 +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- 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 +238 -0
- package/src/local-credentials/inventory.ts +281 -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/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/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 +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- 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/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- 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/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -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 +9 -43
- package/src/server/index/websocket-handler.ts +7 -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 +424 -543
- 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 +79 -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/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -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 +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- 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/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- 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/combo-required-tool-contract.ts +2 -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 +14 -7
- 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 +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -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 +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- 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/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/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -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 +179 -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 +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- 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 +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
package/src/update/index.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { guardedRun, guardedSpawn, guardedSpawnSync } from "./mutation-guard.mjs";
|
|
2
|
+
import { probeSpawn, probeSpawnSync } from "./mutation-guard.mjs";
|
|
2
3
|
import { createSupervisionLatch, inspectDesktopSupervision } from "../service/desktop-supervision.mjs";
|
|
3
4
|
import { manualUpdateFailureGuidance } from "./update-failure-guidance.mjs";
|
|
4
5
|
import { STOP_HISTORY_INCOMPLETE_EXIT_CODE } from "./stop-contract.mjs";
|
|
@@ -15,6 +16,7 @@ import type { ServiceOwnership } from "../service/state";
|
|
|
15
16
|
import { planUpdateRuntimeHandling, planStoppedRuntimeRecovery, inspectPackageRuntimeLiveness } from "./runtime-ownership.mjs";
|
|
16
17
|
import { unprivilegedOwnershipMutationEnvironment } from "../service/ownership-mutation-lease.mjs";
|
|
17
18
|
import { withUpdateOwnershipLease, readUpdateRuntimeTarget } from "./ownership-transaction";
|
|
19
|
+
import { createUpdateServiceHomePolicy, parseUpdateWorkerHome, UPDATE_PACKAGE_ONLY_EXIT_CODE } from "./service-home-policy.mjs";
|
|
18
20
|
import { npmInvocation } from "./npm-invocation.mjs";
|
|
19
21
|
import { pnpmInvocation, pnpmInvocationForPath, resolvePnpmCommands } from "./pnpm-invocation.mjs";
|
|
20
22
|
import { detectInstallOwnershipFromPath } from "./install-detection.mjs";
|
|
@@ -106,11 +108,11 @@ function runPnpmCandidate(
|
|
|
106
108
|
commandPath: string,
|
|
107
109
|
args: readonly string[],
|
|
108
110
|
capture = false,
|
|
109
|
-
|
|
111
|
+
probeSpawn: typeof probeSpawnSync = probeSpawnSync,
|
|
110
112
|
): { status: number | null; stdout?: string | null; stderr?: string | null } {
|
|
111
113
|
const invocation = pnpmInvocationForPath(commandPath, args);
|
|
112
114
|
if (!invocation) return { status: 1 };
|
|
113
|
-
return
|
|
115
|
+
return probeSpawn(invocation.file, invocation.args, {
|
|
114
116
|
stdio: capture ? "pipe" : "ignore",
|
|
115
117
|
encoding: "utf8",
|
|
116
118
|
timeout: 20_000,
|
|
@@ -124,15 +126,15 @@ function runPnpmCandidate(
|
|
|
124
126
|
/** Resolve the exact pnpm executable/group/bin that own this package. */
|
|
125
127
|
export function resolveCurrentPnpmGlobalOwner(
|
|
126
128
|
invoked = process.argv[1],
|
|
127
|
-
deps: { commandPaths?: readonly string[]; spawn?: typeof
|
|
129
|
+
deps: { commandPaths?: readonly string[]; spawn?: typeof probeSpawnSync } = {},
|
|
128
130
|
): PnpmGlobalOwnerResult {
|
|
129
|
-
const
|
|
131
|
+
const probeSpawn = deps.spawn ?? probeSpawnSync;
|
|
130
132
|
return resolvePnpmGlobalOwner({
|
|
131
133
|
packageName: PKG,
|
|
132
134
|
packagePath: packageRoot(),
|
|
133
135
|
commandPaths: deps.commandPaths ?? resolvePnpmCommands(),
|
|
134
136
|
runningShimPath: runningPnpmShimPath(invoked),
|
|
135
|
-
runPnpm: (commandPath, args, capture) => runPnpmCandidate(commandPath, args, capture,
|
|
137
|
+
runPnpm: (commandPath, args, capture) => runPnpmCandidate(commandPath, args, capture, probeSpawn),
|
|
136
138
|
});
|
|
137
139
|
}
|
|
138
140
|
|
|
@@ -155,11 +157,12 @@ export function runOwnedPnpm(
|
|
|
155
157
|
args: readonly string[],
|
|
156
158
|
capture: boolean,
|
|
157
159
|
stdio: "inherit" | "pipe" | "ignore" = capture ? "pipe" : "inherit",
|
|
158
|
-
|
|
160
|
+
probeSpawn: typeof probeSpawnSync = probeSpawnSync,
|
|
161
|
+
authorizeMutation: (kind: "package") => boolean = () => ["root", "bin", "list", "config", "view", "--version"].includes(args[0] ?? ""),
|
|
159
162
|
): { status: number | null; stdout?: string | null; stderr?: string | null } {
|
|
160
163
|
const target = ownerPnpmTarget(owner, args);
|
|
161
164
|
if (!target) return { status: 1 };
|
|
162
|
-
return withPnpmCommandCwd(args, cwd =>
|
|
165
|
+
return withPnpmCommandCwd(args, cwd => authorizeMutation("package") ? guardedSpawnSync(authorizeMutation, "package", target.bin, target.args, {
|
|
163
166
|
stdio,
|
|
164
167
|
encoding: "utf8",
|
|
165
168
|
timeout: 180_000,
|
|
@@ -169,7 +172,7 @@ export function runOwnedPnpm(
|
|
|
169
172
|
cwd,
|
|
170
173
|
env: pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(target.env)),
|
|
171
174
|
...target.options,
|
|
172
|
-
}));
|
|
175
|
+
}, probeSpawn) : { status: 1 });
|
|
173
176
|
}
|
|
174
177
|
|
|
175
178
|
/** Re-read the owning group's active package and return its verified launcher. */
|
|
@@ -295,13 +298,13 @@ export function latestVersion(
|
|
|
295
298
|
tag: string,
|
|
296
299
|
installer: Installer = detectInstall(),
|
|
297
300
|
owner?: PnpmGlobalOwner,
|
|
298
|
-
|
|
301
|
+
probeSpawn: typeof probeSpawnSync = probeSpawnSync,
|
|
299
302
|
): string | null {
|
|
300
303
|
const resolvedOwner = installer === "pnpm" ? selectedPnpmOwner(owner) : undefined;
|
|
301
304
|
if (installer === "pnpm" && !resolvedOwner) return null;
|
|
302
305
|
const manager = registrySpawnTarget(installer, ["view", `${PKG}@${tag}`, "version"], resolvedOwner);
|
|
303
306
|
if (!manager) return null;
|
|
304
|
-
const r =
|
|
307
|
+
const r = probeSpawn(manager.bin, manager.args, {
|
|
305
308
|
encoding: "utf8",
|
|
306
309
|
timeout: 12000,
|
|
307
310
|
windowsHide: true,
|
|
@@ -349,7 +352,7 @@ export function updateCommandStr(installer: Installer, tag: Channel, resolvedVer
|
|
|
349
352
|
*/
|
|
350
353
|
export function checkUpdatePackageIntegrity(
|
|
351
354
|
version: string | null,
|
|
352
|
-
|
|
355
|
+
probeSpawn: typeof probeSpawnSync = probeSpawnSync,
|
|
353
356
|
installer: Installer = detectInstall(),
|
|
354
357
|
owner?: PnpmGlobalOwner,
|
|
355
358
|
): { ok: true; integrity: string } | { ok: false; reason: string } | { ok: "skipped"; reason: string } {
|
|
@@ -362,7 +365,7 @@ export function checkUpdatePackageIntegrity(
|
|
|
362
365
|
const result = checkRegistryPackageIntegrity(PKG, version, args => {
|
|
363
366
|
const target = registrySpawnTarget(installer, args, resolvedOwner);
|
|
364
367
|
if (!target) return { status: 1 };
|
|
365
|
-
return
|
|
368
|
+
return probeSpawn(target.bin, target.args, {
|
|
366
369
|
encoding: "utf8",
|
|
367
370
|
timeout: 12000,
|
|
368
371
|
windowsHide: true,
|
|
@@ -459,7 +462,7 @@ export async function runUpdate(): Promise<void> {
|
|
|
459
462
|
|
|
460
463
|
// Pre-flight integrity metadata check — runs BEFORE the proxy is stopped so an
|
|
461
464
|
// anomalous registry entry aborts without unloading the running service.
|
|
462
|
-
const integrity = checkUpdatePackageIntegrity(latest,
|
|
465
|
+
const integrity = checkUpdatePackageIntegrity(latest, probeSpawnSync, installer, owner);
|
|
463
466
|
if (integrity.ok === false) {
|
|
464
467
|
console.error(`⚠️ ${integrity.reason} — aborting the update before stopping the proxy.`);
|
|
465
468
|
process.exit(1);
|
|
@@ -489,12 +492,17 @@ export async function runUpdate(): Promise<void> {
|
|
|
489
492
|
|
|
490
493
|
const { serviceStatePaths } = await import("../service");
|
|
491
494
|
const updateExitCode = await withUpdateOwnershipLease(serviceStatePaths(), async mutation => {
|
|
495
|
+
// Ownership inspection imports the service CLI, which reaches this update entry again.
|
|
496
|
+
// Load it only after entering the lease; the policy itself stays a dependency-free import.
|
|
497
|
+
const { inspectUpdateServiceHome } = await import("./service-home-authority");
|
|
498
|
+
const homePolicy = createUpdateServiceHomePolicy(inspectUpdateServiceHome, message => console.warn(message), process.argv.includes("--update-package-only"), parseUpdateWorkerHome(process.argv));
|
|
499
|
+
if (!homePolicy.authorizeMutation("package")) return 1;
|
|
492
500
|
// Remember whether a background service manages the proxy BEFORE stopping — `ocx stop`
|
|
493
501
|
// unloads it, so a successful update must repair/restart it afterwards.
|
|
494
502
|
let serviceWasInstalled = false;
|
|
495
503
|
try {
|
|
496
504
|
const { isServiceInstalled } = await import("../service");
|
|
497
|
-
serviceWasInstalled = isServiceInstalled();
|
|
505
|
+
serviceWasInstalled = homePolicy.serviceAllowed && isServiceInstalled();
|
|
498
506
|
} catch { /* best-effort */ }
|
|
499
507
|
// What this update may do to the runtime. A desktop takeover vetoes both the stop and the
|
|
500
508
|
// service refresh below; see `planUpdateRuntimeHandling` for why each half is wrong.
|
|
@@ -513,16 +521,20 @@ export async function runUpdate(): Promise<void> {
|
|
|
513
521
|
}
|
|
514
522
|
let trayWasInstalled = false;
|
|
515
523
|
let trayWasRunning = false;
|
|
516
|
-
if (process.platform === "win32") {
|
|
524
|
+
if (!homePolicy.packageOnly && process.platform === "win32") {
|
|
517
525
|
try {
|
|
518
|
-
const { getWindowsTrayStatus,
|
|
526
|
+
const { getWindowsTrayStatus, guardedStartWindowsTray, guardedStopWindowsTray } = await import("./guarded-tray-ops");
|
|
519
527
|
const tray = getWindowsTrayStatus();
|
|
528
|
+
if (!homePolicy.authorizeMutation("tray")) return 1;
|
|
529
|
+
let trayStopAttempted = false;
|
|
520
530
|
const trayPlan = handoffWindowsTrayForUpdate(tray, {
|
|
521
531
|
stop: () => {
|
|
522
|
-
|
|
532
|
+
if (!homePolicy.authorizeMutation("tray")) throw new Error("Automatic update tray handoff refused; check 'ocx service status'.");
|
|
533
|
+
trayStopAttempted = true;
|
|
534
|
+
const stopped = guardedStopWindowsTray(homePolicy.authorizeMutation);
|
|
523
535
|
return { exitStatus: 0, running: stopped.running };
|
|
524
536
|
},
|
|
525
|
-
start: () =>
|
|
537
|
+
start: () => { if (trayStopAttempted && homePolicy.authorizeMutation("own-tray")) guardedStartWindowsTray(homePolicy.authorizeMutation); },
|
|
526
538
|
});
|
|
527
539
|
trayWasInstalled = trayPlan.refreshAfterReplacement;
|
|
528
540
|
trayWasRunning = trayPlan.restoreOnFailure;
|
|
@@ -565,22 +577,31 @@ export async function runUpdate(): Promise<void> {
|
|
|
565
577
|
&& before?.consentGeneration === after?.consentGeneration;
|
|
566
578
|
};
|
|
567
579
|
/** `"vetoed"`: another owner holds the runtime, so not starting is the correct outcome. */
|
|
568
|
-
const startProxyDirectly = async (): Promise<boolean | "vetoed"> => {
|
|
580
|
+
const startProxyDirectly = async (): Promise<boolean | "vetoed" | "refused"> => {
|
|
581
|
+
// Every caller, including error recovery, owns the lock and fresh home proof here.
|
|
582
|
+
try { mutation.reacquire(); } catch {
|
|
583
|
+
console.warn("⚠️ Recovery could not acquire runtime ownership; run 'ocx service repair' or 'ocx start' manually after the other operation finishes.");
|
|
584
|
+
return false;
|
|
585
|
+
}
|
|
586
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
569
587
|
const ownership = await resolvedRuntimeOwnership();
|
|
570
588
|
const supervision = observeSupervision();
|
|
571
589
|
const plan = planUpdateRuntimeHandling({ ...ownership, serviceInstalled: false, supervision });
|
|
572
|
-
if (!
|
|
590
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
591
|
+
if (!sameOwner(ownership) || !plan.mayStopRuntime) {
|
|
573
592
|
console.warn(supervision
|
|
574
593
|
? "OpenCodex Desktop supervises the proxy; no CLI runtime was restored."
|
|
575
594
|
: plan.notice);
|
|
576
|
-
return "vetoed";
|
|
595
|
+
return homePolicy.authorizeMutation("publish") ? "vetoed" : "refused";
|
|
577
596
|
}
|
|
578
597
|
if (!postUpdateLauncherUsable || !existsSync(postUpdateLauncher)) return false;
|
|
579
598
|
// An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
|
|
580
599
|
const env = mutation.controlEnvironment(withoutSiblingMarker(process.env));
|
|
581
600
|
delete env.OCX_SERVICE;
|
|
582
|
-
const
|
|
583
|
-
|
|
601
|
+
const runtimeEnv = withProcessRuntimeProvenance(env);
|
|
602
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
603
|
+
const child = guardedSpawn(homePolicy.authorizeMutation, "runtime", process.execPath, [postUpdateLauncher, "start", "--port", String(capturedListen.port)], {
|
|
604
|
+
detached: true, stdio: "ignore", windowsHide: true, env: runtimeEnv,
|
|
584
605
|
});
|
|
585
606
|
let failed = false;
|
|
586
607
|
child.once("error", () => { failed = true; });
|
|
@@ -590,7 +611,7 @@ export async function runUpdate(): Promise<void> {
|
|
|
590
611
|
const current = readUpdateRuntimeTarget(getRuntimePortPath(), capturedListen.hostname);
|
|
591
612
|
if (current.kind === "target" && current.target.port === capturedListen.port
|
|
592
613
|
&& await proxyIdentityAt(current.target.port, { hostname: current.target.hostname, expectedPid: current.target.pid },
|
|
593
|
-
{ timeoutMs: 1500, deadlineAt: deadline, attempts: 1 })) return true;
|
|
614
|
+
{ timeoutMs: 1500, deadlineAt: deadline, attempts: 1 })) return homePolicy.authorizeMutation("publish") ? true : "refused";
|
|
594
615
|
await Bun.sleep(Math.min(100, Math.max(0, deadline - Date.now())));
|
|
595
616
|
}
|
|
596
617
|
console.warn("⚠️ Recovery did not report a healthy proxy before its deadline; run 'ocx service repair' or 'ocx start'.");
|
|
@@ -600,12 +621,20 @@ export async function runUpdate(): Promise<void> {
|
|
|
600
621
|
// and count it only when the serving proxy is that job. Runs unleased: the manager's child
|
|
601
622
|
// cannot join this lease (#5760). `"unsettled"` means the manager may still finish the restart,
|
|
602
623
|
// so no competing proxy may be started.
|
|
603
|
-
const restartThroughServiceManager = async (): Promise<"supervised" | "failed" | "unsettled"> => {
|
|
624
|
+
const restartThroughServiceManager = async (): Promise<"supervised" | "failed" | "unsettled" | "refused" | "vetoed"> => {
|
|
604
625
|
if (!hasRestartableServiceManager()) return "failed";
|
|
626
|
+
mutation.release();
|
|
627
|
+
const owner = await resolvedRuntimeOwnership();
|
|
628
|
+
if (!homePolicy.authorizeMutation("runtime")) return "refused";
|
|
629
|
+
if (!homePolicy.serviceAllowed) return "failed";
|
|
630
|
+
if (!sameOwner(owner) || !planUpdateRuntimeHandling({ ...owner, serviceInstalled: true,
|
|
631
|
+
supervision: observeSupervision() }).mayRestoreService) return homePolicy.authorizeMutation("publish") ? "vetoed" : "refused";
|
|
605
632
|
console.log("🔁 Asking the service manager to restart the background service...");
|
|
606
633
|
const before = readUpdateRuntimeTarget(getRuntimePortPath(), capturedListen.hostname);
|
|
607
634
|
const staleRecordPid = before.kind === "target" ? before.target.pid : null;
|
|
608
|
-
|
|
635
|
+
if (!homePolicy.authorizeMutation("service")) return homePolicy.authorizeMutation("runtime") ? "failed" : "refused";
|
|
636
|
+
const restarted = restartServiceManagerJob({}, homePolicy.authorizeMutation);
|
|
637
|
+
if (!restarted.ok && restarted.refused) return "refused";
|
|
609
638
|
const unsettled = !restarted.ok && restarted.unsettled === true;
|
|
610
639
|
let verdict: ReturnType<typeof supervisionVerdict> | { kind: "failed"; reason: string };
|
|
611
640
|
if (!restarted.ok && !unsettled) {
|
|
@@ -624,7 +653,8 @@ export async function runUpdate(): Promise<void> {
|
|
|
624
653
|
verdict = supervisionVerdict({ servingPid, managerPid: readServiceManagerPid(), parentPid: pid => readParentPid(pid) });
|
|
625
654
|
}
|
|
626
655
|
if (verdict.kind === "supervised") {
|
|
627
|
-
|
|
656
|
+
if (!homePolicy.authorizeMutation("publish")) return "refused";
|
|
657
|
+
guardedRun(homePolicy.authorizeMutation, "publish", console.log, [`✅ Proxy is healthy on port ${capturedListen.port} under the service manager (pid ${verdict.managerPid}).`]);
|
|
628
658
|
return "supervised";
|
|
629
659
|
}
|
|
630
660
|
if (unsettled) {
|
|
@@ -635,9 +665,9 @@ export async function runUpdate(): Promise<void> {
|
|
|
635
665
|
return "failed";
|
|
636
666
|
};
|
|
637
667
|
/** Direct start as the last resort for a managed install: never reported as full recovery. */
|
|
638
|
-
const startUnsupervisedFallback = async (): Promise<"vetoed" | "started" | "failed"> => {
|
|
668
|
+
const startUnsupervisedFallback = async (): Promise<"vetoed" | "refused" | "started" | "failed"> => {
|
|
639
669
|
const started = await startProxyDirectly();
|
|
640
|
-
if (started === "vetoed") return
|
|
670
|
+
if (started === "vetoed" || started === "refused") return started;
|
|
641
671
|
if (started) console.warn(unsupervisedRuntimeWarning(capturedListen.port));
|
|
642
672
|
return started ? "started" : "failed";
|
|
643
673
|
};
|
|
@@ -652,12 +682,14 @@ export async function runUpdate(): Promise<void> {
|
|
|
652
682
|
});
|
|
653
683
|
};
|
|
654
684
|
let recovery = await planRecovery();
|
|
685
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
655
686
|
if (recovery.action === "service") {
|
|
656
687
|
// The service manager starts the proxy outside this process tree, so it
|
|
657
688
|
// cannot join this lease, and holding it through the repair's health wait
|
|
658
689
|
// keeps that proxy from starting (#5760). Release it, then decide again —
|
|
659
690
|
// a claim could have landed while the repair ran unleased.
|
|
660
691
|
mutation.release();
|
|
692
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
661
693
|
recovery = await planRecovery();
|
|
662
694
|
}
|
|
663
695
|
if (recovery.reason === "desktop-supervised") {
|
|
@@ -666,19 +698,27 @@ export async function runUpdate(): Promise<void> {
|
|
|
666
698
|
console.warn(`⚠️ ${reason}; runtime recovery requires manual review (${recovery.reason}).`);
|
|
667
699
|
} else if (recovery.action === "service") {
|
|
668
700
|
const { serviceReinstallArgs, isServiceViable } = await import("../service");
|
|
701
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
702
|
+
if (!homePolicy.serviceAllowed) { await startProxyDirectly(); return; }
|
|
669
703
|
recovery = await planRecovery();
|
|
670
704
|
if (recovery.action !== "service") {
|
|
671
705
|
console.warn("Runtime authority changed before service recovery; no CLI runtime was restored.");
|
|
672
706
|
return;
|
|
673
707
|
}
|
|
674
|
-
|
|
708
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
709
|
+
if (!homePolicy.serviceAllowed) { await startProxyDirectly(); return; }
|
|
710
|
+
if (!homePolicy.authorizeMutation("service")) { if (homePolicy.authorizeMutation("runtime")) await startProxyDirectly(); return; }
|
|
711
|
+
const service = guardedSpawnSync(homePolicy.authorizeMutation, "service", process.execPath, [postUpdateLauncher, ...serviceReinstallArgs()], {
|
|
675
712
|
stdio: updateChildStdio(), windowsHide: true,
|
|
676
713
|
env: mutation.controlEnvironment({ ...process.env, OCX_BAKE_PORT: String(capturedListen.port) }),
|
|
677
714
|
});
|
|
715
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
716
|
+
if (!homePolicy.serviceAllowed) { await startProxyDirectly(); return; }
|
|
678
717
|
if (service.status !== 0 || !isServiceViable()) {
|
|
679
718
|
// Ownership may have moved while the refresh ran unleased; only a recovery plan that
|
|
680
719
|
// still names the service may restart the manager's job.
|
|
681
720
|
if ((await planRecovery()).action === "service") {
|
|
721
|
+
if (!homePolicy.authorizeMutation("runtime")) return;
|
|
682
722
|
const managed = await restartThroughServiceManager();
|
|
683
723
|
if (managed !== "failed") return;
|
|
684
724
|
}
|
|
@@ -716,7 +756,12 @@ export async function runUpdate(): Promise<void> {
|
|
|
716
756
|
// silently skips the recovery the receipt was written to trigger (#3008).
|
|
717
757
|
// Full `ocx stop` semantics (drain, service stop, restore).
|
|
718
758
|
|
|
719
|
-
if (
|
|
759
|
+
if (homePolicy.packageOnly && pendingTeardownOutstanding()) {
|
|
760
|
+
console.error("Pending teardown requires manual recovery before package replacement; run 'ocx stop' from the owning installation.");
|
|
761
|
+
return 1;
|
|
762
|
+
}
|
|
763
|
+
if (!homePolicy.packageOnly && runtimePlan.mayStopRuntime && (serviceWasInstalled || readPid() || readRuntimePort() || pendingTeardownOutstanding())) {
|
|
764
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
720
765
|
const preStopPlan = planUpdateRuntimeHandling({
|
|
721
766
|
...(await resolvedRuntimeOwnership()),
|
|
722
767
|
serviceInstalled: serviceWasInstalled,
|
|
@@ -729,7 +774,13 @@ export async function runUpdate(): Promise<void> {
|
|
|
729
774
|
stopAttempted = true;
|
|
730
775
|
console.log("⏹ Stopping the running proxy before updating...");
|
|
731
776
|
const stopStdio = updateChildStdio();
|
|
732
|
-
|
|
777
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
778
|
+
if (serviceWasInstalled && !homePolicy.serviceAllowed) {
|
|
779
|
+
console.warn("Service authority changed before proxy stop; check 'ocx service status' before retrying the update.");
|
|
780
|
+
return 1;
|
|
781
|
+
}
|
|
782
|
+
if (!homePolicy.authorizeMutation(serviceWasInstalled ? "service" : "runtime")) return 1;
|
|
783
|
+
const stop = guardedSpawnSync(homePolicy.authorizeMutation, serviceWasInstalled ? "service" : "runtime", process.execPath, selfLaunchArgv(["stop"]), {
|
|
733
784
|
env: mutation.controlEnvironment(),
|
|
734
785
|
stdio: stopStdio,
|
|
735
786
|
encoding: stopStdio === "pipe" ? "utf8" : undefined,
|
|
@@ -754,8 +805,8 @@ export async function runUpdate(): Promise<void> {
|
|
|
754
805
|
if (!decision.proceed) {
|
|
755
806
|
if (trayWasRunning) {
|
|
756
807
|
try {
|
|
757
|
-
const {
|
|
758
|
-
|
|
808
|
+
const { guardedStartWindowsTray } = await import("./guarded-tray-ops");
|
|
809
|
+
if (homePolicy.authorizeMutation("own-tray")) guardedStartWindowsTray(homePolicy.authorizeMutation);
|
|
759
810
|
} catch { /* preserve the proxy stop failure */ }
|
|
760
811
|
}
|
|
761
812
|
if (decision.reason === "teardown-outstanding") {
|
|
@@ -805,7 +856,7 @@ export async function runUpdate(): Promise<void> {
|
|
|
805
856
|
supervision: observeSupervision(),
|
|
806
857
|
});
|
|
807
858
|
const replacementLiveness = currentPackageRuntimeLiveness();
|
|
808
|
-
if (replacementOwnership.subjectToken !== initialOwnership.subjectToken
|
|
859
|
+
if (!homePolicy.authorizeMutation("package") || replacementOwnership.subjectToken !== initialOwnership.subjectToken
|
|
809
860
|
|| !replacementPlan.mayReplacePackage
|
|
810
861
|
|| replacementLiveness !== "dead") {
|
|
811
862
|
replacementRefusal = replacementPlan.notice
|
|
@@ -819,6 +870,7 @@ export async function runUpdate(): Promise<void> {
|
|
|
819
870
|
if (installer === "pnpm") {
|
|
820
871
|
let update: ReturnType<typeof runPnpmGlobalUpdate>;
|
|
821
872
|
try {
|
|
873
|
+
if (!homePolicy.authorizeMutation("package")) return 1;
|
|
822
874
|
update = runPnpmGlobalUpdate({
|
|
823
875
|
packageName: PKG,
|
|
824
876
|
currentVersion: current,
|
|
@@ -826,12 +878,13 @@ export async function runUpdate(): Promise<void> {
|
|
|
826
878
|
tag,
|
|
827
879
|
owner: owner!,
|
|
828
880
|
runningPackagePath: packageRoot(),
|
|
829
|
-
runPnpm: (args, capture = false) => runOwnedPnpm(
|
|
881
|
+
runPnpm: (args, capture = false) => homePolicy.authorizeMutation("package") ? runOwnedPnpm(
|
|
830
882
|
owner!,
|
|
831
883
|
args,
|
|
832
884
|
capture,
|
|
833
885
|
capture ? "pipe" : installStdio,
|
|
834
|
-
|
|
886
|
+
probeSpawnSync, homePolicy.authorizeMutation,
|
|
887
|
+
) : { status: 1, stdout: "", stderr: "" },
|
|
835
888
|
log: line => console.log(line),
|
|
836
889
|
});
|
|
837
890
|
} catch {
|
|
@@ -855,7 +908,8 @@ export async function runUpdate(): Promise<void> {
|
|
|
855
908
|
r = { status: 1, signal: null, stdout: "", stderr: "" };
|
|
856
909
|
}
|
|
857
910
|
} else {
|
|
858
|
-
|
|
911
|
+
if (!homePolicy.authorizeMutation("package")) return 1;
|
|
912
|
+
r = guardedSpawnSync(homePolicy.authorizeMutation, "package", target.bin, target.args, {
|
|
859
913
|
stdio: installStdio,
|
|
860
914
|
encoding: installStdio === "pipe" ? "utf8" : undefined,
|
|
861
915
|
timeout: 180000,
|
|
@@ -870,8 +924,8 @@ export async function runUpdate(): Promise<void> {
|
|
|
870
924
|
await recoverStoppedRuntime("package replacement was refused");
|
|
871
925
|
if (trayWasRunning) {
|
|
872
926
|
try {
|
|
873
|
-
const {
|
|
874
|
-
|
|
927
|
+
const { guardedStartWindowsTray } = await import("./guarded-tray-ops");
|
|
928
|
+
if (homePolicy.authorizeMutation("own-tray")) guardedStartWindowsTray(homePolicy.authorizeMutation);
|
|
875
929
|
} catch { /* preserve the ownership refusal */ }
|
|
876
930
|
}
|
|
877
931
|
console.error(replacementRefusal);
|
|
@@ -884,15 +938,54 @@ export async function runUpdate(): Promise<void> {
|
|
|
884
938
|
supervision: observeSupervision(),
|
|
885
939
|
});
|
|
886
940
|
if (r.status === 0) {
|
|
887
|
-
|
|
941
|
+
if (homePolicy.packageOnly) {
|
|
942
|
+
if (!homePolicy.authorizeMutation("package-publish")) return 1;
|
|
943
|
+
guardedRun(homePolicy.authorizeMutation, "package-publish", console.log, [`\n✅ Updated${latest ? ` to v${latest}` : ""}.`]);
|
|
944
|
+
homePolicy.check(homePolicy.initial);
|
|
945
|
+
console.log(`Restart the proxy: ${launcherStartHint(postUpdateLauncher, capturedListen.port)}`);
|
|
946
|
+
if (!homePolicy.authorizeMutation("package-publish")) return 1;
|
|
947
|
+
return process.argv.includes("--update-worker-result") ? UPDATE_PACKAGE_ONLY_EXIT_CODE : undefined;
|
|
948
|
+
}
|
|
949
|
+
// Authority gates every post-replacement control action (shim, tray, service), like
|
|
950
|
+
// the Node launcher; refusal may only restore the own tray stopped before replacement.
|
|
951
|
+
const restoreOwnStoppedTray = () => {
|
|
952
|
+
if (trayWasRunning && postUpdateLauncherUsable && existsSync(postUpdateLauncher)) {
|
|
953
|
+
try {
|
|
954
|
+
if (!homePolicy.authorizeMutation("own-tray")) return;
|
|
955
|
+
guardedSpawnSync(homePolicy.authorizeMutation, "own-tray", process.execPath, [postUpdateLauncher, "tray", "start"], {
|
|
956
|
+
stdio: "ignore", windowsHide: true, timeout: 15_000, env: mutation.unprivilegedEnvironment(),
|
|
957
|
+
});
|
|
958
|
+
} catch { /* preserve the authority refusal */ }
|
|
959
|
+
}
|
|
960
|
+
};
|
|
961
|
+
if (!homePolicy.authorizeMutation("publish")) {
|
|
962
|
+
restoreOwnStoppedTray();
|
|
963
|
+
return 1;
|
|
964
|
+
}
|
|
965
|
+
guardedRun(homePolicy.authorizeMutation, "publish", console.log, [`\n✅ Updated${latest ? ` to v${latest}` : ""}.`]);
|
|
888
966
|
if (!postInstallPlan.mayStopRuntime) console.warn("Runtime authority does not permit CLI recovery; no service was refreshed or proxy started.");
|
|
889
967
|
// Re-enter through the verified active package launcher. This keeps the Codex
|
|
890
968
|
// shim, tray, service and proxy recovery paths on the same package/group that
|
|
891
969
|
// pnpm selected, including when the update changed the global link target.
|
|
970
|
+
let isCodexShimInstalled: (() => boolean) | undefined;
|
|
892
971
|
try {
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
972
|
+
({ isCodexShimInstalled } = await import("../codex/shim"));
|
|
973
|
+
} catch {
|
|
974
|
+
console.warn("⚠️ Shim repair skipped; run 'ocx codex-shim install'.");
|
|
975
|
+
}
|
|
976
|
+
// The module load above is the last await before the control actions below; a home
|
|
977
|
+
// change landing while it was in flight must veto the shim rewrite and the tray
|
|
978
|
+
// refresh, not only the later service checks.
|
|
979
|
+
if (!homePolicy.authorizeMutation("runtime")) {
|
|
980
|
+
restoreOwnStoppedTray();
|
|
981
|
+
return 1;
|
|
982
|
+
}
|
|
983
|
+
// The filesystem probe is part of the guarded recovery: a throw after package
|
|
984
|
+
// replacement degrades to the warning below instead of escaping the update.
|
|
985
|
+
try {
|
|
986
|
+
if (isCodexShimInstalled?.()) {
|
|
987
|
+
if (!homePolicy.authorizeMutation("shim")) { restoreOwnStoppedTray(); return 1; }
|
|
988
|
+
const shim = guardedSpawnSync(homePolicy.authorizeMutation, "shim", process.execPath, [postUpdateLauncher, "codex-shim", "install"], {
|
|
896
989
|
stdio: "inherit",
|
|
897
990
|
windowsHide: true,
|
|
898
991
|
env: mutation.unprivilegedEnvironment(),
|
|
@@ -904,38 +997,63 @@ export async function runUpdate(): Promise<void> {
|
|
|
904
997
|
}
|
|
905
998
|
if (trayWasInstalled) {
|
|
906
999
|
const trayArgs = planWindowsTrayUpdate({ installed: trayWasInstalled, running: trayWasRunning }).installArgs;
|
|
907
|
-
|
|
1000
|
+
if (!homePolicy.authorizeMutation("tray")) { restoreOwnStoppedTray(); return 1; }
|
|
1001
|
+
const tray = guardedSpawnSync(homePolicy.authorizeMutation, "tray", process.execPath, [postUpdateLauncher, ...trayArgs], { stdio: "inherit", windowsHide: true, env: mutation.unprivilegedEnvironment() });
|
|
908
1002
|
if (tray.status === 0) {
|
|
909
1003
|
console.log("🔧 Refreshed Windows tray startup paths.");
|
|
910
1004
|
} else {
|
|
911
1005
|
console.warn("⚠️ Windows tray refresh failed. Run 'ocx tray install'.");
|
|
912
|
-
if (trayWasRunning)
|
|
1006
|
+
if (trayWasRunning && homePolicy.authorizeMutation("own-tray")) guardedSpawnSync(homePolicy.authorizeMutation, "own-tray", process.execPath, [postUpdateLauncher, "tray", "start"], { stdio: "ignore", windowsHide: true, env: mutation.unprivilegedEnvironment() });
|
|
913
1007
|
}
|
|
914
1008
|
}
|
|
1009
|
+
if (!homePolicy.authorizeMutation("publish")) { restoreOwnStoppedTray(); return 1; }
|
|
915
1010
|
// The stop above unloaded any managed service; repair it with the NEW files
|
|
916
1011
|
// (spawn the fresh cli.ts so updated code writes the baked paths) so a
|
|
917
1012
|
// launchd/schtasks/systemd user isn't left with the background proxy down.
|
|
1013
|
+
if (!homePolicy.serviceAllowed && postInstallPlan.mayStopRuntime) {
|
|
1014
|
+
if (stopAttempted) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1015
|
+
console.log(`Restart the proxy: ${launcherStartHint(postUpdateLauncher, capturedListen.port)}`);
|
|
1016
|
+
return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1017
|
+
}
|
|
918
1018
|
if (postInstallPlan.mayRestoreService) {
|
|
1019
|
+
let homeRefused = false;
|
|
919
1020
|
const mayRefresh = async () => {
|
|
1021
|
+
if (!homePolicy.authorizeMutation("runtime")) { homeRefused = true; return false; }
|
|
920
1022
|
const ownership = await resolvedRuntimeOwnership();
|
|
921
1023
|
const supervision = observeSupervision();
|
|
922
1024
|
const plan = planUpdateRuntimeHandling({ ...ownership, serviceInstalled: true, supervision });
|
|
1025
|
+
if (!homePolicy.authorizeMutation("runtime")) { homeRefused = true; return false; }
|
|
923
1026
|
if (!plan.mayRestoreService) console.warn(supervision
|
|
924
1027
|
? "OpenCodex Desktop supervises the proxy; CLI recovery was skipped. Use the app's updater (tray → Check for Updates)."
|
|
925
1028
|
: plan.notice);
|
|
926
|
-
return plan.mayRestoreService;
|
|
1029
|
+
return plan.mayRestoreService && homePolicy.serviceAllowed;
|
|
927
1030
|
};
|
|
928
|
-
if (!await mayRefresh())
|
|
1031
|
+
if (!await mayRefresh()) {
|
|
1032
|
+
if (homeRefused) return 1;
|
|
1033
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1034
|
+
return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1035
|
+
}
|
|
929
1036
|
console.log("🔁 Refreshing the background service with the updated files...");
|
|
930
1037
|
const { serviceReinstallArgs } = await import("../service");
|
|
931
|
-
const { reclaimListenPort } = await import("
|
|
1038
|
+
const { guardedReclaimListenPort: reclaimListenPort } = await import("./guarded-port-reclaim");
|
|
1039
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
1040
|
+
// Latched reclaim authority: once a mid-wait probe denies, the latch stays
|
|
1041
|
+
// closed — a transient re-match must not reopen kill/drop or the busy-port path.
|
|
1042
|
+
let reclaimDenied = false;
|
|
1043
|
+
const reclaimGate = () => {
|
|
1044
|
+
try { reclaimDenied ||= !homePolicy.authorizeMutation("runtime"); } catch { reclaimDenied = true; }
|
|
1045
|
+
return !reclaimDenied;
|
|
1046
|
+
};
|
|
932
1047
|
const freed = await reclaimListenPort(capturedListen.port, capturedListen.hostname, {
|
|
933
1048
|
timeoutMs: 30_000,
|
|
934
1049
|
intervalMs: 100,
|
|
935
1050
|
scanIntervalMs: 500,
|
|
936
1051
|
killOcxHolders: capturedListen.oldPid != null,
|
|
937
1052
|
onlyKillPids: capturedListen.oldPid != null ? [capturedListen.oldPid] : [],
|
|
1053
|
+
// The wait's internal awaits can span a home change; gate each kill/drop.
|
|
1054
|
+
mayMutateFn: reclaimGate,
|
|
938
1055
|
});
|
|
1056
|
+
if (!freed && !reclaimGate()) return 1; // a latched denial already refused
|
|
939
1057
|
if (!freed) {
|
|
940
1058
|
console.warn(`⚠️ Port ${capturedListen.port} still busy after 30s; repairing service with pinned --port ${capturedListen.port} anyway (refusing to hop).`);
|
|
941
1059
|
}
|
|
@@ -944,17 +1062,28 @@ export async function runUpdate(): Promise<void> {
|
|
|
944
1062
|
// wait, the lease makes that child die at the acquire deadline (#5760).
|
|
945
1063
|
// The kill-authorizing reclaim above already ran under the lease.
|
|
946
1064
|
mutation.release();
|
|
1065
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
1066
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
947
1067
|
const prevBake = process.env.OCX_BAKE_PORT;
|
|
948
1068
|
process.env.OCX_BAKE_PORT = String(capturedListen.port);
|
|
949
1069
|
try {
|
|
950
|
-
if (!await mayRefresh())
|
|
1070
|
+
if (!await mayRefresh()) {
|
|
1071
|
+
if (homeRefused) return 1;
|
|
1072
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1073
|
+
return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1074
|
+
}
|
|
951
1075
|
const svcStdio = updateChildStdio();
|
|
952
|
-
|
|
1076
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
1077
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1078
|
+
if (!homePolicy.authorizeMutation("service")) return homePolicy.authorizeMutation("runtime") && [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1079
|
+
const svc = guardedSpawnSync(homePolicy.authorizeMutation, "service", process.execPath, [postUpdateLauncher, ...serviceReinstallArgs()], {
|
|
953
1080
|
env: mutation.controlEnvironment(),
|
|
954
1081
|
stdio: svcStdio,
|
|
955
1082
|
encoding: svcStdio === "pipe" ? "utf8" : undefined,
|
|
956
1083
|
windowsHide: true,
|
|
957
1084
|
});
|
|
1085
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
1086
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
958
1087
|
if (svcStdio === "pipe") logSpawnOutput("", svc);
|
|
959
1088
|
const serviceRefreshed = svc.status === 0;
|
|
960
1089
|
let serviceViable = serviceRefreshed;
|
|
@@ -969,10 +1098,16 @@ export async function runUpdate(): Promise<void> {
|
|
|
969
1098
|
if (!serviceRefreshed || !serviceViable) {
|
|
970
1099
|
// #7043: the manager first. Only a proxy it owns counts as recovered; everything
|
|
971
1100
|
// below this line leaves an unsupervised runtime and exits non-zero.
|
|
972
|
-
if (!await mayRefresh())
|
|
1101
|
+
if (!await mayRefresh()) {
|
|
1102
|
+
if (homeRefused) return 1;
|
|
1103
|
+
if (!homePolicy.serviceAllowed) return [true, "vetoed"].includes(await startProxyDirectly()) && homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1104
|
+
return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1105
|
+
}
|
|
1106
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
973
1107
|
const managed = await restartThroughServiceManager();
|
|
974
|
-
if (managed === "supervised") return;
|
|
1108
|
+
if (managed === "supervised" || managed === "vetoed") return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
975
1109
|
if (managed === "unsettled") return 1;
|
|
1110
|
+
if (managed === "refused") return 1;
|
|
976
1111
|
// Repair normally avoids elevation for a healthy scheduler task, but a stale
|
|
977
1112
|
// definition may require guarded create/elevation. It can also fail — or exit 0
|
|
978
1113
|
// while leaving stale/missing assets that never start
|
|
@@ -1010,11 +1145,12 @@ export async function runUpdate(): Promise<void> {
|
|
|
1010
1145
|
serviceInstalled: true,
|
|
1011
1146
|
supervision,
|
|
1012
1147
|
});
|
|
1148
|
+
if (!homePolicy.authorizeMutation("runtime")) return 1;
|
|
1013
1149
|
if (!nowOwned.mayStopRuntime) {
|
|
1014
1150
|
console.warn(supervision
|
|
1015
1151
|
? "OpenCodex Desktop supervises the proxy; CLI recovery was skipped. Use the app's updater (tray → Check for Updates)."
|
|
1016
1152
|
: nowOwned.notice ?? "⚠️ The background runtime is owned elsewhere; not starting a second proxy.");
|
|
1017
|
-
return;
|
|
1153
|
+
return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1018
1154
|
}
|
|
1019
1155
|
console.warn(
|
|
1020
1156
|
serviceRefreshed
|
|
@@ -1028,7 +1164,7 @@ export async function runUpdate(): Promise<void> {
|
|
|
1028
1164
|
? " Run 'ocx service repair' to refresh the background service."
|
|
1029
1165
|
: " Run 'ocx service repair' to refresh the background service and see why it failed.");
|
|
1030
1166
|
// An ownership veto is the correct outcome, not a degraded one.
|
|
1031
|
-
if (await startUnsupervisedFallback() === "vetoed") return;
|
|
1167
|
+
if (await startUnsupervisedFallback() === "vetoed") return homePolicy.authorizeMutation("publish") ? undefined : 1;
|
|
1032
1168
|
return 1;
|
|
1033
1169
|
}
|
|
1034
1170
|
}
|
|
@@ -1039,9 +1175,11 @@ export async function runUpdate(): Promise<void> {
|
|
|
1039
1175
|
} else if (postInstallPlan.mayStopRuntime) {
|
|
1040
1176
|
console.log(`Restart the proxy: ${launcherStartHint(postUpdateLauncher, capturedListen.port)}`);
|
|
1041
1177
|
}
|
|
1178
|
+
if (!homePolicy.authorizeMutation("publish")) return 1;
|
|
1042
1179
|
} else {
|
|
1043
1180
|
if (stopAttempted && trayWasRunning && postUpdateLauncherUsable) {
|
|
1044
|
-
|
|
1181
|
+
if (homePolicy.authorizeMutation("own-tray"))
|
|
1182
|
+
guardedSpawnSync(homePolicy.authorizeMutation, "own-tray", process.execPath, [postUpdateLauncher, "tray", "start"], { stdio: "ignore", windowsHide: true, env: mutation.unprivilegedEnvironment() });
|
|
1045
1183
|
}
|
|
1046
1184
|
await recoverStoppedRuntime("package update failed");
|
|
1047
1185
|
console.error(`\n⚠️ Update failed (${bin} exit ${r.status ?? "?"}). ${manualUpdateFailureGuidance({ bin, args: cmdArgs, owner }).join("\n")}`);
|
|
@@ -1050,7 +1188,7 @@ export async function runUpdate(): Promise<void> {
|
|
|
1050
1188
|
} catch (error) {
|
|
1051
1189
|
await recoverStoppedRuntime("update failed unexpectedly");
|
|
1052
1190
|
if (trayWasRunning) {
|
|
1053
|
-
try { const {
|
|
1191
|
+
try { const { guardedStartWindowsTray } = await import("./guarded-tray-ops"); if (homePolicy.authorizeMutation("own-tray")) guardedStartWindowsTray(homePolicy.authorizeMutation); } catch { /* retain original failure */ }
|
|
1054
1192
|
}
|
|
1055
1193
|
throw error;
|
|
1056
1194
|
}
|