@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -45,6 +45,7 @@ import {
|
|
|
45
45
|
type SubprocessDeadlineScheduler,
|
|
46
46
|
} from "./bounded-subprocess";
|
|
47
47
|
import { resolveTrustedWindowsIcaclsExe } from "./windows-elevation";
|
|
48
|
+
import { verifyWindowsEntriesAcl, verifyWindowsEntriesAclAsync, verifyWindowsPrivateEntries, verifyWindowsPrivateEntriesAsync } from "./windows-owner-acl";
|
|
48
49
|
import {
|
|
49
50
|
cachedCurrentWindowsIdentity,
|
|
50
51
|
resolveCurrentWindowsPrincipal,
|
|
@@ -267,6 +268,8 @@ export interface HardenResult {
|
|
|
267
268
|
|
|
268
269
|
export interface HardenOptions {
|
|
269
270
|
required: boolean;
|
|
271
|
+
/** Inspect an existing runtime directory's private DACL, allowing an enabled Admin owner. */
|
|
272
|
+
verifyExistingRuntimeDirectory?: boolean;
|
|
270
273
|
/**
|
|
271
274
|
* Explicit total budget for this harden call. Shutdown recovery uses a reduced
|
|
272
275
|
* caller-owned slice instead of opening the normal 30-second window.
|
|
@@ -331,11 +334,67 @@ export interface IcaclsResult {
|
|
|
331
334
|
exitCode: number | null;
|
|
332
335
|
timedOut: boolean;
|
|
333
336
|
stdout: string;
|
|
337
|
+
/**
|
|
338
|
+
* Diagnostics only: how a failure was produced when it is not a child
|
|
339
|
+
* result. `spawn_failed` means the spawn call itself threw — no process
|
|
340
|
+
* existed; `runner_rejected` means the runner promise rejected without a
|
|
341
|
+
* result; `runner_watchdog` means the caller-side belt fired before the
|
|
342
|
+
* runner settled — a killed child may still be reaping. Absent means
|
|
343
|
+
* `child_result` (a spawned child produced a verdict, including timeouts).
|
|
344
|
+
*/
|
|
345
|
+
readonly failureStage?: "spawn_failed" | "runner_rejected" | "runner_watchdog";
|
|
346
|
+
/**
|
|
347
|
+
* Allowlisted OS code from the failed spawn (e.g. ENOENT), never an error
|
|
348
|
+
* object, message, or path. Present only alongside `failureStage ===
|
|
349
|
+
* "spawn_failed"`.
|
|
350
|
+
*/
|
|
351
|
+
readonly spawnErrorCode?: string;
|
|
334
352
|
}
|
|
335
353
|
|
|
336
354
|
type IcaclsRunner = (args: string[], timeoutMs: number) => IcaclsResult;
|
|
337
355
|
type AsyncIcaclsRunner = (args: string[], timeoutMs: number) => Promise<IcaclsResult>;
|
|
338
356
|
|
|
357
|
+
/** The only icacls operations this module runs; argv is never derived from it. */
|
|
358
|
+
export type IcaclsStep = "/grant:r" | "/inheritance:r" | "/remove:g" | "/findsid";
|
|
359
|
+
const ICACLS_STEPS: ReadonlySet<string> = new Set(["/grant:r", "/inheritance:r", "/remove:g", "/findsid"]);
|
|
360
|
+
|
|
361
|
+
/**
|
|
362
|
+
* Fixed failure stages for `aclFailure` diagnostics: the shared deadline ran
|
|
363
|
+
* out before a spawn was attempted, the spawn itself threw, the runner
|
|
364
|
+
* rejected, the caller-side watchdog fired before the runner settled, or a
|
|
365
|
+
* child process produced a result. Enum literals only — never parsed from
|
|
366
|
+
* errors, and each value is written only by the code that can prove it.
|
|
367
|
+
*/
|
|
368
|
+
export type AclFailureStage =
|
|
369
|
+
| "deadline_before_spawn"
|
|
370
|
+
| "spawn_failed"
|
|
371
|
+
| "runner_rejected"
|
|
372
|
+
| "runner_watchdog"
|
|
373
|
+
| "child_result";
|
|
374
|
+
|
|
375
|
+
/**
|
|
376
|
+
* Bounded, allowlisted failure metadata carried on a sanitized ACL error.
|
|
377
|
+
* Every field is a fixed enum literal, a boolean, or a finite number — no
|
|
378
|
+
* path, argv, SID, stdout/stderr, message or stack ever crosses this boundary,
|
|
379
|
+
* so a caller may log or branch on it without re-sanitizing.
|
|
380
|
+
*/
|
|
381
|
+
export interface AclFailureDiagnostics {
|
|
382
|
+
/** The icacls step being attempted — one of the fixed literals used by runIcacls. */
|
|
383
|
+
readonly step: IcaclsStep;
|
|
384
|
+
readonly stage: AclFailureStage;
|
|
385
|
+
/**
|
|
386
|
+
* For spawned steps, the measured runner time; for `deadline_before_spawn`,
|
|
387
|
+
* how much of the shared sequence had already elapsed.
|
|
388
|
+
*/
|
|
389
|
+
readonly elapsedMs: number;
|
|
390
|
+
/** The exact remaining budget handed to the runner (<= 0 when refused pre-spawn). */
|
|
391
|
+
readonly budgetMs: number;
|
|
392
|
+
readonly success: boolean;
|
|
393
|
+
readonly exitCode: number | null;
|
|
394
|
+
readonly timedOut: boolean;
|
|
395
|
+
readonly spawnErrorCode?: string;
|
|
396
|
+
}
|
|
397
|
+
|
|
339
398
|
function resolveIcaclsExecutable(): string {
|
|
340
399
|
// Same authority as schtasks/powershell: never take icacls from PATH.
|
|
341
400
|
// A bun-shim or stripped PATH makes `icacls.exe` throw ENOENT, which used to
|
|
@@ -343,8 +402,55 @@ function resolveIcaclsExecutable(): string {
|
|
|
343
402
|
return resolveTrustedWindowsIcaclsExe();
|
|
344
403
|
}
|
|
345
404
|
|
|
346
|
-
|
|
347
|
-
|
|
405
|
+
/**
|
|
406
|
+
* OS spawn codes safe to surface in diagnostics: fixed symbolic names that
|
|
407
|
+
* say WHY the child could not start. Anything else — messages, paths,
|
|
408
|
+
* platform-specific strings — stays inside the process.
|
|
409
|
+
*/
|
|
410
|
+
const ALLOWED_SPAWN_ERROR_CODES: ReadonlySet<string> = new Set([
|
|
411
|
+
"ENOENT",
|
|
412
|
+
"EACCES",
|
|
413
|
+
"EPERM",
|
|
414
|
+
"EAGAIN",
|
|
415
|
+
"ENOMEM",
|
|
416
|
+
]);
|
|
417
|
+
|
|
418
|
+
function allowlistedSpawnErrorCode(code: unknown): string | undefined {
|
|
419
|
+
return typeof code === "string" && ALLOWED_SPAWN_ERROR_CODES.has(code) ? code : undefined;
|
|
420
|
+
}
|
|
421
|
+
|
|
422
|
+
/** Extract an allowlisted spawn code from a thrown spawn error; never the error itself. */
|
|
423
|
+
function spawnErrorCodeOf(error: unknown): string | undefined {
|
|
424
|
+
if (error && typeof error === "object" && "code" in error) {
|
|
425
|
+
return allowlistedSpawnErrorCode((error as { code?: unknown }).code);
|
|
426
|
+
}
|
|
427
|
+
return undefined;
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
function spawnFailedResult(spawnErrorCode?: string): IcaclsResult {
|
|
431
|
+
return {
|
|
432
|
+
success: false,
|
|
433
|
+
exitCode: null,
|
|
434
|
+
timedOut: false,
|
|
435
|
+
stdout: "",
|
|
436
|
+
failureStage: "spawn_failed",
|
|
437
|
+
...(spawnErrorCode !== undefined ? { spawnErrorCode } : {}),
|
|
438
|
+
};
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
/**
|
|
442
|
+
* The async runner rejected instead of producing a result. That is not spawn
|
|
443
|
+
* evidence — nothing proves a child ever existed — so it keeps its own stage
|
|
444
|
+
* and carries no spawnErrorCode.
|
|
445
|
+
*/
|
|
446
|
+
function runnerRejectedResult(): IcaclsResult {
|
|
447
|
+
return {
|
|
448
|
+
success: false,
|
|
449
|
+
exitCode: null,
|
|
450
|
+
timedOut: false,
|
|
451
|
+
stdout: "",
|
|
452
|
+
failureStage: "runner_rejected",
|
|
453
|
+
};
|
|
348
454
|
}
|
|
349
455
|
|
|
350
456
|
/**
|
|
@@ -354,14 +460,15 @@ function spawnFailedResult(): IcaclsResult {
|
|
|
354
460
|
*/
|
|
355
461
|
function trySpawnIcacls(args: string[]) {
|
|
356
462
|
try {
|
|
357
|
-
|
|
463
|
+
const proc = Bun.spawn([resolveIcaclsExecutable(), ...args], {
|
|
358
464
|
stdin: "ignore",
|
|
359
465
|
stdout: "pipe",
|
|
360
466
|
stderr: "ignore",
|
|
361
467
|
windowsHide: true,
|
|
362
468
|
});
|
|
363
|
-
|
|
364
|
-
|
|
469
|
+
return { proc, spawnErrorCode: undefined };
|
|
470
|
+
} catch (error) {
|
|
471
|
+
return { proc: null, spawnErrorCode: spawnErrorCodeOf(error) };
|
|
365
472
|
}
|
|
366
473
|
}
|
|
367
474
|
|
|
@@ -382,8 +489,8 @@ function defaultIcaclsRunner(args: string[], timeoutMs: number): IcaclsResult {
|
|
|
382
489
|
timedOut: result.exitedDueToTimeout ?? false,
|
|
383
490
|
stdout: result.stdout ? result.stdout.toString() : "",
|
|
384
491
|
};
|
|
385
|
-
} catch {
|
|
386
|
-
return spawnFailedResult();
|
|
492
|
+
} catch (error) {
|
|
493
|
+
return spawnFailedResult(spawnErrorCodeOf(error));
|
|
387
494
|
}
|
|
388
495
|
}
|
|
389
496
|
|
|
@@ -393,8 +500,9 @@ function defaultIcaclsRunner(args: string[], timeoutMs: number): IcaclsResult {
|
|
|
393
500
|
* classifies the deadline and keeps waiting for a killed child to actually exit.
|
|
394
501
|
*/
|
|
395
502
|
async function defaultAsyncIcaclsRunner(args: string[], timeoutMs: number): Promise<IcaclsResult> {
|
|
396
|
-
const
|
|
397
|
-
if (!proc) return spawnFailedResult();
|
|
503
|
+
const spawned = trySpawnIcacls(args);
|
|
504
|
+
if (!spawned.proc) return spawnFailedResult(spawned.spawnErrorCode);
|
|
505
|
+
const proc = spawned.proc;
|
|
398
506
|
const { exitCode, timedOut } = await waitForSubprocessExit(proc, timeoutMs);
|
|
399
507
|
const stdout = !timedOut && proc.stdout
|
|
400
508
|
? await new Response(proc.stdout).text().catch(() => "")
|
|
@@ -419,7 +527,7 @@ function awaitAsyncIcaclsRunner(args: string[], timeoutMs: number): Promise<Icac
|
|
|
419
527
|
};
|
|
420
528
|
const run = () => asyncIcaclsRunner(args, timeoutMs).then(
|
|
421
529
|
result => { finish(result); },
|
|
422
|
-
() => { finish(
|
|
530
|
+
() => { finish(runnerRejectedResult()); },
|
|
423
531
|
);
|
|
424
532
|
// Capture and register ownership before the child can start or mutate its alias.
|
|
425
533
|
const tracked = args[0] ? startTrackedAsyncAclWork(args[0], run) : undefined;
|
|
@@ -432,7 +540,13 @@ function awaitAsyncIcaclsRunner(args: string[], timeoutMs: number): Promise<Icac
|
|
|
432
540
|
() => {
|
|
433
541
|
const targetPath = args[0];
|
|
434
542
|
if (targetPath && tracked) registerPendingAsyncIcaclsReap(targetPath, tracked.entry);
|
|
435
|
-
finish({
|
|
543
|
+
finish({
|
|
544
|
+
success: false,
|
|
545
|
+
exitCode: null,
|
|
546
|
+
timedOut: true,
|
|
547
|
+
stdout: "",
|
|
548
|
+
failureStage: "runner_watchdog",
|
|
549
|
+
});
|
|
436
550
|
},
|
|
437
551
|
Math.max(1, timeoutMs) + SUBPROCESS_KILL_GRACE_MS + ASYNC_ICACLS_BELT_MARGIN_MS,
|
|
438
552
|
);
|
|
@@ -730,12 +844,65 @@ export function windowsSecretAclApplies(): boolean {
|
|
|
730
844
|
return (platformOverride ?? process.platform) === "win32";
|
|
731
845
|
}
|
|
732
846
|
|
|
847
|
+
/**
|
|
848
|
+
* Per-spawn observation measured by run(): which stage produced the result,
|
|
849
|
+
* how long it took, and the exact budget it was given. Measured at the call
|
|
850
|
+
* site — not inside the runner — so injected runners are observed identically.
|
|
851
|
+
*/
|
|
852
|
+
interface IcaclsRunMeta {
|
|
853
|
+
readonly stage: AclFailureStage;
|
|
854
|
+
readonly elapsedMs: number;
|
|
855
|
+
readonly budgetMs: number;
|
|
856
|
+
}
|
|
857
|
+
|
|
858
|
+
/** Runner-reported failure provenance; anything else is treated as a child result. */
|
|
859
|
+
const RUNNER_FAILURE_STAGES: ReadonlySet<string> = new Set([
|
|
860
|
+
"spawn_failed",
|
|
861
|
+
"runner_rejected",
|
|
862
|
+
"runner_watchdog",
|
|
863
|
+
]);
|
|
864
|
+
|
|
865
|
+
/**
|
|
866
|
+
* An injected runner may write any string into failureStage, so the enum is
|
|
867
|
+
* re-validated at the boundary instead of trusting the declared type.
|
|
868
|
+
*/
|
|
869
|
+
function runnerFailureStageOf(result: IcaclsResult): AclFailureStage {
|
|
870
|
+
return typeof result.failureStage === "string" && RUNNER_FAILURE_STAGES.has(result.failureStage)
|
|
871
|
+
? result.failureStage
|
|
872
|
+
: "child_result";
|
|
873
|
+
}
|
|
874
|
+
|
|
875
|
+
function finiteOrZero(value: number): number {
|
|
876
|
+
return Number.isFinite(value) ? value : 0;
|
|
877
|
+
}
|
|
878
|
+
|
|
733
879
|
/** Error carrying an honest code: ETIMEDOUT only for real timeouts, EICACLS otherwise. */
|
|
734
|
-
function icaclsError(step:
|
|
880
|
+
function icaclsError(step: IcaclsStep, result: IcaclsResult, meta: IcaclsRunMeta): NodeJS.ErrnoException {
|
|
881
|
+
// Coerce once so the error code and the diagnostics record can never disagree.
|
|
882
|
+
// Boolean() keeps the original truthy semantics the memo/retry callers relied
|
|
883
|
+
// on — a mistyped truthy timedOut still means "timeout", not "child ok".
|
|
884
|
+
const timedOut = Boolean(result.timedOut);
|
|
735
885
|
const err = new Error(
|
|
736
|
-
|
|
737
|
-
) as NodeJS.ErrnoException;
|
|
738
|
-
err.code =
|
|
886
|
+
timedOut ? `icacls ${step} timed out` : `icacls ${step} exited ${result.exitCode ?? "null"}`,
|
|
887
|
+
) as NodeJS.ErrnoException & { aclFailure: AclFailureDiagnostics };
|
|
888
|
+
err.code = timedOut ? "ETIMEDOUT" : "EICACLS";
|
|
889
|
+
// Injected runners are untrusted: every field is coerced back to its declared
|
|
890
|
+
// enum/number/boolean shape so only allowlisted values reach the boundary.
|
|
891
|
+
const spawnErrorCode = result.failureStage === "spawn_failed"
|
|
892
|
+
? allowlistedSpawnErrorCode(result.spawnErrorCode)
|
|
893
|
+
: undefined;
|
|
894
|
+
err.aclFailure = {
|
|
895
|
+
step,
|
|
896
|
+
stage: meta.stage,
|
|
897
|
+
elapsedMs: finiteOrZero(meta.elapsedMs),
|
|
898
|
+
budgetMs: finiteOrZero(meta.budgetMs),
|
|
899
|
+
success: Boolean(result.success),
|
|
900
|
+
exitCode: typeof result.exitCode === "number" && Number.isFinite(result.exitCode)
|
|
901
|
+
? result.exitCode
|
|
902
|
+
: null,
|
|
903
|
+
timedOut,
|
|
904
|
+
...(spawnErrorCode !== undefined ? { spawnErrorCode } : {}),
|
|
905
|
+
};
|
|
739
906
|
return err;
|
|
740
907
|
}
|
|
741
908
|
|
|
@@ -837,7 +1004,14 @@ function shouldVerifyExistingAcl(): boolean {
|
|
|
837
1004
|
return env["OPENCODEX_ACL_VERIFY_EXISTING"] === "1";
|
|
838
1005
|
}
|
|
839
1006
|
|
|
840
|
-
function existingAclAlreadyCompliant(targetPath: string, directory: boolean, deadline: number): boolean {
|
|
1007
|
+
function existingAclAlreadyCompliant(targetPath: string, directory: boolean, deadline: number, strictDirectory = false): boolean {
|
|
1008
|
+
if (strictDirectory) {
|
|
1009
|
+
const before = observe(targetPath);
|
|
1010
|
+
const verified = verifyWindowsEntriesAcl([{ path: targetPath, directory: true, policy: "private-runtime-directory" }], deadline - nowFn());
|
|
1011
|
+
const after = observe(targetPath);
|
|
1012
|
+
// No name-only fallback or success memo: this proof belongs to this observation only.
|
|
1013
|
+
return verified && before !== null && after !== null && sameObservation(before, after) && nowFn() < deadline;
|
|
1014
|
+
}
|
|
841
1015
|
if (!shouldVerifyExistingAcl()) return false;
|
|
842
1016
|
const identity = cachedCurrentWindowsIdentity();
|
|
843
1017
|
if (!identity) return false;
|
|
@@ -845,17 +1019,31 @@ function existingAclAlreadyCompliant(targetPath: string, directory: boolean, dea
|
|
|
845
1019
|
const remaining = deadline - nowFn();
|
|
846
1020
|
if (remaining <= 0) return false;
|
|
847
1021
|
const result = icaclsRunner([targetPath], remaining);
|
|
848
|
-
return result.success && existingAclIsCompliant(targetPath, directory, result.stdout, identity.name)
|
|
1022
|
+
return result.success && (existingAclIsCompliant(targetPath, directory, result.stdout, identity.name)
|
|
1023
|
+
|| verifyWindowsPrivateEntries([{ path: targetPath, directory }], deadline - nowFn()));
|
|
849
1024
|
} catch {
|
|
850
1025
|
return false;
|
|
851
1026
|
}
|
|
852
1027
|
}
|
|
853
1028
|
|
|
1029
|
+
/** Fresh owner/protected-DACL verification; never use the name-only shortcut, harden or trust a memo. */
|
|
1030
|
+
export function verifySecretPathAcl(targetPath: string): boolean {
|
|
1031
|
+
if (!windowsSecretAclApplies()) return false;
|
|
1032
|
+
return verifyWindowsPrivateEntries([{ path: targetPath, directory: false }], resolveHardenDeadlineMs());
|
|
1033
|
+
}
|
|
1034
|
+
|
|
854
1035
|
async function existingAclAlreadyCompliantAsync(
|
|
855
1036
|
targetPath: string,
|
|
856
1037
|
directory: boolean,
|
|
857
1038
|
deadline: number,
|
|
1039
|
+
strictDirectory = false,
|
|
858
1040
|
): Promise<boolean> {
|
|
1041
|
+
if (strictDirectory) {
|
|
1042
|
+
const before = observe(targetPath);
|
|
1043
|
+
const verified = await verifyWindowsEntriesAclAsync([{ path: targetPath, directory: true, policy: "private-runtime-directory" }], deadline - nowFn());
|
|
1044
|
+
const after = observe(targetPath);
|
|
1045
|
+
return verified && before !== null && after !== null && sameObservation(before, after) && nowFn() < deadline;
|
|
1046
|
+
}
|
|
859
1047
|
if (!shouldVerifyExistingAcl()) return false;
|
|
860
1048
|
const identity = cachedCurrentWindowsIdentity();
|
|
861
1049
|
if (!identity) return false;
|
|
@@ -863,7 +1051,8 @@ async function existingAclAlreadyCompliantAsync(
|
|
|
863
1051
|
const remaining = deadline - nowFn();
|
|
864
1052
|
if (remaining <= 0) return false;
|
|
865
1053
|
const result = await awaitAsyncIcaclsRunner([targetPath], remaining);
|
|
866
|
-
return result.success && existingAclIsCompliant(targetPath, directory, result.stdout, identity.name)
|
|
1054
|
+
return result.success && (existingAclIsCompliant(targetPath, directory, result.stdout, identity.name)
|
|
1055
|
+
|| await verifyWindowsPrivateEntriesAsync([{ path: targetPath, directory }], deadline - nowFn()));
|
|
867
1056
|
} catch {
|
|
868
1057
|
return false;
|
|
869
1058
|
}
|
|
@@ -871,18 +1060,36 @@ async function existingAclAlreadyCompliantAsync(
|
|
|
871
1060
|
|
|
872
1061
|
function runIcacls(targetPath: string, directory: boolean, deadline: number, extraReadAces: readonly string[]): void {
|
|
873
1062
|
const principal = currentWindowsPrincipal(deadline);
|
|
1063
|
+
const sequenceStartedAt = nowFn();
|
|
874
1064
|
|
|
875
1065
|
// The deadline is owned by hardenEntry (total budget incl. retry + verification).
|
|
876
|
-
const run = (step:
|
|
1066
|
+
const run = (step: IcaclsStep, args: string[]): { result: IcaclsResult; meta: IcaclsRunMeta } => {
|
|
877
1067
|
const remaining = deadline - nowFn();
|
|
878
1068
|
if (remaining <= 0) {
|
|
879
|
-
throw icaclsError(
|
|
1069
|
+
throw icaclsError(
|
|
1070
|
+
step,
|
|
1071
|
+
{ success: false, exitCode: null, timedOut: true, stdout: "" },
|
|
1072
|
+
{
|
|
1073
|
+
stage: "deadline_before_spawn",
|
|
1074
|
+
elapsedMs: Math.max(0, nowFn() - sequenceStartedAt),
|
|
1075
|
+
budgetMs: remaining,
|
|
1076
|
+
},
|
|
1077
|
+
);
|
|
880
1078
|
}
|
|
881
|
-
|
|
1079
|
+
const started = nowFn();
|
|
1080
|
+
const result = icaclsRunner(args, remaining);
|
|
1081
|
+
return {
|
|
1082
|
+
result,
|
|
1083
|
+
meta: {
|
|
1084
|
+
stage: runnerFailureStageOf(result),
|
|
1085
|
+
elapsedMs: Math.max(0, nowFn() - started),
|
|
1086
|
+
budgetMs: remaining,
|
|
1087
|
+
},
|
|
1088
|
+
};
|
|
882
1089
|
};
|
|
883
|
-
const runOrThrow = (step:
|
|
884
|
-
const result = run(step, args);
|
|
885
|
-
if (!result.success) throw icaclsError(step, result);
|
|
1090
|
+
const runOrThrow = (step: IcaclsStep, args: string[]): void => {
|
|
1091
|
+
const { result, meta } = run(step, args);
|
|
1092
|
+
if (!result.success) throw icaclsError(step, result, meta);
|
|
886
1093
|
};
|
|
887
1094
|
|
|
888
1095
|
// Step 1: grant current user full control BEFORE any destructive ACL change.
|
|
@@ -898,17 +1105,17 @@ function runIcacls(targetPath: string, directory: boolean, deadline: number, ext
|
|
|
898
1105
|
// before accepting the failure as harmless — a swallowed real failure would leave
|
|
899
1106
|
// Everyone/Users/Authenticated Users grants while reporting hardened.
|
|
900
1107
|
// `/remove:g` cannot remove the explicit current-user ACE installed in step 1.
|
|
901
|
-
const removal = run("/remove:g", [targetPath, "/remove:g", ...BROAD_SIDS]);
|
|
1108
|
+
const { result: removal, meta: removalMeta } = run("/remove:g", [targetPath, "/remove:g", ...BROAD_SIDS]);
|
|
902
1109
|
if (!removal.success) {
|
|
903
|
-
if (removal.timedOut) throw icaclsError("/remove:g", removal);
|
|
1110
|
+
if (removal.timedOut) throw icaclsError("/remove:g", removal, removalMeta);
|
|
904
1111
|
for (const sid of BROAD_SIDS) {
|
|
905
|
-
const found = run("/findsid", [targetPath, "/findsid", sid]);
|
|
906
|
-
if (!found.success) throw icaclsError("/findsid", found);
|
|
1112
|
+
const { result: found, meta: foundMeta } = run("/findsid", [targetPath, "/findsid", sid]);
|
|
1113
|
+
if (!found.success) throw icaclsError("/findsid", found, foundMeta);
|
|
907
1114
|
// icacls /findsid echoes the target path in its "SID Found" line only when the SID
|
|
908
1115
|
// still holds an ACE; the summary lines carry only counts. Matching the path echo —
|
|
909
1116
|
// not the (localized) prose — keeps the check locale-independent.
|
|
910
1117
|
if (found.stdout.includes(targetPath)) {
|
|
911
|
-
throw icaclsError("/remove:g", removal);
|
|
1118
|
+
throw icaclsError("/remove:g", removal, removalMeta);
|
|
912
1119
|
}
|
|
913
1120
|
}
|
|
914
1121
|
}
|
|
@@ -917,30 +1124,48 @@ function runIcacls(targetPath: string, directory: boolean, deadline: number, ext
|
|
|
917
1124
|
/** Async counterpart of runIcacls — same step order and timeout/error classification (#612). */
|
|
918
1125
|
async function runIcaclsAsync(targetPath: string, directory: boolean, deadline: number, extraReadAces: readonly string[]): Promise<void> {
|
|
919
1126
|
const principal = await currentWindowsPrincipalAsync(deadline);
|
|
1127
|
+
const sequenceStartedAt = nowFn();
|
|
920
1128
|
|
|
921
|
-
const run = async (step:
|
|
1129
|
+
const run = async (step: IcaclsStep, args: string[]): Promise<{ result: IcaclsResult; meta: IcaclsRunMeta }> => {
|
|
922
1130
|
const remaining = deadline - nowFn();
|
|
923
1131
|
if (remaining <= 0) {
|
|
924
|
-
throw icaclsError(
|
|
1132
|
+
throw icaclsError(
|
|
1133
|
+
step,
|
|
1134
|
+
{ success: false, exitCode: null, timedOut: true, stdout: "" },
|
|
1135
|
+
{
|
|
1136
|
+
stage: "deadline_before_spawn",
|
|
1137
|
+
elapsedMs: Math.max(0, nowFn() - sequenceStartedAt),
|
|
1138
|
+
budgetMs: remaining,
|
|
1139
|
+
},
|
|
1140
|
+
);
|
|
925
1141
|
}
|
|
926
|
-
|
|
1142
|
+
const started = nowFn();
|
|
1143
|
+
const result = await awaitAsyncIcaclsRunner(args, remaining);
|
|
1144
|
+
return {
|
|
1145
|
+
result,
|
|
1146
|
+
meta: {
|
|
1147
|
+
stage: runnerFailureStageOf(result),
|
|
1148
|
+
elapsedMs: Math.max(0, nowFn() - started),
|
|
1149
|
+
budgetMs: remaining,
|
|
1150
|
+
},
|
|
1151
|
+
};
|
|
927
1152
|
};
|
|
928
|
-
const runOrThrow = async (step:
|
|
929
|
-
const result = await run(step, args);
|
|
930
|
-
if (!result.success) throw icaclsError(step, result);
|
|
1153
|
+
const runOrThrow = async (step: IcaclsStep, args: string[]): Promise<void> => {
|
|
1154
|
+
const { result, meta } = await run(step, args);
|
|
1155
|
+
if (!result.success) throw icaclsError(step, result, meta);
|
|
931
1156
|
};
|
|
932
1157
|
|
|
933
1158
|
await runOrThrow("/grant:r", [targetPath, "/grant:r", grantAce(principal, directory), ...extraReadAces]);
|
|
934
1159
|
await runOrThrow("/inheritance:r", [targetPath, "/inheritance:r"]);
|
|
935
1160
|
|
|
936
|
-
const removal = await run("/remove:g", [targetPath, "/remove:g", ...BROAD_SIDS]);
|
|
1161
|
+
const { result: removal, meta: removalMeta } = await run("/remove:g", [targetPath, "/remove:g", ...BROAD_SIDS]);
|
|
937
1162
|
if (!removal.success) {
|
|
938
|
-
if (removal.timedOut) throw icaclsError("/remove:g", removal);
|
|
1163
|
+
if (removal.timedOut) throw icaclsError("/remove:g", removal, removalMeta);
|
|
939
1164
|
for (const sid of BROAD_SIDS) {
|
|
940
|
-
const found = await run("/findsid", [targetPath, "/findsid", sid]);
|
|
941
|
-
if (!found.success) throw icaclsError("/findsid", found);
|
|
1165
|
+
const { result: found, meta: foundMeta } = await run("/findsid", [targetPath, "/findsid", sid]);
|
|
1166
|
+
if (!found.success) throw icaclsError("/findsid", found, foundMeta);
|
|
942
1167
|
if (found.stdout.includes(targetPath)) {
|
|
943
|
-
throw icaclsError("/remove:g", removal);
|
|
1168
|
+
throw icaclsError("/remove:g", removal, removalMeta);
|
|
944
1169
|
}
|
|
945
1170
|
}
|
|
946
1171
|
}
|
|
@@ -976,9 +1201,48 @@ function isTimeoutError(error: unknown): boolean {
|
|
|
976
1201
|
&& String((error as NodeJS.ErrnoException).code) === "ETIMEDOUT";
|
|
977
1202
|
}
|
|
978
1203
|
|
|
1204
|
+
/**
|
|
1205
|
+
* Field-by-field allowlist copy of an aclFailure record from an untrusted cause.
|
|
1206
|
+
* A malformed field invalidates the whole record except `spawnErrorCode`,
|
|
1207
|
+
* which is optional and simply omitted when it is not an allowlisted code.
|
|
1208
|
+
*/
|
|
1209
|
+
function sanitizeAclFailure(cause: unknown): AclFailureDiagnostics | undefined {
|
|
1210
|
+
if (!cause || typeof cause !== "object" || !("aclFailure" in cause)) return undefined;
|
|
1211
|
+
const raw = (cause as { aclFailure?: unknown }).aclFailure;
|
|
1212
|
+
if (!raw || typeof raw !== "object") return undefined;
|
|
1213
|
+
const f = raw as Record<string, unknown>;
|
|
1214
|
+
if (typeof f.step !== "string" || !ICACLS_STEPS.has(f.step)) return undefined;
|
|
1215
|
+
if (
|
|
1216
|
+
f.stage !== "deadline_before_spawn" &&
|
|
1217
|
+
f.stage !== "spawn_failed" &&
|
|
1218
|
+
f.stage !== "runner_rejected" &&
|
|
1219
|
+
f.stage !== "runner_watchdog" &&
|
|
1220
|
+
f.stage !== "child_result"
|
|
1221
|
+
) {
|
|
1222
|
+
return undefined;
|
|
1223
|
+
}
|
|
1224
|
+
if (typeof f.elapsedMs !== "number" || !Number.isFinite(f.elapsedMs)) return undefined;
|
|
1225
|
+
if (typeof f.budgetMs !== "number" || !Number.isFinite(f.budgetMs)) return undefined;
|
|
1226
|
+
if (typeof f.success !== "boolean" || typeof f.timedOut !== "boolean") return undefined;
|
|
1227
|
+
if (f.exitCode !== null && (typeof f.exitCode !== "number" || !Number.isFinite(f.exitCode))) {
|
|
1228
|
+
return undefined;
|
|
1229
|
+
}
|
|
1230
|
+
const spawnErrorCode = allowlistedSpawnErrorCode(f.spawnErrorCode);
|
|
1231
|
+
return {
|
|
1232
|
+
step: f.step as IcaclsStep,
|
|
1233
|
+
stage: f.stage,
|
|
1234
|
+
elapsedMs: f.elapsedMs,
|
|
1235
|
+
budgetMs: f.budgetMs,
|
|
1236
|
+
success: f.success,
|
|
1237
|
+
exitCode: f.exitCode as number | null,
|
|
1238
|
+
timedOut: f.timedOut,
|
|
1239
|
+
...(spawnErrorCode !== undefined ? { spawnErrorCode } : {}),
|
|
1240
|
+
};
|
|
1241
|
+
}
|
|
1242
|
+
|
|
979
1243
|
/** Preserve only the bounded machine-readable cause on a sanitized public error. */
|
|
980
1244
|
function sanitizedAclError(diagnostics: string, cause: unknown): NodeJS.ErrnoException {
|
|
981
|
-
const error = new Error(diagnostics) as NodeJS.ErrnoException;
|
|
1245
|
+
const error = new Error(diagnostics) as NodeJS.ErrnoException & { aclFailure?: AclFailureDiagnostics };
|
|
982
1246
|
const code = cause && typeof cause === "object" && "code" in cause
|
|
983
1247
|
? String((cause as { code?: unknown }).code)
|
|
984
1248
|
: "";
|
|
@@ -995,6 +1259,8 @@ function sanitizedAclError(diagnostics: string, cause: unknown): NodeJS.ErrnoExc
|
|
|
995
1259
|
) {
|
|
996
1260
|
error.code = code;
|
|
997
1261
|
}
|
|
1262
|
+
const aclFailure = sanitizeAclFailure(cause);
|
|
1263
|
+
if (aclFailure) error.aclFailure = aclFailure;
|
|
998
1264
|
return error;
|
|
999
1265
|
}
|
|
1000
1266
|
|
|
@@ -1107,8 +1373,8 @@ function hardenEntry(
|
|
|
1107
1373
|
if (effectivePlatform() !== "win32") return { ok: true };
|
|
1108
1374
|
if (memoSatisfied(cache, targetPath)) return { ok: true };
|
|
1109
1375
|
const deadline = nowFn() + resolveHardenDeadlineMs(opts.deadlineMs);
|
|
1110
|
-
//
|
|
1111
|
-
if (extraReadAces.length === 0 && existingAclAlreadyCompliant(targetPath, directory, deadline)) return { ok: true };
|
|
1376
|
+
// Secret compliance does not prove the extra read grants required by a staged payload.
|
|
1377
|
+
if (extraReadAces.length === 0 && existingAclAlreadyCompliant(targetPath, directory, deadline, directory && opts.verifyExistingRuntimeDirectory === true)) return { ok: true };
|
|
1112
1378
|
const memoKey = timeoutMemoKey(targetPath, opts);
|
|
1113
1379
|
const timeoutMemoError = timeoutMemoErrorIfBlocked(memoKey, opts);
|
|
1114
1380
|
if (timeoutMemoError) {
|
|
@@ -1173,7 +1439,7 @@ async function runHardenEntryAsync(
|
|
|
1173
1439
|
extraReadAces: readonly string[],
|
|
1174
1440
|
): Promise<HardenResult> {
|
|
1175
1441
|
const deadline = nowFn() + resolveHardenDeadlineMs(opts.deadlineMs);
|
|
1176
|
-
if (extraReadAces.length === 0 && await existingAclAlreadyCompliantAsync(targetPath, directory, deadline)) return { ok: true };
|
|
1442
|
+
if (extraReadAces.length === 0 && await existingAclAlreadyCompliantAsync(targetPath, directory, deadline, directory && opts.verifyExistingRuntimeDirectory === true)) return { ok: true };
|
|
1177
1443
|
const memoKey = timeoutMemoKey(targetPath, opts);
|
|
1178
1444
|
const timeoutMemoError = timeoutMemoErrorIfBlocked(memoKey, opts);
|
|
1179
1445
|
if (timeoutMemoError) {
|
|
@@ -63,14 +63,17 @@ export function windowsWrapperKillScript(paths: readonly string[]): string {
|
|
|
63
63
|
export function killWindowsSchedulerWrappers(paths: {
|
|
64
64
|
scriptPath: string;
|
|
65
65
|
launcherPath: string;
|
|
66
|
-
}): void {
|
|
66
|
+
}, beforeMutation?: () => void): void {
|
|
67
67
|
if (process.platform !== "win32") return;
|
|
68
|
+
let file: string, args: string[];
|
|
68
69
|
try {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
70
|
+
file = resolveTrustedWindowsPowerShellExe();
|
|
71
|
+
args = ["-NoProfile", "-NoLogo", "-NonInteractive", "-Command",
|
|
72
|
+
windowsWrapperKillScript([paths.scriptPath, paths.launcherPath])];
|
|
73
|
+
} catch { return; }
|
|
74
|
+
beforeMutation?.();
|
|
75
|
+
try {
|
|
76
|
+
// windowsHide avoids Bun's direct -WindowStyle argv failure (#1589).
|
|
77
|
+
spawnSync(file, args, { stdio: "ignore", timeout: 5000, windowsHide: true });
|
|
75
78
|
} catch { /* best-effort */ }
|
|
76
79
|
}
|
package/src/lib/winsw.ts
CHANGED
|
@@ -184,9 +184,11 @@ const SERVICE_COMMAND_TIMEOUT_MS = 15_000;
|
|
|
184
184
|
/** `stopwait` outlasts the SCM `<stoptimeout>` (20s in the generated service definition) plus overhead; still bounded so a wedged SCM cannot hang the CLI. */
|
|
185
185
|
const SERVICE_STOPWAIT_TIMEOUT_MS = 40_000;
|
|
186
186
|
|
|
187
|
-
function runWinsw(args: string[]): string {
|
|
187
|
+
function runWinsw(args: string[], beforeMutation?: () => void): string {
|
|
188
188
|
const timeoutMs = args[0] === "stopwait" ? SERVICE_STOPWAIT_TIMEOUT_MS : SERVICE_COMMAND_TIMEOUT_MS;
|
|
189
|
-
|
|
189
|
+
const file = winswExePath();
|
|
190
|
+
beforeMutation?.();
|
|
191
|
+
return execFileSync(file, args, {
|
|
190
192
|
encoding: "utf8", stdio: ["ignore", "pipe", "pipe"], windowsHide: true, timeout: timeoutMs,
|
|
191
193
|
}).trim();
|
|
192
194
|
}
|
|
@@ -352,8 +354,10 @@ export function startWinswService(): void { runWinsw(["start"]); }
|
|
|
352
354
|
* catch cannot decide whether it is safe for lifecycle callers to continue. Re-read
|
|
353
355
|
* SCM state and only accept the two states that cannot still own the proxy listener.
|
|
354
356
|
*/
|
|
355
|
-
export function stopWinswService(): void {
|
|
356
|
-
|
|
357
|
+
export function stopWinswService(beforeMutation?: () => void): void {
|
|
358
|
+
let refused = false;
|
|
359
|
+
const gate = beforeMutation && (() => { try { beforeMutation(); } catch (error) { refused = true; throw error; } });
|
|
360
|
+
try { runWinsw(["stopwait"], gate); } catch (error) { if (refused) throw error; /* classify by verified state below */ }
|
|
357
361
|
const status = statusWinswRaw();
|
|
358
362
|
if (status === "stopped" || status === "nonexistent") return;
|
|
359
363
|
if (status === "unknown") {
|
package/src/link/relay-auth.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
|
|
1
|
+
import { createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
|
|
2
2
|
|
|
3
3
|
export const LINK_RELAY_AUTH_PATH = "/.well-known/opencodex/link-relay-auth";
|
|
4
4
|
export const LINK_RELAY_SESSION_HEADER = "x-opencodex-link-session";
|
|
@@ -10,6 +10,43 @@ export const LINK_RELAY_SESSION_HEADER = "x-opencodex-link-session";
|
|
|
10
10
|
export const LINK_RELAY_PROBE_HEADER = "x-opencodex-link-probe";
|
|
11
11
|
export const LINK_RELAY_AUTH_VERSION = "2";
|
|
12
12
|
export const LINK_RELAY_AUTH_TIMEOUT_MS = 5_000;
|
|
13
|
+
/**
|
|
14
|
+
* An additive part of a Home's relay-auth answer: which tunnel connection the proof crossed, as
|
|
15
|
+
* `<Home runtime instance>:<tunnel generation>`, bound to the same nonce and link key by its own
|
|
16
|
+
* proof. A Child that cannot verify it, or an older Home that never sends it, leaves it unknown.
|
|
17
|
+
*/
|
|
18
|
+
export const LINK_RELAY_CONNECTION_HEADER = "x-opencodex-link-connection";
|
|
19
|
+
export const LINK_RELAY_CONNECTION_PROOF_HEADER = "x-opencodex-link-connection-proof";
|
|
20
|
+
/** Chosen once per process, so a runtime restart always changes every connection generation. */
|
|
21
|
+
export const LINK_RUNTIME_INSTANCE = randomUUID();
|
|
22
|
+
const CONNECTION_GENERATION = /^[\x21-\x7e]{1,256}$/;
|
|
23
|
+
|
|
24
|
+
export function isLinkConnectionGeneration(value: unknown): value is string {
|
|
25
|
+
return typeof value === "string" && CONNECTION_GENERATION.test(value);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** This process's name for a tunnel connection; the counter advances on every connect. */
|
|
29
|
+
export function linkConnectionGeneration(counter: number): string {
|
|
30
|
+
return `${LINK_RUNTIME_INSTANCE}:${counter}`;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
let connectionSequence = 0;
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* A fresh connection name from one process-wide sequence, shared by the Home and Child
|
|
37
|
+
* supervisors. A supervisor rebuilt in the same process (a restart rollback, a listener restart)
|
|
38
|
+
* therefore never repeats a name an earlier one handed out.
|
|
39
|
+
*/
|
|
40
|
+
export function nextLinkConnectionGeneration(): string {
|
|
41
|
+
connectionSequence += 1;
|
|
42
|
+
return linkConnectionGeneration(connectionSequence);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export function linkConnectionProof(fingerprint: string, keyId: string, linkId: string, nonce: string, generation: string): string | null {
|
|
46
|
+
if (!isLinkConnectionGeneration(generation) || !linkRelayProof(fingerprint, "listener", keyId, linkId, nonce)) return null;
|
|
47
|
+
return createHmac("sha256", Buffer.from(fingerprint, "hex"))
|
|
48
|
+
.update(`opencodex-link-connection-v1\0${keyId}\0${linkId}\0${nonce}\0${generation}`).digest("hex");
|
|
49
|
+
}
|
|
13
50
|
|
|
14
51
|
/** The direction and both identities are covered; a caller proof is never a listener proof. */
|
|
15
52
|
export function linkRelayProof(
|