@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { aliasTemplateError } from "../providers/alias-template";
|
|
2
|
+
import { redactSecretString } from "../lib/redact";
|
|
2
3
|
import { parseDashboardTrustedProxy } from "./dashboard-trusted-proxy";
|
|
3
4
|
import { readExistingSpendSalt, spendPoolAliasesError, validatePoolAliasOwners } from "../lib/spend-pool-alias-validation";
|
|
4
5
|
import { isSubagentModelEntry, rawSubagentModelForce } from "./subagent-models";
|
|
@@ -16,6 +17,7 @@ import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility"
|
|
|
16
17
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
17
18
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
18
19
|
import { fallbackPolicyError } from "./schema/fallback-policy";
|
|
20
|
+
import { subscriptionReserveConfigError } from "./schema/subscription-reserve";
|
|
19
21
|
import type { OcxConfig } from "../types";
|
|
20
22
|
import { anthropicAccountPoolConfigError, anthropicOAuthInstanceConfigError, anthropicSidecarConfigError } from "./schema/anthropic-account-pool";
|
|
21
23
|
import { configReasoningPinsConfigError } from "./provider-validation";
|
|
@@ -30,9 +32,11 @@ import { projectRemovedOpenCodeFreeSnapshot } from "./removed-opencode-free-back
|
|
|
30
32
|
import { sanitizeOpenCodeOverridesForLoad } from "./opencode-wire-upgrade";
|
|
31
33
|
import {
|
|
32
34
|
sanitizeReasoningPinsForLoad,
|
|
35
|
+
sanitizeAgyAcpForLoad,
|
|
33
36
|
sanitizeRetryOn429ForLoad,
|
|
34
37
|
sanitizeCapabilityDeclarationsForLoad,
|
|
35
38
|
sanitizeModelCostsForLoad,
|
|
39
|
+
sanitizeCreditPriceForLoad,
|
|
36
40
|
sanitizeAutoReviewForLoad,
|
|
37
41
|
degradedListenerWarnings,
|
|
38
42
|
degradedReasoningRetentionWarning,
|
|
@@ -57,6 +61,7 @@ import {
|
|
|
57
61
|
rawConfigRecord,
|
|
58
62
|
malformedNativeSubagentFields,
|
|
59
63
|
malformedNativeSubagentFieldWarning,
|
|
64
|
+
malformedCodexAuthMethodWarning,
|
|
60
65
|
malformedCodexAccountPickerWarning,
|
|
61
66
|
nativeSubagentSyncDisabledReason,
|
|
62
67
|
normalizeNativeSubagentSync,
|
|
@@ -131,7 +136,7 @@ function configPlaceholderWarnings(config: OcxConfig): string[] {
|
|
|
131
136
|
return warnings;
|
|
132
137
|
}
|
|
133
138
|
|
|
134
|
-
function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): ConfigDiagnostics {
|
|
139
|
+
function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown, repairs: readonly string[]): ConfigDiagnostics {
|
|
135
140
|
// Unsafe hand-edited optional values are disabled in memory instead of rejecting
|
|
136
141
|
// the entire config, which would hide unrelated providers/accounts. The next
|
|
137
142
|
// ordinary save persists the normalized absence.
|
|
@@ -139,7 +144,9 @@ function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): Conf
|
|
|
139
144
|
const rawForce = rawSubagentModelForce(rawParsed);
|
|
140
145
|
const rawEffort = rawClaudeSubagentEffort(rawParsed);
|
|
141
146
|
const normalized = normalizeClaudeSubagentEffort(normalizeNativeSubagentSync(config, rawParsed), rawParsed);
|
|
142
|
-
const warnings = configPlaceholderWarnings(normalized);
|
|
147
|
+
const warnings = [...repairs, ...configPlaceholderWarnings(normalized)];
|
|
148
|
+
const codexAuthWarning = malformedCodexAuthMethodWarning(rawParsed);
|
|
149
|
+
if (codexAuthWarning) warnings.push(codexAuthWarning);
|
|
143
150
|
if (rawForce !== undefined && !isSubagentModelEntry(rawForce)) warnings.push("claudeCode.subagentModelForce ignored: expected a safe roster-style model id");
|
|
144
151
|
if (normalized.chatgptDesktop?.appServerShim === true && process.platform !== "darwin") {
|
|
145
152
|
warnings.push("chatgptDesktop.appServerShim is experimental and macOS only; ignored on this platform");
|
|
@@ -155,6 +162,7 @@ function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): Conf
|
|
|
155
162
|
if (routedCatalogDefaultsConfigError(rawParsed)) warnings.push("routedCatalogDefaults ignored: " + ROUTED_CATALOG_DEFAULTS_SHAPE_HINT + "; routed catalog rows keep their derived values");
|
|
156
163
|
if (mainAccountHardLockFallbackError(rawParsed)) warnings.push("codexMainAccountHardLockFallback ignored: expected a nonblank model selector and an optional declared reasoningEffort");
|
|
157
164
|
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");
|
|
165
|
+
if (subscriptionReserveConfigError(rawParsed)) warnings.push("subscriptionReserve ignored: invalid weekly reserve policy");
|
|
158
166
|
const quotaAutoRefreshWarning = degradedCodexQuotaAutoRefreshWarning(rawParsed, normalized);
|
|
159
167
|
if (quotaAutoRefreshWarning) warnings.push(quotaAutoRefreshWarning);
|
|
160
168
|
if (rawEffort !== undefined && !isClaudeSubagentEffort(rawEffort)) {
|
|
@@ -229,8 +237,8 @@ export function mergeConfigDefaults(parsed: unknown): unknown {
|
|
|
229
237
|
|
|
230
238
|
function schemaDiagnosticsError(error: z.ZodError): string {
|
|
231
239
|
const details = error.issues.map(issue => {
|
|
232
|
-
const path = issue.path.join(".") || "config";
|
|
233
|
-
return `${path}: ${issue.message}`;
|
|
240
|
+
const path = issue.path.map(segment => typeof segment === "string" ? redactSecretString(segment) : segment).join(".") || "config";
|
|
241
|
+
return `${path}: ${redactSecretString(issue.message)}`;
|
|
234
242
|
});
|
|
235
243
|
return details.length > 0 ? `schema_invalid: ${details.join("; ")}` : "schema_invalid";
|
|
236
244
|
}
|
|
@@ -290,6 +298,14 @@ function upstreamRequestCompressionError(value: unknown): string | null {
|
|
|
290
298
|
return "schema_invalid: upstreamRequestCompression: must be \"off\", \"gzip\" or \"zstd\"";
|
|
291
299
|
}
|
|
292
300
|
|
|
301
|
+
function upstreamHistorySlimConfigError(value: unknown): string | null {
|
|
302
|
+
const raw = rawConfigRecord(value);
|
|
303
|
+
if (!raw || !Object.hasOwn(raw, "upstreamHistorySlim")) return null;
|
|
304
|
+
const mode = raw.upstreamHistorySlim;
|
|
305
|
+
if (mode === undefined || mode === "off" || mode === "codex") return null;
|
|
306
|
+
return "schema_invalid: upstreamHistorySlim: must be \"off\" or \"codex\"";
|
|
307
|
+
}
|
|
308
|
+
|
|
293
309
|
function plaintextV2AgentMessagesError(value: unknown): string | null {
|
|
294
310
|
return malformedPlaintextV2AgentMessagesWarning(value)
|
|
295
311
|
? "schema_invalid: plaintextV2AgentMessages: must be a boolean or omitted"
|
|
@@ -555,6 +571,12 @@ function oauthOpenBrowserError(value: unknown): string | null {
|
|
|
555
571
|
return "schema_invalid: oauthOpenBrowser: must be a boolean or omitted";
|
|
556
572
|
}
|
|
557
573
|
|
|
574
|
+
function codexAuthMethodError(value: unknown): string | null {
|
|
575
|
+
return malformedCodexAuthMethodWarning(value)
|
|
576
|
+
? 'schema_invalid: codexAuthMethod: must be "auto", "device-only", or omitted'
|
|
577
|
+
: null;
|
|
578
|
+
}
|
|
579
|
+
|
|
558
580
|
/** Validate an in-memory config candidate without touching disk. Used by headless CLI import/set. */
|
|
559
581
|
/**
|
|
560
582
|
* Reject a loopback-listener port that collides with the proxy port (#1102), and a port-less
|
|
@@ -778,6 +800,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
778
800
|
// OCX-11: the read schema degrades a malformed fallback leaf to absent, which would silently
|
|
779
801
|
// drop a refusal on the next whole-config save; the write boundary rejects it instead.
|
|
780
802
|
?? fallbackPolicyError(value)
|
|
803
|
+
?? subscriptionReserveConfigError(value)
|
|
781
804
|
?? nativeReasoningRetentionConfigError(value)
|
|
782
805
|
?? workflowBudgetConfigError(value)
|
|
783
806
|
?? routedCatalogDefaultsConfigError(value)
|
|
@@ -789,6 +812,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
789
812
|
?? appOwnedMemoryBudgetError(value)
|
|
790
813
|
?? upstreamHostCircuitThresholdError(value)
|
|
791
814
|
?? upstreamRequestCompressionError(value)
|
|
815
|
+
?? upstreamHistorySlimConfigError(value)
|
|
792
816
|
?? plaintextV2AgentMessagesError(value)
|
|
793
817
|
?? agentTaskRecoveryError(value)
|
|
794
818
|
?? quotaResetNotifyError(value)
|
|
@@ -805,6 +829,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
805
829
|
?? emptyCompletionRetryError(value)
|
|
806
830
|
?? dropCodexSafetyBufferingError(value)
|
|
807
831
|
?? oauthOpenBrowserError(value)
|
|
832
|
+
?? codexAuthMethodError(value)
|
|
808
833
|
?? showCodexCreditsError(value)
|
|
809
834
|
?? creditCodexAccountIdsError(value)
|
|
810
835
|
?? remainingQuotaAccountIdsError(value)
|
|
@@ -835,6 +860,11 @@ export function configDiagnosticsFromRaw(raw: string, options: { warn?: (message
|
|
|
835
860
|
|
|
836
861
|
function configDiagnosticsFromText(raw: string, file?: { path: string; bytes: Uint8Array }, warn?: (message: string) => void): ConfigDiagnostics {
|
|
837
862
|
try {
|
|
863
|
+
const repairs: string[] = [];
|
|
864
|
+
const reportAgyRepair = (message: string): void => {
|
|
865
|
+
repairs.push(message);
|
|
866
|
+
(warn ?? console.warn)(`⚠️ config.json ${message}`);
|
|
867
|
+
};
|
|
838
868
|
const parsed = JSON.parse(raw.replace(/^\uFEFF/, ""));
|
|
839
869
|
projectRemovedOpenCodeFreeSnapshot(parsed, file);
|
|
840
870
|
sanitizeOpenCodeOverridesForLoad(parsed);
|
|
@@ -845,17 +875,23 @@ function configDiagnosticsFromText(raw: string, file?: { path: string; bytes: Ui
|
|
|
845
875
|
sanitizeModelDisplayNamesForLoad(parsed, warn);
|
|
846
876
|
sanitizeAutoReviewForLoad(parsed, warn);
|
|
847
877
|
sanitizeRetryOn429ForLoad(parsed, warn);
|
|
878
|
+
sanitizeAgyAcpForLoad(parsed, reportAgyRepair);
|
|
848
879
|
sanitizeModelCostsForLoad(parsed, warn);
|
|
880
|
+
sanitizeCreditPriceForLoad(parsed, message => {
|
|
881
|
+
repairs.push(message);
|
|
882
|
+
(warn ?? console.warn)(message);
|
|
883
|
+
});
|
|
849
884
|
sanitizeCapabilityDeclarationsForLoad(parsed, warn);
|
|
850
885
|
const result = configSchema.safeParse(parsed);
|
|
851
886
|
if (result.success) {
|
|
852
|
-
return validFileConfigDiagnostics(normalizeApiKeyIds(result.data as OcxConfig), parsed);
|
|
887
|
+
return validFileConfigDiagnostics(normalizeApiKeyIds(result.data as OcxConfig), parsed, repairs);
|
|
853
888
|
}
|
|
854
889
|
|
|
855
890
|
const merged = mergeConfigDefaults(parsed);
|
|
891
|
+
sanitizeAgyAcpForLoad(merged, reportAgyRepair);
|
|
856
892
|
const retryResult = configSchema.safeParse(merged);
|
|
857
893
|
if (retryResult.success) {
|
|
858
|
-
return validFileConfigDiagnostics(normalizeApiKeyIds(retryResult.data as OcxConfig), parsed);
|
|
894
|
+
return validFileConfigDiagnostics(normalizeApiKeyIds(retryResult.data as OcxConfig), parsed, repairs);
|
|
859
895
|
}
|
|
860
896
|
|
|
861
897
|
// #1785: one invalid routing profile must not make diagnostics report the built-in
|
|
@@ -871,7 +907,7 @@ function configDiagnosticsFromText(raw: string, file?: { path: string; bytes: Ui
|
|
|
871
907
|
const salvaged = salvageConfigCandidate(merged, retryResult.error);
|
|
872
908
|
if (salvaged) {
|
|
873
909
|
const config = normalizeApiKeyIds(salvaged.parsed);
|
|
874
|
-
const warnings = degradedListenerWarnings(parsed, config);
|
|
910
|
+
const warnings = [...repairs, ...degradedListenerWarnings(parsed, config)];
|
|
875
911
|
const chatgptDesktopIssue = chatgptDesktopConfigIssue(parsed);
|
|
876
912
|
if (chatgptDesktopIssue) warnings.push(`${chatgptDesktopIssue}; the whole chatgptDesktop block is ignored, so the ChatGPT desktop integration reads as off`);
|
|
877
913
|
return {
|
|
@@ -882,7 +918,10 @@ function configDiagnosticsFromText(raw: string, file?: { path: string; bytes: Ui
|
|
|
882
918
|
};
|
|
883
919
|
}
|
|
884
920
|
|
|
885
|
-
return {
|
|
921
|
+
return {
|
|
922
|
+
config: getDefaultConfig(), source: "fallback", error: schemaDiagnosticsError(result.error),
|
|
923
|
+
...(repairs.length > 0 ? { warnings: repairs } : {}),
|
|
924
|
+
};
|
|
886
925
|
} catch {
|
|
887
926
|
return { config: getDefaultConfig(), source: "fallback", error: "invalid_json" };
|
|
888
927
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { OcxConfig } from "../types";
|
|
2
2
|
|
|
3
|
-
export const LIVE_TOPOLOGY_KEYS = new Set([
|
|
3
|
+
export const LIVE_TOPOLOGY_KEYS = new Set([
|
|
4
|
+
"hostname", "port", "runtimeRole", "hub", "client", "unauthenticatedLoopbackListener", "codexAuthMethod",
|
|
5
|
+
]);
|
|
4
6
|
const baselines = new WeakMap<OcxConfig, Record<string, unknown>>();
|
|
5
7
|
|
|
6
8
|
function snapshot(config: OcxConfig): Record<string, unknown> {
|
|
@@ -14,7 +16,7 @@ export function captureLiveTopologyBaseline(config: OcxConfig): void {
|
|
|
14
16
|
baselines.set(config, snapshot(config));
|
|
15
17
|
}
|
|
16
18
|
|
|
17
|
-
/** Merge desired next-start
|
|
19
|
+
/** Merge desired next-start settings without mutating active values. */
|
|
18
20
|
export function projectLiveTopology(
|
|
19
21
|
config: OcxConfig, persisted: OcxConfig,
|
|
20
22
|
mergeRecord: (live: Record<string, unknown>, baseline: Record<string, unknown>, disk: Record<string, unknown>, skipped: ReadonlySet<string>) => void,
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { setCodexWsReuseAcrossTurns } from "./codex-ws-reuse-setting";
|
|
2
1
|
import { isSubagentModelEntry, rawSubagentModelForce } from "./subagent-models";
|
|
3
2
|
import { chmodSync, existsSync } from "node:fs";
|
|
4
3
|
import { join } from "node:path";
|
|
@@ -10,7 +9,9 @@ import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility"
|
|
|
10
9
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
11
10
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
12
11
|
import { fallbackPolicyError } from "./schema/fallback-policy";
|
|
12
|
+
import { subscriptionReserveConfigError } from "./schema/subscription-reserve";
|
|
13
13
|
import { anthropicSidecarConfigError } from "./schema/anthropic-account-pool";
|
|
14
|
+
import { agyAcpProviderFieldIssues, agyAcpUnattendedTargetIssues } from "./schema/agy-acp-references";
|
|
14
15
|
import {
|
|
15
16
|
modelPinnedEffortsConfigError,
|
|
16
17
|
pinnedReasoningEffortConfigError,
|
|
@@ -42,6 +43,7 @@ import {
|
|
|
42
43
|
clientConnectionSchema,
|
|
43
44
|
isUsableApiKeySecret,
|
|
44
45
|
managementIngressSchema,
|
|
46
|
+
codexAuthMethodSchema,
|
|
45
47
|
codexPoolSchema,
|
|
46
48
|
codexAccountAutoSwitchThresholdsSchema,
|
|
47
49
|
providerModelCostsConfigError,
|
|
@@ -56,6 +58,7 @@ import {
|
|
|
56
58
|
spendSchema,
|
|
57
59
|
telemetryConfigSchema,
|
|
58
60
|
chatgptDesktopConfigIssue,
|
|
61
|
+
isValidCreditPriceUsd,
|
|
59
62
|
} from "./schema/leaf-validators";
|
|
60
63
|
import { hasWarnedInheritedFastWireConflict, markWarnedInheritedFastWireConflict } from "./warn-memo";
|
|
61
64
|
|
|
@@ -140,10 +143,11 @@ export function warnDegradedCompactionRouting(rawParsed: unknown, validated: Ocx
|
|
|
140
143
|
* the ratchet only ever moves down: a per-block call there costs a line the file does not have.
|
|
141
144
|
*/
|
|
142
145
|
export function warnDegradedTopLevelOptIns(rawParsed: unknown, validated: OcxConfig): void {
|
|
146
|
+
const codexAuthWarning = malformedCodexAuthMethodWarning(rawParsed);
|
|
147
|
+
if (codexAuthWarning) console.warn(`⚠️ config.json ${codexAuthWarning}`);
|
|
143
148
|
if (nativeReasoningRetentionConfigError(rawParsed)) console.warn("⚠️ invalid nativeReasoningRetention disabled; model and account switch allowances remain off");
|
|
144
149
|
if (workflowBudgetConfigError(rawParsed)) console.warn("⚠️ invalid workflowBudget ignored; the built-in workflow ceilings stay in force");
|
|
145
150
|
if (routedCatalogDefaultsConfigError(rawParsed)) console.warn("⚠️ invalid routedCatalogDefaults ignored; routed catalog rows keep their derived values");
|
|
146
|
-
setCodexWsReuseAcrossTurns(validated.codexWsReuseAcrossTurns === true);
|
|
147
151
|
const retentionWarning = degradedReasoningRetentionWarning(rawParsed, validated);
|
|
148
152
|
if (retentionWarning) console.warn(retentionWarning);
|
|
149
153
|
if (compactionRecoveryConfigError(rawParsed)) console.warn("⚠️ invalid compactionRecovery disabled; the original compaction failure is preserved");
|
|
@@ -151,6 +155,7 @@ export function warnDegradedTopLevelOptIns(rawParsed: unknown, validated: OcxCon
|
|
|
151
155
|
if (blockedModelRedirectsError(rawParsed)) console.warn("⚠️ invalid blockedModelRedirects ignored; provider routing remains available");
|
|
152
156
|
if (mainAccountHardLockFallbackError(rawParsed)) console.warn("⚠️ invalid codexMainAccountHardLockFallback ignored; the main-account hard lock still refuses while blocked");
|
|
153
157
|
if (fallbackPolicyError(rawParsed)) console.warn("⚠️ invalid fallback leaves ignored; those scopes keep today's fallback behavior");
|
|
158
|
+
if (subscriptionReserveConfigError(rawParsed)) console.warn("⚠️ invalid subscriptionReserve disabled; Claude subscription routing remains available");
|
|
154
159
|
const chatgptDesktop = chatgptDesktopConfigIssue(rawParsed);
|
|
155
160
|
if (chatgptDesktop) console.warn(`⚠️ config.json ${chatgptDesktop} — the whole chatgptDesktop block is ignored, so the ChatGPT desktop integration reads as off`);
|
|
156
161
|
warnDegradedStreamMode(rawParsed, validated);
|
|
@@ -197,6 +202,70 @@ export function warnDegradedMemoryModels(rawParsed: unknown, validated: OcxConfi
|
|
|
197
202
|
}
|
|
198
203
|
}
|
|
199
204
|
|
|
205
|
+
/** Repair ACP-specific provider fields and unattended selectors on disk reads. */
|
|
206
|
+
export function sanitizeAgyAcpForLoad(
|
|
207
|
+
parsed: unknown,
|
|
208
|
+
warn: (message: string) => void = message => console.warn(`⚠️ config.json ${message}`),
|
|
209
|
+
): void {
|
|
210
|
+
const root = rawConfigRecord(parsed);
|
|
211
|
+
if (!root) return;
|
|
212
|
+
const report = (issue: ReturnType<typeof agyAcpProviderFieldIssues>[number], repair: string): void => {
|
|
213
|
+
const path = issue.path.map(segment => typeof segment === "string"
|
|
214
|
+
? redactSecretString(segment).replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g,
|
|
215
|
+
ch => "\\u" + ch.charCodeAt(0).toString(16).padStart(4, "0"))
|
|
216
|
+
: segment).join(".");
|
|
217
|
+
warn(path + ": " + issue.message + " " + repair);
|
|
218
|
+
};
|
|
219
|
+
// Fallback issues are indexed into their original arrays. Remove later entries first.
|
|
220
|
+
for (const issue of agyAcpUnattendedTargetIssues(root).reverse()) {
|
|
221
|
+
const [section, field, index] = issue.path;
|
|
222
|
+
if (section === "memoryModels" && typeof field === "string") {
|
|
223
|
+
const memory = rawConfigRecord(root.memoryModels);
|
|
224
|
+
if (memory) delete memory[field];
|
|
225
|
+
} else if (section === "injectionModel") {
|
|
226
|
+
root.syncCodexSubagentDefaults = false;
|
|
227
|
+
} else if (section === "compactionRouting") {
|
|
228
|
+
const compaction = rawConfigRecord(root.compactionRouting);
|
|
229
|
+
if (compaction && Array.isArray(compaction.triggers)) {
|
|
230
|
+
const remaining = compaction.triggers.filter(trigger => trigger !== "auto");
|
|
231
|
+
if (remaining.length) compaction.triggers = remaining;
|
|
232
|
+
else delete root.compactionRouting;
|
|
233
|
+
}
|
|
234
|
+
} else if (section === "shadowCallIntercept") {
|
|
235
|
+
const shadow = rawConfigRecord(root.shadowCallIntercept);
|
|
236
|
+
if (shadow) shadow.enabled = false;
|
|
237
|
+
} else if (section === "subagentModelFallback" && Array.isArray(root.subagentModelFallback) && typeof field === "number") {
|
|
238
|
+
root.subagentModelFallback.splice(field, 1);
|
|
239
|
+
} else if (section === "subagentModelFallbackByModel" && typeof field === "string" && typeof index === "number") {
|
|
240
|
+
const byModel = rawConfigRecord(root.subagentModelFallbackByModel);
|
|
241
|
+
const fallback = byModel?.[field];
|
|
242
|
+
if (byModel && Array.isArray(fallback)) {
|
|
243
|
+
fallback.splice(index, 1);
|
|
244
|
+
if (fallback.length === 0) delete byModel[field];
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
const repair = section === "injectionModel" ? "Disabling managed subagent default sync on load."
|
|
248
|
+
: section === "compactionRouting" ? "Ignoring the automatic compaction trigger on load."
|
|
249
|
+
: "Ignoring this target on load.";
|
|
250
|
+
report(issue, repair);
|
|
251
|
+
}
|
|
252
|
+
const providers = rawConfigRecord(root.providers);
|
|
253
|
+
// Apply indexed removals from the end so earlier model entries retain their indices.
|
|
254
|
+
for (const issue of agyAcpProviderFieldIssues(root).reverse()) {
|
|
255
|
+
const [, name, field, entry] = issue.path;
|
|
256
|
+
if (typeof name !== "string" || typeof field !== "string") continue;
|
|
257
|
+
const provider = rawConfigRecord(providers?.[name]);
|
|
258
|
+
if (!provider) continue;
|
|
259
|
+
const value = provider[field];
|
|
260
|
+
if (field === "models" && Array.isArray(value) && typeof entry === "number") value.splice(entry, 1);
|
|
261
|
+
else if (field === "modelAliases" && typeof entry === "string") {
|
|
262
|
+
const aliases = rawConfigRecord(value);
|
|
263
|
+
if (aliases) delete aliases[entry];
|
|
264
|
+
} else delete provider[field];
|
|
265
|
+
report(issue, "Ignoring this provider setting on load.");
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
|
|
200
269
|
/**
|
|
201
270
|
* Load-time degradation for helper `anthropicInstance` (loadConfig only). A malformed id, or one
|
|
202
271
|
* that conflicts with its block's backend or model, drops just that key with a warning, so the
|
|
@@ -433,6 +502,24 @@ export function sanitizeModelCostsForLoad(parsed: unknown, warn: (message: strin
|
|
|
433
502
|
}
|
|
434
503
|
}
|
|
435
504
|
|
|
505
|
+
/**
|
|
506
|
+
* Load-time degradation for `providers.<name>.creditPriceUsd`, mirroring
|
|
507
|
+
* {@link sanitizeModelCostsForLoad}: an invalid hand-edited price is dropped with a warning
|
|
508
|
+
* instead of failing the parse and falling back to defaults. The schema still rejects it on writes.
|
|
509
|
+
*/
|
|
510
|
+
export function sanitizeCreditPriceForLoad(parsed: unknown, warn: (message: string) => void = console.warn): void {
|
|
511
|
+
if (!parsed || typeof parsed !== "object") return;
|
|
512
|
+
const providers = (parsed as Record<string, unknown>).providers;
|
|
513
|
+
if (!providers || typeof providers !== "object" || Array.isArray(providers)) return;
|
|
514
|
+
for (const provider of Object.values(providers as Record<string, unknown>)) {
|
|
515
|
+
if (!provider || typeof provider !== "object" || Array.isArray(provider)) continue;
|
|
516
|
+
const p = provider as Record<string, unknown>;
|
|
517
|
+
if (p.creditPriceUsd === undefined || isValidCreditPriceUsd(p.creditPriceUsd)) continue;
|
|
518
|
+
delete p.creditPriceUsd;
|
|
519
|
+
warn("⚠️ config.json provider has an invalid creditPriceUsd — ignoring the credit price");
|
|
520
|
+
}
|
|
521
|
+
}
|
|
522
|
+
|
|
436
523
|
/**
|
|
437
524
|
* Load-time degradation for provider-scoped auto-review selectors. A malformed
|
|
438
525
|
* hand edit must not fail the whole config parse; the management boundary stays
|
|
@@ -938,6 +1025,13 @@ export function malformedNativeSubagentFieldWarning(field: NativeSubagentPersist
|
|
|
938
1025
|
return `${field} ignored: expected ${expected}`;
|
|
939
1026
|
}
|
|
940
1027
|
|
|
1028
|
+
export const MALFORMED_CODEX_AUTH_METHOD_WARNING = 'codexAuthMethod ignored: using "auto" for Codex pool logins. Expected "auto", "device-only", or omission.';
|
|
1029
|
+
|
|
1030
|
+
export function malformedCodexAuthMethodWarning(rawParsed: unknown): string | null {
|
|
1031
|
+
if (codexAuthMethodSchema.safeParse(rawConfigRecord(rawParsed)?.codexAuthMethod).success) return null;
|
|
1032
|
+
return MALFORMED_CODEX_AUTH_METHOD_WARNING;
|
|
1033
|
+
}
|
|
1034
|
+
|
|
941
1035
|
export function malformedCodexAccountPickerWarning(rawParsed: unknown): string | null {
|
|
942
1036
|
const raw = rawConfigRecord(rawParsed);
|
|
943
1037
|
if (!raw || !Object.hasOwn(raw, "codexAccountPickerEnabled")) return null;
|
|
@@ -38,12 +38,14 @@ function configMutationDatabasePath(dir: string = getConfigDir()): string {
|
|
|
38
38
|
// First statement on purpose: a rejected mutation must leave nothing behind, not a
|
|
39
39
|
// freshly created/chmod'd directory or database. See src/lib/test-home-guard.ts.
|
|
40
40
|
assertNotRealHomeUnderTest(dir);
|
|
41
|
+
const windowsAcl = windowsSecretAclApplies();
|
|
41
42
|
if (!existsSync(dir)) {
|
|
42
43
|
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
43
|
-
} else {
|
|
44
|
+
} else if (!windowsAcl) {
|
|
44
45
|
try { chmodSync(dir, 0o700); } catch { /* best-effort on existing dir */ }
|
|
45
46
|
}
|
|
46
|
-
|
|
47
|
+
// Windows chmod does not set a DACL and can invalidate its freshness memo.
|
|
48
|
+
if (windowsAcl) {
|
|
47
49
|
try {
|
|
48
50
|
// Distinct timeout memo from management-token directory harden: a required
|
|
49
51
|
// management-dir timeout must not poison config mutation on the same home
|
|
@@ -115,7 +117,9 @@ export function withConfigMutationLockSync<T>(fn: () => T, dir?: string): T {
|
|
|
115
117
|
let transactionOpen = false;
|
|
116
118
|
try {
|
|
117
119
|
database = new Database(path, { create: true });
|
|
118
|
-
|
|
120
|
+
if (!windowsSecretAclApplies()) {
|
|
121
|
+
try { chmodSync(path, 0o600); } catch { /* platform may ignore chmod */ }
|
|
122
|
+
}
|
|
119
123
|
database.exec("PRAGMA busy_timeout = 0; BEGIN IMMEDIATE");
|
|
120
124
|
transactionOpen = true;
|
|
121
125
|
initializeConfigGeneration(database);
|
package/src/config/paths.ts
CHANGED
|
@@ -20,6 +20,9 @@ const configDirHardeningFlights = new Map<string, Promise<void>>();
|
|
|
20
20
|
|
|
21
21
|
export function getConfigDir(): string {
|
|
22
22
|
const raw = process.env["OPENCODEX_HOME"]?.trim() || undefined;
|
|
23
|
+
if (raw === "undefined" || raw === "./undefined") {
|
|
24
|
+
throw new Error('OPENCODEX_HOME resolved to "undefined"; set it to a config directory');
|
|
25
|
+
}
|
|
23
26
|
if (resolvedConfigDirCache && resolvedConfigDirCache.raw === raw) return resolvedConfigDirCache.path;
|
|
24
27
|
const path = raw ? resolve(expandUserPath(raw)) : join(homedir(), ".opencodex");
|
|
25
28
|
resolvedConfigDirCache = { raw, path };
|
|
@@ -4,6 +4,7 @@ import { join } from "node:path";
|
|
|
4
4
|
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
5
5
|
import { atomicWriteFile } from "./atomic-write";
|
|
6
6
|
import { getConfigDir } from "./paths";
|
|
7
|
+
import type { ClientStopOwner } from "./process-state";
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* Ownership receipt for a deferred shared teardown (#3008).
|
|
@@ -30,6 +31,10 @@ import { getConfigDir } from "./paths";
|
|
|
30
31
|
export type PendingTeardownReceipt = {
|
|
31
32
|
/** Process that accepted the obligation, so a live owner is distinguishable from a dead one. */
|
|
32
33
|
ownerPid: number;
|
|
34
|
+
/** Optional process incarnation on claims bound to an active Link stop fence. */
|
|
35
|
+
ownerStartTime?: string;
|
|
36
|
+
/** Exact foreign-endpoint receipt snapshot verified by this Link stop before signaling. */
|
|
37
|
+
inheritedTeardownDigest?: string;
|
|
33
38
|
/** Identity of this claim; also its filename, which is what makes a clear a single-syscall delete. */
|
|
34
39
|
nonce: string;
|
|
35
40
|
/** ISO timestamp, for diagnostics only; recovery is decided by liveness, not by age. */
|
|
@@ -116,7 +121,7 @@ export function pendingTeardownPathFor(nonce: string): string {
|
|
|
116
121
|
return join(getConfigDir(), `${PREFIX}${nonce}${SUFFIX}`);
|
|
117
122
|
}
|
|
118
123
|
|
|
119
|
-
function
|
|
124
|
+
export function isValidPendingTeardownReceipt(value: unknown, nonce: string): value is PendingTeardownReceipt {
|
|
120
125
|
if (!value || typeof value !== "object") return false;
|
|
121
126
|
const receipt = value as Record<string, unknown>;
|
|
122
127
|
const endpoint = receipt.endpoint as Record<string, unknown> | undefined;
|
|
@@ -132,6 +137,10 @@ function isReceipt(value: unknown, nonce: string): value is PendingTeardownRecei
|
|
|
132
137
|
// The body must agree with the name: a receipt whose nonce was edited to name a
|
|
133
138
|
// different claim would let a request authorize a deferral it does not own.
|
|
134
139
|
&& receipt.nonce === nonce
|
|
140
|
+
&& (receipt.ownerStartTime === undefined || (typeof receipt.ownerStartTime === "string"
|
|
141
|
+
&& receipt.ownerStartTime.length > 0 && receipt.ownerStartTime.length <= 80))
|
|
142
|
+
&& (receipt.inheritedTeardownDigest === undefined || (typeof receipt.inheritedTeardownDigest === "string"
|
|
143
|
+
&& /^[a-f0-9]{64}$/.test(receipt.inheritedTeardownDigest)))
|
|
135
144
|
&& typeof receipt.createdAt === "string"
|
|
136
145
|
&& (receipt.endpointSource === "exact" || receipt.endpointSource === "guessed")
|
|
137
146
|
&& (receipt.handover === undefined || receipt.handover === "update-restart")
|
|
@@ -145,12 +154,19 @@ export function claimPendingTeardown(
|
|
|
145
154
|
ownerPid: number = process.pid,
|
|
146
155
|
handover?: "update-restart",
|
|
147
156
|
partA?: PendingTeardownPartA | null,
|
|
157
|
+
stopOwner?: ClientStopOwner,
|
|
158
|
+
inheritedTeardownDigest?: string,
|
|
148
159
|
): PendingTeardownReceipt {
|
|
149
160
|
const dir = getConfigDir();
|
|
150
161
|
assertNotRealHomeUnderTest(dir);
|
|
151
|
-
|
|
162
|
+
if (stopOwner && (stopOwner.pid !== ownerPid || endpointSource !== "exact" || !/^[a-f0-9]{32}$/.test(stopOwner.nonce))) {
|
|
163
|
+
throw new Error("invalid Link stop receipt owner");
|
|
164
|
+
}
|
|
165
|
+
const nonce = stopOwner?.nonce ?? randomBytes(16).toString("hex");
|
|
152
166
|
const receipt: PendingTeardownReceipt = {
|
|
153
167
|
ownerPid, nonce, createdAt: new Date().toISOString(), endpoint, endpointSource,
|
|
168
|
+
...(stopOwner ? { ownerStartTime: stopOwner.startTime } : {}),
|
|
169
|
+
...(inheritedTeardownDigest ? { inheritedTeardownDigest } : {}),
|
|
154
170
|
...(handover ? { handover } : {}),
|
|
155
171
|
...(partA ? { partA } : {}),
|
|
156
172
|
};
|
|
@@ -205,7 +221,7 @@ export function readPendingTeardown(nonce: string): PendingTeardownRead {
|
|
|
205
221
|
}
|
|
206
222
|
try {
|
|
207
223
|
const parsed: unknown = JSON.parse(raw);
|
|
208
|
-
if (
|
|
224
|
+
if (isValidPendingTeardownReceipt(parsed, nonce)) return { state: "valid", receipt: parsed };
|
|
209
225
|
const digest = createHash("sha256").update(raw).digest("hex").slice(0, 12);
|
|
210
226
|
return { state: "invalid", nonce, detail: `malformed receipt (sha256 ${digest})` };
|
|
211
227
|
} catch {
|
|
@@ -148,16 +148,27 @@ export function writePid(pid: number): void {
|
|
|
148
148
|
atomicWriteFile(getPidPath(), String(pid));
|
|
149
149
|
}
|
|
150
150
|
|
|
151
|
+
export type ClientStopOwner = { nonce: string; pid: number; startTime: string };
|
|
152
|
+
|
|
151
153
|
export type RuntimePortState = {
|
|
152
154
|
pid: number;
|
|
153
155
|
port: number;
|
|
154
156
|
hostname?: string;
|
|
157
|
+
role?: string;
|
|
158
|
+
/** OS creation identity of a standalone owner, when available. */
|
|
159
|
+
startTime?: string;
|
|
155
160
|
/** Absolute relaunch prefix written by runtimes that identify their serving install. */
|
|
156
161
|
command?: string[];
|
|
157
162
|
/** Per-process proof key; protected by the config directory and never served. */
|
|
158
163
|
attestationSecret?: string;
|
|
159
164
|
/** A Link runtime is draining; new and in-flight sync commits must stand down. */
|
|
160
165
|
clientStopping?: true;
|
|
166
|
+
/** Parent stop: true while active, false after it finishes with this runtime still fenced. */
|
|
167
|
+
clientStopRequested?: boolean;
|
|
168
|
+
/** This stop's exact deferred-teardown nonce and OS process incarnation. */
|
|
169
|
+
clientStopOwner?: ClientStopOwner;
|
|
170
|
+
/** Stable serving Link fingerprint, or null for a native Hub client. */
|
|
171
|
+
clientLinkOwner?: string | null;
|
|
161
172
|
/**
|
|
162
173
|
* Fresh for every publication of a client runtime, including the rollback of a failed restart.
|
|
163
174
|
* A sync compares the whole record before each commit, so one captured before a restart cannot
|
|
@@ -202,6 +213,7 @@ export function isValidRuntimePortState(value: unknown): value is RuntimePortSta
|
|
|
202
213
|
&& hostnameOk
|
|
203
214
|
&& attestationOk
|
|
204
215
|
&& (state.clientStopping === undefined || state.clientStopping === true)
|
|
216
|
+
&& (state.clientStopRequested === undefined || (typeof state.clientStopRequested === "boolean" && state.clientStopping === true))
|
|
205
217
|
&& (state.servingGeneration === undefined || (typeof state.servingGeneration === "string" && state.servingGeneration.length <= 64))
|
|
206
218
|
&& (state.restartOwner === undefined || (typeof state.restartOwner === "string" && state.restartOwner.length <= 64))
|
|
207
219
|
&& siblingOk;
|
|
@@ -495,10 +507,19 @@ function readNativeWindowsCommandLine(pid: number): string | undefined {
|
|
|
495
507
|
}
|
|
496
508
|
}
|
|
497
509
|
|
|
498
|
-
|
|
510
|
+
/** A caller with a deadline can share its remaining time across all subprocess fallbacks. */
|
|
511
|
+
export function readProcessCommandLine(pid: number, remainingMs: () => number = () => Infinity): string | undefined {
|
|
499
512
|
if (!Number.isSafeInteger(pid) || pid <= 0) return undefined;
|
|
513
|
+
const run = (executable: string, args: string[], capMs: number): string | undefined => {
|
|
514
|
+
const timeout = Math.floor(Math.min(capMs, remainingMs()));
|
|
515
|
+
if (timeout <= 0) return undefined;
|
|
516
|
+
return processCommandLineExec(executable, args, {
|
|
517
|
+
encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"], timeout, windowsHide: true,
|
|
518
|
+
});
|
|
519
|
+
};
|
|
500
520
|
const platform = processCommandLinePlatformForTests ?? process.platform;
|
|
501
521
|
try {
|
|
522
|
+
if (remainingMs() <= 0) return undefined;
|
|
502
523
|
if (platform === "linux") {
|
|
503
524
|
try {
|
|
504
525
|
const output = readFileSync(`/proc/${pid}/cmdline`, "utf-8");
|
|
@@ -518,9 +539,10 @@ export function readProcessCommandLine(pid: number): string | undefined {
|
|
|
518
539
|
// the trusted fixed PowerShell binary without consulting PATH or env roots.
|
|
519
540
|
const wmic = join(resolveTrustedWindowsSystemDirectory(), "wbem", "WMIC.exe");
|
|
520
541
|
try {
|
|
521
|
-
const output =
|
|
542
|
+
const output = run(wmic, [
|
|
522
543
|
"process", "where", `ProcessId=${pid}`, "get", "CommandLine", "/VALUE",
|
|
523
|
-
],
|
|
544
|
+
], 3000);
|
|
545
|
+
if (output === undefined) return undefined;
|
|
524
546
|
const match = /^CommandLine=(.*)$/m.exec(output.replace(/\r/g, ""));
|
|
525
547
|
const value = match?.[1]?.trim();
|
|
526
548
|
if (value) return value;
|
|
@@ -531,14 +553,14 @@ export function readProcessCommandLine(pid: number): string | undefined {
|
|
|
531
553
|
// unchanged process and turns a guarded stop into a false approval-changed.
|
|
532
554
|
for (let attempt = 0; attempt < 2; attempt += 1) {
|
|
533
555
|
try {
|
|
534
|
-
const output =
|
|
556
|
+
const output = run(resolveTrustedWindowsPowerShellExe(), [
|
|
535
557
|
"-NoProfile",
|
|
536
558
|
"-NoLogo",
|
|
537
559
|
"-NonInteractive",
|
|
538
560
|
"-Command",
|
|
539
561
|
`(Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}").CommandLine`,
|
|
540
|
-
],
|
|
541
|
-
return output
|
|
562
|
+
], 3000);
|
|
563
|
+
return output?.trim() || undefined;
|
|
542
564
|
} catch {
|
|
543
565
|
/* timed out or CIM unavailable — try once more, then unreadable */
|
|
544
566
|
}
|
|
@@ -547,12 +569,8 @@ export function readProcessCommandLine(pid: number): string | undefined {
|
|
|
547
569
|
}
|
|
548
570
|
for (const ps of ["/bin/ps", "/usr/bin/ps"]) {
|
|
549
571
|
try {
|
|
550
|
-
const output =
|
|
551
|
-
|
|
552
|
-
stdio: ["ignore", "pipe", "ignore"],
|
|
553
|
-
timeout: 1000,
|
|
554
|
-
windowsHide: true,
|
|
555
|
-
});
|
|
572
|
+
const output = run(ps, ["-p", String(pid), "-o", "command="], 1000);
|
|
573
|
+
if (output === undefined) return undefined;
|
|
556
574
|
const value = output.trim();
|
|
557
575
|
if (value) return value;
|
|
558
576
|
} catch {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { isCanonicalOpenAiForwardProvider } from "../providers/openai-tiers";
|
|
2
2
|
import { assertWorkBuddyDestination } from "../providers/workbuddy";
|
|
3
3
|
import { resolveDshAccountMessagesUrl } from "../providers/dsh-account-destination";
|
|
4
|
+
import { M365_COPILOT_BASE_URL } from "../providers/m365-copilot-models";
|
|
4
5
|
import { redactSecretString } from "../lib/redact";
|
|
5
6
|
import {
|
|
6
7
|
isValidModelDiscoveryModelId,
|
|
@@ -457,6 +458,15 @@ export function credentialPinnedProviderConfigError(
|
|
|
457
458
|
catch { return "WorkBuddy AI credentials require https://www.workbuddy.ai/v2"; }
|
|
458
459
|
return null;
|
|
459
460
|
}
|
|
461
|
+
if (providerName === "m365-copilot") {
|
|
462
|
+
if (provider.adapter !== undefined && provider.adapter !== "m365-copilot") {
|
|
463
|
+
return 'adapter must stay "m365-copilot": its Microsoft account token is pinned to that adapter';
|
|
464
|
+
}
|
|
465
|
+
if (typeof provider.baseUrl === "string" && provider.baseUrl.replace(/\/+$/, "") !== M365_COPILOT_BASE_URL) {
|
|
466
|
+
return `baseUrl must stay on ${M365_COPILOT_BASE_URL}: its Microsoft account token is pinned to that host`;
|
|
467
|
+
}
|
|
468
|
+
return null;
|
|
469
|
+
}
|
|
460
470
|
if (providerName !== "dsh-account") return null;
|
|
461
471
|
if (provider.adapter !== undefined && provider.adapter !== "dsh-account") {
|
|
462
472
|
return 'adapter must stay "dsh-account": its account token is pinned to that adapter';
|
package/src/config/salvage.ts
CHANGED
|
@@ -11,7 +11,7 @@ import type { OcxConfig } from "../types";
|
|
|
11
11
|
export function warnConfigRepaired(configPath: string, error: z.ZodError): void {
|
|
12
12
|
if (hasWarnedConfigFallback(configPath)) return;
|
|
13
13
|
markWarnedConfigFallback(configPath);
|
|
14
|
-
const fields = error.issues.map(i => i.path
|
|
14
|
+
const fields = error.issues.map(i => redactIssuePath(i.path) || "config").join(", ");
|
|
15
15
|
console.error(`opencodex config at ${configPath}: repaired missing field(s) [${fields}] with defaults. Your providers and accounts are preserved.`);
|
|
16
16
|
}
|
|
17
17
|
|
|
@@ -229,7 +229,7 @@ export function warnAndBackupInvalidConfig(configPath: string, error: unknown):
|
|
|
229
229
|
|
|
230
230
|
const backupPath = backupInvalidConfig(configPath);
|
|
231
231
|
const reason = error instanceof z.ZodError
|
|
232
|
-
? error.issues.map(issue => `${issue.path
|
|
232
|
+
? error.issues.map(issue => `${redactIssuePath(issue.path) || "config"}: ${redactSecretString(issue.message)}`).join("; ")
|
|
233
233
|
: error instanceof Error ? error.message : String(error);
|
|
234
234
|
const backupNote = backupPath ? ` A backup was written to ${backupPath}.` : "";
|
|
235
235
|
console.error(`Could not load opencodex config at ${configPath}: ${reason}. Using default config.${backupNote}`);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as z from "zod/v4";
|
|
2
|
-
import {
|
|
2
|
+
import { normalizeCloudCodeAppealText, normalizeCloudCodeAppealUrl } from "../../lib/cloud-code-appeal-link";
|
|
3
|
+
import { ACCOUNT_PAUSE_REASONS, type AccountPauseEvidence } from "../../types/account-auto-pause";
|
|
3
4
|
|
|
4
5
|
export const accountAutoPausePolicySchema = z.object({
|
|
5
6
|
enabled: z.boolean().optional(),
|
|
@@ -9,6 +10,19 @@ export const accountPauseDetailsSchema = z.object({
|
|
|
9
10
|
reason: z.enum(ACCOUNT_PAUSE_REASONS),
|
|
10
11
|
pausedAt: z.number().int().nonnegative(),
|
|
11
12
|
}).strict();
|
|
13
|
+
// Not strict: unknown keys a later build adds are dropped instead of costing the known ones.
|
|
14
|
+
// `accountPauseDetailsSchema` stays frozen; new pause facts go here (see AccountPauseEvidence).
|
|
15
|
+
export const accountPauseEvidenceSchema = z.object({
|
|
16
|
+
statusCode: z.number().int().min(100).max(599),
|
|
17
|
+
message: z.string().max(300).optional(),
|
|
18
|
+
appealUrl: z.unknown().optional(),
|
|
19
|
+
appealText: z.unknown().optional(),
|
|
20
|
+
}).transform(({ appealUrl: rawUrl, appealText: rawText, ...evidence }): AccountPauseEvidence => {
|
|
21
|
+
const appealUrl = normalizeCloudCodeAppealUrl(rawUrl);
|
|
22
|
+
if (!appealUrl) return evidence;
|
|
23
|
+
const appealText = normalizeCloudCodeAppealText(rawText);
|
|
24
|
+
return { ...evidence, appealUrl, ...(appealText ? { appealText } : {}) };
|
|
25
|
+
});
|
|
12
26
|
export const accountPauseStateSchema = z.record(z.string(), z.object({
|
|
13
27
|
revision: z.string(), details: accountPauseDetailsSchema.optional(),
|
|
14
28
|
}).strict());
|