@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
package/src/lib/shadow-call.ts
CHANGED
|
@@ -12,6 +12,33 @@
|
|
|
12
12
|
*/
|
|
13
13
|
export const DEFAULT_SHADOW_SOURCE_MODELS = ["gpt-6-luna", "gpt-5.6-luna"] as const;
|
|
14
14
|
|
|
15
|
+
/** How the dashboard explains a selectable shadow source. */
|
|
16
|
+
export type ShadowCallSourceRole = "helper" | "memory" | "legacy" | "custom";
|
|
17
|
+
|
|
18
|
+
export interface ShadowCallSourceOption {
|
|
19
|
+
id: string;
|
|
20
|
+
role: ShadowCallSourceRole;
|
|
21
|
+
defaultIntercepted: boolean;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Every source the dashboard offers as an individual toggle. The runtime owns
|
|
26
|
+
* this list so the GUI cannot drift from the prefixes the request path matches.
|
|
27
|
+
* Terra is the memory-consolidation model and stays opt-in: Codex also selects
|
|
28
|
+
* it for ordinary foreground work, and routing it by default would move a
|
|
29
|
+
* user-chosen model. Codex currently asks for `gpt-5.6-terra`; newer clients
|
|
30
|
+
* can move to `gpt-6.1-terra`, so both generations stay selectable and off by
|
|
31
|
+
* default. The retired gpt-5.4-mini helper stays available for clients through
|
|
32
|
+
* 0.144.x.
|
|
33
|
+
*/
|
|
34
|
+
export const SHADOW_SOURCE_MODEL_OPTIONS: readonly ShadowCallSourceOption[] = [
|
|
35
|
+
{ id: "gpt-6-luna", role: "helper", defaultIntercepted: true },
|
|
36
|
+
{ id: "gpt-5.6-luna", role: "helper", defaultIntercepted: true },
|
|
37
|
+
{ id: "gpt-6.1-terra", role: "memory", defaultIntercepted: false },
|
|
38
|
+
{ id: "gpt-5.6-terra", role: "memory", defaultIntercepted: false },
|
|
39
|
+
{ id: "gpt-5.4-mini", role: "legacy", defaultIntercepted: false },
|
|
40
|
+
];
|
|
41
|
+
|
|
15
42
|
/**
|
|
16
43
|
* Optional blocked model redirects at the shared routing layer.
|
|
17
44
|
* When `blockedModelRedirects` is configured (e.g. `{ "gpt-5.6-terra": "gpt-5.6-luna" }`),
|
|
@@ -39,7 +66,34 @@ export function shadowSourceModels(configured?: unknown): string[] {
|
|
|
39
66
|
.filter((v): v is string => typeof v === "string" && v.trim() !== "")
|
|
40
67
|
.map(v => v.trim())
|
|
41
68
|
: [];
|
|
42
|
-
return configuredStrings.length > 0
|
|
69
|
+
return configuredStrings.length > 0
|
|
70
|
+
? [...new Set(configuredStrings)]
|
|
71
|
+
: [...DEFAULT_SHADOW_SOURCE_MODELS];
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/** True when an override names exactly the built-in prefixes, in any order. */
|
|
75
|
+
export function isDefaultShadowSourceModels(models: readonly string[]): boolean {
|
|
76
|
+
const selected = new Set(models);
|
|
77
|
+
return selected.size === DEFAULT_SHADOW_SOURCE_MODELS.length
|
|
78
|
+
&& DEFAULT_SHADOW_SOURCE_MODELS.every(id => selected.has(id));
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* The dashboard's source inventory: the known runtime prefixes plus any custom
|
|
83
|
+
* prefix the operator persisted. Keeping the known list here avoids a second,
|
|
84
|
+
* drifting model list in the GUI; custom prefixes stay visible so an existing
|
|
85
|
+
* override is never silently dropped by a save.
|
|
86
|
+
*/
|
|
87
|
+
export function shadowSourceModelOptions(configured?: unknown): ShadowCallSourceOption[] {
|
|
88
|
+
const selected = shadowSourceModels(configured);
|
|
89
|
+
const known = new Set(SHADOW_SOURCE_MODEL_OPTIONS.map(option => option.id));
|
|
90
|
+
const custom = selected
|
|
91
|
+
.filter(id => !known.has(id) && !id.includes("/"))
|
|
92
|
+
.map(id => ({ id, role: "custom" as const, defaultIntercepted: false }));
|
|
93
|
+
return [
|
|
94
|
+
...SHADOW_SOURCE_MODEL_OPTIONS.map(option => ({ ...option })),
|
|
95
|
+
...custom,
|
|
96
|
+
];
|
|
43
97
|
}
|
|
44
98
|
|
|
45
99
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
-
import { constants, lstatSync, openSync, fstatSync, readFileSync, closeSync, type
|
|
2
|
+
import { constants, lstatSync, openSync, fstatSync, readFileSync, closeSync, type BigIntStats } from "node:fs";
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
|
|
5
5
|
/** Read an existing single-owner salt without creating or hardening any file. */
|
|
@@ -8,14 +8,14 @@ export function readExistingSpendSalt(home: string): string | undefined {
|
|
|
8
8
|
let salt: string | undefined;
|
|
9
9
|
try {
|
|
10
10
|
const path = join(home, "spend-ledger.salt");
|
|
11
|
-
const before = lstatSync(path);
|
|
12
|
-
if (!before.isFile() || before.nlink !==
|
|
13
|
-
const matches = (stat:
|
|
11
|
+
const before = lstatSync(path, { bigint: true });
|
|
12
|
+
if (!before.isFile() || before.nlink !== 1n) return undefined;
|
|
13
|
+
const matches = (stat: BigIntStats): boolean => stat.isFile() && stat.nlink === 1n
|
|
14
14
|
&& stat.dev === before.dev && stat.ino === before.ino;
|
|
15
15
|
fd = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
|
|
16
|
-
if (!matches(fstatSync(fd))) return undefined;
|
|
16
|
+
if (!matches(fstatSync(fd, { bigint: true }))) return undefined;
|
|
17
17
|
const contents = readFileSync(fd, "utf8").trim();
|
|
18
|
-
if (matches(fstatSync(fd)) && matches(lstatSync(path)) && /^[0-9a-f]{32,}$/.test(contents)) salt = contents;
|
|
18
|
+
if (matches(fstatSync(fd, { bigint: true })) && matches(lstatSync(path, { bigint: true })) && /^[0-9a-f]{32,}$/.test(contents)) salt = contents;
|
|
19
19
|
} catch { salt = undefined; }
|
|
20
20
|
finally {
|
|
21
21
|
if (fd !== undefined) {
|
|
@@ -11,6 +11,7 @@ import { reconcilePoolRotationState } from "../codex/pool-rotation";
|
|
|
11
11
|
import { reconcileCodexQuotaAccounts } from "../codex/quota";
|
|
12
12
|
import { reconcileQuotaRecovery, sweepExpiredQuotaRecovery } from "../codex/quota-401-recovery";
|
|
13
13
|
import { bindUpstreamRequestCompressionConfig } from "../server/responses/request-compression";
|
|
14
|
+
import { bindWorkflowBudgetConfig } from "./workflow-budget-config";
|
|
14
15
|
import {
|
|
15
16
|
listLiveCodexAccountIds,
|
|
16
17
|
reconcileCodexRoutingHealth,
|
|
@@ -82,6 +83,7 @@ export function setLiveStateStoreConfig(config: OcxConfig): void {
|
|
|
82
83
|
// The one place the server's live config object is installed; detached configs (catalog sync)
|
|
83
84
|
// never come through here, so the outbound compression opt-in follows the running server only.
|
|
84
85
|
bindUpstreamRequestCompressionConfig(config);
|
|
86
|
+
bindWorkflowBudgetConfig(config);
|
|
85
87
|
notifyLiveConfigObservers(config);
|
|
86
88
|
}
|
|
87
89
|
|
|
@@ -191,7 +191,7 @@ function missingPreloadHint(): string {
|
|
|
191
191
|
*/
|
|
192
192
|
export function isProtectedHomeUnderTest(dir: string): boolean {
|
|
193
193
|
if (!isTestHomeGuardArmed()) return false;
|
|
194
|
-
return canonicalize(dir)
|
|
194
|
+
return samePathIgnoringPlatformCase(canonicalize(dir), PROTECTED_HOME);
|
|
195
195
|
}
|
|
196
196
|
|
|
197
197
|
/**
|
|
@@ -204,7 +204,7 @@ export function isProtectedHomeUnderTest(dir: string): boolean {
|
|
|
204
204
|
*/
|
|
205
205
|
export function assertNotRealHomeUnderTest(dir: string): void {
|
|
206
206
|
if (!isTestHomeGuardArmed()) return;
|
|
207
|
-
if (canonicalize(dir)
|
|
207
|
+
if (!samePathIgnoringPlatformCase(canonicalize(dir), PROTECTED_HOME)) return;
|
|
208
208
|
throw new Error(
|
|
209
209
|
`refusing to write the real OpenCodex home (${PROTECTED_HOME}) from a test process. `
|
|
210
210
|
+ "Point OPENCODEX_HOME at a temp directory for this test, or inject persistence "
|
|
@@ -227,7 +227,7 @@ export function protectedLaunchAgentsDirForTests(): string {
|
|
|
227
227
|
*/
|
|
228
228
|
export function assertNotRealLaunchAgentsUnderTest(dir: string): void {
|
|
229
229
|
if (!isTestHomeGuardArmed()) return;
|
|
230
|
-
if (canonicalize(dir)
|
|
230
|
+
if (!samePathIgnoringPlatformCase(canonicalize(dir), PROTECTED_LAUNCH_AGENTS)) return;
|
|
231
231
|
throw new Error(
|
|
232
232
|
`refusing to write the real LaunchAgents directory (${PROTECTED_LAUNCH_AGENTS}) from a test `
|
|
233
233
|
+ "process: os.homedir() ignores HOME, so rewriting HOME does not move this path. Pass an "
|
|
@@ -238,7 +238,7 @@ export function assertNotRealLaunchAgentsUnderTest(dir: string): void {
|
|
|
238
238
|
/** Throw when an armed test process is about to write the real native Codex home. */
|
|
239
239
|
export function assertNotRealCodexHomeUnderTest(dir: string): void {
|
|
240
240
|
if (!isTestHomeGuardArmed()) return;
|
|
241
|
-
if (canonicalize(dir)
|
|
241
|
+
if (!samePathIgnoringPlatformCase(canonicalize(dir), PROTECTED_CODEX_HOME)) return;
|
|
242
242
|
throw new Error(
|
|
243
243
|
`refusing to write the real Codex home (${PROTECTED_CODEX_HOME}) from a test process. `
|
|
244
244
|
+ "Point CODEX_HOME at a temp directory for this test before writing Codex files "
|
|
@@ -285,6 +285,15 @@ function foldPlatformCase(path: string): string {
|
|
|
285
285
|
return process.platform === "darwin" || process.platform === "win32" ? path.toLowerCase() : path;
|
|
286
286
|
}
|
|
287
287
|
|
|
288
|
+
/**
|
|
289
|
+
* Path equality as the default filesystem on this platform sees it. A not-yet-existing
|
|
290
|
+
* `.OPENCODEX` canonicalizes through its parent and keeps its spelling, so a plain `===`
|
|
291
|
+
* against the canonical home calls it a different directory on Windows and macOS (#7853).
|
|
292
|
+
*/
|
|
293
|
+
function samePathIgnoringPlatformCase(a: string, b: string): boolean {
|
|
294
|
+
return foldPlatformCase(a) === foldPlatformCase(b);
|
|
295
|
+
}
|
|
296
|
+
|
|
288
297
|
function isSameOrInsideIgnoringPlatformCase(root: string, candidate: string): boolean {
|
|
289
298
|
const parent = foldPlatformCase(root);
|
|
290
299
|
const child = foldPlatformCase(candidate);
|
|
@@ -322,10 +331,29 @@ export function protectedRemovalTreesForTests(): readonly string[] {
|
|
|
322
331
|
return [PROTECTED_REAL_HOME, ...PROTECTED_TREES.map(tree => tree.path)];
|
|
323
332
|
}
|
|
324
333
|
|
|
325
|
-
/**
|
|
334
|
+
/**
|
|
335
|
+
* Whether `child` sits strictly below `parent`, both already canonicalized.
|
|
336
|
+
*
|
|
337
|
+
* Containment is decided per path component, with case folded where the filesystem folds it.
|
|
338
|
+
* A prefix test on the relative path called a direct child named `..backup` "outside", so the
|
|
339
|
+
* removal guard let it through (#7853).
|
|
340
|
+
*/
|
|
326
341
|
function isInside(parent: string, child: string): boolean {
|
|
342
|
+
return !samePathIgnoringPlatformCase(parent, child) && isSameOrInsideIgnoringPlatformCase(parent, child);
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
/**
|
|
346
|
+
* Whether `child` sits strictly below `parent` with case PRESERVED, deciding per path component.
|
|
347
|
+
*
|
|
348
|
+
* Only for the checkout exemption below, which LIFTS a refusal. Folding case there would let a
|
|
349
|
+
* running checkout at `~/.codex/worktrees/repo` exempt a distinct `~/.codex/worktrees/REPO` on a
|
|
350
|
+
* case-sensitive macOS volume. Protection decisions fold, because comparing too broadly only refuses
|
|
351
|
+
* more; an exemption must not, because the same breadth removes more.
|
|
352
|
+
*/
|
|
353
|
+
function isInsidePreservingCase(parent: string, child: string): boolean {
|
|
354
|
+
if (parent === child) return false;
|
|
327
355
|
const rel = relative(parent, child);
|
|
328
|
-
return rel !== "" && !rel
|
|
356
|
+
return rel !== "" && !isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${sep}`);
|
|
329
357
|
}
|
|
330
358
|
|
|
331
359
|
let checkoutRootSpellings: readonly string[] | undefined;
|
|
@@ -362,7 +390,7 @@ function checkoutRoots(): readonly string[] {
|
|
|
362
390
|
* tree (one at `$HOME`, or the virtual root of a compiled build) never qualifies.
|
|
363
391
|
*/
|
|
364
392
|
function isOwnCheckoutContent(protectedPath: string, candidate: string): boolean {
|
|
365
|
-
return checkoutRoots().some(root =>
|
|
393
|
+
return checkoutRoots().some(root => isInsidePreservingCase(protectedPath, root) && isInsidePreservingCase(root, candidate));
|
|
366
394
|
}
|
|
367
395
|
|
|
368
396
|
/**
|
|
@@ -387,12 +415,12 @@ export function protectedRemovalReason(target: string): string | null {
|
|
|
387
415
|
// form still names it. Upstream Codex makes the same distinction in its writable-root
|
|
388
416
|
// handling, keeping logical and resolved forms side by side rather than collapsing to one.
|
|
389
417
|
for (const candidate of [canonicalize(target), resolve(target)]) {
|
|
390
|
-
if (candidate
|
|
418
|
+
if (samePathIgnoringPlatformCase(candidate, PROTECTED_REAL_HOME) || samePathIgnoringPlatformCase(candidate, LEXICAL_REAL_HOME)) {
|
|
391
419
|
return `the real home directory (${PROTECTED_REAL_HOME})`;
|
|
392
420
|
}
|
|
393
421
|
for (const tree of PROTECTED_TREES) {
|
|
394
422
|
for (const protectedPath of [tree.path, tree.lexical]) {
|
|
395
|
-
if (candidate
|
|
423
|
+
if (samePathIgnoringPlatformCase(candidate, protectedPath)) return `${tree.label} (${protectedPath})`;
|
|
396
424
|
if (isInside(protectedPath, candidate) && !isOwnCheckoutContent(protectedPath, candidate)) {
|
|
397
425
|
return `a path inside ${tree.label} (${protectedPath})`;
|
|
398
426
|
}
|
|
@@ -147,16 +147,36 @@ interface CoerceResult {
|
|
|
147
147
|
changed: boolean;
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
+
interface NumberToken {
|
|
151
|
+
start: number;
|
|
152
|
+
raw: string;
|
|
153
|
+
replacement?: string;
|
|
154
|
+
}
|
|
155
|
+
|
|
150
156
|
function coerceValue(
|
|
151
157
|
value: unknown,
|
|
152
158
|
schema: SchemaNode | undefined,
|
|
153
159
|
root: SchemaNode,
|
|
154
160
|
depth: number,
|
|
161
|
+
numbers: Map<string, NumberToken>,
|
|
155
162
|
toolName?: string,
|
|
156
163
|
propertyName?: string,
|
|
157
164
|
): CoerceResult {
|
|
158
165
|
// A hostile or deeply nested schema must not blow the stack.
|
|
159
166
|
if (depth > 64) return { value, changed: false };
|
|
167
|
+
// Only scanner-created placeholders reach numeric coercion. Real strings, including
|
|
168
|
+
// escaped strings that resemble a placeholder, keep their original type and bytes.
|
|
169
|
+
const token = typeof value === "string" ? numbers.get(value) : undefined;
|
|
170
|
+
if (token) {
|
|
171
|
+
const numeric = Number(token.raw);
|
|
172
|
+
// Number() can round a non-integral token onto an integer (1e-400 -> 0, or
|
|
173
|
+
// 9007199254740990.5 -> 9007199254740990). Such a token never counts as integral:
|
|
174
|
+
// it keeps its bytes so the client sees the value that was actually sent.
|
|
175
|
+
if (Number.isInteger(numeric) && !tokenDenotesInteger(token.raw)) return { value, changed: false };
|
|
176
|
+
const result = coerceValue(numeric, schema, root, depth, numbers, toolName, propertyName);
|
|
177
|
+
if (result.changed) token.replacement = JSON.stringify(result.value);
|
|
178
|
+
return result;
|
|
179
|
+
}
|
|
160
180
|
const resolved = schema ? resolveRef(schema, root, new Set()) : undefined;
|
|
161
181
|
|
|
162
182
|
if (typeof value === "number") {
|
|
@@ -188,7 +208,7 @@ function coerceValue(
|
|
|
188
208
|
// in every one of those cases the received value is the right thing to keep.
|
|
189
209
|
if (!integerDeclared || !safelyIntegral(value)) return { value, changed: false };
|
|
190
210
|
// `120000.0` and `120000` are the same JS number; the difference is only in the
|
|
191
|
-
// serialized text, which is repaired by re-stringifying
|
|
211
|
+
// serialized text, which is repaired by re-stringifying only this number token.
|
|
192
212
|
return { value, changed: true };
|
|
193
213
|
}
|
|
194
214
|
|
|
@@ -198,7 +218,7 @@ function coerceValue(
|
|
|
198
218
|
const next = value.map(entry => {
|
|
199
219
|
// Array items have no property name of their own; passing the array's key would
|
|
200
220
|
// let `timeout_ms: [1.5]` inherit the allowlist. Items are judged by schema only.
|
|
201
|
-
const result = coerceValue(entry, itemSchema, root, depth + 1, toolName);
|
|
221
|
+
const result = coerceValue(entry, itemSchema, root, depth + 1, numbers, toolName);
|
|
202
222
|
if (result.changed) changed = true;
|
|
203
223
|
return result.value;
|
|
204
224
|
});
|
|
@@ -214,16 +234,68 @@ function coerceValue(
|
|
|
214
234
|
const next: Record<string, unknown> = {};
|
|
215
235
|
for (const [key, entry] of Object.entries(object)) {
|
|
216
236
|
const childSchema = asSchema(properties?.[key]) ?? additional;
|
|
217
|
-
const result = coerceValue(entry, childSchema, root, depth + 1, toolName, key);
|
|
237
|
+
const result = coerceValue(entry, childSchema, root, depth + 1, numbers, toolName, key);
|
|
218
238
|
if (result.changed) changed = true;
|
|
219
239
|
next[key] = result.value;
|
|
220
240
|
}
|
|
221
241
|
return changed ? { value: next, changed } : { value, changed: false };
|
|
222
242
|
}
|
|
223
243
|
|
|
244
|
+
const JSON_STRING_OR_NUMBER = /"(?:[^"\\]|\\.)*"|-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/g;
|
|
245
|
+
const INTEGRAL_FLOAT_TOKEN = /^-?(?:0|[1-9]\d*)\.0+$/;
|
|
246
|
+
|
|
247
|
+
/** True when a JSON number token's exact decimal value is an integer, judged from its text. */
|
|
248
|
+
function tokenDenotesInteger(raw: string): boolean {
|
|
249
|
+
const match = /^-?(\d+)(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/.exec(raw);
|
|
250
|
+
if (!match) return false;
|
|
251
|
+
const digits = match[1]! + (match[2] ?? "");
|
|
252
|
+
// A zero significand is exactly zero for any exponent, even one Number() cannot hold.
|
|
253
|
+
if (/^0*$/.test(digits)) return true;
|
|
254
|
+
const exponent = Number(match[3] ?? "0");
|
|
255
|
+
if (!Number.isFinite(exponent)) return false;
|
|
256
|
+
const point = match[1]!.length + exponent;
|
|
257
|
+
const fraction = point <= 0 ? digits : digits.slice(point);
|
|
258
|
+
return /^0*$/.test(fraction);
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
/**
|
|
262
|
+
* Mask numbers before schema traversal and retain their original positions. A prefix absent
|
|
263
|
+
* from every decoded input string (including keys) prevents placeholder collisions.
|
|
264
|
+
* Applying repairs to the original text also preserves tokens hidden by duplicate keys.
|
|
265
|
+
*/
|
|
266
|
+
function maskNumberTokens(json: string): { masked: string; numbers: Map<string, NumberToken> } {
|
|
267
|
+
// One pass collects the tag that follows the base prefix in every colliding decoded string;
|
|
268
|
+
// the smallest unused tag then yields a prefix no input string can start with. This stays
|
|
269
|
+
// linear in the input, unlike growing the prefix and rescanning every string.
|
|
270
|
+
const base = "\u0000ocx-number:";
|
|
271
|
+
const usedTags = new Set<string>();
|
|
272
|
+
for (const [raw] of json.matchAll(JSON_STRING_OR_NUMBER)) {
|
|
273
|
+
if (!raw.startsWith('"')) continue;
|
|
274
|
+
const value = JSON.parse(raw) as string;
|
|
275
|
+
if (!value.startsWith(base)) continue;
|
|
276
|
+
const end = value.indexOf(":", base.length);
|
|
277
|
+
if (end >= 0) usedTags.add(value.slice(base.length, end));
|
|
278
|
+
}
|
|
279
|
+
let tag = 0;
|
|
280
|
+
while (usedTags.has(String(tag))) tag += 1;
|
|
281
|
+
const prefix = `${base}${tag}:`;
|
|
282
|
+
const numbers = new Map<string, NumberToken>();
|
|
283
|
+
const masked = json.replace(JSON_STRING_OR_NUMBER, (raw: string, start: number) => {
|
|
284
|
+
if (raw.startsWith('"')) return raw;
|
|
285
|
+
const key = `${prefix}${numbers.size}`;
|
|
286
|
+
numbers.set(key, { start, raw });
|
|
287
|
+
return JSON.stringify(key);
|
|
288
|
+
});
|
|
289
|
+
return { masked, numbers };
|
|
290
|
+
}
|
|
291
|
+
|
|
224
292
|
/**
|
|
225
293
|
* Repair integral floats in a tool-call arguments STRING against the tool's declared
|
|
226
|
-
* parameter schema.
|
|
294
|
+
* parameter schema, and safe bare integers in string-only fields. When a repair is needed,
|
|
295
|
+
* safe integral number tokens are normalized as before; non-integral decimals, unsafe integers
|
|
296
|
+
* and overflowing numbers remain byte-identical, including in duplicate keys and nested arrays,
|
|
297
|
+
* while safe siblings still get repaired. Strings, duplicate keys and surrounding formatting
|
|
298
|
+
* retain their bytes.
|
|
227
299
|
*
|
|
228
300
|
* Returns the original string unchanged when there is no schema, the payload does not
|
|
229
301
|
* parse, or nothing needed repair — so an unaffected call keeps its exact bytes and
|
|
@@ -239,15 +311,35 @@ export function coerceIntegerToolArguments(
|
|
|
239
311
|
// -> integer, or bare-integer -> string).
|
|
240
312
|
if (!/\d/.test(args)) return args;
|
|
241
313
|
let parsed: unknown;
|
|
314
|
+
let numbers: Map<string, NumberToken>;
|
|
242
315
|
try {
|
|
243
|
-
|
|
316
|
+
// Validate before masking so token substitution cannot turn malformed JSON valid.
|
|
317
|
+
JSON.parse(args);
|
|
318
|
+
const masked = maskNumberTokens(args);
|
|
319
|
+
numbers = masked.numbers;
|
|
320
|
+
parsed = JSON.parse(masked.masked);
|
|
244
321
|
} catch {
|
|
245
322
|
// Malformed or still-streaming arguments are not this function's problem; the
|
|
246
323
|
// existing paths already handle them.
|
|
247
324
|
return args;
|
|
248
325
|
}
|
|
249
326
|
const root = parameters as SchemaNode;
|
|
250
|
-
const result = coerceValue(parsed, root, root, 0, toolName);
|
|
327
|
+
const result = coerceValue(parsed, root, root, 0, numbers, toolName);
|
|
251
328
|
if (!result.changed) return args;
|
|
252
|
-
|
|
329
|
+
const chunks: string[] = [];
|
|
330
|
+
let cursor = 0;
|
|
331
|
+
for (const token of numbers.values()) {
|
|
332
|
+
// Unrepaired tokens are normalized only when the source text itself is an integral float
|
|
333
|
+
// (digits, then a fraction of zeros) with a safe value, such as 2.0, matching the previous
|
|
334
|
+
// re-serialization. Every other token, including 9007199254740990.5 and exponent forms,
|
|
335
|
+
// keeps its exact source text, so no unrepaired value is rounded.
|
|
336
|
+
const replacement = token.replacement
|
|
337
|
+
?? (INTEGRAL_FLOAT_TOKEN.test(token.raw) && Number.isSafeInteger(Number(token.raw))
|
|
338
|
+
? JSON.stringify(Number(token.raw))
|
|
339
|
+
: token.raw);
|
|
340
|
+
chunks.push(args.slice(cursor, token.start), replacement);
|
|
341
|
+
cursor = token.start + token.raw.length;
|
|
342
|
+
}
|
|
343
|
+
chunks.push(args.slice(cursor));
|
|
344
|
+
return chunks.join("");
|
|
253
345
|
}
|
|
@@ -310,7 +310,12 @@ export async function releaseResponseBodyBestEffort(
|
|
|
310
310
|
}
|
|
311
311
|
const cancel = body.cancel().catch(() => {});
|
|
312
312
|
if (!signal) {
|
|
313
|
-
|
|
313
|
+
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
314
|
+
try {
|
|
315
|
+
await Promise.race([cancel, new Promise<void>(resolve => { timer = setTimeout(resolve, timeoutMs); })]);
|
|
316
|
+
} finally {
|
|
317
|
+
clearTimeout(timer);
|
|
318
|
+
}
|
|
314
319
|
return;
|
|
315
320
|
}
|
|
316
321
|
await new Promise<void>(resolve => {
|
|
@@ -371,10 +371,18 @@ function isOwnedSchedulerCreate(args: string[]): boolean {
|
|
|
371
371
|
&& normalized.includes("/f");
|
|
372
372
|
}
|
|
373
373
|
|
|
374
|
-
function isWindowsSchtasksAccessDeniedError(error: unknown, args: string[]): boolean {
|
|
375
|
-
if (
|
|
374
|
+
function isWindowsSchtasksAccessDeniedError(error: unknown, args: string[], taskPresent = false): boolean {
|
|
375
|
+
if (isOwnedSchedulerCreate(args)) {
|
|
376
|
+
return isWindowsAccessDeniedError(error)
|
|
377
|
+
|| (schedulerExitStatus(error) === 1 && isCurrentWindowsProcessElevated() === false);
|
|
378
|
+
}
|
|
379
|
+
const operation = schtasksOperationFromArgs(args);
|
|
380
|
+
if (operation !== "delete" && operation !== "run" && operation !== "end") return false;
|
|
381
|
+
const normalized = args.map(arg => arg.toLowerCase());
|
|
382
|
+
const taskIndex = normalized.indexOf("/tn");
|
|
376
383
|
return isWindowsAccessDeniedError(error)
|
|
377
|
-
|| (
|
|
384
|
+
|| (operation === "delete" && taskPresent && schedulerExitStatus(error) === 1
|
|
385
|
+
&& taskIndex > 0 && normalized[taskIndex + 1] === "opencodex-proxy");
|
|
378
386
|
}
|
|
379
387
|
|
|
380
388
|
/** Structured Task Scheduler failure that survives formatting and process boundaries. */
|
|
@@ -410,32 +418,47 @@ export class WindowsElevationError extends Error {
|
|
|
410
418
|
}
|
|
411
419
|
|
|
412
420
|
/** Replace raw schtasks access-denied output with dashboard-friendly guidance. */
|
|
413
|
-
export function formatWindowsSchtasksError(error: unknown, args: string[]): string {
|
|
421
|
+
export function formatWindowsSchtasksError(error: unknown, args: string[], taskPresent = false): string {
|
|
414
422
|
const operation = schtasksOperationFromArgs(args);
|
|
415
|
-
const
|
|
416
|
-
const accessDenied =
|
|
423
|
+
const classifiedAccessDenied = isWindowsSchtasksAccessDeniedError(error, args, taskPresent);
|
|
424
|
+
const accessDenied = classifiedAccessDenied || isWindowsAccessDeniedError(error);
|
|
425
|
+
const argsText = args.map(arg => (/\s/.test(arg) ? `"${arg}"` : arg)).join(" ");
|
|
417
426
|
if (!accessDenied) {
|
|
427
|
+
// Keep the already-stopped contract, but never echo execFileSync's message: it
|
|
428
|
+
// appends OEM stderr decoded as UTF-8, even when encoding: "buffer" was used.
|
|
429
|
+
if (operation === "end" && error instanceof Error
|
|
430
|
+
&& /no running instance|not currently running|0x41330/i.test(error.message)) {
|
|
431
|
+
return "Task Scheduler has no running instance (0x41330).";
|
|
432
|
+
}
|
|
433
|
+
if (error && typeof error === "object"
|
|
434
|
+
&& ("status" in error || "stderr" in error || "stdout" in error)) {
|
|
435
|
+
const status = schedulerExitStatus(error);
|
|
436
|
+
return `Task Scheduler command failed${status === null ? "" : ` (exit code ${status})`}: schtasks ${argsText}`;
|
|
437
|
+
}
|
|
418
438
|
return error instanceof Error ? error.message : String(error);
|
|
419
439
|
}
|
|
420
|
-
|
|
440
|
+
if (operation === "delete" || operation === "run" || operation === "end") {
|
|
441
|
+
return "Windows access denied while running Task Scheduler. "
|
|
442
|
+
+ `Run this command from an elevated terminal (Run as administrator): schtasks ${argsText}`;
|
|
443
|
+
}
|
|
421
444
|
const guidance = [
|
|
422
445
|
"Windows access denied while running Task Scheduler.",
|
|
423
446
|
`Command: schtasks ${argsText}`,
|
|
424
447
|
"The OpenCodex task definition is scoped to the installing account and normally registers without elevation, so this denial is not fixed by approving a UAC prompt. Check `ocx service status`: if an existing `opencodex-proxy` task belongs to a different account, remove it from that account and retry `ocx service install`.",
|
|
425
448
|
].join(" ");
|
|
426
|
-
if (operation === "create" &&
|
|
449
|
+
if (operation === "create" && classifiedAccessDenied) {
|
|
427
450
|
return `${guidance}\n${WINDOWS_SCHTASKS_CREATE_ACCESS_DENIED_MARKER}`;
|
|
428
451
|
}
|
|
429
452
|
return guidance;
|
|
430
453
|
}
|
|
431
454
|
|
|
432
|
-
export function toWindowsSchtasksError(error: unknown, args: string[]): WindowsSchtasksError {
|
|
455
|
+
export function toWindowsSchtasksError(error: unknown, args: string[], taskPresent = false): WindowsSchtasksError {
|
|
433
456
|
if (error instanceof WindowsSchtasksError) return error;
|
|
434
457
|
const operation = schtasksOperationFromArgs(args);
|
|
435
|
-
const reason: WindowsSchtasksFailureReason = isWindowsSchtasksAccessDeniedError(error, args)
|
|
458
|
+
const reason: WindowsSchtasksFailureReason = isWindowsSchtasksAccessDeniedError(error, args, taskPresent)
|
|
436
459
|
? "access-denied"
|
|
437
460
|
: "other";
|
|
438
|
-
return new WindowsSchtasksError(operation, reason, formatWindowsSchtasksError(error, args));
|
|
461
|
+
return new WindowsSchtasksError(operation, reason, formatWindowsSchtasksError(error, args, taskPresent));
|
|
439
462
|
}
|
|
440
463
|
|
|
441
464
|
/**
|