@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
|
@@ -45,7 +45,7 @@ export type RuntimePortState = {
|
|
|
45
45
|
siblingOfPort?: number;
|
|
46
46
|
};
|
|
47
47
|
|
|
48
|
-
function isValidRuntimePortState(value: unknown): value is RuntimePortState {
|
|
48
|
+
export function isValidRuntimePortState(value: unknown): value is RuntimePortState {
|
|
49
49
|
if (!value || typeof value !== "object") return false;
|
|
50
50
|
const state = value as Record<string, unknown>;
|
|
51
51
|
const hostnameOk = state.hostname === undefined || typeof state.hostname === "string";
|
|
@@ -97,17 +97,21 @@ export function readRuntimePort(expectedPid?: number): RuntimePortState | null {
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
-
export function removePid(expectedPid?: number): void {
|
|
100
|
+
export function removePid(expectedPid?: number, beforeMutation?: () => void): void {
|
|
101
101
|
if (expectedPid !== undefined && readPidFileValue() !== expectedPid) return;
|
|
102
|
-
|
|
102
|
+
const path = getPidPath();
|
|
103
|
+
beforeMutation?.();
|
|
104
|
+
try { unlinkSync(path); } catch { /* ignore */ }
|
|
103
105
|
}
|
|
104
106
|
|
|
105
|
-
export function removeRuntimePort(expectedPid?: number): void {
|
|
107
|
+
export function removeRuntimePort(expectedPid?: number, beforeMutation?: () => void): void {
|
|
106
108
|
if (expectedPid !== undefined && readRuntimePort(expectedPid) === null) return;
|
|
107
|
-
|
|
109
|
+
const path = getRuntimePortPath();
|
|
110
|
+
beforeMutation?.();
|
|
111
|
+
try { unlinkSync(path); } catch { /* ignore */ }
|
|
108
112
|
// The record is gone, so the registry pointer names a dead home. Retire it
|
|
109
113
|
// beside the record or stale pointers accumulate toward the reader's cap.
|
|
110
|
-
unregisterOwnerRegistryHome(getConfigDir());
|
|
114
|
+
unregisterOwnerRegistryHome(getConfigDir(), beforeMutation);
|
|
111
115
|
}
|
|
112
116
|
|
|
113
117
|
/**
|
|
@@ -197,14 +201,32 @@ export function ocxStartProcessCacheSizeForTests(): number {
|
|
|
197
201
|
return ocxStartProcessCache.size;
|
|
198
202
|
}
|
|
199
203
|
|
|
200
|
-
|
|
204
|
+
/**
|
|
205
|
+
* One observation of whether a candidate PID is an `ocx start` process.
|
|
206
|
+
*
|
|
207
|
+
* `readPid()` and `verifyPidIdentity()` ask this on every short liveness poll, and the
|
|
208
|
+
* read-only tracked-record inspection in `tracked-runtime-inspection.ts` asks it once per
|
|
209
|
+
* guarded stop, so all of them share this single cache-backed answer rather than probe
|
|
210
|
+
* twice: a hit performs no native command at all, and a miss performs exactly one
|
|
211
|
+
* {@link readProcessCommandLine} probe. Only a definite answer is cached; an unreadable
|
|
212
|
+
* command line is reported as `"unverifiable"`, left uncached, and re-probed on the next
|
|
213
|
+
* ask. `"unverifiable"` is not evidence of a permission boundary, a foreign process, or a
|
|
214
|
+
* different account or elevation — only that the probe could not answer this time.
|
|
215
|
+
*/
|
|
216
|
+
export type OcxStartIdentityObservation = "match" | "mismatch" | "unverifiable";
|
|
217
|
+
|
|
218
|
+
export function inspectOcxStartProcessIdentity(pid: number): OcxStartIdentityObservation {
|
|
201
219
|
const cached = ocxStartProcessCache.get(pid);
|
|
202
|
-
if (cached !== undefined) return cached;
|
|
220
|
+
if (cached !== undefined) return cached ? "match" : "mismatch";
|
|
203
221
|
const commandLine = readProcessCommandLine(pid);
|
|
204
|
-
if (commandLine === undefined) return
|
|
222
|
+
if (commandLine === undefined) return "unverifiable";
|
|
205
223
|
const ok = isOcxStartCommandLine(commandLine);
|
|
206
224
|
ocxStartProcessCache.set(pid, ok);
|
|
207
|
-
return ok;
|
|
225
|
+
return ok ? "match" : "mismatch";
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
function isLikelyOcxStartProcess(pid: number): boolean {
|
|
229
|
+
return inspectOcxStartProcessIdentity(pid) === "match";
|
|
208
230
|
}
|
|
209
231
|
|
|
210
232
|
export function readPid(): number | null {
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync, readdirSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, join } from "node:path";
|
|
3
|
+
import { atomicWriteFileNoFollow } from "./atomic-write";
|
|
4
|
+
import { isPassiveRead } from "../lib/passive-read";
|
|
5
|
+
import { redactUserPath } from "../lib/redact";
|
|
6
|
+
import { sanitizeRemovedOpenCodeFreeForLoad } from "./removed-opencode-free";
|
|
7
|
+
import { verifySecretPathAcl, windowsSecretAclApplies } from "../lib/windows-secret-acl";
|
|
8
|
+
|
|
9
|
+
let warned = false;
|
|
10
|
+
|
|
11
|
+
/** Inspect occupants without following links or modifying their permissions. */
|
|
12
|
+
function holdsOriginal(path: string, original: Uint8Array, retries = 3): boolean {
|
|
13
|
+
let descriptor: number | undefined;
|
|
14
|
+
try {
|
|
15
|
+
const entry = lstatSync(path, { bigint: true });
|
|
16
|
+
if (!entry.isFile() || entry.dev === 0n || entry.ino === 0n) return false;
|
|
17
|
+
descriptor = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
|
|
18
|
+
const opened = fstatSync(descriptor, { bigint: true });
|
|
19
|
+
if (!opened.isFile() || opened.dev !== entry.dev || opened.ino !== entry.ino) return false;
|
|
20
|
+
const bytes = readFileSync(descriptor);
|
|
21
|
+
if (!bytes.equals(Buffer.from(original))) return false;
|
|
22
|
+
if (opened.nlink > 1n) {
|
|
23
|
+
// Exclusive publication briefly links its private temp to the final name.
|
|
24
|
+
// Recheck briefly to reuse a prompt publisher's copy; a delayed publisher
|
|
25
|
+
// may leave multiple exact, protected copies. Never certify a linked file.
|
|
26
|
+
if (retries === 0) return false;
|
|
27
|
+
closeSync(descriptor);
|
|
28
|
+
descriptor = undefined;
|
|
29
|
+
Bun.sleepSync(10);
|
|
30
|
+
return holdsOriginal(path, original, retries - 1);
|
|
31
|
+
}
|
|
32
|
+
const protectedFile = windowsSecretAclApplies()
|
|
33
|
+
? verifySecretPathAcl(path)
|
|
34
|
+
: (opened.mode & 0o7777n) === 0o600n && typeof process.getuid === "function" && opened.uid === BigInt(process.getuid());
|
|
35
|
+
if (!protectedFile) return false;
|
|
36
|
+
const final = fstatSync(descriptor, { bigint: true });
|
|
37
|
+
const after = lstatSync(path, { bigint: true });
|
|
38
|
+
return final.nlink === 1n && final.ctimeNs === opened.ctimeNs
|
|
39
|
+
&& after.isFile() && after.nlink === 1n && after.dev === opened.dev && after.ino === opened.ino
|
|
40
|
+
&& after.ctimeNs === opened.ctimeNs;
|
|
41
|
+
} catch { return false; }
|
|
42
|
+
finally { if (descriptor !== undefined) { try { closeSync(descriptor); } catch { /* optional read only */ } } }
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** Keep each distinct disk original without overwriting an unrelated or older copy. */
|
|
46
|
+
function backupOriginal(configPath: string, rawBytes: Uint8Array): string | null {
|
|
47
|
+
const stem = `${configPath}.pre-opencode-free-removal`;
|
|
48
|
+
// A prior occupied-name read may already have preserved this exact snapshot.
|
|
49
|
+
try {
|
|
50
|
+
for (const name of readdirSync(dirname(configPath))) {
|
|
51
|
+
if (name.startsWith(`${basename(stem)}.`) && name.endsWith(".bak")) {
|
|
52
|
+
const existing = join(dirname(configPath), name);
|
|
53
|
+
if (holdsOriginal(existing, rawBytes)) return existing;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
} catch { /* publication below reports unreadable/unwritable homes */ }
|
|
57
|
+
const stamp = Date.now();
|
|
58
|
+
for (let n = 0; n < 100; n++) {
|
|
59
|
+
const backup = n === 0 ? `${stem}.bak` : `${stem}.${stamp}${n === 1 ? "" : `-${n}`}.bak`;
|
|
60
|
+
if (holdsOriginal(backup, rawBytes)) return backup;
|
|
61
|
+
let published = false;
|
|
62
|
+
try {
|
|
63
|
+
atomicWriteFileNoFollow(backup, rawBytes, undefined, { afterRename: () => { published = true; } }, { exclusive: true });
|
|
64
|
+
return backup;
|
|
65
|
+
} catch (error) {
|
|
66
|
+
if (published) {
|
|
67
|
+
console.warn("Could not remove an OpenCode Free recovery temporary file.");
|
|
68
|
+
return backup;
|
|
69
|
+
}
|
|
70
|
+
if (holdsOriginal(backup, rawBytes)) return backup;
|
|
71
|
+
if ((error as NodeJS.ErrnoException)?.code === "EEXIST") {
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
// A directory occupant can report EACCES on Windows instead of EEXIST.
|
|
75
|
+
const code = (error as NodeJS.ErrnoException)?.code;
|
|
76
|
+
if (code !== "EACCES" && code !== "EPERM") break;
|
|
77
|
+
try { if (!lstatSync(backup).isDirectory()) break; } catch { break; }
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
console.warn("Could not preserve the original config before OpenCode Free removal; no recovery copy was made. Copy config.json now.");
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/** Disk-load boundary only; imported text and passive reads never publish or notify. */
|
|
85
|
+
export function preserveRemovedOpenCodeFree(configPath: string, rawBytes: Uint8Array): void {
|
|
86
|
+
if (isPassiveRead()) return;
|
|
87
|
+
const backup = backupOriginal(configPath, rawBytes);
|
|
88
|
+
if (warned) return;
|
|
89
|
+
warned = true;
|
|
90
|
+
const recovery = backup
|
|
91
|
+
? `the original file was saved to ${redactUserPath(backup)} (restore by copying it back over config.json, for example after downgrading).`
|
|
92
|
+
: "no recovery copy was made; copy config.json now if you need the old entry.";
|
|
93
|
+
console.warn(`opencode-free support was removed because every free model now returns 403 permission_denied under OpenCode's upstream free-tier gate (#7255); the entry and dependent references are disabled. The next configuration save removes them from config.json; ${recovery} Use opencode-go, or another provider such as opencode-zen or openrouter.`);
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** One snapshot boundary for the loader, diagnostics and authoritative live-save read. */
|
|
97
|
+
export function projectRemovedOpenCodeFreeSnapshot(parsed: unknown, file?: { path: string; bytes: Uint8Array }): void {
|
|
98
|
+
if (sanitizeRemovedOpenCodeFreeForLoad(parsed) && file) preserveRemovedOpenCodeFree(file.path, file.bytes);
|
|
99
|
+
}
|
|
@@ -2,17 +2,16 @@ import { getDefaultConfig } from "./proxy-env";
|
|
|
2
2
|
import { DESKTOP_FAMILIES } from "../claude/desktop-profile";
|
|
3
3
|
|
|
4
4
|
const REMOVED_PROVIDER = "opencode-free";
|
|
5
|
-
let warned = false;
|
|
6
5
|
|
|
7
6
|
function record(value: unknown): Record<string, unknown> | undefined {
|
|
8
7
|
return value !== null && typeof value === "object" && !Array.isArray(value)
|
|
9
8
|
? value as Record<string, unknown> : undefined;
|
|
10
9
|
}
|
|
11
10
|
|
|
12
|
-
/** Load
|
|
13
|
-
export function sanitizeRemovedOpenCodeFreeForLoad(parsed: unknown):
|
|
11
|
+
/** Load projection, like the OpenCode wire upgrades: the next configuration save persists it. */
|
|
12
|
+
export function sanitizeRemovedOpenCodeFreeForLoad(parsed: unknown): boolean {
|
|
14
13
|
const config = record(parsed);
|
|
15
|
-
if (!config) return;
|
|
14
|
+
if (!config) return false;
|
|
16
15
|
const providers = record(config.providers);
|
|
17
16
|
const retiredProviders = new Set([REMOVED_PROVIDER]);
|
|
18
17
|
const retiredRoutes = new Set<string>();
|
|
@@ -139,8 +138,5 @@ export function sanitizeRemovedOpenCodeFreeForLoad(parsed: unknown): void {
|
|
|
139
138
|
if (depletedFallbacks.has(model) && Array.isArray(chain) && chain.length === 0) delete fallbacks[model];
|
|
140
139
|
}
|
|
141
140
|
}
|
|
142
|
-
|
|
143
|
-
warned = true;
|
|
144
|
-
console.warn("opencode-free support was removed because every free model now returns 403 permission_denied under OpenCode's upstream free-tier gate (#7255); the entry and dependent references are disabled. Use opencode-go, or another provider such as opencode-zen or openrouter.");
|
|
145
|
-
}
|
|
141
|
+
return changed;
|
|
146
142
|
}
|
package/src/config/salvage.ts
CHANGED
|
@@ -31,6 +31,8 @@ const SALVAGEABLE_CONFIG_SECTIONS = ["routingProfiles", "combos"] as const;
|
|
|
31
31
|
/** Optional nested fields that can be dropped whole without changing the rest of the document. */
|
|
32
32
|
const SALVAGEABLE_OPTIONAL_FIELDS: ReadonlyArray<readonly [string, string]> = [
|
|
33
33
|
["claudeCode", "desktopProfile"],
|
|
34
|
+
["claudeCode", "desktopModelVisibility"],
|
|
35
|
+
["claudeCode", "appendOnlyToolLoadingModels"],
|
|
34
36
|
];
|
|
35
37
|
|
|
36
38
|
function isSalvageableConfigPath(section: string, id: string): boolean {
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { MAIN_ACCOUNT_HARD_LOCK_MIN_PERCENT } from "../../codex/quota-types";
|
|
2
2
|
import { validRemainingQuotaAccountIds } from "../../codex/account-use-remaining";
|
|
3
3
|
import * as z from "zod/v4";
|
|
4
|
+
import { isAppendOnlyToolLoadingModels } from "../../claude/inbound-tool-loading";
|
|
4
5
|
import { accountPauseStateSchema } from "./account-auto-pause";
|
|
5
6
|
import { anthropicAccountPoolSchema } from "./anthropic-account-pool";
|
|
6
7
|
import { compactionRecoverySchema } from "./compaction-recovery";
|
|
7
8
|
import { nativeReasoningRetentionSchema } from "./native-reasoning-retention";
|
|
9
|
+
import { workflowBudgetSchema } from "./workflow-budget";
|
|
8
10
|
import { desktopCompatibilitySchema } from "./desktop-compatibility";
|
|
9
11
|
import { blockedModelRedirectsSchema } from "./blocked-model-redirects";
|
|
10
12
|
import { mainAccountHardLockFallbackSchema } from "./main-account-hard-lock-fallback";
|
|
@@ -31,6 +33,8 @@ import {
|
|
|
31
33
|
apiKeyEntrySchema,
|
|
32
34
|
asideProfileSyncSchema,
|
|
33
35
|
clientIntegrationsSchema,
|
|
36
|
+
opencodeClientExportSchema,
|
|
37
|
+
omoClientExportSchema,
|
|
34
38
|
CODEX_ACCOUNT_NAMESPACE_ACCOUNT_ID_COLLISION_ERROR,
|
|
35
39
|
codexAccountNamespacesSchema,
|
|
36
40
|
modelPinnedEffortsSchema,
|
|
@@ -81,6 +85,7 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
|
|
|
81
85
|
import { modelAutoCompactTokenLimitsConfigError } from "../../providers/auto-compact-budget";
|
|
82
86
|
import { hasFastWireCapabilityConflict } from "../../providers/fastwire";
|
|
83
87
|
import { parseDesktopProfile } from "../../claude/desktop-profile";
|
|
88
|
+
import { parseDesktopModelVisibility } from "../../claude/desktop-model-visibility";
|
|
84
89
|
import { isInterceptBindingId, isInterceptBindingRoute } from "../../claude/intercept/model-bindings";
|
|
85
90
|
import { DEFAULT_APP_OWNED_MEMORY_BUDGET_BYTES, MAX_APP_OWNED_MEMORY_BUDGET_MB, MIN_APP_OWNED_MEMORY_BUDGET_MB } from "../../lib/app-owned-memory";
|
|
86
91
|
|
|
@@ -177,6 +182,13 @@ export const configSchema = z.object({
|
|
|
177
182
|
.min(0)
|
|
178
183
|
.optional()
|
|
179
184
|
.catch(undefined),
|
|
185
|
+
// Match the per-body load/degrade contract: malformed hand edits retain providers.
|
|
186
|
+
// The shared resolver clamps runtime admission to 512 MiB..2 GiB even when the
|
|
187
|
+
// caller bypasses this schema; omission and zero retain the 512 MiB default.
|
|
188
|
+
maxConcurrentInboundBodyBytes: z.number().int()
|
|
189
|
+
.min(0)
|
|
190
|
+
.optional()
|
|
191
|
+
.catch(undefined),
|
|
180
192
|
appOwnedMemoryBudgetMb: z.number().int()
|
|
181
193
|
.min(MIN_APP_OWNED_MEMORY_BUDGET_MB)
|
|
182
194
|
.max(MAX_APP_OWNED_MEMORY_BUDGET_MB)
|
|
@@ -210,6 +222,8 @@ export const configSchema = z.object({
|
|
|
210
222
|
// A bad hand edit disables only this block; writes validate the catch-free leaf first.
|
|
211
223
|
reasoningRetention: reasoningRetentionSchema.optional().catch(undefined),
|
|
212
224
|
nativeReasoningRetention: nativeReasoningRetentionSchema.optional().catch(undefined),
|
|
225
|
+
// A bad hand edit falls back to the built-in ceilings; it never turns the guard off.
|
|
226
|
+
workflowBudget: workflowBudgetSchema.optional().catch(undefined),
|
|
213
227
|
desktopCompatibility: desktopCompatibilitySchema.optional().catch(undefined),
|
|
214
228
|
// A hand-edited malformed phase disables only that phase instead of rejecting
|
|
215
229
|
// providers/apiKeys, matching the load-time degradation notice; the management write
|
|
@@ -225,6 +239,8 @@ export const configSchema = z.object({
|
|
|
225
239
|
defaultProvider: z.string().min(1).default("openai"),
|
|
226
240
|
defaultModelAliases: z.boolean().optional(),
|
|
227
241
|
preferModelAliasIds: z.boolean().optional().catch(false),
|
|
242
|
+
// Catalog omission is opt-in; malformed hand edits preserve the hidden-row default.
|
|
243
|
+
omitDisabledNativeModels: z.boolean().optional().catch(false),
|
|
228
244
|
// Malformed hand edits disable this opt-in projection without rejecting providers.
|
|
229
245
|
cursorEffortRows: z.boolean().optional().catch(false),
|
|
230
246
|
// Fast selectors default on; malformed hand edits disable them without rejecting providers.
|
|
@@ -253,6 +269,7 @@ export const configSchema = z.object({
|
|
|
253
269
|
emptyCompletionRetry: z.boolean().optional().catch(false),
|
|
254
270
|
// Header suppression changes what Codex sees, so absence and malformed edits stay off.
|
|
255
271
|
dropCodexSafetyBuffering: z.boolean().optional().catch(false),
|
|
272
|
+
completeOnMaxOutputTokens: z.boolean().optional().catch(false),
|
|
256
273
|
// A malformed hand edit must not silently stop opening the browser: fall back
|
|
257
274
|
// to undefined, which resolves to the historical auto-open behavior.
|
|
258
275
|
oauthOpenBrowser: z.boolean().optional().catch(undefined),
|
|
@@ -266,6 +283,10 @@ export const configSchema = z.object({
|
|
|
266
283
|
// value degrades to undefined, which simply raises the notice again.
|
|
267
284
|
multiAgentSurfaceAdvisoryVersion: z.number().int().nonnegative().optional().catch(undefined),
|
|
268
285
|
clientIntegrations: clientIntegrationsSchema.optional().catch(undefined),
|
|
286
|
+
// Opt-in opencode-side export timeouts; a malformed block degrades to undefined so opencode
|
|
287
|
+
// keeps its native waits rather than failing the parse and hiding valid providers/accounts.
|
|
288
|
+
opencodeClientExport: opencodeClientExportSchema.optional().catch(undefined),
|
|
289
|
+
omoClientExport: omoClientExportSchema.optional().catch(undefined),
|
|
269
290
|
// A malformed profile policy must not fall back to legacy all-profile activation.
|
|
270
291
|
asideProfileSync: asideProfileSyncSchema.optional().catch({ allProfiles: false }),
|
|
271
292
|
providerContextCaps: z.record(z.string(), z.number().int().positive()).optional(),
|
|
@@ -303,6 +324,14 @@ export const configSchema = z.object({
|
|
|
303
324
|
standard: z.array(z.string().trim().min(1)).optional(),
|
|
304
325
|
frontier: z.array(z.string().trim().min(1)).optional(),
|
|
305
326
|
}).strict().optional().catch(undefined),
|
|
327
|
+
// Discard the retired source while preserving an otherwise valid Artificial Analysis key.
|
|
328
|
+
codexRoleCapability: z.preprocess(value => {
|
|
329
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return value;
|
|
330
|
+
const { huggingFace: _retired, ...rest } = value as Record<string, unknown>;
|
|
331
|
+
return rest;
|
|
332
|
+
}, z.object({
|
|
333
|
+
artificialAnalysis: z.object({ apiKey: z.string().trim().min(1).optional() }).strict().optional(),
|
|
334
|
+
}).strict().optional().catch(undefined)),
|
|
306
335
|
codexShimAutoRestore: z.boolean().optional(),
|
|
307
336
|
codexDesktopAuthless: z.boolean().optional().catch(undefined),
|
|
308
337
|
codexClientCompaction: z.boolean().optional().catch(undefined),
|
|
@@ -408,7 +437,10 @@ export const configSchema = z.object({
|
|
|
408
437
|
if (claudeCode !== undefined && (!claudeCode || typeof claudeCode !== "object" || Array.isArray(claudeCode))) {
|
|
409
438
|
ctx.addIssue({ code: "custom", path: ["claudeCode"], message: "claudeCode must be an object" });
|
|
410
439
|
} else if (claudeCode) {
|
|
411
|
-
const claude = claudeCode as { desktopProfile?: unknown; desktopMode?: unknown; intercept?: unknown };
|
|
440
|
+
const claude = claudeCode as { desktopProfile?: unknown; desktopModelVisibility?: unknown; desktopMode?: unknown; intercept?: unknown; appendOnlyToolLoadingModels?: unknown };
|
|
441
|
+
if (claude.appendOnlyToolLoadingModels !== undefined && !isAppendOnlyToolLoadingModels(claude.appendOnlyToolLoadingModels)) {
|
|
442
|
+
ctx.addIssue({ code: "custom", path: ["claudeCode", "appendOnlyToolLoadingModels"], message: "appendOnlyToolLoadingModels must be up to 128 provider/model selectors (max 512 characters each), optionally ending in a single wildcard" });
|
|
443
|
+
}
|
|
412
444
|
if (claude.desktopMode !== undefined && claude.desktopMode !== "first-party" && claude.desktopMode !== "gateway") {
|
|
413
445
|
ctx.addIssue({ code: "custom", path: ["claudeCode", "desktopMode"], message: "desktopMode must be \"first-party\" or \"gateway\"" });
|
|
414
446
|
}
|
|
@@ -453,6 +485,17 @@ export const configSchema = z.object({
|
|
|
453
485
|
});
|
|
454
486
|
}
|
|
455
487
|
}
|
|
488
|
+
if (claude.desktopModelVisibility !== undefined) {
|
|
489
|
+
try {
|
|
490
|
+
parseDesktopModelVisibility(claude.desktopModelVisibility);
|
|
491
|
+
} catch (error) {
|
|
492
|
+
ctx.addIssue({
|
|
493
|
+
code: "custom",
|
|
494
|
+
path: ["claudeCode", "desktopModelVisibility"],
|
|
495
|
+
message: error instanceof Error ? error.message : String(error),
|
|
496
|
+
});
|
|
497
|
+
}
|
|
498
|
+
}
|
|
456
499
|
}
|
|
457
500
|
|
|
458
501
|
const accountNamespaces = config.codexAccountNamespaces;
|
|
@@ -352,6 +352,7 @@ export const providerConfigSchema = z.object({
|
|
|
352
352
|
requiresPairedResponsesToolResults: z.boolean().optional(),
|
|
353
353
|
annotateEmptyToolOutputs: z.boolean().optional(),
|
|
354
354
|
foldDeveloperRoleToSystem: z.boolean().optional(),
|
|
355
|
+
singleLeadingSystemMessage: z.boolean().optional(),
|
|
355
356
|
fastWire: fastWireSchema.nullable().optional(),
|
|
356
357
|
responseTierAuthoritative: z.boolean().optional(),
|
|
357
358
|
fastEnabled: z.boolean().optional(),
|
|
@@ -359,6 +360,7 @@ export const providerConfigSchema = z.object({
|
|
|
359
360
|
inferContextWindow: z.boolean().optional(),
|
|
360
361
|
modelSupportsServiceTier: z.record(z.string().min(1), z.boolean()).optional(),
|
|
361
362
|
modelSuppressSyntheticMax: z.record(z.string().min(1), z.boolean()).optional(),
|
|
363
|
+
promoteAdditionalTools: z.boolean().optional(),
|
|
362
364
|
preserveResponsesReasoningContent: z.boolean().optional(),
|
|
363
365
|
preserveResponsesInputItemIds: z.boolean().optional(),
|
|
364
366
|
preserveResponsesMessageMetadata: z.boolean().optional(),
|
|
@@ -849,6 +851,26 @@ export const clientIntegrationsSchema = z.object({
|
|
|
849
851
|
"claude-desktop": z.boolean().optional().catch(undefined),
|
|
850
852
|
}).passthrough();
|
|
851
853
|
|
|
854
|
+
/**
|
|
855
|
+
* Opt-in opencode-side request timeouts emitted into the generated opencode provider block.
|
|
856
|
+
* Each field is a positive millisecond count or the literal `false` (disable that wait). A
|
|
857
|
+
* malformed per-field value degrades to undefined (the field is dropped and opencode keeps its
|
|
858
|
+
* native default) rather than rejecting the whole config or emitting an opencode config that
|
|
859
|
+
* opencode would refuse to load. `.passthrough()` keeps a forward-compatible key a later version
|
|
860
|
+
* might add.
|
|
861
|
+
*/
|
|
862
|
+
const opencodeClientExportTimeout = z.union([z.number().positive().finite(), z.literal(false)]);
|
|
863
|
+
export const opencodeClientExportSchema = z.object({
|
|
864
|
+
headerTimeoutMs: opencodeClientExportTimeout.optional().catch(undefined),
|
|
865
|
+
chunkTimeoutMs: opencodeClientExportTimeout.optional().catch(undefined),
|
|
866
|
+
timeoutMs: opencodeClientExportTimeout.optional().catch(undefined),
|
|
867
|
+
}).passthrough();
|
|
868
|
+
|
|
869
|
+
/** omo dialect: an unknown value is dropped so the export falls back to the Chat default. */
|
|
870
|
+
export const omoClientExportSchema = z.object({
|
|
871
|
+
api: z.enum(["openai-completions", "openai-responses"]).optional().catch(undefined),
|
|
872
|
+
}).passthrough();
|
|
873
|
+
|
|
852
874
|
export const asideProfileSyncSchema = z.object({
|
|
853
875
|
allProfiles: z.boolean().optional(),
|
|
854
876
|
profiles: z.record(
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import * as z from "zod/v4";
|
|
2
|
+
import type { OcxConfig } from "../../types";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Per-install bounds for the root-workflow count ceilings.
|
|
6
|
+
*
|
|
7
|
+
* The lower concurrency bound is two because one slot is always held back for the interactive
|
|
8
|
+
* turn; at one, every worker turn would be refused. The upper bounds keep each ceiling a
|
|
9
|
+
* ceiling: a value large enough to never fire is a way of switching the guard off, and that is
|
|
10
|
+
* not what this setting is for.
|
|
11
|
+
*/
|
|
12
|
+
export const WORKFLOW_BUDGET_BOUNDS = {
|
|
13
|
+
maxConcurrentChildren: { min: 2, max: 64 },
|
|
14
|
+
maxPhysicalSends: { min: 1, max: 10_000 },
|
|
15
|
+
maxDistinctChildren: { min: 1, max: 1_024 },
|
|
16
|
+
} as const;
|
|
17
|
+
|
|
18
|
+
const bounded = (key: keyof typeof WORKFLOW_BUDGET_BOUNDS) =>
|
|
19
|
+
z.number().int().min(WORKFLOW_BUDGET_BOUNDS[key].min).max(WORKFLOW_BUDGET_BOUNDS[key].max).optional();
|
|
20
|
+
|
|
21
|
+
/** Omitted fields keep the built-in ceiling, so an absent block is today's behavior byte for byte. */
|
|
22
|
+
export const workflowBudgetSchema = z.object({
|
|
23
|
+
maxConcurrentChildren: bounded("maxConcurrentChildren"),
|
|
24
|
+
maxPhysicalSends: bounded("maxPhysicalSends"),
|
|
25
|
+
maxDistinctChildren: bounded("maxDistinctChildren"),
|
|
26
|
+
}).strict();
|
|
27
|
+
|
|
28
|
+
export type WorkflowBudgetConfig = z.infer<typeof workflowBudgetSchema>;
|
|
29
|
+
|
|
30
|
+
export const WORKFLOW_BUDGET_SHAPE_HINT = "accepts only optional integer maxConcurrentChildren (2-64), maxPhysicalSends (1-10000) and maxDistinctChildren (1-1024)";
|
|
31
|
+
|
|
32
|
+
export function workflowBudgetConfigError(value: unknown): string | null {
|
|
33
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
|
34
|
+
const budget = (value as Record<string, unknown>).workflowBudget;
|
|
35
|
+
return budget === undefined || workflowBudgetSchema.safeParse(budget).success
|
|
36
|
+
? null : "schema_invalid: workflowBudget: " + WORKFLOW_BUDGET_SHAPE_HINT;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Malformed input resolves to no overrides, the same way a degraded disk block does. */
|
|
40
|
+
export function readWorkflowBudgetConfig(config: Pick<OcxConfig, "workflowBudget">): WorkflowBudgetConfig {
|
|
41
|
+
const parsed = workflowBudgetSchema.safeParse(config.workflowBudget);
|
|
42
|
+
return parsed.success && parsed.data ? parsed.data : {};
|
|
43
|
+
}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Read-only classification of the tracked runtime record pair a guarded stop
|
|
3
|
+
* re-verifies before acting.
|
|
4
|
+
*
|
|
5
|
+
* "ocx stop --expect-*" asks "is the recorded runtime still the approved one",
|
|
6
|
+
* which collapses several observations into one boolean: a missing or invalid
|
|
7
|
+
* "ocx.pid", a dead, foreign or unverifiable recorded process, and a missing,
|
|
8
|
+
* invalid or PID-mismatched "runtime-port.json" all read as "not verified".
|
|
9
|
+
* The approval-changed refusal used to report only that umbrella fact, so a
|
|
10
|
+
* desktop log could not tell a stale record from a permission failure.
|
|
11
|
+
*
|
|
12
|
+
* This probe walks the same checks in the same order as "readPid()" followed
|
|
13
|
+
* by "readRuntimePort(pid)", but reports which one failed instead. Each state
|
|
14
|
+
* record is still read exactly once per call -- a guarded stop asks once, and
|
|
15
|
+
* caching the bytes would only carry a stale answer into a decision about a
|
|
16
|
+
* record that may have been rewritten. The process-identity question, though,
|
|
17
|
+
* is answered by the same cache-backed observation "readPid()" itself makes
|
|
18
|
+
* ("inspectOcxStartProcessIdentity"): a cached verdict serves this probe with
|
|
19
|
+
* no native command at all, and a miss performs the same single command-line
|
|
20
|
+
* probe readPid would, so this probe can never disagree with the admission
|
|
21
|
+
* readPid just granted or denied for the same PID. It performs no mutation, no
|
|
22
|
+
* signal beyond the same "process.kill(pid, 0)" liveness read, and no stop
|
|
23
|
+
* decision -- the refusal itself is unchanged; only its detail gains a cause.
|
|
24
|
+
*
|
|
25
|
+
* Two distinctions are deliberate:
|
|
26
|
+
*
|
|
27
|
+
* - "permission-denied" is reported only for a real EACCES/EPERM observed on a
|
|
28
|
+
* record read or the liveness signal. An "unverifiable" identity observation
|
|
29
|
+
* -- an unreadable process command line -- is not proof of a permission
|
|
30
|
+
* boundary, and no account or elevation cause is inferred from it.
|
|
31
|
+
* - No path, command line, stderr text, or token leaves this module: the refusal
|
|
32
|
+
* causes below are fixed strings and the detail built from them is a fixed
|
|
33
|
+
* sentence.
|
|
34
|
+
*/
|
|
35
|
+
import { readFileSync } from "node:fs";
|
|
36
|
+
import {
|
|
37
|
+
getPidPath,
|
|
38
|
+
getRuntimePortPath,
|
|
39
|
+
inspectOcxStartProcessIdentity,
|
|
40
|
+
isValidRuntimePortState,
|
|
41
|
+
parsePidFile,
|
|
42
|
+
} from "./process-state";
|
|
43
|
+
import type { OcxStartIdentityObservation } from "./process-state";
|
|
44
|
+
|
|
45
|
+
/** The single check that failed, as a stable machine-readable token. */
|
|
46
|
+
export type TrackedRecordRefusal =
|
|
47
|
+
| "pid-record-absent"
|
|
48
|
+
| "pid-record-permission-denied"
|
|
49
|
+
| "pid-record-unreadable"
|
|
50
|
+
| "pid-record-invalid"
|
|
51
|
+
| "process-not-running"
|
|
52
|
+
| "process-identity-mismatch"
|
|
53
|
+
| "process-unverifiable"
|
|
54
|
+
| "runtime-record-absent"
|
|
55
|
+
| "runtime-record-permission-denied"
|
|
56
|
+
| "runtime-record-unreadable"
|
|
57
|
+
| "runtime-record-invalid"
|
|
58
|
+
| "runtime-record-pid-mismatch"
|
|
59
|
+
| "unverified";
|
|
60
|
+
|
|
61
|
+
export type TrackedRecordInspection =
|
|
62
|
+
| { status: "verified"; pid: number; port: number; hostname: string }
|
|
63
|
+
| { status: "refused"; reason: TrackedRecordRefusal };
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Injectable read-only seams. Tests must supply fakes for "signal" and either
|
|
67
|
+
* "identity" or the process-state exec seams ("setProcessCommandLineExecForTests"
|
|
68
|
+
* and friends) so no real "process.kill" or native command probe runs; the
|
|
69
|
+
* defaults are exactly what the production caller uses, including the shared
|
|
70
|
+
* identity cache.
|
|
71
|
+
*/
|
|
72
|
+
export interface TrackedRecordProbeDeps {
|
|
73
|
+
/** Read a state record like "readFileSync(path, 'utf-8')"; throw with errno codes. */
|
|
74
|
+
readFile?: (path: string) => string;
|
|
75
|
+
/** The "process.kill(pid, 0)" liveness read; throws like it (ESRCH/EPERM/...). */
|
|
76
|
+
signal?: (pid: number) => void;
|
|
77
|
+
/** The shared start-identity observation; the default consults the real cache. */
|
|
78
|
+
identity?: (pid: number) => OcxStartIdentityObservation;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
function readRecordFile(
|
|
82
|
+
readFile: (path: string) => string,
|
|
83
|
+
path: string,
|
|
84
|
+
absent: TrackedRecordRefusal,
|
|
85
|
+
denied: TrackedRecordRefusal,
|
|
86
|
+
unreadable: TrackedRecordRefusal,
|
|
87
|
+
): { ok: true; raw: string } | { ok: false; reason: TrackedRecordRefusal } {
|
|
88
|
+
try {
|
|
89
|
+
return { ok: true, raw: readFile(path) };
|
|
90
|
+
} catch (error) {
|
|
91
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
92
|
+
if (code === "EACCES" || code === "EPERM") return { ok: false, reason: denied };
|
|
93
|
+
if (code === "ENOENT") return { ok: false, reason: absent };
|
|
94
|
+
return { ok: false, reason: unreadable };
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Classify why the tracked runtime record cannot back a guarded stop, or return
|
|
100
|
+
* the verified target when every check still holds. One read per record, in the
|
|
101
|
+
* same order the stop path already performs them.
|
|
102
|
+
*/
|
|
103
|
+
export function inspectTrackedRuntimeRecord(
|
|
104
|
+
deps: TrackedRecordProbeDeps = {},
|
|
105
|
+
): TrackedRecordInspection {
|
|
106
|
+
const readFile = deps.readFile ?? ((path: string) => readFileSync(path, "utf-8"));
|
|
107
|
+
const signal = deps.signal ?? ((pid: number) => { process.kill(pid, 0); });
|
|
108
|
+
const identity = deps.identity ?? inspectOcxStartProcessIdentity;
|
|
109
|
+
try {
|
|
110
|
+
const pidFile = readRecordFile(
|
|
111
|
+
readFile, getPidPath(), "pid-record-absent", "pid-record-permission-denied", "pid-record-unreadable",
|
|
112
|
+
);
|
|
113
|
+
if (!pidFile.ok) return { status: "refused", reason: pidFile.reason };
|
|
114
|
+
const pid = parsePidFile(pidFile.raw);
|
|
115
|
+
if (pid === null) return { status: "refused", reason: "pid-record-invalid" };
|
|
116
|
+
try {
|
|
117
|
+
signal(pid);
|
|
118
|
+
} catch (error) {
|
|
119
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
120
|
+
if (code === "ESRCH") return { status: "refused", reason: "process-not-running" };
|
|
121
|
+
// EPERM still names a live process; identity is decided by the shared
|
|
122
|
+
// observation below, exactly as readPid decides it. Any other signal
|
|
123
|
+
// error can only be reported as unverifiable.
|
|
124
|
+
if (code !== "EPERM") return { status: "refused", reason: "process-unverifiable" };
|
|
125
|
+
}
|
|
126
|
+
const observation = identity(pid);
|
|
127
|
+
if (observation === "unverifiable") {
|
|
128
|
+
return { status: "refused", reason: "process-unverifiable" };
|
|
129
|
+
}
|
|
130
|
+
if (observation === "mismatch") {
|
|
131
|
+
return { status: "refused", reason: "process-identity-mismatch" };
|
|
132
|
+
}
|
|
133
|
+
const runtimeFile = readRecordFile(
|
|
134
|
+
readFile, getRuntimePortPath(),
|
|
135
|
+
"runtime-record-absent", "runtime-record-permission-denied", "runtime-record-unreadable",
|
|
136
|
+
);
|
|
137
|
+
if (!runtimeFile.ok) return { status: "refused", reason: runtimeFile.reason };
|
|
138
|
+
let parsed: unknown;
|
|
139
|
+
try {
|
|
140
|
+
parsed = JSON.parse(runtimeFile.raw);
|
|
141
|
+
} catch {
|
|
142
|
+
return { status: "refused", reason: "runtime-record-invalid" };
|
|
143
|
+
}
|
|
144
|
+
if (!isValidRuntimePortState(parsed)) {
|
|
145
|
+
return { status: "refused", reason: "runtime-record-invalid" };
|
|
146
|
+
}
|
|
147
|
+
if (parsed.pid !== pid) {
|
|
148
|
+
return { status: "refused", reason: "runtime-record-pid-mismatch" };
|
|
149
|
+
}
|
|
150
|
+
return { status: "verified", pid, port: parsed.port, hostname: parsed.hostname ?? "" };
|
|
151
|
+
} catch {
|
|
152
|
+
return { status: "refused", reason: "unverified" };
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Fixed refusal causes for the approval-changed detail. Every entry is a
|
|
158
|
+
* complete sentence fragment and contains no path, command line, stderr, or
|
|
159
|
+
* token, so the resulting detail is safe to surface in a caller's log or UI.
|
|
160
|
+
*/
|
|
161
|
+
const TRACKED_REFUSAL_CAUSES: Record<TrackedRecordRefusal, string> = {
|
|
162
|
+
"pid-record-absent": "the recorded PID file is absent",
|
|
163
|
+
"pid-record-permission-denied": "reading the recorded PID file was denied",
|
|
164
|
+
"pid-record-unreadable": "the recorded PID file could not be read",
|
|
165
|
+
"pid-record-invalid": "the recorded PID file is not a valid record",
|
|
166
|
+
"process-not-running": "the recorded process is no longer running",
|
|
167
|
+
"process-identity-mismatch": "the recorded process does not match the expected start command",
|
|
168
|
+
"process-unverifiable": "the recorded process identity could not be verified",
|
|
169
|
+
"runtime-record-absent": "the tracked runtime record is absent",
|
|
170
|
+
"runtime-record-permission-denied": "reading the tracked runtime record was denied",
|
|
171
|
+
"runtime-record-unreadable": "the tracked runtime record could not be read",
|
|
172
|
+
"runtime-record-invalid": "the tracked runtime record is not a valid record",
|
|
173
|
+
"runtime-record-pid-mismatch": "the tracked runtime record names a different PID",
|
|
174
|
+
"unverified": "the tracked runtime record could not be re-verified",
|
|
175
|
+
};
|
|
176
|
+
|
|
177
|
+
/**
|
|
178
|
+
* The guarded stop's tracked() callback shape: the verified target, or the
|
|
179
|
+
* fixed cause of the single check that failed. Read-only; decides nothing.
|
|
180
|
+
*/
|
|
181
|
+
export function describeTrackedRuntimeTarget(
|
|
182
|
+
deps: TrackedRecordProbeDeps = {},
|
|
183
|
+
): { pid: number; port: number; hostname: string } | { untracked: string } {
|
|
184
|
+
const inspection = inspectTrackedRuntimeRecord(deps);
|
|
185
|
+
return inspection.status === "verified"
|
|
186
|
+
? { pid: inspection.pid, port: inspection.port, hostname: inspection.hostname }
|
|
187
|
+
: { untracked: TRACKED_REFUSAL_CAUSES[inspection.reason] };
|
|
188
|
+
}
|
package/src/config.ts
CHANGED
|
@@ -162,7 +162,7 @@ import { withConfigMutationLockSync, bumpGenerationForCooperatingConfigWrite } f
|
|
|
162
162
|
import { getDefaultConfig } from "./config/proxy-env";
|
|
163
163
|
import { configSchema } from "./config/schema/config-schema";
|
|
164
164
|
import { sanitizeOpenCodeOverridesForLoad } from "./config/opencode-wire-upgrade";
|
|
165
|
-
import {
|
|
165
|
+
import { projectRemovedOpenCodeFreeSnapshot } from "./config/removed-opencode-free-backup";
|
|
166
166
|
import {
|
|
167
167
|
hardenExistingSecret,
|
|
168
168
|
normalizeApiKeyIds,
|
|
@@ -221,9 +221,9 @@ function loadConfigUnobserved(): OcxConfig {
|
|
|
221
221
|
return withRefreshedCostOverlays(getDefaultConfig());
|
|
222
222
|
}
|
|
223
223
|
try {
|
|
224
|
-
const
|
|
225
|
-
const parsed = JSON.parse(
|
|
226
|
-
|
|
224
|
+
const bytes = readFileSync(configPath);
|
|
225
|
+
const parsed = JSON.parse(bytes.toString("utf-8").replace(/^\uFEFF/, ""));
|
|
226
|
+
projectRemovedOpenCodeFreeSnapshot(parsed, { path: configPath, bytes });
|
|
227
227
|
sanitizeOpenCodeOverridesForLoad(parsed);
|
|
228
228
|
sanitizeAliasesForLoad(parsed);
|
|
229
229
|
sanitizeReasoningPinsForLoad(parsed);
|