@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
|
@@ -71,7 +71,7 @@ function windowsSchtasks(): string {
|
|
|
71
71
|
|
|
72
72
|
let querySchtasksForTests: ((args: string[]) => string) | null = null;
|
|
73
73
|
|
|
74
|
-
export function querySchtasks(args: string[]): string {
|
|
74
|
+
export function querySchtasks(args: string[], beforeMutation?: () => void): string {
|
|
75
75
|
// The repository preload isolates HOME and OPENCODEX_HOME, but Task Scheduler is
|
|
76
76
|
// machine-global. A partially-faked service test once fell through here and replaced the
|
|
77
77
|
// user's real `opencodex-proxy` task with a launcher inside its temporary test home; the
|
|
@@ -86,8 +86,10 @@ export function querySchtasks(args: string[]): string {
|
|
|
86
86
|
+ "inject the scheduler operation instead of calling the live manager.",
|
|
87
87
|
);
|
|
88
88
|
}
|
|
89
|
-
if (querySchtasksForTests) return querySchtasksForTests(args);
|
|
90
|
-
|
|
89
|
+
if (querySchtasksForTests) { beforeMutation?.(); return querySchtasksForTests(args); }
|
|
90
|
+
const file = windowsSchtasks();
|
|
91
|
+
beforeMutation?.();
|
|
92
|
+
return runFile(file, args);
|
|
91
93
|
}
|
|
92
94
|
|
|
93
95
|
/** Test-only seam for Task Scheduler query used by presence probes. */
|
|
@@ -95,11 +97,28 @@ export function setQuerySchtasksForTests(next: ((args: string[]) => string) | nu
|
|
|
95
97
|
querySchtasksForTests = next;
|
|
96
98
|
}
|
|
97
99
|
|
|
98
|
-
export function schtasks(args: string[]
|
|
100
|
+
export function schtasks(args: string[], control: (() => void) | {
|
|
101
|
+
run?: (args: string[]) => string;
|
|
102
|
+
probeTask?: () => WindowsSchedulerTaskProbe;
|
|
103
|
+
} = {}): string {
|
|
104
|
+
const beforeMutation = typeof control === "function" ? control : undefined;
|
|
105
|
+
const io = typeof control === "function" ? {} : control;
|
|
106
|
+
let refused = false;
|
|
107
|
+
const gate = beforeMutation && (() => { try { beforeMutation(); } catch (error) { refused = true; throw error; } });
|
|
99
108
|
try {
|
|
100
|
-
return querySchtasks(args);
|
|
109
|
+
return io.run ? io.run(args) : querySchtasks(args, gate);
|
|
101
110
|
} catch (error) {
|
|
102
|
-
throw
|
|
111
|
+
if (refused) throw error;
|
|
112
|
+
let taskPresent = false;
|
|
113
|
+
const normalized = args.map(arg => arg.toLowerCase());
|
|
114
|
+
const taskIndex = normalized.indexOf("/tn");
|
|
115
|
+
if (normalized[0] === "/delete" && taskIndex > 0 && normalized[taskIndex + 1] === TASK
|
|
116
|
+
&& error && typeof error === "object" && "status" in error && error.status === 1) {
|
|
117
|
+
try {
|
|
118
|
+
taskPresent = (io.probeTask ?? probeWindowsSchedulerTask)().status === "present";
|
|
119
|
+
} catch { /* An unreadable task is not proof of an access denial. */ }
|
|
120
|
+
}
|
|
121
|
+
throw toWindowsSchtasksError(error, args, taskPresent);
|
|
103
122
|
}
|
|
104
123
|
}
|
|
105
124
|
|
|
@@ -174,6 +193,10 @@ export async function inspectWindowsSchedulerServiceStatus(io: {
|
|
|
174
193
|
}
|
|
175
194
|
|
|
176
195
|
export function schtasksErrorDetail(error: unknown): string {
|
|
196
|
+
if (error && typeof error === "object"
|
|
197
|
+
&& ("status" in error || "stderr" in error || "stdout" in error)) {
|
|
198
|
+
return toWindowsSchtasksError(error, ["/query"]).message;
|
|
199
|
+
}
|
|
177
200
|
return error instanceof Error ? error.message : String(error);
|
|
178
201
|
}
|
|
179
202
|
|
|
@@ -76,7 +76,7 @@ export type ServiceManagerInstallation =
|
|
|
76
76
|
|
|
77
77
|
/** Injected so a test can observe the EXACT argv production emits. */
|
|
78
78
|
export interface ProbeRunner {
|
|
79
|
-
(file: string, args: readonly string[]): {
|
|
79
|
+
(file: string, args: readonly string[], options?: { readonly input?: string }): {
|
|
80
80
|
status: number | null;
|
|
81
81
|
stdout: string;
|
|
82
82
|
stderr: string;
|
|
@@ -152,9 +152,10 @@ export function createWindowsTaskListingCache(): WindowsTaskListingCache {
|
|
|
152
152
|
};
|
|
153
153
|
}
|
|
154
154
|
|
|
155
|
-
export const defaultProbeRunner: ProbeRunner = (file, args) => {
|
|
155
|
+
export const defaultProbeRunner: ProbeRunner = (file, args, options) => {
|
|
156
156
|
const result = spawnSync(file, [...args], {
|
|
157
157
|
encoding: "utf8",
|
|
158
|
+
input: options?.input,
|
|
158
159
|
windowsHide: true,
|
|
159
160
|
timeout: SERVICE_PROBE_TIMEOUT_MS,
|
|
160
161
|
});
|
|
@@ -220,6 +221,12 @@ const LAUNCHCTL_NO_SUCH_SERVICE = 113;
|
|
|
220
221
|
* headless Mac — no GUI domain, and no installation either.
|
|
221
222
|
*/
|
|
222
223
|
const LAUNCHCTL_NO_SUCH_DOMAIN = 112;
|
|
224
|
+
/**
|
|
225
|
+
* Observed on a headless Mac (#7697), but unsupported action is not proof that
|
|
226
|
+
* no GUI login exists. Only independent session evidence can qualify GUI 125;
|
|
227
|
+
* a user-domain 125 remains unknown because its services are independent.
|
|
228
|
+
*/
|
|
229
|
+
const LAUNCHCTL_DOMAIN_UNSUPPORTED_ACTION = 125;
|
|
223
230
|
|
|
224
231
|
/**
|
|
225
232
|
* Residue on disk, distinguished from a path that could not be read.
|
|
@@ -338,6 +345,36 @@ function inspectSystemdOffline(home: string): ServiceManagerInstallation {
|
|
|
338
345
|
};
|
|
339
346
|
}
|
|
340
347
|
|
|
348
|
+
/**
|
|
349
|
+
* TN2083: /dev/console identifies only the foreground user; switched-out GUI
|
|
350
|
+
* sessions survive. XNU's IOService::updateConsoleUsers publishes the complete
|
|
351
|
+
* supplied array on the registry root, with UID separate from OnConsole:
|
|
352
|
+
* https://github.com/apple-oss-distributions/xnu/blob/main/iokit/Kernel/IOService.cpp
|
|
353
|
+
* https://github.com/apple-oss-distributions/xnu/blob/main/iokit/IOKit/IOKitKeysPrivate.h
|
|
354
|
+
* Both commands inherit the runner's 2s bound. Missing or malformed evidence
|
|
355
|
+
* cannot prove absence; do not cache session evidence across admissions.
|
|
356
|
+
*/
|
|
357
|
+
function launchdGuiSessionAbsent(run: ProbeRunner, uid: number): boolean {
|
|
358
|
+
try {
|
|
359
|
+
const registry = run("/usr/sbin/ioreg", ["-a", "-r", "-d", "1", "-n", "Root"]);
|
|
360
|
+
if (registry.spawnFailed || registry.timedOut || registry.status !== 0 || !registry.stdout.trim()) return false;
|
|
361
|
+
const converted = run("/usr/bin/plutil", ["-extract", "0.IOConsoleUsers", "json", "-o", "-", "-"], {
|
|
362
|
+
input: registry.stdout,
|
|
363
|
+
});
|
|
364
|
+
if (converted.spawnFailed || converted.timedOut || converted.status !== 0) return false;
|
|
365
|
+
const sessions: unknown = JSON.parse(converted.stdout);
|
|
366
|
+
if (!Array.isArray(sessions)) return false;
|
|
367
|
+
return sessions.every(session => {
|
|
368
|
+
if (!session || typeof session !== "object" || Array.isArray(session)) return false;
|
|
369
|
+
const sessionUid: unknown = session.kCGSSessionUserIDKey;
|
|
370
|
+
return typeof sessionUid === "number" && Number.isInteger(sessionUid)
|
|
371
|
+
&& sessionUid >= 0 && sessionUid < 0xffff_ffff && sessionUid !== uid;
|
|
372
|
+
});
|
|
373
|
+
} catch {
|
|
374
|
+
return false;
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
|
|
341
378
|
function inspectLaunchd(deps: Required<Pick<ProbeDeps, "run" | "uid" | "home">>): ServiceManagerInstallation {
|
|
342
379
|
const definitionPath = join(deps.home, "Library", "LaunchAgents", `${LABEL}.plist`);
|
|
343
380
|
|
|
@@ -357,6 +394,16 @@ function inspectLaunchd(deps: Required<Pick<ProbeDeps, "run" | "uid" | "home">>)
|
|
|
357
394
|
if (printed.status === 0) { registration = "present"; break; }
|
|
358
395
|
if (printed.status === LAUNCHCTL_NO_SUCH_SERVICE) continue;
|
|
359
396
|
if (printed.status === LAUNCHCTL_NO_SUCH_DOMAIN) { unreachableDomains += 1; continue; }
|
|
397
|
+
/*
|
|
398
|
+
* Unsupported action alone says nothing about loaded jobs. Qualify GUI
|
|
399
|
+
* 125 only with independent evidence excluding this UID's GUI sessions;
|
|
400
|
+
* the separate user-domain query and plist checks remain mandatory.
|
|
401
|
+
*/
|
|
402
|
+
if (printed.status === LAUNCHCTL_DOMAIN_UNSUPPORTED_ACTION && domain.startsWith("gui/")) {
|
|
403
|
+
if (!launchdGuiSessionAbsent(deps.run, deps.uid)) return unknown("GUI login session absence could not be established");
|
|
404
|
+
unreachableDomains += 1;
|
|
405
|
+
continue;
|
|
406
|
+
}
|
|
360
407
|
return unknown(`launchctl print exited ${String(printed.status)}: ${printed.stderr.trim()}`);
|
|
361
408
|
}
|
|
362
409
|
|
|
@@ -368,12 +415,10 @@ function inspectLaunchd(deps: Required<Pick<ProbeDeps, "run" | "uid" | "home">>)
|
|
|
368
415
|
return unknown("launchd has a job loaded but its plist is missing");
|
|
369
416
|
}
|
|
370
417
|
/*
|
|
371
|
-
* Nothing staged, and every domain either answered
|
|
372
|
-
* not exist
|
|
373
|
-
*
|
|
374
|
-
*
|
|
375
|
-
* instead would refuse every write on a fresh headless Mac, which has no
|
|
376
|
-
* GUI domain and no installation either.
|
|
418
|
+
* Nothing staged, and every domain either answered service-scoped 113,
|
|
419
|
+
* did not exist (112), or returned GUI 125 corroborated by independent
|
|
420
|
+
* evidence of no GUI session for this UID. A user-domain 113 alone cannot
|
|
421
|
+
* exclude a job in the GUI domain's separate service set.
|
|
377
422
|
*/
|
|
378
423
|
void unreachableDomains;
|
|
379
424
|
return { kind: "absent" };
|
package/src/stall-timeout.ts
CHANGED
|
@@ -43,3 +43,50 @@ export function resolveStallTimeoutSec(configuredSec: number | undefined, option
|
|
|
43
43
|
export function resolveStallTimeoutMs(configuredSec: number | undefined, options: StallTimeoutOptions = {}): number {
|
|
44
44
|
return resolveStallTimeoutSec(configuredSec, options) * 1_000;
|
|
45
45
|
}
|
|
46
|
+
|
|
47
|
+
/** Header-arrival (connect) deadline applied to public upstreams when the operator sets none. */
|
|
48
|
+
export const DEFAULT_CONNECT_TIMEOUT_MS = 200_000;
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Resolve the per-request header-arrival (connect) deadline in milliseconds.
|
|
52
|
+
*
|
|
53
|
+
* This is the budget `fetchWithHeaderTimeout` applies from dispatch until the upstream returns its
|
|
54
|
+
* first response headers — it covers DNS, TCP, TLS, and the wait for response headers, but NOT the
|
|
55
|
+
* body/stream that follows (that is the stall budget, see {@link resolveStallTimeoutMs}).
|
|
56
|
+
*
|
|
57
|
+
* An explicit value always wins: `0` (or any non-positive) disables the deadline everywhere, and a
|
|
58
|
+
* positive value applies verbatim to local and public upstreams alike. Only when the operator left
|
|
59
|
+
* it unset does the destination matter. A local upstream (loopback / private / `.local` / `.lan`,
|
|
60
|
+
* via {@link StallTimeoutOptions.localUpstream}) resolves to disabled (`0`): LM Studio, Ollama, and
|
|
61
|
+
* similar CPU-bound backends can spend minutes in prompt prefill before the first response header
|
|
62
|
+
* arrives on a large prompt, and a flat ceiling would cut that healthy turn. A public upstream
|
|
63
|
+
* keeps the {@link DEFAULT_CONNECT_TIMEOUT_MS} safety deadline.
|
|
64
|
+
*
|
|
65
|
+
* Disabling is expressed as `0`: `fetchWithHeaderTimeout` arms no header clock for a non-positive
|
|
66
|
+
* budget. Client cancellation and any enclosing overall deadline remain authoritative.
|
|
67
|
+
*/
|
|
68
|
+
export function resolveConnectTimeoutMs(configuredMs: number | undefined, options: StallTimeoutOptions = {}): number {
|
|
69
|
+
const { localUpstream = false } = options;
|
|
70
|
+
if (typeof configuredMs === "number" && Number.isFinite(configuredMs)) {
|
|
71
|
+
if (configuredMs <= 0) return 0;
|
|
72
|
+
return Math.max(1, Math.ceil(configuredMs));
|
|
73
|
+
}
|
|
74
|
+
return localUpstream ? 0 : DEFAULT_CONNECT_TIMEOUT_MS;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** Legacy minimum public JSON body-read allowance, independent of the local stall policy. */
|
|
78
|
+
export const MIN_JSON_BODY_READ_MS = 5_000;
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Resolve the total/inactivity budget for reading a buffered non-streaming JSON response body.
|
|
82
|
+
*
|
|
83
|
+
* Local JSON reads use the stall budget for inactivity only; their enclosing signal owns any
|
|
84
|
+
* overall deadline. An unset local budget disables the body clock. Public reads preserve their
|
|
85
|
+
* legacy connect-derived total/inactivity allowance, including the five-second floor, independently
|
|
86
|
+
* of the new local policy. This does not extend the response-header timer into the body phase.
|
|
87
|
+
*/
|
|
88
|
+
export function resolveJsonBodyReadTimeoutMs(configuredSec: number | undefined, options: StallTimeoutOptions = {}, configuredConnectMs?: number): number {
|
|
89
|
+
return options.localUpstream
|
|
90
|
+
? resolveStallTimeoutMs(configuredSec, options)
|
|
91
|
+
: Math.max(configuredConnectMs ?? DEFAULT_CONNECT_TIMEOUT_MS, MIN_JSON_BODY_READ_MS);
|
|
92
|
+
}
|
package/src/tray/windows.ts
CHANGED
|
@@ -622,11 +622,13 @@ export async function runWindowsTrayHost(): Promise<void> {
|
|
|
622
622
|
});
|
|
623
623
|
}
|
|
624
624
|
|
|
625
|
-
function signalTrayStop(): ReturnType<typeof readHeartbeat> {
|
|
625
|
+
function signalTrayStop(beforeMutation?: () => void): ReturnType<typeof readHeartbeat> {
|
|
626
626
|
const previous = readHeartbeat();
|
|
627
627
|
// The stop event name depends only on the current home. Never execute paths
|
|
628
628
|
// recovered from tray-state.json while attempting cleanup or repair.
|
|
629
|
-
|
|
629
|
+
const file = windowsPowerShellPath(), args = windowsTrayProcessArgs(currentEntry(), "Stop");
|
|
630
|
+
beforeMutation?.();
|
|
631
|
+
execFileSync(file, args, {
|
|
630
632
|
stdio: "ignore",
|
|
631
633
|
windowsHide: true,
|
|
632
634
|
timeout: 15_000,
|
|
@@ -743,11 +745,11 @@ export function startWindowsTray(): WindowsTrayStatus {
|
|
|
743
745
|
return getWindowsTrayStatus();
|
|
744
746
|
}
|
|
745
747
|
|
|
746
|
-
export function stopWindowsTray(): WindowsTrayStatus {
|
|
748
|
+
export function stopWindowsTray(beforeMutation?: () => void): WindowsTrayStatus {
|
|
747
749
|
assertWindows();
|
|
748
750
|
let previous = readHeartbeat();
|
|
749
751
|
if (previous) {
|
|
750
|
-
previous = signalTrayStop();
|
|
752
|
+
previous = signalTrayStop(beforeMutation);
|
|
751
753
|
}
|
|
752
754
|
if (!waitForTrayExit(previous)) throw new Error("The tray did not exit after the stop signal. Its login registration was preserved.");
|
|
753
755
|
return getWindowsTrayStatus();
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { AdmissionModelScope } from "../server/admission-model-scope";
|
|
2
|
+
import type { OcxFallbackConfig } from "./fallback";
|
|
3
|
+
|
|
4
|
+
/** Credential-free, immutable decision inputs captured for an internal child. */
|
|
5
|
+
export interface CapturedAdmissionPolicy {
|
|
6
|
+
readonly modelScope: AdmissionModelScope;
|
|
7
|
+
readonly allowMeteredComboTargets: boolean;
|
|
8
|
+
readonly meteredRequiresComboOptIn: boolean;
|
|
9
|
+
readonly fallbackPolicies: readonly {
|
|
10
|
+
readonly config: { readonly fallback?: OcxFallbackConfig };
|
|
11
|
+
readonly deviceIds: readonly string[];
|
|
12
|
+
}[];
|
|
13
|
+
}
|
package/src/types/config.ts
CHANGED
|
@@ -56,6 +56,14 @@ export interface OcxClaudeCodeConfig {
|
|
|
56
56
|
* Default: false; only literal true enables it. Native passthrough is unchanged.
|
|
57
57
|
*/
|
|
58
58
|
stabilizePromptCache?: boolean;
|
|
59
|
+
/**
|
|
60
|
+
* Opt-in resolved provider/model routes verified to accept Responses additional_tools.
|
|
61
|
+
* A single trailing '*' matches a provider-qualified prefix (for example 'gateway/gpt-*').
|
|
62
|
+
* Replays successful client ToolSearch discoveries in place without growing the initial
|
|
63
|
+
* catalog. Requires metadata.user_id. Absent/empty is off; native passthrough is unchanged.
|
|
64
|
+
* Applies only after routing settles on a direct openai-responses route; combos and policies are skipped.
|
|
65
|
+
*/
|
|
66
|
+
appendOnlyToolLoadingModels?: string[];
|
|
59
67
|
/** Opt-in translated Messages admission; unset keeps legacy behavior. Native passthrough is exempt. */
|
|
60
68
|
compatibility?: "shadow" | "enforce";
|
|
61
69
|
/** Kill switch for the /v1/messages inbound (GUI "Claude ON" toggle). Default: enabled. */
|
|
@@ -147,15 +155,15 @@ export interface OcxClaudeCodeConfig {
|
|
|
147
155
|
* that back on: "Set ENABLE_TOOL_SEARCH=true (or auto / auto:N) if your proxy
|
|
148
156
|
* forwards tool_reference blocks."
|
|
149
157
|
*
|
|
150
|
-
* Default OFF
|
|
151
|
-
*
|
|
152
|
-
*
|
|
153
|
-
*
|
|
154
|
-
*
|
|
155
|
-
*
|
|
156
|
-
*
|
|
157
|
-
*
|
|
158
|
-
*
|
|
158
|
+
* Default OFF. Native Anthropic passthrough retains server-side search; the
|
|
159
|
+
* ordinary translated route drops the typed search tool and sends function schemas
|
|
160
|
+
* eagerly. appendOnlyToolLoadingModels is a separate opt-in for verified final
|
|
161
|
+
* Responses destinations and an eager client-executed ToolSearch function: it
|
|
162
|
+
* projects currently declared deferred definitions at successful discovery results.
|
|
163
|
+
* This launcher switch alone enables neither that projection nor server-side search.
|
|
164
|
+
* Compatibility-enforcement admission remains unchanged and can reject unsupported
|
|
165
|
+
* tool_search/tool_reference/deferred_tools requests; no native-search parity or
|
|
166
|
+
* cache-hit guarantee is implied.
|
|
159
167
|
*
|
|
160
168
|
* `true` injects "true"; a string is passed through verbatim so Claude Code's own
|
|
161
169
|
* vocabulary (`auto`, `auto:N`, `force`) stays reachable. `false` and absent
|
|
@@ -256,6 +264,18 @@ export interface OcxClaudeCodeConfig {
|
|
|
256
264
|
* Routing-sidecar alias decoding is unchanged — only the Desktop model list writer.
|
|
257
265
|
*/
|
|
258
266
|
desktopNativeModels?: boolean;
|
|
267
|
+
/**
|
|
268
|
+
* Which models the Claude Desktop 3P list carries (src/claude/desktop-model-visibility.ts).
|
|
269
|
+
* Unset lists every available model. Independent of desktopProfile tiers and of
|
|
270
|
+
* provider-wide disabledModels; other clients are unaffected.
|
|
271
|
+
*/
|
|
272
|
+
desktopModelVisibility?: OcxClaudeDesktopModelVisibility;
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
/** `include`: only `routes` (new models hidden). `exclude`: all but `routes` (new models listed). */
|
|
276
|
+
export interface OcxClaudeDesktopModelVisibility {
|
|
277
|
+
mode: "include" | "exclude";
|
|
278
|
+
routes: string[];
|
|
259
279
|
}
|
|
260
280
|
|
|
261
281
|
export type OcxClaudeDesktopFamily = "opus" | "fable" | "sonnet" | "haiku";
|
|
@@ -384,6 +404,28 @@ export interface OcxClientIntegrationsConfig {
|
|
|
384
404
|
"claude-desktop"?: boolean;
|
|
385
405
|
}
|
|
386
406
|
|
|
407
|
+
/**
|
|
408
|
+
* Opt-in opencode-side request timeouts written into the generated opencode provider block
|
|
409
|
+
* (both the V1 `options` and V2 `settings` connection objects). Each maps to the matching
|
|
410
|
+
* opencode `settings` field and accepts a number of milliseconds or `false` to disable that wait.
|
|
411
|
+
*
|
|
412
|
+
* Omitted by default: opencode keeps its native header and chunk waits for every upstream reached
|
|
413
|
+
* through the proxy (current V2 defaults the header wait to 5 minutes and the longer chunk wait to
|
|
414
|
+
* 15 minutes; this repo pins no opencode release). The knob exists because the generated
|
|
415
|
+
* `opencodex` provider multiplexes all upstreams under one block and opencode's timeouts are
|
|
416
|
+
* provider-wide, so a user fronting a slow local model (whose prompt prefill behind a non-streaming
|
|
417
|
+
* turn can exceed the header wait before the proxy emits a byte) can raise or disable the wait
|
|
418
|
+
* without touching the safety net for anyone else only by setting it here.
|
|
419
|
+
*/
|
|
420
|
+
export interface OcxOpencodeClientExportConfig {
|
|
421
|
+
/** opencode `settings.headerTimeout`: client wait for the proxy's first response header (ms), or false to disable. */
|
|
422
|
+
headerTimeoutMs?: number | false;
|
|
423
|
+
/** opencode `settings.chunkTimeout`: wait between streamed response chunks (ms), or false to disable. */
|
|
424
|
+
chunkTimeoutMs?: number | false;
|
|
425
|
+
/** opencode `settings.timeout`: whole-request bound (ms), or false. opencode applies no default. */
|
|
426
|
+
timeoutMs?: number | false;
|
|
427
|
+
}
|
|
428
|
+
|
|
387
429
|
export interface OcxConfigRebaseProvenance {
|
|
388
430
|
version: 1;
|
|
389
431
|
deletedTopLevelKeys: string[];
|
|
@@ -541,6 +583,8 @@ export interface OcxConfig {
|
|
|
541
583
|
emptyCompletionRetry?: boolean;
|
|
542
584
|
/** Suppress allowlisted client-facing Codex transport hints; provider enforcement is unchanged. */
|
|
543
585
|
dropCodexSafetyBuffering?: boolean;
|
|
586
|
+
/** Opt in to completing truncated plain-text translated Responses turns; default off. */
|
|
587
|
+
completeOnMaxOutputTokens?: boolean;
|
|
544
588
|
/**
|
|
545
589
|
* Whether a login may open a browser on the machine running the proxy.
|
|
546
590
|
*
|
|
@@ -665,6 +709,15 @@ export interface OcxConfig {
|
|
|
665
709
|
* one key at a time rather than widening a shared union.
|
|
666
710
|
*/
|
|
667
711
|
clientIntegrations?: OcxClientIntegrationsConfig;
|
|
712
|
+
/**
|
|
713
|
+
* Opt-in opencode-side request timeouts emitted into the generated opencode provider block.
|
|
714
|
+
* Omitted by default (opencode keeps its native header/chunk waits). Set `headerTimeoutMs` to
|
|
715
|
+
* extend or disable the header wait that otherwise cuts a slow local model's prompt prefill.
|
|
716
|
+
* See {@link OcxOpencodeClientExportConfig}.
|
|
717
|
+
*/
|
|
718
|
+
opencodeClientExport?: OcxOpencodeClientExportConfig;
|
|
719
|
+
/** Opt-in dialect for the managed Pi-based omo block; omitted keeps `openai-completions` (#7431). */
|
|
720
|
+
omoClientExport?: { api?: "openai-completions" | "openai-responses" };
|
|
668
721
|
/** Aside account-backed profile synchronization; individual overrides survive bulk refresh. */
|
|
669
722
|
asideProfileSync?: {
|
|
670
723
|
allProfiles?: boolean;
|
|
@@ -717,6 +770,11 @@ export interface OcxConfig {
|
|
|
717
770
|
* classification. Models no list names and no price covers are never proposed.
|
|
718
771
|
*/
|
|
719
772
|
codexRoleTiers?: { fast?: string[]; standard?: string[]; frontier?: string[] };
|
|
773
|
+
/**
|
|
774
|
+
* Measured-capability source for Codex role auto-assign. With an Artificial Analysis API key
|
|
775
|
+
* (a literal, ${ENV} or keychain reference) its indexes inform measured tiers.
|
|
776
|
+
*/
|
|
777
|
+
codexRoleCapability?: { artificialAnalysis?: { apiKey?: string } };
|
|
720
778
|
/**
|
|
721
779
|
* TTL (ms) for cached sub-agent model availability probes. Default 60_000.
|
|
722
780
|
*/
|
|
@@ -822,6 +880,8 @@ export interface OcxConfig {
|
|
|
822
880
|
reasoningRetention?: { enabled?: boolean; maxContextPercent?: number; maxTokens?: number };
|
|
823
881
|
/** Canonical ChatGPT reasoning replay allowances; both default off. */
|
|
824
882
|
nativeReasoningRetention?: { modelSwitch?: boolean; accountSwitch?: boolean };
|
|
883
|
+
/** Per-root fan-out ceilings (src/lib/workflow-budget.ts); omitted fields keep 8 / 256 / 64. */
|
|
884
|
+
workflowBudget?: { maxConcurrentChildren?: number; maxPhysicalSends?: number; maxDistinctChildren?: number };
|
|
825
885
|
/** Explicit opt-in; resumes Observe only using an existing trusted certificate and endpoints. */
|
|
826
886
|
desktopCompatibility?: { startOnProxyStart: boolean };
|
|
827
887
|
/**
|
|
@@ -852,6 +912,8 @@ export interface OcxConfig {
|
|
|
852
912
|
* the bare row plus every generated selector row and omit that model family from raw discovery.
|
|
853
913
|
*/
|
|
854
914
|
disabledModels?: string[];
|
|
915
|
+
/** Omit explicitly disabled native catalog rows, retaining their validated inheritance template. Default: false; direct routing is unchanged. */
|
|
916
|
+
omitDisabledNativeModels?: boolean;
|
|
855
917
|
/** 사용자가 대시보드에서 직접 추가한 커스텀 모델 목록. */
|
|
856
918
|
customModels?: OcxCustomModel[];
|
|
857
919
|
/**
|
|
@@ -1024,7 +1086,14 @@ export interface OcxConfig {
|
|
|
1024
1086
|
* response.incomplete. Default 300. Min 1.
|
|
1025
1087
|
*/
|
|
1026
1088
|
stallTimeoutSec?: number;
|
|
1027
|
-
/**
|
|
1089
|
+
/**
|
|
1090
|
+
* Connect timeout (ms) for upstream fetch — the deadline from dispatch until the upstream
|
|
1091
|
+
* returns its first response header (covers DNS, TCP, TLS, and the header wait; NOT the body
|
|
1092
|
+
* stream that follows, which is governed by stallTimeoutSec). Set 0 (or any non-positive value)
|
|
1093
|
+
* to disable it entirely. When unset, a public upstream defaults to 200000, while a local
|
|
1094
|
+
* upstream (loopback / private / `.local` / `.lan`) disables it — a local model's prompt prefill
|
|
1095
|
+
* can hold the connection silent for minutes on a large prompt before the first header arrives.
|
|
1096
|
+
*/
|
|
1028
1097
|
connectTimeoutMs?: number;
|
|
1029
1098
|
/** Graceful shutdown drain timeout (ms). Active turns are aborted after this deadline. Default 5000. */
|
|
1030
1099
|
shutdownTimeoutMs?: number;
|
|
@@ -1323,6 +1392,13 @@ export interface OcxConfig {
|
|
|
1323
1392
|
* server starts, so raising this takes effect on restart.
|
|
1324
1393
|
*/
|
|
1325
1394
|
maxInboundBodyBytes?: number;
|
|
1395
|
+
/**
|
|
1396
|
+
* Aggregate admission budget, in bytes, for concurrent raised-limit inbound HTTP bodies.
|
|
1397
|
+
* Omitted or 0 = the built-in 512 MiB budget. `resolveConcurrentInboundBodyLimitBytes()`
|
|
1398
|
+
* clamps to [512 MiB, 2 GiB]; there is no disabled or unbounded mode. Changes take effect
|
|
1399
|
+
* on proxy restart. This accounts for admitted bodies, not total process memory.
|
|
1400
|
+
*/
|
|
1401
|
+
maxConcurrentInboundBodyBytes?: number;
|
|
1326
1402
|
/**
|
|
1327
1403
|
* Opt-in Anthropic OAuth PROACTIVE routing (#294). Default OFF.
|
|
1328
1404
|
* Sticky session affinity; new sessions may pick lowest known 5h usage.
|
package/src/types/provider.ts
CHANGED
|
@@ -434,6 +434,14 @@ export interface OcxProviderConfig {
|
|
|
434
434
|
fastEnabled?: boolean;
|
|
435
435
|
/** Exact upstream model ids that override the provider-level service-tier capability. */
|
|
436
436
|
modelSupportsServiceTier?: Record<string, boolean>;
|
|
437
|
+
/**
|
|
438
|
+
* Whether to promote Codex Desktop's `additional_tools` input items into top-level `tools`
|
|
439
|
+
* and strip the wrapper from `input`. Enabled automatically for OpenCode Go and xAI
|
|
440
|
+
* (`api.x.ai` and `cli-chat-proxy.grok.com`) except on forward-auth routes, which need an
|
|
441
|
+
* explicit `true`; other strict gateways that return HTTP 422 for unknown item types in
|
|
442
|
+
* `input` can opt in here.
|
|
443
|
+
*/
|
|
444
|
+
promoteAdditionalTools?: boolean;
|
|
437
445
|
/**
|
|
438
446
|
* Responses upstream whose native contract accepts plaintext reasoning replay
|
|
439
447
|
* (DeepSeek documents reasoning items with plaintext content). When set, the
|
|
@@ -1011,6 +1019,8 @@ export interface OcxProviderConfig {
|
|
|
1011
1019
|
* keeps its slot in the conversation.
|
|
1012
1020
|
*/
|
|
1013
1021
|
foldDeveloperRoleToSystem?: boolean;
|
|
1022
|
+
/** Merge text-only Chat instruction messages into one leading system message. LM Studio seeds true. */
|
|
1023
|
+
singleLeadingSystemMessage?: boolean;
|
|
1014
1024
|
/**
|
|
1015
1025
|
* Opt-in: forward `prompt_cache_key` to the upstream `/chat/completions` body.
|
|
1016
1026
|
* OpenAI-specific extension; strict backends (Groq, Cerebras, etc.) reject unknown
|
package/src/types/request.ts
CHANGED
|
@@ -479,7 +479,7 @@ export type AdapterEvent =
|
|
|
479
479
|
| { type: "reasoning_raw_delta"; text: string }
|
|
480
480
|
| { type: "tool_call_start"; id: string; name: string; providerMetadata?: OcxProviderOpaqueToolCallMetadata }
|
|
481
481
|
| { type: "tool_call_delta"; arguments: string }
|
|
482
|
-
| { type: "tool_call_end" }
|
|
482
|
+
| { type: "tool_call_end"; incomplete?: true }
|
|
483
483
|
/** Internal boundary between a guarded first pass and its one-shot continuation. */
|
|
484
484
|
| { type: "assistant_boundary" }
|
|
485
485
|
// Native web-search activity surfaced by the web-search sidecar so Codex renders a "Searched the
|
|
@@ -573,6 +573,13 @@ export interface OcxUsage {
|
|
|
573
573
|
cacheCreation1hInputTokens?: number;
|
|
574
574
|
reasoningOutputTokens?: number;
|
|
575
575
|
estimated?: boolean;
|
|
576
|
+
/**
|
|
577
|
+
* The adapter read these counts off the upstream's own usage frame. Only an adapter whose
|
|
578
|
+
* provider is estimated by default (usageForFinalLog) sets it, and a merge keeps it only when
|
|
579
|
+
* every leg had it. A figure taken off a bridged wire or guessed never carries it, so the
|
|
580
|
+
* provider default still marks those as estimated.
|
|
581
|
+
*/
|
|
582
|
+
upstreamReported?: true;
|
|
576
583
|
/**
|
|
577
584
|
* The raw upstream usage object for Responses-shaped upstreams (openai/codex#41980 parity):
|
|
578
585
|
* codex-rs preserves the complete `response.usage` object through its own pipeline, so fields
|
package/src/types.ts
CHANGED
|
@@ -74,11 +74,13 @@ export type {
|
|
|
74
74
|
OcxClaudeCodeConfig,
|
|
75
75
|
OcxClaudeDesktopFamily,
|
|
76
76
|
OcxClaudeDesktopAssignment,
|
|
77
|
+
OcxClaudeDesktopModelVisibility,
|
|
77
78
|
OcxClaudeDesktopProfile,
|
|
78
79
|
StorageCleanupPolicy,
|
|
79
80
|
OcxCustomModel,
|
|
80
81
|
OcxApiKeyEntry,
|
|
81
82
|
OcxClientIntegrationsConfig,
|
|
83
|
+
OcxOpencodeClientExportConfig,
|
|
82
84
|
OcxConfigRebaseProvenance,
|
|
83
85
|
OcxHubConfig,
|
|
84
86
|
OcxRemoteGuiConfig,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { ChildProcessWithoutNullStreams } from "node:child_process";
|
|
2
|
+
import { probeSpawn } from "./mutation-guard.mjs";
|
|
2
3
|
import { unprivilegedOwnershipMutationEnvironment } from "../service/ownership-mutation-lease.mjs";
|
|
3
4
|
import { PKG, registrySpawnTarget, type Channel, type Installer } from "./index";
|
|
4
5
|
import type { PnpmGlobalOwner } from "./pnpm-global-install.mjs";
|
|
@@ -40,11 +41,11 @@ export async function pnpmOwner(deps: PnpmOwnerDeps = {}): Promise<PnpmGlobalOwn
|
|
|
40
41
|
|
|
41
42
|
export interface AsyncLookupDeps {
|
|
42
43
|
ownerFn: () => Promise<PnpmGlobalOwner | null>;
|
|
43
|
-
spawnFn: typeof
|
|
44
|
+
spawnFn: typeof probeSpawn;
|
|
44
45
|
deadlineMs?: number;
|
|
45
46
|
}
|
|
46
47
|
|
|
47
|
-
const defaultDeps: AsyncLookupDeps = { ownerFn: pnpmOwner, spawnFn:
|
|
48
|
+
const defaultDeps: AsyncLookupDeps = { ownerFn: pnpmOwner, spawnFn: probeSpawn };
|
|
48
49
|
|
|
49
50
|
export async function latestVersionAsync(
|
|
50
51
|
channel: Channel,
|
package/src/update/bind-probe.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { probeSpawnSync } from "./mutation-guard.mjs";
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* Strict bind script: exit 0 only after listen+close. Any listen error (including
|
|
@@ -17,7 +17,7 @@ export function strictBindProbeScript(port: number, hostname: string): string {
|
|
|
17
17
|
|
|
18
18
|
export function spawnBindProbe(bin: string, script: string): boolean {
|
|
19
19
|
try {
|
|
20
|
-
const r =
|
|
20
|
+
const r = probeSpawnSync(bin, ["-e", script], {
|
|
21
21
|
windowsHide: true,
|
|
22
22
|
timeout: 4000,
|
|
23
23
|
stdio: "ignore",
|
|
@@ -39,6 +39,15 @@ export function isCodexCliUpdateInspectionArgv(argv) {
|
|
|
39
39
|
return args[0] === "system" && args[1] === "codex-cli-update";
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
+
/** Long-lived published proxy servers need the same proof-bound snapshot so management routes
|
|
43
|
+
* can inspect the Node-selected Codex CLI without accepting a client path or ambient dotenv value.
|
|
44
|
+
* This only controls snapshot inclusion; it does not extend the one-shot inspection restrictions.
|
|
45
|
+
*/
|
|
46
|
+
export function carriesCodexCliUpdateInspectionContext(argv) {
|
|
47
|
+
const args = argv.slice(2).filter(value => !value.startsWith("--ocx-internal-launch-proof="));
|
|
48
|
+
return isCodexCliUpdateInspectionArgv(argv) || args[0] === "start";
|
|
49
|
+
}
|
|
50
|
+
|
|
42
51
|
/** Serialized OCX_NODE_LAUNCH_CONTEXT ceiling; src/cli/launcher-context.ts refuses above it. */
|
|
43
52
|
export const NODE_LAUNCH_CONTEXT_MAX_CHARS = 64 * 1024;
|
|
44
53
|
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { reclaimListenPort, type ReclaimListenPortOptions } from "../server/port-reclaim";
|
|
2
|
+
|
|
3
|
+
export type UpdateReclaimOptions = ReclaimListenPortOptions & { mayMutateFn: () => boolean };
|
|
4
|
+
|
|
5
|
+
/** Update callers must supply authority; the shared helper keeps its ordinary defaults. */
|
|
6
|
+
export async function guardedReclaimListenPort(port: number, hostname: string | undefined,
|
|
7
|
+
options: UpdateReclaimOptions): Promise<boolean> {
|
|
8
|
+
// Finish option accessors before capturing the gate. Inherited/omitted gates
|
|
9
|
+
// are absent from this copy and cannot select the shared helper's permissive default.
|
|
10
|
+
const prepared = { ...options };
|
|
11
|
+
if (typeof prepared.mayMutateFn !== "function") return false;
|
|
12
|
+
try { if (prepared.mayMutateFn() !== true) return false; } catch { return false; }
|
|
13
|
+
return reclaimListenPort(port, hostname, prepared);
|
|
14
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { isProcessAlive, waitForExit } from "../lib/process-control";
|
|
2
|
+
import type { killProxy } from "../lib/process-control";
|
|
3
|
+
import { atomicWriteFile } from "../config/atomic-write";
|
|
4
|
+
import { removePid, removeRuntimePort } from "../config/process-state";
|
|
5
|
+
import { dropWindowsTcpRowsForLocalPort } from "../server/windows-tcp-drop";
|
|
6
|
+
import { stopWinswService } from "../lib/winsw";
|
|
7
|
+
import { stopWindows } from "../service";
|
|
8
|
+
import { killWindowsSchedulerWrappers } from "../lib/windows-service-wrappers";
|
|
9
|
+
import { guardedRun, guardedKill, guardedExecFileSync, materializeMutationData, UpdateMutationRefusedError, type UpdateMutationAuthorizer } from "./mutation-guard.mjs";
|
|
10
|
+
|
|
11
|
+
export type KillProxy = typeof killProxy;
|
|
12
|
+
function mutationGate<K extends Parameters<UpdateMutationAuthorizer>[0]>(authorize: (kind: K) => boolean, kind: K) {
|
|
13
|
+
return () => { if (authorize(kind) !== true) throw new UpdateMutationRefusedError(); };
|
|
14
|
+
}
|
|
15
|
+
export function guardedKillProxy<K extends "runtime" | "own-child">(authorize: (kind: K) => boolean, kind: K, pid: number, native?: KillProxy) {
|
|
16
|
+
if (native) return guardedRun(authorize, kind, native, [pid]); // trusted external-I/O test seam
|
|
17
|
+
const target = materializeMutationData(pid);
|
|
18
|
+
if (!isProcessAlive(target)) return;
|
|
19
|
+
if (process.platform === "win32") {
|
|
20
|
+
const taskkill = `${process.env.SystemRoot ?? "C:\\Windows"}\\System32\\taskkill.exe`;
|
|
21
|
+
try { guardedExecFileSync(authorize, kind, taskkill, ["/PID", String(target), "/T", "/F"], { stdio: "pipe", windowsHide: true }); }
|
|
22
|
+
catch (error) { if (error instanceof UpdateMutationRefusedError || isProcessAlive(target)) throw error; }
|
|
23
|
+
} else {
|
|
24
|
+
guardedKill(authorize, kind, target, "SIGTERM");
|
|
25
|
+
if (!waitForExit(target, 5000)) guardedKill(authorize, kind, target, "SIGKILL");
|
|
26
|
+
}
|
|
27
|
+
if (!waitForExit(target, 5000)) throw new Error(`process ${target} did not exit`);
|
|
28
|
+
}
|
|
29
|
+
export function guardedPublishJob(authorize: UpdateMutationAuthorizer, kind: "publish" | "package-publish",
|
|
30
|
+
target: string, text: string, native: typeof atomicWriteFile = atomicWriteFile): void {
|
|
31
|
+
const [path, payload] = materializeMutationData([target, text]);
|
|
32
|
+
const validateBeforeRename = () => { if (authorize(kind) !== true) throw new UpdateMutationRefusedError(); };
|
|
33
|
+
validateBeforeRename();
|
|
34
|
+
// The atomic writer carries this gate through temp preparation AND every rename retry.
|
|
35
|
+
native(path, payload, undefined, { validateBeforeRename });
|
|
36
|
+
}
|
|
37
|
+
export function guardedRemovePid(authorize: (kind: "runtime") => boolean, pid?: number) {
|
|
38
|
+
return removePid(materializeMutationData(pid), mutationGate(authorize, "runtime"));
|
|
39
|
+
}
|
|
40
|
+
export function guardedRemoveRuntimePort(authorize: (kind: "runtime") => boolean) {
|
|
41
|
+
return removeRuntimePort(undefined, mutationGate(authorize, "runtime"));
|
|
42
|
+
}
|
|
43
|
+
export function guardedDropWindowsTcp(authorize: (kind: "runtime") => boolean, port: number) {
|
|
44
|
+
const target = materializeMutationData(port);
|
|
45
|
+
return dropWindowsTcpRowsForLocalPort(target, () => {
|
|
46
|
+
if (authorize("runtime") !== true) throw new UpdateMutationRefusedError();
|
|
47
|
+
return true;
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
export function guardedStopWinsw(authorize: UpdateMutationAuthorizer) {
|
|
51
|
+
return stopWinswService(mutationGate(authorize, "service"));
|
|
52
|
+
}
|
|
53
|
+
export function guardedStopWindows(authorize: UpdateMutationAuthorizer) {
|
|
54
|
+
return stopWindows(mutationGate(authorize, "service"));
|
|
55
|
+
}
|
|
56
|
+
export function guardedKillWindowsWrappers(authorize: UpdateMutationAuthorizer, paths: Parameters<typeof killWindowsSchedulerWrappers>[0]) {
|
|
57
|
+
return killWindowsSchedulerWrappers(materializeMutationData(paths), mutationGate(authorize, "service"));
|
|
58
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { getWindowsTrayStatus, startWindowsTray, stopWindowsTray } from "../tray/windows";
|
|
2
|
+
import { guardedRun, UpdateMutationRefusedError, type UpdateMutationAuthorizer } from "./mutation-guard.mjs";
|
|
3
|
+
export { getWindowsTrayStatus };
|
|
4
|
+
export function guardedStartWindowsTray(authorize: UpdateMutationAuthorizer) {
|
|
5
|
+
return guardedRun(authorize, "own-tray", startWindowsTray, []);
|
|
6
|
+
}
|
|
7
|
+
export function guardedStopWindowsTray(authorize: UpdateMutationAuthorizer) {
|
|
8
|
+
return stopWindowsTray(() => { if (authorize("tray") !== true) throw new UpdateMutationRefusedError(); });
|
|
9
|
+
}
|