@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -47,7 +47,7 @@ const DATA: Record<string, readonly Row[]> = {
|
|
|
47
47
|
"azure-openai": [["gpt-4.1",1047576,32768,"text,image",0,null,2,8,0.5,0],["gpt-4o",128000,16384,"text,image",0,null,2.5,10,1.25,0],["gpt-4o-mini",128000,16384,"text,image",0,null,0.15,0.6,0.075,0],["o3",200000,100000,"text,image",1,null,2,8,0.5,0],["o3-mini",200000,100000,"text",1,null,1.1,4.4,0.55,0]],
|
|
48
48
|
"cerebras": [["gemma-4-31b",131072,40960,"text,image",1,null,0.99,1.49,0,0],["gpt-oss-120b",131072,40960,"text",1,null,0.35,0.75,0,0],["llama3.1-8b",32000,8000,"text",0,null,0.1,0.1,0,0],["qwen-3-235b-a22b-instruct-2507",131000,32000,"text",0,null,0.6,1.2,0,0],["qwen-3-coder-480b",131072,32768,"text",0,null,0,0,0,0],["zai-glm-4.6",131072,32768,"text",0,null,0,0,0,0],["zai-glm-4.7",131072,40960,"text",1,null,2.25,2.75,2.25,0]],
|
|
49
49
|
"deepseek": [["deepseek-v4-flash",1048576,384000,"text",1,null,0.14,0.28,0.0028,0],["deepseek-v4-pro",1048576,384000,"text",1,null,0.435,0.87,0.003625,0]],
|
|
50
|
-
"google": [["deep-research-max-preview-04-2026",131072,65536,"text,image",1,null,2,12,0.2,0],["deep-research-preview-04-2026",131072,65536,"text,image",1,null,2,12,0.2,0],["gemini-1.5-flash",1000000,8192,"text,image",0,null,0.075,0.3,0.01875,0],["gemini-1.5-flash-8b",1000000,8192,"text,image",0,null,0.0375,0.15,0.01,0],["gemini-1.5-pro",1000000,8192,"text,image",0,null,1.25,5,0.3125,0],["gemini-2.0-flash",1048576,8192,"text,image",0,null,0.1,0.4,0.025,0],["gemini-2.0-flash-lite",1048576,8192,"text,image",0,null,0.075,0.3,0,0],["gemini-2.5-computer-use-preview-10-2025",131072,65536,"text,image",1,null,1.25,10,0,0],["gemini-2.5-flash",1048576,65536,"text,image",1,null,0.3,2.5,0.03,0],["gemini-2.5-flash-lite",1048576,65536,"text,image",1,null,0.1,0.4,0.01,0],["gemini-2.5-flash-lite-preview-06-17",1048576,65536,"text,image",1,null,0.1,0.4,0.025,0],["gemini-2.5-flash-lite-preview-09-2025",1048576,65536,"text,image",1,null,0.1,0.4,0.025,0],["gemini-2.5-flash-preview-04-17",1048576,65536,"text,image",1,null,0.15,0.6,0.0375,0],["gemini-2.5-flash-preview-05-20",1048576,65536,"text,image",1,null,0.15,0.6,0.0375,0],["gemini-2.5-flash-preview-09-2025",1048576,65536,"text,image",1,null,0.3,2.5,0.075,0],["gemini-2.5-pro",1048576,65536,"text,image",1,null,1.25,10,0.125,0],["gemini-2.5-pro-preview-05-06",1048576,65536,"text,image",1,null,1.25,10,0.31,0],["gemini-2.5-pro-preview-06-05",1048576,65536,"text,image",1,null,1.25,10,0.31,0],["gemini-3-flash-preview",1048576,65536,"text,image",1,null,0.5,3,0.05,0],["gemini-3-pro-preview",1048576,65536,"text,image",1,null,2,12,0.2,0],["gemini-3.1-flash-lite",1048576,65536,"text,image",1,null,0.25,1.5,0.025,0],["gemini-3.1-flash-lite-image",65536,65536,"text,image",1,null,0.25,30,0,0],["gemini-3.1-flash-lite-preview",1048576,65536,"text,image",1,null,0.25,1.5,0.025,0],["gemini-3.1-flash-live-preview",131072,65536,"text,image",1,null,0.75,4.5,0,0],["gemini-3.1-pro-preview",1048576,65536,"text,image",1,null,2,12,0.2,0],["gemini-3.1-pro-preview-customtools",1048576,65536,"text,image",1,null,2,12,0.2,0],["gemini-3.5-flash",1048576,65536,"text,image",1,null,1.5,9,0.15,0],["gemini-3.5-flash-lite",1048576,65536,"text,image",1,null,0.3,2.5,0.03,0],["gemini-3.6-flash",1048576,65536,"text,image",1,null,1.5,7.5,0.15,0],["gemini-3.7-flash",1048576,65536,"text,image",1],["gemini-3.8-flash",1048576,65536,"text,image",1],["gemini-4-argon",1048576,65536,"text,image",1],["gemini-flash-latest",1048576,65536,"text,image",1,null,1.5,9,0.15,0],["gemini-flash-lite-latest",1048576,65536,"text,image",1,null,0.25,1.5,0.025,0],["gemini-live-2.5-flash",128000,8000,"text,image",1,null,0.5,2,0,0],["gemini-live-2.5-flash-preview-native-audio",131072,65536,"text",1,null,0.5,2,0,0],["gemini-robotics-er-1.6-preview",131072,65536,"text,image",1,null,1,5,0,0],["gemma-3-27b-it",131072,8192,"text,image",0,null,0,0,0,0],["gemma-4-26b",256000,8192,"text,image",1,null,0,0,0,0],["gemma-4-26b-a4b-it",262144,32768,"text,image",1,null,0,0,0,0],["gemma-4-26b-it",256000,8192,"text,image",1,null,0,0,0,0],["gemma-4-31b",256000,8192,"text,image",1,null,0,0,0,0],["gemma-4-31b-it",262144,32768,"text,image",1,null,0,0,0,0],["gemma-4-E2B-it",131072,8192,"text,image",1,null,0,0,0,0],["gemma-4-E4B-it",131072,8192,"text,image",1,null,0,0,0,0]],
|
|
50
|
+
"google": [["deep-research-max-preview-04-2026",131072,65536,"text,image",1,null,2,12,0.2,0],["deep-research-preview-04-2026",131072,65536,"text,image",1,null,2,12,0.2,0],["gemini-1.5-flash",1000000,8192,"text,image",0,null,0.075,0.3,0.01875,0],["gemini-1.5-flash-8b",1000000,8192,"text,image",0,null,0.0375,0.15,0.01,0],["gemini-1.5-pro",1000000,8192,"text,image",0,null,1.25,5,0.3125,0],["gemini-2.0-flash",1048576,8192,"text,image",0,null,0.1,0.4,0.025,0],["gemini-2.0-flash-lite",1048576,8192,"text,image",0,null,0.075,0.3,0,0],["gemini-2.5-computer-use-preview-10-2025",131072,65536,"text,image",1,null,1.25,10,0,0],["gemini-2.5-flash",1048576,65536,"text,image",1,null,0.3,2.5,0.03,0],["gemini-2.5-flash-lite",1048576,65536,"text,image",1,null,0.1,0.4,0.01,0],["gemini-2.5-flash-lite-preview-06-17",1048576,65536,"text,image",1,null,0.1,0.4,0.025,0],["gemini-2.5-flash-lite-preview-09-2025",1048576,65536,"text,image",1,null,0.1,0.4,0.025,0],["gemini-2.5-flash-preview-04-17",1048576,65536,"text,image",1,null,0.15,0.6,0.0375,0],["gemini-2.5-flash-preview-05-20",1048576,65536,"text,image",1,null,0.15,0.6,0.0375,0],["gemini-2.5-flash-preview-09-2025",1048576,65536,"text,image",1,null,0.3,2.5,0.075,0],["gemini-2.5-pro",1048576,65536,"text,image",1,null,1.25,10,0.125,0],["gemini-2.5-pro-preview-05-06",1048576,65536,"text,image",1,null,1.25,10,0.31,0],["gemini-2.5-pro-preview-06-05",1048576,65536,"text,image",1,null,1.25,10,0.31,0],["gemini-3-flash-preview",1048576,65536,"text,image",1,null,0.5,3,0.05,0],["gemini-3-pro-preview",1048576,65536,"text,image",1,null,2,12,0.2,0],["gemini-3.1-flash-lite",1048576,65536,"text,image",1,null,0.25,1.5,0.025,0],["gemini-3.1-flash-lite-image",65536,65536,"text,image",1,null,0.25,30,0,0],["gemini-3.1-flash-lite-preview",1048576,65536,"text,image",1,null,0.25,1.5,0.025,0],["gemini-3.1-flash-live-preview",131072,65536,"text,image",1,null,0.75,4.5,0,0],["gemini-3.1-pro-preview",1048576,65536,"text,image",1,null,2,12,0.2,0],["gemini-3.1-pro-preview-customtools",1048576,65536,"text,image",1,null,2,12,0.2,0],["gemini-3.5-flash",1048576,65536,"text,image",1,null,1.5,9,0.15,0],["gemini-3.5-flash-lite",1048576,65536,"text,image",1,null,0.3,2.5,0.03,0],["gemini-3.6-flash",1048576,65536,"text,image",1,null,1.5,7.5,0.15,0],["gemini-3.7-flash",1048576,65536,"text,image",1],["gemini-3.8-flash",1048576,65536,"text,image",1],["gemini-4-argon",1048576,65536,"text,image",1],["gemini-4-carbon",1048576,65536,"text,image",1],["gemini-4-hydrogen",1048576,65536,"text,image",1],["gemini-flash-latest",1048576,65536,"text,image",1,null,1.5,9,0.15,0],["gemini-flash-lite-latest",1048576,65536,"text,image",1,null,0.25,1.5,0.025,0],["gemini-live-2.5-flash",128000,8000,"text,image",1,null,0.5,2,0,0],["gemini-live-2.5-flash-preview-native-audio",131072,65536,"text",1,null,0.5,2,0,0],["gemini-robotics-er-1.6-preview",131072,65536,"text,image",1,null,1,5,0,0],["gemma-3-27b-it",131072,8192,"text,image",0,null,0,0,0,0],["gemma-4-26b",256000,8192,"text,image",1,null,0,0,0,0],["gemma-4-26b-a4b-it",262144,32768,"text,image",1,null,0,0,0,0],["gemma-4-26b-it",256000,8192,"text,image",1,null,0,0,0,0],["gemma-4-31b",256000,8192,"text,image",1,null,0,0,0,0],["gemma-4-31b-it",262144,32768,"text,image",1,null,0,0,0,0],["gemma-4-E2B-it",131072,8192,"text,image",1,null,0,0,0,0],["gemma-4-E4B-it",131072,8192,"text,image",1,null,0,0,0,0]],
|
|
51
51
|
"minimax": [["MiniMax-M2",196608,128000,"text",1,null,0.3,1.2,0,0],["MiniMax-M2.1",204800,131072,"text",1,null,0.3,1.2,0,0],["MiniMax-M2.5",204800,131072,"text",1,null,0.3,1.2,0.03,0.375],["MiniMax-M2.5-highspeed",204800,131072,"text",1,null,0.6,2.4,0.06,0.375],["MiniMax-M2.5-lightning",204800,32000,"text",1,null,0.3,2.4,0,0],["MiniMax-M2.7",204800,131072,"text",1,null,0.3,1.2,0.06,0.375],["MiniMax-M2.7-highspeed",204800,131072,"text",1,null,0.6,2.4,0.06,0.375],["minimax-m3",512000,128000,"text,image",1,null,0.6,2.4,0.12,0],["MiniMax-M3",1000000,128000,"text,image,video",1,null,0.3,1.2,0.06,0],["MiniMax-M3.1-Flash",1000000,524288,"text,image,video",1,null,0.15,0.6,0.015,0]],
|
|
52
52
|
"mistral": [["codestral-latest",256000,4096,"text",0,null,0.3,0.9,0,0],["devstral-2512",262144,262144,"text",0,null,0.4,2,0,0],["devstral-latest",262144,262144,"text",0,null,0.4,2,0,0],["devstral-medium-2507",128000,128000,"text",0,null,0.4,2,0,0],["devstral-medium-latest",262144,262144,"text",0,null,0.4,2,0,0],["devstral-small-2505",128000,128000,"text",0,null,0.1,0.3,0,0],["devstral-small-2507",128000,128000,"text",0,null,0.1,0.3,0,0],["labs-devstral-small-2512",256000,256000,"text,image",0,null,0,0,0,0],["magistral-medium-latest",128000,16384,"text",1,null,2,5,0,0],["magistral-small",128000,128000,"text",1,null,0.5,1.5,0,0],["ministral-3b-latest",128000,128000,"text",0,null,0.04,0.04,0,0],["ministral-8b-latest",128000,128000,"text",0,null,0.1,0.1,0,0],["mistral-large-2411",131072,16384,"text",0,null,2,6,0,0],["mistral-large-2512",262144,262144,"text,image",0,null,0.5,1.5,0,0],["mistral-large-latest",262144,262144,"text,image",0,null,0.5,1.5,0,0],["mistral-medium-2505",131072,131072,"text,image",0,null,0.4,2,0,0],["mistral-medium-2508",262144,262144,"text,image",0,null,0.4,2,0,0],["mistral-medium-2604",262144,262144,"text,image",1,null,1.5,7.5,0,0],["mistral-medium-latest",262144,262144,"text,image",1,null,1.5,7.5,0,0],["mistral-nemo",128000,128000,"text",0,null,0.15,0.15,0,0],["mistral-small-2506",128000,16384,"text,image",0,null,0.1,0.3,0,0],["mistral-small-2603",256000,256000,"text,image",1,null,0.15,0.6,0,0],["mistral-small-latest",256000,256000,"text,image",1,null,0.15,0.6,0,0],["open-mistral-7b",8000,8000,"text",0,null,0.25,0.25,0,0],["open-mistral-nemo",128000,128000,"text",0,null,0.15,0.15,0,0],["open-mixtral-8x22b",64000,64000,"text",0,null,2,6,0,0],["open-mixtral-8x7b",32000,32000,"text",0,null,0.7,0.7,0,0],["pixtral-12b",128000,128000,"text,image",0,null,0.15,0.15,0,0],["pixtral-large-latest",128000,128000,"text,image",0,null,2,6,0,0]],
|
|
53
53
|
"moonshot": [["kimi-k2.5",262144,65536,"text,image",1,null,0,0,0,0]],
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { pathToFileURL } from "node:url";
|
|
2
2
|
import type { VideoBridgePlan, VideoCallResult } from "./types";
|
|
3
|
-
import { submitVideoJob, pollVideoJob } from "./xai-video-client";
|
|
3
|
+
import { submitVideoJob, pollVideoJob, type VideoProviderAuth } from "./xai-video-client";
|
|
4
4
|
import { downloadVideoToArtifact, createVideoBudget, type VideoBudget } from "./artifacts";
|
|
5
5
|
|
|
6
6
|
/** Parsed arguments from the model's video_gen tool call. */
|
|
@@ -20,7 +20,7 @@ const DEFAULT_VIDEO_TIMEOUT_MS = 300_000; // 5 min
|
|
|
20
20
|
export type SleepFn = (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
21
21
|
export type PollVideoJobFn = (
|
|
22
22
|
requestId: string,
|
|
23
|
-
auth:
|
|
23
|
+
auth: VideoProviderAuth,
|
|
24
24
|
signal?: AbortSignal,
|
|
25
25
|
) => ReturnType<typeof pollVideoJob>;
|
|
26
26
|
|
|
@@ -82,7 +82,7 @@ export function parseVideoCallArgs(raw: string):
|
|
|
82
82
|
*/
|
|
83
83
|
export async function* pollVideoWithHeartbeats(
|
|
84
84
|
requestId: string,
|
|
85
|
-
auth:
|
|
85
|
+
auth: VideoProviderAuth,
|
|
86
86
|
signal: AbortSignal,
|
|
87
87
|
timeoutMs: number = DEFAULT_VIDEO_TIMEOUT_MS,
|
|
88
88
|
/** Test seams — avoid mock.module / global setTimeout (both poison parallel Bun CI). */
|
package/src/images/loop.ts
CHANGED
|
@@ -391,6 +391,8 @@ export interface ImageBridgeDeps {
|
|
|
391
391
|
forceEmptyResponseId?: boolean;
|
|
392
392
|
/** Responses inbound only: deliver a non-retryable upstream refusal as `response.failed`. */
|
|
393
393
|
terminalRefusalAsFailed?: boolean;
|
|
394
|
+
/** False for Chat/Messages inbound: their clients never parse `<oai-mem-citation>`, so text stays raw. */
|
|
395
|
+
escapeMemoryCitationTags?: boolean;
|
|
394
396
|
}
|
|
395
397
|
|
|
396
398
|
/**
|
|
@@ -1026,9 +1028,13 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
|
|
|
1026
1028
|
continue;
|
|
1027
1029
|
}
|
|
1028
1030
|
const vArgs = parseVideoCallArgs(call.args);
|
|
1031
|
+
const videoAuth = videoPlan!.auth;
|
|
1029
1032
|
let vResult;
|
|
1030
1033
|
if (!vArgs.ok) {
|
|
1031
1034
|
vResult = { ok: false, model: videoPlan!.model, prompt: "", files: [], count: 0, error: vArgs.error };
|
|
1035
|
+
} else if (!videoAuth) {
|
|
1036
|
+
// An unusable images.videoProvider answers the call; it never reaches any upstream.
|
|
1037
|
+
vResult = { ok: false, model: videoPlan!.model, prompt: vArgs.prompt, files: [], count: 0, error: videoPlan!.unavailable };
|
|
1032
1038
|
} else {
|
|
1033
1039
|
paidVideoCalls += 1;
|
|
1034
1040
|
const videoTimeout = videoTimeoutMs ?? 300_000;
|
|
@@ -1046,13 +1052,13 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
|
|
|
1046
1052
|
...(vArgs.resolution != null ? { resolution: vArgs.resolution } : {}),
|
|
1047
1053
|
...(vArgs.aspectRatio != null ? { aspectRatio: vArgs.aspectRatio } : {}),
|
|
1048
1054
|
},
|
|
1049
|
-
|
|
1055
|
+
videoAuth, linkedDeadline,
|
|
1050
1056
|
);
|
|
1051
1057
|
const remainingMs = videoDeadline - Date.now();
|
|
1052
1058
|
if (remainingMs <= 0) {
|
|
1053
1059
|
vResult = { ok: false, model: videoPlan!.model, prompt: vArgs.prompt, files: [], count: 0, error: `video generation timed out after ${Math.floor(videoTimeout / 1000)}s` };
|
|
1054
1060
|
} else {
|
|
1055
|
-
const pollGen = pollVideoWithHeartbeats(requestId,
|
|
1061
|
+
const pollGen = pollVideoWithHeartbeats(requestId, videoAuth, linkedDeadline, remainingMs);
|
|
1056
1062
|
let pollResult: { ok: true; videoUrl: string } | { ok: false; error: string };
|
|
1057
1063
|
try {
|
|
1058
1064
|
for (;;) {
|
|
@@ -1221,6 +1227,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
|
|
|
1221
1227
|
...(deps.clientToolCatalogRestriction ? { ...deps.clientToolCatalogRestriction, enforceDeclaredToolNames: false } : {}),
|
|
1222
1228
|
...(deps.forceEmptyResponseId ? { responseId: "" } : {}),
|
|
1223
1229
|
...(deps.terminalRefusalAsFailed ? { terminalRefusalAsFailed: true } : {}),
|
|
1230
|
+
...(deps.escapeMemoryCitationTags === false ? { escapeMemoryCitationTags: false } : {}),
|
|
1224
1231
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
1225
1232
|
chatRawReasoningVisible: deps.chatRawReasoningVisible,
|
|
1226
1233
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
package/src/images/plan.ts
CHANGED
|
@@ -2,9 +2,13 @@ import type { OcxConfig, OcxParsedRequest, OcxProviderConfig } from "../types";
|
|
|
2
2
|
import { toolChoiceToolPredicate } from "../types";
|
|
3
3
|
import type { ImageBridgePlan, VideoBridgePlan } from "./types";
|
|
4
4
|
import { resolveProviderApiKey } from "../providers/key-store";
|
|
5
|
+
import { isProviderApiKeyPaused } from "../providers/api-key-pause-state";
|
|
6
|
+
import { isKeychainReference, keychainReferenceBelongsToProvider } from "../providers/api-key-resolve";
|
|
5
7
|
import { getValidAccessToken } from "../oauth/index";
|
|
6
8
|
import { getProviderRegistryEntry } from "../providers/registry";
|
|
9
|
+
import { providerDestinationConfigError } from "../lib/destination-policy";
|
|
7
10
|
import { IMAGE_GEN_TOOL_NAME, VIDEO_GEN_TOOL_NAME, isVideoGenName } from "./synthetic-tool";
|
|
11
|
+
import type { VideoProviderAuth } from "./xai-video-client";
|
|
8
12
|
|
|
9
13
|
const DEFAULT_MODEL = "grok-imagine-image-quality";
|
|
10
14
|
/** Absolute ceiling for `images.timeoutMs` (matches /v1/images relay budget). */
|
|
@@ -100,6 +104,133 @@ export async function planImageBridge(
|
|
|
100
104
|
}
|
|
101
105
|
|
|
102
106
|
const DEFAULT_VIDEO_MODEL = "grok-imagine-video";
|
|
107
|
+
const XAI_HOSTS = new Set(["api.x.ai", "cli-chat-proxy.grok.com"]);
|
|
108
|
+
|
|
109
|
+
function pinnedXaiBaseUrl(): string {
|
|
110
|
+
return (getProviderRegistryEntry("xai")?.baseUrl ?? "https://api.x.ai/v1").replace(/\/+$/, "");
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
function hostnameOf(baseUrl: string): string | undefined {
|
|
114
|
+
try { return new URL(baseUrl).hostname.toLowerCase(); } catch { return undefined; }
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/** Only these exact origins may receive an xAI credential: HTTPS, an xAI host, the default port. */
|
|
118
|
+
function isTrustedXaiOrigin(baseUrl: string): boolean {
|
|
119
|
+
try {
|
|
120
|
+
const url = new URL(baseUrl);
|
|
121
|
+
return url.protocol === "https:" && url.port === "" && XAI_HOSTS.has(url.hostname.toLowerCase());
|
|
122
|
+
} catch { return false; }
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function isXaiRow(name: string, provider: OcxProviderConfig): boolean {
|
|
126
|
+
const host = hostnameOf(provider.baseUrl);
|
|
127
|
+
return name.trim().toLowerCase() === "xai" || (host !== undefined && XAI_HOSTS.has(host));
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* Whether a credential is recognizably xAI's, from any of: xAI's `xai-` key format, a key held by an
|
|
132
|
+
* xAI row (disabled rows and pooled keys included), or an environment reference whose name points at
|
|
133
|
+
* xAI/Grok. Such a key may reach only xAI. An arbitrary string with none of these marks cannot be
|
|
134
|
+
* attributed to xAI; foreign keychain references are refused earlier for every destination.
|
|
135
|
+
*/
|
|
136
|
+
function isXaiCredential(config: OcxConfig, reference: string | undefined, token: string): boolean {
|
|
137
|
+
if (token.toLowerCase().startsWith("xai-")) return true;
|
|
138
|
+
const ref = reference?.trim() ?? "";
|
|
139
|
+
if (/^\$\{?[A-Za-z0-9_]*(XAI|GROK)[A-Za-z0-9_]*\}?$/i.test(ref)) return true;
|
|
140
|
+
for (const [name, provider] of Object.entries(config.providers)) {
|
|
141
|
+
if (!isXaiRow(name, provider)) continue;
|
|
142
|
+
for (const candidate of [provider.apiKey, ...(provider.apiKeyPool ?? []).map(entry => entry.key)]) {
|
|
143
|
+
if (resolveProviderApiKey(candidate)?.trim() === token) return true;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
export type VideoProviderSelection =
|
|
150
|
+
| { ok: true; providerName: string; provider: OcxProviderConfig; auth: VideoProviderAuth }
|
|
151
|
+
| { ok: false; error: string };
|
|
152
|
+
|
|
153
|
+
/** The pinned xAI destination: registry host, no private-network opt-in, the row's egress route. */
|
|
154
|
+
function pinnedXaiVideoAuth(provider: OcxProviderConfig, token: string): VideoProviderAuth {
|
|
155
|
+
return {
|
|
156
|
+
baseUrl: pinnedXaiBaseUrl(),
|
|
157
|
+
token,
|
|
158
|
+
providerName: "xai",
|
|
159
|
+
...(provider.proxy !== undefined ? { proxy: provider.proxy } : {}),
|
|
160
|
+
...(provider.noProxy !== undefined ? { noProxy: provider.noProxy } : {}),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* Resolve an explicit `images.videoProvider`. Returns undefined when the setting is absent, which
|
|
166
|
+
* keeps the historical xAI discovery. Every other outcome is final: an unusable selection is an
|
|
167
|
+
* error and never falls back to xAI. The chosen row's own baseUrl and key are the only destination
|
|
168
|
+
* and credential; `xai` itself stays pinned to the registry host, and a recognizably xAI credential
|
|
169
|
+
* (see {@link isXaiCredential}) is refused for every origin except HTTPS xAI hosts on the default port.
|
|
170
|
+
*/
|
|
171
|
+
export function selectVideoProvider(config: OcxConfig): VideoProviderSelection | undefined {
|
|
172
|
+
const configured = config.images?.videoProvider;
|
|
173
|
+
if (configured === undefined) return undefined;
|
|
174
|
+
if (typeof configured !== "string" || !configured.trim()) {
|
|
175
|
+
return { ok: false, error: "images.videoProvider must be a nonblank provider name" };
|
|
176
|
+
}
|
|
177
|
+
const providerName = configured.trim();
|
|
178
|
+
const label = `images.videoProvider "${providerName}"`;
|
|
179
|
+
const isXai = providerName === "xai";
|
|
180
|
+
if (!isXai && getProviderRegistryEntry(providerName)) {
|
|
181
|
+
return { ok: false, error: `${label} must name a custom provider or xai` };
|
|
182
|
+
}
|
|
183
|
+
const provider = Object.prototype.hasOwnProperty.call(config.providers, providerName)
|
|
184
|
+
? config.providers[providerName]
|
|
185
|
+
: undefined;
|
|
186
|
+
if (!provider) return { ok: false, error: `${label} is not configured` };
|
|
187
|
+
if (provider.disabled === true) return { ok: false, error: `${label} is disabled` };
|
|
188
|
+
if (provider.authMode !== undefined && provider.authMode !== "key") {
|
|
189
|
+
return { ok: false, error: `${label} must be an API-key provider` };
|
|
190
|
+
}
|
|
191
|
+
if (isProviderApiKeyPaused(provider)) {
|
|
192
|
+
return { ok: false, error: `${label} is paused: its active API key is disabled` };
|
|
193
|
+
}
|
|
194
|
+
// Never resolve another row's keychain secret, whatever the destination (xAI included).
|
|
195
|
+
if (isKeychainReference(provider.apiKey) && !keychainReferenceBelongsToProvider(provider.apiKey, providerName)) {
|
|
196
|
+
return { ok: false, error: `${label} references a keychain secret it does not own` };
|
|
197
|
+
}
|
|
198
|
+
let baseUrl: string;
|
|
199
|
+
if (isXai) {
|
|
200
|
+
baseUrl = pinnedXaiBaseUrl();
|
|
201
|
+
} else {
|
|
202
|
+
baseUrl = provider.baseUrl.trim().replace(/\/+$/, "");
|
|
203
|
+
let parsed: URL | undefined;
|
|
204
|
+
try { parsed = new URL(baseUrl); } catch { /* reported below */ }
|
|
205
|
+
// The client appends paths as strings, so a query or fragment would swallow them.
|
|
206
|
+
if (!parsed || (parsed.protocol !== "https:" && parsed.protocol !== "http:")
|
|
207
|
+
|| parsed.username || parsed.password || parsed.search || parsed.hash
|
|
208
|
+
|| baseUrl.includes("?") || baseUrl.includes("#")) {
|
|
209
|
+
return { ok: false, error: `${label} needs a plain http(s) baseUrl without credentials, query or fragment` };
|
|
210
|
+
}
|
|
211
|
+
const destinationError = providerDestinationConfigError(providerName, provider);
|
|
212
|
+
if (destinationError) return { ok: false, error: `${label} ${destinationError}` };
|
|
213
|
+
}
|
|
214
|
+
const token = resolveProviderApiKey(provider.apiKey)?.trim();
|
|
215
|
+
if (!token) return { ok: false, error: `${label} has no usable API key` };
|
|
216
|
+
if (!isXai && !isTrustedXaiOrigin(baseUrl) && isXaiCredential(config, provider.apiKey, token)) {
|
|
217
|
+
return { ok: false, error: `${label} uses an xAI API key; an xAI API key is only sent to xAI over HTTPS` };
|
|
218
|
+
}
|
|
219
|
+
// The literal check above runs at plan time; the outbound transport repeats it on the resolved
|
|
220
|
+
// addresses at connect time, so a hostname that resolves to loopback or private space needs the
|
|
221
|
+
// same allowPrivateNetwork opt-in.
|
|
222
|
+
const auth: VideoProviderAuth = isXai
|
|
223
|
+
? pinnedXaiVideoAuth(provider, token)
|
|
224
|
+
: {
|
|
225
|
+
baseUrl,
|
|
226
|
+
token,
|
|
227
|
+
providerName,
|
|
228
|
+
...(provider.allowPrivateNetwork === true ? { allowPrivateNetwork: true } : {}),
|
|
229
|
+
...(provider.proxy !== undefined ? { proxy: provider.proxy } : {}),
|
|
230
|
+
...(provider.noProxy !== undefined ? { noProxy: provider.noProxy } : {}),
|
|
231
|
+
};
|
|
232
|
+
return { ok: true, providerName, provider, auth };
|
|
233
|
+
}
|
|
103
234
|
|
|
104
235
|
/**
|
|
105
236
|
* Decide whether the video bridge should activate for this request. Unlike images, video
|
|
@@ -107,7 +238,9 @@ const DEFAULT_VIDEO_MODEL = "grok-imagine-video";
|
|
|
107
238
|
* injected when `videoBridgeEnabled` is true. The bridge activates only when:
|
|
108
239
|
* 1. videoBridgeEnabled is explicitly true (opt-in)
|
|
109
240
|
* 2. the routed provider is NOT api.openai.com (native passthrough)
|
|
110
|
-
* 3.
|
|
241
|
+
* 3. `images.videoProvider` names a usable provider, or, when it is unset, an xAI provider with a
|
|
242
|
+
* valid API key is available. An unusable explicit provider yields an unavailable plan that
|
|
243
|
+
* answers every call with its error; it never falls back to xAI.
|
|
111
244
|
*/
|
|
112
245
|
export async function planVideoBridge(
|
|
113
246
|
config: OcxConfig,
|
|
@@ -136,23 +269,26 @@ export async function planVideoBridge(
|
|
|
136
269
|
// Don't intercept for OpenAI native passthrough
|
|
137
270
|
const host = (() => { try { return new URL(routedProvider.baseUrl).hostname; } catch { return ""; } })();
|
|
138
271
|
if (host === "api.openai.com") return undefined;
|
|
139
|
-
const found = findXaiProvider(config);
|
|
140
|
-
if (!found) return undefined;
|
|
141
|
-
const token = resolveXaiImageApiKey(found.provider);
|
|
142
|
-
if (!token) return undefined;
|
|
143
|
-
// Pin the baseUrl to the registry entry, ignoring any config-level baseUrl override.
|
|
144
|
-
const registryEntry = getProviderRegistryEntry("xai");
|
|
145
|
-
const pinnedBaseUrl = (registryEntry?.baseUrl ?? "https://api.x.ai/v1").replace(/\/+$/, "");
|
|
146
272
|
const timeoutMs = clampImageTimeoutMs(config.images?.videoTimeoutMs);
|
|
147
273
|
const keepRaw = config.images?.artifactsKeepCount;
|
|
148
274
|
const artifactsKeepCount =
|
|
149
275
|
typeof keepRaw === "number" && Number.isFinite(keepRaw) ? Math.floor(keepRaw) : undefined;
|
|
150
|
-
|
|
151
|
-
provider: found.provider,
|
|
152
|
-
auth: { baseUrl: pinnedBaseUrl, token },
|
|
276
|
+
const common = {
|
|
153
277
|
model: config.images?.videoBridgeModel ?? DEFAULT_VIDEO_MODEL,
|
|
154
278
|
toolNames,
|
|
155
279
|
...(timeoutMs !== undefined ? { timeoutMs } : {}),
|
|
156
280
|
...(artifactsKeepCount !== undefined ? { artifactsKeepCount } : {}),
|
|
157
281
|
};
|
|
282
|
+
const selection = selectVideoProvider(config);
|
|
283
|
+
if (selection) {
|
|
284
|
+
return selection.ok
|
|
285
|
+
? { ...common, provider: selection.provider, auth: selection.auth }
|
|
286
|
+
: { ...common, unavailable: selection.error };
|
|
287
|
+
}
|
|
288
|
+
const found = findXaiProvider(config);
|
|
289
|
+
if (!found) return undefined;
|
|
290
|
+
const token = resolveXaiImageApiKey(found.provider);
|
|
291
|
+
if (!token) return undefined;
|
|
292
|
+
// Pin the baseUrl to the registry entry, ignoring any config-level baseUrl override.
|
|
293
|
+
return { ...common, provider: found.provider, auth: pinnedXaiVideoAuth(found.provider, token) };
|
|
158
294
|
}
|
package/src/images/types.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { OcxProviderConfig } from "../types";
|
|
2
|
+
import type { VideoProviderAuth } from "./xai-video-client";
|
|
2
3
|
|
|
3
4
|
export interface ImageBridgePlan {
|
|
4
5
|
provider: OcxProviderConfig;
|
|
@@ -25,10 +26,7 @@ export interface ImageCallResult {
|
|
|
25
26
|
error?: string;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
|
-
|
|
29
|
-
export interface VideoBridgePlan {
|
|
30
|
-
provider: OcxProviderConfig;
|
|
31
|
-
auth: { baseUrl: string; token: string };
|
|
29
|
+
interface VideoBridgePlanBase {
|
|
32
30
|
model: string;
|
|
33
31
|
toolNames: Set<string>;
|
|
34
32
|
/** Per-call xAI deadline (ms) for submit + poll. */
|
|
@@ -37,5 +35,16 @@ export interface VideoBridgePlan {
|
|
|
37
35
|
artifactsKeepCount?: number;
|
|
38
36
|
}
|
|
39
37
|
|
|
38
|
+
/**
|
|
39
|
+
* Plan for the video bridge. A ready plan carries the one destination and credential the
|
|
40
|
+
* bridge may use. An unavailable plan (an explicit `images.videoProvider` that cannot be used)
|
|
41
|
+
* still claims the `video_gen` tool so each call is answered with the configuration error
|
|
42
|
+
* instead of reaching any upstream; it carries no provider and no credential.
|
|
43
|
+
*/
|
|
44
|
+
export type VideoBridgePlan = VideoBridgePlanBase & (
|
|
45
|
+
| { provider: OcxProviderConfig; auth: VideoProviderAuth; unavailable?: undefined }
|
|
46
|
+
| { provider?: undefined; auth?: undefined; unavailable: string }
|
|
47
|
+
);
|
|
48
|
+
|
|
40
49
|
/** Result shape for video fulfillment — same as image. */
|
|
41
50
|
export type VideoCallResult = ImageCallResult;
|
|
@@ -6,7 +6,37 @@
|
|
|
6
6
|
* The submit call uses a 60 s timeout (it only returns an ID); the poll call uses 30 s.
|
|
7
7
|
* Non-2xx responses throw with the original status code so callers can distinguish
|
|
8
8
|
* rate-limit / auth failures from transient errors.
|
|
9
|
+
*
|
|
10
|
+
* Both calls go through the provider outbound transport, which resolves the destination host,
|
|
11
|
+
* applies the selected row's `allowPrivateNetwork` to every DNS answer and pins the connection to
|
|
12
|
+
* a validated address, so a hostname that resolves to loopback or private space never receives the
|
|
13
|
+
* bearer key without the opt-in and a later DNS answer cannot redirect it (rebinding).
|
|
14
|
+
* The poll GET carries the same key as the submit POST, so it obeys the same cleartext rules.
|
|
9
15
|
*/
|
|
16
|
+
import type { OcxProviderConfig } from "../types";
|
|
17
|
+
import { getProviderRegistryEntry } from "../providers/registry";
|
|
18
|
+
import {
|
|
19
|
+
providerOutboundGet,
|
|
20
|
+
providerOutboundPost,
|
|
21
|
+
type ProviderOutboundDependencies,
|
|
22
|
+
} from "../lib/provider-outbound";
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Destination and credential of one video provider. `providerName` and the destination fields are
|
|
26
|
+
* the selected row's, read by the outbound policy; the pinned xAI path uses `xai` with no
|
|
27
|
+
* private-network opt-in because its destination is the registry host.
|
|
28
|
+
*/
|
|
29
|
+
export interface VideoProviderAuth {
|
|
30
|
+
baseUrl: string;
|
|
31
|
+
token: string;
|
|
32
|
+
providerName: string;
|
|
33
|
+
allowPrivateNetwork?: boolean;
|
|
34
|
+
proxy?: OcxProviderConfig["proxy"];
|
|
35
|
+
noProxy?: OcxProviderConfig["noProxy"];
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Test seam for DNS resolution and the pinned transport; production passes nothing. */
|
|
39
|
+
export type VideoOutboundDependencies = Pick<ProviderOutboundDependencies, "resolveAddresses" | "pinnedGet" | "pinnedPost">;
|
|
10
40
|
|
|
11
41
|
export interface XaiVideoSubmitRequest {
|
|
12
42
|
prompt: string;
|
|
@@ -30,6 +60,40 @@ const SUBMIT_TIMEOUT_MS = 60_000;
|
|
|
30
60
|
const POLL_TIMEOUT_MS = 30_000;
|
|
31
61
|
const DEFAULT_VIDEO_MODEL = "grok-imagine-video";
|
|
32
62
|
|
|
63
|
+
function xaiRegistryBaseUrl(): string {
|
|
64
|
+
return (getProviderRegistryEntry("xai")?.baseUrl ?? "https://api.x.ai/v1").replace(/\/+$/, "");
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Only the registry xAI video endpoints qualify for the outbound fake-IP TUN exception, which
|
|
69
|
+
* keeps the pinned xAI path reachable under Clash/Surge TUN mode as it was with plain fetch.
|
|
70
|
+
*/
|
|
71
|
+
function isCanonicalXaiVideoUrl(name: string, url: string): boolean {
|
|
72
|
+
return name === "xai" && url.startsWith(`${xaiRegistryBaseUrl()}/videos/`);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function outboundConfig(auth: VideoProviderAuth) {
|
|
76
|
+
return {
|
|
77
|
+
baseUrl: auth.baseUrl,
|
|
78
|
+
...(auth.allowPrivateNetwork === true ? { allowPrivateNetwork: true } : {}),
|
|
79
|
+
...(auth.proxy !== undefined ? { proxy: auth.proxy } : {}),
|
|
80
|
+
...(auth.noProxy !== undefined ? { noProxy: auth.noProxy } : {}),
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
function outboundDependencies(dependencies: VideoOutboundDependencies): ProviderOutboundDependencies {
|
|
85
|
+
return {
|
|
86
|
+
...dependencies,
|
|
87
|
+
isCanonicalUrl: isCanonicalXaiVideoUrl,
|
|
88
|
+
// A self-hosted http video service is reachable only on localhost or a local address
|
|
89
|
+
// literal, and only when the row itself sets allowPrivateNetwork (see provider-outbound).
|
|
90
|
+
allowLocalCleartextPost: true,
|
|
91
|
+
// The poll GET sends the bearer key too, so it gets exactly the submit POST's cleartext rules:
|
|
92
|
+
// a public answer for an http host, or a proxied http route, is refused before any send.
|
|
93
|
+
cleartextPolicy: "credentialed",
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
|
|
33
97
|
/** Maximum response body size for the submit and poll calls (responses are small JSON). */
|
|
34
98
|
const MAX_RESPONSE_BYTES = 1024 * 1024; // 1 MiB — these endpoints return small JSON
|
|
35
99
|
|
|
@@ -64,8 +128,9 @@ async function readBoundedText(resp: Response): Promise<string> {
|
|
|
64
128
|
*/
|
|
65
129
|
export async function submitVideoJob(
|
|
66
130
|
req: XaiVideoSubmitRequest,
|
|
67
|
-
auth:
|
|
131
|
+
auth: VideoProviderAuth,
|
|
68
132
|
signal?: AbortSignal,
|
|
133
|
+
dependencies: VideoOutboundDependencies = {},
|
|
69
134
|
): Promise<XaiVideoSubmitResult> {
|
|
70
135
|
const body: Record<string, unknown> = {
|
|
71
136
|
model: req.model ?? DEFAULT_VIDEO_MODEL,
|
|
@@ -78,16 +143,14 @@ export async function submitVideoJob(
|
|
|
78
143
|
const timeout = AbortSignal.timeout(SUBMIT_TIMEOUT_MS);
|
|
79
144
|
const linkedSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
|
|
80
145
|
|
|
81
|
-
const resp = await
|
|
82
|
-
method: "POST",
|
|
83
|
-
redirect: "manual",
|
|
146
|
+
const resp = await providerOutboundPost(auth.providerName, outboundConfig(auth), `${auth.baseUrl}/videos/generations`, {
|
|
84
147
|
headers: {
|
|
85
148
|
"Authorization": `Bearer ${auth.token}`,
|
|
86
149
|
"Content-Type": "application/json",
|
|
87
150
|
},
|
|
88
151
|
body: JSON.stringify(body),
|
|
89
152
|
signal: linkedSignal,
|
|
90
|
-
});
|
|
153
|
+
}, outboundDependencies(dependencies));
|
|
91
154
|
|
|
92
155
|
if (!resp.ok) {
|
|
93
156
|
try { await resp.body?.cancel(); } catch { /* ignore */ }
|
|
@@ -111,20 +174,19 @@ export async function submitVideoJob(
|
|
|
111
174
|
*/
|
|
112
175
|
export async function pollVideoJob(
|
|
113
176
|
requestId: string,
|
|
114
|
-
auth:
|
|
177
|
+
auth: VideoProviderAuth,
|
|
115
178
|
signal?: AbortSignal,
|
|
179
|
+
dependencies: VideoOutboundDependencies = {},
|
|
116
180
|
): Promise<XaiVideoPollResult> {
|
|
117
181
|
const timeout = AbortSignal.timeout(POLL_TIMEOUT_MS);
|
|
118
182
|
const linkedSignal = signal ? AbortSignal.any([signal, timeout]) : timeout;
|
|
119
183
|
|
|
120
|
-
const resp = await
|
|
121
|
-
method: "GET",
|
|
122
|
-
redirect: "manual",
|
|
184
|
+
const resp = await providerOutboundGet(auth.providerName, outboundConfig(auth), `${auth.baseUrl}/videos/${encodeURIComponent(requestId)}`, {
|
|
123
185
|
headers: {
|
|
124
186
|
"Authorization": `Bearer ${auth.token}`,
|
|
125
187
|
},
|
|
126
188
|
signal: linkedSignal,
|
|
127
|
-
});
|
|
189
|
+
}, outboundDependencies(dependencies));
|
|
128
190
|
|
|
129
191
|
if (!resp.ok) {
|
|
130
192
|
try { await resp.body?.cancel(); } catch { /* ignore */ }
|
|
@@ -1,16 +1,41 @@
|
|
|
1
1
|
import { namedExportContext } from "../clients/config-export/alias-selectors";
|
|
2
|
+
import { attachNestedSelectors } from "../clients/config-export/nested-selectors";
|
|
2
3
|
import { supportsAliasModelNames } from "../clients/config-export/model-names";
|
|
3
4
|
import type { OcxConfig } from "../types";
|
|
4
5
|
import { observeIntegration, type IntegrationPlanOperation, type IntegrationWriteInput } from "./mutation-plan";
|
|
5
6
|
import { exportContextOf } from "./state";
|
|
6
7
|
import type { WriteRefused } from "./writer";
|
|
7
8
|
|
|
9
|
+
/**
|
|
10
|
+
* Pi's raw nested selectors were proven against the serving configuration when the roster loaded
|
|
11
|
+
* (#8172). A configuration or inventory change during the coordinator awaits retires that proof, so
|
|
12
|
+
* a selector that no longer reaches the same model refuses the write instead of being installed.
|
|
13
|
+
*/
|
|
14
|
+
function staleNestedSelectorRefusal(
|
|
15
|
+
input: IntegrationWriteInput,
|
|
16
|
+
liveConfig: OcxConfig,
|
|
17
|
+
operation: IntegrationPlanOperation,
|
|
18
|
+
): WriteRefused | null {
|
|
19
|
+
if ((operation !== "apply" && operation !== "overwrite") || input.clientId !== "pi") return null;
|
|
20
|
+
const captured = exportContextOf(input).models;
|
|
21
|
+
if (!captured.some(model => model.nestedNamespaced !== undefined)) return null;
|
|
22
|
+
const current = attachNestedSelectors(liveConfig, captured);
|
|
23
|
+
const stale = captured.some((model, index) => model.nestedNamespaced !== undefined
|
|
24
|
+
&& model.nestedNamespaced !== current[index]?.nestedNamespaced);
|
|
25
|
+
return stale ? {
|
|
26
|
+
ok: false, clientId: input.clientId, state: "conflict", reason: "conflict",
|
|
27
|
+
message: "model selectors changed while applying; retry with the current catalog",
|
|
28
|
+
} : null;
|
|
29
|
+
}
|
|
30
|
+
|
|
8
31
|
/** Final synchronous admission after all coordinator awaits, before maintenance or writes. */
|
|
9
32
|
export function staleModelNameRefusal(
|
|
10
33
|
input: IntegrationWriteInput,
|
|
11
34
|
liveConfig: OcxConfig,
|
|
12
35
|
operation: IntegrationPlanOperation,
|
|
13
36
|
): WriteRefused | null {
|
|
37
|
+
const nested = staleNestedSelectorRefusal(input, liveConfig, operation);
|
|
38
|
+
if (nested) return nested;
|
|
14
39
|
if ((operation !== "apply" && operation !== "overwrite") || !supportsAliasModelNames(input.clientId)
|
|
15
40
|
|| (input.modelNames !== undefined && input.modelNames !== "alias")) return null;
|
|
16
41
|
const context = { ...exportContextOf(input), modelNames: "alias" as const };
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/** Passive routing facts only. No catalog discovery, persistence, targets, or credentials. */
|
|
2
|
+
import { comboPublicModelId, isValidComboId } from "../combos/identifiers";
|
|
3
|
+
import type { OcxConfig } from "../types";
|
|
4
|
+
|
|
5
|
+
export const MAX_ROUTE_CATALOG_BYTES = 1024 * 1024;
|
|
6
|
+
export interface RouteCatalogFacts { version: 1; combos: Array<{ publicId: string; comboId: string }> }
|
|
7
|
+
export function parseRouteCatalogFacts(raw: unknown): RouteCatalogFacts | null {
|
|
8
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw) || Object.keys(raw).sort().join(",") !== "combos,version"
|
|
9
|
+
|| !("version" in raw) || raw.version !== 1 || !("combos" in raw) || !Array.isArray(raw.combos) || raw.combos.length > 4096) return null;
|
|
10
|
+
const seen = new Set<string>();
|
|
11
|
+
const combos: RouteCatalogFacts["combos"] = [];
|
|
12
|
+
for (const row of raw.combos) {
|
|
13
|
+
if (!row || typeof row !== "object" || Array.isArray(row) || Object.keys(row).sort().join(",") !== "comboId,publicId"
|
|
14
|
+
|| typeof row.comboId !== "string" || !isValidComboId(row.comboId) || typeof row.publicId !== "string"
|
|
15
|
+
|| !row.publicId || row.publicId.length > 512 || /[\x00-\x1f\x7f]/.test(row.publicId) || seen.has(row.publicId)) return null;
|
|
16
|
+
seen.add(row.publicId); combos.push({ publicId: row.publicId, comboId: row.comboId });
|
|
17
|
+
}
|
|
18
|
+
return { version: 1, combos };
|
|
19
|
+
}
|
|
20
|
+
export function projectRouteCatalogFacts(config: OcxConfig): RouteCatalogFacts {
|
|
21
|
+
const facts = parseRouteCatalogFacts({ version: 1, combos: Object.entries(config.combos ?? {}).map(([comboId, combo]) => ({
|
|
22
|
+
publicId: comboPublicModelId(comboId, combo), comboId,
|
|
23
|
+
})) });
|
|
24
|
+
if (!facts || Buffer.byteLength(JSON.stringify(facts)) > MAX_ROUTE_CATALOG_BYTES) throw new Error("Route catalog facts are invalid or too large");
|
|
25
|
+
return facts;
|
|
26
|
+
}
|