@bitkyc08/opencodex 2.93.0 → 2.95.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -10,8 +10,10 @@
|
|
|
10
10
|
* Lives outside cli.ts (which dispatches argv at module top level) so tests can import it.
|
|
11
11
|
*/
|
|
12
12
|
import { loadConfig } from "../config";
|
|
13
|
-
import { isWildcardHostname } from "../codex/loopback-target";
|
|
14
|
-
import {
|
|
13
|
+
import { isLoopbackHostname, isWildcardHostname } from "../codex/loopback-target";
|
|
14
|
+
import { normalizeBindHostname } from "./bind-host";
|
|
15
|
+
import { isOcxCommandLine, readAlivePid, readProcessCommandLine, readRuntimePort, verifyPidIdentity } from "../config/process-state";
|
|
16
|
+
import { loopbackFamilyAvailability } from "../lib/loopback-family";
|
|
15
17
|
import {
|
|
16
18
|
LOCAL_ATTESTATION_CHALLENGE_HEADER,
|
|
17
19
|
LOCAL_ATTESTATION_PROOF_HEADER,
|
|
@@ -52,6 +54,9 @@ export interface LivenessIo {
|
|
|
52
54
|
* Destructive callers only ever receive pids that passed this gate.
|
|
53
55
|
*/
|
|
54
56
|
verifyPidFn?: (candidatePid: number) => number | null;
|
|
57
|
+
/** Fresh command-line evidence: undefined/empty is unreadable, never confirmed foreign. */
|
|
58
|
+
readCommandLineFn?: typeof readProcessCommandLine;
|
|
59
|
+
loopbackAvailabilityFn?: typeof loopbackFamilyAvailability;
|
|
55
60
|
readRuntimeFn?: (pid?: number) => { pid?: number; port: number; hostname?: string } | null;
|
|
56
61
|
configFn?: () => { port?: number; hostname?: string };
|
|
57
62
|
timeoutMs?: number;
|
|
@@ -152,8 +157,10 @@ type LivenessFetch = (
|
|
|
152
157
|
export interface LiveProxy {
|
|
153
158
|
pid: number | null;
|
|
154
159
|
port: number;
|
|
155
|
-
/**
|
|
160
|
+
/** Candidate bind scope, with the default loopback made explicit; never a probe alias. */
|
|
156
161
|
hostname?: string;
|
|
162
|
+
/** Successful recovery probe address, when discovery checked both loopback families. */
|
|
163
|
+
probeHostname?: string;
|
|
157
164
|
/** Whether the successful probe used runtime-port metadata or the configured listen port. */
|
|
158
165
|
source: "runtime" | "config";
|
|
159
166
|
/**
|
|
@@ -197,7 +204,7 @@ export type HomeOwnershipProof = "proven" | "refuted" | "indeterminate";
|
|
|
197
204
|
export async function proveLiveProxyOwnedByHome(live: LiveProxy, io: LivenessIo = {}): Promise<HomeOwnershipProof> {
|
|
198
205
|
if (live.pid === null) return "indeterminate";
|
|
199
206
|
return attestFencedIdentity(
|
|
200
|
-
`http://${probeHostname(live.hostname)}:${live.port}/healthz`,
|
|
207
|
+
`http://${probeHostname(live.probeHostname ?? live.hostname)}:${live.port}/healthz`,
|
|
201
208
|
live.port,
|
|
202
209
|
live.pid,
|
|
203
210
|
io,
|
|
@@ -329,16 +336,16 @@ export function isConnectionRefused(error: unknown): boolean {
|
|
|
329
336
|
if (depth >= 4) return false;
|
|
330
337
|
if (current === null || (typeof current !== "object" && typeof current !== "function")) return false;
|
|
331
338
|
const record = current as { code?: unknown; cause?: unknown; errors?: unknown };
|
|
332
|
-
if (record.
|
|
333
|
-
if (typeof record.code === "string" && record.code.endsWith("ECONNREFUSED")) return true;
|
|
334
|
-
if (Array.isArray(record.errors) && record.errors.length > 0) {
|
|
339
|
+
if (record.errors !== undefined) {
|
|
335
340
|
// One connect attempt fanned out over several addresses reports a single AggregateError.
|
|
336
341
|
// Only a unanimous refusal proves the endpoint is free: a bundle that mixes ECONNREFUSED
|
|
337
342
|
// with a timeout means one address answered nothing at all, and an address whose state is
|
|
338
343
|
// unreadable is unknown, not absence. Collapsing it to "refused" is how a second runtime
|
|
339
344
|
// gets started on a port that already has one.
|
|
340
|
-
return record.errors.every(error => visit(error, depth + 1));
|
|
345
|
+
return Array.isArray(record.errors) && record.errors.length > 0 && record.errors.every(error => visit(error, depth + 1));
|
|
341
346
|
}
|
|
347
|
+
if (record.code === "ECONNREFUSED" || record.code === "ConnectionRefused") return true;
|
|
348
|
+
if (typeof record.code === "string" && record.code.endsWith("ECONNREFUSED")) return true;
|
|
342
349
|
return visit(record.cause, depth + 1);
|
|
343
350
|
};
|
|
344
351
|
return visit(error, 0);
|
|
@@ -393,6 +400,17 @@ export async function proxyIdentityAt(
|
|
|
393
400
|
opts: { hostname?: string; expectedPid?: number } = {},
|
|
394
401
|
io: LivenessIo = {},
|
|
395
402
|
): Promise<{ pid: number | null; version?: string; role?: string; packageTreeFenced?: true } | null> {
|
|
403
|
+
return proxyIdentityAtObserved(port, opts, io);
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
/** Preserve negative evidence for recovery without changing identity-only callers. */
|
|
407
|
+
async function proxyIdentityAtObserved(
|
|
408
|
+
port: number,
|
|
409
|
+
opts: { hostname?: string; expectedPid?: number },
|
|
410
|
+
io: LivenessIo,
|
|
411
|
+
observe?: (result: EndpointLiveness) => void,
|
|
412
|
+
): ReturnType<typeof proxyIdentityAt> {
|
|
413
|
+
const negative = (result: "dead" | "unknown"): null => { observe?.(result); return null; };
|
|
396
414
|
const fetchFn = io.fetchFn ?? directLocalHttpFetch;
|
|
397
415
|
const sleepFn = io.sleepFn ?? ((ms: number) => new Promise<void>(r => setTimeout(r, ms)));
|
|
398
416
|
const nowFn = io.nowFn ?? Date.now;
|
|
@@ -401,10 +419,11 @@ export async function proxyIdentityAt(
|
|
|
401
419
|
const attempts = Number.isNaN(requestedAttempts)
|
|
402
420
|
? 1
|
|
403
421
|
: Math.max(1, Math.min(requestedAttempts, 5));
|
|
422
|
+
let sawUnknown = false;
|
|
404
423
|
|
|
405
424
|
for (let attempt = 1; attempt <= attempts; attempt++) {
|
|
406
425
|
const remainingMs = io.deadlineAt === undefined ? baseTimeoutMs : io.deadlineAt - nowFn();
|
|
407
|
-
if (remainingMs <= 0) return
|
|
426
|
+
if (remainingMs <= 0) return negative("unknown");
|
|
408
427
|
const timeoutMs = Math.min(baseTimeoutMs, remainingMs);
|
|
409
428
|
try {
|
|
410
429
|
const url = `http://${probeHostname(opts.hostname)}:${port}/healthz`;
|
|
@@ -413,12 +432,12 @@ export async function proxyIdentityAt(
|
|
|
413
432
|
});
|
|
414
433
|
if (!res.ok && io.acceptPackageTreeFenced && res.status === 503) {
|
|
415
434
|
const fenced = (await res.json().catch(() => null)) as HealthzIdentity | null;
|
|
416
|
-
if (!isPackageTreeFencedHealthz(fenced)) return
|
|
435
|
+
if (!isPackageTreeFencedHealthz(fenced)) return negative("unknown");
|
|
417
436
|
const fencedPid = fenced!.pid as number;
|
|
418
|
-
if (opts.expectedPid !== undefined && fencedPid !== opts.expectedPid) return
|
|
437
|
+
if (opts.expectedPid !== undefined && fencedPid !== opts.expectedPid) return negative("unknown");
|
|
419
438
|
const attestMs = io.deadlineAt === undefined ? baseTimeoutMs : Math.min(baseTimeoutMs, io.deadlineAt - nowFn());
|
|
420
|
-
if (attestMs <= 0) return
|
|
421
|
-
if ((await attestFencedIdentity(url, port, fencedPid, io, fetchFn, attestMs)) !== "proven") return
|
|
439
|
+
if (attestMs <= 0) return negative("unknown");
|
|
440
|
+
if ((await attestFencedIdentity(url, port, fencedPid, io, fetchFn, attestMs)) !== "proven") return negative("unknown");
|
|
422
441
|
const fencedVersion = isHealthzVersion(fenced?.version) ? fenced!.version as string : undefined;
|
|
423
442
|
return {
|
|
424
443
|
pid: fencedPid,
|
|
@@ -426,11 +445,11 @@ export async function proxyIdentityAt(
|
|
|
426
445
|
packageTreeFenced: true,
|
|
427
446
|
};
|
|
428
447
|
}
|
|
429
|
-
if (!res.ok) return
|
|
430
|
-
const body = (await res.json().catch(() =>
|
|
431
|
-
if (!isOpencodexHealthz(body)) return
|
|
448
|
+
if (!res.ok) return negative("unknown");
|
|
449
|
+
const body = (await res.json().catch(() => undefined)) as HealthzIdentity | null | undefined;
|
|
450
|
+
if (!isOpencodexHealthz(body ?? null)) return negative(res.status === 200 && body !== undefined ? "dead" : "unknown");
|
|
432
451
|
const pid = typeof body?.pid === "number" ? body.pid : null;
|
|
433
|
-
if (opts.expectedPid !== undefined && pid !== null && pid !== opts.expectedPid) return
|
|
452
|
+
if (opts.expectedPid !== undefined && pid !== null && pid !== opts.expectedPid) return negative("unknown");
|
|
434
453
|
// Whoever holds the port controls this response. Only carry bounded semver text into
|
|
435
454
|
// diagnostics; dropping anything else prevents terminal controls reaching human output.
|
|
436
455
|
const version = isHealthzVersion(body?.version) ? body.version : undefined;
|
|
@@ -442,15 +461,38 @@ export async function proxyIdentityAt(
|
|
|
442
461
|
...(version === undefined ? {} : { version }),
|
|
443
462
|
...(role === undefined ? {} : { role }),
|
|
444
463
|
};
|
|
445
|
-
} catch {
|
|
464
|
+
} catch (error) {
|
|
446
465
|
// Transport failure (timeout / refused) — retry while budget remains; a proxy that
|
|
447
466
|
// has only just begun listening can miss a single short probe (#764).
|
|
448
|
-
if (
|
|
449
|
-
if (
|
|
467
|
+
if (!isConnectionRefused(error)) sawUnknown = true;
|
|
468
|
+
if (attempt >= attempts) return negative(sawUnknown ? "unknown" : "dead");
|
|
469
|
+
if (io.deadlineAt !== undefined && io.deadlineAt - nowFn() <= 0) return negative("unknown");
|
|
450
470
|
await sleepFn(100);
|
|
451
471
|
}
|
|
452
472
|
}
|
|
453
|
-
return
|
|
473
|
+
return negative("unknown");
|
|
474
|
+
}
|
|
475
|
+
|
|
476
|
+
export type ProxyLivenessObservation =
|
|
477
|
+
| { kind: "live"; live: LiveProxy }
|
|
478
|
+
| { kind: "absent" | "unknown"; live: null };
|
|
479
|
+
|
|
480
|
+
/** Recovery additionally covers both available loopback families and fresh PID identity. */
|
|
481
|
+
export async function observeProxyLiveness(io: LivenessIo = {}): Promise<ProxyLivenessObservation> {
|
|
482
|
+
let alivePid: number | null = null, unknown = false;
|
|
483
|
+
const live = await discoverLiveProxy(io, {
|
|
484
|
+
pid: pid => { alivePid = pid; },
|
|
485
|
+
endpoint: result => { if (result === "unknown") unknown = true; },
|
|
486
|
+
});
|
|
487
|
+
if (live) return { kind: "live", live };
|
|
488
|
+
if (alivePid !== null && !unknown) {
|
|
489
|
+
// A failed verifier alone conflates foreign with unreadable. Only fresh positive
|
|
490
|
+
// evidence of a foreign command line releases a reused PID; never signal it.
|
|
491
|
+
const commandLine = (io.readCommandLineFn ?? readProcessCommandLine)(alivePid);
|
|
492
|
+
unknown = !commandLine?.trim() || isOcxCommandLine(commandLine);
|
|
493
|
+
if (io.deadlineAt !== undefined && (io.nowFn ?? Date.now)() >= io.deadlineAt) unknown = true;
|
|
494
|
+
}
|
|
495
|
+
return { kind: unknown ? "unknown" : "absent", live: null };
|
|
454
496
|
}
|
|
455
497
|
|
|
456
498
|
/**
|
|
@@ -459,6 +501,13 @@ export async function proxyIdentityAt(
|
|
|
459
501
|
* found and a foreign listener on the configured port is rejected.
|
|
460
502
|
*/
|
|
461
503
|
export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | null> {
|
|
504
|
+
return discoverLiveProxy(io);
|
|
505
|
+
}
|
|
506
|
+
|
|
507
|
+
async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
508
|
+
pid: (pid: number | null) => void;
|
|
509
|
+
endpoint: (result: EndpointLiveness) => void;
|
|
510
|
+
}): Promise<LiveProxy | null> {
|
|
462
511
|
// Prefer the cheap alive-pid check: the Windows cmdline probe (WMIC/PowerShell) is too
|
|
463
512
|
// expensive for waitForProxy's 150ms poll loop, and /healthz identity is the real trust gate.
|
|
464
513
|
const readPidFn = io.readPidFn ?? readAlivePid;
|
|
@@ -470,6 +519,26 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
470
519
|
const probeIo: LivenessIo = io;
|
|
471
520
|
const budgetExhausted = (): boolean =>
|
|
472
521
|
deadlineAt !== undefined && nowFn() >= deadlineAt;
|
|
522
|
+
const expired = (): null => { observer?.endpoint("unknown"); return null; };
|
|
523
|
+
const probe = async (port: number, opts: { hostname?: string; expectedPid?: number }) => {
|
|
524
|
+
// Missing/blank means an actual loopback bind, not a later config's bind scope.
|
|
525
|
+
const bindHostname = opts.hostname?.trim() || "127.0.0.1";
|
|
526
|
+
const hostname = normalizeBindHostname(opts.hostname);
|
|
527
|
+
if (!observer || (!isLoopbackHostname(hostname) && !isWildcardHostname(hostname))) {
|
|
528
|
+
const identity = await proxyIdentityAtObserved(port, opts, probeIo, observer?.endpoint);
|
|
529
|
+
return identity ? { ...identity, hostname: bindHostname,
|
|
530
|
+
...(observer ? { probeHostname: probeHostname(opts.hostname) } : {}) } : null;
|
|
531
|
+
}
|
|
532
|
+
// Parallel families share the existing per-probe attempts/timeout and absolute
|
|
533
|
+
// deadline. A slow family cannot multiply the serial discovery budget.
|
|
534
|
+
const hosts = loopbackProbeHosts(hostname).filter(host =>
|
|
535
|
+
(io.loopbackAvailabilityFn ?? loopbackFamilyAvailability)(host) !== "unavailable");
|
|
536
|
+
const identities = await Promise.all(hosts.map(async hostname => {
|
|
537
|
+
const identity = await proxyIdentityAtObserved(port, { ...opts, hostname }, probeIo, observer.endpoint);
|
|
538
|
+
return identity ? { ...identity, hostname: bindHostname, probeHostname: hostname } : null;
|
|
539
|
+
}));
|
|
540
|
+
return identities.find(identity => identity !== null) ?? null;
|
|
541
|
+
};
|
|
473
542
|
|
|
474
543
|
// The cheap pid is discovery-only. Before it can appear in a returned (killable) result
|
|
475
544
|
// it must pass the full identity check AND the verifier must echo the exact candidate —
|
|
@@ -488,13 +557,14 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
488
557
|
};
|
|
489
558
|
|
|
490
559
|
const pid = readPidFn();
|
|
560
|
+
observer?.pid(pid);
|
|
491
561
|
let probedPort: number | null = null;
|
|
492
562
|
if (pid) {
|
|
493
563
|
const runtime = readRuntimeFn(pid);
|
|
494
564
|
if (runtime?.port) {
|
|
495
|
-
if (budgetExhausted()) return
|
|
565
|
+
if (budgetExhausted()) return expired();
|
|
496
566
|
probedPort = runtime.port;
|
|
497
|
-
const identity = await
|
|
567
|
+
const identity = await probe(runtime.port, { hostname: runtime.hostname, expectedPid: pid });
|
|
498
568
|
if (identity) {
|
|
499
569
|
// healthz confirmed the pid itself → trusted; a pidless legacy body did not,
|
|
500
570
|
// so the cheap pid must pass full identity verification before it is returned.
|
|
@@ -502,7 +572,8 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
502
572
|
return {
|
|
503
573
|
pid: trusted,
|
|
504
574
|
port: runtime.port,
|
|
505
|
-
hostname:
|
|
575
|
+
hostname: identity.hostname,
|
|
576
|
+
...(identity.probeHostname === undefined ? {} : { probeHostname: identity.probeHostname }),
|
|
506
577
|
source: "runtime",
|
|
507
578
|
...(identity.version === undefined ? {} : { version: identity.version }),
|
|
508
579
|
...(identity.role === undefined ? {} : { role: identity.role }),
|
|
@@ -517,9 +588,9 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
517
588
|
// identity-probe it so ensure/update/stop see the live proxy instead of shadowing it.
|
|
518
589
|
const record = readRuntimeFn();
|
|
519
590
|
if (record?.port && record.port !== probedPort) {
|
|
520
|
-
if (budgetExhausted()) return
|
|
591
|
+
if (budgetExhausted()) return expired();
|
|
521
592
|
const expectedPid = typeof record.pid === "number" ? record.pid : undefined;
|
|
522
|
-
const identity = await
|
|
593
|
+
const identity = await probe(record.port, { hostname: record.hostname, expectedPid });
|
|
523
594
|
// Only the healthz-reported pid is authoritative here. The record's pid may be stale
|
|
524
595
|
// (its process dead, the port reused by a pidless legacy proxy) — synthesizing it
|
|
525
596
|
// would hand destructive callers (stopProxy → kill fallback) a reusable pid.
|
|
@@ -527,7 +598,8 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
527
598
|
return {
|
|
528
599
|
pid: verifiedReportedPid(identity.pid),
|
|
529
600
|
port: record.port,
|
|
530
|
-
hostname:
|
|
601
|
+
hostname: identity.hostname,
|
|
602
|
+
...(identity.probeHostname === undefined ? {} : { probeHostname: identity.probeHostname }),
|
|
531
603
|
source: "runtime",
|
|
532
604
|
...(identity.version === undefined ? {} : { version: identity.version }),
|
|
533
605
|
...(identity.role === undefined ? {} : { role: identity.role }),
|
|
@@ -538,13 +610,16 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
538
610
|
|
|
539
611
|
const config = configFn();
|
|
540
612
|
const port = config.port ?? 10100;
|
|
541
|
-
if (budgetExhausted()) return
|
|
542
|
-
|
|
613
|
+
if (budgetExhausted()) return expired();
|
|
614
|
+
// Port zero requests an OS-assigned port; it cannot name an existing listener.
|
|
615
|
+
if (observer && port === 0) return null;
|
|
616
|
+
const identity = await probe(port, { hostname: config.hostname });
|
|
543
617
|
if (identity) {
|
|
544
618
|
return {
|
|
545
619
|
pid: verifiedReportedPid(identity.pid) ?? killablePid(pid),
|
|
546
620
|
port,
|
|
547
|
-
hostname:
|
|
621
|
+
hostname: identity.hostname,
|
|
622
|
+
...(identity.probeHostname === undefined ? {} : { probeHostname: identity.probeHostname }),
|
|
548
623
|
source: "config",
|
|
549
624
|
...(identity.version === undefined ? {} : { version: identity.version }),
|
|
550
625
|
...(identity.role === undefined ? {} : { role: identity.role }),
|
|
@@ -572,9 +647,11 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
572
647
|
* different question than the caller asked.
|
|
573
648
|
*/
|
|
574
649
|
export function loopbackProbeHosts(hostname: string | undefined): string[] {
|
|
575
|
-
const
|
|
576
|
-
|
|
577
|
-
if (
|
|
650
|
+
const normalized = normalizeBindHostname(hostname);
|
|
651
|
+
const primary = probeHostname(normalized);
|
|
652
|
+
if (isLoopbackHostname(normalized) || isWildcardHostname(normalized)) {
|
|
653
|
+
return primary === "[::1]" ? ["[::1]", "127.0.0.1"] : ["127.0.0.1", "[::1]"];
|
|
654
|
+
}
|
|
578
655
|
return [primary];
|
|
579
656
|
}
|
|
580
657
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Buffer } from "node:buffer";
|
|
2
2
|
import { gunzipSync, inflateRawSync, inflateSync, zstdDecompressSync } from "node:zlib";
|
|
3
3
|
import type { TranslatorBudget } from "../lib/translator-budget";
|
|
4
|
+
import { updateInboundBodyReservation } from "./inbound-body-budget";
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Request-body decompression for the /v1/responses data plane.
|
|
@@ -328,11 +329,14 @@ export async function readBoundedJsonRequestBody(
|
|
|
328
329
|
// Count UTF-8 without allocating another request-sized byte array for diagnostics.
|
|
329
330
|
releaseText = budget?.observeAcceptedRequestCopy(Buffer.byteLength(text, "utf8"));
|
|
330
331
|
if (options && "emptyBodyFallback" in options && text.trim() === "") {
|
|
332
|
+
updateInboundBodyReservation(req, Math.max(raw.byteLength, decoded.byteLength));
|
|
331
333
|
return options.emptyBodyFallback;
|
|
332
334
|
}
|
|
333
335
|
const parsed = JSON.parse(text);
|
|
334
336
|
// Keep the serialized-size contract: normalization can expand numeric literals.
|
|
335
|
-
budget
|
|
337
|
+
const parsedBytes = budget ? Buffer.byteLength(JSON.stringify(parsed), "utf8") : decoded.byteLength;
|
|
338
|
+
budget?.observeAcceptedRequestCopy(parsedBytes);
|
|
339
|
+
updateInboundBodyReservation(req, Math.max(raw.byteLength, decoded.byteLength, parsedBytes));
|
|
336
340
|
return parsed;
|
|
337
341
|
} finally {
|
|
338
342
|
releaseText?.();
|
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
} from "../lib/errors";
|
|
20
20
|
import { CODEX_CONFIG_PATH, readRootTomlString } from "../codex/paths";
|
|
21
21
|
import type { CodexAffinityMove, CodexAffinityReason } from "../codex/routing";
|
|
22
|
+
import type { CodexAuthContext } from "../codex/auth-context";
|
|
22
23
|
import { readCodexCatalogPath } from "../codex/catalog";
|
|
23
24
|
import type { AttemptTierOutcome, OcxProviderConfig, OcxUsage } from "../types";
|
|
24
25
|
import { normalizeRouteDecisionTrace, type RouteDecisionTraceV1 } from "../routing/trace";
|
|
@@ -46,6 +47,7 @@ import {
|
|
|
46
47
|
normalizeClaudeCompatibilityUsageLog,
|
|
47
48
|
normalizeRequestFailureAttribution,
|
|
48
49
|
normalizeRequestSpend,
|
|
50
|
+
normalizedAttempts,
|
|
49
51
|
readRecentUsageEntries,
|
|
50
52
|
modelIdentityLogFields, recordObservedServedModel,
|
|
51
53
|
usageForFinalLog,
|
|
@@ -357,6 +359,8 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
|
357
359
|
usage?: OcxUsage;
|
|
358
360
|
totalTokens?: number;
|
|
359
361
|
attempts?: PersistedUsageAttempt[];
|
|
362
|
+
/** True when persistence normalization drops any attempt. */
|
|
363
|
+
attemptNormalizationDropped?: boolean;
|
|
360
364
|
/**
|
|
361
365
|
* Upstream spend for the whole logical request: sends aggregated across attempts and combo
|
|
362
366
|
* children, split into settled and unresolved, with the budget state and move reasons that
|
|
@@ -513,6 +517,8 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
513
517
|
...(entry.usage ? { usage: entry.usage } : {}),
|
|
514
518
|
...(entry.totalTokens !== undefined ? { totalTokens: entry.totalTokens } : {}),
|
|
515
519
|
...(entry.attempts !== undefined ? { attempts: entry.attempts } : {}),
|
|
520
|
+
...(entry.attemptNormalizationDropped === true
|
|
521
|
+
? { attemptNormalizationDropped: true } : {}),
|
|
516
522
|
...(spend ? { spend } : {}),
|
|
517
523
|
...(isKnownCacheTelemetryProvenance(entry.cacheProvenance)
|
|
518
524
|
? { cacheProvenance: entry.cacheProvenance }
|
|
@@ -619,12 +625,16 @@ export function addRequestLog(entry: RequestLogEntry) {
|
|
|
619
625
|
const servedModel = modelIdentityLogFields(entry).servedModel;
|
|
620
626
|
const claudeCompatibility = normalizeClaudeCompatibilityUsageLog(entry.claudeCompatibility);
|
|
621
627
|
const jevDecision = normalizePersistedJevDecision(entry.jevDecision);
|
|
628
|
+
const attempts = normalizedAttempts(entry.attempts);
|
|
629
|
+
const attemptsDropped = Array.isArray(entry.attempts) && attempts.length < entry.attempts.length;
|
|
622
630
|
const retained: RequestLogEntry = shadowCallRewrittenFrom === entry.shadowCallRewrittenFrom
|
|
623
631
|
&& servedModel === entry.servedModel
|
|
624
632
|
&& entry.claudeCompatibility === undefined
|
|
625
633
|
&& entry.jevDecision === undefined
|
|
634
|
+
&& !attemptsDropped
|
|
626
635
|
? entry
|
|
627
|
-
: { ...entry, ...(
|
|
636
|
+
: { ...entry, ...(entry.attemptNormalizationDropped === true || attemptsDropped ? { attemptNormalizationDropped: true } : {}),
|
|
637
|
+
...(shadowCallRewrittenFrom ? { shadowCallRewrittenFrom } : {}) };
|
|
628
638
|
if (!shadowCallRewrittenFrom && retained !== entry) delete retained.shadowCallRewrittenFrom;
|
|
629
639
|
if (!servedModel && retained !== entry) {
|
|
630
640
|
delete retained.servedModel;
|
|
@@ -699,6 +709,8 @@ export function addRequestLog(entry: RequestLogEntry) {
|
|
|
699
709
|
...(entry.usage ? { usage: entry.usage } : {}),
|
|
700
710
|
...(entry.totalTokens !== undefined ? { totalTokens: entry.totalTokens } : {}),
|
|
701
711
|
...(entry.attempts !== undefined ? { attempts: entry.attempts } : {}),
|
|
712
|
+
...(entry.attemptNormalizationDropped === true
|
|
713
|
+
? { attemptNormalizationDropped: true } : {}),
|
|
702
714
|
...(entry.spend ? { spend: entry.spend } : {}),
|
|
703
715
|
...(isKnownCacheTelemetryProvenance(entry.cacheProvenance)
|
|
704
716
|
? { cacheProvenance: entry.cacheProvenance }
|
|
@@ -1263,6 +1275,18 @@ export function noteAffinityMove(
|
|
|
1263
1275
|
(logCtx.affinityMoveReasons ??= []).push(reason);
|
|
1264
1276
|
}
|
|
1265
1277
|
|
|
1278
|
+
/**
|
|
1279
|
+
* Copy the selection's own affinity decision onto the request log. Both Pool-served kinds carry
|
|
1280
|
+
* one: a stored Pool account and the main login rotating as `main-pool` (#4546, #7799). A move
|
|
1281
|
+
* then reads as an event with its cause instead of something inferred from account labels.
|
|
1282
|
+
*/
|
|
1283
|
+
export function noteCodexSelectionAffinity(logCtx: RequestLogContext, authCtx: CodexAuthContext): void {
|
|
1284
|
+
const decision = authCtx.kind === "pool" || authCtx.kind === "main-pool" ? authCtx.affinityDecision : undefined;
|
|
1285
|
+
if (!decision) return;
|
|
1286
|
+
logCtx.affinity = decision.move;
|
|
1287
|
+
logCtx.affinityReason = decision.reason;
|
|
1288
|
+
}
|
|
1289
|
+
|
|
1266
1290
|
/**
|
|
1267
1291
|
* The affinity scope a released binding belonged to: one thread, one model lane.
|
|
1268
1292
|
*
|
|
@@ -1625,7 +1649,10 @@ function finalizedUsage(
|
|
|
1625
1649
|
const usageFallback = !finalUsage && estimate !== undefined
|
|
1626
1650
|
? { inputTokens: estimate, outputTokens: 0, estimated: true }
|
|
1627
1651
|
: undefined;
|
|
1628
|
-
|
|
1652
|
+
// The estimate is a floor under a count the adapter could only guess. A count the adapter read
|
|
1653
|
+
// off the upstream's own usage frame stays exact: max() against a larger local estimate would
|
|
1654
|
+
// replace it and mark it estimated.
|
|
1655
|
+
const combinedInputTokens = finalUsage && !finalUsage.upstreamReported && estimate !== undefined
|
|
1629
1656
|
? Math.max(finalUsage.inputTokens, estimate)
|
|
1630
1657
|
: undefined;
|
|
1631
1658
|
const loggedUsage = finalUsage && combinedInputTokens !== undefined
|
|
@@ -1907,6 +1934,7 @@ export function aggregateAttemptUsage(
|
|
|
1907
1934
|
...(reasoningOutputTokens !== undefined ? { reasoningOutputTokens } : {}),
|
|
1908
1935
|
...(providerCredits !== undefined ? { providerCredits } : {}),
|
|
1909
1936
|
...(status === "estimated" ? { estimated: true } : {}),
|
|
1937
|
+
...(usages.every(usage => usage.upstreamReported) ? { upstreamReported: true as const } : {}),
|
|
1910
1938
|
};
|
|
1911
1939
|
return { usage: aggregate, status, totalTokens };
|
|
1912
1940
|
}
|
|
@@ -199,6 +199,13 @@ export function scrubUnportableConversationStateInPlace(body: unknown): boolean
|
|
|
199
199
|
delete record.conversation;
|
|
200
200
|
changed = true;
|
|
201
201
|
}
|
|
202
|
+
if (record.client_metadata && typeof record.client_metadata === "object" && !Array.isArray(record.client_metadata)) {
|
|
203
|
+
const cm = record.client_metadata as Record<string, unknown>;
|
|
204
|
+
if ("x-codex-turn-state" in cm) {
|
|
205
|
+
delete cm["x-codex-turn-state"];
|
|
206
|
+
changed = true;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
202
209
|
// Encrypted reasoning and compaction ciphertext are deliberately NOT touched here. #2247
|
|
203
210
|
// already strips them when a pooled thread moves accounts, and in a specific shape: the
|
|
204
211
|
// reasoning item keeps its readable summary with an emptied content array, and the compaction
|
|
@@ -230,6 +237,7 @@ export function rememberServingConversationStateIssuer(
|
|
|
230
237
|
|
|
231
238
|
export interface ApplyAccountChangeConversationStateScrubArgs {
|
|
232
239
|
body: unknown;
|
|
240
|
+
headers?: Headers;
|
|
233
241
|
bindingKey: string;
|
|
234
242
|
servingAccountId: string;
|
|
235
243
|
/** Account this request body was prepared for, when this is an in-request move. */
|
|
@@ -257,9 +265,13 @@ export function applyAccountChangeConversationStateScrub(
|
|
|
257
265
|
// The issuer record can outlive the serving-route cache. Even a retained ciphertext cannot
|
|
258
266
|
// make its reasoning item id resolvable in the new account's store.
|
|
259
267
|
if (parsed) parsed._dropForeignReasoningItemIds = true;
|
|
260
|
-
|
|
268
|
+
let headerScrubbed = false;
|
|
269
|
+
if (args.headers?.has("x-codex-turn-state")) {
|
|
270
|
+
args.headers.delete("x-codex-turn-state");
|
|
271
|
+
headerScrubbed = true;
|
|
272
|
+
}
|
|
261
273
|
const scrubbed = scrubUnportableConversationStateInPlace(body);
|
|
262
|
-
if (!scrubbed) return false;
|
|
274
|
+
if (!scrubbed && !headerScrubbed) return false;
|
|
263
275
|
if (parsed) {
|
|
264
276
|
delete parsed.previousResponseId;
|
|
265
277
|
parsed._stripNativeCompactionEncryptedContent = true;
|
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
import { noteAttemptRecoveryWithheld } from "../request-log";
|
|
19
19
|
import { withProviderRequestSlot } from "../../providers/request-pacing";
|
|
20
20
|
import { providerFetch, fetchWithHeaderTimeout, safeHostLabel } from "./fetch-helpers";
|
|
21
|
+
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
21
22
|
import {
|
|
22
23
|
transientRetryPolicyFor,
|
|
23
24
|
rateLimitRetryDelayMs,
|
|
@@ -139,8 +140,7 @@ export function createAdapterContinuations(
|
|
|
139
140
|
} = transportState;
|
|
140
141
|
const { route, translatorBudget, inboundWire, parsed } = requestState;
|
|
141
142
|
const { routedCompaction } = sidecarState;
|
|
142
|
-
const { upstream, connectMs, rateLimitPolicy, stallTimeoutMs
|
|
143
|
-
const bodyInactivityMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream });
|
|
143
|
+
const { upstream, connectMs, rateLimitPolicy, stallTimeoutMs } = adapterExchange;
|
|
144
144
|
const {
|
|
145
145
|
adapterDispatchBudget,
|
|
146
146
|
noteAdapterPhysicalSend,
|
|
@@ -249,7 +249,7 @@ export function createAdapterContinuations(
|
|
|
249
249
|
transportState.activeAdapter.fetchResponse!(builtContinuationRequest, {
|
|
250
250
|
kiroPreferAccountFailover: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro"),
|
|
251
251
|
abortSignal: upstream.signal,
|
|
252
|
-
timeoutMs: connectMs,
|
|
252
|
+
timeoutMs: route.provider.authMode === "forward" ? connectMs : 0,
|
|
253
253
|
sendBudget: adapterDispatchBudget,
|
|
254
254
|
onPhysicalSend: send => noteAdapterPhysicalSend(continuationEstimate, send),
|
|
255
255
|
onRecoveryWithheld: noteAdapterRecoveryWithheld,
|
|
@@ -284,7 +284,7 @@ export function createAdapterContinuations(
|
|
|
284
284
|
body: builtContinuationRequest.body,
|
|
285
285
|
}, recovery),
|
|
286
286
|
upstream.signal,
|
|
287
|
-
connectMs,
|
|
287
|
+
route.provider.authMode === "forward" ? connectMs : 0,
|
|
288
288
|
nextParsed.stream,
|
|
289
289
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
290
290
|
dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed),
|
|
@@ -720,6 +720,7 @@ export function createAdapterContinuations(
|
|
|
720
720
|
// The shared signal is not aborted on timeout: this generator must still emit
|
|
721
721
|
// the error that the already-live Responses bridge turns into a terminal.
|
|
722
722
|
const parse = async function* (current: Response): AsyncGenerator<AdapterEvent> {
|
|
723
|
+
const bodyInactivityMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl) });
|
|
723
724
|
if (!current.ok) {
|
|
724
725
|
yield await adapterExchange.thinkingSignatureRecovery.projectHttpFailure(current, upstream.signal);
|
|
725
726
|
} else if (nextParsed.stream) {
|
|
@@ -42,6 +42,8 @@ export async function deliverAdapterResponse(
|
|
|
42
42
|
| "clientToolCatalogRestriction"
|
|
43
43
|
| "rememberKiroDeliveredFinalAnswer"
|
|
44
44
|
| "responseStateOptions"
|
|
45
|
+
| "turnMembership"
|
|
46
|
+
| "completedToolBlocks"
|
|
45
47
|
>,
|
|
46
48
|
transportState: Pick<ResponsesTransport, "activeAdapter" | "bindKeyUsageFromBridge" | "sentOAuthSnapshot">,
|
|
47
49
|
sidecarState: Pick<ResponsesSidecarAuth, "routedCompaction">,
|
|
@@ -100,6 +102,7 @@ export async function deliverAdapterResponse(
|
|
|
100
102
|
return;
|
|
101
103
|
}
|
|
102
104
|
try {
|
|
105
|
+
const bodyInactivityMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: adapterExchange.localUpstream });
|
|
103
106
|
const retryEvents = upstreamRequestsStream
|
|
104
107
|
? readResponseStreamWithInactivity(response, upstream.signal, bodyInactivityMs,
|
|
105
108
|
guarded => transportState.activeAdapter.parseStream(guarded, translatorBudget, logCtx.activeTierMetadata))
|
|
@@ -125,6 +128,15 @@ export async function deliverAdapterResponse(
|
|
|
125
128
|
|
|
126
129
|
|
|
127
130
|
if (parsed.stream) {
|
|
131
|
+
const clientEncoder = clientToolCatalog?.bareCustomToolNames.has("exec") ? undefined
|
|
132
|
+
: clientEncoderForDelivery(options, logCtx, !!routedCompaction, transportState.activeAdapter.name);
|
|
133
|
+
// Sign only the negotiated canonical Chat delivery. Native/sidecar/opaque item identities
|
|
134
|
+
// retain their existing owners; structural membership grants no supplier-state authority.
|
|
135
|
+
const outputItemIds = requestState.completedToolBlocks && transportState.activeAdapter.name === "openai-chat"
|
|
136
|
+
&& options.inboundWire !== "chat" && options.inboundWire !== "anthropic"
|
|
137
|
+
&& !routedCompaction && !parsed._advisorGuard && !clientEncoder && upstreamResponse.headers.get("x-opencodex-tool-completion") === "block-stop-v1"
|
|
138
|
+
? requestState.turnMembership?.begin() : undefined;
|
|
139
|
+
|
|
128
140
|
// The continuation legs classify a stalled body themselves; the initial stream needs the
|
|
129
141
|
// same mapping or the bridge catch reports this upstream timeout as a 500 proxy_error.
|
|
130
142
|
const initialEventStream = (async function* (): AsyncGenerator<AdapterEvent> {
|
|
@@ -133,7 +145,7 @@ export async function deliverAdapterResponse(
|
|
|
133
145
|
upstreamResponse,
|
|
134
146
|
upstream.signal,
|
|
135
147
|
bodyInactivityMs,
|
|
136
|
-
response => transportState.activeAdapter.parseStream(response, translatorBudget, logCtx.activeTierMetadata),
|
|
148
|
+
response => transportState.activeAdapter.parseStream(response, translatorBudget, logCtx.activeTierMetadata, { completedToolBlocks: outputItemIds !== undefined }),
|
|
137
149
|
)) {
|
|
138
150
|
options.onCompactionRecoveryAdapterEvent?.(event);
|
|
139
151
|
yield event;
|
|
@@ -211,8 +223,7 @@ export async function deliverAdapterResponse(
|
|
|
211
223
|
notifyResponseComplete(response);
|
|
212
224
|
};
|
|
213
225
|
// The Responses bridge owns code-mode helper compilation; the direct encoder only renames.
|
|
214
|
-
|
|
215
|
-
: clientEncoderForDelivery(options, logCtx, !!routedCompaction, transportState.activeAdapter.name);
|
|
226
|
+
|
|
216
227
|
if (clientEncoder) {
|
|
217
228
|
return deliverClientEncodedResponse({
|
|
218
229
|
encoder: clientEncoder,
|
|
@@ -224,11 +235,12 @@ export async function deliverAdapterResponse(
|
|
|
224
235
|
fold: {
|
|
225
236
|
replayCacheScope: parsed._reasoningReplayScope,
|
|
226
237
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
238
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
227
239
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
228
240
|
toolNsMap, declaredToolNames, toolParameterSchemas, freeformToolNames, bareCustomToolNames, toolSearchToolNames,
|
|
229
241
|
},
|
|
230
242
|
stallTimeoutSec: config.stallTimeoutSec,
|
|
231
|
-
localUpstream,
|
|
243
|
+
get localUpstream() { return adapterExchange.localUpstream; },
|
|
232
244
|
turnAdmissionLease: options.turnAdmissionLease,
|
|
233
245
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
234
246
|
stopUpstream: () => { cancelResponseCompletion(); upstream.abort(); },
|
|
@@ -243,10 +255,12 @@ export async function deliverAdapterResponse(
|
|
|
243
255
|
{
|
|
244
256
|
translatorBudget,
|
|
245
257
|
replayCacheScope: parsed._reasoningReplayScope,
|
|
258
|
+
...(outputItemIds ? { outputItemIds } : {}),
|
|
246
259
|
...(options.forceEmptyResponseId ? { responseId: "" } : {}),
|
|
247
260
|
stallTimeoutSec: config.stallTimeoutSec,
|
|
248
|
-
localUpstream,
|
|
261
|
+
get localUpstream() { return adapterExchange.localUpstream; },
|
|
249
262
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
263
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
250
264
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
251
265
|
declaredToolNames,
|
|
252
266
|
bareCustomToolNames,
|
|
@@ -255,6 +269,8 @@ export async function deliverAdapterResponse(
|
|
|
255
269
|
toolParameterSchemas,
|
|
256
270
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
257
271
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
272
|
+
completeOnMaxOutputTokens: config.completeOnMaxOutputTokens === true && options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
273
|
+
textFormat: parsed.options.textFormat,
|
|
258
274
|
// Same grok-surface split as the runTurn branch above.
|
|
259
275
|
...(logCtx.surface === "grok" ? { heartbeatStyle: "comment" as const } : {}),
|
|
260
276
|
onUsage: usage => {
|
|
@@ -354,6 +370,7 @@ export async function deliverAdapterResponse(
|
|
|
354
370
|
translatorBudget,
|
|
355
371
|
replayCacheScope: parsed._reasoningReplayScope,
|
|
356
372
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
373
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
357
374
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
358
375
|
toolNsMap,
|
|
359
376
|
declaredToolNames,
|
|
@@ -363,6 +380,8 @@ export async function deliverAdapterResponse(
|
|
|
363
380
|
freeformToolNames,
|
|
364
381
|
toolSearchToolNames,
|
|
365
382
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
383
|
+
completeOnMaxOutputTokens: config.completeOnMaxOutputTokens === true && options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
384
|
+
textFormat: parsed.options.textFormat,
|
|
366
385
|
onProviderState: state => { providerState = state; },
|
|
367
386
|
onUsage: usage => {
|
|
368
387
|
transportState.bindKeyUsageFromBridge(usage);
|