@bitkyc08/opencodex 2.93.0 → 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-BXu4zE8H.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-CizjBqyk.js +0 -58
- 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/src/update/job.ts
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { guardedRun, guardedSpawnSync, materializeMutationData } from "./mutation-guard.mjs";
|
|
2
|
+
import type { ChildProcess } from "node:child_process";
|
|
3
|
+
import { probeSpawn, probeSpawnSync } from "./mutation-guard.mjs";
|
|
4
|
+
import { existsSync, mkdirSync, readFileSync } from "node:fs";
|
|
3
5
|
import { dirname, join, sep } from "node:path";
|
|
4
6
|
import { fileURLToPath } from "node:url";
|
|
5
7
|
import { atomicWriteFile, getConfigDir, loadConfig } from "../config";
|
|
6
|
-
import { readPid, readRuntimePort,
|
|
7
|
-
import { isProcessAlive
|
|
8
|
+
import { readPid, readRuntimePort, verifyPidIdentity } from "../config/process-state";
|
|
9
|
+
import { isProcessAlive } from "../lib/process-control";
|
|
8
10
|
import { selfLaunchArgv } from "../lib/self-launch-argv";
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
buildWindowsElevatedArgumentList,
|
|
11
|
+
import { buildWindowsElevatedArgumentList,
|
|
12
12
|
resolveTrustedWindowsPowerShellExe,
|
|
13
13
|
} from "../lib/windows-elevation";
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
14
|
+
import { listListenPids, scanListenPids, type ListenPidScan } from "../server/port-reclaim";
|
|
15
|
+
import { guardedReclaimListenPort as reclaimListenPort } from "./guarded-port-reclaim";
|
|
16
|
+
import { guardedKillProxy, guardedRemovePid, guardedRemoveRuntimePort, guardedDropWindowsTcp, guardedPublishJob, type KillProxy } from "./guarded-runtime-ops";
|
|
17
17
|
import {
|
|
18
18
|
isHealthzVersion,
|
|
19
19
|
isOpencodexHealthz,
|
|
@@ -21,7 +21,9 @@ import {
|
|
|
21
21
|
proxyIdentityAt,
|
|
22
22
|
type HealthzIdentity,
|
|
23
23
|
} from "../server/proxy-liveness";
|
|
24
|
-
import { isServiceInstalled, isServiceViable
|
|
24
|
+
import { isServiceInstalled, isServiceViable } from "../service";
|
|
25
|
+
import { stopWindowsServiceWrappersBestEffort } from "./job-windows-restart";
|
|
26
|
+
import { createUpdateServiceHomePolicy, inspectUpdateServiceHome, type UpdateServiceHomeInspector } from "./service-home-authority";
|
|
25
27
|
import { runUpdateRestartWithOwnershipLease, type ServiceOwnershipResolution } from "./restart-ownership";
|
|
26
28
|
import { restartServiceManagerAfterUpdate, unsettledManagerRestartFailure, unsupervisedRestartFailure, type ManagerRestartFn } from "./job-supervised-restart";
|
|
27
29
|
import {
|
|
@@ -44,7 +46,7 @@ export type { UpdateCheckDeps } from "./check-types";
|
|
|
44
46
|
import type { PnpmGlobalOwner } from "./pnpm-global-install.mjs";
|
|
45
47
|
import { isNewer } from "./notify";
|
|
46
48
|
import { isRealBunBinary } from "../lib/bun-binary-validator.mjs";
|
|
47
|
-
import {
|
|
49
|
+
import { planWindowsTrayUpdate } from "./tray-update-plan.mjs";
|
|
48
50
|
import { GUI_UPDATE_FAILURE_NEXT_STEP } from "./update-failure-guidance.mjs";
|
|
49
51
|
import {
|
|
50
52
|
npmCachePreflightFailureMessage,
|
|
@@ -52,7 +54,10 @@ import {
|
|
|
52
54
|
type NpmCachePreflightReason,
|
|
53
55
|
} from "./npm-cache-preflight.mjs";
|
|
54
56
|
import { guiUpdateWorkerCommand } from "./worker-launch";
|
|
55
|
-
import {
|
|
57
|
+
import { prepareWorkerUpdateHome, packageOnlyUpdateSucceeded } from "./job-update-home";
|
|
58
|
+
import { defaultWorkerTrayHandoff } from "./job-update-tray";
|
|
59
|
+
import { spawnWorkerPinnedStart } from "./job-pinned-start";
|
|
60
|
+
import type { UpdateMutationAuthorizer } from "./mutation-guard.mjs";
|
|
56
61
|
import { spawnBindProbe, strictBindProbeScript } from "./bind-probe";
|
|
57
62
|
import { withoutUpdateTeardownHandover, withUpdateTeardownHandover } from "./teardown-handover";
|
|
58
63
|
import type { WorkerLaunchContext } from "./worker-launch";
|
|
@@ -169,11 +174,8 @@ async function strictRuntimePortAvailable(port: number, hostname = "127.0.0.1"):
|
|
|
169
174
|
return spawnBindProbe(process.execPath, script);
|
|
170
175
|
}
|
|
171
176
|
|
|
172
|
-
/**
|
|
173
|
-
*
|
|
174
|
-
* can bind. Dead PIDs still appear as holders while the ghost TCB lives;
|
|
175
|
-
* SetTcpEntry is a no-op without elevation (rc 317), so wait them out.
|
|
176
|
-
*/
|
|
177
|
+
/** Wait for no LISTEN owners plus a bindable port. Dead PIDs retain ghost TCBs;
|
|
178
|
+
* SetTcpEntry needs elevation (rc 317 otherwise), so wait them out. */
|
|
177
179
|
async function waitForGhostListenClear(
|
|
178
180
|
port: number,
|
|
179
181
|
hostname: string,
|
|
@@ -181,6 +183,7 @@ async function waitForGhostListenClear(
|
|
|
181
183
|
timeoutMs: number,
|
|
182
184
|
sleep: (ms: number) => Promise<void>,
|
|
183
185
|
aliveFn: (pid: number) => boolean = isProcessAlive,
|
|
186
|
+
authorizeMutation: (kind: "runtime") => boolean = () => true,
|
|
184
187
|
): Promise<{ ok: boolean; accessDenied: boolean }> {
|
|
185
188
|
const deadline = Date.now() + timeoutMs;
|
|
186
189
|
let accessDenied = false;
|
|
@@ -189,8 +192,9 @@ async function waitForGhostListenClear(
|
|
|
189
192
|
const liveHolders = holders.filter(pid => aliveFn(pid));
|
|
190
193
|
// Never SetTcpEntry while a live process still owns the port (foreign or ocx).
|
|
191
194
|
if (process.platform === "win32" && liveHolders.length === 0) {
|
|
195
|
+
if (!authorizeMutation("runtime")) return { ok: false, accessDenied };
|
|
192
196
|
try {
|
|
193
|
-
const drop =
|
|
197
|
+
const drop = guardedDropWindowsTcp(authorizeMutation, port);
|
|
194
198
|
if (drop.accessDenied > 0) accessDenied = true;
|
|
195
199
|
} catch { /* best-effort */ }
|
|
196
200
|
}
|
|
@@ -201,7 +205,6 @@ async function waitForGhostListenClear(
|
|
|
201
205
|
}
|
|
202
206
|
return { ok: false, accessDenied };
|
|
203
207
|
}
|
|
204
|
-
|
|
205
208
|
function packageLauncherPath(): string {
|
|
206
209
|
// The launcher is <pkg-root>/bin/ocx.mjs. After `npm install -g`, import.meta.url
|
|
207
210
|
// can still point at npm's renamed temp tree — prefer the live package path then.
|
|
@@ -363,9 +366,13 @@ function sanitizePersistedUpdateJob(job: UpdateJobState): UpdateJobState {
|
|
|
363
366
|
) as UpdateJobState;
|
|
364
367
|
}
|
|
365
368
|
|
|
366
|
-
function writeJob(job: UpdateJobState
|
|
369
|
+
function writeJob(job: UpdateJobState, authorizeMutation: UpdateMutationAuthorizer = () => false,
|
|
370
|
+
kind: "publish" | "package-publish" = "publish"): void {
|
|
367
371
|
ensureJobDir();
|
|
368
|
-
|
|
372
|
+
const data = materializeMutationData(job);
|
|
373
|
+
const target = updateJobPath(), text = `${JSON.stringify(sanitizePersistedUpdateJob(data), null, 2)}\n`;
|
|
374
|
+
if (data.status === "succeeded") guardedPublishJob(authorizeMutation, kind, target, text);
|
|
375
|
+
else atomicWriteFile(target, text);
|
|
369
376
|
}
|
|
370
377
|
|
|
371
378
|
export function readUpdateJob(jobId?: string | null): UpdateJobState | null {
|
|
@@ -387,6 +394,9 @@ export function readUpdateJob(jobId?: string | null): UpdateJobState | null {
|
|
|
387
394
|
* `withheldSummary()`, which produces a branded description WITHOUT the text itself.
|
|
388
395
|
*/
|
|
389
396
|
function updateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?: string): UpdateJobState {
|
|
397
|
+
const next = prepareUpdateJob(job, patch, logLine); writeJob(next); return next;
|
|
398
|
+
}
|
|
399
|
+
function prepareUpdateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?: string): UpdateJobState {
|
|
390
400
|
const current = readUpdateJob(job.id) ?? job;
|
|
391
401
|
const next = {
|
|
392
402
|
...current,
|
|
@@ -394,7 +404,6 @@ function updateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?
|
|
|
394
404
|
updatedAt: new Date().toISOString(),
|
|
395
405
|
log: logLine ? [...current.log, logLine] : current.log,
|
|
396
406
|
};
|
|
397
|
-
writeJob(next);
|
|
398
407
|
return next;
|
|
399
408
|
}
|
|
400
409
|
|
|
@@ -542,7 +551,7 @@ export function spawnGuiUpdateWorker(
|
|
|
542
551
|
]);
|
|
543
552
|
if (process.platform !== "win32") {
|
|
544
553
|
const launch = guiUpdateWorkerCommand(process.execPath, args, context);
|
|
545
|
-
return
|
|
554
|
+
return probeSpawn(launch.command, launch.argv, {
|
|
546
555
|
detached: true,
|
|
547
556
|
stdio: "ignore",
|
|
548
557
|
windowsHide: true,
|
|
@@ -560,7 +569,7 @@ export function spawnGuiUpdateWorker(
|
|
|
560
569
|
`if (-not $p) { exit 1 }`,
|
|
561
570
|
`Write-Output $p.Id`,
|
|
562
571
|
].join("; ");
|
|
563
|
-
const launched =
|
|
572
|
+
const launched = probeSpawnSync(
|
|
564
573
|
resolveTrustedWindowsPowerShellExe(),
|
|
565
574
|
["-NoProfile", "-NoLogo", "-NonInteractive", "-Command", ps],
|
|
566
575
|
{ encoding: "utf8", windowsHide: true, timeout: 15_000 },
|
|
@@ -675,9 +684,12 @@ function runLoggedCommand(
|
|
|
675
684
|
args: string[],
|
|
676
685
|
timeout: number,
|
|
677
686
|
env?: NodeJS.ProcessEnv,
|
|
687
|
+
authorizeMutation: UpdateMutationAuthorizer = () => false,
|
|
688
|
+
kind: Parameters<UpdateMutationAuthorizer>[0] = "runtime",
|
|
678
689
|
): { status: number | null; signal: NodeJS.Signals | null; timedOut: boolean } {
|
|
679
690
|
job = updateJob(job, {}, `$ ${formatCommand(bin, args)}`);
|
|
680
|
-
|
|
691
|
+
if (!authorizeMutation(kind)) return { status: 1, signal: null, timedOut: false };
|
|
692
|
+
const result = guardedSpawnSync(authorizeMutation, kind, bin, args, {
|
|
681
693
|
encoding: "utf8",
|
|
682
694
|
timeout,
|
|
683
695
|
windowsHide: true,
|
|
@@ -853,27 +865,26 @@ export function summarizeCommandOutput(
|
|
|
853
865
|
return parts.join(" · ");
|
|
854
866
|
}
|
|
855
867
|
|
|
856
|
-
/**
|
|
857
|
-
* Tear down anything that would make `ocx start` exit 1 with "already running"
|
|
858
|
-
* (service wrapper respawn, stale pidfile + live /healthz) before a pinned spawn.
|
|
859
|
-
*/
|
|
868
|
+
/** Clear wrappers, stale state and verified ocx listeners before a pinned spawn. */
|
|
860
869
|
function preparePortForPinnedStart(
|
|
861
|
-
job: UpdateJobState,
|
|
862
|
-
port: number,
|
|
863
|
-
listPids: (port: number) => number[],
|
|
864
|
-
aliveFn: (pid: number) => boolean,
|
|
870
|
+
job: UpdateJobState, port: number,
|
|
871
|
+
listPids: (port: number) => number[], aliveFn: (pid: number) => boolean,
|
|
865
872
|
verifyOcx: (pid: number) => number | null = verifyPidIdentity,
|
|
866
|
-
|
|
867
|
-
|
|
873
|
+
stopServiceWrappers: () => void = () => {},
|
|
874
|
+
authorizeMutation: (kind: "runtime") => boolean = () => true,
|
|
875
|
+
): false | void {
|
|
876
|
+
if (!authorizeMutation("runtime")) return false;
|
|
877
|
+
stopServiceWrappers();
|
|
868
878
|
const pid = readPid();
|
|
869
879
|
if (pid) {
|
|
870
880
|
updateJob(job, {}, `Clearing pre-start proxy PID ${pid} before pinned start.`);
|
|
871
|
-
|
|
872
|
-
|
|
873
|
-
} else {
|
|
874
|
-
removePid();
|
|
881
|
+
if (!authorizeMutation("runtime")) return false;
|
|
882
|
+
try { guardedKillProxy(authorizeMutation, "runtime", pid); } catch { /* best-effort */ }
|
|
875
883
|
}
|
|
876
|
-
|
|
884
|
+
if (!authorizeMutation("runtime")) return false;
|
|
885
|
+
guardedRemovePid(authorizeMutation, pid ?? undefined);
|
|
886
|
+
if (!authorizeMutation("runtime")) return false;
|
|
887
|
+
guardedRemoveRuntimePort(authorizeMutation);
|
|
877
888
|
for (const holder of listPids(port)) {
|
|
878
889
|
if (holder === process.pid || !aliveFn(holder)) continue;
|
|
879
890
|
if (verifyOcx(holder) !== holder) {
|
|
@@ -885,60 +896,22 @@ function preparePortForPinnedStart(
|
|
|
885
896
|
continue;
|
|
886
897
|
}
|
|
887
898
|
updateJob(job, {}, `Stopping live ocx listen holder PID ${holder} on port ${port} before pinned start.`);
|
|
888
|
-
|
|
899
|
+
if (!authorizeMutation("runtime")) return false;
|
|
900
|
+
try { guardedKillProxy(authorizeMutation, "runtime", holder); } catch { /* best-effort */ }
|
|
889
901
|
}
|
|
890
902
|
// Match reclaimListenPort: never SetTcpEntry while a live holder remains.
|
|
891
903
|
const liveRemain = listPids(port).filter(pid => pid !== process.pid && aliveFn(pid));
|
|
892
904
|
if (process.platform === "win32" && liveRemain.length === 0) {
|
|
893
|
-
|
|
905
|
+
if (!authorizeMutation("runtime")) return false;
|
|
906
|
+
try { guardedDropWindowsTcp(authorizeMutation, port); } catch { /* best-effort */ }
|
|
894
907
|
}
|
|
895
908
|
}
|
|
896
909
|
|
|
897
|
-
function spawnDetachedStart(
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
port
|
|
901
|
-
|
|
902
|
-
): ChildProcess {
|
|
903
|
-
const cmd = restartCommand(false, installer, launcher, port);
|
|
904
|
-
// An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
|
|
905
|
-
const env: NodeJS.ProcessEnv = withoutSiblingMarker(process.env);
|
|
906
|
-
delete env.OCX_SERVICE;
|
|
907
|
-
updateJob(job, {}, `$ ${cmd.display}`);
|
|
908
|
-
let stdio: "ignore" | [ "ignore", number, number ] = "ignore";
|
|
909
|
-
let logFd: number | undefined;
|
|
910
|
-
try {
|
|
911
|
-
const logPath = join(getConfigDir(), "update-pinned-start.log");
|
|
912
|
-
mkdirSync(getConfigDir(), { recursive: true });
|
|
913
|
-
logFd = openSync(logPath, "a");
|
|
914
|
-
writeSync(logFd, `\n--- ${new Date().toISOString()} ---\n$ ${cmd.display}\n`);
|
|
915
|
-
stdio = ["ignore", logFd, logFd];
|
|
916
|
-
} catch { /* fall back to ignored stdio */ }
|
|
917
|
-
const child = spawn(cmd.bin, cmd.args, {
|
|
918
|
-
detached: true,
|
|
919
|
-
stdio,
|
|
920
|
-
windowsHide: true,
|
|
921
|
-
env,
|
|
922
|
-
});
|
|
923
|
-
child.once("error", err => {
|
|
924
|
-
try {
|
|
925
|
-
updateJob(job, {}, `Pinned start spawn error: ${withheldSummary(err)}`);
|
|
926
|
-
} catch { /* best-effort */ }
|
|
927
|
-
});
|
|
928
|
-
// Foreground `ocx start` keeps the listen process; EADDRINUSE/ghost races exit quickly
|
|
929
|
-
// with stdio ignored — surface that so the job log explains a silent miss.
|
|
930
|
-
child.once("exit", (code, signal) => {
|
|
931
|
-
if (code === 0 && !signal) return;
|
|
932
|
-
try {
|
|
933
|
-
updateJob(
|
|
934
|
-
job,
|
|
935
|
-
{},
|
|
936
|
-
`Pinned start exited early (code=${code ?? "null"} signal=${signal ?? "null"}).`,
|
|
937
|
-
);
|
|
938
|
-
} catch { /* best-effort */ }
|
|
939
|
-
});
|
|
940
|
-
child.unref();
|
|
941
|
-
return child;
|
|
910
|
+
function spawnDetachedStart(job: UpdateJobState, installer: Installer, port: number | undefined,
|
|
911
|
+
launcher: string, authorizeMutation: UpdateMutationAuthorizer): ChildProcess {
|
|
912
|
+
if (!authorizeMutation("runtime")) throw new Error("Automatic update restart refused; check 'ocx service status'.");
|
|
913
|
+
return spawnWorkerPinnedStart(restartCommand(false, installer, launcher, port), authorizeMutation,
|
|
914
|
+
line => updateJob(job, {}, line), withheldSummary);
|
|
942
915
|
}
|
|
943
916
|
|
|
944
917
|
/** Identity snapshot used to prove a package-manager self-update replaced the pre-update process. */
|
|
@@ -957,8 +930,12 @@ export interface RestartIo {
|
|
|
957
930
|
spawnDetachedStartFn?: typeof spawnDetachedStart;
|
|
958
931
|
preparePortForPinnedStartFn?: typeof preparePortForPinnedStart;
|
|
959
932
|
waitForGhostListenClearFn?: typeof waitForGhostListenClear;
|
|
960
|
-
killProxyFn?:
|
|
933
|
+
killProxyFn?: KillProxy;
|
|
961
934
|
serviceInstalledFn?: () => boolean;
|
|
935
|
+
serviceHomeAuthorityFn?: UpdateServiceHomeInspector;
|
|
936
|
+
serviceHomeBaseline?: ReturnType<UpdateServiceHomeInspector>; // Worker delegation pins its original authority.
|
|
937
|
+
stopServiceWrappersFn?: (authorizeMutation: UpdateMutationAuthorizer) => void;
|
|
938
|
+
readPidFn?: typeof readPid;
|
|
962
939
|
/**
|
|
963
940
|
* After a service reinstall exits 0, only trust the service path when this is true.
|
|
964
941
|
* Defaults to {@link isServiceViable} — installed-but-stale assets must fall through
|
|
@@ -1067,7 +1044,10 @@ async function restartAfterUpdate(
|
|
|
1067
1044
|
captured?: { port: number; hostname: string; oldPid?: number },
|
|
1068
1045
|
io: RestartIo = {},
|
|
1069
1046
|
): Promise<false | void | "unsupervised"> {
|
|
1070
|
-
const
|
|
1047
|
+
const homePolicy = createUpdateServiceHomePolicy(io.serviceHomeAuthorityFn ?? inspectUpdateServiceHome,
|
|
1048
|
+
refusal => { updateJob(job, { status: "failed", restarted: false, error: refusal }, refusal); }, false, io.serviceHomeBaseline);
|
|
1049
|
+
if (!homePolicy.check(io.serviceHomeBaseline ? undefined : homePolicy.initial)) return false;
|
|
1050
|
+
const serviceInstalled = homePolicy.initial.kind === "same" && (io.serviceInstalledFn ?? isServiceInstalled)();
|
|
1071
1051
|
const config = loadConfig();
|
|
1072
1052
|
// Stop-first update already cleared pid/runtime state, so the pre-update capture is
|
|
1073
1053
|
// the authoritative port to wait on; config is only the cold-start fallback.
|
|
@@ -1089,9 +1069,8 @@ async function restartAfterUpdate(
|
|
|
1089
1069
|
const listPids = io.listListenPidsFn ?? listListenPids;
|
|
1090
1070
|
const verifyOcx = io.verifyOcxFn ?? verifyPidIdentity;
|
|
1091
1071
|
const aliveFn = io.isAliveFn ?? isProcessAlive;
|
|
1092
|
-
// Pre-update PID plus
|
|
1093
|
-
//
|
|
1094
|
-
// treating it as protected blocks reclaim so the direct start never binds.
|
|
1072
|
+
// Pre-update PID plus live ocx listeners on the captured port: a self-update can
|
|
1073
|
+
// leave a respawned child whose protected status would block reclaim and the start.
|
|
1095
1074
|
const reclaimKillAllowlist = (): number[] => {
|
|
1096
1075
|
const allow = new Set<number>();
|
|
1097
1076
|
if (oldPid != null) allow.add(oldPid);
|
|
@@ -1101,6 +1080,12 @@ async function restartAfterUpdate(
|
|
|
1101
1080
|
}
|
|
1102
1081
|
return [...allow];
|
|
1103
1082
|
};
|
|
1083
|
+
// A reclaim denial stays latched across preparation and this job's waits.
|
|
1084
|
+
let reclaimDenied = false;
|
|
1085
|
+
const reclaimGate = () => {
|
|
1086
|
+
try { reclaimDenied ||= !homePolicy.authorizeMutation("runtime"); } catch { reclaimDenied = true; }
|
|
1087
|
+
return !reclaimDenied;
|
|
1088
|
+
};
|
|
1104
1089
|
const reclaimOptsFor = (onlyKillPids: number[]) => ({
|
|
1105
1090
|
timeoutMs: RESTART_PORT_RECLAIM_MS,
|
|
1106
1091
|
intervalMs: 100,
|
|
@@ -1110,20 +1095,19 @@ async function restartAfterUpdate(
|
|
|
1110
1095
|
// listener, not only the pre-wait snapshot; foreign claimants stay protected.
|
|
1111
1096
|
killAllOcxOnPort: true,
|
|
1112
1097
|
onlyKillPids,
|
|
1098
|
+
mayMutateFn: reclaimGate, // the wait's awaits can span a home change; gate each kill/drop
|
|
1113
1099
|
});
|
|
1114
|
-
|
|
1115
1100
|
if (serviceInstalled) {
|
|
1116
|
-
//
|
|
1117
|
-
//
|
|
1118
|
-
//
|
|
1119
|
-
|
|
1120
|
-
stopWindowsServiceWrappersBestEffort();
|
|
1101
|
+
if (!homePolicy.authorizeMutation("runtime")) return false; // a home change during the service-args import refuses before stop/reclaim
|
|
1102
|
+
// schtasks /end often leaves the hidden wrapper alive; its :loop respawns
|
|
1103
|
+
// `ocx start` and races reclaim, so end wrappers before the socket.
|
|
1104
|
+
if (homePolicy.authorizeMutation("service")) (io.stopServiceWrappersFn ?? stopWindowsServiceWrappersBestEffort)(homePolicy.authorizeMutation);
|
|
1121
1105
|
const preServiceAllow = reclaimKillAllowlist();
|
|
1122
1106
|
const freed = await waitFn(port, hostname, reclaimOptsFor(preServiceAllow));
|
|
1107
|
+
if (!freed && !reclaimGate()) return false; // a latched denial already refused the job
|
|
1123
1108
|
let skipServiceInstall = false;
|
|
1124
|
-
// `service repair` reuses the live task and refreshes
|
|
1125
|
-
//
|
|
1126
|
-
// applies; only a caller that still passes install argv keeps that behavior.
|
|
1109
|
+
// `service repair` reuses the live task and refreshes stale definitions via its
|
|
1110
|
+
// guarded path; only a caller still passing install argv keeps the old skip.
|
|
1127
1111
|
const refreshRegisters = (svcArgs ?? []).includes("install");
|
|
1128
1112
|
if ((io.platform ?? process.platform) === "win32" && process.env.OCX_SERVICE === "1" && refreshRegisters) {
|
|
1129
1113
|
updateJob(job, {}, "Skipping service re-registration from the non-elevated update worker; falling back to a direct proxy start.");
|
|
@@ -1153,10 +1137,10 @@ async function restartAfterUpdate(
|
|
|
1153
1137
|
}
|
|
1154
1138
|
}
|
|
1155
1139
|
if (!skipServiceInstall) {
|
|
1156
|
-
// `service repair` re-activates a manager whose `ocx start` child
|
|
1157
|
-
//
|
|
1158
|
-
// wait, the lease makes that child die at the acquire deadline (#5760).
|
|
1140
|
+
// `service repair` re-activates a manager whose `ocx start` child cannot join
|
|
1141
|
+
// this lease; holding it through the serving wait kills that child at the deadline (#5760).
|
|
1159
1142
|
io.releaseForServiceManagerFn?.();
|
|
1143
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1160
1144
|
const prevBake = process.env.OCX_BAKE_PORT;
|
|
1161
1145
|
process.env.OCX_BAKE_PORT = String(Math.trunc(port));
|
|
1162
1146
|
let serviceOk = false;
|
|
@@ -1164,10 +1148,10 @@ async function restartAfterUpdate(
|
|
|
1164
1148
|
const repairTimeoutMs = (io.platform ?? process.platform) === "win32"
|
|
1165
1149
|
? WINDOWS_SERVICE_REPAIR_TIMEOUT_MS
|
|
1166
1150
|
: RESTART_TIMEOUT_MS;
|
|
1167
|
-
const run = io.runService ?? ((j, bin, args, timeoutMs) => runLoggedCommand(j, bin, args, timeoutMs));
|
|
1168
|
-
const result = run(job, cmd.bin, cmd.args, repairTimeoutMs);
|
|
1169
|
-
serviceOk = result.status === 0;
|
|
1170
|
-
if (!serviceOk) {
|
|
1151
|
+
const run = io.runService ?? ((j, bin, args, timeoutMs) => runLoggedCommand(j, bin, args, timeoutMs, undefined, homePolicy.authorizeMutation, "service"));
|
|
1152
|
+
const result = homePolicy.authorizeMutation("service") ? run(job, cmd.bin, cmd.args, repairTimeoutMs) : { status: 0, timedOut: false };
|
|
1153
|
+
serviceOk = homePolicy.serviceAllowed && result.status === 0;
|
|
1154
|
+
if (!serviceOk && homePolicy.serviceAllowed) {
|
|
1171
1155
|
if (result.timedOut) {
|
|
1172
1156
|
// UAC and scheduler mutation can outlive a fixed child deadline. Once the
|
|
1173
1157
|
// worker kills that child, ownership is ambiguous: launching a foreground
|
|
@@ -1192,14 +1176,14 @@ async function restartAfterUpdate(
|
|
|
1192
1176
|
if (prevBake === undefined) delete process.env.OCX_BAKE_PORT;
|
|
1193
1177
|
else process.env.OCX_BAKE_PORT = prevBake;
|
|
1194
1178
|
}
|
|
1195
|
-
if (
|
|
1179
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1180
|
+
if (serviceOk && homePolicy.serviceAllowed) {
|
|
1196
1181
|
// Registration state cannot distinguish a serving supervisor from one that
|
|
1197
|
-
// registered and bound nothing — `launchctl list`
|
|
1198
|
-
//
|
|
1199
|
-
// satisfy one probe — so ask the port before skipping the fallback.
|
|
1182
|
+
// registered and bound nothing — `launchctl list`/`schtasks` report both, and
|
|
1183
|
+
// a flapping supervisor can satisfy one probe — so ask the port first.
|
|
1200
1184
|
const viable = (io.serviceViableFn ?? isServiceViable)();
|
|
1201
1185
|
if (viable) {
|
|
1202
|
-
if (await serviceRestartServed(job, port, hostname, io)) return;
|
|
1186
|
+
if (await serviceRestartServed(job, port, hostname, io)) return homePolicy.authorizeMutation("publish") ? undefined : false;
|
|
1203
1187
|
updateJob(
|
|
1204
1188
|
job,
|
|
1205
1189
|
{},
|
|
@@ -1219,33 +1203,37 @@ async function restartAfterUpdate(
|
|
|
1219
1203
|
}
|
|
1220
1204
|
|
|
1221
1205
|
// #7043: a managed install asks launchd/systemd first; only the manager's own job counts as recovered.
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
|
|
1206
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1207
|
+
const managed = !serviceInstalled || !homePolicy.authorizeMutation("service") ? "failed" : await (io.restartServiceManagerFn ?? restartServiceManagerAfterUpdate)(
|
|
1208
|
+
{ port, hostname, release: io.releaseForServiceManagerFn, authorizeMutation: homePolicy.authorizeMutation }, line => updateJob(job, {}, line));
|
|
1209
|
+
if (managed === "supervised") return homePolicy.authorizeMutation("publish") ? undefined : false;
|
|
1210
|
+
if (managed === "refused") { updateJob(job, { status: "failed", restarted: false, error: "Automatic service restart was refused; check 'ocx service status' before restarting manually." }); return false; }
|
|
1225
1211
|
if (managed === "unsettled") { updateJob(job, ...unsettledManagerRestartFailure(port)); return false; }
|
|
1226
1212
|
const fallback = serviceInstalled ? "unsupervised" as const : undefined; // every exit below is unproven ownership
|
|
1227
1213
|
// The service refresh ran outside the lease; take it back so the veto and the kills/start below stay serialized.
|
|
1228
1214
|
const restartVeto = io.reacquireForDirectStartFn?.();
|
|
1215
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1229
1216
|
if (restartVeto) {
|
|
1230
|
-
|
|
1217
|
+
if (!homePolicy.authorizeMutation("publish")) return false;
|
|
1218
|
+
writeJob(prepareUpdateJob(job, restartVeto.failed ? { status: "failed", restarted: false, error: restartVeto.notice } : { status: "succeeded", restarted: false }, restartVeto.notice), homePolicy.authorizeMutation, "publish");
|
|
1231
1219
|
return false;
|
|
1232
1220
|
}
|
|
1233
|
-
|
|
1234
|
-
const pid = readPid();
|
|
1221
|
+
const pid = (io.readPidFn ?? readPid)();
|
|
1235
1222
|
if (pid) {
|
|
1236
1223
|
updateJob(job, {}, `Stopping current proxy PID ${pid}.`);
|
|
1237
1224
|
try {
|
|
1238
|
-
|
|
1225
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1226
|
+
guardedKillProxy(homePolicy.authorizeMutation, "runtime", pid, io.killProxyFn);
|
|
1239
1227
|
} catch {
|
|
1240
1228
|
// A PID that resists taskkill must not abort recovery: reclaim + pinned start
|
|
1241
1229
|
// below are the path that repairs stuck Windows listeners.
|
|
1242
1230
|
}
|
|
1243
1231
|
}
|
|
1244
|
-
if (serviceInstalled) stopWindowsServiceWrappersBestEffort();
|
|
1245
|
-
// Reclaim before the pinned start:
|
|
1246
|
-
// is how updates used to fail health checks or hop ports.
|
|
1232
|
+
if (serviceInstalled && homePolicy.authorizeMutation("service")) (io.stopServiceWrappersFn ?? stopWindowsServiceWrappersBestEffort)(homePolicy.authorizeMutation);
|
|
1233
|
+
// Reclaim before the pinned start: a busy old socket used to hop ports or fail health.
|
|
1247
1234
|
const directAllow = reclaimKillAllowlist();
|
|
1248
1235
|
const freed = await waitFn(port, hostname, reclaimOptsFor(directAllow));
|
|
1236
|
+
if (!freed && !reclaimGate()) return false;
|
|
1249
1237
|
if (!freed) {
|
|
1250
1238
|
const liveHolders = listPids(port).filter(pid => pid !== process.pid && aliveFn(pid));
|
|
1251
1239
|
updateJob(
|
|
@@ -1258,8 +1246,7 @@ async function restartAfterUpdate(
|
|
|
1258
1246
|
updateJob(job, {}, `Live holder(s) remain on port ${port}; not starting on another port. Retry 'ocx start --port ${port}'.`);
|
|
1259
1247
|
return fallback;
|
|
1260
1248
|
}
|
|
1261
|
-
// Dead PIDs can still own LISTEN rows
|
|
1262
|
-
// normal update worker), so poll until netstat is empty and the start runtime can bind.
|
|
1249
|
+
// Dead PIDs can still own LISTEN rows (SetTcpEntry needs elevation); poll netstat until bindable.
|
|
1263
1250
|
updateJob(
|
|
1264
1251
|
job,
|
|
1265
1252
|
{},
|
|
@@ -1268,7 +1255,8 @@ async function restartAfterUpdate(
|
|
|
1268
1255
|
// Injected spawnStart is the unit-test seam — skip the long OS wait.
|
|
1269
1256
|
if (!io.spawnStart) {
|
|
1270
1257
|
const sleep = io.sleepMs ?? ((ms: number) => new Promise<void>(r => setTimeout(r, ms)));
|
|
1271
|
-
const cleared = await waitForGhostListenClear(port, hostname, listPids, 90_000, sleep);
|
|
1258
|
+
const cleared = await waitForGhostListenClear(port, hostname, listPids, 90_000, sleep, aliveFn, reclaimGate);
|
|
1259
|
+
if (!reclaimGate()) return false;
|
|
1272
1260
|
if (cleared.accessDenied) {
|
|
1273
1261
|
updateJob(job, {}, "SetTcpEntry is non-elevated (access denied); relying on OS ghost-LISTEN expiry.");
|
|
1274
1262
|
}
|
|
@@ -1287,6 +1275,7 @@ async function restartAfterUpdate(
|
|
|
1287
1275
|
// Injected spawnStart keeps unit tests deterministic (one call). Production path
|
|
1288
1276
|
// retries on missing /healthz after prepare + ghost-LISTEN clear.
|
|
1289
1277
|
if (io.spawnStart) {
|
|
1278
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1290
1279
|
io.spawnStart(job, job.installer, port, launcher);
|
|
1291
1280
|
return fallback;
|
|
1292
1281
|
}
|
|
@@ -1323,7 +1312,8 @@ async function restartAfterUpdate(
|
|
|
1323
1312
|
// A numeric PID can be reused once this particular child has exited.
|
|
1324
1313
|
if (!child?.pid || child.exitCode !== null || child.signalCode !== null) return;
|
|
1325
1314
|
if (aliveFn(child.pid)) {
|
|
1326
|
-
|
|
1315
|
+
if (!homePolicy.authorizeMutation("own-child")) return;
|
|
1316
|
+
try { guardedKillProxy(homePolicy.authorizeMutation, "own-child", child.pid, io.killProxyFn); } catch { /* best-effort */ }
|
|
1327
1317
|
}
|
|
1328
1318
|
};
|
|
1329
1319
|
for (let attempt = 1; attempt <= attempts; attempt++) {
|
|
@@ -1337,14 +1327,16 @@ async function restartAfterUpdate(
|
|
|
1337
1327
|
killSpawnAttempt(lastChild);
|
|
1338
1328
|
lastChild = null;
|
|
1339
1329
|
}
|
|
1340
|
-
|
|
1330
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1331
|
+
if (preparePort(job, port, listPids, aliveFn, verifyOcx, () => { if (serviceInstalled && homePolicy.authorizeMutation("service")) (io.stopServiceWrappersFn ?? stopWindowsServiceWrappersBestEffort)(homePolicy.authorizeMutation); }, reclaimGate) === false) return false;
|
|
1341
1332
|
const ready = await waitForGhost(
|
|
1342
1333
|
port,
|
|
1343
1334
|
hostname,
|
|
1344
1335
|
listPids,
|
|
1345
1336
|
attempt === 1 ? (freed ? 15_000 : 5_000) : 30_000,
|
|
1346
|
-
sleep,
|
|
1337
|
+
sleep, aliveFn, reclaimGate,
|
|
1347
1338
|
);
|
|
1339
|
+
if (!reclaimGate()) return false;
|
|
1348
1340
|
if (!ready.ok) {
|
|
1349
1341
|
updateJob(
|
|
1350
1342
|
job,
|
|
@@ -1354,7 +1346,8 @@ async function restartAfterUpdate(
|
|
|
1354
1346
|
);
|
|
1355
1347
|
continue;
|
|
1356
1348
|
}
|
|
1357
|
-
|
|
1349
|
+
if (!homePolicy.authorizeMutation("runtime")) return false;
|
|
1350
|
+
const child = spawnPinnedStart(job, job.installer, port, launcher, homePolicy.authorizeMutation);
|
|
1358
1351
|
lastChild = child;
|
|
1359
1352
|
const retireChild = () => {
|
|
1360
1353
|
if (lastChild === child) lastChild = null;
|
|
@@ -1395,35 +1388,6 @@ function formatPortHolders(
|
|
|
1395
1388
|
return `holders=[${holders.join(", ") || "none"}] allow=[${allow.join(", ") || "none"}]`;
|
|
1396
1389
|
}
|
|
1397
1390
|
|
|
1398
|
-
/** Stop the installed Windows backend and best-effort kill surviving :loop wrappers. */
|
|
1399
|
-
function stopWindowsServiceWrappersBestEffort(): void {
|
|
1400
|
-
if (process.platform !== "win32") return;
|
|
1401
|
-
try {
|
|
1402
|
-
if (readServiceBackend() === "native") {
|
|
1403
|
-
stopWinswService();
|
|
1404
|
-
return;
|
|
1405
|
-
}
|
|
1406
|
-
stopWindows();
|
|
1407
|
-
} catch { /* already stopped */ }
|
|
1408
|
-
killWindowsServiceWrapperProcesses();
|
|
1409
|
-
}
|
|
1410
|
-
|
|
1411
|
-
/**
|
|
1412
|
-
* Best-effort termination of surviving Windows scheduler launcher/wrapper processes.
|
|
1413
|
-
* `schtasks /end` ends the task instance but often leaves wscript/cmd running the
|
|
1414
|
-
* `:loop` batch, which brings the proxy back during post-update reclaim.
|
|
1415
|
-
*
|
|
1416
|
-
* This used to match the bare filenames with -like '*name*', which could stop a
|
|
1417
|
-
* wrapper belonging to a DIFFERENT OpenCodex home under the same account. The
|
|
1418
|
-
* shared killer scopes to this home's canonical paths as complete tokens.
|
|
1419
|
-
*/
|
|
1420
|
-
function killWindowsServiceWrapperProcesses(): void {
|
|
1421
|
-
killWindowsSchedulerWrappers({
|
|
1422
|
-
scriptPath: join(getConfigDir(), "opencodex-service.cmd"),
|
|
1423
|
-
launcherPath: join(getConfigDir(), "opencodex-service-launcher.vbs"),
|
|
1424
|
-
});
|
|
1425
|
-
}
|
|
1426
|
-
|
|
1427
1391
|
/** Exposed for tests: drives the non-service restart path with injected io. */
|
|
1428
1392
|
export function restartAfterUpdateForTests(
|
|
1429
1393
|
job: UpdateJobState,
|
|
@@ -1518,7 +1482,7 @@ async function confirmRestartedProxy(
|
|
|
1518
1482
|
): Promise<boolean> {
|
|
1519
1483
|
/* [Decision Log]
|
|
1520
1484
|
- 목적과 의도: GUI update job이 detached restart 요청만 보고 성공 처리하지 않도록, 실제 프록시 복귀 여부를 확인한다.
|
|
1521
|
-
- 기존 구현 및 제약 조건: update-job.json은
|
|
1485
|
+
- 기존 구현 및 제약 조건: update-job.json은 probeSpawn/service reinstall 직후 `succeeded`로 끝났고, Windows npm/Bun 교체 실패처럼 몇 초 후 죽는 재시작을 잡지 못했다.
|
|
1522
1486
|
- 검토한 주요 대안: (1) 포트 점유만 확인 — 외부 프로세스/죽기 직전 프로세스를 성공으로 오인할 수 있다. (2) 무기한 /healthz 폴링 — UX가 느려지고 worker 종료 시점이 불명확하다. (3) 짧은 healthy 등장 + 안정성 창 확인 — 실제 복귀를 확인하면서도 대기 시간을 제한할 수 있다.
|
|
1523
1487
|
- 선택한 방식: identity-aware /healthz probe가 일정 시간 안에 나타나고, 추가 안정성 창 동안 유지되는지 확인한다.
|
|
1524
1488
|
- 다른 대안 대신 이 방식을 선택한 이유: GUI는 "업데이트가 설치됐지만 재시작은 실패"를 분리해 알려줘야 하며, 이 방식이 가장 적은 오탐으로 그 경계를 만든다.
|
|
@@ -1781,8 +1745,14 @@ export interface GuiUpdateWorkerIo {
|
|
|
1781
1745
|
resolvePnpmActiveLauncherFn?: (owner: PnpmGlobalOwner) => string | null;
|
|
1782
1746
|
/** Restart seams used by focused worker tests; the verified launcher is always injected. */
|
|
1783
1747
|
restartIo?: RestartIo;
|
|
1784
|
-
|
|
1785
|
-
|
|
1748
|
+
resolveOwnershipFn?: () => ServiceOwnershipResolution; // Defaults to the shared service install state.
|
|
1749
|
+
serviceHomeAuthorityFn?: UpdateServiceHomeInspector;
|
|
1750
|
+
launcherSupportsUpdateHomeFn?: (launcher: string, node: string) => boolean;
|
|
1751
|
+
platform?: NodeJS.Platform; // Exercise the default Windows handoff without changing the host platform.
|
|
1752
|
+
/** Isolated tray handoff plan for focused worker tests (default: the win32 tray handoff). */
|
|
1753
|
+
trayHandoffFn?: (capturePlan?: Parameters<typeof defaultWorkerTrayHandoff>[0], authorizeMutation?: UpdateMutationAuthorizer) => ReturnType<typeof planWindowsTrayUpdate> | Promise<ReturnType<typeof planWindowsTrayUpdate>>;
|
|
1754
|
+
/** Isolated tray command runner for focused worker tests (default: runLoggedCommand). */
|
|
1755
|
+
trayCommandFn?: GuiUpdateWorkerIo["runCommandFn"];
|
|
1786
1756
|
runCommandFn?: (
|
|
1787
1757
|
job: UpdateJobState,
|
|
1788
1758
|
bin: string,
|
|
@@ -1791,7 +1761,6 @@ export interface GuiUpdateWorkerIo {
|
|
|
1791
1761
|
env?: NodeJS.ProcessEnv,
|
|
1792
1762
|
) => { status: number | null; signal: NodeJS.Signals | null };
|
|
1793
1763
|
}
|
|
1794
|
-
|
|
1795
1764
|
export async function runGuiUpdateWorker(
|
|
1796
1765
|
jobId: string,
|
|
1797
1766
|
channel: Channel,
|
|
@@ -1821,6 +1790,12 @@ export async function runGuiUpdateWorker(
|
|
|
1821
1790
|
let activeLauncher = packageLauncherPath();
|
|
1822
1791
|
let activeLauncherVerified = true;
|
|
1823
1792
|
let pnpmOwner: PnpmGlobalOwner | undefined;
|
|
1793
|
+
let workerAuthorizeMutation: UpdateMutationAuthorizer = () => false;
|
|
1794
|
+
const trayRun = (args: string[], timeout: number) => {
|
|
1795
|
+
if (!workerAuthorizeMutation(args[1] === "start" ? "own-tray" : "tray")) return { status: 1, signal: null };
|
|
1796
|
+
return io.trayCommandFn ? io.trayCommandFn(job!, process.execPath, [activeLauncher, ...args], timeout)
|
|
1797
|
+
: runLoggedCommand(job!, process.execPath, [activeLauncher, ...args], timeout, undefined, workerAuthorizeMutation, args[1] === "start" ? "own-tray" : "tray");
|
|
1798
|
+
};
|
|
1824
1799
|
if (!job) {
|
|
1825
1800
|
job = {
|
|
1826
1801
|
id: jobId,
|
|
@@ -1838,7 +1813,6 @@ export async function runGuiUpdateWorker(
|
|
|
1838
1813
|
};
|
|
1839
1814
|
writeJob(job);
|
|
1840
1815
|
}
|
|
1841
|
-
|
|
1842
1816
|
try {
|
|
1843
1817
|
if (!check.canUpdate) {
|
|
1844
1818
|
throw new Error(check.reason ?? "No update is available");
|
|
@@ -1855,7 +1829,7 @@ export async function runGuiUpdateWorker(
|
|
|
1855
1829
|
// proxy is stopped; transient registry failure degrades to a logged skip.
|
|
1856
1830
|
const integrity = io.integrityFn
|
|
1857
1831
|
? io.integrityFn(check.latestVersion)
|
|
1858
|
-
: checkUpdatePackageIntegrity(check.latestVersion,
|
|
1832
|
+
: checkUpdatePackageIntegrity(check.latestVersion, probeSpawnSync, check.installer, pnpmOwner);
|
|
1859
1833
|
if (integrity.ok === false) {
|
|
1860
1834
|
updateJob(job, { status: "failed", error: integrity.reason });
|
|
1861
1835
|
return;
|
|
@@ -1883,28 +1857,31 @@ export async function runGuiUpdateWorker(
|
|
|
1883
1857
|
}
|
|
1884
1858
|
}
|
|
1885
1859
|
|
|
1886
|
-
|
|
1860
|
+
let homeRefusal: string | undefined;
|
|
1861
|
+
const homePolicy = prepareWorkerUpdateHome(cmd, check.installer, activeLauncher, nodeBin(), channel,
|
|
1862
|
+
message => { homeRefusal = message; job = updateJob(job!, {}, message); }, io.serviceHomeAuthorityFn, io.launcherSupportsUpdateHomeFn);
|
|
1863
|
+
if (!homePolicy) { updateJob(job, { status: "failed", restarted: false, error: homeRefusal }); return; }
|
|
1864
|
+
workerAuthorizeMutation = homePolicy.authorizeMutation;
|
|
1865
|
+
job = updateJob(job, { command: cmd.display });
|
|
1866
|
+
const refuseWorkerHome = () => {
|
|
1867
|
+
if (trayWasRunning && activeLauncherVerified && homePolicy.authorizeMutation("own-tray")) trayRun(["tray", "start"], 15_000);
|
|
1868
|
+
updateJob(job!, { status: "failed", restarted: false, error: homeRefusal });
|
|
1869
|
+
};
|
|
1870
|
+
if (!homePolicy.packageOnly && (io.trayHandoffFn || (io.platform ?? process.platform) === "win32")) {
|
|
1887
1871
|
try {
|
|
1888
|
-
|
|
1889
|
-
const
|
|
1890
|
-
const trayPlan = handoffWindowsTrayForUpdate(tray, {
|
|
1891
|
-
stop: () => {
|
|
1892
|
-
const stopped = stopWindowsTray();
|
|
1893
|
-
return { exitStatus: 0, running: stopped.running };
|
|
1894
|
-
},
|
|
1895
|
-
start: () => startWindowsTray(),
|
|
1896
|
-
});
|
|
1872
|
+
if (!homePolicy.authorizeMutation("tray")) { refuseWorkerHome(); return; }
|
|
1873
|
+
const trayPlan = await (io.trayHandoffFn ?? defaultWorkerTrayHandoff)(plan => { trayWasInstalled = plan.refreshAfterReplacement; trayWasRunning = plan.restoreOnFailure; }, homePolicy.authorizeMutation);
|
|
1897
1874
|
trayWasInstalled = trayPlan.refreshAfterReplacement;
|
|
1898
1875
|
trayWasRunning = trayPlan.restoreOnFailure;
|
|
1899
1876
|
} catch (error) {
|
|
1877
|
+
if (trayWasRunning && activeLauncherVerified && homePolicy.authorizeMutation("own-tray")) { try { trayRun(["tray", "start"], 15_000); } catch { /* preserve the handoff failure */ } }
|
|
1900
1878
|
updateJob(job, {
|
|
1901
|
-
status: "failed",
|
|
1902
|
-
error: `Could not stop the Windows tray; aborting before package replacement: ${withheldSummary(error)}`,
|
|
1879
|
+
status: "failed", restarted: false,
|
|
1880
|
+
error: homeRefusal ?? `Could not stop the Windows tray; aborting before package replacement: ${withheldSummary(error)}`,
|
|
1903
1881
|
});
|
|
1904
1882
|
return;
|
|
1905
1883
|
}
|
|
1906
1884
|
}
|
|
1907
|
-
|
|
1908
1885
|
/* [Decision Log]
|
|
1909
1886
|
- 목적: GUI 요청 처리 프로세스가 자신이 실행 중인 패키지를 직접 덮어쓰지 않도록 업데이트를 별도 worker에서 수행한다.
|
|
1910
1887
|
- 대안 분석: (1) 서버에서 runUpdate 직접 호출: process.exit/stdio/실행 파일 교체 위험. (2) GUI에서 CLI 명령 안내만 제공: 자동 업데이트 UX 부족. (3) 숨은 worker가 Node launcher/Bun 전역 명령을 실행: 상태 추적과 안전한 재시작이 가능.
|
|
@@ -1914,7 +1891,15 @@ export async function runGuiUpdateWorker(
|
|
|
1914
1891
|
// and the routed catalog to the replacement instead of restoring native Codex for the
|
|
1915
1892
|
// seconds in between. Without a restart the stop restores, even under an inherited marker.
|
|
1916
1893
|
const updateEnv = restart ? withUpdateTeardownHandover(process.env) : withoutUpdateTeardownHandover(process.env);
|
|
1917
|
-
|
|
1894
|
+
// Raw package-manager lanes cannot carry the baseline argv; the parent rechecks it at the boundary.
|
|
1895
|
+
if (!homePolicy.authorizeMutation("package")) { refuseWorkerHome(); return; }
|
|
1896
|
+
const result = (io.runCommandFn ?? runLoggedCommand)(job, cmd.bin, cmd.args, UPDATE_TIMEOUT_MS, updateEnv, homePolicy.authorizeMutation, "package");
|
|
1897
|
+
if (packageOnlyUpdateSucceeded(cmd, result.status, homePolicy.packageOnly)) {
|
|
1898
|
+
homePolicy.check({ kind: "unknown" });
|
|
1899
|
+
if (!homePolicy.authorizeMutation("package-publish")) { refuseWorkerHome(); return; }
|
|
1900
|
+
writeJob(prepareUpdateJob(job, { status: "succeeded", restarted: false }, "Update installed. Restart the proxy manually after checking 'ocx service status'."), homePolicy.authorizeMutation, "package-publish");
|
|
1901
|
+
return;
|
|
1902
|
+
}
|
|
1918
1903
|
if (result.status !== 0) {
|
|
1919
1904
|
if (check.installer === "pnpm") {
|
|
1920
1905
|
const verifiedLauncher = pnpmOwner
|
|
@@ -1923,9 +1908,7 @@ export async function runGuiUpdateWorker(
|
|
|
1923
1908
|
if (verifiedLauncher) activeLauncher = verifiedLauncher;
|
|
1924
1909
|
else activeLauncherVerified = false;
|
|
1925
1910
|
}
|
|
1926
|
-
if (trayWasRunning && activeLauncherVerified)
|
|
1927
|
-
runLoggedCommand(job, process.execPath, [activeLauncher, "tray", "start"], 15_000);
|
|
1928
|
-
}
|
|
1911
|
+
if (trayWasRunning && activeLauncherVerified && homePolicy.authorizeMutation("own-tray")) trayRun(["tray", "start"], 15_000);
|
|
1929
1912
|
updateJob(job, {
|
|
1930
1913
|
status: "failed",
|
|
1931
1914
|
exitCode: result.status,
|
|
@@ -1941,37 +1924,40 @@ export async function runGuiUpdateWorker(
|
|
|
1941
1924
|
activeLauncher = verifiedLauncher;
|
|
1942
1925
|
}
|
|
1943
1926
|
|
|
1927
|
+
// Authority gates every post-replacement control action; refusal may only restore the
|
|
1928
|
+
// own tray stopped before replacement, never install/refresh a new artifact.
|
|
1929
|
+
if (!homePolicy.authorizeMutation("runtime")) { refuseWorkerHome(); return; }
|
|
1944
1930
|
if (trayWasInstalled) {
|
|
1945
1931
|
const trayArgs = planWindowsTrayUpdate({ installed: trayWasInstalled, running: trayWasRunning }).installArgs;
|
|
1946
|
-
|
|
1932
|
+
if (!homePolicy.authorizeMutation("tray")) { refuseWorkerHome(); return; }
|
|
1933
|
+
const tray = trayRun(trayArgs, 20_000);
|
|
1947
1934
|
if (tray.status !== 0) {
|
|
1948
1935
|
updateJob(job, {}, "Windows tray refresh failed; run 'ocx tray install'.");
|
|
1949
|
-
if (trayWasRunning
|
|
1936
|
+
if (trayWasRunning && homePolicy.authorizeMutation("own-tray")) trayRun(["tray", "start"], 15_000);
|
|
1950
1937
|
}
|
|
1951
1938
|
}
|
|
1952
|
-
|
|
1953
1939
|
if (restart) {
|
|
1954
1940
|
const outcome = await runUpdateRestartWithOwnershipLease(io.resolveOwnershipFn, async lease => {
|
|
1955
1941
|
job = updateJob(job!, { status: "restarting" }, "Update installed. Restarting proxy...");
|
|
1956
1942
|
return finishGuiUpdateRestart(job!, captured, check.installer, {
|
|
1957
1943
|
...io.restartIo,
|
|
1944
|
+
serviceHomeAuthorityFn: io.restartIo?.serviceHomeAuthorityFn ?? io.serviceHomeAuthorityFn, serviceHomeBaseline: homePolicy.initial,
|
|
1958
1945
|
releaseForServiceManagerFn: lease.releaseForServiceManager,
|
|
1959
1946
|
reacquireForDirectStartFn: lease.reacquireForDirectStart,
|
|
1960
1947
|
packageLauncherPathFn: () => activeLauncher,
|
|
1961
1948
|
});
|
|
1962
1949
|
});
|
|
1963
|
-
if (outcome.kind === "veto") {
|
|
1950
|
+
if (outcome.kind === "veto") { if (!homePolicy.authorizeMutation("publish")) { refuseWorkerHome(); return; } writeJob(prepareUpdateJob(job, { status: "succeeded", restarted: false }, outcome.notice), homePolicy.authorizeMutation, "publish"); return; }
|
|
1964
1951
|
if (!outcome.value) return;
|
|
1965
|
-
|
|
1952
|
+
if (!homePolicy.authorizeMutation("publish")) { refuseWorkerHome(); return; }
|
|
1953
|
+
writeJob(prepareUpdateJob(job, { status: "succeeded", restarted: true }, "Restart requested and proxy is healthy."), homePolicy.authorizeMutation, "publish");
|
|
1966
1954
|
return;
|
|
1967
1955
|
}
|
|
1968
|
-
|
|
1969
|
-
|
|
1956
|
+
if (!homePolicy.authorizeMutation("publish")) { refuseWorkerHome(); return; }
|
|
1957
|
+
writeJob(prepareUpdateJob(job, { status: "succeeded", restarted: false }, "Update installed. Restart the proxy to use the new version."), homePolicy.authorizeMutation, "publish");
|
|
1970
1958
|
} catch (err) {
|
|
1971
1959
|
if (check.installer === "pnpm") activeLauncherVerified = false;
|
|
1972
|
-
if (trayWasRunning && activeLauncherVerified)
|
|
1973
|
-
runLoggedCommand(job, process.execPath, [activeLauncher, "tray", "start"], 15_000);
|
|
1974
|
-
}
|
|
1960
|
+
if (trayWasRunning && activeLauncherVerified && workerAuthorizeMutation("own-tray")) trayRun(["tray", "start"], 15_000);
|
|
1975
1961
|
updateJob(job, {
|
|
1976
1962
|
status: "failed",
|
|
1977
1963
|
error: withheldSummary(err),
|