@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
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-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.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
package/src/cli/index.ts
CHANGED
|
@@ -166,9 +166,9 @@ import { uninstallPrivilegeRefusal } from "../lib/config-ownership";
|
|
|
166
166
|
import { withProcessRuntimeProvenance } from "../lib/bun-runtime";
|
|
167
167
|
import { startArgv } from "../lib/self-launch-argv";
|
|
168
168
|
import { initializeNodeLauncherContext } from "./launcher-context";
|
|
169
|
-
import { assertConnectedClientStopSupported, clearRestoredStopReceipts, connectedClientStopSkipLine, notOwnedTeardownIsAcceptable, preflightConnectedClientStop, preserveConnectedClientRoutingOnExit, restoreBoundaryOwnership, restoreSharedClientStateAfterStop, settleUnrestoredStopBoundary } from "./stop-restore";
|
|
169
|
+
import { abandonedTeardownIsSafeToFinish, assertConnectedClientStopSupported, classifyStopRole, clearRestoredStopReceipts, configuredStopEndpoint, connectedClientStopSkipLine, isRegisteredServiceStopTarget, notOwnedTeardownIsAcceptable, preflightConnectedClientStop, preserveConnectedClientRoutingOnExit, proveStandaloneStopRecord, restoreBoundaryOwnership, restoreSharedClientStateAfterStop, settleUnrestoredStopBoundary, stopOwnershipRefused, unclassifiedStopTarget, unsupportedConnectedStop, verifyConnectedStopTarget, type LinkStopPreflight, type StopTargetProof } from "./stop-restore";
|
|
170
170
|
import { stopRestoreWriteGuard } from "./stop-restore-guard";
|
|
171
|
-
import {
|
|
171
|
+
import { startConnectedClientWithOwnershipFence } from "./client-start-fence";
|
|
172
172
|
import { recoverStartJournalAfterOwnerRecheck, recoverStartStateUnderOwnershipLease } from "./start-owner-fence";
|
|
173
173
|
import { handledSignalExitCode } from "../lib/handled-signal-exit";
|
|
174
174
|
import { createLocalAttestationSecret } from "../lib/local-management-attestation";
|
|
@@ -491,14 +491,7 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
491
491
|
if (rotationGate.kind === "recovery-required" || rotationGate.kind === "unsafe") {
|
|
492
492
|
throw new Error(clientStartupRefusalMessage(rotationGate.reason));
|
|
493
493
|
}
|
|
494
|
-
|
|
495
|
-
// Same lease-held owner recheck as the server path below: this branch binds and publishes too.
|
|
496
|
-
await startClientRuntimeUnderOwnershipLease({
|
|
497
|
-
acquireLease: () => acquireOwnershipMutationLease(serviceStatePaths()),
|
|
498
|
-
decide: () => serviceChildOwnershipDecisionForClassifiedChild(supervisedServiceChild),
|
|
499
|
-
stayOut: refusal => { console.error("❌ " + refusal); process.exit(serviceStayOutExitCode()); },
|
|
500
|
-
start: afterPublish => startClientRuntime({ port: requestedPort, block: options.block, afterPublish }),
|
|
501
|
-
});
|
|
494
|
+
await startConnectedClientWithOwnershipFence({ connection: clientState.value, siblingStart, supervisedServiceChild, requestedPort, block: options.block });
|
|
502
495
|
return;
|
|
503
496
|
}
|
|
504
497
|
|
|
@@ -511,6 +504,7 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
511
504
|
// live daemon holding resources while it overwrites its own binary. Never from a
|
|
512
505
|
// sibling: replacing the global package makes the live proxy drain and restart.
|
|
513
506
|
if (!siblingStart) await maybeShowUpdatePrompt();
|
|
507
|
+
const { readClientStopProcessStart } = await import("../client/stop-teardown-owner");
|
|
514
508
|
|
|
515
509
|
type StartServerModule = typeof import("../server");
|
|
516
510
|
type BoundStart = {
|
|
@@ -610,6 +604,7 @@ async function handleStart(options: { block?: boolean } = {}) {
|
|
|
610
604
|
port: bound.port,
|
|
611
605
|
hostname: bound.server.hostname,
|
|
612
606
|
attestationSecret: bound.localAttestationSecret,
|
|
607
|
+
startTime: readClientStopProcessStart(process.pid),
|
|
613
608
|
command: currentServingCommand(),
|
|
614
609
|
...siblingRuntimeField(),
|
|
615
610
|
}); updateRestartChild?.complete(); },
|
|
@@ -1013,8 +1008,10 @@ async function handleRestartStartWhenStopped(recoveringLiveRestart = false): Pro
|
|
|
1013
1008
|
}
|
|
1014
1009
|
async function handleStop(approval?: StopApproval) {
|
|
1015
1010
|
const lease = acquireOwnershipMutationLease(serviceStatePaths());
|
|
1011
|
+
let finishConnectedStop: (() => Promise<void>) | undefined;
|
|
1012
|
+
const stop = (snapshot?: GuardedStopSnapshot) => handleStopUnlocked(snapshot, finish => { finishConnectedStop = finish; });
|
|
1016
1013
|
try {
|
|
1017
|
-
if (!approval) return await
|
|
1014
|
+
if (!approval) return await stop();
|
|
1018
1015
|
return await runApprovedStop(
|
|
1019
1016
|
approval,
|
|
1020
1017
|
async () => {
|
|
@@ -1029,50 +1026,18 @@ async function handleStop(approval?: StopApproval) {
|
|
|
1029
1026
|
},
|
|
1030
1027
|
describeTrackedRuntimeTarget,
|
|
1031
1028
|
() => inspectGuardedTarget(approval.pid, approval.port),
|
|
1032
|
-
|
|
1029
|
+
stop,
|
|
1033
1030
|
);
|
|
1034
1031
|
}
|
|
1035
|
-
finally { lease.release(); }
|
|
1032
|
+
finally { try { await finishConnectedStop?.(); } finally { lease.release(); } }
|
|
1036
1033
|
}
|
|
1037
1034
|
|
|
1038
|
-
async function handleStopUnlocked(snapshot
|
|
1035
|
+
async function handleStopUnlocked(snapshot: GuardedStopSnapshot | undefined, onFence: (finish: () => Promise<void>) => void) {
|
|
1039
1036
|
// The receipt must name the endpoint the owner was stopping — an obligation nobody can
|
|
1040
1037
|
// locate cannot be proven discharged. Only the runtime record knows it; a proxy started
|
|
1041
1038
|
// with an explicit --port is not on the configured one.
|
|
1042
1039
|
const endpointOf = (runtime: { port: number; hostname?: string } | null): { hostname: string; port: number } | null =>
|
|
1043
1040
|
runtime?.port ? { hostname: runtime.hostname ?? "127.0.0.1", port: runtime.port } : null;
|
|
1044
|
-
// Last-resort endpoint for a receipt: the address this home is configured to serve on,
|
|
1045
|
-
// which is what a later recovery probe would ask about anyway.
|
|
1046
|
-
const configuredEndpoint = (): { hostname: string; port: number } => {
|
|
1047
|
-
try {
|
|
1048
|
-
const config = loadConfig();
|
|
1049
|
-
return {
|
|
1050
|
-
hostname: config.hostname ?? "127.0.0.1",
|
|
1051
|
-
port: typeof config.port === "number" && config.port > 0 ? config.port : 10100,
|
|
1052
|
-
};
|
|
1053
|
-
} catch {
|
|
1054
|
-
return { hostname: "127.0.0.1", port: 10100 };
|
|
1055
|
-
}
|
|
1056
|
-
};
|
|
1057
|
-
// Only a definitive "nothing is answering" authorizes finishing somebody else's
|
|
1058
|
-
// abandoned teardown. The tri-state probe distinguishes that from "we could not tell"
|
|
1059
|
-
// (timeout, a listener that withholds /healthz), which `findLiveProxy` collapses into
|
|
1060
|
-
// the same null (#3008).
|
|
1061
|
-
const abandonedTeardownIsSafeToFinish = async (
|
|
1062
|
-
endpoint: { hostname: string; port: number } | null,
|
|
1063
|
-
): Promise<boolean> => {
|
|
1064
|
-
// The endpoint has to come from the receipt. A crashed owner usually leaves no
|
|
1065
|
-
// runtime-port record, and the configured port is the wrong question for a proxy
|
|
1066
|
-
// started with an explicit --port: it refuses while the live one keeps serving.
|
|
1067
|
-
// An obligation that cannot name its endpoint cannot be proven discharged.
|
|
1068
|
-
if (!endpoint) return false;
|
|
1069
|
-
try {
|
|
1070
|
-
return await probeEndpointLiveness(endpoint) === "dead";
|
|
1071
|
-
} catch {
|
|
1072
|
-
// A probe that could not run is not evidence of absence.
|
|
1073
|
-
return false;
|
|
1074
|
-
}
|
|
1075
|
-
};
|
|
1076
1041
|
let stopFailed = false;
|
|
1077
1042
|
let historyOnlyFailure = false;
|
|
1078
1043
|
/**
|
|
@@ -1094,25 +1059,14 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1094
1059
|
// A sibling instance's shared teardown is not this stop's to run: the client routing belongs
|
|
1095
1060
|
// to the live proxy it ran beside (`src/codex/sibling-start.ts`). Read before any stop removes
|
|
1096
1061
|
// the record; a record left behind by a hard-killed sibling still says so.
|
|
1097
|
-
const
|
|
1062
|
+
const initialRuntime = readRuntimePort();
|
|
1063
|
+
const siblingOfPort = initialRuntime?.siblingOfPort;
|
|
1098
1064
|
const stoppingSibling = siblingOfPort !== undefined;
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
if (connectedClientSkip) {
|
|
1102
|
-
const preflight = await preflightConnectedClientStop(snapshot?.approval);
|
|
1103
|
-
if (preflight === "already-stopped") connectedClientAlreadyStopped = true;
|
|
1104
|
-
else if (preflight) return preflight;
|
|
1065
|
+
if (stoppingSibling && snapshot && snapshot.manager.kind !== "absent") {
|
|
1066
|
+
return approvalChanged("the sibling runtime record conflicts with the approved service manager");
|
|
1105
1067
|
}
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
// where the corresponding boolean already flips — the summarizer never re-decides.
|
|
1109
|
-
const record: StopRunRecord = {
|
|
1110
|
-
service: "absent",
|
|
1111
|
-
proxy: "unknown",
|
|
1112
|
-
sharedTeardown: "skipped",
|
|
1113
|
-
inheritedTeardownBlocks: false,
|
|
1114
|
-
receiptClearFailed: false,
|
|
1115
|
-
};
|
|
1068
|
+
const connectedClientState = readClientConnectionState();
|
|
1069
|
+
let connectedClientSkip = stoppingSibling ? null : connectedClientStopSkipLine(connectedClientState);
|
|
1116
1070
|
// Deferring shared teardown to this process is an obligation, so record it on disk
|
|
1117
1071
|
// before asking for it (#3008). A parent that dies mid-stop would otherwise leave the
|
|
1118
1072
|
// client config routed at a proxy that is already gone, with nothing to find later.
|
|
@@ -1136,34 +1090,78 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1136
1090
|
// anything is restored.
|
|
1137
1091
|
const teardownOwnerStillRunning = (ownerPid: number): boolean =>
|
|
1138
1092
|
isProcessAlive(ownerPid) && isLikelyOcxProcess(ownerPid);
|
|
1139
|
-
const
|
|
1140
|
-
|
|
1093
|
+
const savedLink = connectedClientState.kind === "connected" && connectedClientState.value.transport === "link";
|
|
1094
|
+
const pendingTeardowns = savedLink ? [] : listPendingTeardowns();
|
|
1095
|
+
const inheritedTeardownSnapshot = savedLink
|
|
1096
|
+
? (await import("../client/stop-native-handoff")).readLinkInheritedTeardowns()
|
|
1097
|
+
: pendingTeardowns.filter(read => isPendingTeardownAbandoned(read, teardownOwnerStillRunning));
|
|
1098
|
+
let linkStop: LinkStopPreflight | undefined;
|
|
1099
|
+
let stopTarget: StopTargetProof | undefined;
|
|
1100
|
+
const stopRole = await classifyStopRole(connectedClientState, initialRuntime, pendingTeardowns);
|
|
1101
|
+
const connectedStop = stopRole === "connected";
|
|
1102
|
+
const trackedStopPid = connectedStop ? null : snapshot?.approval.pid ?? readPid();
|
|
1103
|
+
const verifyStandaloneRecord = stopRole === "unknown" && connectedClientState.kind === "disconnected" && trackedStopPid !== null
|
|
1104
|
+
? await proveStandaloneStopRecord(initialRuntime, trackedStopPid, pendingTeardowns) : undefined;
|
|
1105
|
+
if (trackedStopPid !== null) {
|
|
1106
|
+
const standaloneRuntime = (stopRole === "standalone" || stoppingSibling || verifyStandaloneRecord) && initialRuntime?.pid === trackedStopPid
|
|
1107
|
+
&& Bun.deepEquals(readRuntimePort(trackedStopPid), initialRuntime, true);
|
|
1108
|
+
if (!standaloneRuntime && !(connectedClientState.kind === "disconnected" && isRegisteredServiceStopTarget(trackedStopPid))) {
|
|
1109
|
+
return stopOwnershipRefused(unclassifiedStopTarget(trackedStopPid));
|
|
1110
|
+
}
|
|
1111
|
+
}
|
|
1112
|
+
const preflight = connectedStop ? await preflightConnectedClientStop(snapshot?.approval, onFence, inheritedTeardownSnapshot,
|
|
1113
|
+
proof => { linkStop = proof; connectedClientSkip = null; }, proof => { stopTarget = proof; }, siblingOfPort) : null;
|
|
1114
|
+
const connectedClientAlreadyStopped = preflight === "already-stopped";
|
|
1115
|
+
if (preflight && preflight !== "already-stopped") return preflight;
|
|
1116
|
+
const inheritedTeardowns = stopTarget?.terminateSibling ? [] : inheritedTeardownSnapshot;
|
|
1117
|
+
// Structured twin of the human lines below, for `ocx stop --json`: one document the
|
|
1118
|
+
// desktop shell can read across the process boundary (D4). Every field is assigned
|
|
1119
|
+
// where the corresponding boolean already flips — the summarizer never re-decides.
|
|
1120
|
+
const record: StopRunRecord = {
|
|
1121
|
+
service: "absent",
|
|
1122
|
+
proxy: "unknown",
|
|
1123
|
+
sharedTeardown: "skipped",
|
|
1124
|
+
inheritedTeardownBlocks: false,
|
|
1125
|
+
receiptClearFailed: false,
|
|
1126
|
+
};
|
|
1141
1127
|
let teardownNonce: string | undefined;
|
|
1142
1128
|
// #7423: an update that restarts the proxy asks this stop to leave Codex routing for the replacement.
|
|
1143
1129
|
// Client start never discharges a standalone update-handover receipt or reapplies routing.
|
|
1144
1130
|
const handoverRequested = updateTeardownHandoverRequested(process.env, () => shouldSyncCodexOnStart(loadConfig()))
|
|
1145
1131
|
&& !stoppingSibling && readClientConnectionState().kind !== "connected";
|
|
1146
1132
|
let deferralHonoredByProxy = false;
|
|
1133
|
+
const verifyStopTarget = (pid?: number) => {
|
|
1134
|
+
if (connectedStop) return verifyConnectedStopTarget(stopTarget, linkStop, pid);
|
|
1135
|
+
const current = readClientConnectionState();
|
|
1136
|
+
if (!stoppingSibling && current.kind === "connected" && current.value.transport === "link") throw unsupportedConnectedStop();
|
|
1137
|
+
const trackedPid = readPid();
|
|
1138
|
+
if (trackedPid !== null && trackedPid !== trackedStopPid) throw unclassifiedStopTarget(trackedPid);
|
|
1139
|
+
verifyStandaloneRecord?.();
|
|
1140
|
+
};
|
|
1147
1141
|
const claimTeardown = (endpoint: { hostname: string; port: number }, endpointSource: "exact" | "guessed") => {
|
|
1148
|
-
if (teardownNonce || stoppingSibling) return;
|
|
1149
|
-
if (connectedClientSkip) return;
|
|
1142
|
+
if (teardownNonce || stoppingSibling || (!linkStop && connectedClientSkip)) return;
|
|
1150
1143
|
try {
|
|
1151
|
-
teardownNonce = claimPendingTeardown(endpoint, endpointSource, process.pid, handoverRequested ? "update-restart" : undefined, windowsPartAReceiptRecord()).nonce;
|
|
1144
|
+
teardownNonce = claimPendingTeardown(endpoint, endpointSource, process.pid, handoverRequested ? "update-restart" : undefined, windowsPartAReceiptRecord(), linkStop?.owner, linkStop?.inheritedTeardownDigest).nonce;
|
|
1152
1145
|
} catch (err) {
|
|
1153
|
-
//
|
|
1146
|
+
// A Link Child can exit before native restoration. Record that obligation first.
|
|
1147
|
+
if (linkStop) throw new ProxyOwnershipRefusedError(`Link Child stop refused: could not record the deferred-teardown receipt (${err instanceof Error ? err.message : String(err)}). Repair the OpenCodex home's storage and retry ocx stop.`, "link_teardown_receipt_failed");
|
|
1154
1148
|
if (windowsStopRequiresReceipt()) { ownershipBlocked = true; stopFailed = true; throw err; }
|
|
1155
1149
|
console.warn(`⚠️ Could not record the deferred-teardown receipt: ${err instanceof Error ? err.message : String(err)}`);
|
|
1156
1150
|
}
|
|
1157
1151
|
};
|
|
1158
|
-
//
|
|
1159
|
-
// a configured guess records an obligation but is never evidence for orphan recovery.
|
|
1160
|
-
// Claim before any kill fallback so a parent crash leaves a durable teardown obligation.
|
|
1152
|
+
// Use one endpoint for the receipt and POST. A connected stop needs its own proved target.
|
|
1161
1153
|
const stopWithDeferral = async (pid: number, discovered?: { hostname: string; port: number } | null): Promise<boolean> => {
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1154
|
+
verifyStopTarget(pid);
|
|
1155
|
+
if (stopTarget?.terminateSibling) {
|
|
1156
|
+
stopTarget.terminateSibling();
|
|
1157
|
+
return false;
|
|
1158
|
+
}
|
|
1159
|
+
const verifiedLink = linkStop;
|
|
1160
|
+
const exact = connectedStop ? endpointOf(stopTarget?.target ?? null) : discovered ?? endpointOf(readRuntimePort(pid));
|
|
1161
|
+
if (connectedStop && !exact) throw unsupportedConnectedStop();
|
|
1165
1162
|
if (connectedClientSkip) await assertConnectedClientStopSupported(exact ? { ...exact, pid } : null);
|
|
1166
|
-
claimTeardown(exact ??
|
|
1163
|
+
claimTeardown(exact ?? configuredStopEndpoint(), exact ? "exact" : "guessed");
|
|
1164
|
+
verifyStopTarget(pid);
|
|
1167
1165
|
const graceful = await stopProxy(pid, {
|
|
1168
1166
|
deferSharedTeardownNonce: teardownNonce,
|
|
1169
1167
|
// "not-owned" is refused only for a positively identified Link connection, read at the
|
|
@@ -1171,11 +1169,9 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1171
1169
|
// restore. A connect committed mid-stop can make this a hub client whose answer is
|
|
1172
1170
|
// truthful, so the entry-time skip snapshot cannot stand in for this check.
|
|
1173
1171
|
acceptNotOwnedTeardown: notOwnedTeardownIsAcceptable(readClientConnectionState(), stoppingSibling),
|
|
1174
|
-
// Only an exact endpoint may direct the request; the configured fallback is a guess
|
|
1175
|
-
// good enough to record an obligation against, not to POST a stop to. Never re-read the
|
|
1176
|
-
// record here: one published since would send the receipt to a port it does not name.
|
|
1177
1172
|
runtimeEndpoint: exact ?? undefined,
|
|
1178
1173
|
runtimeEndpointOnly: true,
|
|
1174
|
+
...(verifiedLink ? { forceKill: verifiedLink.forceKill } : { mayTerminate: () => { verifyStopTarget(pid); return true; } }),
|
|
1179
1175
|
skipPortWait: windowsPartBOwnsPortWait(), // #7771: Part B owns the Windows port wait on both paths.
|
|
1180
1176
|
});
|
|
1181
1177
|
// A valid receipt means the proxy deferred shared teardown to this process. If the
|
|
@@ -1189,13 +1185,18 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1189
1185
|
? { hostname: probeHostname(snapshot.approval.hostname || undefined), port: snapshot.approval.port }
|
|
1190
1186
|
: null;
|
|
1191
1187
|
// Only an exact runtime endpoint may back a handover; without one the ordinary restore runs.
|
|
1192
|
-
const claimHandoverBeforeManager = () => {
|
|
1188
|
+
const claimHandoverBeforeManager = () => {
|
|
1189
|
+
if (!handoverRequested) return;
|
|
1190
|
+
const exact = endpointOf(connectedStop ? stopTarget?.target ?? null : readRuntimePort());
|
|
1191
|
+
if (exact) claimTeardown(exact, "exact");
|
|
1192
|
+
};
|
|
1193
1193
|
let guardedStep: Awaited<ReturnType<typeof runGuardedManagerStep>> | null = null;
|
|
1194
1194
|
try {
|
|
1195
1195
|
const serviceStop = snapshot
|
|
1196
1196
|
? (guardedStep = await runGuardedManagerStep(snapshot, {
|
|
1197
1197
|
revalidateManager: () => inspectGuardedTarget(snapshot.approval.pid, snapshot.approval.port),
|
|
1198
1198
|
stopManager: () => {
|
|
1199
|
+
verifyStopTarget();
|
|
1199
1200
|
if (approvedEndpoint) claimTeardown(approvedEndpoint, "exact");
|
|
1200
1201
|
return stopGuardedManager({ approvedPort: snapshot.approval.port, receiptNonce: () => teardownNonce, inheritedReceipts: inheritedTeardowns.length });
|
|
1201
1202
|
},
|
|
@@ -1207,7 +1208,13 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1207
1208
|
// A sibling never runs under a service manager: an installed one belongs to the live owner,
|
|
1208
1209
|
// and its ownership check would fail this stop and skip the stale-record purge below.
|
|
1209
1210
|
// #7423: a manager stop takes the proxy down itself, so a handover claims its receipt first.
|
|
1210
|
-
: stoppingSibling || connectedClientAlreadyStopped ? noServiceStop() :
|
|
1211
|
+
: stoppingSibling || connectedClientAlreadyStopped ? noServiceStop() : await (async () => {
|
|
1212
|
+
verifyStopTarget();
|
|
1213
|
+
const linkEndpoint = linkStop && endpointOf(linkStop.target);
|
|
1214
|
+
if (linkEndpoint) claimTeardown(linkEndpoint, "exact");
|
|
1215
|
+
else claimHandoverBeforeManager();
|
|
1216
|
+
return stopServiceForOcxStop({ receiptNonce: () => teardownNonce, inheritedReceipts: inheritedTeardowns.length });
|
|
1217
|
+
})();
|
|
1211
1218
|
record.service = serviceStop;
|
|
1212
1219
|
stoppedService = serviceStop === "stopped" || serviceStop === "stopped-respawnable";
|
|
1213
1220
|
schedulerCanRespawn = serviceStop === "stopped-respawnable" || windowsPartBDue();
|
|
@@ -1231,11 +1238,13 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1231
1238
|
ownershipBlocked = windowsPartAHolds(record) || ownershipBlocked; // #7771: no POST and no shared teardown.
|
|
1232
1239
|
} catch (err) {
|
|
1233
1240
|
record.service = "error";
|
|
1234
|
-
if (isServiceOwnershipError(err) || windowsChildStopHeld()) {
|
|
1241
|
+
if (err instanceof ProxyOwnershipRefusedError || isServiceOwnershipError(err) || windowsChildStopHeld()) {
|
|
1235
1242
|
ownershipBlocked = true;
|
|
1236
1243
|
stopFailed = true;
|
|
1237
1244
|
console.error(`❌ ${err instanceof Error ? err.message : String(err)}`);
|
|
1238
|
-
console.error(
|
|
1245
|
+
console.error(err instanceof ProxyOwnershipRefusedError
|
|
1246
|
+
? " Skipping shared teardown (native Codex restore, Grok config) because the stop could not be verified."
|
|
1247
|
+
: " Skipping shared teardown (native Codex restore, Grok config): the installed service is still running.");
|
|
1239
1248
|
} else {
|
|
1240
1249
|
console.error(`⚠️ Service manager stop failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
1241
1250
|
}
|
|
@@ -1259,16 +1268,13 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1259
1268
|
record.proxy = "unknown";
|
|
1260
1269
|
console.error("The approved runtime could not be verified after the guarded stop step.");
|
|
1261
1270
|
}
|
|
1262
|
-
} else if (windowsChildStopHeld()) { /*
|
|
1263
|
-
const
|
|
1271
|
+
} else if (windowsChildStopHeld() || (connectedStop && ownershipBlocked)) { /* No process stop after the connected manager gate refused. */ } else {
|
|
1272
|
+
const attestedPid = linkStop?.target.pid ?? (stopTarget?.terminateSibling ? stopTarget.target.pid : undefined);
|
|
1273
|
+
const pid = readPid() ?? (attestedPid !== undefined && isProcessAlive(attestedPid) ? attestedPid : null);
|
|
1264
1274
|
if (pid) {
|
|
1265
1275
|
try {
|
|
1266
|
-
//
|
|
1267
|
-
//
|
|
1268
|
-
// Shared teardown is deferred to this process: it happens after the respawn
|
|
1269
|
-
// verification below, so a survivor does not get its client config pulled first.
|
|
1270
|
-
// The receipt goes down first; Windows refuses if it cannot be recorded.
|
|
1271
|
-
// Other platforms retain the existing undeferred fallback.
|
|
1276
|
+
// The management API can drain before exit. A deferral receipt leaves shared teardown
|
|
1277
|
+
// with this process until after respawn verification.
|
|
1272
1278
|
nativeRestoreHandledByProxy = await stopWithDeferral(pid);
|
|
1273
1279
|
console.log(`✅ Proxy (PID ${pid}) stopped.`);
|
|
1274
1280
|
removePid(pid);
|
|
@@ -1312,12 +1318,7 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
|
|
|
1312
1318
|
console.error(" Skipping shared teardown (native Codex restore, Grok config) while that proxy is running.");
|
|
1313
1319
|
} else if (live?.pid) {
|
|
1314
1320
|
try {
|
|
1315
|
-
|
|
1316
|
-
// typically what went missing in the first place.
|
|
1317
|
-
nativeRestoreHandledByProxy = await stopWithDeferral(
|
|
1318
|
-
live.pid,
|
|
1319
|
-
{ hostname: live.hostname ?? "127.0.0.1", port: live.port },
|
|
1320
|
-
);
|
|
1321
|
+
nativeRestoreHandledByProxy = await stopWithDeferral(live.pid, { hostname: live.hostname ?? "127.0.0.1", port: live.port });
|
|
1321
1322
|
console.log(`✅ Proxy (PID ${live.pid}) stopped.`);
|
|
1322
1323
|
record.proxy = "stopped-orphan";
|
|
1323
1324
|
} catch (err) {
|
package/src/cli/init.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { existsSync, readFileSync, unlinkSync } from "node:fs";
|
|
|
5
5
|
import { injectCodexConfig } from "../codex/inject";
|
|
6
6
|
import { classifyOpenAiTierBackup, ConfigMutationLockError, getConfigPath, getDefaultConfig, initializePersistedConfigIfMissing, isValidProviderName, observeInitialConfigState, preserveOpenAiTierRollbackSnapshot } from "../config";
|
|
7
7
|
import { InitialConfigPublicationError } from "../config/initialize";
|
|
8
|
+
import { agyAcpConfigIssues, isAgyAcpProvider } from "../config/schema/agy-acp-references";
|
|
8
9
|
import { redactUserPath } from "../lib/redact";
|
|
9
10
|
import { enrichProviderFromCatalog } from "../oauth/key-providers";
|
|
10
11
|
import { deriveInitProviders } from "../providers/derive";
|
|
@@ -75,6 +76,7 @@ export interface InitProvider {
|
|
|
75
76
|
adapter: string;
|
|
76
77
|
baseUrl: string;
|
|
77
78
|
kind: InitKind;
|
|
79
|
+
keyOptional?: boolean;
|
|
78
80
|
dashboardUrl?: string;
|
|
79
81
|
defaultModel?: string;
|
|
80
82
|
}
|
|
@@ -160,8 +162,13 @@ export async function runInit(): Promise<void> {
|
|
|
160
162
|
providerConfig = { adapter: p.adapter, baseUrl: p.baseUrl, authMode: "oauth", ...(p.defaultModel ? { defaultModel: p.defaultModel } : {}) };
|
|
161
163
|
oauthHint = true;
|
|
162
164
|
} else {
|
|
163
|
-
|
|
164
|
-
if (
|
|
165
|
+
const isAgyAcp = isAgyAcpProvider(p.id, p);
|
|
166
|
+
if (isAgyAcp) {
|
|
167
|
+
console.log(" Sign in on the proxy host with: agy acp --login");
|
|
168
|
+
if (p.dashboardUrl) console.log(` CLI setup: ${p.dashboardUrl}`);
|
|
169
|
+
} else if (p.dashboardUrl) {
|
|
170
|
+
console.log(` 🔑 Get your key: ${p.dashboardUrl}`);
|
|
171
|
+
}
|
|
165
172
|
// Template URL with placeholders (e.g. Cloudflare's {account_id}) needs a resolved value.
|
|
166
173
|
let baseUrl = p.baseUrl;
|
|
167
174
|
if (/\{[^}]*\}/.test(baseUrl)) {
|
|
@@ -174,17 +181,26 @@ export async function runInit(): Promise<void> {
|
|
|
174
181
|
}
|
|
175
182
|
const env = envKeyFor(p.id);
|
|
176
183
|
const hint = p.kind === "local" ? "API key (usually blank — press Enter): " : `API key (paste, or env var $${env}): `;
|
|
177
|
-
const apiKey = (await prompt.ask(`\n${hint}`)).trim();
|
|
184
|
+
const apiKey = isAgyAcp ? "" : (await prompt.ask(`\n${hint}`)).trim();
|
|
178
185
|
const modelChoice = (await prompt.ask(`Default model${p.defaultModel ? ` [${p.defaultModel}]` : " (optional)"}: `)).trim();
|
|
179
186
|
const defaultModel = modelChoice || p.defaultModel;
|
|
180
187
|
providerConfig = {
|
|
181
188
|
adapter: p.adapter,
|
|
182
189
|
baseUrl,
|
|
183
|
-
...(p.kind === "key" ? { apiKey: apiKey || `\${${env}}` } : apiKey ? { apiKey } : {}),
|
|
190
|
+
...(p.kind === "key" && !isAgyAcp ? { apiKey: apiKey || `\${${env}}` } : apiKey ? { apiKey } : {}),
|
|
184
191
|
...(defaultModel ? { defaultModel } : {}),
|
|
185
192
|
};
|
|
186
193
|
// Apply the catalog's models / vision classification (same enrichment as the GUI).
|
|
187
194
|
enrichProviderFromCatalog(p.id, providerConfig);
|
|
195
|
+
if (isAgyAcp) {
|
|
196
|
+
const issue = agyAcpConfigIssues({ providers: { [p.id]: providerConfig } })
|
|
197
|
+
.find(({ path }) => path[2] === "defaultModel");
|
|
198
|
+
if (issue) {
|
|
199
|
+
console.error(`\n❌ ${issue.path.join(".")}: ${issue.message}`);
|
|
200
|
+
process.exitCode = 1;
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
188
204
|
}
|
|
189
205
|
} else {
|
|
190
206
|
providerName = (await prompt.ask("Provider name: ")).trim();
|
package/src/cli/integrations.ts
CHANGED
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
printData,
|
|
6
6
|
rejectArgs,
|
|
7
7
|
runCliAction,
|
|
8
|
+
runtimeBaseUrl,
|
|
8
9
|
runtimeRequest,
|
|
9
10
|
summaryLines,
|
|
10
11
|
takeBooleanOption,
|
|
@@ -22,7 +23,7 @@ const CLAUDE_USAGE = `Usage:
|
|
|
22
23
|
ocx claude config set [--enabled <on|off>] [--auth-mode <auto|proxy|subscription>]
|
|
23
24
|
[--system-env <on|off>] [--fast-mode <on|off>] [--auto-context <on|off>]
|
|
24
25
|
[--compact-window <tokens|default>] [--context-accounting <1m|200k>] [--inject-agents <on|off>]
|
|
25
|
-
[--small-fast-model <id|->] [--model-map <from=to,from=to|->]
|
|
26
|
+
[--native-passthrough <on|off>] [--small-fast-model <id|->] [--model-map <from=to,from=to|->]
|
|
26
27
|
[--blocked-skills <name,name|->] [--web-model <id|->] [--web-backend <openai|anthropic|xai|gemini|exa|->]
|
|
27
28
|
[--vision-model <id|->] [--vision-backend <openai|anthropic|->] [--json]
|
|
28
29
|
ocx claude config set --first-party <on|off> [--json]`;
|
|
@@ -80,6 +81,7 @@ export async function handleClaudeConfigCommand(argv: string[], deps: RuntimeApi
|
|
|
80
81
|
const compact = takeOption(args, "--compact-window");
|
|
81
82
|
const accounting = takeOption(args, "--context-accounting");
|
|
82
83
|
const injectAgents = takeBooleanOption(args, "--inject-agents");
|
|
84
|
+
const nativePassthrough = takeBooleanOption(args, "--native-passthrough");
|
|
83
85
|
const smallFastModel = takeOption(args, "--small-fast-model");
|
|
84
86
|
const modelMap = takeOption(args, "--model-map");
|
|
85
87
|
const blockedSkills = takeOption(args, "--blocked-skills");
|
|
@@ -107,6 +109,7 @@ export async function handleClaudeConfigCommand(argv: string[], deps: RuntimeApi
|
|
|
107
109
|
body.contextAccounting = value;
|
|
108
110
|
}
|
|
109
111
|
if (injectAgents !== undefined) body.injectAgents = injectAgents;
|
|
112
|
+
if (nativePassthrough !== undefined) body.nativePassthrough = nativePassthrough;
|
|
110
113
|
if (smallFastModel !== undefined) body.smallFastModel = smallFastModel === "-" ? "" : smallFastModel;
|
|
111
114
|
if (modelMap !== undefined) body.modelMap = parseMap(modelMap);
|
|
112
115
|
if (blockedSkills !== undefined) body.blockedSkills = blockedSkills === "-" ? null : csv(blockedSkills);
|
|
@@ -128,8 +131,25 @@ export async function handleClaudeConfigCommand(argv: string[], deps: RuntimeApi
|
|
|
128
131
|
body.cliFirstParty = firstParty;
|
|
129
132
|
}
|
|
130
133
|
if (Object.keys(body).length === 0) throw new CliUsageError("at least one Claude setting is required", CLAUDE_USAGE);
|
|
131
|
-
|
|
132
|
-
|
|
134
|
+
let writeDeps = deps;
|
|
135
|
+
if (nativePassthrough !== undefined) {
|
|
136
|
+
writeDeps = { ...deps, baseUrl: await runtimeBaseUrl(deps) };
|
|
137
|
+
const current = await runtimeRequest<{ nativePassthrough?: unknown }>(
|
|
138
|
+
"/api/claude-code", { redirect: "error" }, writeDeps,
|
|
139
|
+
);
|
|
140
|
+
if (typeof current?.nativePassthrough !== "boolean") {
|
|
141
|
+
throw new Error("The running proxy does not report support for --native-passthrough. Upgrade the proxy and retry. No settings were sent.");
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
const result = await runtimeRequest<{ nativePassthrough?: unknown; warnings?: unknown }>(
|
|
145
|
+
"/api/claude-code",
|
|
146
|
+
{ method: "PUT", body: JSON.stringify(body), redirect: nativePassthrough === undefined ? undefined : "error" },
|
|
147
|
+
writeDeps,
|
|
148
|
+
);
|
|
149
|
+
if (nativePassthrough !== undefined && result?.nativePassthrough !== nativePassthrough) {
|
|
150
|
+
throw new Error("The running proxy did not confirm --native-passthrough. Check the setting with `ocx claude config status`.");
|
|
151
|
+
}
|
|
152
|
+
const { warnings } = result;
|
|
133
153
|
const retained = Array.isArray(warnings) && warnings.includes("shared_proxy_retained");
|
|
134
154
|
printData(result, wantsJson, [
|
|
135
155
|
"Claude Code settings updated.",
|
|
@@ -20,6 +20,7 @@ type CodexCliVersionManagerRoots = Readonly<Partial<Record<CodexCliVersionManage
|
|
|
20
20
|
|
|
21
21
|
export type TrustedNodeLaunchContext = {
|
|
22
22
|
anthropicEnvSlots: readonly AnthropicParentEnvSlot[];
|
|
23
|
+
managedRelease: boolean;
|
|
23
24
|
codexCliInspectionEnv: Readonly<{
|
|
24
25
|
codexCliPath: string | null;
|
|
25
26
|
path: string | null;
|
|
@@ -90,6 +91,10 @@ export function initializeNodeLauncherContext(
|
|
|
90
91
|
|
|
91
92
|
const raw = env[NODE_LAUNCH_CONTEXT_ENV];
|
|
92
93
|
delete env[NODE_LAUNCH_CONTEXT_ENV];
|
|
94
|
+
// A child launcher must never inherit a project dotenv marker as parent input.
|
|
95
|
+
for (const name of Object.keys(env)) {
|
|
96
|
+
if (name.toUpperCase() === "OCX_MANAGED_RELEASE") delete env[name];
|
|
97
|
+
}
|
|
93
98
|
// Older launchers used this unauthenticated marker. Never let a project
|
|
94
99
|
// dotenv resurrect it as a trusted provenance channel.
|
|
95
100
|
delete env.OCX_PRE_BUN_ANTHROPIC_ENV;
|
|
@@ -104,11 +109,13 @@ export function initializeNodeLauncherContext(
|
|
|
104
109
|
version?: unknown;
|
|
105
110
|
proof?: unknown;
|
|
106
111
|
anthropicEnvSlots?: unknown;
|
|
112
|
+
managedRelease?: unknown;
|
|
107
113
|
codexCliInspectionEnv?: unknown;
|
|
108
114
|
};
|
|
109
115
|
if (parsed.version !== 1 || parsed.proof !== proof || !Array.isArray(parsed.anthropicEnvSlots)) {
|
|
110
116
|
return null;
|
|
111
117
|
}
|
|
118
|
+
if (parsed.managedRelease !== undefined && typeof parsed.managedRelease !== "boolean") return null;
|
|
112
119
|
const allowed = new Set<string>(ANTHROPIC_PARENT_ENV_SLOTS);
|
|
113
120
|
const slots = parsed.anthropicEnvSlots.filter(
|
|
114
121
|
(slot): slot is AnthropicParentEnvSlot => typeof slot === "string" && allowed.has(slot),
|
|
@@ -158,7 +165,7 @@ export function initializeNodeLauncherContext(
|
|
|
158
165
|
})
|
|
159
166
|
: undefined;
|
|
160
167
|
if (codexCliInspectionEnv === undefined) return null;
|
|
161
|
-
trustedContext = { anthropicEnvSlots: slots, codexCliInspectionEnv };
|
|
168
|
+
trustedContext = { anthropicEnvSlots: slots, managedRelease: parsed.managedRelease === true, codexCliInspectionEnv };
|
|
162
169
|
return trustedContext;
|
|
163
170
|
} catch {
|
|
164
171
|
return null;
|
|
@@ -168,6 +175,10 @@ export function initializeNodeLauncherContext(
|
|
|
168
175
|
export function trustedNodeLauncherContext(): TrustedNodeLaunchContext | null {
|
|
169
176
|
return trustedContext;
|
|
170
177
|
}
|
|
178
|
+
|
|
179
|
+
export function trustedManagedReleaseOptIn(): boolean {
|
|
180
|
+
return trustedContext?.managedRelease === true;
|
|
181
|
+
}
|
|
171
182
|
import {
|
|
172
183
|
CODEX_CLI_TRANSPORT_ENV_KEYS,
|
|
173
184
|
CODEX_CLI_VERSION_MANAGER_ROOT_ENV_SLOTS,
|
package/src/cli/link.ts
CHANGED
|
@@ -2,8 +2,9 @@ import { clientLinkStatusIdentity } from "../client/link-status";
|
|
|
2
2
|
import { clientLinkTunnelStatus } from "../client/link-tunnel";
|
|
3
3
|
import { loadConfig } from "../config";
|
|
4
4
|
import {
|
|
5
|
-
projectLinkStatus, type ClientLinkIdentity, type LinkStatusConfig, type LinkStatusDto, type LinkTunnelDiagnostics, type LinkWireState,
|
|
5
|
+
LINK_RELAY_DEGRADED_GUIDANCE, projectLinkStatus, type ClientLinkIdentity, type LinkRelayHealth, type LinkStatusConfig, type LinkStatusDto, type LinkTunnelDiagnostics, type LinkWireState,
|
|
6
6
|
} from "../link/status-projection";
|
|
7
|
+
import { LINK_DELIVERY_DEGRADED_THRESHOLD, LINK_DELIVERY_SAMPLE_LIMIT } from "../link/child-activity";
|
|
7
8
|
import { TUNNEL_CAUSES } from "../link/tunnel-history";
|
|
8
9
|
import { isEpochMs, type LinkChildParity } from "../link/child-parity";
|
|
9
10
|
import { CODEX_SETTINGS_DIGEST_PATTERN } from "../link/codex-settings";
|
|
@@ -188,7 +189,7 @@ export function validateStatus(value: unknown): LinkStatusPayload {
|
|
|
188
189
|
if (!isRecord(candidate)) throw new Error(`invalid link API response: link ${index}`);
|
|
189
190
|
// The OCX-6 parity fields are optional on the wire (an older runtime omits them) and always
|
|
190
191
|
// present in this output, null when absent.
|
|
191
|
-
assertKeys(candidate, ["id", "alias", "direction", "state", "since", "reason", "tunnelPort"], [...PARITY_KEYS, "peer", "tunnel", "childKind", "exclusive", "explicitRoute", "child", "ws", "traffic", "routes", "route", "routeBlocked"], `link ${index}`);
|
|
192
|
+
assertKeys(candidate, ["id", "alias", "direction", "state", "since", "reason", "tunnelPort"], [...PARITY_KEYS, "peer", "tunnel", "relayHealth", "childKind", "exclusive", "explicitRoute", "child", "ws", "traffic", "routes", "route", "routeBlocked"], `link ${index}`);
|
|
192
193
|
const parity = validateParity(candidate, index);
|
|
193
194
|
if (typeof candidate.id !== "string" || !LINK_ID.test(candidate.id)
|
|
194
195
|
|| !validString(candidate.alias) || (candidate.direction !== "hub-initiated" && candidate.direction !== "client-initiated")
|
|
@@ -213,6 +214,7 @@ export function validateStatus(value: unknown): LinkStatusPayload {
|
|
|
213
214
|
...parity,
|
|
214
215
|
...(candidate.peer !== undefined ? { peer: validatePeer(candidate.peer, index) } : {}),
|
|
215
216
|
...(candidate.tunnel !== undefined ? { tunnel: validateTunnel(candidate.tunnel, index) } : {}),
|
|
217
|
+
...(candidate.relayHealth !== undefined ? { relayHealth: validateRelayHealth(candidate.relayHealth, index) } : {}),
|
|
216
218
|
...(candidate.child !== undefined ? { child: validateChildOps(candidate.child, index) } : {}),
|
|
217
219
|
...(candidate.ws !== undefined ? { ws: validateLinkWs(candidate.ws, index) } : {}),
|
|
218
220
|
...(candidate.traffic !== undefined ? { traffic: validateLinkTraffic(candidate.traffic, index) } : {}),
|
|
@@ -371,10 +373,9 @@ async function runStatus(args: string[], deps: LinkCliDeps): Promise<void> {
|
|
|
371
373
|
}
|
|
372
374
|
throw error;
|
|
373
375
|
}
|
|
374
|
-
//
|
|
375
|
-
// the traffic counters ignores the query and answers without those fields.
|
|
376
|
+
// Older runtimes ignore unsupported query parameters and omit those fields.
|
|
376
377
|
const result = validateStatus(await viaLocalControlSocket(baseUrl, deps,
|
|
377
|
-
statusDeps => linkRequest<unknown>("/api/link/status?compatibility=1&diagnostics=1&children=1&transport=1&traffic=1&routes=1", {}, statusDeps)));
|
|
378
|
+
statusDeps => linkRequest<unknown>("/api/link/status?compatibility=1&diagnostics=1&children=1&transport=1&traffic=1&routes=1&relayHealth=1", {}, statusDeps)));
|
|
378
379
|
console.log(JSON.stringify(result));
|
|
379
380
|
}
|
|
380
381
|
|
|
@@ -582,6 +583,24 @@ function validateTunnel(value: unknown, index: number): LinkTunnelDiagnostics {
|
|
|
582
583
|
return value as unknown as LinkTunnelDiagnostics;
|
|
583
584
|
}
|
|
584
585
|
|
|
586
|
+
function validateRelayHealth(value: unknown, index: number): LinkRelayHealth {
|
|
587
|
+
const label = `link ${index} relayHealth`;
|
|
588
|
+
const fail = (): never => { throw new Error(`invalid link API response: ${label}`); };
|
|
589
|
+
if (!isRecord(value)) return fail();
|
|
590
|
+
assertKeys(value, ["relayAuthentication", "delivery", "inferenceReadiness", "recentInterruptions"], ["guidance"], label);
|
|
591
|
+
const { relayAuthentication, delivery, inferenceReadiness, recentInterruptions, guidance } = value;
|
|
592
|
+
if ((relayAuthentication !== "observed" && relayAuthentication !== "unknown")
|
|
593
|
+
|| (delivery !== "observed" && delivery !== "degraded" && delivery !== "unknown")
|
|
594
|
+
|| inferenceReadiness !== "unknown"
|
|
595
|
+
|| typeof recentInterruptions !== "number" || !Number.isSafeInteger(recentInterruptions)
|
|
596
|
+
|| recentInterruptions < 0 || recentInterruptions > LINK_DELIVERY_SAMPLE_LIMIT
|
|
597
|
+
|| (delivery !== "unknown" && relayAuthentication !== "observed")
|
|
598
|
+
|| (delivery === "unknown" && recentInterruptions !== 0)
|
|
599
|
+
|| (delivery === "degraded") !== (recentInterruptions >= LINK_DELIVERY_DEGRADED_THRESHOLD)
|
|
600
|
+
|| guidance !== (delivery === "degraded" ? LINK_RELAY_DEGRADED_GUIDANCE : undefined)) return fail();
|
|
601
|
+
return value as unknown as LinkRelayHealth;
|
|
602
|
+
}
|
|
603
|
+
|
|
585
604
|
function validateParity(candidate: Record<string, unknown>, index: number): LinkChildParity {
|
|
586
605
|
const time = (key: "lastApplyAt" | "runtimeStartedAt" | "reportedAt"): number | null => {
|
|
587
606
|
const value = candidate[key];
|
|
@@ -46,6 +46,7 @@ const USAGE = `Usage:
|
|
|
46
46
|
ocx models preset apply <provider> [--all] [--json]
|
|
47
47
|
ocx models new-policy [on|off|admit] [--provider <name>] [--json]
|
|
48
48
|
ocx models new-arrivals [--json]
|
|
49
|
+
ocx models discover <provider> [--json]
|
|
49
50
|
${MODELS_CONTEXT_USAGE}
|
|
50
51
|
ocx models shadow <status|set> [model|-] [--enabled <on|off>] [--json]
|
|
51
52
|
ocx models auto-review <status|set> [model|-] [--enabled <on|off>] [--json]
|
|
@@ -528,6 +529,36 @@ async function newArrivals(argv: string[], deps: RuntimeApiDeps): Promise<void>
|
|
|
528
529
|
printData(result.recentArrivals, wantsJson, lines.length ? lines : ["no recent model arrivals"]);
|
|
529
530
|
}
|
|
530
531
|
|
|
532
|
+
interface DiscoverResult {
|
|
533
|
+
ok: boolean; provider: string; applicable?: boolean; reason?: string;
|
|
534
|
+
discovery?: { status: string; reason?: string; httpStatus?: number } | null;
|
|
535
|
+
liveModelCount?: number | null;
|
|
536
|
+
newArrivals?: Array<{ id: string; at: string; state: string }>;
|
|
537
|
+
recentArrivals?: Array<{ id: string; at: string; state: string }>;
|
|
538
|
+
}
|
|
539
|
+
|
|
540
|
+
async function discover(argv: string[], deps: RuntimeApiDeps): Promise<number | void> {
|
|
541
|
+
const args = [...argv]; const wantsJson = takeFlag(args, "--json");
|
|
542
|
+
const provider = args.shift()?.trim();
|
|
543
|
+
if (!provider) throw new CliUsageError("provider is required", USAGE);
|
|
544
|
+
rejectArgs(args, USAGE);
|
|
545
|
+
const result = await runtimeRequest<DiscoverResult>("/api/model-discovery/refresh", {
|
|
546
|
+
method: "POST", body: JSON.stringify({ provider }),
|
|
547
|
+
}, deps);
|
|
548
|
+
const lines: string[] = [];
|
|
549
|
+
if (result.applicable === false) lines.push(`${provider}: live discovery is off for this provider (${result.reason ?? "static catalog"})`);
|
|
550
|
+
else {
|
|
551
|
+
const status = result.discovery?.status === "failed"
|
|
552
|
+
? `failed (${result.discovery.reason ?? "unknown"}${result.discovery.httpStatus ? ` ${result.discovery.httpStatus}` : ""})`
|
|
553
|
+
: result.discovery?.status ?? "unknown";
|
|
554
|
+
lines.push(`${provider}: discovery ${status}; ${result.liveModelCount ?? "?"} live models; ${result.newArrivals?.length ?? 0} new`);
|
|
555
|
+
for (const row of result.newArrivals ?? []) lines.push(` new ${provider}/${row.id} [${row.state}] ${row.at}`);
|
|
556
|
+
}
|
|
557
|
+
printData(result, wantsJson, lines);
|
|
558
|
+
// The server answers 200 with a failed discovery; scripts still need a nonzero exit.
|
|
559
|
+
if (result.applicable !== false && result.discovery?.status === "failed") return 1;
|
|
560
|
+
}
|
|
561
|
+
|
|
531
562
|
async function context(argv: string[], deps: RuntimeApiDeps): Promise<void> {
|
|
532
563
|
const args = [...argv];
|
|
533
564
|
const action = (args.shift() ?? "status").toLowerCase();
|
|
@@ -648,6 +679,7 @@ export async function handleModelsRuntimeCommand(sub: string, argv: string[], de
|
|
|
648
679
|
else if (sub === "preset") action = () => preset(argv, deps);
|
|
649
680
|
else if (sub === "new-policy") action = () => newPolicy(argv, deps);
|
|
650
681
|
else if (sub === "new-arrivals") action = () => newArrivals(argv, deps);
|
|
682
|
+
else if (sub === "discover") action = () => discover(argv, deps);
|
|
651
683
|
else if (sub === "context") action = () => context(argv, deps);
|
|
652
684
|
else if (sub === "shadow") action = () => shadow(argv, deps);
|
|
653
685
|
else if (sub === "auto-review") action = () => autoReview(argv, deps);
|