@bitkyc08/opencodex 2.93.0 → 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-BXu4zE8H.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-CizjBqyk.js +0 -58
- 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/src/combos/failover.ts
CHANGED
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
|
|
14
14
|
interface TargetCooldown {
|
|
15
15
|
cooldownUntil: number;
|
|
16
|
+
revision: number;
|
|
16
17
|
status?: number;
|
|
17
18
|
}
|
|
18
19
|
|
|
@@ -44,6 +45,8 @@ const HTTP_MONTH_INDEX: Record<string, number> = {
|
|
|
44
45
|
|
|
45
46
|
/** Map<`${comboId}\0${provider/model}`, TargetCooldown> */
|
|
46
47
|
const targetCooldowns = new Map<string, TargetCooldown>();
|
|
48
|
+
// Never reset: an in-flight reservation may still refer to an entry cleared from the map.
|
|
49
|
+
let nextCooldownRevision = 0;
|
|
47
50
|
let lastReconciledGeneration = 0;
|
|
48
51
|
let liveComboTargets = new Set<string>();
|
|
49
52
|
|
|
@@ -163,6 +166,42 @@ export function isComboTargetInCooldown(
|
|
|
163
166
|
return true;
|
|
164
167
|
}
|
|
165
168
|
|
|
169
|
+
/** The live cooldown expiry for one target, or undefined once it is absent or elapsed. */
|
|
170
|
+
export function comboTargetCooldownExpiry(
|
|
171
|
+
comboId: string,
|
|
172
|
+
target: Pick<OcxComboTarget, "provider" | "model">,
|
|
173
|
+
now = Date.now(),
|
|
174
|
+
): number | undefined {
|
|
175
|
+
const key = cooldownMapKey(comboId, target);
|
|
176
|
+
const entry = targetCooldowns.get(key);
|
|
177
|
+
if (!entry) return undefined;
|
|
178
|
+
if (entry.cooldownUntil <= now) {
|
|
179
|
+
targetCooldowns.delete(key);
|
|
180
|
+
return undefined;
|
|
181
|
+
}
|
|
182
|
+
return entry.cooldownUntil;
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
/** Identity of the current live write, independent of its possibly repeated expiry. */
|
|
186
|
+
export function comboTargetCooldownRevision(
|
|
187
|
+
comboId: string,
|
|
188
|
+
target: Pick<OcxComboTarget, "provider" | "model">,
|
|
189
|
+
now = Date.now(),
|
|
190
|
+
): number | undefined {
|
|
191
|
+
return isComboTargetInCooldown(comboId, target, now)
|
|
192
|
+
? targetCooldowns.get(cooldownMapKey(comboId, target))?.revision : undefined;
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
/** Lift only the reserved write; a replacement with even the same expiry survives. */
|
|
196
|
+
export function clearComboTargetCooldownIfUnchanged(
|
|
197
|
+
comboId: string,
|
|
198
|
+
target: Pick<OcxComboTarget, "provider" | "model">,
|
|
199
|
+
expectedRevision: number,
|
|
200
|
+
): void {
|
|
201
|
+
const key = cooldownMapKey(comboId, target);
|
|
202
|
+
if (targetCooldowns.get(key)?.revision === expectedRevision) targetCooldowns.delete(key);
|
|
203
|
+
}
|
|
204
|
+
|
|
166
205
|
export function isTransientRequestRateLimit(input: {
|
|
167
206
|
status?: number;
|
|
168
207
|
code?: string | null;
|
|
@@ -253,7 +292,7 @@ export function coolComboTarget(
|
|
|
253
292
|
// A spent account window or an unpaid/rejected credential does not turn over in a minute,
|
|
254
293
|
// so the 60s default would re-offer a target that cannot succeed. Only the duration
|
|
255
294
|
// changes; the scope and hop decisions are untouched.
|
|
256
|
-
?? (isAccountWindowExhausted(options?.message ?? "", options?.code)
|
|
295
|
+
?? (isAccountWindowExhausted(options?.message ?? "", options?.code, options?.status)
|
|
257
296
|
|| PROVIDER_SCOPED_FAILURE_CODES.has(normalizedFailureCode(options?.code))
|
|
258
297
|
? MAX_COOLDOWN_MS
|
|
259
298
|
: isTransientRequestRateLimit({
|
|
@@ -262,6 +301,7 @@ export function coolComboTarget(
|
|
|
262
301
|
message: options?.message,
|
|
263
302
|
}) ? COMBO_REQUEST_RATE_COOLDOWN_MS : DEFAULT_COOLDOWN_MS);
|
|
264
303
|
targetCooldowns.set(cooldownMapKey(comboId, target), {
|
|
304
|
+
revision: ++nextCooldownRevision,
|
|
265
305
|
// Local fallbacks are capped at ten minutes; explicit server delays at one day.
|
|
266
306
|
cooldownUntil: now + (serverDelayMs ?? Math.min(Math.max(cooldownMs, 1), MAX_COOLDOWN_MS)),
|
|
267
307
|
status: options?.status,
|
|
@@ -355,11 +395,37 @@ const ACCOUNT_EXHAUSTION_CODES = new Set(["usage_limit_exceeded", "usage_limit_r
|
|
|
355
395
|
// Token-plan windows (Alibaba's DeepSeek/Qwen plans) report "Your token-plan 1-week quota has been
|
|
356
396
|
// exhausted" (#5494). The match is anchored to that phrasing: a looser "quota ... exhausted" would
|
|
357
397
|
// also catch per-minute limits, and this arm outranks the transient rate-limit duration.
|
|
358
|
-
const ACCOUNT_EXHAUSTION_TEXT = /usage limit (?:has been )?reached|token-plan\s+\S+\s+quota has been exhausted
|
|
398
|
+
const ACCOUNT_EXHAUSTION_TEXT = /usage limit (?:has been )?reached|token-plan\s+\S+\s+quota has been exhausted|(?:account|weekly|monthly|daily)\s*(?:usage\s+)?quota (?:(?:has been |is )?exhausted|exceeded)/i;
|
|
359
399
|
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
400
|
+
/**
|
|
401
|
+
* Determines whether an error signals that an account's quota or usage window has been exhausted.
|
|
402
|
+
*
|
|
403
|
+
* Explicit error codes (`usage_limit_exceeded`, `insufficient_quota`, etc.) are always authoritative.
|
|
404
|
+
* For HTTP 400 (Bad Request), prose alone is not authoritative because client validation errors
|
|
405
|
+
* may echo prompt contents or parameter values containing quota-related words.
|
|
406
|
+
*
|
|
407
|
+
* @param message The error message text.
|
|
408
|
+
* @param code The normalized or raw error code.
|
|
409
|
+
* @param status The HTTP status code, if known.
|
|
410
|
+
* @returns True if the failure represents an account window exhaustion.
|
|
411
|
+
*/
|
|
412
|
+
function isAccountWindowExhausted(
|
|
413
|
+
message: string,
|
|
414
|
+
code?: string | null,
|
|
415
|
+
status?: number,
|
|
416
|
+
): boolean {
|
|
417
|
+
const normalized = normalizedFailureCode(code);
|
|
418
|
+
if (ACCOUNT_EXHAUSTION_CODES.has(normalized) || normalized === "insufficient_quota") {
|
|
419
|
+
return true;
|
|
420
|
+
}
|
|
421
|
+
// On HTTP 400 (Bad Request / parameter validation), prose alone is not authoritative evidence
|
|
422
|
+
// of account quota exhaustion because validation errors may echo user prompts or parameter values
|
|
423
|
+
// quoting "quota exhausted". An authoritative account exhaustion verdict on 400 requires a
|
|
424
|
+
// structured exhaustion code.
|
|
425
|
+
if (status === 400 || status === 422) {
|
|
426
|
+
return false;
|
|
427
|
+
}
|
|
428
|
+
return ACCOUNT_EXHAUSTION_TEXT.test(message.toLowerCase());
|
|
363
429
|
}
|
|
364
430
|
|
|
365
431
|
function isProviderScopedQuotaCap(
|
|
@@ -379,6 +445,12 @@ function isProviderScopedQuotaCap(
|
|
|
379
445
|
|| (text.includes("free tier") && text.includes("single request"));
|
|
380
446
|
}
|
|
381
447
|
|
|
448
|
+
/** A structured account-window exhaustion code; prose never qualifies (a request can echo it). */
|
|
449
|
+
function hasAccountExhaustionCode(code?: string | null): boolean {
|
|
450
|
+
const normalized = normalizedFailureCode(code);
|
|
451
|
+
return ACCOUNT_EXHAUSTION_CODES.has(normalized) || normalized === "insufficient_quota";
|
|
452
|
+
}
|
|
453
|
+
|
|
382
454
|
/**
|
|
383
455
|
* A free-tier cap the upstream evaluates PER REQUEST rather than per account window. These
|
|
384
456
|
* needles used to reach only `isProviderScopedQuotaCap`, so a single oversized free-tier prompt
|
|
@@ -878,9 +950,16 @@ export function comboFailureDecision(
|
|
|
878
950
|
// adapter grants it (the words alone prove nothing for another provider); it must precede the
|
|
879
951
|
// generic invalid_request_error stop.
|
|
880
952
|
if (options?.failedAdapter === "kiro" && isKiroAccountProfileRefusal(status, message)) return "hop";
|
|
953
|
+
// A structured account-window exhaustion code is provider-state evidence even inside a
|
|
954
|
+
// 400 / invalid_request_error envelope, so it must precede that stop. Exhaustion prose alone
|
|
955
|
+
// never reaches this arm: a validation error can quote quota wording back (#7625).
|
|
956
|
+
if (hasAccountExhaustionCode(options?.code)) return "hop";
|
|
881
957
|
if (["origin_rejected", "context_length_exceeded", "invalid_request_error"].includes(error.code ?? "")) {
|
|
882
958
|
return "stop";
|
|
883
959
|
}
|
|
960
|
+
// Quota prose inside a request-validation status (400/422) is not authoritative without a
|
|
961
|
+
// structured code: the body can quote prompt or parameter text back (#7625).
|
|
962
|
+
if (error.code === "insufficient_quota" && (status === 400 || status === 422)) return "stop";
|
|
884
963
|
// 402 (payment required) and 425 (too early) are provider-state signals, not verdicts about
|
|
885
964
|
// the request: another combo target can still serve it.
|
|
886
965
|
if ([401, 402, 403, 404, 408, 425, 429].includes(status) || status >= 500) return "hop";
|
package/src/combos/index.ts
CHANGED
package/src/combos/resolve.ts
CHANGED
|
@@ -3,7 +3,8 @@ import { getCachedProviderRoutingQuota } from "../providers/quota-routing-cache"
|
|
|
3
3
|
import type { ProviderQuota, ProviderQuotaWindow } from "../providers/quota-types";
|
|
4
4
|
import { sleepWithAbort } from "../lib/upstream-retry";
|
|
5
5
|
import {
|
|
6
|
-
|
|
6
|
+
clearComboTargetCooldownIfUnchanged,
|
|
7
|
+
comboTargetCooldownRevision,
|
|
7
8
|
coolComboTarget,
|
|
8
9
|
earliestComboCooldown,
|
|
9
10
|
isComboTargetInCooldown,
|
|
@@ -24,6 +25,8 @@ export interface ComboPick {
|
|
|
24
25
|
targetIndex: number;
|
|
25
26
|
attempted: string[];
|
|
26
27
|
writerGeneration: number;
|
|
28
|
+
/** Cooled targets this request alone may probe, each bound to the cooldown write it reserved. */
|
|
29
|
+
cooldownReprobeTargets?: Record<string, number>;
|
|
27
30
|
}
|
|
28
31
|
|
|
29
32
|
interface SelectionState {
|
|
@@ -288,11 +291,11 @@ function resetWindowIndex(
|
|
|
288
291
|
return selected;
|
|
289
292
|
}
|
|
290
293
|
|
|
291
|
-
/** Reserve one recovery pass
|
|
292
|
-
function
|
|
294
|
+
/** Reserve one request-scoped recovery pass; preview and in-flight picks never call this. */
|
|
295
|
+
function reserveAllCooledTargets(
|
|
293
296
|
config: OcxConfig, comboId: string, now: number,
|
|
294
297
|
eligible?: (target: NormalizedComboTarget) => boolean,
|
|
295
|
-
):
|
|
298
|
+
): Map<string, number> | undefined {
|
|
296
299
|
const combo = getCombo(config, comboId);
|
|
297
300
|
if (!combo?.cooldownReprobe?.enabled) return;
|
|
298
301
|
const state = selectionState.get(comboId);
|
|
@@ -307,13 +310,22 @@ function reopenAllCooledTargets(
|
|
|
307
310
|
if (combo.targets.some(target => !isComboTargetInCooldown(comboId, target, now)
|
|
308
311
|
&& reprobeEligible(target))) return;
|
|
309
312
|
const usable = combo.targets.filter(reprobeEligible);
|
|
310
|
-
if (usable.length === 0
|
|
313
|
+
if (usable.length === 0) return;
|
|
314
|
+
// Each reserved key is bound to the cooldown entry observed here. A replacement entry —
|
|
315
|
+
// a provider-scoped failure's, or one this request's own failed hop wrote — is newer
|
|
316
|
+
// evidence and cancels that target's bypass instead of being probed through.
|
|
317
|
+
const reserved = new Map<string, number>();
|
|
318
|
+
for (const target of usable) {
|
|
319
|
+
const revision = comboTargetCooldownRevision(comboId, target, now);
|
|
320
|
+
if (revision === undefined) return;
|
|
321
|
+
reserved.set(targetKey(target), revision);
|
|
322
|
+
}
|
|
311
323
|
// No await between reservation and reset: concurrent requests cannot reserve another pass.
|
|
312
324
|
const next = state ?? { successes: 0, currentWeights: new Map<string, number>(), successfulUses: new Map<string, number>() };
|
|
313
325
|
next.lastCooldownReprobeAt = now;
|
|
314
326
|
selectionState.set(comboId, next);
|
|
315
|
-
|
|
316
|
-
|
|
327
|
+
console.warn(`[combo] ${comboId}: reserving all-cooled targets for one request; minimum reprobe interval ${combo.cooldownReprobe.intervalMs}ms`);
|
|
328
|
+
return reserved;
|
|
317
329
|
}
|
|
318
330
|
|
|
319
331
|
export function pickComboTarget(
|
|
@@ -324,6 +336,8 @@ export function pickComboTarget(
|
|
|
324
336
|
eligible?: (target: NormalizedComboTarget) => boolean;
|
|
325
337
|
/** Disable recovery for picks without request context or picks already in flight. */
|
|
326
338
|
allowCooldownReprobe?: boolean;
|
|
339
|
+
/** Request-scoped cooldown bypasses, each bound to the write it was reserved against. */
|
|
340
|
+
cooldownReprobeTargets?: Iterable<readonly [string, number]>;
|
|
327
341
|
now?: number;
|
|
328
342
|
/** Inspect a round-robin choice without mutating its sticky/weight state. */
|
|
329
343
|
preview?: boolean;
|
|
@@ -334,12 +348,19 @@ export function pickComboTarget(
|
|
|
334
348
|
if (!combo) throw new UnknownComboError(comboId);
|
|
335
349
|
const excluded = new Set(options.exclude ?? []);
|
|
336
350
|
const now = options.now ?? Date.now();
|
|
351
|
+
const cooldownReprobeTargets = new Map(options.cooldownReprobeTargets);
|
|
337
352
|
if (options.allowCooldownReprobe !== false && !options.preview && excluded.size === 0) {
|
|
338
|
-
|
|
353
|
+
for (const [key, revision] of reserveAllCooledTargets(config, comboId, now, options.eligible) ?? []) {
|
|
354
|
+
cooldownReprobeTargets.set(key, revision);
|
|
355
|
+
}
|
|
339
356
|
}
|
|
357
|
+
const reprobeBypass = (target: NormalizedComboTarget): boolean => {
|
|
358
|
+
const revision = cooldownReprobeTargets.get(targetKey(target));
|
|
359
|
+
return revision !== undefined && revision === comboTargetCooldownRevision(comboId, target, now);
|
|
360
|
+
};
|
|
340
361
|
const eligible = (target: NormalizedComboTarget): boolean =>
|
|
341
362
|
targetProviderIsUsable(config, target, now)
|
|
342
|
-
&& !isComboTargetInCooldown(comboId, target, now)
|
|
363
|
+
&& (reprobeBypass(target) || !isComboTargetInCooldown(comboId, target, now))
|
|
343
364
|
&& !excluded.has(targetKey(target))
|
|
344
365
|
&& (options.eligible?.(target) ?? true);
|
|
345
366
|
|
|
@@ -417,6 +438,7 @@ export function pickComboTarget(
|
|
|
417
438
|
targetIndex,
|
|
418
439
|
attempted: [...excluded, targetKey(target)],
|
|
419
440
|
writerGeneration,
|
|
441
|
+
...(cooldownReprobeTargets.size > 0 ? { cooldownReprobeTargets: Object.fromEntries(cooldownReprobeTargets) } : {}),
|
|
420
442
|
};
|
|
421
443
|
}
|
|
422
444
|
|
|
@@ -447,6 +469,17 @@ export function noteComboSuccess(
|
|
|
447
469
|
}
|
|
448
470
|
}
|
|
449
471
|
|
|
472
|
+
/**
|
|
473
|
+
* A request that proved a reserved target healthy lifts exactly the cooldown entry it
|
|
474
|
+
* probed; a replacement entry written while the request was in flight stays. Targets
|
|
475
|
+
* the pass reserved but never dispatched keep their cooldowns.
|
|
476
|
+
*/
|
|
477
|
+
export function settleComboReprobeSuccess(pick: ComboPick): void {
|
|
478
|
+
const revision = pick.cooldownReprobeTargets?.[targetKey(pick.target)];
|
|
479
|
+
if (revision === undefined) return;
|
|
480
|
+
clearComboTargetCooldownIfUnchanged(pick.comboId, pick.target, revision);
|
|
481
|
+
}
|
|
482
|
+
|
|
450
483
|
export function noteComboFailure(
|
|
451
484
|
comboId: string,
|
|
452
485
|
target: OcxComboTarget,
|
|
@@ -519,8 +552,10 @@ export function advanceComboAfterFailure(
|
|
|
519
552
|
return pickComboTarget(config, pick.comboId, {
|
|
520
553
|
exclude: pick.attempted,
|
|
521
554
|
now: options.now,
|
|
522
|
-
|
|
523
|
-
|
|
555
|
+
cooldownReprobeTargets: pick.cooldownReprobeTargets
|
|
556
|
+
? Object.entries(pick.cooldownReprobeTargets)
|
|
557
|
+
: undefined,
|
|
558
|
+
eligible: target => (options.eligible?.(target) ?? true)
|
|
524
559
|
&& (!defersLastResort || !target.lastResort),
|
|
525
560
|
});
|
|
526
561
|
}
|
|
@@ -535,6 +570,8 @@ export async function pickComboTargetWithWait(
|
|
|
535
570
|
abortSignal?: AbortSignal;
|
|
536
571
|
/** Disable recovery when retrying a target after its normal cooldown. */
|
|
537
572
|
allowCooldownReprobe?: boolean;
|
|
573
|
+
/** Request-scoped cooldown bypasses carried through the wait, each bound to its write. */
|
|
574
|
+
cooldownReprobeTargets?: Iterable<readonly [string, number]>;
|
|
538
575
|
now?: number;
|
|
539
576
|
sleep?: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
540
577
|
},
|
|
@@ -542,13 +579,12 @@ export async function pickComboTargetWithWait(
|
|
|
542
579
|
const now = options.now ?? Date.now();
|
|
543
580
|
const excluded = new Set(options.exclude ?? []);
|
|
544
581
|
const customEligible = options.eligible;
|
|
582
|
+
const cooldownReprobeTargets = new Map(options.cooldownReprobeTargets);
|
|
545
583
|
if (options.allowCooldownReprobe !== false && excluded.size === 0 && !options.abortSignal?.aborted) {
|
|
546
|
-
|
|
584
|
+
for (const [key, revision] of reserveAllCooledTargets(config, comboId, now, customEligible) ?? []) {
|
|
585
|
+
cooldownReprobeTargets.set(key, revision);
|
|
586
|
+
}
|
|
547
587
|
}
|
|
548
|
-
const eligibleAt = (target: NormalizedComboTarget, at: number): boolean =>
|
|
549
|
-
!isComboTargetInCooldown(comboId, target, at)
|
|
550
|
-
&& (customEligible?.(target) ?? true);
|
|
551
|
-
const eligible = (target: NormalizedComboTarget): boolean => eligibleAt(target, now);
|
|
552
588
|
// Milliseconds already slept inside this call. `waitForCooldownMs` is documented as a cap
|
|
553
589
|
// per *selection attempt*, so a deferral wait and the ordinary wait below must share it —
|
|
554
590
|
// otherwise a 3s deferral followed by a 9s ordinary wait spends 12s against a 10s budget.
|
|
@@ -567,9 +603,10 @@ export async function pickComboTargetWithWait(
|
|
|
567
603
|
&& policyCombo.targets.some(target => !target.lastResort);
|
|
568
604
|
if (defersLastResort && !options.abortSignal?.aborted) {
|
|
569
605
|
const normalOnly = (target: NormalizedComboTarget): boolean =>
|
|
570
|
-
!target.lastResort &&
|
|
606
|
+
!target.lastResort && (customEligible?.(target) ?? true);
|
|
571
607
|
const normalPick = pickComboTarget(config, comboId, {
|
|
572
608
|
allowCooldownReprobe: false,
|
|
609
|
+
cooldownReprobeTargets,
|
|
573
610
|
exclude: excluded,
|
|
574
611
|
eligible: normalOnly,
|
|
575
612
|
now,
|
|
@@ -601,11 +638,10 @@ export async function pickComboTargetWithWait(
|
|
|
601
638
|
if (!getCombo(config, comboId)) return null;
|
|
602
639
|
const waited = pickComboTarget(config, comboId, {
|
|
603
640
|
allowCooldownReprobe: false,
|
|
641
|
+
cooldownReprobeTargets,
|
|
604
642
|
exclude: excluded,
|
|
605
643
|
now: now + normalDelay,
|
|
606
|
-
eligible:
|
|
607
|
-
&& !isComboTargetInCooldown(comboId, target, now + normalDelay)
|
|
608
|
-
&& (customEligible?.(target) ?? true),
|
|
644
|
+
eligible: normalOnly,
|
|
609
645
|
});
|
|
610
646
|
if (waited) return waited;
|
|
611
647
|
}
|
|
@@ -619,8 +655,9 @@ export async function pickComboTargetWithWait(
|
|
|
619
655
|
|
|
620
656
|
const pick = pickComboTarget(config, comboId, {
|
|
621
657
|
allowCooldownReprobe: false,
|
|
658
|
+
cooldownReprobeTargets,
|
|
622
659
|
exclude: excluded,
|
|
623
|
-
eligible:
|
|
660
|
+
eligible: customEligible,
|
|
624
661
|
now: clock,
|
|
625
662
|
});
|
|
626
663
|
if (pick || remainingWaitMs <= 0 || options.abortSignal?.aborted) return pick;
|
|
@@ -654,8 +691,9 @@ export async function pickComboTargetWithWait(
|
|
|
654
691
|
return pickComboTarget(config, comboId, {
|
|
655
692
|
exclude: excluded,
|
|
656
693
|
allowCooldownReprobe: false,
|
|
694
|
+
cooldownReprobeTargets,
|
|
657
695
|
now: clock + delay,
|
|
658
|
-
eligible:
|
|
696
|
+
eligible: customEligible,
|
|
659
697
|
});
|
|
660
698
|
}
|
|
661
699
|
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
|
+
type BigIntStats,
|
|
2
3
|
chmodSync,
|
|
3
4
|
closeSync,
|
|
4
5
|
fchmodSync,
|
|
5
6
|
fsyncSync,
|
|
6
7
|
fstatSync,
|
|
8
|
+
linkSync,
|
|
7
9
|
lstatSync,
|
|
8
10
|
openSync,
|
|
9
11
|
realpathSync,
|
|
@@ -132,14 +134,17 @@ function assertResolvedTargetAllowed(path: string, target: string): void {
|
|
|
132
134
|
assertNotRealHomeUnderTest(dirname(target));
|
|
133
135
|
}
|
|
134
136
|
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
137
|
+
// Zero dev/ino is refused only where publication relies on stable identity (exclusive
|
|
138
|
+
// recovery copies); ordinary saves must keep working on filesystems that report zero.
|
|
139
|
+
function assertPrivateTempDescriptor(path: string, descriptor: number, requireStableIdentity = false): void {
|
|
140
|
+
const opened = fstatSync(descriptor, { bigint: true });
|
|
141
|
+
const linked = lstatSync(path, { bigint: true });
|
|
138
142
|
if (!opened.isFile() || !linked.isFile()
|
|
143
|
+
|| (requireStableIdentity && (opened.dev === 0n || opened.ino === 0n))
|
|
139
144
|
|| opened.dev !== linked.dev || opened.ino !== linked.ino) {
|
|
140
145
|
throw new Error("atomic temporary file identity changed before write");
|
|
141
146
|
}
|
|
142
|
-
if (process.platform !== "win32" && (opened.mode &
|
|
147
|
+
if (process.platform !== "win32" && (opened.mode & 0o777n) !== 0o600n) {
|
|
143
148
|
throw new Error("atomic temporary file permissions are not owner-only");
|
|
144
149
|
}
|
|
145
150
|
}
|
|
@@ -195,11 +200,12 @@ function writePrivateTempFile(
|
|
|
195
200
|
path: string,
|
|
196
201
|
content: string,
|
|
197
202
|
timeoutMemoKey: string,
|
|
198
|
-
onCreated: () => void,
|
|
203
|
+
onCreated: (descriptor: number) => void,
|
|
204
|
+
requireStableIdentity = false,
|
|
199
205
|
): void {
|
|
200
206
|
const descriptor = openSync(path, "wx", 0o600);
|
|
201
|
-
onCreated();
|
|
202
207
|
try {
|
|
208
|
+
onCreated(descriptor);
|
|
203
209
|
if (windowsHardeningApplies()) {
|
|
204
210
|
hardenSecretPath(path, { required: true, timeoutMemoKey });
|
|
205
211
|
}
|
|
@@ -209,11 +215,11 @@ function writePrivateTempFile(
|
|
|
209
215
|
if (process.platform !== "win32") {
|
|
210
216
|
fchmodSync(descriptor, 0o600);
|
|
211
217
|
}
|
|
212
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
218
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
213
219
|
writeFileSync(descriptor, content, { encoding: "utf-8" });
|
|
214
220
|
// Second assertion, after the content write: the object this path resolves
|
|
215
221
|
// to is still the object the ACL was applied to and the one we just wrote.
|
|
216
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
222
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
217
223
|
} finally {
|
|
218
224
|
closeSync(descriptor);
|
|
219
225
|
}
|
|
@@ -235,18 +241,19 @@ function writePrivateTempFileWith(
|
|
|
235
241
|
path: string,
|
|
236
242
|
write: (descriptor: number) => void,
|
|
237
243
|
timeoutMemoKey: string,
|
|
238
|
-
onCreated: () => void,
|
|
244
|
+
onCreated: (descriptor: number) => void,
|
|
245
|
+
requireStableIdentity = false,
|
|
239
246
|
): void {
|
|
240
247
|
const descriptor = openSync(path, "wx", 0o600);
|
|
241
|
-
onCreated();
|
|
242
248
|
try {
|
|
249
|
+
onCreated(descriptor);
|
|
243
250
|
if (windowsHardeningApplies()) {
|
|
244
251
|
hardenSecretPath(path, { required: true, timeoutMemoKey });
|
|
245
252
|
}
|
|
246
253
|
if (process.platform !== "win32") fchmodSync(descriptor, 0o600);
|
|
247
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
254
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
248
255
|
write(descriptor);
|
|
249
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
256
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
250
257
|
fsyncSync(descriptor);
|
|
251
258
|
} finally {
|
|
252
259
|
closeSync(descriptor);
|
|
@@ -258,11 +265,11 @@ async function writePrivateTempFileAsync(
|
|
|
258
265
|
path: string,
|
|
259
266
|
content: string,
|
|
260
267
|
timeoutMemoKey: string,
|
|
261
|
-
onCreated: () => void,
|
|
268
|
+
onCreated: (descriptor: number) => void,
|
|
262
269
|
): Promise<void> {
|
|
263
270
|
const descriptor = openSync(path, "wx", 0o600);
|
|
264
|
-
onCreated();
|
|
265
271
|
try {
|
|
272
|
+
onCreated(descriptor);
|
|
266
273
|
if (windowsHardeningApplies()) {
|
|
267
274
|
await hardenSecretPathAsync(path, { required: true, timeoutMemoKey });
|
|
268
275
|
}
|
|
@@ -285,14 +292,29 @@ function atomicWriteFileToTarget(
|
|
|
285
292
|
io?: AtomicWriteIO,
|
|
286
293
|
hooks: AtomicWriteHooks = {},
|
|
287
294
|
recordOwnership = true,
|
|
295
|
+
exclusive = false,
|
|
288
296
|
): void {
|
|
289
297
|
if (recordOwnership) recordOwnedConfigPath(getConfigDir(), path);
|
|
290
298
|
assertResolvedTargetAllowed(path, target);
|
|
291
299
|
const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
|
|
292
300
|
let hardened = false;
|
|
293
301
|
let ownsTemp = false;
|
|
302
|
+
let publicationAttempted = false;
|
|
303
|
+
let identity: BigIntStats | undefined;
|
|
304
|
+
const created = (descriptor: number): void => {
|
|
305
|
+
ownsTemp = true;
|
|
306
|
+
if (exclusive) identity = fstatSync(descriptor, { bigint: true });
|
|
307
|
+
};
|
|
308
|
+
const assertIdentity = (entry: string): BigIntStats => {
|
|
309
|
+
const current = lstatSync(entry, { bigint: true });
|
|
310
|
+
if (!identity?.isFile() || identity.dev === 0n || identity.ino === 0n || !current.isFile()
|
|
311
|
+
|| current.dev !== identity.dev || current.ino !== identity.ino) {
|
|
312
|
+
throw new Error("atomic exclusive publication identity changed");
|
|
313
|
+
}
|
|
314
|
+
return current;
|
|
315
|
+
};
|
|
294
316
|
const effective: AtomicWriteIO = io ?? {
|
|
295
|
-
write: (tempPath, value) => writePrivateTempFile(tempPath, value, path,
|
|
317
|
+
write: (tempPath, value) => writePrivateTempFile(tempPath, value, path, created, exclusive),
|
|
296
318
|
harden: tempPath => {
|
|
297
319
|
// No chmod on the Windows branch: there it sets the read-only ATTRIBUTE,
|
|
298
320
|
// which is not the secret boundary and is not what protects this file, and
|
|
@@ -313,15 +335,24 @@ function atomicWriteFileToTarget(
|
|
|
313
335
|
// A streaming writer bypasses the string form of `write` and nothing else. Every later
|
|
314
336
|
// step -- harden, the pre-rename hooks, the rename and the whole residual-cleanup path,
|
|
315
337
|
// which still scrubs through `effective.write(tmp, "")` -- is shared with the string form.
|
|
316
|
-
if (typeof content === "function") writePrivateTempFileWith(tmp, content, path,
|
|
338
|
+
if (typeof content === "function") writePrivateTempFileWith(tmp, content, path, created, exclusive);
|
|
317
339
|
else effective.write(tmp, content);
|
|
318
340
|
hooks.afterTempWrite?.(tmp, target);
|
|
341
|
+
if (exclusive) assertIdentity(tmp);
|
|
319
342
|
effective.harden(tmp);
|
|
320
343
|
hardened = true;
|
|
321
344
|
hooks.beforeRename?.(tmp, target);
|
|
322
345
|
hooks.validateBeforeRename?.(target);
|
|
323
|
-
|
|
346
|
+
if (exclusive) {
|
|
347
|
+
// link is an atomic no-replace publication on both NTFS and POSIX. A raced
|
|
348
|
+
// destination entry, including a symlink, is refused rather than followed.
|
|
349
|
+
assertIdentity(tmp);
|
|
350
|
+
publicationAttempted = true;
|
|
351
|
+
linkSync(tmp, target);
|
|
352
|
+
assertIdentity(target);
|
|
353
|
+
} else effective.rename(tmp, target);
|
|
324
354
|
hooks.afterRename?.(target);
|
|
355
|
+
if (exclusive) { assertIdentity(tmp); effective.unlink(tmp); }
|
|
325
356
|
// The rename is only as durable as the directory entry recording it. Fsyncing the temp's
|
|
326
357
|
// CONTENT and then losing the entry in a power cut leaves the old file in place, or the
|
|
327
358
|
// directory in an indeterminate state, while the caller was told the replacement landed.
|
|
@@ -334,10 +365,19 @@ function atomicWriteFileToTarget(
|
|
|
334
365
|
forgetEphemeralSecretPath(tmp);
|
|
335
366
|
} catch (cause) {
|
|
336
367
|
if (!ownsTemp) throw cause;
|
|
368
|
+
let sharedTemp = false;
|
|
369
|
+
if (exclusive) {
|
|
370
|
+
try { sharedTemp = assertIdentity(tmp).nlink > 1n; } catch (error) {
|
|
371
|
+
if (isMissingPathError(error)) { forgetEphemeralSecretPath(tmp); throw cause; }
|
|
372
|
+
// The named entry is no longer ours. Neither truncate nor unlink it.
|
|
373
|
+
throw new AtomicWriteSecretResidualError(tmp, { cause });
|
|
374
|
+
}
|
|
375
|
+
}
|
|
337
376
|
let scrubbed = false;
|
|
338
377
|
try {
|
|
339
|
-
|
|
340
|
-
|
|
378
|
+
// A link syscall can publish and then report an error (e.g. a remote FS).
|
|
379
|
+
// Like initial config publication, cleanup after an attempt is unlink-only.
|
|
380
|
+
if (!publicationAttempted && !sharedTemp) { effective.truncate(tmp); scrubbed = true; }
|
|
341
381
|
} catch (error) {
|
|
342
382
|
if (isMissingPathError(error)) scrubbed = true;
|
|
343
383
|
else {
|
|
@@ -346,12 +386,13 @@ function atomicWriteFileToTarget(
|
|
|
346
386
|
}
|
|
347
387
|
let removed = false;
|
|
348
388
|
try {
|
|
389
|
+
if (exclusive) assertIdentity(tmp);
|
|
349
390
|
effective.unlink(tmp);
|
|
350
391
|
removed = true;
|
|
351
392
|
} catch (error) {
|
|
352
393
|
if (isMissingPathError(error)) removed = true;
|
|
353
394
|
else {
|
|
354
|
-
try { effective.unlink(tmp); removed = true; }
|
|
395
|
+
try { if (exclusive) assertIdentity(tmp); effective.unlink(tmp); removed = true; }
|
|
355
396
|
catch (retryError) { if (isMissingPathError(retryError)) removed = true; }
|
|
356
397
|
}
|
|
357
398
|
}
|
|
@@ -398,14 +439,26 @@ export function atomicWriteFileStreamed(
|
|
|
398
439
|
*/
|
|
399
440
|
export function atomicWriteFileNoFollow(
|
|
400
441
|
path: string,
|
|
401
|
-
content: string,
|
|
442
|
+
content: string | Uint8Array,
|
|
402
443
|
io?: AtomicWriteIO,
|
|
403
444
|
hooks: AtomicWriteHooks = {},
|
|
445
|
+
options: { exclusive?: boolean } = {},
|
|
404
446
|
): void {
|
|
405
447
|
// Only the final entry is no-follow: the parent still resolves, because an
|
|
406
448
|
// OS alias above the configured root (a home junction, /tmp) is legitimate
|
|
407
449
|
// and Windows cannot exclusive-create a temp through a junction.
|
|
408
|
-
|
|
450
|
+
const value = typeof content === "string" ? content : (descriptor: number) => { writeFileSync(descriptor, content); };
|
|
451
|
+
// Recovery copies are deliberately unclaimed: uninstall must not own them.
|
|
452
|
+
atomicWriteFileToTarget(path, value, join(resolveWriteTarget(dirname(path)), basename(path)), io, hooks, !options.exclusive, options.exclusive);
|
|
453
|
+
}
|
|
454
|
+
|
|
455
|
+
/** Content fsync before rename is mandatory; parent-directory sync is best effort. */
|
|
456
|
+
export function atomicWriteFileNoFollowStreamed(
|
|
457
|
+
path: string,
|
|
458
|
+
write: (descriptor: number) => void,
|
|
459
|
+
hooks: AtomicWriteHooks = {},
|
|
460
|
+
): void {
|
|
461
|
+
atomicWriteFileToTarget(path, write, join(resolveWriteTarget(dirname(path)), basename(path)), undefined, hooks);
|
|
409
462
|
}
|
|
410
463
|
|
|
411
464
|
/**
|
|
@@ -22,7 +22,7 @@ import { isMissingPathError } from "./atomic-write";
|
|
|
22
22
|
import { getConfigDir, getConfigPath } from "./paths";
|
|
23
23
|
import { getDefaultConfig } from "./proxy-env";
|
|
24
24
|
import { salvageConfigCandidate } from "./salvage";
|
|
25
|
-
import {
|
|
25
|
+
import { projectRemovedOpenCodeFreeSnapshot } from "./removed-opencode-free-backup";
|
|
26
26
|
import { sanitizeOpenCodeOverridesForLoad } from "./opencode-wire-upgrade";
|
|
27
27
|
import {
|
|
28
28
|
sanitizeReasoningPinsForLoad,
|
|
@@ -200,7 +200,7 @@ export function subagentDefaultSyncEffective(
|
|
|
200
200
|
}
|
|
201
201
|
|
|
202
202
|
export function mergeConfigDefaults(parsed: unknown): unknown {
|
|
203
|
-
if (!parsed || typeof parsed !== "object") return parsed;
|
|
203
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return parsed;
|
|
204
204
|
const defaults = getDefaultConfig();
|
|
205
205
|
const raw = parsed as Record<string, unknown>;
|
|
206
206
|
// Same absence-is-meaningful pin as the repair merge above.
|
|
@@ -781,9 +781,13 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
781
781
|
}
|
|
782
782
|
|
|
783
783
|
export function configDiagnosticsFromRaw(raw: string): ConfigDiagnostics {
|
|
784
|
+
return configDiagnosticsFromText(raw);
|
|
785
|
+
}
|
|
786
|
+
|
|
787
|
+
function configDiagnosticsFromText(raw: string, file?: { path: string; bytes: Uint8Array }): ConfigDiagnostics {
|
|
784
788
|
try {
|
|
785
789
|
const parsed = JSON.parse(raw.replace(/^\uFEFF/, ""));
|
|
786
|
-
|
|
790
|
+
projectRemovedOpenCodeFreeSnapshot(parsed, file);
|
|
787
791
|
sanitizeOpenCodeOverridesForLoad(parsed);
|
|
788
792
|
sanitizeReasoningPinsForLoad(parsed);
|
|
789
793
|
// Same degradation as loadConfig: a hand-edited invalid retryOn429 must not trip the
|
|
@@ -835,10 +839,12 @@ export function configDiagnosticsFromRaw(raw: string): ConfigDiagnostics {
|
|
|
835
839
|
}
|
|
836
840
|
}
|
|
837
841
|
|
|
838
|
-
export function readConfigFileSnapshot(): ConfigFileSnapshot {
|
|
842
|
+
export function readConfigFileSnapshot(options: { passive?: boolean } = {}): ConfigFileSnapshot {
|
|
839
843
|
try {
|
|
840
|
-
const
|
|
841
|
-
|
|
844
|
+
const path = getConfigPath();
|
|
845
|
+
const bytes = readFileSync(path);
|
|
846
|
+
const raw = bytes.toString("utf-8");
|
|
847
|
+
return { diagnostics: configDiagnosticsFromText(raw, options.passive ? undefined : { path, bytes }), raw };
|
|
842
848
|
} catch (error) {
|
|
843
849
|
if (isMissingPathError(error)) {
|
|
844
850
|
return {
|
|
@@ -851,8 +857,9 @@ export function readConfigFileSnapshot(): ConfigFileSnapshot {
|
|
|
851
857
|
}
|
|
852
858
|
}
|
|
853
859
|
|
|
854
|
-
|
|
855
|
-
|
|
860
|
+
/** Passive observations project retired providers without publishing recovery backups. */
|
|
861
|
+
export function readConfigDiagnostics(options: { passive?: boolean } = {}): ConfigDiagnostics {
|
|
862
|
+
return readConfigFileSnapshot(options).diagnostics;
|
|
856
863
|
}
|
|
857
864
|
|
|
858
865
|
/** Read-only init preflight. Occupied unsafe entries are never treated as absence. */
|
|
@@ -890,12 +897,13 @@ export type ConfigAdmissionSnapshot =
|
|
|
890
897
|
| Readonly<{ kind: "unreadable"; diagnostics: ConfigDiagnostics; contentSha256: null }>;
|
|
891
898
|
|
|
892
899
|
export function readConfigAdmissionSnapshot(): ConfigAdmissionSnapshot {
|
|
900
|
+
const path = getConfigPath();
|
|
893
901
|
let bytes: Buffer;
|
|
894
902
|
try {
|
|
895
903
|
// ONE read. Hashing the file and then reading it again to parse would leave
|
|
896
904
|
// a window for the two to disagree, which is the exact hazard this exists
|
|
897
905
|
// to detect — the check would become a second chance to be wrong.
|
|
898
|
-
bytes = readFileSync(
|
|
906
|
+
bytes = readFileSync(path);
|
|
899
907
|
} catch (error) {
|
|
900
908
|
return {
|
|
901
909
|
kind: "unreadable",
|
|
@@ -908,7 +916,7 @@ export function readConfigAdmissionSnapshot(): ConfigAdmissionSnapshot {
|
|
|
908
916
|
return {
|
|
909
917
|
kind: "read",
|
|
910
918
|
// Decoded from the same buffer that was hashed, not re-read from disk.
|
|
911
|
-
diagnostics:
|
|
919
|
+
diagnostics: configDiagnosticsFromText(bytes.toString("utf-8"), { path, bytes }),
|
|
912
920
|
contentSha256: createHash("sha256").update(bytes).digest("hex"),
|
|
913
921
|
};
|
|
914
922
|
}
|