@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
|
@@ -29,6 +29,38 @@ export function setAdvisorPlanFactory(config: OcxConfig, factory: AdvisorPlanFac
|
|
|
29
29
|
else factories.delete(config);
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
/** Request-scoped config views (e.g. the Claude replay config) -> the live config they were built from. */
|
|
33
|
+
type AdvisorLinkedConfig = Pick<OcxConfig, "advisor">;
|
|
34
|
+
const views = new WeakMap<AdvisorLinkedConfig, OcxConfig>();
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Record that `view` is a request-scoped copy of `live`. A view resolves the live config's
|
|
38
|
+
* factory at lookup time, so a later disable or re-activation of the live config still applies.
|
|
39
|
+
* The view's `advisor` reads through to the live config: management writes replace that object
|
|
40
|
+
* (`config.advisor = ...`), so a copied reference would keep a revoked consent alive for the
|
|
41
|
+
* plan. Every other request-scoped override on the view is kept. Nothing is stored on the live
|
|
42
|
+
* config, and an accessor is still cloneable (#7974).
|
|
43
|
+
*/
|
|
44
|
+
export function linkAdvisorPlanConfig<T extends OcxConfig>(live: OcxConfig, view: T): T {
|
|
45
|
+
const root = views.get(live) ?? live;
|
|
46
|
+
views.set(view, root);
|
|
47
|
+
if (view !== root) {
|
|
48
|
+
Object.defineProperty(view, "advisor", { get: () => root.advisor, enumerable: true, configurable: true });
|
|
49
|
+
}
|
|
50
|
+
return view;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* The live config a request-scoped view was linked to, or the config itself when it was not
|
|
55
|
+
* linked. Identity-scoped state that must outlive one request (the activity feed the management
|
|
56
|
+
* route reads from its own config object) resolves through the same link as the factory.
|
|
57
|
+
*/
|
|
58
|
+
export function advisorPlanRootConfig<T extends AdvisorLinkedConfig>(config: T): T | OcxConfig {
|
|
59
|
+
return views.get(config) ?? config;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** Create the plan from the factory registered for this config, or for the live config it was linked to. */
|
|
32
63
|
export function createRegisteredAdvisorPlan(input: AdvisorPlanInput): Promise<RegisteredAdvisorPlan | null> | null {
|
|
33
|
-
|
|
64
|
+
const live = views.get(input.config);
|
|
65
|
+
return (factories.get(input.config) ?? (live && factories.get(live)))?.(input) ?? null;
|
|
34
66
|
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/** Shared, core-owned question bounds; no optional Advisor runtime dependency. */
|
|
2
|
+
export const MAX_ADVISOR_QUESTION_CHARACTERS = 2_000;
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Bound a trimmed question by Unicode code points without splitting surrogate pairs.
|
|
6
|
+
* The fixed notice makes clipping idempotent across interception and prompt construction.
|
|
7
|
+
* Stop after the first excess code point instead of materializing the whole input as an array.
|
|
8
|
+
*/
|
|
9
|
+
export function clipAdvisorQuestion(value: string): string {
|
|
10
|
+
const text = value.trim();
|
|
11
|
+
let characters = 0;
|
|
12
|
+
let end = 0;
|
|
13
|
+
for (const character of text) {
|
|
14
|
+
if (characters === MAX_ADVISOR_QUESTION_CHARACTERS) {
|
|
15
|
+
return `${text.slice(0, end)}… [truncated]`;
|
|
16
|
+
}
|
|
17
|
+
characters += 1;
|
|
18
|
+
end += character.length;
|
|
19
|
+
}
|
|
20
|
+
return text;
|
|
21
|
+
}
|
|
@@ -32,6 +32,7 @@ import type {
|
|
|
32
32
|
import { jsonStringPartsUtf8Bytes, jsonUtf8Bytes } from "../../lib/json-byte-size";
|
|
33
33
|
import { isTranslatorBudgetExceededError, TRANSLATOR_MAX_CALL_ARGUMENT_BYTES, TranslatorBudgetExceededError, type TranslatorBudget } from "../../lib/translator-budget";
|
|
34
34
|
import { AdvisorRetention } from "./advisor-retention";
|
|
35
|
+
import { clipAdvisorQuestion } from "./advisor-question";
|
|
35
36
|
|
|
36
37
|
export const ADVISOR_TOOL_NAME = "advisor";
|
|
37
38
|
|
|
@@ -61,6 +62,8 @@ export interface AdvisorConsultOutcome {
|
|
|
61
62
|
|
|
62
63
|
/** The structural plan the optional advisor subsystem registers per request. */
|
|
63
64
|
export interface AdvisorPlan {
|
|
65
|
+
/** Synchronous admission: invalid question-only calls do not reserve a consultation. */
|
|
66
|
+
shouldCountManualConsultation?(question: string | undefined): boolean;
|
|
64
67
|
/**
|
|
65
68
|
* Run one consultation for the current conversation state. Implementations own dedup,
|
|
66
69
|
* logging, and usage accounting; the guard only consumes the outcome.
|
|
@@ -112,14 +115,17 @@ export function createAdvisorSidecarStep(plan: AdvisorPlan) {
|
|
|
112
115
|
},
|
|
113
116
|
async consultCall(parsed: OcxParsedRequest, call: AdvisorSidecarCall, abortSignal?: AbortSignal) {
|
|
114
117
|
let outcome: AdvisorConsultOutcome;
|
|
115
|
-
|
|
118
|
+
// An invalid question-only call is refused by the plan without a consultation, so it
|
|
119
|
+
// neither reserves nor exhausts the allowance; the continuation bound still applies.
|
|
120
|
+
const counts = plan.shouldCountManualConsultation?.(call.question) !== false;
|
|
121
|
+
if (counts && consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST) {
|
|
116
122
|
outcome = {
|
|
117
123
|
ok: false,
|
|
118
124
|
isError: true,
|
|
119
125
|
content: plan.formatUnavailable("limit", "consultation limit reached for this request"),
|
|
120
126
|
};
|
|
121
127
|
} else {
|
|
122
|
-
consultations += 1;
|
|
128
|
+
if (counts) consultations += 1;
|
|
123
129
|
try {
|
|
124
130
|
outcome = await plan.consult(parsed, "manual", call.question, abortSignal);
|
|
125
131
|
} catch (error) {
|
|
@@ -162,7 +168,8 @@ export function parseAdvisorQuestionArgs(argsBuf: string): { question?: string }
|
|
|
162
168
|
const parsed: unknown = JSON.parse(argsBuf);
|
|
163
169
|
if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
|
|
164
170
|
const question = (parsed as { question?: unknown }).question;
|
|
165
|
-
|
|
171
|
+
const text = typeof question === "string" ? clipAdvisorQuestion(question) : "";
|
|
172
|
+
if (text) return { question: text };
|
|
166
173
|
}
|
|
167
174
|
} catch { /* malformed args → no focus question */ }
|
|
168
175
|
return {};
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { isNonReplayableResponse } from "../../lib/upstream-retry";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Whether an Antigravity 502/503/504 that outlived the same-account transient ladder may be
|
|
5
|
+
* replayed once on a live sibling. The failing account is cooled briefly (not marked), and the
|
|
6
|
+
* per-request `attempted` flag keeps a pool-wide outage to one extra ladder per request.
|
|
7
|
+
*
|
|
8
|
+
* The recovery loop asks this for the response it is holding and again for the response a 429
|
|
9
|
+
* account hop or a verify-account 403 hop just produced: that hop's replacement can be the 5xx, and
|
|
10
|
+
* without asking here the hop loop would leave recovery with the one-hop fault rotation still unspent.
|
|
11
|
+
*/
|
|
12
|
+
export function isAntigravityFaultRotatable(
|
|
13
|
+
providerName: string,
|
|
14
|
+
response: Response,
|
|
15
|
+
state: { activeAdapter: { name: string }; genericFailovers: number; genericFailoverLimit: number },
|
|
16
|
+
poolActivated: boolean,
|
|
17
|
+
faultRotationAttempted: boolean,
|
|
18
|
+
): boolean {
|
|
19
|
+
return providerName === "google-antigravity" && [502, 503, 504].includes(response.status)
|
|
20
|
+
&& state.activeAdapter.name === "google"
|
|
21
|
+
&& poolActivated && !faultRotationAttempted
|
|
22
|
+
&& !isNonReplayableResponse(response)
|
|
23
|
+
&& state.genericFailovers < state.genericFailoverLimit;
|
|
24
|
+
}
|
|
@@ -1,23 +1,60 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
ANTIGRAVITY_ACCESS_DENIED_PREFIX, ANTIGRAVITY_AUTH_FAILED_PREFIX, ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX,
|
|
3
|
+
GOOGLE_PERMISSION_DENIED_SUFFIX, safeAntigravityHttpErrorMessage,
|
|
4
|
+
} from "../../adapters/google-errors";
|
|
2
5
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
3
|
-
import { hasAntigravityModelNotFoundProvenance } from "../../adapters/antigravity-refusal";
|
|
6
|
+
import { classifyAntigravityRefusal, hasAntigravityModelNotFoundProvenance } from "../../adapters/antigravity-refusal";
|
|
4
7
|
|
|
5
8
|
/** Match only the normalized Antigravity validation-refusal marker. */
|
|
6
9
|
export function hasAntigravityValidationRefusalMarker(text: string): boolean {
|
|
7
10
|
return text.startsWith(`${ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX}: `);
|
|
8
11
|
}
|
|
9
12
|
|
|
13
|
+
/**
|
|
14
|
+
* A normalized 403 that Google itself attributed to this account: a structured `PERMISSION_DENIED`
|
|
15
|
+
* envelope, worded either as a plain denial or as invalid/expired credentials. `classifyGoogle` keeps
|
|
16
|
+
* the "(PERMISSION_DENIED)" suffix on both prefixes only when it parsed that enum. Not a validation
|
|
17
|
+
* demand and not a "verify your account" conviction (the dedicated quarantine path owns that one). The
|
|
18
|
+
* caller cools the account and tries a sibling; nothing here marks the account durably.
|
|
19
|
+
*
|
|
20
|
+
* `classifyGoogle` writes the bare "Antigravity access denied" prefix for every 403, including an empty
|
|
21
|
+
* body, a proxy or WAF HTML page, or an envelope without the enum, and the bare "Antigravity
|
|
22
|
+
* authentication failed" prefix for any 403 whose text says "expired" or "unauthenticated". Neither
|
|
23
|
+
* bare prefix says anything about this account, so neither qualifies: accepting one would walk the
|
|
24
|
+
* whole pool and cool every account on a failure that is wrong for all of them.
|
|
25
|
+
*
|
|
26
|
+
* Text that carries the validation marker is never an access denial: that wording belongs to the
|
|
27
|
+
* validation path, and an upstream message imitating it must not earn a different recovery.
|
|
28
|
+
*/
|
|
29
|
+
export function hasAntigravityAccessDeniedMarker(text: string): boolean {
|
|
30
|
+
return (text.startsWith(`${ANTIGRAVITY_ACCESS_DENIED_PREFIX}${GOOGLE_PERMISSION_DENIED_SUFFIX}`)
|
|
31
|
+
|| text.startsWith(`${ANTIGRAVITY_AUTH_FAILED_PREFIX}${GOOGLE_PERMISSION_DENIED_SUFFIX}`))
|
|
32
|
+
&& !text.includes(ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX)
|
|
33
|
+
&& classifyAntigravityRefusal(403, text).kind === "other";
|
|
34
|
+
}
|
|
35
|
+
|
|
10
36
|
/** Inspect only the Google adapter's normalized, already bounded 403 response. */
|
|
11
37
|
export async function isAntigravityValidationRefusal(response: Response, signal?: AbortSignal): Promise<boolean> {
|
|
12
|
-
return inspectValidationRefusal(response, signal, false);
|
|
38
|
+
return inspectValidationRefusal(response, signal, false, hasAntigravityValidationRefusalMarker);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Normalized 403 whose account is simply refused: cool it and rotate (credential-rejected). */
|
|
42
|
+
export async function isAntigravityAccessDeniedRefusal(response: Response, signal?: AbortSignal): Promise<boolean> {
|
|
43
|
+
return inspectValidationRefusal(response, signal, false, hasAntigravityAccessDeniedMarker);
|
|
13
44
|
}
|
|
14
45
|
|
|
15
46
|
/** Sidecar dispatch retains the raw Google envelope; normalize only a complete bounded body. */
|
|
16
47
|
export async function isAntigravityRawValidationRefusal(response: Response, signal?: AbortSignal): Promise<boolean> {
|
|
17
|
-
return inspectValidationRefusal(response, signal, true
|
|
48
|
+
return inspectValidationRefusal(response, signal, true,
|
|
49
|
+
text => hasAntigravityValidationRefusalMarker(text) || hasAntigravityAccessDeniedMarker(text));
|
|
18
50
|
}
|
|
19
51
|
|
|
20
|
-
async function inspectValidationRefusal(
|
|
52
|
+
async function inspectValidationRefusal(
|
|
53
|
+
response: Response,
|
|
54
|
+
signal: AbortSignal | undefined,
|
|
55
|
+
raw: boolean,
|
|
56
|
+
accepts: (text: string) => boolean,
|
|
57
|
+
): Promise<boolean> {
|
|
21
58
|
if (response.status !== 403 || signal?.aborted) return false;
|
|
22
59
|
try {
|
|
23
60
|
const body = await readBoundedResponseBody(response.clone(), {
|
|
@@ -28,7 +65,7 @@ async function inspectValidationRefusal(response: Response, signal: AbortSignal
|
|
|
28
65
|
signal,
|
|
29
66
|
});
|
|
30
67
|
return !signal?.aborted && body.displaySafe && !body.truncated && !body.timedOut && !body.oversized
|
|
31
|
-
&&
|
|
68
|
+
&& accepts(raw ? safeAntigravityHttpErrorMessage(403, body.text) : body.text);
|
|
32
69
|
} catch {
|
|
33
70
|
return false;
|
|
34
71
|
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { RoutedNamespaceToolAliases } from "../../responses/namespace-tool-compat";
|
|
2
|
+
|
|
3
|
+
type ToolIdentity = { namespace: string; name: string; freeform?: boolean };
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* The bare aliases a request authorized through `buildToolBridgeMaps`: each alias that one namespaced identity claims
|
|
7
|
+
* under its own bare name. Passthrough restoration runs before the undeclared-tool guard copies them into the declared
|
|
8
|
+
* set, so the dispatcher restores calls to these identities first (src/server/responses/passthrough-dispatch.ts).
|
|
9
|
+
*/
|
|
10
|
+
export function authorizedBareNamespaceToolAliases(toolNsMap: Iterable<[string, ToolIdentity]>): RoutedNamespaceToolAliases {
|
|
11
|
+
return new Map(
|
|
12
|
+
[...toolNsMap].flatMap(([alias, identity]) =>
|
|
13
|
+
alias === identity.name
|
|
14
|
+
? [[alias, { namespace: identity.namespace, name: identity.name, kind: identity.freeform ? "custom" as const : "function" as const }] as const]
|
|
15
|
+
: []
|
|
16
|
+
),
|
|
17
|
+
);
|
|
18
|
+
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
2
|
+
import { ResponseBodyInactivityError } from "../../lib/response-body-inactivity";
|
|
2
3
|
import {
|
|
3
4
|
createSseInspector,
|
|
4
5
|
createSseTerminalOutputBoundary,
|
|
6
|
+
createTerminalStatusTracker,
|
|
5
7
|
SseAggregateLimitError,
|
|
6
|
-
terminalStatusFromParsed,
|
|
7
8
|
type CodexSafetyBufferingFilterOptions,
|
|
8
9
|
type SseInspector,
|
|
9
10
|
} from "../relay";
|
|
@@ -109,6 +110,7 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
109
110
|
let terminalCount = 0;
|
|
110
111
|
let status: ResponsesTerminalStatus | undefined;
|
|
111
112
|
let terminalResponse: Record<string, unknown> | undefined;
|
|
113
|
+
const classifyTerminal = createTerminalStatusTracker();
|
|
112
114
|
const inspector = createSseInspector({
|
|
113
115
|
terminalReconstruction: {
|
|
114
116
|
maxItems: MAX_BUFFERED_RESPONSES_OUTPUT_ITEMS,
|
|
@@ -117,7 +119,7 @@ function createBufferedTerminalInspector(maxSourceBytes: number): {
|
|
|
117
119
|
mergeSparseTerminalOutput: true,
|
|
118
120
|
},
|
|
119
121
|
onParsedPayload(payload) {
|
|
120
|
-
const candidateStatus =
|
|
122
|
+
const candidateStatus = classifyTerminal(payload);
|
|
121
123
|
if (!candidateStatus) return;
|
|
122
124
|
terminalCount += 1;
|
|
123
125
|
status ??= candidateStatus;
|
|
@@ -218,6 +220,8 @@ export async function collectBufferedResponsesSse(
|
|
|
218
220
|
terminalBoundary?: CodexSafetyBufferingFilterOptions;
|
|
219
221
|
read?: BufferedReadOptions;
|
|
220
222
|
retainTranscript?: boolean;
|
|
223
|
+
/** Per-request outbound mask, applied to upstream copy before the boundary bounds it. */
|
|
224
|
+
maskCredential?: (text: string) => string;
|
|
221
225
|
} = {},
|
|
222
226
|
): Promise<BufferedResponsesSseResult> {
|
|
223
227
|
const maxBytes = options.read?.maxBytes ?? MAX_UPSTREAM_JSON_BODY_BYTES;
|
|
@@ -236,6 +240,7 @@ export async function collectBufferedResponsesSse(
|
|
|
236
240
|
const reader = body.getReader();
|
|
237
241
|
const boundary = createSseTerminalOutputBoundary({
|
|
238
242
|
...options.terminalBoundary,
|
|
243
|
+
maskCredential: options.maskCredential,
|
|
239
244
|
maxInputBytes: maxBytes,
|
|
240
245
|
maxOutputBytes: maxBytes,
|
|
241
246
|
maxFrames,
|
|
@@ -328,7 +333,8 @@ export async function collectBufferedResponsesSse(
|
|
|
328
333
|
ok: false,
|
|
329
334
|
kind: options.signal?.aborted
|
|
330
335
|
? "aborted"
|
|
331
|
-
|
|
336
|
+
// A source guarded at its upstream reads reports its stall through the body it feeds us.
|
|
337
|
+
: error instanceof BufferedSseTimeoutError || error instanceof ResponseBodyInactivityError
|
|
332
338
|
? "timeout"
|
|
333
339
|
: error instanceof SseAggregateLimitError
|
|
334
340
|
|| error instanceof SseFrameTooLargeError
|
|
@@ -258,6 +258,17 @@ function renderedNestedTools(description: string): RenderedTool[] {
|
|
|
258
258
|
return rendered;
|
|
259
259
|
}
|
|
260
260
|
|
|
261
|
+
/**
|
|
262
|
+
* Nested tools a codex-rs code-mode exec renders, read from its wire form: a top-level custom
|
|
263
|
+
* `exec` whose description opens with the template header. Each name needs a heading followed by
|
|
264
|
+
* its own declaration, so an example or quoted text in the description renders nothing.
|
|
265
|
+
*/
|
|
266
|
+
export function codeModeRenderedToolNames(name: unknown, description: unknown): string[] {
|
|
267
|
+
if (name !== CODE_MODE_EXEC_TOOL_NAME || typeof description !== "string"
|
|
268
|
+
|| !description.startsWith(CODE_MODE_EXEC_TEMPLATE_HEADER)) return [];
|
|
269
|
+
return renderedNestedTools(description).map(tool => tool.name);
|
|
270
|
+
}
|
|
271
|
+
|
|
261
272
|
/** A nested name that claims a collaboration surface other than V1's. */
|
|
262
273
|
function isForeignCollabName(name: string): boolean {
|
|
263
274
|
if (name.startsWith("mcp__")) return false; // MCP server tools are never native collaboration
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import { currentTurnWireToolCatalogBody } from "../responses-undeclared-tool-guard";
|
|
2
|
+
import { sessionLaneIdFromRequest } from "../request-log-conversation";
|
|
3
|
+
import { codeModeRenderedToolNames } from "./code-mode-collab-surface";
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Eager MCP definitions at which a Codex request is diagnosed as carrying an expanded catalog.
|
|
7
|
+
* Routed catalog rows advertise deferred discovery, so a Codex client with current model metadata
|
|
8
|
+
* keeps MCP tools deferred; one whose metadata is missing or stale expands every MCP tool into the
|
|
9
|
+
* request. The request is still forwarded unchanged: this is a diagnostic, never an admission
|
|
10
|
+
* rule, because an eager catalog stays a valid request (ADR-0022).
|
|
11
|
+
*/
|
|
12
|
+
export const EAGER_CODEX_MCP_TOOL_WARNING_THRESHOLD = 64;
|
|
13
|
+
/**
|
|
14
|
+
* Sessions already warned, least recently sent first. Bounded so a long-lived proxy cannot grow
|
|
15
|
+
* it without limit: the dedupe covers this many sessions and no more, so an operator running more
|
|
16
|
+
* sessions than that can see one repeat warning. Recency refreshes on every request a session
|
|
17
|
+
* sends, so the session being evicted is the one that has been idle longest.
|
|
18
|
+
*/
|
|
19
|
+
export const WARNED_SESSION_LIMIT = 1024;
|
|
20
|
+
const warnedSessions = new Map<string, true>();
|
|
21
|
+
/** Logical requests already warned without a session identity; weak so completed requests leave no trace. */
|
|
22
|
+
const warnedAnonymousRequests = new WeakSet<object>();
|
|
23
|
+
const CODEX_CLIENT_IDENTITY = /^(?:codex|codex_cli_rs|codex_app|codex_work_desktop|codexless_agent|Codex Desktop)(?:\/|$)/i;
|
|
24
|
+
|
|
25
|
+
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
26
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Which wire surface a request is being counted for. Compaction sends its history as `input` rather
|
|
31
|
+
* than as declarations, so only its top-level `tools` are this request's catalog.
|
|
32
|
+
*/
|
|
33
|
+
export function eagerCodexToolCatalogSurface(
|
|
34
|
+
body: unknown,
|
|
35
|
+
compactionRecoveryKind: string | undefined,
|
|
36
|
+
): "responses" | "compact" {
|
|
37
|
+
if (compactionRecoveryKind === "compaction-v1") return "compact";
|
|
38
|
+
const input = isRecord(body) && Array.isArray(body.input) ? body.input : [];
|
|
39
|
+
return input.some(item => isRecord(item) && item.type === "compaction_trigger") ? "compact" : "responses";
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function collectEagerMcpTools(specs: unknown[], names: Set<string>, namespace?: string): void {
|
|
43
|
+
for (const spec of specs) {
|
|
44
|
+
if (!isRecord(spec) || spec.defer_loading === true) continue;
|
|
45
|
+
// Codex namespaces are one level deep. A namespace nested inside another is not a Codex
|
|
46
|
+
// declaration, and recursing into caller-shaped depth could exhaust the stack.
|
|
47
|
+
if (spec.type === "namespace" && typeof spec.name === "string" && Array.isArray(spec.tools)) {
|
|
48
|
+
if (namespace === undefined) collectEagerMcpTools(spec.tools, names, spec.name);
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
const tool = isRecord(spec.function) ? spec.function : spec;
|
|
52
|
+
if (tool.defer_loading === true || typeof tool.name !== "string") continue;
|
|
53
|
+
// `functions` is the reserved unnamespaced group (as in the undeclared-tool guard and parser),
|
|
54
|
+
// so an MCP tool declared inside it keeps its own `mcp__` name.
|
|
55
|
+
const name = namespace && namespace !== "functions" ? `${namespace}__${tool.name}` : tool.name;
|
|
56
|
+
if (name.startsWith("mcp__")) names.add(name);
|
|
57
|
+
// Code Mode renders each enabled, non-deferred nested tool into the exec description. Codex
|
|
58
|
+
// sends exec bare or, on Responses Lite, inside its `functions` namespace.
|
|
59
|
+
if ((namespace === undefined || namespace === "functions") && spec.type === "custom") {
|
|
60
|
+
for (const nested of codeModeRenderedToolNames(tool.name, tool.description)) {
|
|
61
|
+
if (nested.startsWith("mcp__")) names.add(nested);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Responses Lite `additional_tools` the client sent for this request.
|
|
69
|
+
*
|
|
70
|
+
* Codex does not express "current turn" by position: a window resends its base catalog at the head
|
|
71
|
+
* of `input` on every request and appends an incremental `additional_tools` update wherever the
|
|
72
|
+
* change happened, including after a replayed tool call. Both are live declarations that this
|
|
73
|
+
* request pays for, so every client-sent item counts. Only what the proxy itself replayed from
|
|
74
|
+
* stored continuation state is history, and `currentTurnWireToolCatalogBody` removes it before
|
|
75
|
+
* this runs.
|
|
76
|
+
*/
|
|
77
|
+
function clientSentAdditionalTools(input: unknown[]): unknown[][] {
|
|
78
|
+
const groups: unknown[][] = [];
|
|
79
|
+
for (const item of input) {
|
|
80
|
+
if (isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)) groups.push(item.tools);
|
|
81
|
+
}
|
|
82
|
+
return groups;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Eager MCP definitions a canonical Codex client declared for this request, or 0 for any other
|
|
87
|
+
* client. `replayPrefixLength` is the leading input the proxy restored from stored continuation
|
|
88
|
+
* state; those items are history and grant no declaration for this turn. Compaction reads only
|
|
89
|
+
* top-level `tools`: its `input` is history.
|
|
90
|
+
*/
|
|
91
|
+
export function eagerCodexMcpToolCount(
|
|
92
|
+
body: unknown,
|
|
93
|
+
headers: Headers,
|
|
94
|
+
surface: "responses" | "compact" = "responses",
|
|
95
|
+
replayPrefixLength?: number,
|
|
96
|
+
): number {
|
|
97
|
+
if (!headers.has("x-codex-turn-metadata")
|
|
98
|
+
&& !CODEX_CLIENT_IDENTITY.test(headers.get("originator") ?? "")
|
|
99
|
+
&& !CODEX_CLIENT_IDENTITY.test(headers.get("user-agent") ?? "")) return 0;
|
|
100
|
+
const current = currentTurnWireToolCatalogBody(body, replayPrefixLength);
|
|
101
|
+
if (!isRecord(current)) return 0;
|
|
102
|
+
const names = new Set<string>();
|
|
103
|
+
if (Array.isArray(current.tools)) collectEagerMcpTools(current.tools, names);
|
|
104
|
+
if (surface === "responses" && Array.isArray(current.input)) {
|
|
105
|
+
for (const tools of clientSentAdditionalTools(current.input)) collectEagerMcpTools(tools, names);
|
|
106
|
+
}
|
|
107
|
+
return names.size;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* Warn once per session when a Codex request carries an eagerly expanded MCP catalog. Only the
|
|
112
|
+
* count and the threshold are logged; tool names, bodies and session identifiers are not.
|
|
113
|
+
*
|
|
114
|
+
* A request without a session identity has no session to warn once per, so the
|
|
115
|
+
* `logicalRequest` scope stands in for one: each logical request warns, and a retry, combo child
|
|
116
|
+
* or compaction replay that shares the scope does not repeat it. Callers that omit the scope fall
|
|
117
|
+
* back to the session only.
|
|
118
|
+
*/
|
|
119
|
+
export function warnEagerCodexToolCatalog(
|
|
120
|
+
body: unknown,
|
|
121
|
+
headers: Headers,
|
|
122
|
+
options: { surface?: "responses" | "compact"; replayPrefixLength?: number; logicalRequest?: object } = {},
|
|
123
|
+
): void {
|
|
124
|
+
const surface = options.surface ?? "responses";
|
|
125
|
+
const session = sessionLaneIdFromRequest(headers);
|
|
126
|
+
if (session !== undefined && warnedSessions.has(session)) {
|
|
127
|
+
// Refresh recency on every request the session sends, eager or not, so an active session is
|
|
128
|
+
// never the one evicted next. An already-warned session needs no count at all.
|
|
129
|
+
warnedSessions.delete(session);
|
|
130
|
+
warnedSessions.set(session, true);
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
// A diagnostic must never change the request it observes: any failure while counting a
|
|
134
|
+
// malformed body skips the warning and lets the request continue exactly as before.
|
|
135
|
+
let count: number;
|
|
136
|
+
try { count = eagerCodexMcpToolCount(body, headers, surface, options.replayPrefixLength); } catch { return; }
|
|
137
|
+
if (count < EAGER_CODEX_MCP_TOOL_WARNING_THRESHOLD) return;
|
|
138
|
+
if (session !== undefined) {
|
|
139
|
+
while (warnedSessions.size >= WARNED_SESSION_LIMIT) {
|
|
140
|
+
const oldest = warnedSessions.keys().next().value;
|
|
141
|
+
if (oldest === undefined) break;
|
|
142
|
+
warnedSessions.delete(oldest);
|
|
143
|
+
}
|
|
144
|
+
warnedSessions.set(session, true);
|
|
145
|
+
} else if (options.logicalRequest !== undefined) {
|
|
146
|
+
if (warnedAnonymousRequests.has(options.logicalRequest)) return;
|
|
147
|
+
warnedAnonymousRequests.add(options.logicalRequest);
|
|
148
|
+
}
|
|
149
|
+
console.warn(
|
|
150
|
+
`[codex-catalog] Codex sent ${count} eager MCP tool definitions (warning threshold ${EAGER_CODEX_MCP_TOOL_WARNING_THRESHOLD}) `
|
|
151
|
+
+ "instead of deferred tool discovery; its model metadata may be missing or stale. The request was forwarded unchanged. "
|
|
152
|
+
+ "Restart Codex to reload the catalog ('ocx system codex-restart --yes'; it interrupts running turns). "
|
|
153
|
+
+ "Shown once per session, or once per request "
|
|
154
|
+
+ "when the client sends no session identity.",
|
|
155
|
+
);
|
|
156
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AdapterRequest } from "../../adapters/base";
|
|
2
2
|
import { collectResponsesToolGroups } from "../../responses/tool-groups";
|
|
3
3
|
import { requiredToolContractOf, type RequiredToolContract } from "./combo-required-tool-contract";
|
|
4
|
-
import { parseOutboundRequestBody } from "./
|
|
4
|
+
import { parseOutboundRequestBody } from "./outbound-request-body";
|
|
5
5
|
|
|
6
6
|
type Item = Record<string, unknown>;
|
|
7
7
|
const record = (value: unknown): Item | undefined => value !== null && typeof value === "object" && !Array.isArray(value) ? value as Item : undefined;
|
|
@@ -48,8 +48,10 @@ export function requiredToolFulfillments(
|
|
|
48
48
|
const identity = record(normalize({ ...substitution, type: "function_call" }));
|
|
49
49
|
if (identity && intendedClient(identity) && wire?.hosted.has(substitution.callType)) hosted.add(substitution.callType);
|
|
50
50
|
}
|
|
51
|
+
// Read once here: the predicate lives as long as the stream, so it keeps this answer and the wire declarations, never the parsed body (#8601).
|
|
52
|
+
const deniesAll = request !== undefined && (!outbound || outbound.tool_choice === "none");
|
|
51
53
|
return (item, clientCall) => {
|
|
52
|
-
if (
|
|
54
|
+
if (deniesAll) return false;
|
|
53
55
|
if (!clientCall) return hosted.has(String(item.type)) && (!wire || wire.hosted.has(String(item.type)));
|
|
54
56
|
// Sparse calls keep the existing uncertain-name policy; explicit identities must be declared.
|
|
55
57
|
if (typeof item.name !== "string") return !wire || wire.clients.length > 0;
|