@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -10,12 +10,14 @@ import {
|
|
|
10
10
|
renameSync,
|
|
11
11
|
unlinkSync,
|
|
12
12
|
writeFileSync,
|
|
13
|
+
type BigIntStats,
|
|
13
14
|
type Stats,
|
|
14
15
|
} from "node:fs";
|
|
15
16
|
import { randomUUID } from "node:crypto";
|
|
16
17
|
import { dirname, isAbsolute, join, resolve } from "node:path";
|
|
17
18
|
import { getConfigDir } from "../config";
|
|
18
19
|
import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
20
|
+
import { sameFileIdentity, statTimeMs } from "../lib/file-identity";
|
|
19
21
|
|
|
20
22
|
export const CODEX_SHIM_STATE_MAX_BYTES = 1024 * 1024;
|
|
21
23
|
|
|
@@ -99,9 +101,9 @@ function fileErrorCode(error: unknown): string | undefined {
|
|
|
99
101
|
}
|
|
100
102
|
|
|
101
103
|
function readBoundedRegularFile(path: string, maxBytes: number): { bytes: Buffer; content: string; stat: Stats } | { warning: string } | null {
|
|
102
|
-
let lexicalBefore:
|
|
104
|
+
let lexicalBefore: BigIntStats;
|
|
103
105
|
try {
|
|
104
|
-
lexicalBefore = lstatSync(path);
|
|
106
|
+
lexicalBefore = lstatSync(path, { bigint: true });
|
|
105
107
|
if (lexicalBefore.isSymbolicLink() || !lexicalBefore.isFile()) {
|
|
106
108
|
return { warning: `Codex shim state is not a direct regular file at ${path}; auto-restore skipped.` };
|
|
107
109
|
}
|
|
@@ -117,12 +119,12 @@ function readBoundedRegularFile(path: string, maxBytes: number): { bytes: Buffer
|
|
|
117
119
|
return { warning: `Codex shim state could not be opened as a regular file at ${path}.` };
|
|
118
120
|
}
|
|
119
121
|
try {
|
|
120
|
-
const before = fstatSync(fd);
|
|
122
|
+
const before = fstatSync(fd, { bigint: true });
|
|
121
123
|
if (!before.isFile()) return { warning: `Codex shim state is not a regular file at ${path}; auto-restore skipped.` };
|
|
122
124
|
if (before.size > maxBytes) {
|
|
123
125
|
return { warning: `Codex shim state exceeds the 1 MiB startup limit at ${path}; auto-restore skipped.` };
|
|
124
126
|
}
|
|
125
|
-
const buffer = Buffer.allocUnsafe(before.size);
|
|
127
|
+
const buffer = Buffer.allocUnsafe(Number(before.size));
|
|
126
128
|
let offset = 0;
|
|
127
129
|
while (offset < buffer.length) {
|
|
128
130
|
const bytesRead = readSync(fd, buffer, offset, buffer.length - offset, offset);
|
|
@@ -133,25 +135,31 @@ function readBoundedRegularFile(path: string, maxBytes: number): { bytes: Buffer
|
|
|
133
135
|
if (readSync(fd, extra, 0, 1, offset) !== 0) {
|
|
134
136
|
return { warning: `Codex shim state exceeds the 1 MiB startup limit at ${path}; auto-restore skipped.` };
|
|
135
137
|
}
|
|
136
|
-
const after = fstatSync(fd);
|
|
137
|
-
let lexicalAfter:
|
|
138
|
+
const after = fstatSync(fd, { bigint: true });
|
|
139
|
+
let lexicalAfter: BigIntStats;
|
|
138
140
|
try {
|
|
139
|
-
lexicalAfter = lstatSync(path);
|
|
141
|
+
lexicalAfter = lstatSync(path, { bigint: true });
|
|
140
142
|
} catch {
|
|
141
143
|
return { warning: `Codex shim state changed while being read at ${path}; auto-restore skipped.` };
|
|
142
144
|
}
|
|
143
|
-
if (before
|
|
144
|
-
|| before.
|
|
145
|
+
if (!sameFileIdentity(before, after) || before.size !== after.size
|
|
146
|
+
|| statTimeMs(before.mtimeNs) !== statTimeMs(after.mtimeNs) || statTimeMs(before.ctimeNs) !== statTimeMs(after.ctimeNs)
|
|
145
147
|
|| before.mode !== after.mode || before.uid !== after.uid
|
|
146
|
-
|| lexicalBefore
|
|
148
|
+
|| !sameFileIdentity(lexicalBefore, before)
|
|
147
149
|
|| lexicalBefore.mode !== before.mode || lexicalBefore.uid !== before.uid
|
|
148
|
-
|| lexicalBefore.size !== before.size || lexicalBefore.
|
|
149
|
-
|| !lexicalAfter.isFile() || lexicalAfter.isSymbolicLink() || lexicalAfter
|
|
150
|
+
|| lexicalBefore.size !== before.size || statTimeMs(lexicalBefore.mtimeNs) !== statTimeMs(before.mtimeNs) || statTimeMs(lexicalBefore.ctimeNs) !== statTimeMs(before.ctimeNs)
|
|
151
|
+
|| !lexicalAfter.isFile() || lexicalAfter.isSymbolicLink() || !sameFileIdentity(lexicalAfter, after)
|
|
150
152
|
|| lexicalAfter.mode !== after.mode || lexicalAfter.uid !== after.uid
|
|
151
|
-
|| lexicalAfter.size !== after.size || lexicalAfter.
|
|
153
|
+
|| lexicalAfter.size !== after.size || statTimeMs(lexicalAfter.mtimeNs) !== statTimeMs(after.mtimeNs) || statTimeMs(lexicalAfter.ctimeNs) !== statTimeMs(after.ctimeNs)) {
|
|
152
154
|
return { warning: `Codex shim state changed while being read at ${path}; auto-restore skipped.` };
|
|
153
155
|
}
|
|
154
|
-
|
|
156
|
+
const stat = Object.assign(Object.create(Object.getPrototypeOf(after)), after, {
|
|
157
|
+
dev: Number(after.dev), ino: Number(after.ino), mode: Number(after.mode), nlink: Number(after.nlink),
|
|
158
|
+
uid: Number(after.uid), gid: Number(after.gid), rdev: Number(after.rdev), size: Number(after.size),
|
|
159
|
+
blksize: Number(after.blksize), blocks: Number(after.blocks), atimeMs: statTimeMs(after.atimeNs),
|
|
160
|
+
mtimeMs: statTimeMs(after.mtimeNs), ctimeMs: statTimeMs(after.ctimeNs), birthtimeMs: statTimeMs(after.birthtimeNs),
|
|
161
|
+
}) as Stats;
|
|
162
|
+
return { bytes: buffer, content: buffer.toString("utf8"), stat };
|
|
155
163
|
} finally {
|
|
156
164
|
closeSync(fd);
|
|
157
165
|
}
|
|
@@ -35,7 +35,10 @@ const CODEX_SHIM_REENTRY_DIAGNOSTIC = "opencodex: saved Codex launcher resolved
|
|
|
35
35
|
*/
|
|
36
36
|
export const CODEX_SHIM_ENSURE_FAILED_DIAGNOSTIC = "opencodex: proxy autostart failed; launching Codex anyway. Run 'ocx doctor' for details, or 'ocx restore' to hand Codex back to its own account.";
|
|
37
37
|
|
|
38
|
-
|
|
38
|
+
// Shared with launchers that speak the same argv vocabulary (`ocx codex`): the
|
|
39
|
+
// generated shell templates inline this grammar, so the sets are the single
|
|
40
|
+
// source and the shell text is the consumer, not the definition.
|
|
41
|
+
export const CODEX_INTERNAL_COMMANDS = [
|
|
39
42
|
"app-server",
|
|
40
43
|
"archive",
|
|
41
44
|
"apply",
|
|
@@ -60,7 +63,7 @@ const CODEX_INTERNAL_COMMANDS = [
|
|
|
60
63
|
// Codex accepts global options before a subcommand. The shim must skip the value belonging to
|
|
61
64
|
// these options before it decides which first positional token is the real subcommand. Keep this
|
|
62
65
|
// list aligned with `codex --help`; `--option=value` and attached short forms stay one token.
|
|
63
|
-
const CODEX_GLOBAL_OPTIONS_WITH_VALUE = [
|
|
66
|
+
export const CODEX_GLOBAL_OPTIONS_WITH_VALUE = [
|
|
64
67
|
"-c", "--config",
|
|
65
68
|
"--enable", "--disable",
|
|
66
69
|
"--remote", "--remote-auth-token-env",
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Wrapper write and ownership fingerprint for the Codex autostart shim.
|
|
3
|
+
*
|
|
4
|
+
* Extracted from shim.ts so the parent module stays inside the file-size
|
|
5
|
+
* ratchet. This cluster is a closed dependency edge: everything here flows
|
|
6
|
+
* from node:fs/node:path, the shim template builders, and the fingerprint
|
|
7
|
+
* probes — nothing imports back into shim.ts.
|
|
8
|
+
*/
|
|
9
|
+
import { randomUUID } from "node:crypto";
|
|
10
|
+
import { chmodSync, lstatSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
|
|
11
|
+
import { basename, dirname, join } from "node:path";
|
|
12
|
+
import { durableBunRuntime, type BunRuntimeSource, type DurableBunRuntime } from "../lib/bun-runtime";
|
|
13
|
+
import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
|
|
14
|
+
import { serviceApiTokenFilePath } from "../lib/service-secrets";
|
|
15
|
+
import {
|
|
16
|
+
buildUnixCodexShim,
|
|
17
|
+
buildWindowsCodexShim,
|
|
18
|
+
buildWindowsPowerShellCodexShim,
|
|
19
|
+
gitBashPath,
|
|
20
|
+
SHIM_MARKER,
|
|
21
|
+
} from "./shim-templates";
|
|
22
|
+
import {
|
|
23
|
+
sameFingerprint,
|
|
24
|
+
stableShimPathProbe,
|
|
25
|
+
type ShimPathFingerprint,
|
|
26
|
+
type StableShimPathProbe,
|
|
27
|
+
} from "./shim-fingerprint";
|
|
28
|
+
|
|
29
|
+
function cliEntry(runtime: DurableBunRuntime = durableBunRuntime()): { bun: string; bunRuntimeSource: BunRuntimeSource; cli: string } {
|
|
30
|
+
// Bundled Bun path (survives `ocx update`); all three shim builders
|
|
31
|
+
// (Unix / Windows cmd / Windows PowerShell) receive it via this entry.
|
|
32
|
+
// This module lives in src/codex/, the CLI entry in src/cli/index.ts.
|
|
33
|
+
// Path and provenance resolve together so the marker always describes this binary.
|
|
34
|
+
return { bun: runtime.path, bunRuntimeSource: runtime.source, cli: join(import.meta.dir, "..", "cli", "index.ts") };
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Write the wrapper and return the identity of the inode this call created, or
|
|
39
|
+
* `undefined` where the platform still writes the destination in place.
|
|
40
|
+
*
|
|
41
|
+
* Callers must derive ownership from the returned identity rather than from a
|
|
42
|
+
* later `stat` of `wrapperPath`: the shim markers are public, so a concurrent
|
|
43
|
+
* updater's wrapper can carry them, and a replacement landing between the write
|
|
44
|
+
* and the observation is otherwise indistinguishable from our own file.
|
|
45
|
+
*/
|
|
46
|
+
/** The Windows wrapper for `wrapperPath`'s flavor (.ps1, .cmd/.bat, or extensionless Git-Bash sh). */
|
|
47
|
+
export function windowsShimContent(wrapperPath: string, realCodexPath: string, runtime?: DurableBunRuntime): string {
|
|
48
|
+
const { bun, bunRuntimeSource, cli } = cliEntry(runtime);
|
|
49
|
+
const lower = wrapperPath.toLowerCase();
|
|
50
|
+
// UTF-8 BOM: Windows PowerShell 5.1 decodes BOM-less .ps1 files in the ANSI
|
|
51
|
+
// codepage, which mangles non-ASCII paths embedded in the shim.
|
|
52
|
+
if (lower.endsWith(".ps1")) return `\uFEFF${buildWindowsPowerShellCodexShim(realCodexPath, bun, cli, bunRuntimeSource)}`;
|
|
53
|
+
if (lower.endsWith(".cmd") || lower.endsWith(".bat")) return buildWindowsCodexShim(realCodexPath, bun, cli, bunRuntimeSource);
|
|
54
|
+
// Extensionless Git-Bash sh launcher: sh shim with forward-slash paths.
|
|
55
|
+
return buildUnixCodexShim(gitBashPath(realCodexPath), gitBashPath(bun), gitBashPath(cli), bunRuntimeSource, gitBashPath(serviceApiTokenFilePath()));
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export function writeShim(wrapperPath: string, realCodexPath: string, runtime?: DurableBunRuntime): FileIdentity | undefined {
|
|
59
|
+
const { bun, bunRuntimeSource, cli } = cliEntry(runtime);
|
|
60
|
+
if (process.platform === "win32") {
|
|
61
|
+
writeFileSync(wrapperPath, windowsShimContent(wrapperPath, realCodexPath, runtime), "utf8");
|
|
62
|
+
return undefined;
|
|
63
|
+
} else {
|
|
64
|
+
// Stage the wrapper as its own inode and rename it into place, so ownership
|
|
65
|
+
// comes from the write itself rather than from observing the path afterwards.
|
|
66
|
+
// Writing the destination directly leaves a window in which a concurrent
|
|
67
|
+
// updater can replace the file between our write and our fingerprint; we would
|
|
68
|
+
// then adopt that replacement as ours and unlink it during rollback, deleting
|
|
69
|
+
// an executable we never wrote.
|
|
70
|
+
// Hidden and non-executable while staged, so a crash between the write and the
|
|
71
|
+
// rename cannot leave an executable `codex*` artifact that a glob or a shell
|
|
72
|
+
// completion would surface.
|
|
73
|
+
const staged = join(dirname(wrapperPath), `.${basename(wrapperPath)}.opencodex-staging.${process.pid}.${randomUUID()}`);
|
|
74
|
+
let renamed = false;
|
|
75
|
+
try {
|
|
76
|
+
// "wx" fails if the staging path somehow exists, so we never inherit a file.
|
|
77
|
+
writeFileSync(staged, buildUnixCodexShim(realCodexPath, bun, cli, bunRuntimeSource), { encoding: "utf8", flag: "wx", mode: 0o600 });
|
|
78
|
+
const stagedStat = lstatSync(staged, { bigint: true });
|
|
79
|
+
chmodSync(staged, 0o755);
|
|
80
|
+
renameSync(staged, wrapperPath);
|
|
81
|
+
renamed = true;
|
|
82
|
+
// rename() preserves dev/ino and updates ctime, so identity is the inode
|
|
83
|
+
// pair, captured from the file we created rather than from the destination.
|
|
84
|
+
return { dev: stagedStat.dev, ino: stagedStat.ino };
|
|
85
|
+
} finally {
|
|
86
|
+
if (!renamed) {
|
|
87
|
+
try { unlinkSync(staged); } catch { /* best-effort: nothing to clean up */ }
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* The fingerprint to record as "we wrote this", or `undefined` when the file at
|
|
95
|
+
* `wrapperPath` is not the inode `writeShim()` created. Returning `undefined`
|
|
96
|
+
* makes every rollback path treat the file as someone else's and leave it alone.
|
|
97
|
+
*/
|
|
98
|
+
export function ownedWrapperFingerprint(
|
|
99
|
+
wrapperPath: string,
|
|
100
|
+
written: FileIdentity | undefined,
|
|
101
|
+
): ShimPathFingerprint | undefined {
|
|
102
|
+
const probe = stableShimPathProbe(wrapperPath);
|
|
103
|
+
if (!probe) return undefined;
|
|
104
|
+
// Platforms that still write in place (Windows) have no staged identity; fall
|
|
105
|
+
// back to the marker check they have always used.
|
|
106
|
+
if (!written) return probe.prefix.includes(SHIM_MARKER) ? probe.fingerprint : undefined;
|
|
107
|
+
if (!sameFileIdentity(probe.fingerprint.identity, written)) return undefined;
|
|
108
|
+
return probe.fingerprint;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* Whether the file now at the wrapper path is one this transaction may unlink.
|
|
113
|
+
*
|
|
114
|
+
* The inode our write created is the authority. It stays ours through an in-place
|
|
115
|
+
* truncation — a partial write we must clean up — and stops being ours the moment
|
|
116
|
+
* someone renames a different file over the path, which is exactly the concurrent
|
|
117
|
+
* updater we must not delete. Where no inode was recorded (Windows writes the
|
|
118
|
+
* destination directly), fall back to the exact fingerprint recorded at the time.
|
|
119
|
+
*/
|
|
120
|
+
export function wrapperInodeIsOurs(
|
|
121
|
+
wrapper: StableShimPathProbe,
|
|
122
|
+
written: FileIdentity | undefined,
|
|
123
|
+
recorded: ShimPathFingerprint | undefined,
|
|
124
|
+
): boolean {
|
|
125
|
+
// A different inode is conclusive: someone renamed their own file over ours.
|
|
126
|
+
if (written && !sameFileIdentity(wrapper.fingerprint.identity, written)) {
|
|
127
|
+
return false;
|
|
128
|
+
}
|
|
129
|
+
// Same inode is not sufficient on its own — an in-place truncation (shell `>`,
|
|
130
|
+
// writeFileSync) keeps it while replacing the contents. When we recorded a full
|
|
131
|
+
// fingerprint, require it to still match; that covers our own partial write,
|
|
132
|
+
// whose fingerprint we record before anything can fail.
|
|
133
|
+
if (recorded !== undefined) return sameFingerprint(wrapper.fingerprint, recorded);
|
|
134
|
+
// No recorded fingerprint: only the inode identity we captured at write time can
|
|
135
|
+
// speak for us, and there is nothing else to distinguish this file.
|
|
136
|
+
return written !== undefined;
|
|
137
|
+
}
|
package/src/codex/shim.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { beginCodexCliSelectionParentWrite, withCodexCliSelectionParentWriteAsync, CodexCliSelectionMutationBusyError } from "./cli-update-selection-gate";
|
|
2
3
|
import {
|
|
3
|
-
chmodSync,
|
|
4
4
|
existsSync,
|
|
5
5
|
lstatSync,
|
|
6
6
|
readFileSync,
|
|
@@ -8,22 +8,14 @@ import {
|
|
|
8
8
|
unlinkSync,
|
|
9
9
|
writeFileSync,
|
|
10
10
|
} from "node:fs";
|
|
11
|
-
import {
|
|
11
|
+
import { delimiter, extname, join, posix, win32 } from "node:path";
|
|
12
12
|
import { durableBunRuntime, type DurableBunRuntime } from "../lib/bun-runtime";
|
|
13
|
+
import type { FileIdentity } from "../lib/file-identity";
|
|
13
14
|
import { assertSelectedRuntimeWritable, RuntimePreflightError, type RuntimePreflightDeps } from "../lib/bun-runtime-preflight";
|
|
14
15
|
import { getConfigDir } from "../config";
|
|
15
|
-
import type { BunRuntimeSource } from "../lib/bun-runtime";
|
|
16
|
-
import { serviceApiTokenFilePath } from "../lib/service-secrets";
|
|
17
16
|
import { isWslRuntime, wslAutomountRoot } from "./home";
|
|
18
17
|
import { truncateRetainedUtf8 } from "../lib/admission";
|
|
19
|
-
import {
|
|
20
|
-
buildUnixCodexShim,
|
|
21
|
-
buildWindowsCodexShim,
|
|
22
|
-
buildWindowsPowerShellCodexShim,
|
|
23
|
-
gitBashPath,
|
|
24
|
-
SHIM_MARKER,
|
|
25
|
-
UNIX_SHIM_REVISION_MARKER,
|
|
26
|
-
} from "./shim-templates";
|
|
18
|
+
import { SHIM_MARKER, UNIX_SHIM_REVISION_MARKER } from "./shim-templates";
|
|
27
19
|
import {
|
|
28
20
|
hasUsableBackingPath,
|
|
29
21
|
isCurrentShimProbe,
|
|
@@ -65,6 +57,7 @@ import {
|
|
|
65
57
|
resolveStableFnmCodexPath,
|
|
66
58
|
type CodexPathScanDeps,
|
|
67
59
|
} from "./shim-path-resolution";
|
|
60
|
+
import { ownedWrapperFingerprint, windowsShimContent, wrapperInodeIsOurs, writeShim } from "./shim-wrapper-write";
|
|
68
61
|
|
|
69
62
|
export { buildUnixCodexShim, buildWindowsCodexShim, buildWindowsPowerShellCodexShim } from "./shim-templates";
|
|
70
63
|
export { isVersionManagerOwnedCodexPath } from "./shim-fingerprint";
|
|
@@ -111,14 +104,6 @@ export type CodexShimAutoRestoreResult =
|
|
|
111
104
|
| { status: "ineligible" | "deferred"; message?: string }
|
|
112
105
|
| { status: "restored"; message: string };
|
|
113
106
|
|
|
114
|
-
function cliEntry(runtime: DurableBunRuntime = durableBunRuntime()): { bun: string; bunRuntimeSource: BunRuntimeSource; cli: string } {
|
|
115
|
-
// Bundled Bun path (survives `ocx update`); all three shim builders
|
|
116
|
-
// (Unix / Windows cmd / Windows PowerShell) receive it via this entry.
|
|
117
|
-
// This module lives in src/codex/, the CLI entry in src/cli/index.ts.
|
|
118
|
-
// Path and provenance resolve together so the marker always describes this binary.
|
|
119
|
-
return { bun: runtime.path, bunRuntimeSource: runtime.source, cli: join(import.meta.dir, "..", "cli", "index.ts") };
|
|
120
|
-
}
|
|
121
|
-
|
|
122
107
|
function commandNames(name: string): string[] {
|
|
123
108
|
if (process.platform !== "win32") return [name];
|
|
124
109
|
const exts = (process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD;.PS1").split(";").filter(Boolean);
|
|
@@ -280,7 +265,7 @@ interface FreshShimInstallJournalEntry {
|
|
|
280
265
|
writtenWrapperFingerprint?: ShimPathFingerprint;
|
|
281
266
|
wrapperWriteStarted: boolean;
|
|
282
267
|
/** dev/ino of the file our `writeShim()` created, recorded before anything can fail. */
|
|
283
|
-
writtenWrapperInode?:
|
|
268
|
+
writtenWrapperInode?: FileIdentity;
|
|
284
269
|
}
|
|
285
270
|
|
|
286
271
|
function rollbackFreshShimInstall(journal: readonly FreshShimInstallJournalEntry[]): void {
|
|
@@ -341,108 +326,6 @@ function rollbackFreshShimInstall(journal: readonly FreshShimInstallJournalEntry
|
|
|
341
326
|
if (errors.length > 0) throw new AggregateError(errors, "Codex shim install validation rollback failed");
|
|
342
327
|
}
|
|
343
328
|
|
|
344
|
-
/**
|
|
345
|
-
* Write the wrapper and return the identity of the inode this call created, or
|
|
346
|
-
* `undefined` where the platform still writes the destination in place.
|
|
347
|
-
*
|
|
348
|
-
* Callers must derive ownership from the returned identity rather than from a
|
|
349
|
-
* later `stat` of `wrapperPath`: the shim markers are public, so a concurrent
|
|
350
|
-
* updater's wrapper can carry them, and a replacement landing between the write
|
|
351
|
-
* and the observation is otherwise indistinguishable from our own file.
|
|
352
|
-
*/
|
|
353
|
-
/** The Windows wrapper for `wrapperPath`'s flavor (.ps1, .cmd/.bat, or extensionless Git-Bash sh). */
|
|
354
|
-
function windowsShimContent(wrapperPath: string, realCodexPath: string, runtime?: DurableBunRuntime): string {
|
|
355
|
-
const { bun, bunRuntimeSource, cli } = cliEntry(runtime);
|
|
356
|
-
const lower = wrapperPath.toLowerCase();
|
|
357
|
-
// UTF-8 BOM: Windows PowerShell 5.1 decodes BOM-less .ps1 files in the ANSI
|
|
358
|
-
// codepage, which mangles non-ASCII paths embedded in the shim.
|
|
359
|
-
if (lower.endsWith(".ps1")) return `\uFEFF${buildWindowsPowerShellCodexShim(realCodexPath, bun, cli, bunRuntimeSource)}`;
|
|
360
|
-
if (lower.endsWith(".cmd") || lower.endsWith(".bat")) return buildWindowsCodexShim(realCodexPath, bun, cli, bunRuntimeSource);
|
|
361
|
-
// Extensionless Git-Bash sh launcher: sh shim with forward-slash paths.
|
|
362
|
-
return buildUnixCodexShim(gitBashPath(realCodexPath), gitBashPath(bun), gitBashPath(cli), bunRuntimeSource, gitBashPath(serviceApiTokenFilePath()));
|
|
363
|
-
}
|
|
364
|
-
|
|
365
|
-
function writeShim(wrapperPath: string, realCodexPath: string, runtime?: DurableBunRuntime): { dev: number; ino: number } | undefined {
|
|
366
|
-
const { bun, bunRuntimeSource, cli } = cliEntry(runtime);
|
|
367
|
-
if (process.platform === "win32") {
|
|
368
|
-
writeFileSync(wrapperPath, windowsShimContent(wrapperPath, realCodexPath, runtime), "utf8");
|
|
369
|
-
return undefined;
|
|
370
|
-
} else {
|
|
371
|
-
// Stage the wrapper as its own inode and rename it into place, so ownership
|
|
372
|
-
// comes from the write itself rather than from observing the path afterwards.
|
|
373
|
-
// Writing the destination directly leaves a window in which a concurrent
|
|
374
|
-
// updater can replace the file between our write and our fingerprint; we would
|
|
375
|
-
// then adopt that replacement as ours and unlink it during rollback, deleting
|
|
376
|
-
// an executable we never wrote.
|
|
377
|
-
// Hidden and non-executable while staged, so a crash between the write and the
|
|
378
|
-
// rename cannot leave an executable `codex*` artifact that a glob or a shell
|
|
379
|
-
// completion would surface.
|
|
380
|
-
const staged = join(dirname(wrapperPath), `.${basename(wrapperPath)}.opencodex-staging.${process.pid}.${randomUUID()}`);
|
|
381
|
-
let renamed = false;
|
|
382
|
-
try {
|
|
383
|
-
// "wx" fails if the staging path somehow exists, so we never inherit a file.
|
|
384
|
-
writeFileSync(staged, buildUnixCodexShim(realCodexPath, bun, cli, bunRuntimeSource), { encoding: "utf8", flag: "wx", mode: 0o600 });
|
|
385
|
-
const stagedStat = lstatSync(staged);
|
|
386
|
-
chmodSync(staged, 0o755);
|
|
387
|
-
renameSync(staged, wrapperPath);
|
|
388
|
-
renamed = true;
|
|
389
|
-
// rename() preserves dev/ino and updates ctime, so identity is the inode
|
|
390
|
-
// pair, captured from the file we created rather than from the destination.
|
|
391
|
-
return { dev: stagedStat.dev, ino: stagedStat.ino };
|
|
392
|
-
} finally {
|
|
393
|
-
if (!renamed) {
|
|
394
|
-
try { unlinkSync(staged); } catch { /* best-effort: nothing to clean up */ }
|
|
395
|
-
}
|
|
396
|
-
}
|
|
397
|
-
}
|
|
398
|
-
}
|
|
399
|
-
|
|
400
|
-
/**
|
|
401
|
-
* The fingerprint to record as "we wrote this", or `undefined` when the file at
|
|
402
|
-
* `wrapperPath` is not the inode `writeShim()` created. Returning `undefined`
|
|
403
|
-
* makes every rollback path treat the file as someone else's and leave it alone.
|
|
404
|
-
*/
|
|
405
|
-
function ownedWrapperFingerprint(
|
|
406
|
-
wrapperPath: string,
|
|
407
|
-
written: { dev: number; ino: number } | undefined,
|
|
408
|
-
): ShimPathFingerprint | undefined {
|
|
409
|
-
const probe = stableShimPathProbe(wrapperPath);
|
|
410
|
-
if (!probe) return undefined;
|
|
411
|
-
// Platforms that still write in place (Windows) have no staged identity; fall
|
|
412
|
-
// back to the marker check they have always used.
|
|
413
|
-
if (!written) return probe.prefix.includes(SHIM_MARKER) ? probe.fingerprint : undefined;
|
|
414
|
-
if (probe.fingerprint.dev !== written.dev || probe.fingerprint.ino !== written.ino) return undefined;
|
|
415
|
-
return probe.fingerprint;
|
|
416
|
-
}
|
|
417
|
-
|
|
418
|
-
/**
|
|
419
|
-
* Whether the file now at the wrapper path is one this transaction may unlink.
|
|
420
|
-
*
|
|
421
|
-
* The inode our write created is the authority. It stays ours through an in-place
|
|
422
|
-
* truncation — a partial write we must clean up — and stops being ours the moment
|
|
423
|
-
* someone renames a different file over the path, which is exactly the concurrent
|
|
424
|
-
* updater we must not delete. Where no inode was recorded (Windows writes the
|
|
425
|
-
* destination directly), fall back to the exact fingerprint recorded at the time.
|
|
426
|
-
*/
|
|
427
|
-
function wrapperInodeIsOurs(
|
|
428
|
-
wrapper: StableShimPathProbe,
|
|
429
|
-
written: { dev: number; ino: number } | undefined,
|
|
430
|
-
recorded: ShimPathFingerprint | undefined,
|
|
431
|
-
): boolean {
|
|
432
|
-
// A different inode is conclusive: someone renamed their own file over ours.
|
|
433
|
-
if (written && (wrapper.fingerprint.dev !== written.dev || wrapper.fingerprint.ino !== written.ino)) {
|
|
434
|
-
return false;
|
|
435
|
-
}
|
|
436
|
-
// Same inode is not sufficient on its own — an in-place truncation (shell `>`,
|
|
437
|
-
// writeFileSync) keeps it while replacing the contents. When we recorded a full
|
|
438
|
-
// fingerprint, require it to still match; that covers our own partial write,
|
|
439
|
-
// whose fingerprint we record before anything can fail.
|
|
440
|
-
if (recorded !== undefined) return sameFingerprint(wrapper.fingerprint, recorded);
|
|
441
|
-
// No recorded fingerprint: only the inode identity we captured at write time can
|
|
442
|
-
// speak for us, and there is nothing else to distinguish this file.
|
|
443
|
-
return written !== undefined;
|
|
444
|
-
}
|
|
445
|
-
|
|
446
329
|
function primaryState(files: ShimFileState[]): ShimState {
|
|
447
330
|
const first = files[0]!;
|
|
448
331
|
return { platform: process.platform, ...first, wrappers: files };
|
|
@@ -1096,10 +979,43 @@ function installCodexShimInternal(options: InstallCodexShimInternalOptions): { i
|
|
|
1096
979
|
|
|
1097
980
|
export function installCodexShim(deps: RuntimePreflightDeps = {}): { installed: boolean; message: string; refused?: boolean; runnable?: boolean } {
|
|
1098
981
|
if (process.platform !== "win32") return installUnixOverlay(findCodexOnPath, lastCodexDiscoveryError);
|
|
1099
|
-
|
|
982
|
+
const gate = beginCodexCliSelectionParentWrite();
|
|
983
|
+
if (!gate.entered) return { installed: false, refused: true, message: "codex_cli_selection_busy" };
|
|
984
|
+
try { return installCodexShimInternal({ ...deps, allowFreshInstall: true }); }
|
|
985
|
+
finally { gate.exit(); }
|
|
1100
986
|
}
|
|
1101
987
|
|
|
1102
|
-
export function
|
|
988
|
+
export async function installCodexShimAsync(deps: RuntimePreflightDeps = {}): Promise<ReturnType<typeof installCodexShim>> {
|
|
989
|
+
try { return await withCodexCliSelectionParentWriteAsync(() => installCodexShim(deps)); }
|
|
990
|
+
catch (error) {
|
|
991
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return { installed: false, refused: true, message: error.message };
|
|
992
|
+
throw error;
|
|
993
|
+
}
|
|
994
|
+
}
|
|
995
|
+
export async function autoRestoreCodexShimAsync(options: Parameters<typeof autoRestoreCodexShim>[0]): Promise<CodexShimAutoRestoreResult> {
|
|
996
|
+
try { return await withCodexCliSelectionParentWriteAsync(() => autoRestoreCodexShim(options)); }
|
|
997
|
+
catch (error) {
|
|
998
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return { status: "deferred", message: error.message };
|
|
999
|
+
throw error;
|
|
1000
|
+
}
|
|
1001
|
+
}
|
|
1002
|
+
export async function uninstallCodexShimAsync(): Promise<ReturnType<typeof uninstallCodexShim>> {
|
|
1003
|
+
try { return await withCodexCliSelectionParentWriteAsync(uninstallCodexShim); }
|
|
1004
|
+
catch (error) {
|
|
1005
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return { removed: false, message: error.message };
|
|
1006
|
+
throw error;
|
|
1007
|
+
}
|
|
1008
|
+
}
|
|
1009
|
+
|
|
1010
|
+
export function autoRestoreCodexShim(options: Parameters<typeof autoRestoreWindowsCodexShim>[0]): CodexShimAutoRestoreResult {
|
|
1011
|
+
if (process.platform !== "win32") return autoRestoreUnixOverlay(options);
|
|
1012
|
+
const gate = beginCodexCliSelectionParentWrite();
|
|
1013
|
+
if (!gate.entered) return { status: "deferred", message: "codex_cli_selection_busy" };
|
|
1014
|
+
try { return autoRestoreWindowsCodexShim(options); }
|
|
1015
|
+
finally { gate.exit(); }
|
|
1016
|
+
}
|
|
1017
|
+
|
|
1018
|
+
function autoRestoreWindowsCodexShim(options: RuntimePreflightDeps & {
|
|
1103
1019
|
enabled: () => boolean;
|
|
1104
1020
|
stabilitySleep?: (ms: number) => void;
|
|
1105
1021
|
/** Narrow deterministic seam used to hold the interprocess lock in tests. */
|
|
@@ -1109,7 +1025,6 @@ export function autoRestoreCodexShim(options: RuntimePreflightDeps & {
|
|
|
1109
1025
|
/** Narrow deterministic race seam for the guarded transaction tests. */
|
|
1110
1026
|
beforeGuardedRefresh?: (wrapperPath: string, index: number) => void;
|
|
1111
1027
|
}): CodexShimAutoRestoreResult {
|
|
1112
|
-
if (process.platform !== "win32") return autoRestoreUnixOverlay(options);
|
|
1113
1028
|
const stateRead = readStateResult();
|
|
1114
1029
|
const state = stateRead.state;
|
|
1115
1030
|
if (!state) {
|
|
@@ -1223,6 +1138,13 @@ export function autoRestoreCodexShim(options: RuntimePreflightDeps & {
|
|
|
1223
1138
|
|
|
1224
1139
|
export function uninstallCodexShim(): { removed: boolean; message: string } {
|
|
1225
1140
|
if (process.platform !== "win32") return uninstallUnixCodexShim();
|
|
1141
|
+
const gate = beginCodexCliSelectionParentWrite();
|
|
1142
|
+
if (!gate.entered) return { removed: false, message: "codex_cli_selection_busy" };
|
|
1143
|
+
try { return uninstallWindowsCodexShim(); }
|
|
1144
|
+
finally { gate.exit(); }
|
|
1145
|
+
}
|
|
1146
|
+
|
|
1147
|
+
function uninstallWindowsCodexShim(): { removed: boolean; message: string } {
|
|
1226
1148
|
const state = readState();
|
|
1227
1149
|
if (!state) return { removed: false, message: "Codex autostart shim is not installed." };
|
|
1228
1150
|
const files = stateFiles(state);
|
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
unlinkSync,
|
|
22
22
|
} from "node:fs";
|
|
23
23
|
import { basename, dirname, join } from "node:path";
|
|
24
|
+
import { fileIdentityKey } from "../lib/file-identity";
|
|
24
25
|
|
|
25
26
|
import { Database } from "bun:sqlite";
|
|
26
27
|
|
|
@@ -524,11 +525,11 @@ export function openCodexCoordinatorTransaction(
|
|
|
524
525
|
);
|
|
525
526
|
}
|
|
526
527
|
}
|
|
527
|
-
const opened = lstatSync(finalDatabasePath);
|
|
528
|
+
const opened = lstatSync(finalDatabasePath, { bigint: true });
|
|
528
529
|
if (opened.isSymbolicLink() || !opened.isFile()) {
|
|
529
530
|
throw new CodexUserIdentityRefusal("The coordinator database path changed during open.");
|
|
530
531
|
}
|
|
531
|
-
initialIdentity =
|
|
532
|
+
initialIdentity = fileIdentityKey(opened);
|
|
532
533
|
database.exec("PRAGMA busy_timeout = 0; PRAGMA locking_mode = NORMAL; BEGIN IMMEDIATE");
|
|
533
534
|
transactionOpen = true;
|
|
534
535
|
initialize(database, databaseWasAbsent || databaseWasEmpty);
|
|
@@ -546,9 +547,9 @@ export function openCodexCoordinatorTransaction(
|
|
|
546
547
|
};
|
|
547
548
|
const assertStablePath = (): void => {
|
|
548
549
|
requireOpen();
|
|
549
|
-
const entry = lstatSync(finalDatabasePath);
|
|
550
|
+
const entry = lstatSync(finalDatabasePath, { bigint: true });
|
|
550
551
|
if (entry.isSymbolicLink() || !entry.isFile()
|
|
551
|
-
||
|
|
552
|
+
|| fileIdentityKey(entry) !== initialIdentity
|
|
552
553
|
|| !samePathIdentity(realpathSync.native(finalDatabasePath), finalDatabasePath)) {
|
|
553
554
|
throw new CodexUserIdentityRefusal("The coordinator database path was substituted.");
|
|
554
555
|
}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { dlopen, ptr, read, type Library, type Symbols } from "bun:ffi";
|
|
2
|
+
|
|
3
|
+
// Windows x64 ABI only. No native binary, compiler, worker URL, or shell dependency.
|
|
4
|
+
export const WIN64_CHILD_ABI = Object.freeze({ securityAttributes: 24, securityDescriptor: 8, inheritHandle: 16,
|
|
5
|
+
startupInfo: 104, startupInfoEx: 112, startupFlags: 60, stdin: 80, stdout: 88, stderr: 96, attributes: 104,
|
|
6
|
+
processInformation: 24, process: 0, thread: 8, pid: 16, tid: 20,
|
|
7
|
+
overlapped: 32, event: 24, jobAccounting: 48, activeProcesses: 40 });
|
|
8
|
+
const KERNEL = {
|
|
9
|
+
GetLastError: { args: [], returns: "u32" },
|
|
10
|
+
SetLastError: { args: ["u32"], returns: "void" },
|
|
11
|
+
SetHandleInformation: { args: ["u64", "u32", "u32"], returns: "i32" },
|
|
12
|
+
DuplicateHandle: { args: ["u64", "u64", "u64", "ptr", "u32", "i32", "u32"], returns: "i32" },
|
|
13
|
+
GetCurrentProcess: { args: [], returns: "u64" },
|
|
14
|
+
CompareStringOrdinal: { args: ["ptr", "i32", "ptr", "i32", "i32"], returns: "i32" },
|
|
15
|
+
CreateJobObjectW: { args: ["ptr", "ptr"], returns: "u64" },
|
|
16
|
+
AssignProcessToJobObject: { args: ["u64", "u64"], returns: "i32" },
|
|
17
|
+
QueryInformationJobObject: { args: ["u64", "i32", "ptr", "u32", "ptr"], returns: "i32" },
|
|
18
|
+
TerminateJobObject: { args: ["u64", "u32"], returns: "i32" },
|
|
19
|
+
TerminateProcess: { args: ["u64", "u32"], returns: "i32" },
|
|
20
|
+
CreateProcessW: { args: ["ptr", "ptr", "ptr", "ptr", "i32", "u32", "ptr", "ptr", "ptr", "ptr"], returns: "i32" },
|
|
21
|
+
ResumeThread: { args: ["u64"], returns: "u32" },
|
|
22
|
+
WaitForSingleObject: { args: ["u64", "u32"], returns: "u32" },
|
|
23
|
+
GetExitCodeProcess: { args: ["u64", "ptr"], returns: "i32" },
|
|
24
|
+
GetProcessTimes: { args: ["u64", "ptr", "ptr", "ptr", "ptr"], returns: "i32" },
|
|
25
|
+
InitializeProcThreadAttributeList: { args: ["ptr", "u32", "u32", "ptr"], returns: "i32" },
|
|
26
|
+
UpdateProcThreadAttribute: { args: ["ptr", "u32", "u64", "ptr", "u64", "ptr", "ptr"], returns: "i32" },
|
|
27
|
+
DeleteProcThreadAttributeList: { args: ["ptr"], returns: "void" },
|
|
28
|
+
CreateNamedPipeW: { args: ["ptr", "u32", "u32", "u32", "u32", "u32", "u32", "ptr"], returns: "u64" },
|
|
29
|
+
ConnectNamedPipe: { args: ["u64", "ptr"], returns: "i32" },
|
|
30
|
+
CreateFileW: { args: ["ptr", "u32", "u32", "ptr", "u32", "u32", "u64"], returns: "u64" },
|
|
31
|
+
CreateEventW: { args: ["ptr", "i32", "i32", "ptr"], returns: "u64" },
|
|
32
|
+
ResetEvent: { args: ["u64"], returns: "i32" },
|
|
33
|
+
ReadFile: { args: ["u64", "ptr", "u32", "ptr", "ptr"], returns: "i32" },
|
|
34
|
+
GetOverlappedResult: { args: ["u64", "ptr", "ptr", "i32"], returns: "i32" },
|
|
35
|
+
CancelIoEx: { args: ["u64", "ptr"], returns: "i32" },
|
|
36
|
+
CloseHandle: { args: ["u64"], returns: "i32" },
|
|
37
|
+
LocalFree: { args: ["ptr"], returns: "ptr" },
|
|
38
|
+
} as const satisfies Symbols;
|
|
39
|
+
const ADVAPI = {
|
|
40
|
+
OpenProcessToken: { args: ["u64", "u32", "ptr"], returns: "i32" },
|
|
41
|
+
GetTokenInformation: { args: ["u64", "i32", "ptr", "u32", "ptr"], returns: "i32" },
|
|
42
|
+
ConvertSidToStringSidW: { args: ["ptr", "ptr"], returns: "i32" },
|
|
43
|
+
ConvertStringSecurityDescriptorToSecurityDescriptorW: { args: ["ptr", "u32", "ptr", "ptr"], returns: "i32" },
|
|
44
|
+
} as const satisfies Symbols;
|
|
45
|
+
|
|
46
|
+
export const wide = (value: string): Buffer => Buffer.from(`${value}\0`, "utf16le");
|
|
47
|
+
export function securityAttributes(inherit: boolean, descriptor = 0n): Buffer {
|
|
48
|
+
const bytes = Buffer.alloc(WIN64_CHILD_ABI.securityAttributes);
|
|
49
|
+
bytes.writeUInt32LE(bytes.length, 0); bytes.writeBigUInt64LE(descriptor, 8); bytes.writeUInt32LE(+inherit, 16);
|
|
50
|
+
return bytes;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
type OwnedDispatch<SymbolsTable> = { -readonly [Key in keyof SymbolsTable]:
|
|
54
|
+
SymbolsTable[Key] extends (...args: infer Args) => infer Result ? (...args: Args) => Result : SymbolsTable[Key] };
|
|
55
|
+
|
|
56
|
+
/** Owns only handles returned by this invocation, never PID-reopened handles. */
|
|
57
|
+
export class WindowsChildNative {
|
|
58
|
+
readonly k: OwnedDispatch<Library<typeof KERNEL>["symbols"]>;
|
|
59
|
+
readonly a: OwnedDispatch<Library<typeof ADVAPI>["symbols"]>;
|
|
60
|
+
readonly handles = new Set<bigint>();
|
|
61
|
+
/** Explicit GC roots for pointers stored inside native attribute lists. */
|
|
62
|
+
readonly borrowedMemory = new Set<Buffer>();
|
|
63
|
+
readonly closeErrors: bigint[] = [];
|
|
64
|
+
private readonly kernel: Library<typeof KERNEL>;
|
|
65
|
+
private readonly advapi: Library<typeof ADVAPI>;
|
|
66
|
+
private closed = false;
|
|
67
|
+
constructor() {
|
|
68
|
+
if (process.platform !== "win32" || process.arch !== "x64") throw new Error("windows_child_unsupported_platform");
|
|
69
|
+
this.kernel = dlopen("kernel32.dll", KERNEL);
|
|
70
|
+
try { this.advapi = dlopen("advapi32.dll", ADVAPI); }
|
|
71
|
+
catch (error) { this.kernel.close(); throw error; }
|
|
72
|
+
// Own mutable dispatch tables permit per-instance fault injection in native fixtures.
|
|
73
|
+
this.k = { ...this.kernel.symbols }; this.a = { ...this.advapi.symbols };
|
|
74
|
+
}
|
|
75
|
+
keep(value: number | bigint): bigint {
|
|
76
|
+
const handle = BigInt(value);
|
|
77
|
+
if (!handle || handle === 0xffffffffffffffffn) throw new Error(`windows_child_handle_${this.k.GetLastError!()}`);
|
|
78
|
+
this.handles.add(handle); return handle;
|
|
79
|
+
}
|
|
80
|
+
close(handle: bigint): void {
|
|
81
|
+
if (!this.handles.has(handle)) return;
|
|
82
|
+
if (!this.k.CloseHandle!(handle)) { this.closeErrors.push(handle); return; }
|
|
83
|
+
this.handles.delete(handle);
|
|
84
|
+
}
|
|
85
|
+
dispose(): boolean {
|
|
86
|
+
if (this.handles.size || this.borrowedMemory.size) return false;
|
|
87
|
+
if (!this.closed) { this.closed = true; this.advapi.close(); this.kernel.close(); }
|
|
88
|
+
return true;
|
|
89
|
+
}
|
|
90
|
+
/** Protected DACL grants only the current token user. No default/world pipe ACL. */
|
|
91
|
+
privateDescriptor(): bigint {
|
|
92
|
+
const output = Buffer.alloc(8), size = Buffer.alloc(4);
|
|
93
|
+
if (!this.a.OpenProcessToken!(this.k.GetCurrentProcess!(), 8, ptr(output))) throw new Error("windows_child_token");
|
|
94
|
+
const token = this.keep(output.readBigUInt64LE());
|
|
95
|
+
let sidText = 0n;
|
|
96
|
+
try {
|
|
97
|
+
this.a.GetTokenInformation!(token, 1, null, 0, ptr(size));
|
|
98
|
+
const length = size.readUInt32LE();
|
|
99
|
+
if (length < 8 || length > 65536) throw new Error("windows_child_token_size");
|
|
100
|
+
const user = Buffer.alloc(length);
|
|
101
|
+
if (!this.a.GetTokenInformation!(token, 1, ptr(user), length, ptr(size))) throw new Error("windows_child_token_user");
|
|
102
|
+
const sid = user.readBigUInt64LE();
|
|
103
|
+
if (!this.a.ConvertSidToStringSidW!(sid, ptr(output))) throw new Error("windows_child_token_sid");
|
|
104
|
+
sidText = output.readBigUInt64LE();
|
|
105
|
+
let sidString = "";
|
|
106
|
+
for (let index = 0; index < 184; index++) {
|
|
107
|
+
const code = read.u16(sidText, index * 2);
|
|
108
|
+
if (!code) break;
|
|
109
|
+
sidString += String.fromCharCode(code);
|
|
110
|
+
}
|
|
111
|
+
if (!/^S-1-(?:\d+-)+\d+$/.test(sidString)) throw new Error("windows_child_sid_shape");
|
|
112
|
+
const sddl = wide(`D:P(A;;GA;;;${sidString})`);
|
|
113
|
+
if (!this.a.ConvertStringSecurityDescriptorToSecurityDescriptorW!(ptr(sddl), 1, ptr(output), null)) {
|
|
114
|
+
throw new Error("windows_child_pipe_acl");
|
|
115
|
+
}
|
|
116
|
+
return output.readBigUInt64LE();
|
|
117
|
+
} finally { if (sidText) this.k.LocalFree!(sidText); this.close(token); }
|
|
118
|
+
}
|
|
119
|
+
}
|