@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Shared response rules for raw outbound transports and internal response consumers.
|
|
3
3
|
*
|
|
4
|
-
* `fetch` applies
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
* the SOCKS helper excluded 204 and the pinned helper excluded nothing, so the same no-content
|
|
8
|
-
* upstream answer behaved differently depending on which transport carried the request.
|
|
4
|
+
* `fetch` applies null-body and content-coding rules below the Response constructor.
|
|
5
|
+
* Raw socket transports apply them explicitly; internal response consumers also need a
|
|
6
|
+
* consistent Content-Type match before choosing their body decoder.
|
|
9
7
|
*/
|
|
10
8
|
|
|
9
|
+
/** Match the exact type/subtype, ignoring case and parameters (RFC 9110 section 8.3.1). */
|
|
10
|
+
export function hasResponseMediaType(headers: Headers, mediaType: string): boolean {
|
|
11
|
+
return headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() === mediaType.toLowerCase();
|
|
12
|
+
}
|
|
13
|
+
|
|
11
14
|
/**
|
|
12
15
|
* Statuses the Fetch specification defines as null-body.
|
|
13
16
|
*
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Admission accounting for raised HTTP bodies; these values do not cap RSS. */
|
|
2
|
+
export const DEFAULT_CONCURRENT_INBOUND_BODY_BYTES = 512 * 1024 * 1024;
|
|
3
|
+
export const MAX_CONCURRENT_INBOUND_BODY_BYTES = 2 * 1024 * 1024 * 1024;
|
|
4
|
+
|
|
5
|
+
/** Keep hand edits bounded; omission, zero and invalid values retain the old default. */
|
|
6
|
+
export function resolveConcurrentInboundBodyLimitBytes(configured?: number): number {
|
|
7
|
+
if (typeof configured !== "number" || !Number.isSafeInteger(configured) || configured <= 0) {
|
|
8
|
+
return DEFAULT_CONCURRENT_INBOUND_BODY_BYTES;
|
|
9
|
+
}
|
|
10
|
+
return Math.min(MAX_CONCURRENT_INBOUND_BODY_BYTES, Math.max(DEFAULT_CONCURRENT_INBOUND_BODY_BYTES, configured));
|
|
11
|
+
}
|
package/src/lib/jsonc.ts
CHANGED
|
@@ -18,7 +18,7 @@ function stripJsonComments(text: string): string {
|
|
|
18
18
|
const ch = text[i]!;
|
|
19
19
|
const next = text[i + 1];
|
|
20
20
|
if (inLine) {
|
|
21
|
-
if (ch === "\n") {
|
|
21
|
+
if (ch === "\n" || ch === "\r") {
|
|
22
22
|
inLine = false;
|
|
23
23
|
out += ch;
|
|
24
24
|
}
|
|
@@ -82,7 +82,12 @@ function stripTrailingCommas(text: string): string {
|
|
|
82
82
|
if (ch === ",") {
|
|
83
83
|
let j = i + 1;
|
|
84
84
|
while (j < text.length && /\s/.test(text[j]!)) j++;
|
|
85
|
-
if (text[j] === "}" || text[j] === "]")
|
|
85
|
+
if (text[j] === "}" || text[j] === "]") {
|
|
86
|
+
let previous = i - 1;
|
|
87
|
+
while (previous >= 0 && /\s/.test(text[previous]!)) previous--;
|
|
88
|
+
// A comma without a preceding member is malformed, not a trailing comma.
|
|
89
|
+
if (text[previous] !== "[" && text[previous] !== "{") continue;
|
|
90
|
+
}
|
|
86
91
|
}
|
|
87
92
|
out += ch;
|
|
88
93
|
}
|
|
@@ -19,6 +19,7 @@ export const LOCAL_MANAGEMENT_READ_PATHS = {
|
|
|
19
19
|
startupHealth: "/api/startup-health",
|
|
20
20
|
providerQuotas: "/api/provider-quotas",
|
|
21
21
|
usageTimeline: "/api/usage/timeline",
|
|
22
|
+
stop: "/api/stop",
|
|
22
23
|
} as const;
|
|
23
24
|
|
|
24
25
|
export type LocalManagementReadPath =
|
|
@@ -50,7 +51,8 @@ function isLocalManagementReadPath(path: string): path is LocalManagementReadPat
|
|
|
50
51
|
|| path === LOCAL_MANAGEMENT_READ_PATHS.usage
|
|
51
52
|
|| path === LOCAL_MANAGEMENT_READ_PATHS.startupHealth
|
|
52
53
|
|| path === LOCAL_MANAGEMENT_READ_PATHS.providerQuotas
|
|
53
|
-
|| path === LOCAL_MANAGEMENT_READ_PATHS.usageTimeline
|
|
54
|
+
|| path === LOCAL_MANAGEMENT_READ_PATHS.usageTimeline
|
|
55
|
+
|| path === LOCAL_MANAGEMENT_READ_PATHS.stop;
|
|
54
56
|
}
|
|
55
57
|
|
|
56
58
|
function localReadCapabilityPayload(
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
* `.local`/`.lan` name) earns the disabled budget. Anything else — a public DNS name, an
|
|
17
17
|
* unreachable host, a bare domain — stays public and keeps its stall budget, because being local
|
|
18
18
|
* is what switches OFF a safety clock.
|
|
19
|
+
* This is lexical timeout policy: it never resolves DNS or grants network access.
|
|
19
20
|
*/
|
|
20
21
|
import { isIP } from "node:net";
|
|
21
22
|
|
|
@@ -52,29 +53,20 @@ export function isLocalUpstream(destination: string | null | undefined): boolean
|
|
|
52
53
|
function hostnameOf(destination: string): string | null {
|
|
53
54
|
const trimmed = destination.trim();
|
|
54
55
|
if (!trimmed) return null;
|
|
55
|
-
|
|
56
|
-
//
|
|
57
|
-
//
|
|
58
|
-
if (
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
56
|
+
const absolute = /^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed);
|
|
57
|
+
// A schemeless host may carry a numeric port, but never credentials, a path, an
|
|
58
|
+
// unmatched bracket or a discarded suffix. Do not rescue malformed absolute URLs.
|
|
59
|
+
if (!absolute && !/^(?:\[[0-9a-f:.]+\]|[^:/?#@\s\\]+)(?::\d{1,5})?$/i.test(trimmed)) return null;
|
|
60
|
+
try {
|
|
61
|
+
const parsed = new URL(absolute ? trimmed : `http://${trimmed}`);
|
|
62
|
+
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return null;
|
|
63
|
+
return parsed.hostname || null;
|
|
64
|
+
} catch {
|
|
65
|
+
return null;
|
|
65
66
|
}
|
|
66
|
-
let host = trimmed;
|
|
67
|
-
if (host.startsWith("[")) {
|
|
68
|
-
const end = host.indexOf("]");
|
|
69
|
-
host = end > 0 ? host.slice(1, end) : host.slice(1);
|
|
70
|
-
} else {
|
|
71
|
-
const colon = host.indexOf(":");
|
|
72
|
-
if (colon >= 0) host = host.slice(0, colon);
|
|
73
|
-
}
|
|
74
|
-
return host || null;
|
|
75
67
|
}
|
|
76
68
|
|
|
77
|
-
/** 0.0.0.0
|
|
69
|
+
/** Unspecified 0.0.0.0, 10/8, 127/8, 169.254/16, 172.16/12, 192.168/16. */
|
|
78
70
|
function isLocalIpv4(host: string): boolean {
|
|
79
71
|
const parts = host.split(".");
|
|
80
72
|
if (parts.length !== 4) return false;
|
|
@@ -86,7 +78,7 @@ function isLocalIpv4(host: string): boolean {
|
|
|
86
78
|
octets.push(value);
|
|
87
79
|
}
|
|
88
80
|
const [a, b] = octets;
|
|
89
|
-
if (a === 0) return
|
|
81
|
+
if (a === 0) return octets.every(value => value === 0);
|
|
90
82
|
if (a === 10) return true;
|
|
91
83
|
if (a === 127) return true;
|
|
92
84
|
if (a === 169 && b === 254) return true;
|
|
@@ -102,8 +94,9 @@ function isLocalIpv6(host: string): boolean {
|
|
|
102
94
|
if (!groups) return false;
|
|
103
95
|
// Loopback in any spelling: every group zero except a trailing one.
|
|
104
96
|
if (groups.every((group, index) => (index < 7 ? group === 0 : group === 1))) return true;
|
|
105
|
-
|
|
106
|
-
|
|
97
|
+
if (groups.slice(0, 5).every(group => group === 0) && groups[5] === 0xffff) {
|
|
98
|
+
return isLocalIpv4(`${groups[6] >>> 8}.${groups[6] & 255}.${groups[7] >>> 8}.${groups[7] & 255}`);
|
|
99
|
+
}
|
|
107
100
|
const first = groups[0];
|
|
108
101
|
if ((first & 0xffc0) === 0xfe80) return true;
|
|
109
102
|
if ((first & 0xfe00) === 0xfc00) return true;
|
|
@@ -116,15 +109,18 @@ function ipv6Groups(host: string): number[] | null {
|
|
|
116
109
|
const compressed = marker >= 0;
|
|
117
110
|
const head = compressed ? host.slice(0, marker) : host;
|
|
118
111
|
const tail = compressed ? host.slice(marker + 2) : "";
|
|
119
|
-
|
|
112
|
+
let headGroups = head === "" ? [] : head.split(":");
|
|
120
113
|
let tailGroups = tail === "" ? [] : tail.split(":");
|
|
121
114
|
// A trailing embedded IPv4 (e.g. `64:ff9b::1.2.3.4`) counts as two groups.
|
|
122
|
-
const
|
|
115
|
+
const ending = compressed ? tailGroups : headGroups;
|
|
116
|
+
const last = ending[ending.length - 1];
|
|
123
117
|
if (last !== undefined && last.includes(".")) {
|
|
124
118
|
const v4 = last.split(".");
|
|
125
119
|
if (v4.length === 4 && v4.every((part) => /^\d{1,3}$/.test(part) && Number(part) <= 255)) {
|
|
126
120
|
const [o0, o1, o2, o3] = v4.map(Number);
|
|
127
|
-
|
|
121
|
+
const expanded = [...ending.slice(0, -1), ((o0 << 8) | o1).toString(16), ((o2 << 8) | o3).toString(16)];
|
|
122
|
+
if (compressed) tailGroups = expanded;
|
|
123
|
+
else headGroups = expanded;
|
|
128
124
|
} else return null;
|
|
129
125
|
}
|
|
130
126
|
let groups: string[];
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/** A failed connect cannot distinguish an absent loopback address from a slow owner. */
|
|
2
|
+
export type LoopbackFamilyAvailability = "available" | "unavailable" | "unknown";
|
|
3
|
+
|
|
4
|
+
function bindLoopback(hostname: string): { stop(): void } {
|
|
5
|
+
return Bun.listen({ hostname, port: 0, socket: { data(socket) { socket.end(); } } });
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Ask the kernel whether the concrete local address can be bound, independently of
|
|
10
|
+
* routing/connect timeouts. Only address/family absence permits skipping discovery;
|
|
11
|
+
* permissions, resource exhaustion and other failures leave owner evidence unknown.
|
|
12
|
+
* The ephemeral listener is closed synchronously and never accepts client traffic.
|
|
13
|
+
*/
|
|
14
|
+
export function loopbackFamilyAvailability(
|
|
15
|
+
hostname: string,
|
|
16
|
+
bindFn: (hostname: string) => { stop(): void } = bindLoopback,
|
|
17
|
+
): LoopbackFamilyAvailability {
|
|
18
|
+
const address = hostname === "[::1]" ? "::1" : hostname;
|
|
19
|
+
if (address !== "::1" && address !== "127.0.0.1") return "unknown";
|
|
20
|
+
let listener: { stop(): void };
|
|
21
|
+
try {
|
|
22
|
+
listener = bindFn(address);
|
|
23
|
+
} catch (error) {
|
|
24
|
+
const code = (error as { code?: unknown } | null)?.code;
|
|
25
|
+
return code === "EADDRNOTAVAIL" || code === "EAFNOSUPPORT"
|
|
26
|
+
|| code === "EPROTONOSUPPORT"
|
|
27
|
+
? "unavailable" : "unknown";
|
|
28
|
+
}
|
|
29
|
+
listener.stop();
|
|
30
|
+
return "available";
|
|
31
|
+
}
|
package/src/lib/plain-data.ts
CHANGED
|
@@ -29,7 +29,7 @@ export function copyPlainData<T>(value: T): PlainDataCopy<T> {
|
|
|
29
29
|
/**
|
|
30
30
|
* A stable string for comparing two plain-data values.
|
|
31
31
|
*
|
|
32
|
-
*
|
|
32
|
+
* Tagged containers and key-sorted entry pairs, because property order is observable through
|
|
33
33
|
* serialization and two values that differ only in it are the same value.
|
|
34
34
|
*/
|
|
35
35
|
export function canonicalPlainData(value: unknown): string {
|
|
@@ -50,6 +50,7 @@ export function isPlainObject(value: unknown): value is Record<string, unknown>
|
|
|
50
50
|
return prototype === Object.prototype || prototype === null;
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
+
/** Copy one JSON-shaped value through property descriptors, or return `REFUSED` for anything else. */
|
|
53
54
|
function copyValue(value: unknown, seen: Set<object>): unknown {
|
|
54
55
|
if (value === null) return null;
|
|
55
56
|
const type = typeof value;
|
|
@@ -69,7 +70,7 @@ function copyValue(value: unknown, seen: Set<object>): unknown {
|
|
|
69
70
|
if (entry === undefined) continue;
|
|
70
71
|
const item = copyValue(entry, seen);
|
|
71
72
|
if (item === REFUSED) return REFUSED;
|
|
72
|
-
copied
|
|
73
|
+
Object.defineProperty(copied, key, { value: item, enumerable: true, writable: true, configurable: true });
|
|
73
74
|
}
|
|
74
75
|
return copied;
|
|
75
76
|
} finally {
|
|
@@ -92,12 +93,13 @@ function copyArray(source: unknown[], seen: Set<object>): unknown {
|
|
|
92
93
|
return copied;
|
|
93
94
|
}
|
|
94
95
|
|
|
96
|
+
/** Rebuild a value with tagged arrays and objects and key-sorted object entries for comparison. */
|
|
95
97
|
function sorted(value: unknown): unknown {
|
|
96
|
-
if (Array.isArray(value)) return value.map(sorted);
|
|
98
|
+
if (Array.isArray(value)) return ["array", value.map(sorted)];
|
|
97
99
|
if (value !== null && typeof value === "object") {
|
|
98
|
-
return Object.keys(value as Record<string, unknown>)
|
|
100
|
+
return ["object", Object.keys(value as Record<string, unknown>)
|
|
99
101
|
.sort()
|
|
100
|
-
.map(key => [key, sorted((value as Record<string, unknown>)[key])]);
|
|
102
|
+
.map(key => [key, sorted((value as Record<string, unknown>)[key])])];
|
|
101
103
|
}
|
|
102
104
|
return value;
|
|
103
105
|
}
|
|
@@ -41,6 +41,18 @@ export interface GracefulStopIo {
|
|
|
41
41
|
* and keep the self-contained behaviour.
|
|
42
42
|
*/
|
|
43
43
|
deferSharedTeardownNonce?: string;
|
|
44
|
+
/**
|
|
45
|
+
* Whether a `sharedTeardown: "not-owned"` answer confirms this stop's teardown.
|
|
46
|
+
*
|
|
47
|
+
* A sibling's `not-owned` is a truthful final answer: it owns no shared teardown, so
|
|
48
|
+
* nothing is left for this caller either. `ocx stop` of a connected Link Child sets this
|
|
49
|
+
* false — only an old build answers `not-owned` for a link connection, and it says so
|
|
50
|
+
* while preserving the loopback route this caller must restore itself. The caller decides
|
|
51
|
+
* from the connection state read at the POST: a connect or disconnect committed mid-stop
|
|
52
|
+
* changes what the answer means for it. Defaults to true; the option only narrows a stop
|
|
53
|
+
* that sent no deferral nonce.
|
|
54
|
+
*/
|
|
55
|
+
acceptNotOwnedTeardown?: boolean;
|
|
44
56
|
/**
|
|
45
57
|
* Endpoint the caller already resolved for this pid.
|
|
46
58
|
*
|
|
@@ -204,7 +216,7 @@ export async function stopProxyGracefully(pid: number, io: GracefulStopIo = {}):
|
|
|
204
216
|
*/
|
|
205
217
|
type StopRefusal = { message: string | null; code: string | null };
|
|
206
218
|
|
|
207
|
-
async function stopRequestFetch(input: string | URL | Request, init?: RequestInit): Promise<Response> {
|
|
219
|
+
export async function stopRequestFetch(input: string | URL | Request, init?: RequestInit): Promise<Response> {
|
|
208
220
|
let status: number | undefined;
|
|
209
221
|
try {
|
|
210
222
|
return await directLocalHttpFetch(input, init, { onResponseStatus: value => { status = value; } });
|
|
@@ -275,12 +287,16 @@ async function stopProxyGracefullyDetailed(
|
|
|
275
287
|
const expectedTeardown = io.deferSharedTeardownNonce ? "deferred" : "performed";
|
|
276
288
|
// A sibling instance answers `not-owned`: it has no shared teardown to perform, so there is
|
|
277
289
|
// nothing left over for this caller either. A deferral it was sent is still not confirmed.
|
|
290
|
+
// A connected Link Child's stop refuses the same answer: only an old build sends it for a
|
|
291
|
+
// link connection, and it preserves the route this caller must restore.
|
|
278
292
|
sharedTeardownConfirmed = body !== null
|
|
279
293
|
&& typeof body === "object"
|
|
280
294
|
&& !Array.isArray(body)
|
|
281
295
|
&& "success" in body && body.success === true
|
|
282
296
|
&& "sharedTeardown" in body && (body.sharedTeardown === expectedTeardown
|
|
283
|
-
|| (!io.deferSharedTeardownNonce
|
|
297
|
+
|| (!io.deferSharedTeardownNonce
|
|
298
|
+
&& (io.acceptNotOwnedTeardown ?? true)
|
|
299
|
+
&& body.sharedTeardown === "not-owned"));
|
|
284
300
|
} catch {
|
|
285
301
|
return done(false);
|
|
286
302
|
}
|
|
@@ -351,22 +367,31 @@ async function waitForStoppedPort(
|
|
|
351
367
|
}
|
|
352
368
|
}
|
|
353
369
|
|
|
354
|
-
export function killProxy(pid: number): void {
|
|
370
|
+
export function killProxy(pid: number, mayTerminate?: () => boolean): void {
|
|
355
371
|
if (!isProcessAlive(pid)) return;
|
|
372
|
+
const authorize = () => {
|
|
373
|
+
if (mayTerminate && mayTerminate() !== true) throw Object.assign(new Error("Process termination refused"), { code: "EUPDATEAUTHORITY" });
|
|
374
|
+
};
|
|
356
375
|
if (process.platform === "win32") {
|
|
357
376
|
// Windows process.kill(SIGTERM/SIGINT) is TerminateProcess — not a graceful signal.
|
|
358
377
|
// Graceful drain happens only via stopProxyGracefully() (POST /api/stop). This path
|
|
359
378
|
// is the hard fallback: taskkill /T /F so the process tree exits (ghost LISTEN /
|
|
360
379
|
// CLOSE_WAIT are then cleared by reclaimListenPort / SetTcpEntry).
|
|
361
380
|
const taskkill = `${process.env.SystemRoot ?? "C:\\Windows"}\\System32\\taskkill.exe`;
|
|
381
|
+
const args = ["/PID", String(pid), "/T", "/F"];
|
|
382
|
+
authorize();
|
|
362
383
|
try {
|
|
363
|
-
execFileSync(taskkill,
|
|
384
|
+
execFileSync(taskkill, args, { stdio: "pipe", windowsHide: true });
|
|
364
385
|
} catch (err) {
|
|
365
386
|
if (isProcessAlive(pid)) throw err;
|
|
366
387
|
}
|
|
367
388
|
} else {
|
|
389
|
+
authorize();
|
|
368
390
|
process.kill(pid, "SIGTERM");
|
|
369
|
-
if (!waitForExit(pid, 5000))
|
|
391
|
+
if (!waitForExit(pid, 5000)) {
|
|
392
|
+
authorize();
|
|
393
|
+
process.kill(pid, "SIGKILL");
|
|
394
|
+
}
|
|
370
395
|
}
|
|
371
396
|
if (!waitForExit(pid, 5000)) throw new Error(`process ${pid} did not exit`);
|
|
372
397
|
}
|
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
|
/**
|
|
@@ -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
|
/**
|