@bitkyc08/opencodex 2.100.1 → 2.100.3
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 +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.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 +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -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.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- 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 +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- 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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-restart-client.ts +3 -2
- 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 +321 -34
- 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-readiness.ts +16 -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-status.ts +76 -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 +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -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/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- 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-types.ts +2 -0
- package/src/codex/convergence.ts +2 -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/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- 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/redact.ts +84 -8
- 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 +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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 +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- 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/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- 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-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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- 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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -2
- 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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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 +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- 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 +137 -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 +7 -1
- 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 +218 -0
- 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 +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -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 +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- 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-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- 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/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-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- 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 +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -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/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/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- 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 +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -32,7 +32,14 @@ import { join } from "node:path";
|
|
|
32
32
|
import { getConfigDir } from "../config/paths";
|
|
33
33
|
import { resolveEnvValue } from "../config/proxy-env";
|
|
34
34
|
import { isKeychainReference, providerKeyResolutionGeneration, resolveProviderApiKeyQuietly } from "../providers/api-key-resolve";
|
|
35
|
-
import {
|
|
35
|
+
import {
|
|
36
|
+
MAX_CREDENTIAL_EXCERPT_WINDOWS,
|
|
37
|
+
containsExcerptWindow,
|
|
38
|
+
credentialComponents,
|
|
39
|
+
credentialExcerptWindows,
|
|
40
|
+
credentialSetMatches,
|
|
41
|
+
credentialContainmentIndex,
|
|
42
|
+
} from "../lib/outbound-credential-registry";
|
|
36
43
|
import { SENSITIVE_KEY_PATTERN } from "../lib/redact";
|
|
37
44
|
|
|
38
45
|
const CREDENTIAL_FIELD = /(?:key|token|secret|password|passwd|credential|cookie|authorization)$/i;
|
|
@@ -47,6 +54,8 @@ export interface ConfiguredCredentials {
|
|
|
47
54
|
interface Snapshot {
|
|
48
55
|
/** The only object handed out: cache metadata (including env values) stays private here. */
|
|
49
56
|
readonly view: ConfiguredCredentials;
|
|
57
|
+
/** Excerpt windows of configured credential keys and tokens (see containsConfiguredCredentialExcerpt). */
|
|
58
|
+
readonly excerptWindows: ReadonlySet<string>;
|
|
50
59
|
readonly signature: string;
|
|
51
60
|
readonly envNames: readonly string[];
|
|
52
61
|
readonly envFingerprint: string;
|
|
@@ -105,10 +114,22 @@ function envReference(raw: string): string | undefined {
|
|
|
105
114
|
|
|
106
115
|
function build(configRead: StoreRead, authRead: StoreRead, signature: string, now: number): Snapshot {
|
|
107
116
|
const values = new Set<string>();
|
|
117
|
+
// Excerpt windows of credential-field values (keys, tokens): copy that repeats 8+ characters of a
|
|
118
|
+
// configured credential is refused like the whole value. Provider header values are matched whole
|
|
119
|
+
// only: they are often ordinary text (titles, referrer URLs) whose words would refuse common copy.
|
|
120
|
+
const windows = new Set<string>();
|
|
121
|
+
let producedWindows = 0;
|
|
108
122
|
const envNames = new Set<string>();
|
|
109
123
|
let complete = true;
|
|
110
|
-
const add = (raw: string | undefined) => {
|
|
111
|
-
if (raw)
|
|
124
|
+
const add = (raw: string | undefined, credential = true) => {
|
|
125
|
+
if (!raw) return;
|
|
126
|
+
for (const part of credentialComponents(raw)) values.add(part);
|
|
127
|
+
if (!credential || producedWindows > MAX_CREDENTIAL_EXCERPT_WINDOWS) return;
|
|
128
|
+
const produced = credentialExcerptWindows(raw, MAX_CREDENTIAL_EXCERPT_WINDOWS - producedWindows);
|
|
129
|
+
producedWindows += produced.length;
|
|
130
|
+
// Unbounded excerpt coverage would be unbounded work: past the cap the set fails closed.
|
|
131
|
+
if (producedWindows > MAX_CREDENTIAL_EXCERPT_WINDOWS) complete = false;
|
|
132
|
+
else for (const window of produced) windows.add(window);
|
|
112
133
|
};
|
|
113
134
|
const noteEnv = (raw: string) => {
|
|
114
135
|
const name = envReference(raw);
|
|
@@ -131,7 +152,7 @@ function build(configRead: StoreRead, authRead: StoreRead, signature: string, no
|
|
|
131
152
|
for (const header of Object.values(value)) {
|
|
132
153
|
if (typeof header !== "string") continue;
|
|
133
154
|
noteEnv(header);
|
|
134
|
-
add(resolveEnvValue(header) ?? header);
|
|
155
|
+
add(resolveEnvValue(header) ?? header, false);
|
|
135
156
|
}
|
|
136
157
|
} else if (typeof value === "string") {
|
|
137
158
|
if (isCredentialField(field)) addReference(value);
|
|
@@ -171,12 +192,14 @@ function build(configRead: StoreRead, authRead: StoreRead, signature: string, no
|
|
|
171
192
|
if (isRecord(auth.value)) walkAuth(auth.value, 0);
|
|
172
193
|
|
|
173
194
|
const names = [...envNames].sort();
|
|
195
|
+
const containment = credentialContainmentIndex(values);
|
|
174
196
|
const view: ConfiguredCredentials = Object.freeze({
|
|
175
197
|
complete,
|
|
176
|
-
matches: (value: string) => credentialSetMatches(values, candidate => values.has(candidate), value),
|
|
198
|
+
matches: (value: string) => credentialSetMatches(values, candidate => values.has(candidate), value, 1, containment),
|
|
177
199
|
});
|
|
178
200
|
return {
|
|
179
201
|
view,
|
|
202
|
+
excerptWindows: windows,
|
|
180
203
|
signature,
|
|
181
204
|
envNames: names,
|
|
182
205
|
envFingerprint: envFingerprint(names),
|
|
@@ -197,3 +220,12 @@ export function configuredCredentials(now = Date.now()): ConfiguredCredentials {
|
|
|
197
220
|
if (stale) cached = build(configRead, authRead, signature, now);
|
|
198
221
|
return cached!.view;
|
|
199
222
|
}
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* Whether value holds an 8+ character excerpt of a configured credential key or token, against the
|
|
226
|
+
* same fresh snapshot {@link configuredCredentials} serves. Whole-value matching stays in the view.
|
|
227
|
+
*/
|
|
228
|
+
export function containsConfiguredCredentialExcerpt(value: string, now = Date.now()): boolean {
|
|
229
|
+
configuredCredentials(now);
|
|
230
|
+
return cached !== undefined && containsExcerptWindow(value, cached.excerptWindows);
|
|
231
|
+
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { desktopGuiBinding, desktopGuiOrigin, hasDesktopForwardingHeaders } from "../lib/desktop-gui-origin";
|
|
3
|
+
import type { OcxConfig } from "../types";
|
|
4
|
+
import { managementRequestOrigin } from "./auth-cors";
|
|
5
|
+
import type { GuiSessionRecord, GuiSessionState } from "./gui-session";
|
|
6
|
+
|
|
7
|
+
export const DESKTOP_AUTHORIZATION_PATH = "/api/codex/desktop-compatibility/authorization";
|
|
8
|
+
const TTL = 5 * 60_000;
|
|
9
|
+
const authorities = new WeakMap<GuiSessionRecord, { expiresAt: number; binding: string }>();
|
|
10
|
+
|
|
11
|
+
/** A scope on the existing record: neither pairing issuance nor data-key disclosure changes. */
|
|
12
|
+
export function authorizeDesktopSession(req: Request, config: OcxConfig, state: GuiSessionState, session: GuiSessionRecord, grant: string): boolean {
|
|
13
|
+
if (!/^ocx_pair_[A-Za-z0-9_-]{43}$/.test(grant) || req.method !== "POST"
|
|
14
|
+
|| new URL(req.url).pathname !== DESKTOP_AUTHORIZATION_PATH || new URL(req.url).search
|
|
15
|
+
|| hasDesktopForwardingHeaders(req) || desktopGuiOrigin(config, session.serverOrigin) !== session.serverOrigin
|
|
16
|
+
|| session.browserOrigin !== session.serverOrigin || req.headers.get("Origin") !== session.serverOrigin
|
|
17
|
+
|| managementRequestOrigin(req, config) !== session.serverOrigin
|
|
18
|
+
|| !(session.issuance === "loopback" || session.issuance === "pairing" && session.localPairing)) return false;
|
|
19
|
+
const digest = createHash("sha256").update(grant).digest("base64url");
|
|
20
|
+
const record = state.pairingGrants.get(digest), now = Date.now();
|
|
21
|
+
if (!record?.desktopPurpose || record.desktopBinding !== desktopGuiBinding(config) || record.expiresAt <= now || record.serverOrigin !== session.serverOrigin
|
|
22
|
+
|| record.browserOrigin !== session.browserOrigin) return false;
|
|
23
|
+
state.pairingGrants.delete(digest);
|
|
24
|
+
authorities.set(session, { expiresAt: Math.min(now + TTL, session.expiresAt), binding: desktopGuiBinding(config) });
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export function desktopSessionAuthorized(req: Request, config: OcxConfig, session: GuiSessionRecord): boolean {
|
|
29
|
+
const authority = authorities.get(session);
|
|
30
|
+
if (!authority) return false;
|
|
31
|
+
if (authority.expiresAt <= Date.now() || authority.binding !== desktopGuiBinding(config)
|
|
32
|
+
|| desktopGuiOrigin(config, session.serverOrigin) !== session.serverOrigin) {
|
|
33
|
+
authorities.delete(session); return false;
|
|
34
|
+
}
|
|
35
|
+
return !hasDesktopForwardingHeaders(req);
|
|
36
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { OcxConfig } from "../types";
|
|
2
|
-
import { GUI_PAIR_BROWSER_ORIGIN_HEADER, GUI_PAIR_CAPABILITY_HEADER, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
2
|
+
import { DESKTOP_GUI_PAIR_PATH, GUI_PAIR_BROWSER_ORIGIN_HEADER, GUI_PAIR_CAPABILITY_HEADER, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
3
|
+
import { desktopGuiOrigin, hasDesktopForwardingHeaders } from "../lib/desktop-gui-origin";
|
|
3
4
|
import { consumeGuiPairIntent, GUI_PAIR_INTENT_HEADER } from "../lib/gui-pair-intent";
|
|
4
5
|
import { createGuiPairingGrant, type GuiSessionState } from "./gui-session";
|
|
5
6
|
|
|
@@ -13,11 +14,13 @@ export class GuiPairingIntentRequiredError extends Error {
|
|
|
13
14
|
/** The serving route must authenticate the existing process-bound capability first. */
|
|
14
15
|
export function deliverGuiPairingGrant(req: Request, config: OcxConfig, state: GuiSessionState) {
|
|
15
16
|
const origin = req.headers.get(GUI_PAIR_BROWSER_ORIGIN_HEADER) ?? "";
|
|
17
|
+
const desktop = new URL(req.url).pathname === DESKTOP_GUI_PAIR_PATH;
|
|
18
|
+
if (desktop && (hasDesktopForwardingHeaders(req) || desktopGuiOrigin(config, origin) !== origin)) throw new GuiPairingIntentRequiredError();
|
|
16
19
|
if (config.runtimeRole !== "hub") {
|
|
17
|
-
if (standaloneGuiPairingOrigin(config) !== origin
|
|
20
|
+
if ((desktop ? desktopGuiOrigin(config, origin) : standaloneGuiPairingOrigin(config)) !== origin
|
|
18
21
|
|| !consumeGuiPairIntent(req.headers.get(GUI_PAIR_CAPABILITY_HEADER), req.headers.get(GUI_PAIR_INTENT_HEADER))) {
|
|
19
22
|
throw new GuiPairingIntentRequiredError();
|
|
20
23
|
}
|
|
21
24
|
}
|
|
22
|
-
return createGuiPairingGrant(origin, config, state);
|
|
25
|
+
return createGuiPairingGrant(origin, config, state, Date.now(), desktop);
|
|
23
26
|
}
|
|
@@ -2,6 +2,7 @@ import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
|
|
|
2
2
|
import type { OcxConfig } from "../types";
|
|
3
3
|
import { canonicalGuiBrowserOrigin, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
4
4
|
import { authorizationCredential } from "../lib/authorization-scheme";
|
|
5
|
+
import { desktopGuiBinding, desktopGuiOrigin } from "../lib/desktop-gui-origin";
|
|
5
6
|
import {
|
|
6
7
|
isAllowedManagementOrigin,
|
|
7
8
|
isApiAuthRequired,
|
|
@@ -38,6 +39,9 @@ export interface GuiPairingGrantRecord {
|
|
|
38
39
|
expiresAt: number;
|
|
39
40
|
failedAttempts?: number;
|
|
40
41
|
localPairing?: true;
|
|
42
|
+
/** Only the signed Desktop route may create this process-local purpose. */
|
|
43
|
+
desktopPurpose?: true;
|
|
44
|
+
desktopBinding?: string;
|
|
41
45
|
}
|
|
42
46
|
|
|
43
47
|
export interface PairingAttemptContext {
|
|
@@ -265,9 +269,10 @@ export function createGuiPairingGrant(
|
|
|
265
269
|
config: OcxConfig,
|
|
266
270
|
state: GuiSessionState,
|
|
267
271
|
now = Date.now(),
|
|
272
|
+
desktopPurpose = false,
|
|
268
273
|
): { grant: string; browserOrigin: string; serverOrigin: string; expiresAt: number } {
|
|
269
274
|
const canonicalBrowserOrigin = canonicalGuiBrowserOrigin(browserOrigin);
|
|
270
|
-
const localOrigin = standaloneGuiPairingOrigin(config);
|
|
275
|
+
const localOrigin = desktopPurpose ? desktopGuiOrigin(config, browserOrigin) : standaloneGuiPairingOrigin(config);
|
|
271
276
|
const localPairing = localOrigin !== null && canonicalBrowserOrigin === localOrigin;
|
|
272
277
|
const serverOrigin = config.runtimeRole === "hub"
|
|
273
278
|
? canonicalHttpOrigin(config.hub?.managementPublicOrigin) : localOrigin;
|
|
@@ -275,6 +280,7 @@ export function createGuiPairingGrant(
|
|
|
275
280
|
!canonicalBrowserOrigin
|
|
276
281
|
|| canonicalBrowserOrigin !== browserOrigin
|
|
277
282
|
|| !serverOrigin
|
|
283
|
+
|| (desktopPurpose && !localPairing)
|
|
278
284
|
|| (config.runtimeRole === "hub"
|
|
279
285
|
? !isRemoteGuiBrowserOriginAllowed(canonicalBrowserOrigin, config) : !localPairing)
|
|
280
286
|
) throw new TypeError("remote GUI origin is not allowed");
|
|
@@ -289,6 +295,7 @@ export function createGuiPairingGrant(
|
|
|
289
295
|
} while (state.pairingGrants.has(digest));
|
|
290
296
|
const expiresAt = now + GUI_PAIRING_GRANT_TTL_MS;
|
|
291
297
|
state.pairingGrants.set(digest, { browserOrigin: canonicalBrowserOrigin, serverOrigin, expiresAt,
|
|
298
|
+
...(desktopPurpose ? { desktopPurpose: true as const, desktopBinding: desktopGuiBinding(config) } : {}),
|
|
292
299
|
...(localPairing ? { localPairing: true as const } : {}) });
|
|
293
300
|
return { grant, browserOrigin: canonicalBrowserOrigin, serverOrigin, expiresAt };
|
|
294
301
|
}
|
|
@@ -368,6 +375,8 @@ export function consumeGuiPairingGrant(
|
|
|
368
375
|
return attemptContext && !source.allowed ? source : null;
|
|
369
376
|
}
|
|
370
377
|
const [digest, record] = found;
|
|
378
|
+
// A Desktop grant adds only its own scope to an existing session, never ordinary pairing.
|
|
379
|
+
if (record.desktopPurpose) return null;
|
|
371
380
|
// A live role/config change must not turn a hub grant into local operator consent, or vice versa.
|
|
372
381
|
if (record.localPairing ? !localOrigin || record.serverOrigin !== localOrigin
|
|
373
382
|
: config.runtimeRole !== "hub") return null;
|
package/src/server/images.ts
CHANGED
|
@@ -32,6 +32,8 @@ import { sidecarEnter } from "../lib/sidecar-tracker";
|
|
|
32
32
|
import { isNonReplayableResponse } from "../lib/upstream-retry";
|
|
33
33
|
import type { OcxConfig } from "../types";
|
|
34
34
|
import { resolveFirstUsableOpenAiSidecar, selectImagesProvider } from "../providers/openai-sidecar";
|
|
35
|
+
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
|
|
36
|
+
import { resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
|
|
35
37
|
import { recordDistributedKeyFailure, selectProactiveApiKeyTransport } from "../providers/key-failover";
|
|
36
38
|
import { requestPacingOverloadResponse } from "./responses/pacing-overload";
|
|
37
39
|
import { getProviderRegistryEntry } from "../providers/registry";
|
|
@@ -669,8 +671,8 @@ export async function handleImages(
|
|
|
669
671
|
const xaiRelay = await tryXaiImageRelay(body, config, logCtx, req.signal, endpoint, admission);
|
|
670
672
|
if (xaiRelay) return xaiRelay;
|
|
671
673
|
}
|
|
672
|
-
if (candidates.error) {
|
|
673
|
-
return formatErrorResponse(400, "invalid_request_error", candidates.error);
|
|
674
|
+
if (candidates.error && (config.images?.provider !== undefined || !candidates.paused)) {
|
|
675
|
+
return formatErrorResponse(candidates.paused ? 403 : 400, candidates.paused ? "permission_error" : "invalid_request_error", candidates.error);
|
|
674
676
|
}
|
|
675
677
|
const explicitKeyedProvider = config.images?.provider !== undefined && candidates.keyed !== undefined;
|
|
676
678
|
// Admission bearer is valid proxy auth (requireApiAuth already passed) but must never be
|
|
@@ -709,6 +711,9 @@ export async function handleImages(
|
|
|
709
711
|
const ccaResponse = await tryCcaImageGeneration(body, config, logCtx, req.signal, endpoint, admission);
|
|
710
712
|
if (ccaResponse) return ccaResponse;
|
|
711
713
|
if (forwardScopeDenial) return forwardScopeDenial;
|
|
714
|
+
if (candidates.paused) {
|
|
715
|
+
return formatErrorResponse(403, "permission_error", candidates.error ?? new ProviderApiKeyPausedError().message);
|
|
716
|
+
}
|
|
712
717
|
// 400, not 5xx: codex retries every 5xx up to 5 total attempts, and this is a permanent
|
|
713
718
|
// configuration state that must surface on the first attempt.
|
|
714
719
|
return formatErrorResponse(
|
|
@@ -812,27 +817,47 @@ export async function handleImages(
|
|
|
812
817
|
// Transport variant: this branch reads `provider.baseUrl` and `provider.headers` to build
|
|
813
818
|
// the URL and the request, and it comes back with the credential already resolved.
|
|
814
819
|
let warmKeyProvider;
|
|
815
|
-
|
|
816
|
-
|
|
820
|
+
let currentKeyProvider;
|
|
821
|
+
try {
|
|
822
|
+
warmKeyProvider = selectProactiveApiKeyTransport(config, providerName, candidates.keyed.provider);
|
|
823
|
+
currentKeyProvider = warmKeyProvider ?? resolveCurrentProviderApiKeyTransport(
|
|
824
|
+
config,
|
|
825
|
+
providerName,
|
|
826
|
+
{ ...candidates.keyed.provider, _apiKeyAttempt: undefined },
|
|
827
|
+
);
|
|
828
|
+
if (isProviderApiKeyPaused(currentKeyProvider ?? config.providers[providerName])) {
|
|
829
|
+
throw new ProviderApiKeyPausedError();
|
|
830
|
+
}
|
|
831
|
+
} catch (error) {
|
|
832
|
+
if (error instanceof ProviderApiKeyPausedError) {
|
|
833
|
+
if (config.images?.provider === undefined) {
|
|
834
|
+
const ccaResponse = await tryCcaImageGeneration(body, config, logCtx, req.signal, endpoint, admission);
|
|
835
|
+
if (ccaResponse) return ccaResponse;
|
|
836
|
+
}
|
|
837
|
+
return formatErrorResponse(403, "permission_error", error.message);
|
|
838
|
+
}
|
|
839
|
+
if (error instanceof OAuthAccountPausedError) {
|
|
840
|
+
return formatErrorResponse(403, "permission_error", error.message);
|
|
841
|
+
}
|
|
817
842
|
const refusal = requestPacingOverloadResponse(error);
|
|
818
843
|
if (refusal) return refusal;
|
|
819
844
|
throw error;
|
|
820
845
|
}
|
|
821
|
-
const provider =
|
|
822
|
-
|
|
823
|
-
// No fall back to the earlier snapshot once a pick has happened. The picker COMMITS its
|
|
824
|
-
// choice before returning, so if the chosen reference will not resolve -- revoked keychain
|
|
825
|
-
// entry, unset env var -- sending the previous key would authenticate a non-idempotent
|
|
826
|
-
// POST with a credential the config no longer considers active, and the previous key is
|
|
827
|
-
// the one that was cooling. Fail loudly instead.
|
|
828
|
-
if (warmKeyProvider && !warmKeyProvider.apiKey?.trim()) {
|
|
846
|
+
const provider = currentKeyProvider;
|
|
847
|
+
if (!provider || !provider.apiKey?.trim()) {
|
|
829
848
|
return formatErrorResponse(
|
|
830
849
|
500,
|
|
831
850
|
"configuration_error",
|
|
832
851
|
`image generation selected an API key for "${providerName}" that cannot be resolved`,
|
|
833
852
|
);
|
|
834
853
|
}
|
|
835
|
-
|
|
854
|
+
recordKeyFailure = (status, retryAfter) => { recordDistributedKeyFailure(config, providerName, provider._apiKeyAttempt, status, Date.now(), retryAfter); };
|
|
855
|
+
// No fall back to the earlier snapshot once a pick has happened. The picker COMMITS its
|
|
856
|
+
// choice before returning, so if the chosen reference will not resolve -- revoked keychain
|
|
857
|
+
// entry, unset env var -- sending the previous key would authenticate a non-idempotent
|
|
858
|
+
// POST with a credential the config no longer considers active, and the previous key is
|
|
859
|
+
// the one that was cooling. Fail loudly instead.
|
|
860
|
+
const apiKey = provider.apiKey;
|
|
836
861
|
try {
|
|
837
862
|
for (const [name, value] of Object.entries(provider.headers ?? {})) headers.set(name, value);
|
|
838
863
|
headers.set("authorization", `Bearer ${apiKey}`);
|
|
@@ -847,6 +872,9 @@ export async function handleImages(
|
|
|
847
872
|
// No usable OpenAI credential — try CCA before giving up.
|
|
848
873
|
const ccaResponse = await tryCcaImageGeneration(body, config, logCtx, req.signal, endpoint, admission);
|
|
849
874
|
if (ccaResponse) return ccaResponse;
|
|
875
|
+
if (candidates.paused) {
|
|
876
|
+
return formatErrorResponse(403, "permission_error", candidates.error ?? new ProviderApiKeyPausedError().message);
|
|
877
|
+
}
|
|
850
878
|
return formatErrorResponse(
|
|
851
879
|
401,
|
|
852
880
|
"authentication_error",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
compressedBodyDecodeLimit,
|
|
2
3
|
MAX_DECOMPRESSED_BODY_BYTES,
|
|
3
4
|
resolveInboundBodyLimitBytes,
|
|
4
5
|
} from "./request-decompress";
|
|
@@ -133,9 +134,19 @@ function retainUntilResponseSettles(response: Response, signal: AbortSignal, rel
|
|
|
133
134
|
return wrapped;
|
|
134
135
|
}
|
|
135
136
|
|
|
137
|
+
/** A body that will be decoded: any Content-Encoding other than identity. */
|
|
138
|
+
function encodedBody(req: Request): boolean {
|
|
139
|
+
const encoding = req.headers.get("content-encoding")?.trim().toLowerCase();
|
|
140
|
+
return encoding !== undefined && encoding !== "" && encoding !== "identity";
|
|
141
|
+
}
|
|
142
|
+
|
|
136
143
|
/**
|
|
137
|
-
* Own one raised-limit HTTP request from before body reading through response
|
|
138
|
-
* EOF/error or settled cancellation.
|
|
144
|
+
* Own one raised-limit or encoded HTTP request from before body reading through response
|
|
145
|
+
* EOF/error or settled cancellation. An encoded body joins the shared budget at every limit
|
|
146
|
+
* (#3023): it reserves what it may decode to (`compressedBodyDecodeLimit` of its declared wire
|
|
147
|
+
* bytes, or the whole limit without a declaration) before a byte is read, and the reader shrinks
|
|
148
|
+
* that to the measured size, so the decoded bodies held at once stay within the budget however
|
|
149
|
+
* small their wire bytes are. An identity body at the default limit is not gated, as before. Call only at the admitted HTTP boundary,
|
|
139
150
|
* after auth/origin checks, not from readers or internal combo/translation hops.
|
|
140
151
|
* pathname is the same canonical pathname used by the server's dispatcher.
|
|
141
152
|
* The optional budget/wait override isolates lifecycle tests from the process-wide owner.
|
|
@@ -151,8 +162,9 @@ export async function withRaisedInboundBodyAdmission(
|
|
|
151
162
|
const maxBytes = resolveInboundBodyLimitBytes(configuredLimit);
|
|
152
163
|
// Native Ollama generation routes are served only on the authenticated listener, so they sit in
|
|
153
164
|
// their own set: the loopback oracle checks CONFIGURABLE_JSON_BODY_ROUTES against that allowlist.
|
|
165
|
+
const raised = maxBytes > MAX_DECOMPRESSED_BODY_BYTES;
|
|
154
166
|
if (req.method !== "POST" || !(CONFIGURABLE_JSON_BODY_ROUTES.has(pathname) || OLLAMA_JSON_BODY_ROUTES.has(pathname))
|
|
155
|
-
||
|
|
167
|
+
|| !(raised || encodedBody(req)) || req.signal.aborted) {
|
|
156
168
|
return work();
|
|
157
169
|
}
|
|
158
170
|
const declared = req.headers.get("content-length");
|
|
@@ -162,9 +174,10 @@ export async function withRaisedInboundBodyAdmission(
|
|
|
162
174
|
// protocol-specific 413 win over temporary capacity refusal, unchanged.
|
|
163
175
|
return work();
|
|
164
176
|
}
|
|
177
|
+
const reservation = raised || !Number.isFinite(declaredBytes) ? maxBytes : compressedBodyDecodeLimit(declaredBytes, maxBytes);
|
|
165
178
|
let lease;
|
|
166
179
|
try {
|
|
167
|
-
lease = await (options?.budget ?? inboundBodyBudget).acquire(
|
|
180
|
+
lease = await (options?.budget ?? inboundBodyBudget).acquire(reservation, req.signal, options?.maxWaitMs);
|
|
168
181
|
} catch (error) {
|
|
169
182
|
cancelUnreadBody(req, error);
|
|
170
183
|
if (options?.onAdmissionError) return options.onAdmissionError(error);
|