@bitkyc08/opencodex 2.96.0 → 2.98.0-preview.20261107
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/bin/ocx.mjs +215 -20
- package/gui/dist/assets/App-6TFtZsUF.css +1 -0
- package/gui/dist/assets/App-B8_sOxoz.js +59 -0
- package/gui/dist/assets/Tray-DpWEp6ee.js +1 -0
- package/gui/dist/assets/WantedSansVariable.split.0-Dwvb1WRx.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.1-1wKD2RxI.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.10-CAKA6LIP.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.11-k5H85R4b.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.12-BHboLsUv.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.13-9GV377ix.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.14-DovDXnrj.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.15-DTdykCig.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.16-CKz2ccgK.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.17-Z2RD_KRZ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.18-BcKtfonJ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.19-DEQPOSZn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.2-DryboyuA.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.20-Bia5JMls.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.21-Cr4jFw-E.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.22-DjjB69TZ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.23-CvUzJskt.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.24-i_eMg5ox.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.25-2aKHwPX-.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.26-B6wXoCEL.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.27-D4h1WfGM.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.28-kvRPCStd.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.29-DHAiwleD.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.3-7H--eyZi.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.30-C66cfAY2.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.31-FDmtiNim.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.32-DouHt2Dd.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.33-B8HVvkJX.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.34-BtkRu1FN.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.35-DBylQbtk.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.36-Sg089Kgh.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.37-CYtvbriS.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.38-DKkSLf8Z.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.39-CecotKZD.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.4-Bv8O3ZMb.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.40-DdCvkmOU.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.41-ESn674Hc.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.42-DL9V7NNV.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.43-yipO0cyk.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.44-6rTmLZhm.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.45-BJAj8lrm.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.46-BDTzMn2c.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.47-Bxd4wGgi.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.48-DxnFBLnH.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.49-DnVD0aOD.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.5-B1wI2pp5.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.50-D9JlkZd6.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.51-D9Vw6Bu3.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.52-ClEJk4kn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.53-BSXU0vh-.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.54-EcuxkR9v.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.55-CYiFhQX8.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.56--Gk9g8BK.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.57-DnkOPZcy.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.58-9MB8504z.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.59-ByxIsN72.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.6-Bmk0dRVw.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.60-Bxwx_aWQ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.61-DA2z5sm7.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.62-C5iJPJZn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.63-DAqrmaEc.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.64-BgXFsljb.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.65-DKiWujvu.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.66-8po4vUZ4.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.67-Cy5qyI9O.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.68-BKny7Fy3.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.69-B4VU4u_b.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.7-BuqwNpgA.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.70-BCd4n346.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.71-CkQppaWn.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.72-Db7vaoFs.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.73-DI80TYWl.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.74-tMCtDAHB.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.75-Ciw0D5WG.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.76-DoLjFgp-.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.77-CpT2uvMy.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.78-CkcJ4iZ1.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.79-DsOUJjEM.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.8-DsjypPd6.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.80-C0VwHTte.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.81-DTelu57i.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.82-BiMndGN1.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.83-CVcC6eDG.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.84-DlhZVt_O.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.85-S8I2D3pA.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.86-DozXXpH5.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.87-Dsn0Vuuo.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.88-iNwxxDCr.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.89-B63u_9CZ.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.9-Bi3IzpMI.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.90-ByeH1Pqf.woff2 +0 -0
- package/gui/dist/assets/WantedSansVariable.split.91-UQLlagpm.woff2 +0 -0
- package/gui/dist/assets/brand-mark-VPhzz-WE.js +1 -0
- package/gui/dist/assets/geist-cyrillic-ext-wght-normal-DjL33-gN.woff2 +0 -0
- package/gui/dist/assets/geist-cyrillic-wght-normal-BEAKL7Jp.woff2 +0 -0
- package/gui/dist/assets/geist-latin-ext-wght-normal-DC-KSUi6.woff2 +0 -0
- package/gui/dist/assets/geist-latin-wght-normal-BgDaEnEv.woff2 +0 -0
- package/gui/dist/assets/geist-mono-cyrillic-ext-wght-normal-X_5orZeX.woff2 +0 -0
- package/gui/dist/assets/geist-mono-cyrillic-wght-normal-DiZS0aHC.woff2 +0 -0
- package/gui/dist/assets/geist-mono-latin-ext-wght-normal-Bwz-egvJ.woff2 +0 -0
- package/gui/dist/assets/geist-mono-latin-wght-normal-XN7g48iV.woff2 +0 -0
- package/gui/dist/assets/geist-mono-symbols2-wght-normal-CO5SzqOn.woff2 +0 -0
- package/gui/dist/assets/geist-mono-vietnamese-wght-normal-DadHysG0.woff2 +0 -0
- package/gui/dist/assets/geist-vietnamese-wght-normal-6IgcOCM7.woff2 +0 -0
- package/gui/dist/assets/index-5REODpG3.css +2 -0
- package/gui/dist/assets/index-BWKBeK77.js +94 -0
- package/gui/dist/assets/segment-thumb-features-BQYzrze9.js +1 -0
- package/gui/dist/classic/assets/App-Bz65x1J6.js +58 -0
- package/gui/dist/{assets/Tray-BOPQyDbH.js → classic/assets/Tray-kk7mdO6I.js} +1 -1
- package/gui/dist/classic/assets/index-Dp2j8bSc.js +94 -0
- package/gui/dist/classic/assets/quota-summary-CvamtHjB.js +1 -0
- package/gui/dist/classic/index.html +47 -0
- package/gui/dist/favicon.png +0 -0
- package/gui/dist/favicon.svg +14 -0
- package/gui/dist/index.html +15 -2
- package/package.json +1 -1
- package/src/adapters/anthropic.ts +17 -8
- package/src/adapters/command-code.ts +15 -16
- package/src/adapters/cursor/transport-retry.ts +2 -2
- package/src/adapters/devin/cloud-direct/chat.ts +15 -6
- package/src/adapters/google.ts +7 -7
- package/src/adapters/kiro/adapter.ts +18 -3
- package/src/adapters/kiro/conversation.ts +8 -8
- package/src/adapters/kiro/payload.ts +45 -12
- package/src/adapters/kiro/stream.ts +230 -14
- package/src/adapters/kiro/structured-output-json.ts +191 -0
- package/src/adapters/kiro/structured-output-schema.ts +542 -0
- package/src/adapters/kiro/structured-output.ts +367 -0
- package/src/adapters/kiro-constants.ts +24 -1
- package/src/adapters/kiro-events.ts +31 -1
- package/src/adapters/kiro-retry.ts +3 -3
- package/src/adapters/kiro-tools.ts +14 -9
- package/src/adapters/kiro-wire.ts +9 -5
- package/src/adapters/ollama-native.ts +11 -1
- package/src/adapters/openai-chat/messages.ts +58 -5
- package/src/adapters/openai-chat/mistral-image-limit.ts +50 -0
- package/src/adapters/openai-chat/passthrough.ts +5 -3
- package/src/adapters/openai-chat/tool-schema.ts +83 -13
- package/src/adapters/openai-responses/empty-assistant.ts +15 -3
- package/src/adapters/openai-responses/opengateway-input.ts +18 -6
- package/src/adapters/openai-responses/passthrough.ts +5 -4
- package/src/adapters/openai-responses/reasoning.ts +9 -4
- package/src/adapters/openai-responses/request-strips.ts +1 -1
- package/src/adapters/openai-responses/tool-output-recovery.ts +79 -0
- package/src/adapters/physical-send.ts +3 -3
- package/src/adapters/qoder/live-models.ts +115 -1
- package/src/adapters/zed-openai-stream.ts +2 -1
- package/src/bridge/errors.ts +11 -2
- package/src/bridge/response-json.ts +2 -1
- package/src/bridge/sse.ts +14 -6
- package/src/chat/failure-verdict.ts +21 -0
- package/src/chat/outbound.ts +139 -21
- package/src/claude/failure-verdict.ts +21 -0
- package/src/claude/inbound-content-options.ts +15 -2
- package/src/claude/inbound-model-options.ts +2 -1
- package/src/claude/inbound-records.ts +2 -0
- package/src/claude/inbound.ts +17 -11
- package/src/claude/outbound.ts +98 -22
- package/src/cli/capabilities-access-remote.ts +13 -0
- package/src/cli/capabilities-base.ts +26 -3
- package/src/cli/capabilities-command.ts +12 -3
- package/src/cli/capabilities-provider-models.ts +3 -3
- package/src/cli/capability-contracts.ts +2 -0
- package/src/cli/codex-launch-auth.ts +30 -1
- package/src/cli/codex-launcher.ts +12 -5
- package/src/cli/codex-shim-autorestore.ts +12 -4
- package/src/cli/config-command.ts +11 -2
- package/src/cli/connect.ts +17 -2
- package/src/cli/dispatch.ts +14 -177
- package/src/cli/doctor.ts +95 -7
- package/src/cli/help.ts +2 -2
- package/src/cli/index.ts +17 -8
- package/src/cli/link-apply-restart.ts +9 -2
- package/src/cli/link.ts +1 -1
- package/src/cli/models.ts +124 -38
- package/src/cli/registry.ts +12 -4
- package/src/cli/restart-failure.ts +17 -0
- package/src/cli/root.ts +8 -0
- package/src/cli/stop-approval.ts +2 -2
- package/src/cli/sync-command.ts +243 -0
- package/src/cli/sync-fanout-process.ts +92 -0
- package/src/cli/sync-fanout.ts +161 -0
- package/src/cli/sync-flags.ts +10 -0
- package/src/cli/sync-link-status.ts +39 -0
- package/src/cli/sync-update-guard.ts +18 -0
- package/src/cli/system-restart-client.ts +5 -0
- package/src/cli/uninstall-client-state.ts +12 -1
- package/src/cli/update-restart-child.ts +13 -3
- package/src/cli/update-restart-home.ts +6 -3
- package/src/cli/update-restart.ts +36 -19
- package/src/client/connect.ts +35 -15
- package/src/client/hub-client.ts +5 -0
- package/src/client/link-home.ts +3 -2
- package/src/client/link-management-relay.ts +39 -2
- package/src/client/link-readiness.ts +3 -1
- package/src/client/machine-api.ts +2 -1
- package/src/client/machine-listener.ts +10 -0
- package/src/client/orphan-token-recovery.ts +322 -0
- package/src/client/restore-ownership.ts +19 -1
- package/src/client/runtime-restart.ts +12 -4
- package/src/client/runtime.ts +40 -11
- package/src/client/stop-routing.ts +62 -0
- package/src/client/sync-runtime.ts +65 -0
- package/src/clients/config-export.ts +32 -3
- package/src/codex/auth-context.ts +49 -103
- package/src/codex/catalog/antigravity-discovery.ts +16 -5
- package/src/codex/catalog/provider-models.ts +18 -12
- package/src/codex/forward-transport-headers.ts +35 -6
- package/src/codex/inject/config-toml.ts +88 -0
- package/src/codex/inject/multi-agent-v2.ts +30 -4
- package/src/codex/inject/plan.ts +34 -7
- package/src/codex/inject-coordination.ts +11 -0
- package/src/codex/inject.ts +18 -7
- package/src/codex/lineage.ts +13 -7
- package/src/codex/native-profile-api.ts +27 -1
- package/src/codex/quota.ts +22 -6
- package/src/codex/request-owned-affinity-key.ts +11 -0
- package/src/codex/request-owned-affinity.ts +118 -0
- package/src/codex/request-owned-main-pin.ts +86 -0
- package/src/codex/role-capability.ts +52 -41
- package/src/codex/routing/active-account.ts +13 -5
- package/src/codex/routing/selection.ts +40 -1
- package/src/codex/routing/thread-affinity-store.ts +916 -0
- package/src/codex/routing/thread-affinity.ts +90 -12
- package/src/codex/shim-diagnostics.ts +7 -0
- package/src/codex/shim-legacy-record.ts +290 -0
- package/src/codex/shim-windows-refresh.ts +9 -2
- package/src/codex/shim-wrapper-write.ts +7 -0
- package/src/codex/shim.ts +80 -21
- package/src/codex/toml-source-lines.ts +72 -13
- package/src/combos/failover.ts +6 -109
- package/src/combos/request.ts +2 -2
- package/src/combos/resolve.ts +29 -11
- package/src/config/diagnostics.ts +9 -9
- package/src/config/load-degrade.ts +27 -27
- package/src/config/process-state.ts +5 -0
- package/src/config/provider-validation.ts +9 -2
- package/src/config/removed-opencode-free-backup.ts +6 -3
- package/src/config/schema/leaf-validators.ts +1 -0
- package/src/config/tracked-runtime-inspection.ts +3 -3
- package/src/generated/compatibility-version.json +595 -255
- package/src/images/loop.ts +4 -3
- package/src/lib/client-error-body.ts +215 -0
- package/src/lib/client-retry-after.ts +66 -0
- package/src/lib/config-ownership-removal.ts +422 -0
- package/src/lib/config-ownership.ts +650 -81
- package/src/lib/context-overflow-verdict.ts +113 -0
- package/src/lib/crash-guard.ts +4 -2
- package/src/lib/desktop-cli-handoff.d.mts +4 -5
- package/src/lib/desktop-cli-handoff.mjs +18 -17
- package/src/lib/empty-tool-catalog.ts +25 -3
- package/src/lib/error-destination.ts +47 -0
- package/src/lib/errors.ts +1 -0
- package/src/lib/failure-detail.ts +66 -0
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/messages-error-body.ts +162 -0
- package/src/lib/messages-sse-error-presentation.ts +93 -0
- package/src/lib/model-identity.ts +44 -0
- package/src/lib/passive-read.ts +9 -4
- package/src/lib/private-sqlite-path.ts +124 -0
- package/src/lib/response-service-tier.ts +17 -0
- package/src/lib/retry-after.ts +3 -0
- package/src/lib/socks5-fetch.ts +21 -9
- package/src/lib/spend-ledger-owner.ts +43 -4
- package/src/lib/upstream-condition.ts +142 -0
- package/src/lib/upstream-retry.ts +95 -12
- package/src/lib/windows-owner-acl.ts +22 -9
- package/src/lib/winsw.ts +5 -5
- package/src/lib/workflow-budget.ts +3 -1
- package/src/link/remote-platform.ts +14 -0
- package/src/link/remote-windows.ts +51 -9
- package/src/link/ssh-argv.ts +63 -10
- package/src/oauth/generic-account-failover.ts +13 -11
- package/src/oauth/index.ts +42 -73
- package/src/oauth/oauth-errors.ts +67 -0
- package/src/oauth/store.ts +21 -11
- package/src/protocols/codecs/messages-ir.ts +15 -9
- package/src/protocols/codecs/ollama.ts +197 -0
- package/src/protocols/encoders/adapter-events.ts +30 -7
- package/src/protocols/encoders/chat.ts +18 -10
- package/src/protocols/encoders/messages.ts +72 -28
- package/src/protocols/trace.ts +18 -0
- package/src/providers/antigravity-models.ts +45 -12
- package/src/providers/fastwire.ts +3 -2
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/quota/anthropic-usage-windows.ts +13 -3
- package/src/providers/quota/vendor-probes-key.ts +60 -24
- package/src/providers/reasoning-metadata.ts +2 -1
- package/src/providers/registry/entries-extended.ts +9 -0
- package/src/providers/request-pacing.ts +3 -2
- package/src/reasoning-effort.ts +7 -2
- package/src/remote/hub-usage.ts +3 -0
- package/src/responses/apply-patch-envelope.ts +45 -19
- package/src/responses/compaction-history-framing.ts +5 -1
- package/src/responses/freeform-wrapper-scan.ts +5 -3
- package/src/responses/progressive-freeform-input.ts +354 -45
- package/src/routing/fallback-policy.ts +3 -1
- package/src/server/admission-model-scope.ts +17 -6
- package/src/server/admitted-http-turn.ts +57 -0
- package/src/server/anthropic-rate-limit-headers.ts +75 -3
- package/src/server/auth-cors.ts +5 -0
- package/src/server/chat-completions.ts +45 -20
- package/src/server/chat-native-sse.ts +52 -7
- package/src/server/chat-native.ts +60 -35
- package/src/server/claude-bridge-pool-session.ts +59 -0
- package/src/server/claude-messages.ts +174 -84
- package/src/server/context-history.ts +5 -1
- package/src/server/gui-static.ts +4 -1
- package/src/server/hub-usage.ts +7 -2
- package/src/server/inbound-body-admission.ts +11 -4
- package/src/server/index/link-management.ts +8 -0
- package/src/server/index/ollama-routes.ts +91 -0
- package/src/server/index/serve-options.ts +44 -24
- package/src/server/index/startup-warnings.ts +5 -12
- package/src/server/index/websocket-handler.ts +5 -2
- package/src/server/index.ts +6 -36
- package/src/server/inference/client-encoder-delivery.ts +9 -3
- package/src/server/json-serialized-bytes.ts +44 -0
- package/src/server/management/agent-settings-routes.ts +24 -21
- package/src/server/management/codex-cli-update-routes.ts +2 -1
- package/src/server/management/logs-usage-routes.ts +89 -4
- package/src/server/management/provider-routes.ts +2 -22
- package/src/server/management/qoder-provider-probe.ts +105 -0
- package/src/server/management/route-registry.ts +4 -1
- package/src/server/management/usage-aggregate-cache.ts +15 -5
- package/src/server/management/usage-source-facets.ts +38 -0
- package/src/server/messages-native-scope.ts +2 -1
- package/src/server/messages-native-tool-guard.ts +12 -4
- package/src/server/messages-native.ts +123 -47
- package/src/server/messages-response-headers.ts +25 -11
- package/src/server/messages-shared.ts +99 -65
- package/src/server/messages-sse-error-filter.ts +199 -0
- package/src/server/native-final-log.ts +93 -0
- package/src/server/ollama-inbound.ts +349 -0
- package/src/server/ollama-native-paths.ts +21 -0
- package/src/server/ollama-route-policy.ts +73 -0
- package/src/server/relay.ts +22 -3
- package/src/server/request-decompress.ts +4 -2
- package/src/server/request-log-failure-attribution.ts +22 -0
- package/src/server/request-log-failure-detail.ts +80 -0
- package/src/server/request-log-terminal-status.ts +4 -2
- package/src/server/request-log.ts +91 -42
- package/src/server/response-log-body.ts +6 -1
- package/src/server/responses/account-change-state.ts +17 -6
- package/src/server/responses/adapter-continuation.ts +17 -6
- package/src/server/responses/adapter-delivery.ts +17 -10
- package/src/server/responses/adapter-dispatch.ts +32 -31
- package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
- package/src/server/responses/codex-auth-error.ts +24 -19
- package/src/server/responses/codex-ws-exchange.ts +11 -8
- package/src/server/responses/codex-ws-metadata.ts +94 -21
- package/src/server/responses/codex-ws-request.ts +3 -1
- package/src/server/responses/codex-ws-wire.ts +19 -3
- package/src/server/responses/compact.ts +57 -24
- package/src/server/responses/compaction-recovery.ts +4 -2
- package/src/server/responses/compaction-routing.ts +9 -4
- package/src/server/responses/core-auth.ts +32 -14
- package/src/server/responses/core-codex-account.ts +17 -6
- package/src/server/responses/core-combo-failure.ts +7 -1
- package/src/server/responses/core-combo-native.ts +2 -1
- package/src/server/responses/core-combo.ts +43 -27
- package/src/server/responses/core-errors.ts +24 -21
- package/src/server/responses/core-lifetime.ts +6 -3
- package/src/server/responses/core-normalize.ts +1 -0
- package/src/server/responses/core-options.ts +9 -0
- package/src/server/responses/core-pipeline.ts +4 -3
- package/src/server/responses/empty-completion-guard.ts +4 -1
- package/src/server/responses/fetch-helpers.ts +7 -1
- package/src/server/responses/input-admission.ts +28 -2
- package/src/server/responses/native-injection.ts +1 -1
- package/src/server/responses/native-response-json.ts +13 -4
- package/src/server/responses/native-response-output.ts +1 -2
- package/src/server/responses/non-replayable-error.ts +2 -1
- package/src/server/responses/pacing-overload.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +55 -14
- package/src/server/responses/passthrough-dispatch.ts +20 -18
- package/src/server/responses/passthrough-error.ts +9 -9
- package/src/server/responses/policy-fallback.ts +2 -1
- package/src/server/responses/request-prepare.ts +69 -48
- package/src/server/responses/request-transport.ts +36 -31
- package/src/server/responses/response-effects.ts +3 -2
- package/src/server/responses/run-turn-execution.ts +6 -6
- package/src/server/responses/sidecar-execution.ts +16 -12
- package/src/server/responses/spend-storage-error.ts +2 -1
- package/src/server/responses/terminal-guard.ts +30 -0
- package/src/server/responses/ws-upstream.ts +9 -0
- package/src/server/responses-custom-tool-repair.ts +14 -3
- package/src/server/responses-terminal-repair.ts +5 -2
- package/src/server/responses-undeclared-tool-guard.ts +39 -16
- package/src/server/restart-replacement.ts +3 -1
- package/src/server/safe-response-headers.ts +162 -13
- package/src/server/sse-payload-rewrite.ts +23 -11
- package/src/server/turn-state-handles.ts +164 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +4 -0
- package/src/service/definition.ts +36 -4
- package/src/service/launchd.ts +89 -32
- package/src/service/logging.ts +34 -7
- package/src/service/ownership-mutation-lease.d.mts +11 -2
- package/src/service/ownership-mutation-lease.mjs +53 -11
- package/src/service/plist-xml.ts +59 -0
- package/src/service/state.ts +8 -0
- package/src/service/systemd-env.ts +2 -0
- package/src/service/systemd.ts +31 -7
- package/src/service/windows-taskxml.ts +16 -7
- package/src/service-manager-probe.ts +4 -10
- package/src/types/config.ts +2 -0
- package/src/types/provider.ts +2 -0
- package/src/types/request.ts +13 -1
- package/src/update/config-preflight.ts +48 -0
- package/src/update/index.ts +148 -26
- package/src/update/npm-install.d.mts +8 -0
- package/src/update/npm-install.mjs +20 -1
- package/src/update/orchestrated-admission.d.mts +4 -0
- package/src/update/orchestrated-admission.mjs +12 -0
- package/src/update/orchestrated-arguments.d.mts +12 -0
- package/src/update/orchestrated-arguments.mjs +64 -0
- package/src/update/orchestrated-child.d.mts +12 -0
- package/src/update/orchestrated-child.mjs +70 -0
- package/src/update/orchestrated-entry.ts +234 -0
- package/src/update/orchestrated-identity-probe-entry.ts +20 -0
- package/src/update/orchestrated-identity.ts +53 -0
- package/src/update/orchestrated-live-identity.ts +48 -0
- package/src/update/orchestrated-node-driver.mjs +99 -0
- package/src/update/orchestrated-outcome.d.mts +21 -0
- package/src/update/orchestrated-outcome.mjs +40 -0
- package/src/update/orchestrated-plan.ts +49 -0
- package/src/update/orchestrated-pnpm.d.mts +8 -0
- package/src/update/orchestrated-pnpm.mjs +33 -0
- package/src/update/orchestrated-session.d.mts +37 -0
- package/src/update/orchestrated-session.mjs +264 -0
- package/src/update/orchestrated-token.d.mts +10 -0
- package/src/update/orchestrated-token.mjs +21 -0
- package/src/update/orchestrated-token.ts +3 -0
- package/src/update/orchestrated-tree.d.mts +1 -0
- package/src/update/orchestrated-tree.mjs +14 -0
- package/src/update/pnpm-global-install.d.mts +6 -0
- package/src/update/pnpm-global-install.mjs +9 -2
- package/src/update/posix-install-supervisor-entry.mjs +6 -0
- package/src/update/posix-install-supervisor.d.mts +10 -0
- package/src/update/posix-install-supervisor.mjs +88 -0
- package/src/update/sync-update-mutex.d.mts +10 -0
- package/src/update/sync-update-mutex.mjs +164 -0
- package/src/update/sync-update-mutex.ts +1 -0
- package/src/update/test-home-guard.mjs +33 -0
- package/src/update/transactional-install.mjs +2 -2
- package/src/usage/client.ts +43 -0
- package/src/usage/error-detail.ts +225 -0
- package/src/usage/log.ts +64 -27
- package/src/usage/source-facets.ts +51 -0
- package/src/usage/source-filter.ts +65 -0
- package/src/usage/summary.ts +50 -8
- package/src/web-search/anthropic-executor.ts +105 -24
- package/src/web-search/executor.ts +5 -3
- package/src/web-search/loop.ts +33 -6
- package/src/web-search/progress-stream.ts +64 -5
- package/gui/dist/assets/App-bwugJRKn.js +0 -58
- package/gui/dist/assets/index-ebuVUtB7.js +0 -94
- package/gui/dist/assets/quota-summary-6HsrHQAy.js +0 -1
- /package/gui/dist/{assets → classic/assets}/App-B4j-Txmb.css +0 -0
- /package/gui/dist/{assets → classic/assets}/index-CHWwDo9L.css +0 -0
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export interface OrchestratedExpect {
|
|
2
|
+
home: string;
|
|
3
|
+
cliRoot: string;
|
|
4
|
+
servingRoot: string | null;
|
|
5
|
+
runtimePid: number | null;
|
|
6
|
+
planToken: string;
|
|
7
|
+
}
|
|
8
|
+
export declare function encodeOrchestratedExpect(value: OrchestratedExpect): string;
|
|
9
|
+
export declare function decodeOrchestratedExpect(encoded: string): OrchestratedExpect;
|
|
10
|
+
export interface OrchestratedResultChannel {
|
|
11
|
+
directory: string;
|
|
12
|
+
resultPath: string;
|
|
13
|
+
capability: string;
|
|
14
|
+
read(): Record<string, unknown> | null;
|
|
15
|
+
dispose(): void;
|
|
16
|
+
}
|
|
17
|
+
export declare function createOrchestratedResultChannel(): OrchestratedResultChannel;
|
|
18
|
+
export declare function issueOrchestratedResultCapability(path: string): { capability: string; identity: import("node:fs").BigIntStats };
|
|
19
|
+
export declare function createOrchestratedChildSession(options: {
|
|
20
|
+
home: string;
|
|
21
|
+
resultPath: string;
|
|
22
|
+
resultCapability: string;
|
|
23
|
+
expect: OrchestratedExpect;
|
|
24
|
+
notAfter?: number;
|
|
25
|
+
now?: () => number;
|
|
26
|
+
pid?: number;
|
|
27
|
+
verifyIdentity: () => boolean | Promise<boolean>;
|
|
28
|
+
}): {
|
|
29
|
+
start(): { ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight" };
|
|
30
|
+
finishPreflight(): void;
|
|
31
|
+
enterMutation(): Promise<{ ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight" | "deadline-passed" | "plan-changed" }>;
|
|
32
|
+
noteUntrackedInstaller(): void;
|
|
33
|
+
confirmInstallerExit(): void;
|
|
34
|
+
retainInstallerFence(): void;
|
|
35
|
+
finish(outcome: ({ phase: "installed"; activeRoot: string } | { phase: "failed"; error?: string; rollbackPerformed?: boolean }) & { terminationConfirmed?: boolean }): void;
|
|
36
|
+
};
|
|
37
|
+
export declare function createLegacyUpdateSession(options: { home: string }): ReturnType<typeof createOrchestratedChildSession>;
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
import { randomBytes, randomUUID } from "node:crypto";
|
|
2
|
+
import { closeSync, constants, fstatSync, fsyncSync, ftruncateSync, lstatSync, mkdtempSync, openSync, readFileSync, readSync, realpathSync,
|
|
3
|
+
renameSync, rmdirSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { basename, dirname, isAbsolute, join } from "node:path";
|
|
6
|
+
import { inspectUpdateMarker, tryAcquireUpdateSyncMutex } from "./sync-update-mutex.mjs";
|
|
7
|
+
import { assertNotRealHomeUnderTest } from "./test-home-guard.mjs";
|
|
8
|
+
|
|
9
|
+
function atomicJson(path, value) {
|
|
10
|
+
const temp = join(dirname(path), `.${basename(path)}.${process.pid}.${randomUUID()}.tmp`);
|
|
11
|
+
let created = false;
|
|
12
|
+
try {
|
|
13
|
+
writeFileSync(temp, `${JSON.stringify(value)}\n`, { encoding: "utf8", flag: "wx", mode: 0o600 });
|
|
14
|
+
created = true;
|
|
15
|
+
renameSync(temp, path);
|
|
16
|
+
created = false;
|
|
17
|
+
} finally {
|
|
18
|
+
if (created) { try { unlinkSync(temp); } catch { /* preserve the original write error */ } }
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
// Result handoff. The child writes only into a single-link, non-symlink regular file whose entire
|
|
23
|
+
// content equals the capability document for the token it was given, and only through the
|
|
24
|
+
// descriptor it validated; the parent reads and removes only the file and directory it recorded.
|
|
25
|
+
const CAPABILITY = /^[A-Za-z0-9_-]{43}$/;
|
|
26
|
+
// Outcome records are a few hundred bytes; anything larger is not a record this channel published.
|
|
27
|
+
const MAX_RESULT_BYTES = 65536;
|
|
28
|
+
const NOFOLLOW = constants.O_NOFOLLOW ?? 0;
|
|
29
|
+
const capabilityDocument = token => JSON.stringify({ ocxUpdateResultCapability: token });
|
|
30
|
+
// BigInt stats: NTFS/ReFS file ids can exceed Number.MAX_SAFE_INTEGER, and two ids must never round to equal.
|
|
31
|
+
const EXACT = { bigint: true };
|
|
32
|
+
const sameIdentity = (a, b) => a.dev === b.dev && a.ino === b.ino;
|
|
33
|
+
const ownerOnly = stat => process.platform === "win32" || (stat.uid === BigInt(process.getuid()) && (stat.mode & 0o077n) === 0n);
|
|
34
|
+
const invalidDestination = () => new Error("invalid orchestrated result destination");
|
|
35
|
+
/**
|
|
36
|
+
* Path-based cleanup is safe only where no other principal can replace an ancestor between check and use: on POSIX
|
|
37
|
+
* every ancestor is owned by this user or root and not group/other-writable, unless root-owned and sticky. Windows
|
|
38
|
+
* has no cheap equivalent, so it never removes by path.
|
|
39
|
+
*/
|
|
40
|
+
function removableChannel(directory) {
|
|
41
|
+
if (process.platform === "win32") return false;
|
|
42
|
+
try {
|
|
43
|
+
for (let entry = dirname(directory); ; entry = dirname(entry)) {
|
|
44
|
+
const stat = lstatSync(entry, EXACT), uid = Number(stat.uid), mode = Number(stat.mode);
|
|
45
|
+
if (!stat.isDirectory() || stat.isSymbolicLink() || (uid !== process.getuid() && uid !== 0)
|
|
46
|
+
|| ((mode & 0o022) !== 0 && !(uid === 0 && (mode & 0o1000) !== 0))) return false;
|
|
47
|
+
if (dirname(entry) === entry) return true;
|
|
48
|
+
}
|
|
49
|
+
} catch { return false; }
|
|
50
|
+
}
|
|
51
|
+
function readAll(fd, size) {
|
|
52
|
+
const bytes = Buffer.alloc(size);
|
|
53
|
+
let read = 0;
|
|
54
|
+
while (read < size) { const count = readSync(fd, bytes, read, size - read, read); if (count === 0) break; read += count; }
|
|
55
|
+
return bytes.subarray(0, read).toString("utf8");
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** Create a new owner-only capability file at path; returns its token and recorded identity. */
|
|
59
|
+
export function issueOrchestratedResultCapability(path) {
|
|
60
|
+
const capability = randomBytes(32).toString("base64url");
|
|
61
|
+
const fd = openSync(path, "wx", 0o600);
|
|
62
|
+
try {
|
|
63
|
+
const document = Buffer.from(capabilityDocument(capability), "utf8");
|
|
64
|
+
for (let written = 0; written < document.length;) written += writeSync(fd, document, written, document.length - written, written);
|
|
65
|
+
return { capability, identity: fstatSync(fd, EXACT) };
|
|
66
|
+
} finally { closeSync(fd); }
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/** Parent side: a fresh private directory holding one exclusive capability file for one child. */
|
|
70
|
+
export function createOrchestratedResultChannel() {
|
|
71
|
+
const directory = realpathSync.native(mkdtempSync(join(tmpdir(), "ocx-update-")));
|
|
72
|
+
const resultPath = join(directory, "result.json");
|
|
73
|
+
const directoryStat = lstatSync(directory, EXACT);
|
|
74
|
+
const { capability, identity: fileStat } = issueOrchestratedResultCapability(resultPath);
|
|
75
|
+
return {
|
|
76
|
+
directory, resultPath, capability,
|
|
77
|
+
/** The child's recorded outcome, or null unless the recorded file is still in place and parses. */
|
|
78
|
+
read() {
|
|
79
|
+
let readFd;
|
|
80
|
+
try {
|
|
81
|
+
const before = lstatSync(resultPath, EXACT);
|
|
82
|
+
if (!before.isFile() || before.isSymbolicLink() || !sameIdentity(before, fileStat)) return null;
|
|
83
|
+
readFd = openSync(resultPath, constants.O_RDONLY | NOFOLLOW);
|
|
84
|
+
const opened = fstatSync(readFd, EXACT);
|
|
85
|
+
if (!sameIdentity(opened, fileStat) || opened.size > BigInt(MAX_RESULT_BYTES)) return null;
|
|
86
|
+
const text = readAll(readFd, Number(opened.size));
|
|
87
|
+
if (text === capabilityDocument(capability)) return null;
|
|
88
|
+
const value = JSON.parse(text);
|
|
89
|
+
return value && typeof value === "object" && !Array.isArray(value) ? value : null;
|
|
90
|
+
} catch { return null; }
|
|
91
|
+
finally { if (readFd !== undefined) closeSync(readFd); }
|
|
92
|
+
},
|
|
93
|
+
/**
|
|
94
|
+
* Remove only the recorded file, then the recorded directory if it is empty; anything else stays. Path-based
|
|
95
|
+
* removal runs only on POSIX and only when no ancestor can be replaced by another principal; otherwise the
|
|
96
|
+
* channel (at most this parent's own capability or result record) is left in place.
|
|
97
|
+
*/
|
|
98
|
+
dispose() {
|
|
99
|
+
if (!removableChannel(directory)) return;
|
|
100
|
+
try { const current = lstatSync(resultPath, EXACT); if (current.isFile() && sameIdentity(current, fileStat)) unlinkSync(resultPath); }
|
|
101
|
+
catch { /* leave whatever is there */ }
|
|
102
|
+
try { const current = lstatSync(directory, EXACT); if (current.isDirectory() && sameIdentity(current, directoryStat)) rmdirSync(directory); }
|
|
103
|
+
catch { /* a non-empty or replaced directory is left in place */ }
|
|
104
|
+
},
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** Child side: validate the destination through the descriptor it will keep, before any write. */
|
|
109
|
+
function openResultDestination(resultPath, capability) {
|
|
110
|
+
if (typeof resultPath !== "string" || !isAbsolute(resultPath) || basename(resultPath) !== "result.json"
|
|
111
|
+
|| typeof capability !== "string" || !CAPABILITY.test(capability)) throw invalidDestination();
|
|
112
|
+
let fd;
|
|
113
|
+
try {
|
|
114
|
+
const canonical = realpathSync.native(resultPath);
|
|
115
|
+
if (process.platform === "win32" ? canonical.toLowerCase() !== resultPath.toLowerCase() : canonical !== resultPath) throw invalidDestination();
|
|
116
|
+
const directory = lstatSync(dirname(resultPath), EXACT);
|
|
117
|
+
if (!directory.isDirectory() || directory.isSymbolicLink() || !ownerOnly(directory)) throw invalidDestination();
|
|
118
|
+
const file = lstatSync(resultPath, EXACT);
|
|
119
|
+
if (!file.isFile() || file.isSymbolicLink() || file.nlink !== 1n || !ownerOnly(file)) throw invalidDestination();
|
|
120
|
+
fd = openSync(resultPath, constants.O_RDWR | NOFOLLOW);
|
|
121
|
+
const opened = fstatSync(fd, EXACT);
|
|
122
|
+
const expected = capabilityDocument(capability);
|
|
123
|
+
// Size first: nothing is read from a file that cannot be the capability document.
|
|
124
|
+
if (!sameIdentity(opened, file) || opened.size !== file.size || opened.nlink !== 1n || opened.size !== BigInt(Buffer.byteLength(expected))) throw invalidDestination();
|
|
125
|
+
if (readAll(fd, Number(opened.size)) !== expected) throw invalidDestination();
|
|
126
|
+
return fd;
|
|
127
|
+
} catch {
|
|
128
|
+
if (fd !== undefined) closeSync(fd);
|
|
129
|
+
throw invalidDestination();
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/** Truncate, then write the whole record at explicit offsets: an interruption never leaves a mixed record. */
|
|
134
|
+
function publishResult(fd, value) {
|
|
135
|
+
const bytes = Buffer.from(JSON.stringify(value), "utf8");
|
|
136
|
+
ftruncateSync(fd, 0);
|
|
137
|
+
for (let written = 0; written < bytes.length;) written += writeSync(fd, bytes, written, bytes.length - written, written);
|
|
138
|
+
fsyncSync(fd);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
function validateExpect(value) {
|
|
142
|
+
if (!value || typeof value !== "object" || Array.isArray(value)
|
|
143
|
+
|| Object.keys(value).sort().join(",") !== "cliRoot,home,planToken,runtimePid,servingRoot"
|
|
144
|
+
|| typeof value.home !== "string" || !isAbsolute(value.home)
|
|
145
|
+
|| typeof value.cliRoot !== "string" || !isAbsolute(value.cliRoot)
|
|
146
|
+
|| (value.servingRoot !== null && (typeof value.servingRoot !== "string" || !isAbsolute(value.servingRoot)))
|
|
147
|
+
|| (value.runtimePid !== null && (!Number.isSafeInteger(value.runtimePid) || value.runtimePid <= 0))
|
|
148
|
+
|| typeof value.planToken !== "string" || !/^[A-Za-z0-9_-]{16,128}$/.test(value.planToken)) {
|
|
149
|
+
throw new Error("invalid orchestrated expectation");
|
|
150
|
+
}
|
|
151
|
+
return value;
|
|
152
|
+
}
|
|
153
|
+
export function encodeOrchestratedExpect(value) {
|
|
154
|
+
return Buffer.from(JSON.stringify(validateExpect(value)), "utf8").toString("base64url");
|
|
155
|
+
}
|
|
156
|
+
export function decodeOrchestratedExpect(encoded) {
|
|
157
|
+
if (typeof encoded !== "string" || !/^[A-Za-z0-9_-]+$/.test(encoded)) throw new Error("invalid orchestrated expectation");
|
|
158
|
+
const bytes = Buffer.from(encoded, "base64url");
|
|
159
|
+
if (bytes.toString("base64url") !== encoded) throw new Error("invalid orchestrated expectation");
|
|
160
|
+
let parsed;
|
|
161
|
+
try { parsed = JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(bytes)); } catch { throw new Error("invalid orchestrated expectation"); }
|
|
162
|
+
return validateExpect(parsed);
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
export function createOrchestratedChildSession({ home, resultPath, resultCapability, expect, notAfter, now = Date.now, pid = process.pid, verifyIdentity }) {
|
|
166
|
+
if (expect !== undefined) validateExpect(expect);
|
|
167
|
+
if ((expect !== undefined && expect.home !== home)
|
|
168
|
+
|| (notAfter !== undefined && (!Number.isSafeInteger(notAfter) || notAfter <= 0))
|
|
169
|
+
|| !Number.isSafeInteger(pid) || pid <= 0 || typeof now !== "function" || typeof verifyIdentity !== "function") {
|
|
170
|
+
throw new Error("invalid orchestrated session options");
|
|
171
|
+
}
|
|
172
|
+
assertNotRealHomeUnderTest(home);
|
|
173
|
+
const markerPath = join(home, "update-orchestrated.json");
|
|
174
|
+
// Validated before any session write, mutex use or identity probe; every result goes through this descriptor.
|
|
175
|
+
let resultFd = resultPath === undefined && resultCapability === undefined ? undefined : openResultDestination(resultPath, resultCapability);
|
|
176
|
+
const result = value => { if (resultFd !== undefined) publishResult(resultFd, value); };
|
|
177
|
+
const closeResult = () => { if (resultFd !== undefined) { const fd = resultFd; resultFd = undefined; closeSync(fd); } };
|
|
178
|
+
let state = "new", mutex, startedAt, untrackedPending = false, retainFence = false;
|
|
179
|
+
const marker = (phase, preserveInstaller = false, terminationUnconfirmed = false, retainFence = false) => {
|
|
180
|
+
let installer = {};
|
|
181
|
+
if (preserveInstaller) {
|
|
182
|
+
const current = JSON.parse(readFileSync(markerPath, "utf8"));
|
|
183
|
+
if (current.pid !== pid || current.startedAt !== startedAt) throw new Error("orchestrated marker changed");
|
|
184
|
+
if (current.installerPid !== undefined) installer.installerPid = current.installerPid;
|
|
185
|
+
if (current.installerPgid !== undefined) installer.installerPgid = current.installerPgid;
|
|
186
|
+
}
|
|
187
|
+
atomicJson(markerPath, { pid, phase, startedAt, ...installer,
|
|
188
|
+
...((phase === "mutating" || retainFence) ? { fenceUntil: startedAt + 900000 } : {}),
|
|
189
|
+
...(terminationUnconfirmed ? { terminationUnconfirmed: true } : {}) });
|
|
190
|
+
};
|
|
191
|
+
return {
|
|
192
|
+
start() {
|
|
193
|
+
if (state !== "new") throw new Error("orchestrated session already started");
|
|
194
|
+
result({ phase: "preflight" });
|
|
195
|
+
const acquired = tryAcquireUpdateSyncMutex(home, "update");
|
|
196
|
+
if (acquired.kind === "busy") {
|
|
197
|
+
const error = acquired.holder === "sync" ? "sync-in-progress" : "update-in-flight";
|
|
198
|
+
result({ phase: "refused", error }); state = "refused"; closeResult();
|
|
199
|
+
return { ok: false, error };
|
|
200
|
+
}
|
|
201
|
+
mutex = acquired;
|
|
202
|
+
if (inspectUpdateMarker(home) !== "free") {
|
|
203
|
+
mutex.release(); mutex = undefined;
|
|
204
|
+
result({ phase: "refused", error: "update-in-flight" }); state = "refused"; closeResult();
|
|
205
|
+
return { ok: false, error: "update-in-flight" };
|
|
206
|
+
}
|
|
207
|
+
try { startedAt = now(); marker("preflight"); }
|
|
208
|
+
catch (error) { mutex.release(); mutex = undefined; throw error; }
|
|
209
|
+
state = "preflight";
|
|
210
|
+
return { ok: true };
|
|
211
|
+
},
|
|
212
|
+
finishPreflight() {
|
|
213
|
+
if (state !== "preflight") return;
|
|
214
|
+
marker("failed");
|
|
215
|
+
mutex.release(); mutex = undefined; state = "finished"; closeResult();
|
|
216
|
+
},
|
|
217
|
+
async enterMutation() {
|
|
218
|
+
if (state !== "preflight") throw new Error("orchestrated session is not in preflight");
|
|
219
|
+
state = "entering";
|
|
220
|
+
marker("mutating");
|
|
221
|
+
result({ phase: "mutating" });
|
|
222
|
+
let error;
|
|
223
|
+
if (notAfter !== undefined && now() > notAfter) error = "deadline-passed";
|
|
224
|
+
else {
|
|
225
|
+
try { if (await verifyIdentity() !== true) error = "plan-changed"; }
|
|
226
|
+
catch { error = "plan-changed"; }
|
|
227
|
+
}
|
|
228
|
+
if (!error && notAfter !== undefined && now() > notAfter) error = "deadline-passed";
|
|
229
|
+
if (error) {
|
|
230
|
+
marker("refused");
|
|
231
|
+
result({ phase: "refused", error });
|
|
232
|
+
mutex.release(); mutex = undefined; state = "refused"; closeResult();
|
|
233
|
+
return { ok: false, error };
|
|
234
|
+
}
|
|
235
|
+
state = "mutating";
|
|
236
|
+
return { ok: true };
|
|
237
|
+
},
|
|
238
|
+
noteUntrackedInstaller() {
|
|
239
|
+
if (state !== "mutating") throw new Error("orchestrated session is not mutating");
|
|
240
|
+
marker("mutating", true, true); untrackedPending = true;
|
|
241
|
+
},
|
|
242
|
+
confirmInstallerExit() {
|
|
243
|
+
if (state !== "mutating" || !untrackedPending) throw new Error("no untracked installer");
|
|
244
|
+
marker("mutating", true); untrackedPending = false;
|
|
245
|
+
},
|
|
246
|
+
retainInstallerFence() {
|
|
247
|
+
if (state !== "mutating") throw new Error("orchestrated session is not mutating");
|
|
248
|
+
retainFence = true;
|
|
249
|
+
},
|
|
250
|
+
finish(outcome) {
|
|
251
|
+
if (state !== "mutating") throw new Error("orchestrated session is not mutating");
|
|
252
|
+
if (!outcome || (outcome.phase !== "installed" && outcome.phase !== "failed")) throw new Error("invalid final outcome");
|
|
253
|
+
if (untrackedPending) outcome = { phase: "failed", error: "installer-termination-unconfirmed", terminationConfirmed: false };
|
|
254
|
+
result(outcome);
|
|
255
|
+
marker(outcome.phase, true, outcome.error === "installer-termination-unconfirmed",
|
|
256
|
+
retainFence || outcome.terminationConfirmed === false || outcome.error === "installer-termination-unconfirmed" || outcome.error === "installer-timeout");
|
|
257
|
+
mutex.release(); mutex = undefined; state = "finished"; closeResult();
|
|
258
|
+
},
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
export function createLegacyUpdateSession({ home }) {
|
|
263
|
+
return createOrchestratedChildSession({ home, verifyIdentity: () => true });
|
|
264
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export interface UpdatePlanTokenInput {
|
|
2
|
+
currentVersion: string;
|
|
3
|
+
targetVersion: string | null;
|
|
4
|
+
installer: string;
|
|
5
|
+
cliRoot: string;
|
|
6
|
+
servingRoot: string | null;
|
|
7
|
+
runtimeOwner: string;
|
|
8
|
+
runtime: { pid: number; port: number; hostname: string; command: readonly string[] } | null;
|
|
9
|
+
}
|
|
10
|
+
export declare function createUpdatePlanToken(input: UpdatePlanTokenInput): string;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
|
|
3
|
+
/** Hash only the explicitly bound fields in a fixed order, never a runtime proof key. */
|
|
4
|
+
export function createUpdatePlanToken(input) {
|
|
5
|
+
const runtime = input.runtime === null ? null : {
|
|
6
|
+
pid: input.runtime.pid,
|
|
7
|
+
port: input.runtime.port,
|
|
8
|
+
hostname: input.runtime.hostname,
|
|
9
|
+
command: [...input.runtime.command],
|
|
10
|
+
};
|
|
11
|
+
const canonical = {
|
|
12
|
+
currentVersion: input.currentVersion,
|
|
13
|
+
targetVersion: input.targetVersion,
|
|
14
|
+
installer: input.installer,
|
|
15
|
+
cliRoot: input.cliRoot,
|
|
16
|
+
servingRoot: input.servingRoot,
|
|
17
|
+
runtimeOwner: input.runtimeOwner,
|
|
18
|
+
runtime,
|
|
19
|
+
};
|
|
20
|
+
return createHash("sha256").update(JSON.stringify(canonical)).digest("base64url");
|
|
21
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function verifyOrchestratedInstall(root: string, version: string, installer: "npm" | "bun"): boolean;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { readFileSync, statSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { verifyInstallTree } from "./transactional-install.mjs";
|
|
4
|
+
|
|
5
|
+
/** npm and Bun verification reads the active tree only; retained backup siblings are irrelevant. */
|
|
6
|
+
export function verifyOrchestratedInstall(root, version, installer) {
|
|
7
|
+
if (installer !== "npm" && installer !== "bun") return false;
|
|
8
|
+
try {
|
|
9
|
+
const manifest = JSON.parse(readFileSync(join(root, "package.json"), "utf8"));
|
|
10
|
+
if (manifest.version !== version || !manifest.dependencies?.bun || !manifest.dependencies?.zod) return false;
|
|
11
|
+
const source = statSync(join(root, "src", "cli", "index.ts"));
|
|
12
|
+
return source.isFile() && source.size > 0 && verifyInstallTree(root, version).ok;
|
|
13
|
+
} catch { return false; }
|
|
14
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
export interface PnpmRunResult {
|
|
2
2
|
status: number | null;
|
|
3
|
+
processTreeExited?: boolean;
|
|
4
|
+
groupExited?: boolean;
|
|
3
5
|
stdout?: string | Uint8Array | null;
|
|
4
6
|
stderr?: string | Uint8Array | null;
|
|
5
7
|
}
|
|
@@ -119,6 +121,10 @@ export type PnpmGlobalUpdateResult =
|
|
|
119
121
|
ok: false;
|
|
120
122
|
phase: "preflight" | "install" | "rollback";
|
|
121
123
|
rolledBack?: boolean;
|
|
124
|
+
uncertain?: boolean;
|
|
125
|
+
processTreeExited?: boolean;
|
|
126
|
+
/** True only when a rollback transaction restored and verified the previous version. */
|
|
127
|
+
rollbackPerformed?: boolean;
|
|
122
128
|
activePath?: string;
|
|
123
129
|
globalDir?: string;
|
|
124
130
|
globalBinDir?: string;
|
|
@@ -512,8 +512,10 @@ export function runPnpmGlobalUpdate({
|
|
|
512
512
|
try {
|
|
513
513
|
install = runPnpm(ownerGlobalArgs(["add", "-g", PNPM_BUILD_APPROVAL, spec], owner), false);
|
|
514
514
|
} catch {
|
|
515
|
-
install = { status:
|
|
515
|
+
install = { status: null, processTreeExited: false };
|
|
516
516
|
}
|
|
517
|
+
if (!Number.isInteger(install?.status) || install?.processTreeExited === false || install?.groupExited === false) return { ok: false, phase: "install", processTreeExited: false, rolledBack: false, uncertain: true,
|
|
518
|
+
error: "installer-termination-unconfirmed" };
|
|
517
519
|
|
|
518
520
|
// The package path may switch to a different group link, so only constrain
|
|
519
521
|
// the group/bin pair after the command; the active package path is intentionally open.
|
|
@@ -548,6 +550,7 @@ export function runPnpmGlobalUpdate({
|
|
|
548
550
|
ok: false,
|
|
549
551
|
phase: "install",
|
|
550
552
|
rolledBack: true,
|
|
553
|
+
rollbackPerformed: false,
|
|
551
554
|
activePath: after.path,
|
|
552
555
|
globalDir: owner.globalDir,
|
|
553
556
|
globalBinDir: owner.globalBinDir,
|
|
@@ -560,8 +563,10 @@ export function runPnpmGlobalUpdate({
|
|
|
560
563
|
try {
|
|
561
564
|
rollback = runPnpm(ownerGlobalArgs(["add", "-g", PNPM_BUILD_APPROVAL, packageSpec(packageName, before.version)], owner), false);
|
|
562
565
|
} catch {
|
|
563
|
-
rollback = { status:
|
|
566
|
+
rollback = { status: null, processTreeExited: false };
|
|
564
567
|
}
|
|
568
|
+
if (!Number.isInteger(rollback?.status) || rollback?.processTreeExited === false || rollback?.groupExited === false) return { ok: false, phase: "rollback", processTreeExited: false, rolledBack: false, uncertain: true,
|
|
569
|
+
error: "installer-termination-unconfirmed" };
|
|
565
570
|
const restored = readPnpmGlobalPackage(
|
|
566
571
|
packageName,
|
|
567
572
|
runPnpm,
|
|
@@ -573,6 +578,7 @@ export function runPnpmGlobalUpdate({
|
|
|
573
578
|
ok: false,
|
|
574
579
|
phase: "rollback",
|
|
575
580
|
rolledBack: true,
|
|
581
|
+
rollbackPerformed: true,
|
|
576
582
|
activePath: restored.path,
|
|
577
583
|
globalDir: owner.globalDir,
|
|
578
584
|
globalBinDir: owner.globalBinDir,
|
|
@@ -583,6 +589,7 @@ export function runPnpmGlobalUpdate({
|
|
|
583
589
|
ok: false,
|
|
584
590
|
phase: "rollback",
|
|
585
591
|
rolledBack: false,
|
|
592
|
+
rollbackPerformed: false,
|
|
586
593
|
...(restored.ok ? { activePath: restored.path } : {}),
|
|
587
594
|
globalDir: owner.globalDir,
|
|
588
595
|
globalBinDir: owner.globalBinDir,
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { runPosixInstallerSupervisorMain } from "./posix-install-supervisor.mjs";
|
|
2
|
+
|
|
3
|
+
runPosixInstallerSupervisorMain().catch(error => {
|
|
4
|
+
console.error("opencodex: installer supervisor failed: " + (error instanceof Error ? error.message : String(error)));
|
|
5
|
+
process.exitCode = 1;
|
|
6
|
+
});
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare function runPosixInstallerSync(options: {
|
|
2
|
+
file: string;
|
|
3
|
+
args: string[];
|
|
4
|
+
markerPath: string;
|
|
5
|
+
timeoutMs?: number;
|
|
6
|
+
env?: NodeJS.ProcessEnv;
|
|
7
|
+
cwd?: string;
|
|
8
|
+
authorizeMutation?: (kind: "package") => boolean;
|
|
9
|
+
}): { status: number | null; signal?: NodeJS.Signals | null; groupExited: boolean; groupKilled?: boolean; processTreeExited?: boolean };
|
|
10
|
+
export declare function runPosixInstallerSupervisorMain(): Promise<void>;
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { guardedSpawnSync } from "./mutation-guard.mjs";
|
|
3
|
+
import { readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
|
|
4
|
+
import { fileURLToPath } from "node:url";
|
|
5
|
+
import { dirname, join } from "node:path";
|
|
6
|
+
import { randomUUID } from "node:crypto";
|
|
7
|
+
|
|
8
|
+
// The supervisor runs through a dedicated entry file: this library is also bundled into the
|
|
9
|
+
// compiled CLI, where every module shares one entry URL, so it must have no top-level effects.
|
|
10
|
+
const entry = join(dirname(fileURLToPath(import.meta.url)), "posix-install-supervisor-entry.mjs");
|
|
11
|
+
const failed = message => ({ status: null, groupExited: false, processTreeExited: false, error: { code: "EINSTALLJOIN", message } });
|
|
12
|
+
|
|
13
|
+
// The synchronous transaction waits for this separate supervisor, which keeps a
|
|
14
|
+
// detached group leader blocked until its pid and pgid are durable in the marker.
|
|
15
|
+
export function runPosixInstallerSync({ file, args, markerPath, timeoutMs = 180000, env, cwd, authorizeMutation = () => true }) {
|
|
16
|
+
if (!authorizeMutation("package")) return { status: 1, groupExited: true, groupKilled: false };
|
|
17
|
+
const input = JSON.stringify({ file, args, markerPath, timeoutMs, cwd });
|
|
18
|
+
const result = guardedSpawnSync(authorizeMutation, "package", process.execPath, [entry, "supervise"], { input, encoding: "utf8", env, cwd, stdio: ["pipe", "pipe", "inherit"] });
|
|
19
|
+
try {
|
|
20
|
+
const value = JSON.parse(result.stdout);
|
|
21
|
+
if (result.status !== 0 || typeof value.groupExited !== "boolean" || typeof value.groupKilled !== "boolean"
|
|
22
|
+
|| !(value.status === null || Number.isInteger(value.status)) || !(value.signal === null || typeof value.signal === "string")) throw Error("invalid result");
|
|
23
|
+
return value;
|
|
24
|
+
} catch { return failed("installer supervisor did not confirm process-tree exit"); }
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function publish(path, pid) {
|
|
28
|
+
const marker = JSON.parse(readFileSync(path, "utf8"));
|
|
29
|
+
if (marker.phase !== "mutating" || !Number.isSafeInteger(marker.pid)) throw Error("invalid update marker");
|
|
30
|
+
const temp = `${path}.${randomUUID()}.tmp`;
|
|
31
|
+
let created = false;
|
|
32
|
+
try {
|
|
33
|
+
writeFileSync(temp, JSON.stringify({ ...marker, installerPid: pid, installerPgid: pid }), { flag: "wx", mode: 0o600 });
|
|
34
|
+
created = true;
|
|
35
|
+
renameSync(temp, path);
|
|
36
|
+
created = false;
|
|
37
|
+
} finally {
|
|
38
|
+
if (created) try { unlinkSync(temp); } catch (error) { if (error.code !== "ENOENT") throw error; }
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function alive(pgid) {
|
|
43
|
+
try { process.kill(-pgid, 0); return true; }
|
|
44
|
+
catch (error) { if (error.code === "ESRCH") return false; if (error.code === "EPERM") return true; throw error; }
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
async function supervise(config) {
|
|
48
|
+
const group = spawn(process.execPath, [entry, "install"], { detached: true, stdio: ["pipe", "ignore", "inherit"], cwd: config.cwd, env: process.env });
|
|
49
|
+
const spawned = await new Promise(resolve => { group.once("spawn", () => resolve(true)); group.once("error", () => resolve(false)); });
|
|
50
|
+
if (!spawned || !group.pid) return { status: null, groupExited: true, processTreeExited: false, error: { code: "ESPAWN", message: "installer group could not start" } };
|
|
51
|
+
const pid = group.pid;
|
|
52
|
+
try { publish(config.markerPath, pid); }
|
|
53
|
+
catch (error) {
|
|
54
|
+
try { process.kill(-pid, "SIGKILL"); }
|
|
55
|
+
catch (killError) { if (killError.code !== "ESRCH") return failed(`could not publish or terminate installer group: ${killError.message}`); }
|
|
56
|
+
return failed(`could not publish installer group: ${error.message}`);
|
|
57
|
+
}
|
|
58
|
+
const closed = new Promise(resolve => group.once("close", (status, signal) => resolve({ status, signal })));
|
|
59
|
+
group.stdin.on("error", () => {});
|
|
60
|
+
group.stdin.end(JSON.stringify({ file: config.file, args: config.args, cwd: config.cwd }));
|
|
61
|
+
let timer;
|
|
62
|
+
const timed = new Promise(resolve => { timer = setTimeout(() => resolve(null), config.timeoutMs); });
|
|
63
|
+
const result = await Promise.race([closed, timed]); clearTimeout(timer);
|
|
64
|
+
// Even an exited leader may have left descendants in its process group.
|
|
65
|
+
let groupKilled = false;
|
|
66
|
+
try { if (alive(pid)) { process.kill(-pid, "SIGKILL"); groupKilled = true; } }
|
|
67
|
+
catch (error) { if (error.code !== "ESRCH") return failed("could not terminate installer group"); }
|
|
68
|
+
const deadline = Date.now() + 10000;
|
|
69
|
+
while (Date.now() < deadline) {
|
|
70
|
+
try { if (!alive(pid)) return { status: result?.status ?? null, signal: result?.signal ?? null, groupExited: true, groupKilled,
|
|
71
|
+
...(result?.status == null ? { processTreeExited: false } : {}) }; }
|
|
72
|
+
catch (error) { return failed(`could not inspect installer group: ${error.code ?? error.message}`); }
|
|
73
|
+
await new Promise(resolve => setTimeout(resolve, 50));
|
|
74
|
+
}
|
|
75
|
+
return failed("installer group termination was not confirmed");
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/** Entry-point body for posix-install-supervisor-entry.mjs. */
|
|
79
|
+
export async function runPosixInstallerSupervisorMain() {
|
|
80
|
+
const input = JSON.parse(readFileSync(0, "utf8"));
|
|
81
|
+
if (process.argv[2] === "supervise") {
|
|
82
|
+
console.log(JSON.stringify(await supervise(input)));
|
|
83
|
+
} else if (process.argv[2] === "install") {
|
|
84
|
+
const child = spawn(input.file, input.args, { cwd: input.cwd, env: process.env, stdio: ["ignore", "inherit", "inherit"] });
|
|
85
|
+
child.on("error", () => { process.exitCode = 1; });
|
|
86
|
+
child.on("close", (code, signal) => { if (signal) process.kill(process.pid, signal); else process.exitCode = code ?? 1; });
|
|
87
|
+
}
|
|
88
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export type Holder = "sync" | "update" | "free" | "unknown";
|
|
2
|
+
export type Observation = "free" | "active" | "unknown";
|
|
3
|
+
export type Acquisition = { kind: "acquired"; addDelegate(pid: number): void; release(): void } | { kind: "busy"; holder: Exclude<Holder, "free"> };
|
|
4
|
+
export declare function tryAcquireUpdateSyncMutex(home: string, kind: "sync" | "update", deps?: { now?: () => number; processAlive?: (pid: number) => boolean }): Acquisition;
|
|
5
|
+
export declare function inspectUpdateSyncMutex(home: string): Holder;
|
|
6
|
+
export declare function parentHoldsSyncMutex(home: string, claimedPid?: string): boolean;
|
|
7
|
+
export declare function refuseSync(reason: "update-in-flight" | "sync-in-progress", args: readonly string[]): number;
|
|
8
|
+
export declare function acquireSyncGuard(home: string, args: readonly string[]): { kind: "acquired"; addDelegate(pid: number): void; release(): void } | { kind: "refused"; exit: number };
|
|
9
|
+
export declare function inspectUpdateMarker(home: string, deps?: { now?: () => number }): Observation;
|
|
10
|
+
export declare function isUpdateInFlight(home: string, deps?: { mutex(home: string): Holder; ownershipLease(home: string): Observation; marker(home: string): Observation }): boolean;
|