@bitkyc08/opencodex 2.93.0 → 2.95.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
package/src/claude/desktop-3p.ts
CHANGED
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
import { nativeOpenAiContextWindow, type NativeContextLimitsInput } from "../codex/catalog";
|
|
28
28
|
import { localAdmissionToken, localInferenceDestination } from "../lib/local-destinations";
|
|
29
29
|
import { assertDesktop3pModelsValid } from "./desktop-3p-guard";
|
|
30
|
+
import { filterDesktopModelsByVisibility, readDesktopModelVisibility, type DesktopModelVisibility } from "./desktop-model-visibility";
|
|
30
31
|
import { claudeSurfaceSupportsOneMillion, ONE_MILLION } from "./long-context";
|
|
31
32
|
|
|
32
33
|
export interface Desktop3pModelEntry {
|
|
@@ -170,9 +171,11 @@ function collectDesktop3pModels(
|
|
|
170
171
|
routedModels: Array<Desktop3pRoutedModel>,
|
|
171
172
|
profile?: OcxClaudeDesktopProfile,
|
|
172
173
|
nativeContextCap?: NativeContextLimitsInput,
|
|
173
|
-
): { models: Desktop3pModelEntry[]; registry: Map<string, string>; realAnthropicIds: Set<string> } {
|
|
174
|
+
): { models: Desktop3pModelEntry[]; routes: string[]; registry: Map<string, string>; realAnthropicIds: Set<string> } {
|
|
174
175
|
const registry = new Map<string, string>();
|
|
175
176
|
const models: Desktop3pModelEntry[] = [];
|
|
177
|
+
// routes[i] is the route models[i] serves; visibility filters by route, never by alias.
|
|
178
|
+
const routes: string[] = [];
|
|
176
179
|
const candidates: Desktop3pRoutedModel[] = [
|
|
177
180
|
// Native candidates carry their real context window from the same accessor the
|
|
178
181
|
// Desktop DTO uses, so a native 1M/372k model resolves identically in the written
|
|
@@ -224,6 +227,7 @@ function collectDesktop3pModels(
|
|
|
224
227
|
...(model.isFamilyDefault ? { isFamilyDefault: true } : {}),
|
|
225
228
|
...(model.supports1m ? { supports1m: true, prefer1m: true } : {}),
|
|
226
229
|
});
|
|
230
|
+
routes.push(model.route);
|
|
227
231
|
}
|
|
228
232
|
// Previous profile IDs and both hash generations are compatibility-only and can
|
|
229
233
|
// collide. Bind them in stable route order so changing a family default or
|
|
@@ -248,7 +252,7 @@ function collectDesktop3pModels(
|
|
|
248
252
|
}
|
|
249
253
|
}
|
|
250
254
|
desktop3pAliasesByRoute = aliasesByRoute;
|
|
251
|
-
return { models, registry, realAnthropicIds };
|
|
255
|
+
return { models, routes, registry, realAnthropicIds };
|
|
252
256
|
}
|
|
253
257
|
|
|
254
258
|
const aliasesByRoute = new Map<string, string>();
|
|
@@ -272,6 +276,7 @@ function collectDesktop3pModels(
|
|
|
272
276
|
...(supports1m.supports1m ? { prefer1m: true as const } : {}),
|
|
273
277
|
});
|
|
274
278
|
emittedNames.add(alias);
|
|
279
|
+
routes.push(route);
|
|
275
280
|
aliasesByRoute.set(route, alias);
|
|
276
281
|
continue;
|
|
277
282
|
}
|
|
@@ -300,12 +305,13 @@ function collectDesktop3pModels(
|
|
|
300
305
|
...supports1m,
|
|
301
306
|
...(supports1m.supports1m ? { prefer1m: true as const } : {}),
|
|
302
307
|
});
|
|
308
|
+
routes.push(route);
|
|
303
309
|
aliasesByRoute.set(route, alias);
|
|
304
310
|
}
|
|
305
311
|
|
|
306
312
|
if (models[0]) models[0].isFamilyDefault = true;
|
|
307
313
|
desktop3pAliasesByRoute = aliasesByRoute;
|
|
308
|
-
return { models, registry, realAnthropicIds };
|
|
314
|
+
return { models, routes, registry, realAnthropicIds };
|
|
309
315
|
}
|
|
310
316
|
|
|
311
317
|
/** Build and install the registry used to decode Desktop aliases. */
|
|
@@ -328,6 +334,11 @@ export interface Desktop3pModelOptions {
|
|
|
328
334
|
* (`supports1m`) but no longer defaults to it (`prefer1m` dropped).
|
|
329
335
|
*/
|
|
330
336
|
preferOneMillion?: boolean;
|
|
337
|
+
/**
|
|
338
|
+
* Rows Desktop lists (#7702). Filters only the emitted list: the decode registry keeps every
|
|
339
|
+
* route so a running session holding a just-hidden alias still routes.
|
|
340
|
+
*/
|
|
341
|
+
visibility?: DesktopModelVisibility;
|
|
331
342
|
}
|
|
332
343
|
|
|
333
344
|
export function generateDesktop3pModels(
|
|
@@ -337,15 +348,25 @@ export function generateDesktop3pModels(
|
|
|
337
348
|
nativeContextCap?: NativeContextLimitsInput,
|
|
338
349
|
options: Desktop3pModelOptions = {},
|
|
339
350
|
): Desktop3pModelEntry[] {
|
|
340
|
-
const { models, registry, realAnthropicIds } = collectDesktop3pModels(nativeSlugs, routedModels, profile, nativeContextCap);
|
|
351
|
+
const { models: all, routes, registry, realAnthropicIds } = collectDesktop3pModels(nativeSlugs, routedModels, profile, nativeContextCap);
|
|
341
352
|
desktop3pRegistry = registry;
|
|
342
353
|
desktop3pRealAnthropicIds = realAnthropicIds;
|
|
354
|
+
let models = filterDesktopModelsByVisibility(all, routes, options.visibility);
|
|
355
|
+
if (models.length === 0 && all.length > 0) {
|
|
356
|
+
// An empty static list leaves Desktop with no usable picker. The dashboard refuses to save
|
|
357
|
+
// such a selection; this covers selections whose every model has since disappeared.
|
|
358
|
+
console.warn("[opencodex] Claude Desktop model visibility hides every available model; listing all models instead");
|
|
359
|
+
models = all;
|
|
360
|
+
}
|
|
343
361
|
return options.preferOneMillion === false ? models.map(({ prefer1m: _prefer1m, ...model }) => model) : models;
|
|
344
362
|
}
|
|
345
363
|
|
|
346
364
|
/** The Desktop model options a config asks for (one place, so writer and export agree). */
|
|
347
|
-
export function desktop3pModelOptions(
|
|
348
|
-
|
|
365
|
+
export function desktop3pModelOptions(
|
|
366
|
+
claudeCode: { contextAccounting?: string; desktopModelVisibility?: unknown } | undefined,
|
|
367
|
+
): Desktop3pModelOptions {
|
|
368
|
+
const visibility = readDesktopModelVisibility(claudeCode);
|
|
369
|
+
return { preferOneMillion: claudeCode?.contextAccounting !== "200k", ...(visibility ? { visibility } : {}) };
|
|
349
370
|
}
|
|
350
371
|
|
|
351
372
|
/** Resolve an alias using the most recently generated Desktop model registry. */
|
|
@@ -242,6 +242,19 @@ export async function withFirstPartySecretsSettled<T>(configDir: string, prepare
|
|
|
242
242
|
}
|
|
243
243
|
}
|
|
244
244
|
|
|
245
|
+
/**
|
|
246
|
+
* Run a captured first-party rollback once overlapping ACL work settles. A settle timeout
|
|
247
|
+
* leaves the rollback unrun and reports it as incomplete, so callers keep their existing
|
|
248
|
+
* "rollback did not complete" response instead of escaping into a generic error path.
|
|
249
|
+
*/
|
|
250
|
+
export async function rollbackDesktopFirstPartySettled(configDir: string, rollback: () => boolean): Promise<boolean> {
|
|
251
|
+
try { return await withConfigDirHardeningSettled(configDir, rollback); }
|
|
252
|
+
catch (error) {
|
|
253
|
+
if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
|
|
254
|
+
return false;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
|
|
245
258
|
/**
|
|
246
259
|
* Write the first-party env into Claude Code's settings. Creates the local CA first so the
|
|
247
260
|
* path we point `NODE_EXTRA_CA_CERTS` at exists before Claude Code ever reads it.
|
|
@@ -284,7 +297,8 @@ export function removeDesktopFirstParty(
|
|
|
284
297
|
* Remove Desktop's first-party env once ACL work overlapping the Claude settings home settles.
|
|
285
298
|
* A `CLAUDE_CONFIG_DIR` nested in the opencodex home shares the config-root hardening flight, so
|
|
286
299
|
* the credential-bearing settings rewrite gets the same admission as other intercept secrets.
|
|
287
|
-
* The config is read inside the same synchronous turn.
|
|
300
|
+
* The config is read inside the same synchronous turn. Admission, authority-read and removal
|
|
301
|
+
* exceptions return the existing unreadable refusal so a committed gateway remains explicit.
|
|
288
302
|
*/
|
|
289
303
|
export async function removeDesktopFirstPartySettled(
|
|
290
304
|
readConfig: () => Pick<OcxConfig, "claudeCode" | "runtimeRole">,
|
|
@@ -293,8 +307,5 @@ export async function removeDesktopFirstPartySettled(
|
|
|
293
307
|
): Promise<ReturnType<typeof removeDesktopFirstParty>> {
|
|
294
308
|
const dir = options.claudeConfigDir ?? claudeConfigDir();
|
|
295
309
|
try { return await withConfigDirHardeningSettled(dir, () => remove(readConfig(), options)); }
|
|
296
|
-
catch (
|
|
297
|
-
if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
|
|
298
|
-
return { ok: false, reason: "unreadable", path: join(dir, "settings.json") };
|
|
299
|
-
}
|
|
310
|
+
catch { return { ok: false, reason: "unreadable", path: join(dir, "settings.json") }; }
|
|
300
311
|
}
|
|
@@ -29,10 +29,14 @@ export function persistCommittedDesktopGateway(
|
|
|
29
29
|
const appliedAt = new Date().toISOString();
|
|
30
30
|
try {
|
|
31
31
|
const outcome = mutatePersistedConfig(current => {
|
|
32
|
+
if (JSON.stringify(current.claudeCode?.desktopProfile) !== JSON.stringify(profile)) {
|
|
33
|
+
return { changed: false, value: null };
|
|
34
|
+
}
|
|
32
35
|
recordCommittedDesktopGateway(current, profile, fingerprint, appliedAt);
|
|
33
36
|
return { changed: true, value: structuredClone(current.claudeCode) };
|
|
34
37
|
});
|
|
35
38
|
if (outcome.status === "unavailable") return { ok: false, reason: outcome.reason };
|
|
39
|
+
if (outcome.value === null) return { ok: false, reason: "conflict" };
|
|
36
40
|
adoptPersistedClaudeCode(snapshot, outcome.value);
|
|
37
41
|
// The mode/profile pair IS the committed transaction, not mergeable state.
|
|
38
42
|
// Without an armed baseline the three-way adopt cannot prove the live leaves
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Claude Desktop model visibility (#7702): which rows the Desktop 3P `inferenceModels`
|
|
3
|
+
* list carries, persisted as `claudeCode.desktopModelVisibility`.
|
|
4
|
+
*
|
|
5
|
+
* Deliberately separate from the Desktop profile (tier/family mapping and defaults) and
|
|
6
|
+
* from provider-wide `disabledModels`: hiding a row here changes only what Claude Desktop
|
|
7
|
+
* lists. The alias decode registry keeps every route, so a running Desktop session that
|
|
8
|
+
* still sends a just-hidden alias keeps routing instead of failing mid-conversation.
|
|
9
|
+
*
|
|
10
|
+
* - unset: every available model is listed (the pre-#7702 behaviour).
|
|
11
|
+
* - `exclude`: every model except `routes`; newly discovered models are listed.
|
|
12
|
+
* - `include`: only `routes`; newly discovered models stay hidden until selected.
|
|
13
|
+
*
|
|
14
|
+
* Discovery-only mode emits no static list, so visibility does not apply there.
|
|
15
|
+
*/
|
|
16
|
+
import type { OcxClaudeDesktopModelVisibility } from "../types";
|
|
17
|
+
import { readDesktopLibraryText } from "./desktop-3p-library";
|
|
18
|
+
|
|
19
|
+
export type DesktopModelVisibility = OcxClaudeDesktopModelVisibility;
|
|
20
|
+
|
|
21
|
+
export const DESKTOP_VISIBILITY_MODES = ["include", "exclude"] as const;
|
|
22
|
+
/** Bounded so a hand-edited config cannot grow the per-write set without limit. */
|
|
23
|
+
export const MAX_DESKTOP_VISIBILITY_ROUTES = 5000;
|
|
24
|
+
|
|
25
|
+
export class DesktopModelVisibilityError extends Error {
|
|
26
|
+
constructor(message: string, readonly path = "desktopModelVisibility") {
|
|
27
|
+
super(`${path}: ${message}`);
|
|
28
|
+
this.name = "DesktopModelVisibilityError";
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
33
|
+
return !!value && typeof value === "object" && !Array.isArray(value);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export function parseDesktopModelVisibility(value: unknown): DesktopModelVisibility {
|
|
37
|
+
if (!isPlainObject(value)) throw new DesktopModelVisibilityError("must be an object");
|
|
38
|
+
for (const key of Object.keys(value)) {
|
|
39
|
+
if (key !== "mode" && key !== "routes") throw new DesktopModelVisibilityError(`unknown field "${key}"`);
|
|
40
|
+
}
|
|
41
|
+
if (value.mode !== "include" && value.mode !== "exclude") {
|
|
42
|
+
throw new DesktopModelVisibilityError("must be \"include\" or \"exclude\"", "desktopModelVisibility.mode");
|
|
43
|
+
}
|
|
44
|
+
if (!Array.isArray(value.routes)) throw new DesktopModelVisibilityError("must be an array", "desktopModelVisibility.routes");
|
|
45
|
+
if (value.routes.length > MAX_DESKTOP_VISIBILITY_ROUTES) {
|
|
46
|
+
throw new DesktopModelVisibilityError(`must list at most ${MAX_DESKTOP_VISIBILITY_ROUTES} routes`, "desktopModelVisibility.routes");
|
|
47
|
+
}
|
|
48
|
+
const routes = new Set<string>();
|
|
49
|
+
for (const route of value.routes) {
|
|
50
|
+
if (typeof route !== "string" || !route.includes("/") || /\s/.test(route) || route.startsWith("/") || route.endsWith("/")) {
|
|
51
|
+
throw new DesktopModelVisibilityError("routes must be provider/model strings", "desktopModelVisibility.routes");
|
|
52
|
+
}
|
|
53
|
+
routes.add(route);
|
|
54
|
+
}
|
|
55
|
+
return { mode: value.mode, routes: [...routes].sort() };
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** Whether Desktop lists this route under the given visibility (unset lists everything). */
|
|
59
|
+
export function desktopRouteVisible(visibility: DesktopModelVisibility | undefined, route: string): boolean {
|
|
60
|
+
if (!visibility) return true;
|
|
61
|
+
const listed = visibility.routes.includes(route);
|
|
62
|
+
return visibility.mode === "include" ? listed : !listed;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/** Same desired list, compared order-insensitively (routes are stored sorted). */
|
|
66
|
+
export function sameDesktopModelVisibility(
|
|
67
|
+
left: DesktopModelVisibility | undefined,
|
|
68
|
+
right: DesktopModelVisibility | undefined,
|
|
69
|
+
): boolean {
|
|
70
|
+
if (!left || !right) return !left && !right;
|
|
71
|
+
return left.mode === right.mode && left.routes.join("\n") === right.routes.join("\n");
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
interface FamilyRow {
|
|
75
|
+
anthropicFamilyTier: string;
|
|
76
|
+
isFamilyDefault?: boolean;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Drop hidden rows from a generated Desktop list (`routes[i]` is the route of `models[i]`).
|
|
81
|
+
*
|
|
82
|
+
* A hidden family default hands its role to the first remaining member of that family, and
|
|
83
|
+
* the defaults are moved to the front so the written list keeps the shape
|
|
84
|
+
* `renderDesktopProfile` produces: defaults first, in family order, then everything else.
|
|
85
|
+
*/
|
|
86
|
+
export function filterDesktopModelsByVisibility<T extends FamilyRow>(
|
|
87
|
+
models: readonly T[],
|
|
88
|
+
routes: readonly string[],
|
|
89
|
+
visibility: DesktopModelVisibility | undefined,
|
|
90
|
+
): T[] {
|
|
91
|
+
if (!visibility) return [...models];
|
|
92
|
+
const kept = models.filter((_, index) => desktopRouteVisible(visibility, routes[index] ?? ""));
|
|
93
|
+
if (kept.length === models.length) return kept;
|
|
94
|
+
const families: string[] = [];
|
|
95
|
+
for (const model of models) if (!families.includes(model.anthropicFamilyTier)) families.push(model.anthropicFamilyTier);
|
|
96
|
+
const defaults: T[] = [];
|
|
97
|
+
for (const family of families) {
|
|
98
|
+
const members = kept.filter(model => model.anthropicFamilyTier === family);
|
|
99
|
+
const chosen = members.find(model => model.isFamilyDefault) ?? members[0];
|
|
100
|
+
if (chosen) defaults.push(chosen);
|
|
101
|
+
}
|
|
102
|
+
const defaultSet = new Set(defaults);
|
|
103
|
+
return [
|
|
104
|
+
...defaults.map(model => ({ ...model, isFamilyDefault: true })),
|
|
105
|
+
...kept.filter(model => !defaultSet.has(model)).map(({ isFamilyDefault: _drop, ...model }) => model as T),
|
|
106
|
+
];
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** The persisted selection, or undefined when unset or unreadable (unreadable lists everything). */
|
|
110
|
+
export function readDesktopModelVisibility(claudeCode: { desktopModelVisibility?: unknown } | undefined): DesktopModelVisibility | undefined {
|
|
111
|
+
if (claudeCode?.desktopModelVisibility === undefined) return undefined;
|
|
112
|
+
try {
|
|
113
|
+
return parseDesktopModelVisibility(claudeCode.desktopModelVisibility);
|
|
114
|
+
} catch {
|
|
115
|
+
return undefined;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
export interface AppliedDesktopModel {
|
|
120
|
+
name: string;
|
|
121
|
+
label: string;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/**
|
|
125
|
+
* The `inferenceModels` rows of the profile Desktop has selected, for the dashboard's
|
|
126
|
+
* applied count and added/removed preview. `null` when there is no static list to read
|
|
127
|
+
* (no profile, discovery-only, or unreadable): unknown, not empty. Names and labels only.
|
|
128
|
+
*/
|
|
129
|
+
export function readAppliedDesktopModels(selectedProfilePath: string | null): AppliedDesktopModel[] | null {
|
|
130
|
+
if (!selectedProfilePath) return null;
|
|
131
|
+
try {
|
|
132
|
+
const parsed = JSON.parse(readDesktopLibraryText(selectedProfilePath)) as { inferenceModels?: unknown };
|
|
133
|
+
if (!Array.isArray(parsed.inferenceModels)) return null;
|
|
134
|
+
return parsed.inferenceModels.flatMap(row => {
|
|
135
|
+
if (!isPlainObject(row) || typeof row.name !== "string") return [];
|
|
136
|
+
return [{ name: row.name, label: typeof row.labelOverride === "string" ? row.labelOverride : row.name }];
|
|
137
|
+
});
|
|
138
|
+
} catch {
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { chmodSync, lstatSync, mkdirSync, realpathSync, unlinkSync } from "node:fs";
|
|
1
|
+
import { chmodSync, lstatSync, mkdirSync, realpathSync, unlinkSync, type BigIntStats } from "node:fs";
|
|
2
2
|
import { basename, dirname, join, resolve } from "node:path";
|
|
3
3
|
import { atomicWriteFile, getConfigDir } from "../config";
|
|
4
4
|
import { hardenSecretDir } from "../lib/windows-secret-acl";
|
|
@@ -8,7 +8,7 @@ import { DesktopStoreError, digest } from "./desktop-remote-store-state";
|
|
|
8
8
|
export const MAX_DESKTOP_METADATA_ENTRIES = 256;
|
|
9
9
|
|
|
10
10
|
export interface JsonFile { value: Record<string, unknown>; hash: string; identity: string }
|
|
11
|
-
const identity = (s:
|
|
11
|
+
const identity = (s: BigIntStats): string => `${s.dev}:${s.ino}:${s.size}:${s.mtimeNs}`;
|
|
12
12
|
function missing(error: unknown): boolean { return (error as NodeJS.ErrnoException)?.code === "ENOENT"; }
|
|
13
13
|
export function canonicalDirectory(path: string): string {
|
|
14
14
|
const absolute = resolve(path);
|
|
@@ -33,20 +33,20 @@ export class StoreIO {
|
|
|
33
33
|
private bytes = 0;
|
|
34
34
|
private readonly seenSizes = new Map<string, number>();
|
|
35
35
|
read(path: string, maxBytes = 1024 * 1024, privateFile = false): JsonFile | null {
|
|
36
|
-
let stat:
|
|
37
|
-
try { stat = lstatSync(path); }
|
|
36
|
+
let stat: BigIntStats;
|
|
37
|
+
try { stat = lstatSync(path, { bigint: true }); }
|
|
38
38
|
catch (error) { if (missing(error)) return null; throw new DesktopStoreError("unsafe"); }
|
|
39
39
|
if (!stat.isFile() || stat.isSymbolicLink() || stat.size > maxBytes
|
|
40
|
-
|| (privateFile && process.platform !== "win32" && (stat.mode &
|
|
40
|
+
|| (privateFile && process.platform !== "win32" && (stat.mode & 0o077n) !== 0n)) throw new DesktopStoreError("unsafe");
|
|
41
41
|
const counted = this.seenSizes.get(path) ?? 0;
|
|
42
|
-
this.bytes += Math.max(0, stat.size - counted);
|
|
43
|
-
this.seenSizes.set(path, Math.max(counted, stat.size));
|
|
42
|
+
this.bytes += Math.max(0, Number(stat.size) - counted);
|
|
43
|
+
this.seenSizes.set(path, Math.max(counted, Number(stat.size)));
|
|
44
44
|
if (this.bytes > 8 * 1024 * 1024) throw new DesktopStoreError("unsafe");
|
|
45
45
|
try {
|
|
46
46
|
// The shared verified regular-file read keeps a swapped FIFO from parking this
|
|
47
47
|
// open before the post-read identity recheck below can run.
|
|
48
48
|
const bytes = readDesktopLibraryBytes(path, Math.min(maxBytes, MAX_DESKTOP_PROFILE_FILE_BYTES));
|
|
49
|
-
if (bytes.byteLength > maxBytes || identity(lstatSync(path)) !== identity(stat)) throw new DesktopStoreError("conflict");
|
|
49
|
+
if (bytes.byteLength > maxBytes || identity(lstatSync(path, { bigint: true })) !== identity(stat)) throw new DesktopStoreError("conflict");
|
|
50
50
|
const value: unknown = JSON.parse(bytes.toString("utf8"));
|
|
51
51
|
if (!isRecord(value)) throw new DesktopStoreError("unsafe");
|
|
52
52
|
return { value, hash: digest(bytes.toString("utf8")), identity: identity(stat) };
|
|
@@ -42,12 +42,18 @@ export function systemToInstructions(system: unknown): string | undefined {
|
|
|
42
42
|
|
|
43
43
|
export function toolsToResponses(tools: unknown): Rec[] | undefined {
|
|
44
44
|
if (!Array.isArray(tools) || tools.length === 0) return undefined;
|
|
45
|
+
// The shared hosted-search lane cannot enforce these constraints on every destination or
|
|
46
|
+
// sidecar backend. Omit search rather than broaden it; a duplicate declaration cannot opt out.
|
|
47
|
+
// Typed originals still travel separately to an Anthropic destination.
|
|
48
|
+
const restrictedSearch = tools.some(raw => isRec(raw) && typeof raw.type === "string"
|
|
49
|
+
&& raw.type.startsWith("web_search")
|
|
50
|
+
&& ["allowed_domains", "blocked_domains", "user_location"].some(key => Object.hasOwn(raw, key)));
|
|
45
51
|
const out: Rec[] = [];
|
|
46
52
|
for (const raw of tools) {
|
|
47
53
|
if (!isRec(raw)) continue;
|
|
48
54
|
const type = typeof raw.type === "string" ? raw.type : "";
|
|
49
55
|
if (type.startsWith("web_search")) {
|
|
50
|
-
out.push({ type: "web_search" }); // hosted sidecar path
|
|
56
|
+
if (!restrictedSearch) out.push({ type: "web_search" }); // hosted sidecar path
|
|
51
57
|
continue;
|
|
52
58
|
}
|
|
53
59
|
if (typeof raw.name === "string" && raw.name.length > 0 && isRec(raw.input_schema)) {
|
|
@@ -167,6 +173,10 @@ export function toolChoiceToResponses(choice: unknown, body: Rec): void {
|
|
|
167
173
|
// Anthropic represents hosted WebSearch as a named tool choice, while
|
|
168
174
|
// Responses requires the choice type to match the hosted declaration.
|
|
169
175
|
// Preserve forced-tool intent rather than weakening it to `auto`.
|
|
176
|
+
if (isClaudeWebSearchToolName(choice.name)
|
|
177
|
+
&& (!Array.isArray(body.tools) || !body.tools.some(tool => isRec(tool) && tool.type === "web_search"))) {
|
|
178
|
+
throw new AnthropicRequestError("Restricted web search cannot be forced on a translated route without an available search declaration");
|
|
179
|
+
}
|
|
170
180
|
body.tool_choice = isClaudeWebSearchToolName(choice.name)
|
|
171
181
|
? { type: "web_search" }
|
|
172
182
|
: { type: "function", name: choice.name };
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { isRec, type Rec } from "./inbound-records";
|
|
2
|
+
|
|
3
|
+
/** Provider-qualified routes, optionally ending in one prefix wildcard; never a global wildcard. */
|
|
4
|
+
export function isAppendOnlyToolLoadingModels(value: unknown): value is string[] {
|
|
5
|
+
return Array.isArray(value) && value.length <= 128 && value.every(entry =>
|
|
6
|
+
typeof entry === "string" && entry.length <= 512 && /^[^\s/*]+\/[^\s*]+\*?$/.test(entry));
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export function appendOnlyToolLoadingMatches(value: unknown, model: string): boolean {
|
|
10
|
+
return isAppendOnlyToolLoadingModels(value) && value.some(pattern =>
|
|
11
|
+
pattern.endsWith("*") ? model.startsWith(pattern.slice(0, -1)) : model === pattern);
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** Replay client discovery in place, using only definitions still declared by this request. */
|
|
15
|
+
export function appendLoadedToolDefinitions(body: Rec, raw: Rec): Rec {
|
|
16
|
+
if (!Array.isArray(body.tools) || !Array.isArray(body.input) || !Array.isArray(raw.tools)
|
|
17
|
+
|| !Array.isArray(raw.messages)) return body;
|
|
18
|
+
|
|
19
|
+
const declared = new Map<string, Rec>();
|
|
20
|
+
const deferred = new Set<string>();
|
|
21
|
+
for (const tool of body.tools) {
|
|
22
|
+
if (!isRec(tool) || tool.type !== "function" || typeof tool.name !== "string") continue;
|
|
23
|
+
if (declared.has(tool.name)) return body;
|
|
24
|
+
declared.set(tool.name, tool);
|
|
25
|
+
}
|
|
26
|
+
for (const tool of raw.tools) {
|
|
27
|
+
if (isRec(tool) && tool.defer_loading === true && typeof tool.name === "string") deferred.add(tool.name);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
const calls = new Map<string, string>();
|
|
31
|
+
const used = new Set<string>();
|
|
32
|
+
const loadAt = new Map<string, string>();
|
|
33
|
+
for (const message of raw.messages) {
|
|
34
|
+
if (!isRec(message) || !Array.isArray(message.content)) continue;
|
|
35
|
+
for (const block of message.content) {
|
|
36
|
+
if (!isRec(block)) continue;
|
|
37
|
+
if (message.role === "assistant" && block.type === "tool_use"
|
|
38
|
+
&& typeof block.id === "string" && typeof block.name === "string") {
|
|
39
|
+
if (calls.has(block.id)) return body;
|
|
40
|
+
calls.set(block.id, block.name);
|
|
41
|
+
used.add(block.name);
|
|
42
|
+
}
|
|
43
|
+
if (message.role !== "user" || block.type !== "tool_result" || block.is_error === true
|
|
44
|
+
|| typeof block.tool_use_id !== "string" || calls.get(block.tool_use_id) !== "ToolSearch"
|
|
45
|
+
|| !Array.isArray(block.content)) continue;
|
|
46
|
+
for (const reference of block.content) {
|
|
47
|
+
if (!isRec(reference) || reference.type !== "tool_reference" || typeof reference.tool_name !== "string") continue;
|
|
48
|
+
const name = reference.tool_name;
|
|
49
|
+
if (declared.has(name) && deferred.has(name) && !used.has(name) && !loadAt.has(name)) {
|
|
50
|
+
loadAt.set(name, block.tool_use_id);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
// Discovery must remain callable; this optimization does not create a search capability.
|
|
56
|
+
if (!declared.has("ToolSearch") || deferred.has("ToolSearch")) return body;
|
|
57
|
+
|
|
58
|
+
// An ambiguous translated result cannot carry a definition safely.
|
|
59
|
+
const outputCounts = new Map<string, number>();
|
|
60
|
+
for (const item of body.input) {
|
|
61
|
+
if (isRec(item) && item.type === "function_call_output" && typeof item.call_id === "string") {
|
|
62
|
+
outputCounts.set(item.call_id, (outputCounts.get(item.call_id) ?? 0) + 1);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
for (const id of loadAt.values()) if (outputCounts.get(id) !== 1) return body;
|
|
66
|
+
|
|
67
|
+
const hidden = new Set([...deferred].filter(name => declared.has(name) && (!used.has(name) || loadAt.has(name))));
|
|
68
|
+
// Explicit forced-tool intent takes precedence over waiting for discovery.
|
|
69
|
+
const choice = raw.tool_choice;
|
|
70
|
+
if (isRec(choice) && choice.type === "tool" && typeof choice.name === "string" && !loadAt.has(choice.name)) {
|
|
71
|
+
hidden.delete(choice.name);
|
|
72
|
+
}
|
|
73
|
+
if (hidden.size === 0) return body;
|
|
74
|
+
|
|
75
|
+
const additions = new Map<string, Rec[]>();
|
|
76
|
+
for (const [name, id] of loadAt) {
|
|
77
|
+
const tools = additions.get(id) ?? [];
|
|
78
|
+
tools.push(declared.get(name)!);
|
|
79
|
+
additions.set(id, tools);
|
|
80
|
+
}
|
|
81
|
+
const input: unknown[] = [];
|
|
82
|
+
for (const item of body.input) {
|
|
83
|
+
input.push(item);
|
|
84
|
+
if (!isRec(item) || item.type !== "function_call_output" || typeof item.call_id !== "string") continue;
|
|
85
|
+
const tools = additions.get(item.call_id);
|
|
86
|
+
if (tools) input.push({ type: "additional_tools", role: "developer", tools });
|
|
87
|
+
}
|
|
88
|
+
return {
|
|
89
|
+
...body,
|
|
90
|
+
tools: body.tools.filter(tool => !isRec(tool) || typeof tool.name !== "string" || !hidden.has(tool.name)),
|
|
91
|
+
input,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
@@ -34,6 +34,8 @@ export interface PickerListenerOptions {
|
|
|
34
34
|
maxEncodedBytes?: number;
|
|
35
35
|
/** Test seam: concurrent upstream requests; production uses PICKER_MAX_ACTIVE_UPSTREAMS. */
|
|
36
36
|
maxActiveUpstreams?: number;
|
|
37
|
+
/** Test seam: no-progress time before an upstream response; never an upload lifetime cap. */
|
|
38
|
+
uploadIdleMs?: number;
|
|
37
39
|
/**
|
|
38
40
|
* Test seam: arms the drop of a connection whose backend ended, after PICKER_ABANDONED_INPUT_LINGER_MS;
|
|
39
41
|
* returns a cancel function. Production uses a timer.
|
|
@@ -54,6 +56,8 @@ export const PICKER_MAX_HEADER_BYTES = 64 * 1024;
|
|
|
54
56
|
export const PICKER_MAX_ACTIVE_UPSTREAMS = 256;
|
|
55
57
|
/** Advertised per HTTP/2 connection; Chromium queues further requests rather than failing them. */
|
|
56
58
|
export const PICKER_MAX_CONCURRENT_STREAMS = 100;
|
|
59
|
+
/** Pre-response body inactivity budget; native runtime limits remain independent. */
|
|
60
|
+
export const PICKER_UPLOAD_IDLE_MS = 60_000;
|
|
57
61
|
/** A connection that has not sent a complete ClientHello by then is dropped. */
|
|
58
62
|
const CLIENT_HELLO_TIMEOUT_MS = 10_000;
|
|
59
63
|
/**
|
|
@@ -217,7 +221,11 @@ export async function startPickerListener(options: PickerListenerOptions): Promi
|
|
|
217
221
|
// Discard further input and flush a graceful FIN without waiting for body completion.
|
|
218
222
|
req.resume();
|
|
219
223
|
req.socket.end();
|
|
220
|
-
} else
|
|
224
|
+
} else {
|
|
225
|
+
// Bun can synthesize an empty 200 when only its request readable is destroyed.
|
|
226
|
+
// An unfinished upload without a reply must abort the transport instead.
|
|
227
|
+
req.socket.destroy();
|
|
228
|
+
}
|
|
221
229
|
}
|
|
222
230
|
};
|
|
223
231
|
// An HTTP/1.1 reply sent while the upload is unfinished advertises Connection: close. Bun 1.4.3
|
|
@@ -358,9 +366,27 @@ export async function startPickerListener(options: PickerListenerOptions): Promi
|
|
|
358
366
|
if (h2) (req as Http2ServerRequest).stream.once("close", onClientClose);
|
|
359
367
|
if (uploading) {
|
|
360
368
|
let uploadFinished = false;
|
|
369
|
+
let idleTimer: ReturnType<typeof setTimeout> | undefined;
|
|
370
|
+
const clearIdle = () => { if (idleTimer !== undefined) clearTimeout(idleTimer); idleTimer = undefined; };
|
|
371
|
+
const armIdle = () => {
|
|
372
|
+
clearIdle();
|
|
373
|
+
if (uploadFinished || upstreamResponded || req.isPaused()) return;
|
|
374
|
+
idleTimer = setTimeout(() => {
|
|
375
|
+
clientGone = true;
|
|
376
|
+
options.log?.("picker upload idle timeout");
|
|
377
|
+
stopUnfinishedUpload();
|
|
378
|
+
}, options.uploadIdleMs ?? PICKER_UPLOAD_IDLE_MS);
|
|
379
|
+
idleTimer.unref?.();
|
|
380
|
+
};
|
|
381
|
+
const noteProgress = (chunk: Buffer) => { if (chunk.length > 0) armIdle(); };
|
|
361
382
|
const finishUpload = () => {
|
|
362
383
|
if (uploadFinished) return;
|
|
363
384
|
uploadFinished = true;
|
|
385
|
+
clearIdle();
|
|
386
|
+
req.off("data", noteProgress);
|
|
387
|
+
req.off("pause", clearIdle);
|
|
388
|
+
req.off("resume", armIdle);
|
|
389
|
+
upReq.off("response", clearIdle);
|
|
364
390
|
req.off("end", finishUpload);
|
|
365
391
|
req.off("close", finishUpload);
|
|
366
392
|
upReq.off("close", onUpstreamClose);
|
|
@@ -382,12 +408,18 @@ export async function startPickerListener(options: PickerListenerOptions): Promi
|
|
|
382
408
|
const onUpstreamClose = () => {
|
|
383
409
|
if (!upstreamResponded && !res.writableEnded) stopUnfinishedUpload();
|
|
384
410
|
};
|
|
411
|
+
// Piping pauses the readable under upstream backpressure; that is not client idleness.
|
|
412
|
+
req.on("data", noteProgress);
|
|
413
|
+
req.on("pause", clearIdle);
|
|
414
|
+
req.on("resume", armIdle);
|
|
415
|
+
upReq.once("response", clearIdle);
|
|
385
416
|
req.once("end", finishUpload);
|
|
386
417
|
req.once("close", finishUpload);
|
|
387
418
|
upReq.once("close", onUpstreamClose);
|
|
388
419
|
responseWritable.once("finish", onResponseFinish);
|
|
389
420
|
res.once("close", stopUnfinishedUpload);
|
|
390
421
|
if (h2) (req as Http2ServerRequest).stream.once("close", finishUpload);
|
|
422
|
+
armIdle();
|
|
391
423
|
}
|
|
392
424
|
req.pipe(upReq);
|
|
393
425
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
2
|
import {
|
|
3
3
|
closeSync, constants, fchmodSync, fstatSync, linkSync, lstatSync, mkdirSync,
|
|
4
|
-
openSync, readSync, unlinkSync, writeFileSync, type
|
|
4
|
+
openSync, readSync, unlinkSync, writeFileSync, type BigIntStats,
|
|
5
5
|
} from "node:fs";
|
|
6
6
|
import { join } from "node:path";
|
|
7
7
|
import { forgetEphemeralSecretPath, hardenSecretDir, hardenSecretPath } from "../../lib/windows-secret-acl";
|
|
@@ -20,15 +20,15 @@ function invalidCredential(): Error {
|
|
|
20
20
|
return new Error("Claude intercept credential is not a safe, valid owner-controlled file");
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
function assertOwnedNode(stat:
|
|
23
|
+
function assertOwnedNode(stat: BigIntStats, directory = false): void {
|
|
24
24
|
if (stat.isSymbolicLink() || !(directory ? stat.isDirectory() : stat.isFile())) throw invalidCredential();
|
|
25
|
-
if (process.platform !== "win32" && typeof process.geteuid === "function" && stat.uid !== process.geteuid()) {
|
|
25
|
+
if (process.platform !== "win32" && typeof process.geteuid === "function" && stat.uid !== BigInt(process.geteuid())) {
|
|
26
26
|
throw invalidCredential();
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
function assertSameNode(path: string, expected:
|
|
31
|
-
const current = lstatSync(path);
|
|
30
|
+
function assertSameNode(path: string, expected: BigIntStats, directory = false): void {
|
|
31
|
+
const current = lstatSync(path, { bigint: true });
|
|
32
32
|
assertOwnedNode(current, directory);
|
|
33
33
|
if (current.dev !== expected.dev || current.ino !== expected.ino) throw invalidCredential();
|
|
34
34
|
}
|
|
@@ -36,17 +36,17 @@ function assertSameNode(path: string, expected: Stats, directory = false): void
|
|
|
36
36
|
/** Read only through the validated descriptor, with a fixed maximum allocation and no links. */
|
|
37
37
|
function readPinnedToken(configDir: string, harden: boolean): string {
|
|
38
38
|
const dir = join(configDir, "claude-intercept");
|
|
39
|
-
const directory = lstatSync(dir);
|
|
39
|
+
const directory = lstatSync(dir, { bigint: true });
|
|
40
40
|
assertOwnedNode(directory, true);
|
|
41
|
-
if (process.platform !== "win32" && (directory.mode &
|
|
41
|
+
if (process.platform !== "win32" && (directory.mode & 0o077n) !== 0n) throw invalidCredential();
|
|
42
42
|
const path = claudeInterceptProxyTokenPath(configDir);
|
|
43
|
-
const entry = lstatSync(path);
|
|
43
|
+
const entry = lstatSync(path, { bigint: true });
|
|
44
44
|
assertOwnedNode(entry);
|
|
45
45
|
if (entry.size < TOKEN_LENGTH || entry.size > TOKEN_MAX_BYTES) throw invalidCredential();
|
|
46
46
|
// NONBLOCK prevents a raced-in FIFO from blocking before fstat can reject it.
|
|
47
47
|
const fd = openSync(path, constants.O_RDONLY | NOFOLLOW | NONBLOCK);
|
|
48
48
|
try {
|
|
49
|
-
const opened = fstatSync(fd);
|
|
49
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
50
50
|
assertOwnedNode(opened);
|
|
51
51
|
if (opened.dev !== entry.dev || opened.ino !== entry.ino
|
|
52
52
|
|| opened.size < TOKEN_LENGTH || opened.size > TOKEN_MAX_BYTES) throw invalidCredential();
|
|
@@ -62,8 +62,8 @@ function readPinnedToken(configDir: string, harden: boolean): string {
|
|
|
62
62
|
const ending = contents.slice(TOKEN_LENGTH);
|
|
63
63
|
if (token.length !== TOKEN_LENGTH || !/^[A-Za-z0-9_-]+$/.test(token)
|
|
64
64
|
|| !["", "\n", "\r\n"].includes(ending)) throw invalidCredential();
|
|
65
|
-
const afterRead = fstatSync(fd);
|
|
66
|
-
if (length !== afterRead.size || afterRead.
|
|
65
|
+
const afterRead = fstatSync(fd, { bigint: true });
|
|
66
|
+
if (BigInt(length) !== afterRead.size || afterRead.mtimeNs !== opened.mtimeNs) throw invalidCredential();
|
|
67
67
|
assertSameNode(path, opened);
|
|
68
68
|
assertSameNode(dir, directory, true);
|
|
69
69
|
if (harden) {
|
|
@@ -71,7 +71,7 @@ function readPinnedToken(configDir: string, harden: boolean): string {
|
|
|
71
71
|
else fchmodSync(fd, 0o600); // Never chmod a followed/replaced pathname.
|
|
72
72
|
assertSameNode(path, opened);
|
|
73
73
|
assertSameNode(dir, directory, true);
|
|
74
|
-
} else if (process.platform !== "win32" && (afterRead.mode &
|
|
74
|
+
} else if (process.platform !== "win32" && (afterRead.mode & 0o077n) !== 0n) {
|
|
75
75
|
throw invalidCredential();
|
|
76
76
|
}
|
|
77
77
|
return token;
|
|
@@ -89,7 +89,7 @@ export function readClaudeInterceptProxyToken(configDir: string): string | null
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
function ensurePrivateDirectory(configDir: string):
|
|
92
|
+
function ensurePrivateDirectory(configDir: string): BigIntStats {
|
|
93
93
|
const dir = join(configDir, "claude-intercept");
|
|
94
94
|
mkdirSync(configDir, { recursive: true, mode: 0o700 });
|
|
95
95
|
try {
|
|
@@ -97,14 +97,14 @@ function ensurePrivateDirectory(configDir: string): Stats {
|
|
|
97
97
|
} catch (error) {
|
|
98
98
|
if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
|
|
99
99
|
}
|
|
100
|
-
const entry = lstatSync(dir);
|
|
100
|
+
const entry = lstatSync(dir, { bigint: true });
|
|
101
101
|
assertOwnedNode(entry, true);
|
|
102
102
|
if (process.platform === "win32") {
|
|
103
103
|
hardenSecretDir(dir, { required: true });
|
|
104
104
|
} else {
|
|
105
105
|
const fd = openSync(dir, constants.O_RDONLY | (constants.O_DIRECTORY ?? 0) | NOFOLLOW);
|
|
106
106
|
try {
|
|
107
|
-
const opened = fstatSync(fd);
|
|
107
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
108
108
|
assertOwnedNode(opened, true);
|
|
109
109
|
if (entry.dev !== opened.dev || entry.ino !== opened.ino) throw invalidCredential();
|
|
110
110
|
fchmodSync(fd, 0o700);
|
|
@@ -130,7 +130,7 @@ export function ensureClaudeInterceptProxyToken(configDir: string): string {
|
|
|
130
130
|
const token = randomBytes(32).toString("base64url");
|
|
131
131
|
const temp = join(dir, `.${TOKEN_FILE}.${process.pid}.${randomBytes(8).toString("hex")}.tmp`);
|
|
132
132
|
const fd = openSync(temp, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NOFOLLOW, 0o600);
|
|
133
|
-
const created = fstatSync(fd);
|
|
133
|
+
const created = fstatSync(fd, { bigint: true });
|
|
134
134
|
try {
|
|
135
135
|
writeFileSync(fd, `${token}\n`, { encoding: "utf8" });
|
|
136
136
|
if (process.platform !== "win32") fchmodSync(fd, 0o600);
|