@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
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
|
+
type BigIntStats,
|
|
2
3
|
chmodSync,
|
|
3
4
|
closeSync,
|
|
4
5
|
fchmodSync,
|
|
5
6
|
fsyncSync,
|
|
6
7
|
fstatSync,
|
|
8
|
+
linkSync,
|
|
7
9
|
lstatSync,
|
|
8
10
|
openSync,
|
|
9
11
|
realpathSync,
|
|
@@ -16,10 +18,12 @@ import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
|
16
18
|
import { assertNotRealCodexHomeUnderTest, assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
17
19
|
import {
|
|
18
20
|
forgetEphemeralSecretPath,
|
|
21
|
+
flushWindowsSecretAclReapsBeforeRemoval,
|
|
19
22
|
hardenSecretPath,
|
|
20
23
|
hardenSecretPathAsync,
|
|
21
24
|
reattributeHardenedSecretPath,
|
|
22
25
|
windowsSecretAclReapPendingForPath,
|
|
26
|
+
WindowsSecretAclSettleTimeoutError,
|
|
23
27
|
} from "../lib/windows-secret-acl";
|
|
24
28
|
import {
|
|
25
29
|
renameAtomicFile,
|
|
@@ -28,6 +32,28 @@ import {
|
|
|
28
32
|
import { getConfigDir } from "./paths";
|
|
29
33
|
|
|
30
34
|
let atomicSequence = 0;
|
|
35
|
+
const aclDestinations = new Map<string, Set<string>>();
|
|
36
|
+
|
|
37
|
+
/** Track overlapping writes, refusing only children retained past their timeout belt. */
|
|
38
|
+
function admitAtomicAclWork(target: string, temp: string, enabled: boolean): (() => void) | undefined {
|
|
39
|
+
if (!enabled || !windowsHardeningApplies()) return undefined;
|
|
40
|
+
const destination = join(realpathSync(dirname(target)), basename(target));
|
|
41
|
+
const key = process.platform === "win32" ? destination.toLowerCase() : destination;
|
|
42
|
+
const temps = aclDestinations.get(key) ?? new Set<string>();
|
|
43
|
+
if ([...temps].some(windowsSecretAclReapPendingForPath)) throw new WindowsSecretAclSettleTimeoutError();
|
|
44
|
+
temps.add(temp);
|
|
45
|
+
aclDestinations.set(key, temps);
|
|
46
|
+
const release = (): void => {
|
|
47
|
+
temps.delete(temp);
|
|
48
|
+
if (temps.size === 0) aclDestinations.delete(key);
|
|
49
|
+
};
|
|
50
|
+
return () => {
|
|
51
|
+
if (windowsSecretAclReapPendingForPath(temp)) {
|
|
52
|
+
// Caller settlement is bounded; admission resumes only after actual handle release.
|
|
53
|
+
void flushWindowsSecretAclReapsBeforeRemoval(temp).then(release);
|
|
54
|
+
} else release();
|
|
55
|
+
};
|
|
56
|
+
}
|
|
31
57
|
|
|
32
58
|
/**
|
|
33
59
|
* Whether this writer's Windows ACL branch applies.
|
|
@@ -132,14 +158,17 @@ function assertResolvedTargetAllowed(path: string, target: string): void {
|
|
|
132
158
|
assertNotRealHomeUnderTest(dirname(target));
|
|
133
159
|
}
|
|
134
160
|
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
161
|
+
// Zero dev/ino is refused only where publication relies on stable identity (exclusive
|
|
162
|
+
// recovery copies); ordinary saves must keep working on filesystems that report zero.
|
|
163
|
+
function assertPrivateTempDescriptor(path: string, descriptor: number, requireStableIdentity = false): void {
|
|
164
|
+
const opened = fstatSync(descriptor, { bigint: true });
|
|
165
|
+
const linked = lstatSync(path, { bigint: true });
|
|
138
166
|
if (!opened.isFile() || !linked.isFile()
|
|
167
|
+
|| (requireStableIdentity && (opened.dev === 0n || opened.ino === 0n))
|
|
139
168
|
|| opened.dev !== linked.dev || opened.ino !== linked.ino) {
|
|
140
169
|
throw new Error("atomic temporary file identity changed before write");
|
|
141
170
|
}
|
|
142
|
-
if (process.platform !== "win32" && (opened.mode &
|
|
171
|
+
if (process.platform !== "win32" && (opened.mode & 0o777n) !== 0o600n) {
|
|
143
172
|
throw new Error("atomic temporary file permissions are not owner-only");
|
|
144
173
|
}
|
|
145
174
|
}
|
|
@@ -195,13 +224,14 @@ function writePrivateTempFile(
|
|
|
195
224
|
path: string,
|
|
196
225
|
content: string,
|
|
197
226
|
timeoutMemoKey: string,
|
|
198
|
-
onCreated: () => void,
|
|
227
|
+
onCreated: (descriptor: number) => void,
|
|
228
|
+
requireStableIdentity = false,
|
|
199
229
|
): void {
|
|
200
230
|
const descriptor = openSync(path, "wx", 0o600);
|
|
201
|
-
onCreated();
|
|
202
231
|
try {
|
|
232
|
+
onCreated(descriptor);
|
|
203
233
|
if (windowsHardeningApplies()) {
|
|
204
|
-
hardenSecretPath(path, { required: true, timeoutMemoKey });
|
|
234
|
+
hardenSecretPath(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
|
|
205
235
|
}
|
|
206
236
|
// Keyed on the REAL platform, not the override: on a POSIX host the mode is
|
|
207
237
|
// the boundary and `assertPrivateTempDescriptor` demands 0o600, which an
|
|
@@ -209,11 +239,11 @@ function writePrivateTempFile(
|
|
|
209
239
|
if (process.platform !== "win32") {
|
|
210
240
|
fchmodSync(descriptor, 0o600);
|
|
211
241
|
}
|
|
212
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
242
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
213
243
|
writeFileSync(descriptor, content, { encoding: "utf-8" });
|
|
214
244
|
// Second assertion, after the content write: the object this path resolves
|
|
215
245
|
// to is still the object the ACL was applied to and the one we just wrote.
|
|
216
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
246
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
217
247
|
} finally {
|
|
218
248
|
closeSync(descriptor);
|
|
219
249
|
}
|
|
@@ -235,18 +265,19 @@ function writePrivateTempFileWith(
|
|
|
235
265
|
path: string,
|
|
236
266
|
write: (descriptor: number) => void,
|
|
237
267
|
timeoutMemoKey: string,
|
|
238
|
-
onCreated: () => void,
|
|
268
|
+
onCreated: (descriptor: number) => void,
|
|
269
|
+
requireStableIdentity = false,
|
|
239
270
|
): void {
|
|
240
271
|
const descriptor = openSync(path, "wx", 0o600);
|
|
241
|
-
onCreated();
|
|
242
272
|
try {
|
|
273
|
+
onCreated(descriptor);
|
|
243
274
|
if (windowsHardeningApplies()) {
|
|
244
|
-
hardenSecretPath(path, { required: true, timeoutMemoKey });
|
|
275
|
+
hardenSecretPath(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
|
|
245
276
|
}
|
|
246
277
|
if (process.platform !== "win32") fchmodSync(descriptor, 0o600);
|
|
247
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
278
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
248
279
|
write(descriptor);
|
|
249
|
-
assertPrivateTempDescriptor(path, descriptor);
|
|
280
|
+
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
250
281
|
fsyncSync(descriptor);
|
|
251
282
|
} finally {
|
|
252
283
|
closeSync(descriptor);
|
|
@@ -258,13 +289,13 @@ async function writePrivateTempFileAsync(
|
|
|
258
289
|
path: string,
|
|
259
290
|
content: string,
|
|
260
291
|
timeoutMemoKey: string,
|
|
261
|
-
onCreated: () => void,
|
|
292
|
+
onCreated: (descriptor: number) => void,
|
|
262
293
|
): Promise<void> {
|
|
263
294
|
const descriptor = openSync(path, "wx", 0o600);
|
|
264
|
-
onCreated();
|
|
265
295
|
try {
|
|
296
|
+
onCreated(descriptor);
|
|
266
297
|
if (windowsHardeningApplies()) {
|
|
267
|
-
await hardenSecretPathAsync(path, { required: true, timeoutMemoKey });
|
|
298
|
+
await hardenSecretPathAsync(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
|
|
268
299
|
}
|
|
269
300
|
if (process.platform !== "win32") {
|
|
270
301
|
fchmodSync(descriptor, 0o600);
|
|
@@ -285,21 +316,39 @@ function atomicWriteFileToTarget(
|
|
|
285
316
|
io?: AtomicWriteIO,
|
|
286
317
|
hooks: AtomicWriteHooks = {},
|
|
287
318
|
recordOwnership = true,
|
|
319
|
+
exclusive = false,
|
|
288
320
|
): void {
|
|
289
321
|
if (recordOwnership) recordOwnedConfigPath(getConfigDir(), path);
|
|
290
322
|
assertResolvedTargetAllowed(path, target);
|
|
291
323
|
const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
|
|
324
|
+
const releaseAcl = admitAtomicAclWork(target, tmp, io === undefined);
|
|
292
325
|
let hardened = false;
|
|
293
326
|
let ownsTemp = false;
|
|
327
|
+
// Cleanup must not consume the destination's recovery attempt for a later write.
|
|
328
|
+
let cleanupHarden = false;
|
|
329
|
+
let publicationAttempted = false;
|
|
330
|
+
let identity: BigIntStats | undefined;
|
|
331
|
+
const created = (descriptor: number): void => {
|
|
332
|
+
ownsTemp = true;
|
|
333
|
+
if (exclusive) identity = fstatSync(descriptor, { bigint: true });
|
|
334
|
+
};
|
|
335
|
+
const assertIdentity = (entry: string): BigIntStats => {
|
|
336
|
+
const current = lstatSync(entry, { bigint: true });
|
|
337
|
+
if (!identity?.isFile() || identity.dev === 0n || identity.ino === 0n || !current.isFile()
|
|
338
|
+
|| current.dev !== identity.dev || current.ino !== identity.ino) {
|
|
339
|
+
throw new Error("atomic exclusive publication identity changed");
|
|
340
|
+
}
|
|
341
|
+
return current;
|
|
342
|
+
};
|
|
294
343
|
const effective: AtomicWriteIO = io ?? {
|
|
295
|
-
write: (tempPath, value) => writePrivateTempFile(tempPath, value, path,
|
|
344
|
+
write: (tempPath, value) => writePrivateTempFile(tempPath, value, path, created, exclusive),
|
|
296
345
|
harden: tempPath => {
|
|
297
346
|
// No chmod on the Windows branch: there it sets the read-only ATTRIBUTE,
|
|
298
347
|
// which is not the secret boundary and is not what protects this file, and
|
|
299
348
|
// its ChangeTime bump is what used to invalidate the harden memo one line
|
|
300
349
|
// later. On POSIX the mode IS the boundary, so it stays.
|
|
301
350
|
if (windowsHardeningApplies()) {
|
|
302
|
-
hardenSecretPath(tempPath, { required: true, timeoutMemoKey: path });
|
|
351
|
+
hardenSecretPath(tempPath, { required: true, timeoutMemoKey: path, retryTimedOutOnce: !cleanupHarden });
|
|
303
352
|
return;
|
|
304
353
|
}
|
|
305
354
|
try { chmodSync(tempPath, 0o600); } catch { /* platform may ignore chmod */ }
|
|
@@ -313,15 +362,24 @@ function atomicWriteFileToTarget(
|
|
|
313
362
|
// A streaming writer bypasses the string form of `write` and nothing else. Every later
|
|
314
363
|
// step -- harden, the pre-rename hooks, the rename and the whole residual-cleanup path,
|
|
315
364
|
// which still scrubs through `effective.write(tmp, "")` -- is shared with the string form.
|
|
316
|
-
if (typeof content === "function") writePrivateTempFileWith(tmp, content, path,
|
|
365
|
+
if (typeof content === "function") writePrivateTempFileWith(tmp, content, path, created, exclusive);
|
|
317
366
|
else effective.write(tmp, content);
|
|
318
367
|
hooks.afterTempWrite?.(tmp, target);
|
|
368
|
+
if (exclusive) assertIdentity(tmp);
|
|
319
369
|
effective.harden(tmp);
|
|
320
370
|
hardened = true;
|
|
321
371
|
hooks.beforeRename?.(tmp, target);
|
|
322
372
|
hooks.validateBeforeRename?.(target);
|
|
323
|
-
|
|
373
|
+
if (exclusive) {
|
|
374
|
+
// link is an atomic no-replace publication on both NTFS and POSIX. A raced
|
|
375
|
+
// destination entry, including a symlink, is refused rather than followed.
|
|
376
|
+
assertIdentity(tmp);
|
|
377
|
+
publicationAttempted = true;
|
|
378
|
+
linkSync(tmp, target);
|
|
379
|
+
assertIdentity(target);
|
|
380
|
+
} else effective.rename(tmp, target);
|
|
324
381
|
hooks.afterRename?.(target);
|
|
382
|
+
if (exclusive) { assertIdentity(tmp); effective.unlink(tmp); }
|
|
325
383
|
// The rename is only as durable as the directory entry recording it. Fsyncing the temp's
|
|
326
384
|
// CONTENT and then losing the entry in a power cut leaves the old file in place, or the
|
|
327
385
|
// directory in an indeterminate state, while the caller was told the replacement landed.
|
|
@@ -334,10 +392,20 @@ function atomicWriteFileToTarget(
|
|
|
334
392
|
forgetEphemeralSecretPath(tmp);
|
|
335
393
|
} catch (cause) {
|
|
336
394
|
if (!ownsTemp) throw cause;
|
|
395
|
+
cleanupHarden = true;
|
|
396
|
+
let sharedTemp = false;
|
|
397
|
+
if (exclusive) {
|
|
398
|
+
try { sharedTemp = assertIdentity(tmp).nlink > 1n; } catch (error) {
|
|
399
|
+
if (isMissingPathError(error)) { forgetEphemeralSecretPath(tmp); throw cause; }
|
|
400
|
+
// The named entry is no longer ours. Neither truncate nor unlink it.
|
|
401
|
+
throw new AtomicWriteSecretResidualError(tmp, { cause });
|
|
402
|
+
}
|
|
403
|
+
}
|
|
337
404
|
let scrubbed = false;
|
|
338
405
|
try {
|
|
339
|
-
|
|
340
|
-
|
|
406
|
+
// A link syscall can publish and then report an error (e.g. a remote FS).
|
|
407
|
+
// Like initial config publication, cleanup after an attempt is unlink-only.
|
|
408
|
+
if (!publicationAttempted && !sharedTemp) { effective.truncate(tmp); scrubbed = true; }
|
|
341
409
|
} catch (error) {
|
|
342
410
|
if (isMissingPathError(error)) scrubbed = true;
|
|
343
411
|
else {
|
|
@@ -346,12 +414,13 @@ function atomicWriteFileToTarget(
|
|
|
346
414
|
}
|
|
347
415
|
let removed = false;
|
|
348
416
|
try {
|
|
417
|
+
if (exclusive) assertIdentity(tmp);
|
|
349
418
|
effective.unlink(tmp);
|
|
350
419
|
removed = true;
|
|
351
420
|
} catch (error) {
|
|
352
421
|
if (isMissingPathError(error)) removed = true;
|
|
353
422
|
else {
|
|
354
|
-
try { effective.unlink(tmp); removed = true; }
|
|
423
|
+
try { if (exclusive) assertIdentity(tmp); effective.unlink(tmp); removed = true; }
|
|
355
424
|
catch (retryError) { if (isMissingPathError(retryError)) removed = true; }
|
|
356
425
|
}
|
|
357
426
|
}
|
|
@@ -362,7 +431,7 @@ function atomicWriteFileToTarget(
|
|
|
362
431
|
if (removed) forgetEphemeralSecretPath(tmp);
|
|
363
432
|
if (!removed) throw new AtomicWriteResidualTempError(tmp, hardened, { cause });
|
|
364
433
|
throw cause;
|
|
365
|
-
}
|
|
434
|
+
} finally { releaseAcl?.(); }
|
|
366
435
|
}
|
|
367
436
|
|
|
368
437
|
export function atomicWriteFile(
|
|
@@ -398,14 +467,26 @@ export function atomicWriteFileStreamed(
|
|
|
398
467
|
*/
|
|
399
468
|
export function atomicWriteFileNoFollow(
|
|
400
469
|
path: string,
|
|
401
|
-
content: string,
|
|
470
|
+
content: string | Uint8Array,
|
|
402
471
|
io?: AtomicWriteIO,
|
|
403
472
|
hooks: AtomicWriteHooks = {},
|
|
473
|
+
options: { exclusive?: boolean } = {},
|
|
404
474
|
): void {
|
|
405
475
|
// Only the final entry is no-follow: the parent still resolves, because an
|
|
406
476
|
// OS alias above the configured root (a home junction, /tmp) is legitimate
|
|
407
477
|
// and Windows cannot exclusive-create a temp through a junction.
|
|
408
|
-
|
|
478
|
+
const value = typeof content === "string" ? content : (descriptor: number) => { writeFileSync(descriptor, content); };
|
|
479
|
+
// Recovery copies are deliberately unclaimed: uninstall must not own them.
|
|
480
|
+
atomicWriteFileToTarget(path, value, join(resolveWriteTarget(dirname(path)), basename(path)), io, hooks, !options.exclusive, options.exclusive);
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
/** Content fsync before rename is mandatory; parent-directory sync is best effort. */
|
|
484
|
+
export function atomicWriteFileNoFollowStreamed(
|
|
485
|
+
path: string,
|
|
486
|
+
write: (descriptor: number) => void,
|
|
487
|
+
hooks: AtomicWriteHooks = {},
|
|
488
|
+
): void {
|
|
489
|
+
atomicWriteFileToTarget(path, write, join(resolveWriteTarget(dirname(path)), basename(path)), undefined, hooks);
|
|
409
490
|
}
|
|
410
491
|
|
|
411
492
|
/**
|
|
@@ -437,12 +518,13 @@ export async function atomicWriteFileAsync(
|
|
|
437
518
|
testSeam?: AtomicWriteAsyncTestSeam,
|
|
438
519
|
): Promise<void> {
|
|
439
520
|
let ownsTemp = false;
|
|
521
|
+
let cleanupHarden = false;
|
|
440
522
|
const effective: AtomicWriteAsyncIO = io ?? {
|
|
441
523
|
write: (tempPath, value) => writePrivateTempFileAsync(tempPath, value, path, () => { ownsTemp = true; }),
|
|
442
524
|
harden: async tempPath => {
|
|
443
525
|
// Same reasoning as the synchronous writer above.
|
|
444
526
|
if (windowsHardeningApplies()) {
|
|
445
|
-
await hardenSecretPathAsync(tempPath, { required: true, timeoutMemoKey: path });
|
|
527
|
+
await hardenSecretPathAsync(tempPath, { required: true, timeoutMemoKey: path, retryTimedOutOnce: !cleanupHarden });
|
|
446
528
|
return;
|
|
447
529
|
}
|
|
448
530
|
try { chmodSync(tempPath, 0o600); } catch { /* platform may ignore chmod */ }
|
|
@@ -454,6 +536,7 @@ export async function atomicWriteFileAsync(
|
|
|
454
536
|
const target = resolveWriteTarget(path);
|
|
455
537
|
assertResolvedTargetAllowed(path, target);
|
|
456
538
|
const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
|
|
539
|
+
const releaseAcl = admitAtomicAclWork(target, tmp, io === undefined);
|
|
457
540
|
let hardened = false;
|
|
458
541
|
let tempWasHardenedBeforeContent = false;
|
|
459
542
|
try {
|
|
@@ -467,6 +550,7 @@ export async function atomicWriteFileAsync(
|
|
|
467
550
|
forgetEphemeralSecretPath(tmp);
|
|
468
551
|
} catch (cause) {
|
|
469
552
|
if (!ownsTemp) throw cause;
|
|
553
|
+
cleanupHarden = true;
|
|
470
554
|
// The async ACL belt bounds the writer, but it is not evidence that icacls released this
|
|
471
555
|
// path. Leave the temp in the existing residual state instead of racing an unlink against a
|
|
472
556
|
// live Windows handle. The default Windows writer hardens before writing secret bytes; a
|
|
@@ -502,5 +586,5 @@ export async function atomicWriteFileAsync(
|
|
|
502
586
|
if (removed) forgetEphemeralSecretPath(tmp);
|
|
503
587
|
if (!removed) throw new AtomicWriteResidualTempError(tmp, hardened, { cause });
|
|
504
588
|
throw cause;
|
|
505
|
-
}
|
|
589
|
+
} finally { releaseAcl?.(); }
|
|
506
590
|
}
|
|
@@ -8,6 +8,7 @@ import { join } from "node:path";
|
|
|
8
8
|
import * as z from "zod/v4";
|
|
9
9
|
import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
|
|
10
10
|
import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
|
|
11
|
+
import { WORKFLOW_BUDGET_SHAPE_HINT, workflowBudgetConfigError } from "./schema/workflow-budget";
|
|
11
12
|
import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
|
|
12
13
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
13
14
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
@@ -22,7 +23,7 @@ import { isMissingPathError } from "./atomic-write";
|
|
|
22
23
|
import { getConfigDir, getConfigPath } from "./paths";
|
|
23
24
|
import { getDefaultConfig } from "./proxy-env";
|
|
24
25
|
import { salvageConfigCandidate } from "./salvage";
|
|
25
|
-
import {
|
|
26
|
+
import { projectRemovedOpenCodeFreeSnapshot } from "./removed-opencode-free-backup";
|
|
26
27
|
import { sanitizeOpenCodeOverridesForLoad } from "./opencode-wire-upgrade";
|
|
27
28
|
import {
|
|
28
29
|
sanitizeReasoningPinsForLoad,
|
|
@@ -145,6 +146,7 @@ function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): Conf
|
|
|
145
146
|
warnings.push(...degradedListenerWarnings(rawParsed, normalized));
|
|
146
147
|
if (blockedModelRedirectsError(rawParsed)) warnings.push("blockedModelRedirects ignored: expected a map of nonempty model keys to nonempty string targets");
|
|
147
148
|
if (nativeReasoningRetentionConfigError(rawParsed)) warnings.push("nativeReasoningRetention ignored: expected only optional boolean modelSwitch and accountSwitch fields; both remain off");
|
|
149
|
+
if (workflowBudgetConfigError(rawParsed)) warnings.push("workflowBudget ignored: " + WORKFLOW_BUDGET_SHAPE_HINT + "; the built-in ceilings remain");
|
|
148
150
|
if (mainAccountHardLockFallbackError(rawParsed)) warnings.push("codexMainAccountHardLockFallback ignored: expected a nonblank model selector and an optional declared reasoningEffort");
|
|
149
151
|
if (fallbackPolicyError(rawParsed)) warnings.push("fallback partly ignored: expected boolean model/provider switches, providers/routes/devices maps of them, and devices.<id>.localFallback; ignored leaves keep today's fallback behavior");
|
|
150
152
|
const quotaAutoRefreshWarning = degradedCodexQuotaAutoRefreshWarning(rawParsed, normalized);
|
|
@@ -200,7 +202,7 @@ export function subagentDefaultSyncEffective(
|
|
|
200
202
|
}
|
|
201
203
|
|
|
202
204
|
export function mergeConfigDefaults(parsed: unknown): unknown {
|
|
203
|
-
if (!parsed || typeof parsed !== "object") return parsed;
|
|
205
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return parsed;
|
|
204
206
|
const defaults = getDefaultConfig();
|
|
205
207
|
const raw = parsed as Record<string, unknown>;
|
|
206
208
|
// Same absence-is-meaningful pin as the repair merge above.
|
|
@@ -735,6 +737,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
735
737
|
// drop a refusal on the next whole-config save; the write boundary rejects it instead.
|
|
736
738
|
?? fallbackPolicyError(value)
|
|
737
739
|
?? nativeReasoningRetentionConfigError(value)
|
|
740
|
+
?? workflowBudgetConfigError(value)
|
|
738
741
|
?? mainAccountHardLockFallbackError(value)
|
|
739
742
|
?? compactionRecoveryConfigError(value) ?? desktopCompatibilityConfigError(value) ?? configReasoningPinsConfigError(value)
|
|
740
743
|
?? blankHostnameError(value)
|
|
@@ -781,9 +784,13 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
781
784
|
}
|
|
782
785
|
|
|
783
786
|
export function configDiagnosticsFromRaw(raw: string): ConfigDiagnostics {
|
|
787
|
+
return configDiagnosticsFromText(raw);
|
|
788
|
+
}
|
|
789
|
+
|
|
790
|
+
function configDiagnosticsFromText(raw: string, file?: { path: string; bytes: Uint8Array }): ConfigDiagnostics {
|
|
784
791
|
try {
|
|
785
792
|
const parsed = JSON.parse(raw.replace(/^\uFEFF/, ""));
|
|
786
|
-
|
|
793
|
+
projectRemovedOpenCodeFreeSnapshot(parsed, file);
|
|
787
794
|
sanitizeOpenCodeOverridesForLoad(parsed);
|
|
788
795
|
sanitizeReasoningPinsForLoad(parsed);
|
|
789
796
|
// Same degradation as loadConfig: a hand-edited invalid retryOn429 must not trip the
|
|
@@ -835,10 +842,12 @@ export function configDiagnosticsFromRaw(raw: string): ConfigDiagnostics {
|
|
|
835
842
|
}
|
|
836
843
|
}
|
|
837
844
|
|
|
838
|
-
export function readConfigFileSnapshot(): ConfigFileSnapshot {
|
|
845
|
+
export function readConfigFileSnapshot(options: { passive?: boolean } = {}): ConfigFileSnapshot {
|
|
839
846
|
try {
|
|
840
|
-
const
|
|
841
|
-
|
|
847
|
+
const path = getConfigPath();
|
|
848
|
+
const bytes = readFileSync(path);
|
|
849
|
+
const raw = bytes.toString("utf-8");
|
|
850
|
+
return { diagnostics: configDiagnosticsFromText(raw, options.passive ? undefined : { path, bytes }), raw };
|
|
842
851
|
} catch (error) {
|
|
843
852
|
if (isMissingPathError(error)) {
|
|
844
853
|
return {
|
|
@@ -851,8 +860,9 @@ export function readConfigFileSnapshot(): ConfigFileSnapshot {
|
|
|
851
860
|
}
|
|
852
861
|
}
|
|
853
862
|
|
|
854
|
-
|
|
855
|
-
|
|
863
|
+
/** Passive observations project retired providers without publishing recovery backups. */
|
|
864
|
+
export function readConfigDiagnostics(options: { passive?: boolean } = {}): ConfigDiagnostics {
|
|
865
|
+
return readConfigFileSnapshot(options).diagnostics;
|
|
856
866
|
}
|
|
857
867
|
|
|
858
868
|
/** Read-only init preflight. Occupied unsafe entries are never treated as absence. */
|
|
@@ -890,12 +900,13 @@ export type ConfigAdmissionSnapshot =
|
|
|
890
900
|
| Readonly<{ kind: "unreadable"; diagnostics: ConfigDiagnostics; contentSha256: null }>;
|
|
891
901
|
|
|
892
902
|
export function readConfigAdmissionSnapshot(): ConfigAdmissionSnapshot {
|
|
903
|
+
const path = getConfigPath();
|
|
893
904
|
let bytes: Buffer;
|
|
894
905
|
try {
|
|
895
906
|
// ONE read. Hashing the file and then reading it again to parse would leave
|
|
896
907
|
// a window for the two to disagree, which is the exact hazard this exists
|
|
897
908
|
// to detect — the check would become a second chance to be wrong.
|
|
898
|
-
bytes = readFileSync(
|
|
909
|
+
bytes = readFileSync(path);
|
|
899
910
|
} catch (error) {
|
|
900
911
|
return {
|
|
901
912
|
kind: "unreadable",
|
|
@@ -908,7 +919,7 @@ export function readConfigAdmissionSnapshot(): ConfigAdmissionSnapshot {
|
|
|
908
919
|
return {
|
|
909
920
|
kind: "read",
|
|
910
921
|
// Decoded from the same buffer that was hashed, not re-read from disk.
|
|
911
|
-
diagnostics:
|
|
922
|
+
diagnostics: configDiagnosticsFromText(bytes.toString("utf-8"), { path, bytes }),
|
|
912
923
|
contentSha256: createHash("sha256").update(bytes).digest("hex"),
|
|
913
924
|
};
|
|
914
925
|
}
|
package/src/config/initialize.ts
CHANGED
|
@@ -43,16 +43,16 @@ function hardenInitialConfig(fd: number, temp: string, target: string): void {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
function identifiesDescriptor(fd: number, path: string): boolean {
|
|
47
|
-
const opened = fstatSync(fd);
|
|
48
|
-
const entry = lstatSync(path);
|
|
46
|
+
function identifiesDescriptor(fd: number, path: string, privateMode = false): boolean {
|
|
47
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
48
|
+
const entry = lstatSync(path, { bigint: true });
|
|
49
49
|
return opened.isFile() && entry.isFile()
|
|
50
|
-
&& opened.dev === entry.dev && opened.ino === entry.ino
|
|
50
|
+
&& opened.dev === entry.dev && opened.ino === entry.ino
|
|
51
|
+
&& (!privateMode || process.platform === "win32" || (opened.mode & 0o777n) === 0o600n);
|
|
51
52
|
}
|
|
52
53
|
|
|
53
54
|
function verifyPrivateTemp(fd: number, temp: string): void {
|
|
54
|
-
if (!identifiesDescriptor(fd, temp)
|
|
55
|
-
|| (process.platform !== "win32" && (fstatSync(fd).mode & 0o777) !== 0o600)) {
|
|
55
|
+
if (!identifiesDescriptor(fd, temp, true)) {
|
|
56
56
|
throw new Error("Initial config temporary file identity or permissions changed.");
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -19,7 +19,6 @@ import { withConfigMutationLockSync, bumpGenerationForCooperatingConfigWrite } f
|
|
|
19
19
|
import { ConfigWritePublishedError, persistConfigUnlocked, readRawConfigJson } from "./persist-unlocked";
|
|
20
20
|
import { configDiagnosticsFromRaw, readConfigDiagnostics, validateConfigCandidate } from "./diagnostics";
|
|
21
21
|
import { normalizePersistedClaudeCode } from "./load-degrade";
|
|
22
|
-
import { sanitizeRemovedOpenCodeFreeForLoad } from "./removed-opencode-free";
|
|
23
22
|
import { reconcileApiKeys } from "./api-key-reconcile";
|
|
24
23
|
import { captureLiveTopologyBaseline, LIVE_TOPOLOGY_KEYS, projectLiveTopology } from "./live-topology";
|
|
25
24
|
|
|
@@ -109,6 +108,16 @@ export function adoptPersistedModelDiscovery(
|
|
|
109
108
|
baseline.disabledModels = structuredClone(persisted.disabledModels);
|
|
110
109
|
}
|
|
111
110
|
}
|
|
111
|
+
|
|
112
|
+
/** Adopt the committed Advisor subtree without advancing unrelated pending live intent. */
|
|
113
|
+
export function adoptPersistedAdvisor(config: OcxConfig, persisted: OcxConfig["advisor"]): void {
|
|
114
|
+
config.advisor = structuredClone(persisted);
|
|
115
|
+
const baseline = liveConfigBaseline.get(config);
|
|
116
|
+
// A known absent key remains rebaseable when a later disk edit adds it back.
|
|
117
|
+
if (baseline) baseline.advisor = structuredClone(persisted);
|
|
118
|
+
clearConfigTopLevelDeletionIntent(config, ["advisor"]);
|
|
119
|
+
if (baseline) clearConfigTopLevelDeletionIntent(baseline, ["advisor"]);
|
|
120
|
+
}
|
|
112
121
|
/**
|
|
113
122
|
* The live config retains the address of the socket Bun actually opened, while
|
|
114
123
|
* this map retains the operator's desired address for the next process start.
|
|
@@ -531,8 +540,7 @@ export function saveConfigPreservingClaudeCode(config: OcxConfig): void {
|
|
|
531
540
|
const bindingBaseline = persistedLiveServerBinding.get(config);
|
|
532
541
|
// One authoritative pre-write read feeds both the live-config reconciliation and
|
|
533
542
|
// custom-model deletion migration. A second read could observe different bytes.
|
|
534
|
-
const onDisk = readRawConfigJson();
|
|
535
|
-
sanitizeRemovedOpenCodeFreeForLoad(onDisk);
|
|
543
|
+
const onDisk = readRawConfigJson(true);
|
|
536
544
|
const pauseBefore = snapshotAutoPauseFingerprints(config);
|
|
537
545
|
const baseline = liveConfigBaseline.get(config);
|
|
538
546
|
let diskDeletedKeys = new Set<string>();
|
|
@@ -4,6 +4,7 @@ import { chmodSync, existsSync } from "node:fs";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
|
|
6
6
|
import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
|
|
7
|
+
import { workflowBudgetConfigError } from "./schema/workflow-budget";
|
|
7
8
|
import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
|
|
8
9
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
9
10
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
@@ -137,6 +138,7 @@ export function warnDegradedCompactionRouting(rawParsed: unknown, validated: Ocx
|
|
|
137
138
|
*/
|
|
138
139
|
export function warnDegradedTopLevelOptIns(rawParsed: unknown, validated: OcxConfig): void {
|
|
139
140
|
if (nativeReasoningRetentionConfigError(rawParsed)) console.warn("⚠️ invalid nativeReasoningRetention disabled; model and account switch allowances remain off");
|
|
141
|
+
if (workflowBudgetConfigError(rawParsed)) console.warn("⚠️ invalid workflowBudget ignored; the built-in workflow ceilings stay in force");
|
|
140
142
|
setCodexWsReuseAcrossTurns(validated.codexWsReuseAcrossTurns === true);
|
|
141
143
|
const retentionWarning = degradedReasoningRetentionWarning(rawParsed, validated);
|
|
142
144
|
if (retentionWarning) console.warn(retentionWarning);
|
|
@@ -156,10 +156,11 @@ export function readOwnerRegistry(): OwnerRegistryRead {
|
|
|
156
156
|
}
|
|
157
157
|
|
|
158
158
|
/** Retire 'home' from the shared registry. Best-effort like registration. */
|
|
159
|
-
export function unregisterOwnerRegistryHome(home: string): void {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
159
|
+
export function unregisterOwnerRegistryHome(home: string, beforeMutation?: () => void): void {
|
|
160
|
+
let path: string;
|
|
161
|
+
try { path = registryEntryPath(ownerRegistryDir(), home); } catch { return; }
|
|
162
|
+
beforeMutation?.();
|
|
163
|
+
try { unlinkSync(path); } catch { /* a missing pointer needs no removal */ }
|
|
163
164
|
}
|
|
164
165
|
|
|
165
166
|
/** Register this process's own home after its runtime record is published. */
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { publishCredentialSync } from "../local-credentials/generation";
|
|
2
|
+
import { osStoreAccounts } from "../local-credentials/references";
|
|
1
3
|
import { normalizeAccountAutoPauseRevisions, observeAccountAutoPauseRevisions, snapshotAutoPauseFingerprints } from "./account-auto-pause-revisions";
|
|
2
4
|
import { existsSync, readFileSync } from "node:fs";
|
|
3
5
|
import { configReasoningPinsConfigError } from "./provider-validation";
|
|
@@ -8,6 +10,7 @@ import { atomicWriteFile, isMissingPathError } from "./atomic-write";
|
|
|
8
10
|
import { getConfigPath } from "./paths";
|
|
9
11
|
import { configRebaseDeletionKeys, projectConfigRebaseProvenance } from "./rebase-provenance";
|
|
10
12
|
import { clientConnectionSchema } from "./schema/leaf-validators";
|
|
13
|
+
import { projectRemovedOpenCodeFreeSnapshot } from "./removed-opencode-free-backup";
|
|
11
14
|
|
|
12
15
|
/** The requested bytes are current; callers must not roll back only live state. */
|
|
13
16
|
export class ConfigWritePublishedError extends Error {
|
|
@@ -17,19 +20,39 @@ export class ConfigWritePublishedError extends Error {
|
|
|
17
20
|
}
|
|
18
21
|
}
|
|
19
22
|
|
|
20
|
-
/** The literal file, with no schema merge or default injection. */
|
|
21
|
-
export function readRawConfigJson(): Record<string, unknown> | undefined {
|
|
23
|
+
/** The literal file, with no schema merge or default injection; preserve-only leaves it unprojected. */
|
|
24
|
+
export function readRawConfigJson(projectRetired: boolean | "preserve-only" = false): Record<string, unknown> | undefined {
|
|
25
|
+
let configPath: string;
|
|
26
|
+
let bytes: Buffer;
|
|
27
|
+
let parsed: unknown;
|
|
22
28
|
try {
|
|
23
|
-
|
|
29
|
+
configPath = getConfigPath();
|
|
24
30
|
if (!existsSync(configPath)) return undefined;
|
|
25
|
-
|
|
26
|
-
const
|
|
31
|
+
bytes = readFileSync(configPath);
|
|
32
|
+
const raw = bytes.toString("utf-8").replace(/^\uFEFF/, "");
|
|
33
|
+
parsed = JSON.parse(raw) as unknown;
|
|
27
34
|
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return undefined;
|
|
28
|
-
return parsed as Record<string, unknown>;
|
|
29
35
|
} catch {
|
|
30
36
|
// Unreadable or corrupt: behave exactly as before. Never fail a save over protection.
|
|
31
37
|
return undefined;
|
|
32
38
|
}
|
|
39
|
+
if (projectRetired === "preserve-only") {
|
|
40
|
+
// Preservation is optional; its failure must not discard the parsed snapshot that the
|
|
41
|
+
// client-state guard and OS-store reference accounting depend on.
|
|
42
|
+
try {
|
|
43
|
+
projectRemovedOpenCodeFreeSnapshot(structuredClone(parsed), { path: configPath, bytes });
|
|
44
|
+
} catch {
|
|
45
|
+
console.warn("[opencodex] Could not check config.json for retired OpenCode Free entries before saving; no recovery copy was made.");
|
|
46
|
+
}
|
|
47
|
+
} else if (projectRetired) {
|
|
48
|
+
try {
|
|
49
|
+
projectRemovedOpenCodeFreeSnapshot(parsed, { path: configPath, bytes });
|
|
50
|
+
} catch {
|
|
51
|
+
// The in-place projection may be partial; keep the previous unreadable result.
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return parsed as Record<string, unknown>;
|
|
33
56
|
}
|
|
34
57
|
|
|
35
58
|
function failClosedClientPersistenceError(
|
|
@@ -67,7 +90,8 @@ export function persistConfigUnlocked(config: OcxConfig): boolean {
|
|
|
67
90
|
const pinError = configReasoningPinsConfigError(config);
|
|
68
91
|
if (pinError) throw new Error(pinError);
|
|
69
92
|
const configPath = getConfigPath();
|
|
70
|
-
|
|
93
|
+
// Protect late disk edits from these same bytes, retaining raw rows for guards and credential accounting.
|
|
94
|
+
const rawBeforeWrite = readRawConfigJson("preserve-only");
|
|
71
95
|
const clientPersistenceError = failClosedClientPersistenceError(rawBeforeWrite, config);
|
|
72
96
|
if (clientPersistenceError) throw new Error(clientPersistenceError);
|
|
73
97
|
// External editors can add provider rows the live config deliberately does
|
|
@@ -96,7 +120,9 @@ export function persistConfigUnlocked(config: OcxConfig): boolean {
|
|
|
96
120
|
let observedPublication = false;
|
|
97
121
|
try {
|
|
98
122
|
if (!unchanged) {
|
|
99
|
-
|
|
123
|
+
// Register every OS-store reference on either side before a removal can land.
|
|
124
|
+
publishCredentialSync(() => atomicWriteFile(configPath, bytes, undefined, { afterRename: () => { published = true; } }),
|
|
125
|
+
{ references: [...new Set([...osStoreAccounts(rawBeforeWrite), ...osStoreAccounts(persisted)])] });
|
|
100
126
|
published = true;
|
|
101
127
|
}
|
|
102
128
|
// Publication, not successful cache refresh, is the rollback boundary. A
|
|
@@ -17,6 +17,13 @@ export type PersistedConfigMutationOutcome<T> =
|
|
|
17
17
|
const CONFIG_MUTATION_MAX_REBASE_ATTEMPTS = 3;
|
|
18
18
|
let persistedConfigMutationBeforeCommitForTests: (() => void) | null = null;
|
|
19
19
|
|
|
20
|
+
/** Re-read authority inside ACL admission without starting another optional hardening flight. */
|
|
21
|
+
export function readConfigForAdmittedMutation(): OcxConfig {
|
|
22
|
+
const { diagnostics } = readConfigFileSnapshot();
|
|
23
|
+
if (diagnostics.source !== "file") throw new Error("config_unavailable");
|
|
24
|
+
return diagnostics.config;
|
|
25
|
+
}
|
|
26
|
+
|
|
20
27
|
/** Test-only one-shot seam: inject a competing mutation after the first decision, before freshness revalidation. */
|
|
21
28
|
export function setPersistedConfigMutationBeforeCommitForTests(hook: (() => void) | null): void {
|
|
22
29
|
persistedConfigMutationBeforeCommitForTests = hook;
|