@bitkyc08/opencodex 2.95.0 → 2.97.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/bin/ocx.mjs +214 -19
- package/gui/dist/assets/{App-8yedBkhm.js → App-DuNhggE1.js} +18 -18
- package/gui/dist/assets/{Tray-erSMzxPG.js → Tray-CEw0y0jR.js} +1 -1
- package/gui/dist/assets/index-CynE_Rue.js +94 -0
- package/gui/dist/assets/{quota-summary-BK4VuQNc.js → quota-summary-VHFSlUuM.js} +1 -1
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/command-code.ts +15 -16
- package/src/adapters/cursor/transport-retry.ts +2 -2
- package/src/adapters/devin/cloud-direct/chat.ts +15 -6
- package/src/adapters/kiro/stream.ts +63 -4
- package/src/adapters/kiro-constants.ts +15 -1
- package/src/adapters/kiro-events.ts +31 -1
- package/src/adapters/kiro-retry.ts +3 -3
- package/src/adapters/ollama-native.ts +21 -7
- package/src/adapters/openai-responses/canonical-forward.ts +50 -13
- package/src/adapters/openai-responses/empty-assistant.ts +15 -3
- package/src/adapters/openai-responses/passthrough.ts +8 -8
- package/src/adapters/openai-responses/reasoning.ts +9 -4
- package/src/adapters/openai-responses/request-strips.ts +1 -1
- package/src/adapters/openai-responses/transport.ts +17 -26
- package/src/adapters/physical-send.ts +3 -3
- package/src/adapters/qoder/adapter.ts +1 -1
- package/src/adapters/qoder/image-input.ts +5 -2
- package/src/adapters/zed-openai-stream.ts +2 -1
- package/src/bridge/errors.ts +11 -2
- package/src/bridge/response-json.ts +2 -1
- package/src/bridge/sse.ts +14 -6
- package/src/chat/failure-verdict.ts +21 -0
- package/src/chat/outbound.ts +139 -21
- package/src/claude/outbound.ts +49 -2
- package/src/cli/agent.ts +44 -15
- package/src/cli/capabilities-agents-routing.ts +9 -0
- package/src/cli/capabilities-base.ts +25 -3
- package/src/cli/capabilities-command.ts +12 -3
- package/src/cli/capability-contracts.ts +2 -0
- package/src/cli/codex-launch-auth.ts +30 -1
- package/src/cli/codex-launcher.ts +12 -5
- package/src/cli/codex-shim-autorestore.ts +5 -4
- package/src/cli/dispatch.ts +11 -176
- package/src/cli/ensure-desired-integrations.ts +4 -3
- package/src/cli/help.ts +2 -2
- package/src/cli/index.ts +9 -2
- package/src/cli/link.ts +1 -1
- package/src/cli/message-command.ts +2 -1
- package/src/cli/message-mcp-command.ts +29 -0
- package/src/cli/registry.ts +12 -4
- package/src/cli/root.ts +8 -0
- package/src/cli/sync-command.ts +243 -0
- package/src/cli/sync-fanout-process.ts +92 -0
- package/src/cli/sync-fanout.ts +150 -0
- package/src/cli/sync-flags.ts +10 -0
- package/src/cli/sync-link-status.ts +39 -0
- package/src/cli/sync-update-guard.ts +18 -0
- package/src/client/connect.ts +31 -14
- package/src/client/link-home.ts +3 -2
- package/src/client/machine-listener.ts +3 -0
- package/src/client/restore-ownership.ts +19 -1
- package/src/client/runtime-restart.ts +12 -4
- package/src/client/runtime.ts +40 -11
- package/src/client/stop-routing.ts +62 -0
- package/src/client/sync-runtime.ts +65 -0
- package/src/clients/config-export.ts +32 -3
- package/src/codex/account-store.ts +1 -0
- package/src/codex/auth-context-provider.ts +15 -0
- package/src/codex/auth-context.ts +59 -122
- package/src/codex/catalog/antigravity-discovery.ts +16 -5
- package/src/codex/catalog/provider-models.ts +6 -8
- package/src/codex/forward-transport-headers.ts +65 -36
- package/src/codex/inject/config-toml.ts +88 -0
- package/src/codex/inject/multi-agent-v2.ts +30 -4
- package/src/codex/inject/plan.ts +34 -7
- package/src/codex/inject-coordination.ts +11 -0
- package/src/codex/inject.ts +18 -7
- package/src/codex/installation-id.ts +72 -0
- package/src/codex/lineage.ts +13 -7
- package/src/codex/quota.ts +22 -6
- package/src/codex/request-owned-affinity-key.ts +11 -0
- package/src/codex/request-owned-affinity.ts +118 -0
- package/src/codex/request-owned-main-pin.ts +86 -0
- package/src/codex/role-capability.ts +52 -41
- package/src/codex/routing/active-account.ts +13 -5
- package/src/codex/routing/selection.ts +40 -1
- package/src/codex/routing/thread-affinity-store.ts +916 -0
- package/src/codex/routing/thread-affinity.ts +90 -12
- package/src/codex/toml-source-lines.ts +72 -13
- package/src/combos/failover.ts +6 -109
- package/src/combos/request.ts +2 -2
- package/src/combos/resolve.ts +29 -11
- package/src/config/process-state.ts +5 -0
- package/src/config/schema/leaf-validators.ts +1 -0
- package/src/generated/compatibility-version.json +496 -192
- package/src/grok/sync.ts +10 -1
- package/src/images/loop.ts +2 -1
- package/src/lib/client-error-body.ts +184 -0
- package/src/lib/client-retry-after.ts +66 -0
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/context-overflow-verdict.ts +113 -0
- package/src/lib/desktop-cli-handoff.d.mts +1 -1
- package/src/lib/desktop-cli-handoff.mjs +11 -1
- package/src/lib/empty-tool-catalog.ts +25 -3
- package/src/lib/error-destination.ts +47 -0
- package/src/lib/failure-detail.ts +66 -0
- package/src/lib/model-identity.ts +44 -0
- package/src/lib/private-sqlite-path.ts +124 -0
- package/src/lib/response-service-tier.ts +17 -0
- package/src/lib/retry-after.ts +3 -0
- package/src/lib/spend-ledger-owner.ts +43 -4
- package/src/lib/upstream-condition.ts +142 -0
- package/src/lib/upstream-retry.ts +14 -11
- package/src/lib/windows-owner-acl.ts +13 -6
- package/src/lib/windows-secret-acl.ts +2 -2
- package/src/link/remote-platform.ts +14 -0
- package/src/link/remote-windows.ts +51 -9
- package/src/link/ssh-argv.ts +63 -10
- package/src/messaging/mcp-queue-rpc.ts +102 -0
- package/src/messaging/mcp-queue-server.ts +42 -0
- package/src/messaging/mcp-queue-tools.ts +39 -0
- package/src/oauth/anthropic-identity.ts +2 -6
- package/src/oauth/generic-account-failover.ts +13 -11
- package/src/oauth/index.ts +41 -74
- package/src/oauth/oauth-errors.ts +67 -0
- package/src/oauth/store.ts +1 -1
- package/src/protocols/codecs/ollama.ts +197 -0
- package/src/protocols/encoders/adapter-events.ts +4 -0
- package/src/protocols/encoders/chat.ts +18 -10
- package/src/protocols/trace.ts +18 -0
- package/src/providers/anthropic-subscription.ts +25 -0
- package/src/providers/claude-cli-usage.ts +15 -67
- package/src/providers/fastwire.ts +3 -2
- package/src/providers/quota/anthropic-decision-windows.ts +5 -19
- package/src/providers/quota/anthropic-usage-windows.ts +65 -0
- package/src/providers/quota/vendor-probes-key.ts +60 -24
- package/src/providers/request-pacing.ts +3 -2
- package/src/responses/apply-patch-envelope.ts +45 -19
- package/src/responses/compaction-history-framing.ts +5 -1
- package/src/responses/freeform-wrapper-scan.ts +5 -3
- package/src/responses/parser-tools.ts +1 -0
- package/src/responses/progressive-freeform-input.ts +354 -45
- package/src/responses/schema.ts +5 -2
- package/src/routing/fallback-policy.ts +3 -1
- package/src/server/admission-model-scope.ts +17 -6
- package/src/server/admitted-http-turn.ts +56 -0
- package/src/server/audio-dictation.ts +3 -0
- package/src/server/audio-live.ts +8 -2
- package/src/server/audio-upstream.ts +2 -0
- package/src/server/auth-cors.ts +5 -0
- package/src/server/chat-completions.ts +45 -20
- package/src/server/chat-native-sse.ts +52 -7
- package/src/server/chat-native.ts +60 -35
- package/src/server/claude-bridge-pool-session.ts +59 -0
- package/src/server/claude-messages.ts +57 -27
- package/src/server/context-history.ts +14 -7
- package/src/server/images.ts +14 -5
- package/src/server/inbound-body-admission.ts +11 -4
- package/src/server/index/live-sideband.ts +16 -2
- package/src/server/index/ollama-routes.ts +89 -0
- package/src/server/index/serve-options.ts +22 -4
- package/src/server/index/websocket-handler.ts +5 -3
- package/src/server/index.ts +6 -36
- package/src/server/inference/client-encoder-delivery.ts +4 -2
- package/src/server/json-serialized-bytes.ts +44 -0
- package/src/server/live.ts +30 -5
- package/src/server/management/agent-settings-routes.ts +24 -21
- package/src/server/management/codex-cli-update-routes.ts +2 -1
- package/src/server/management/route-registry.ts +1 -1
- package/src/server/messages-native-scope.ts +2 -1
- package/src/server/messages-native-tool-guard.ts +1 -1
- package/src/server/messages-native.ts +12 -7
- package/src/server/messages-shared.ts +6 -2
- package/src/server/native-final-log.ts +93 -0
- package/src/server/ollama-inbound.ts +349 -0
- package/src/server/ollama-native-paths.ts +21 -0
- package/src/server/ollama-route-policy.ts +73 -0
- package/src/server/relay.ts +22 -3
- package/src/server/request-decompress.ts +4 -2
- package/src/server/request-log-failure-attribution.ts +22 -0
- package/src/server/request-log-failure-detail.ts +80 -0
- package/src/server/request-log-terminal-status.ts +4 -2
- package/src/server/request-log.ts +79 -42
- package/src/server/response-log-body.ts +6 -1
- package/src/server/responses/account-change-state.ts +17 -6
- package/src/server/responses/adapter-continuation.ts +9 -4
- package/src/server/responses/adapter-delivery.ts +5 -4
- package/src/server/responses/adapter-dispatch.ts +36 -30
- package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
- package/src/server/responses/codex-auth-error.ts +22 -17
- package/src/server/responses/codex-ws-exchange.ts +11 -8
- package/src/server/responses/codex-ws-metadata.ts +94 -21
- package/src/server/responses/codex-ws-request.ts +3 -1
- package/src/server/responses/combo-required-tool-contract.ts +24 -12
- package/src/server/responses/compact.ts +89 -41
- package/src/server/responses/compaction-recovery.ts +4 -2
- package/src/server/responses/compaction-routing.ts +9 -4
- package/src/server/responses/core-auth.ts +32 -14
- package/src/server/responses/core-codex-account.ts +34 -12
- package/src/server/responses/core-combo-failure.ts +5 -1
- package/src/server/responses/core-combo-native.ts +2 -1
- package/src/server/responses/core-combo.ts +51 -33
- package/src/server/responses/core-errors.ts +22 -20
- package/src/server/responses/core-lifetime.ts +6 -3
- package/src/server/responses/core-normalize.ts +8 -1
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/core-pipeline.ts +4 -3
- package/src/server/responses/fetch-helpers.ts +7 -1
- package/src/server/responses/input-admission.ts +28 -2
- package/src/server/responses/native-injection.ts +1 -1
- package/src/server/responses/native-response-json.ts +13 -4
- package/src/server/responses/native-response-output.ts +1 -2
- package/src/server/responses/non-replayable-error.ts +2 -1
- package/src/server/responses/pacing-overload.ts +3 -2
- package/src/server/responses/passthrough-build-error.ts +36 -0
- package/src/server/responses/passthrough-delivery.ts +55 -14
- package/src/server/responses/passthrough-dispatch.ts +26 -39
- package/src/server/responses/passthrough-error.ts +9 -9
- package/src/server/responses/policy-fallback.ts +2 -1
- package/src/server/responses/request-prepare.ts +67 -48
- package/src/server/responses/request-sidecar-auth.ts +3 -1
- package/src/server/responses/request-transport.ts +35 -31
- package/src/server/responses/run-turn-execution.ts +6 -6
- package/src/server/responses/sidecar-execution.ts +16 -12
- package/src/server/responses/spend-storage-error.ts +2 -1
- package/src/server/responses/ws-upstream.ts +9 -0
- package/src/server/responses-custom-tool-repair.ts +14 -3
- package/src/server/responses-terminal-repair.ts +5 -2
- package/src/server/responses-undeclared-tool-guard.ts +39 -16
- package/src/server/safe-response-headers.ts +162 -13
- package/src/server/search.ts +13 -4
- package/src/server/turn-state-handles.ts +164 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +5 -2
- package/src/service/ownership-mutation-lease.d.mts +11 -2
- package/src/service/ownership-mutation-lease.mjs +53 -11
- package/src/types/config.ts +2 -0
- package/src/update/index.ts +133 -25
- package/src/update/npm-install.d.mts +8 -0
- package/src/update/npm-install.mjs +20 -1
- package/src/update/orchestrated-admission.d.mts +4 -0
- package/src/update/orchestrated-admission.mjs +12 -0
- package/src/update/orchestrated-arguments.d.mts +12 -0
- package/src/update/orchestrated-arguments.mjs +64 -0
- package/src/update/orchestrated-child.d.mts +12 -0
- package/src/update/orchestrated-child.mjs +70 -0
- package/src/update/orchestrated-entry.ts +234 -0
- package/src/update/orchestrated-identity-probe-entry.ts +20 -0
- package/src/update/orchestrated-identity.ts +53 -0
- package/src/update/orchestrated-live-identity.ts +48 -0
- package/src/update/orchestrated-node-driver.mjs +99 -0
- package/src/update/orchestrated-outcome.d.mts +21 -0
- package/src/update/orchestrated-outcome.mjs +40 -0
- package/src/update/orchestrated-plan.ts +49 -0
- package/src/update/orchestrated-pnpm.d.mts +8 -0
- package/src/update/orchestrated-pnpm.mjs +33 -0
- package/src/update/orchestrated-session.d.mts +37 -0
- package/src/update/orchestrated-session.mjs +264 -0
- package/src/update/orchestrated-token.d.mts +10 -0
- package/src/update/orchestrated-token.mjs +21 -0
- package/src/update/orchestrated-token.ts +3 -0
- package/src/update/orchestrated-tree.d.mts +1 -0
- package/src/update/orchestrated-tree.mjs +14 -0
- package/src/update/pnpm-global-install.d.mts +6 -0
- package/src/update/pnpm-global-install.mjs +9 -2
- package/src/update/posix-install-supervisor-entry.mjs +6 -0
- package/src/update/posix-install-supervisor.d.mts +10 -0
- package/src/update/posix-install-supervisor.mjs +88 -0
- package/src/update/sync-update-mutex.d.mts +10 -0
- package/src/update/sync-update-mutex.mjs +164 -0
- package/src/update/sync-update-mutex.ts +1 -0
- package/src/update/test-home-guard.mjs +33 -0
- package/src/update/transactional-install.mjs +2 -2
- package/src/usage/error-detail.ts +225 -0
- package/src/usage/log.ts +60 -27
- package/src/vision/describe.ts +4 -7
- package/src/web-search/executor.ts +4 -7
- package/src/web-search/loop.ts +31 -5
- package/gui/dist/assets/index-D7DCm5eQ.js +0 -94
|
@@ -18,6 +18,8 @@ export interface PreparedCodexWsRequest {
|
|
|
18
18
|
/** Original HTTP body/framing/options with only the canonical routing hint re-derived. */
|
|
19
19
|
httpInit: RequestInit;
|
|
20
20
|
canonical: boolean;
|
|
21
|
+
/** The request's model id, when the body names one: a model the relayed metadata may report. */
|
|
22
|
+
model?: string;
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
@@ -83,7 +85,7 @@ export function prepareCodexWsRequest(url: string, init: RequestInit): PreparedC
|
|
|
83
85
|
? headers["openai-beta"]
|
|
84
86
|
: `${headers["openai-beta"]}, ${WS_BETA}`
|
|
85
87
|
: WS_BETA;
|
|
86
|
-
return { frameText, headers, httpInit, canonical };
|
|
88
|
+
return { frameText, headers, httpInit, canonical, ...(typeof body.model === "string" ? { model: body.model } : {}) };
|
|
87
89
|
} catch {
|
|
88
90
|
return null;
|
|
89
91
|
}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
|
|
2
|
+
import { mapToolChoice } from "../../responses/parser-tools";
|
|
3
|
+
import { modelInList, type OcxProviderConfig } from "../../types";
|
|
2
4
|
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
3
5
|
import { applyReplayRefusalClientHeaders, isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
4
6
|
import { clientWireOf } from "../inference/client-wire";
|
|
@@ -15,6 +17,16 @@ const allowedHostedSelectors = new Set([
|
|
|
15
17
|
"code_interpreter", "image_generation", "image_gen", "tool_search",
|
|
16
18
|
]);
|
|
17
19
|
|
|
20
|
+
function knownToolSelector(value: unknown): boolean {
|
|
21
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
22
|
+
const entry = value as Record<string, unknown>;
|
|
23
|
+
if (entry.type === "mcp") return typeof entry.server_label === "string" && !!entry.server_label.trim()
|
|
24
|
+
&& (entry.name === undefined || entry.name === null || (typeof entry.name === "string" && !!entry.name.trim()));
|
|
25
|
+
if (entry.name !== undefined && (typeof entry.name !== "string" || !entry.name.trim())) return false;
|
|
26
|
+
if (entry.type === "function" || entry.type === "custom") return typeof entry.name === "string";
|
|
27
|
+
return typeof entry.type === "string" && allowedHostedSelectors.has(entry.type);
|
|
28
|
+
}
|
|
29
|
+
|
|
18
30
|
/** Only definite, well-formed mandatory selectors justify excluding a destination. */
|
|
19
31
|
export function hasMandatoryToolChoice(rawBody: unknown): boolean {
|
|
20
32
|
if (!rawBody || typeof rawBody !== "object" || Array.isArray(rawBody)) return false;
|
|
@@ -22,19 +34,19 @@ export function hasMandatoryToolChoice(rawBody: unknown): boolean {
|
|
|
22
34
|
if (choice === "required") return true;
|
|
23
35
|
if (!choice || typeof choice !== "object" || Array.isArray(choice)) return false;
|
|
24
36
|
const selector = choice as Record<string, unknown>;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
return selector.type === "allowed_tools" && selector.mode === "required"
|
|
37
|
+
// Eligibility is broader than terminal inspection: hosted selectors retain their own terminal owner.
|
|
38
|
+
if (selector.type !== "allowed_tools") return knownToolSelector(selector);
|
|
39
|
+
return selector.mode === "required"
|
|
29
40
|
&& Array.isArray(selector.tools) && selector.tools.length > 0
|
|
30
|
-
&& selector.tools.every(
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
41
|
+
&& selector.tools.every(knownToolSelector);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** A translated Chat target must not turn a mandatory selector into auto or none. */
|
|
45
|
+
export function chatCanPreserveMandatoryToolChoice(rawBody: unknown, provider: OcxProviderConfig, modelId: string): boolean {
|
|
46
|
+
if (!hasMandatoryToolChoice(rawBody)) return true;
|
|
47
|
+
if (modelInList(provider.autoToolChoiceOnlyModels, modelId)) return false;
|
|
48
|
+
const mapped = mapToolChoice((rawBody as Record<string, unknown>).tool_choice);
|
|
49
|
+
return mapped === "required" || (!!mapped && typeof mapped === "object");
|
|
38
50
|
}
|
|
39
51
|
|
|
40
52
|
const hostedCalls = new Map([
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
import { clientFacingModelLabel, type ClientFacingModelLabel } from "../../lib/error-destination";
|
|
2
|
+
import { formatClientRetryAfter } from "../../lib/client-retry-after";
|
|
3
|
+
import { conversationStateAccountId, releaseRequestOwnedMainOnOutcome, isKeyedRequestOwnedMain } from "../../codex/request-owned-affinity";
|
|
4
|
+
import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
|
|
5
|
+
import { MAIN_CODEX_ACCOUNT_ID } from "../../codex/account-id";
|
|
6
|
+
import { isolateCodexPoolClientMetadata } from "../../codex/forward-transport-headers";
|
|
1
7
|
import { captureAccountAutoPauseAttempt, wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
|
|
2
8
|
import { spendLedgerStorageErrorResponse } from "./spend-storage-error";
|
|
3
9
|
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
@@ -10,7 +16,7 @@ import { join } from "node:path";
|
|
|
10
16
|
import { rmSync } from "node:fs";
|
|
11
17
|
import { previewXaiOauthWireModel } from "./core-normalize";
|
|
12
18
|
import {
|
|
13
|
-
admissionModelDeniedResponse,
|
|
19
|
+
admissionModelDeniedResponse, projectAdmissionModelDeniedLog,
|
|
14
20
|
AdmissionModelDeniedError,
|
|
15
21
|
assertRouteAllowedByScope,
|
|
16
22
|
resolveAdmissionModelScope,
|
|
@@ -95,6 +101,7 @@ import { codexFailureWindowOutcomeMeta } from "../../codex/routing/failure-windo
|
|
|
95
101
|
import {
|
|
96
102
|
applyAccountChangeConversationStateScrub,
|
|
97
103
|
conversationStateBindingFromAuth,
|
|
104
|
+
compactAlternateAffinityKey,
|
|
98
105
|
accountChangeFileReferenceRefusal,
|
|
99
106
|
rememberServingConversationStateIssuer,
|
|
100
107
|
conversationCarriesUploadedFiles,
|
|
@@ -109,7 +116,7 @@ import {
|
|
|
109
116
|
fetchWithTransientRetry,
|
|
110
117
|
applyUpstreamRecoveryInit,
|
|
111
118
|
isNonReplayableResponse,
|
|
112
|
-
SendBudgetExhaustedError,
|
|
119
|
+
SendBudgetExhaustedError, errorDestinationLabel,
|
|
113
120
|
TRANSIENT_RETRY_MAX_ATTEMPTS,
|
|
114
121
|
type UpstreamSendRecovery,
|
|
115
122
|
} from "../../lib/upstream-retry";
|
|
@@ -320,6 +327,7 @@ function compactHandoffRoute(
|
|
|
320
327
|
}
|
|
321
328
|
|
|
322
329
|
export interface HandleResponsesCompactOptions {
|
|
330
|
+
clientModelLabel?: ClientFacingModelLabel;
|
|
323
331
|
advisorAdmissionPolicy?: import("../../types/admission-policy").CapturedAdmissionPolicy;
|
|
324
332
|
compactionRoutingOverride?: CompactionRoutingOverride | null;
|
|
325
333
|
nativeMainRefreshDependencies?: NativeMainRefreshDependencies;
|
|
@@ -393,7 +401,7 @@ async function refreshNativeMainCompactContext(args: {
|
|
|
393
401
|
});
|
|
394
402
|
for (const name of FORWARD_HEADERS) {
|
|
395
403
|
const value = selected.get(name);
|
|
396
|
-
if (value) headers.set(name, value);
|
|
404
|
+
if (value !== null) headers.set(name, value);
|
|
397
405
|
}
|
|
398
406
|
const override = (refreshedProvider as { _codexAccountOverride?: { accessToken: string; chatgptAccountId: string } })._codexAccountOverride;
|
|
399
407
|
if (override) {
|
|
@@ -488,7 +496,7 @@ async function refreshPoolCompactContext(args: {
|
|
|
488
496
|
});
|
|
489
497
|
for (const name of FORWARD_HEADERS) {
|
|
490
498
|
const value = selected.get(name);
|
|
491
|
-
if (value) headers.set(name, value);
|
|
499
|
+
if (value !== null) headers.set(name, value);
|
|
492
500
|
}
|
|
493
501
|
const override = (refreshedProvider as { _codexAccountOverride?: { accessToken: string; chatgptAccountId: string } })._codexAccountOverride;
|
|
494
502
|
if (override) {
|
|
@@ -541,11 +549,12 @@ async function resolveAlternateCompactContext(args: {
|
|
|
541
549
|
excludeAccountId: string | null;
|
|
542
550
|
turnAdmissionLease?: AdmissionLease;
|
|
543
551
|
admission?: DataPlaneAdmission;
|
|
544
|
-
}): Promise<{ authCtx: CodexAuthContext; provider: OcxProviderConfig; headers: Headers } | null> {
|
|
552
|
+
}): Promise<{ authCtx: CodexAuthContext; provider: OcxProviderConfig; headers: Headers } | { failure: Response } | null> {
|
|
545
553
|
const { req, config, route, selectedModelId, excludeAccountId, turnAdmissionLease } = args;
|
|
546
554
|
if (!route.codexAccountMode || !excludeAccountId) return null;
|
|
555
|
+
let authCtx: CodexAuthContext | undefined;
|
|
547
556
|
try {
|
|
548
|
-
|
|
557
|
+
authCtx = await resolveCodexAuthContext(req.headers, config, route.codexAccountMode, {
|
|
549
558
|
admission: args.admission,
|
|
550
559
|
...(selectedModelId ? { modelId: selectedModelId } : {}),
|
|
551
560
|
excludeAccountId,
|
|
@@ -561,7 +570,7 @@ async function resolveAlternateCompactContext(args: {
|
|
|
561
570
|
const selected = headersForCodexAuthContext(req.headers, authCtx, config, selectedModelId, args.admission);
|
|
562
571
|
for (const name of FORWARD_HEADERS) {
|
|
563
572
|
const value = selected.get(name);
|
|
564
|
-
if (value) headers.set(name, value);
|
|
573
|
+
if (value !== null) headers.set(name, value);
|
|
565
574
|
}
|
|
566
575
|
const override = (provider as { _codexAccountOverride?: { accessToken: string; chatgptAccountId: string } })._codexAccountOverride;
|
|
567
576
|
if (override) {
|
|
@@ -571,6 +580,8 @@ async function resolveAlternateCompactContext(args: {
|
|
|
571
580
|
if (provider.apiKey) headers.set("authorization", `Bearer ${resolveProviderApiKey(provider.apiKey)}`);
|
|
572
581
|
return { authCtx, provider, headers };
|
|
573
582
|
} catch (err) {
|
|
583
|
+
releaseCodexAuthContextProbeLease(authCtx);
|
|
584
|
+
if (err instanceof CodexInstallationIdUnavailableError) return { failure: formatErrorResponse(503, "server_busy", err.message) };
|
|
574
585
|
if (err instanceof CodexMainProfileDrainingError) {
|
|
575
586
|
// The native-main fence can start after account A has already rejected the
|
|
576
587
|
// request. Treat the now-fenced main profile as no alternate and preserve A's
|
|
@@ -603,7 +614,12 @@ function compactResponseHeaders(upstream: Response): Headers {
|
|
|
603
614
|
const headers = new Headers({ "Content-Type": upstream.headers.get("content-type") ?? "application/json" });
|
|
604
615
|
for (const name of COMPACT_PASSTHROUGH_HEADERS) {
|
|
605
616
|
const value = upstream.headers.get(name);
|
|
606
|
-
if (value
|
|
617
|
+
if (value === null) continue;
|
|
618
|
+
if (name === "retry-after") {
|
|
619
|
+
// Retry advice leaves as an integer this proxy formats, never the upstream bytes.
|
|
620
|
+
const advice = formatClientRetryAfter(value);
|
|
621
|
+
if (advice !== undefined) headers.set(name, advice);
|
|
622
|
+
} else headers.set(name, value);
|
|
607
623
|
}
|
|
608
624
|
return headers;
|
|
609
625
|
}
|
|
@@ -672,6 +688,8 @@ export async function handleResponsesCompact(
|
|
|
672
688
|
if (!body || typeof body !== "object" || Array.isArray(body)) {
|
|
673
689
|
return formatErrorResponse(400, "invalid_request_error", "Invalid compaction request body");
|
|
674
690
|
}
|
|
691
|
+
const clientModelLabel = options.clientModelLabel ?? clientFacingModelLabel(options.compactionRoutingOverride?.sourceModel ?? (body as { model?: unknown }).model);
|
|
692
|
+
options = { ...options, clientModelLabel };
|
|
675
693
|
// Compaction forwards client history upstream too; keep local artifact paths out of it.
|
|
676
694
|
redactHostedImageDisplayPaths(body);
|
|
677
695
|
if (!options.compactionRoutingOverride) {
|
|
@@ -725,14 +743,14 @@ export async function handleResponsesCompact(
|
|
|
725
743
|
// Routed xAI OAuth compaction must preview its Fast wire model here;
|
|
726
744
|
// native compact keeps checking the destination it dispatches directly.
|
|
727
745
|
const callerTier = (raw as Record<string, unknown>).service_tier;
|
|
728
|
-
assertRouteAllowedByScope(resolveAdmissionModelScope(config, admission),
|
|
746
|
+
assertRouteAllowedByScope(resolveAdmissionModelScope(config, admission), clientModelLabel, {
|
|
729
747
|
providerName: route.providerName,
|
|
730
748
|
modelId: previewXaiOauthWireModel({ options: {
|
|
731
749
|
serviceTier: compactFastRow ? "priority" : typeof callerTier === "string" ? callerTier : undefined,
|
|
732
750
|
} }, route, config, "responses"),
|
|
733
751
|
});
|
|
734
752
|
} catch (err) {
|
|
735
|
-
if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(err);
|
|
753
|
+
if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(err, logCtx));
|
|
736
754
|
if (err instanceof NoEligiblePolicyCandidateError) {
|
|
737
755
|
// Persist the evaluation trace (per-candidate exclusions + the
|
|
738
756
|
// no-eligible reason) so a failed compact policy request stays
|
|
@@ -907,7 +925,7 @@ export async function handleResponsesCompact(
|
|
|
907
925
|
compactProvider = applyCodexAuthContextToProvider(route.provider, authCtx, route.codexAccountMode);
|
|
908
926
|
for (const name of FORWARD_HEADERS) {
|
|
909
927
|
const value = selected.get(name);
|
|
910
|
-
if (value) headers.set(name, value);
|
|
928
|
+
if (value !== null) headers.set(name, value);
|
|
911
929
|
}
|
|
912
930
|
const override = (compactProvider as { _codexAccountOverride?: { accessToken: string; chatgptAccountId: string } })._codexAccountOverride;
|
|
913
931
|
if (override) {
|
|
@@ -978,6 +996,7 @@ export async function handleResponsesCompact(
|
|
|
978
996
|
if (refusal) return refusal;
|
|
979
997
|
applyAccountChangeConversationStateScrub({
|
|
980
998
|
body: raw,
|
|
999
|
+
headers,
|
|
981
1000
|
bindingKey: binding.bindingKey,
|
|
982
1001
|
servingAccountId: binding.accountId,
|
|
983
1002
|
logCtx,
|
|
@@ -996,7 +1015,11 @@ export async function handleResponsesCompact(
|
|
|
996
1015
|
&& compactProvider.supportsNativeCompactEndpoint === true
|
|
997
1016
|
? buildResponsesTransport({ ...compactProvider, apiKey: compactProvider.apiKey ? resolveProviderApiKey(compactProvider.apiKey) : undefined }, { headers: req.headers })
|
|
998
1017
|
: undefined;
|
|
999
|
-
if (gatewayTransport)
|
|
1018
|
+
if (gatewayTransport) {
|
|
1019
|
+
headers = new Headers(gatewayTransport.headers);
|
|
1020
|
+
const binding = conversationStateBindingFromAuth(authCtx, codexPoolAffinityKey(req.headers));
|
|
1021
|
+
if (binding) applyAccountChangeConversationStateScrub({ body: compactBody, headers, bindingKey: binding.bindingKey, servingAccountId: binding.accountId, logCtx });
|
|
1022
|
+
}
|
|
1000
1023
|
// Native v1 bypasses the adapter serializer. Bind the same replay provenance as ordinary
|
|
1001
1024
|
// turns, but leave canonical compact's established account-state handling unchanged.
|
|
1002
1025
|
const gatewayReplayParsed = gatewayTransport ? parseRequest(raw) : undefined;
|
|
@@ -1058,6 +1081,14 @@ export async function handleResponsesCompact(
|
|
|
1058
1081
|
compactHostAdmissionLease = null;
|
|
1059
1082
|
};
|
|
1060
1083
|
const connectMs = () => resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(compactUrl) });
|
|
1084
|
+
const applyCompactPoolQuotaHeaders = async (ctx: CodexAuthContext, response: Response) => {
|
|
1085
|
+
if (ctx.kind !== "pool" && ctx.kind !== "main-pool") return;
|
|
1086
|
+
const { applyAccountQuotaFromUpstreamHeaders } = await import("../../codex/quota");
|
|
1087
|
+
applyAccountQuotaFromUpstreamHeaders(ctx.accountId, response.headers, ctx.writerGeneration,
|
|
1088
|
+
ctx.kind === "main-pool" ? ctx.mainQuotaWriter : undefined,
|
|
1089
|
+
{ modelId: route.modelId, poolWriter: ctx.kind === "pool" ? ctx.poolQuotaWriter : undefined,
|
|
1090
|
+
poolResponse: ctx.kind === "pool" });
|
|
1091
|
+
};
|
|
1061
1092
|
// Takes its context explicitly: the alternate-account flow below records a rejection
|
|
1062
1093
|
// against A while promoting B, then records B's own outcome. A closure over a single
|
|
1063
1094
|
// `authCtx` cannot express either.
|
|
@@ -1071,8 +1102,12 @@ export async function handleResponsesCompact(
|
|
|
1071
1102
|
} = {},
|
|
1072
1103
|
) => {
|
|
1073
1104
|
// A gateway response is not evidence about any Codex account.
|
|
1074
|
-
if (gatewayTransport
|
|
1105
|
+
if (gatewayTransport) return;
|
|
1075
1106
|
if ((outcome === 401 || outcome === 403) && upstream && wasPermanentAccountRefusal(upstream)) return;
|
|
1107
|
+
if (!usesCodexForwardPoolAuth(ctx, route.provider)) {
|
|
1108
|
+
if (isKeyedRequestOwnedMain(ctx) && typeof outcome === "number" && (!upstream || !isNonReplayableResponse(upstream)) && isCanonicalOpenAiForwardProvider(route.provider)) releaseRequestOwnedMainOnOutcome(ctx, outcome, selectedModelId);
|
|
1109
|
+
return;
|
|
1110
|
+
}
|
|
1076
1111
|
recordCodexUpstreamOutcome(config, ctx.accountId, outcome, {
|
|
1077
1112
|
...meta,
|
|
1078
1113
|
...codexFailureWindowOutcomeMeta(ctx),
|
|
@@ -1110,7 +1145,7 @@ export async function handleResponsesCompact(
|
|
|
1110
1145
|
identityId: logCtx.accountLogLabel }));
|
|
1111
1146
|
let started = false;
|
|
1112
1147
|
try {
|
|
1113
|
-
if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(
|
|
1148
|
+
if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1114
1149
|
started = true;
|
|
1115
1150
|
return await (report.execute ? report.execute(doFetch) : doFetch());
|
|
1116
1151
|
} finally {
|
|
@@ -1122,11 +1157,11 @@ export async function handleResponsesCompact(
|
|
|
1122
1157
|
sendClass: "auth-recovery",
|
|
1123
1158
|
targetKey: compactTargetKey,
|
|
1124
1159
|
});
|
|
1125
|
-
if (!decision.allowed) return Promise.reject(new SendBudgetExhaustedError(
|
|
1160
|
+
if (!decision.allowed) return Promise.reject(new SendBudgetExhaustedError(errorDestinationLabel(compactUrl)));
|
|
1126
1161
|
const dispatch = () => {
|
|
1127
1162
|
if (!decision.permit.use()) {
|
|
1128
1163
|
decision.permit.release();
|
|
1129
|
-
throw new SendBudgetExhaustedError(
|
|
1164
|
+
throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1130
1165
|
}
|
|
1131
1166
|
return doFetch();
|
|
1132
1167
|
};
|
|
@@ -1140,7 +1175,9 @@ export async function handleResponsesCompact(
|
|
|
1140
1175
|
onPhysicalDispatch?: () => void,
|
|
1141
1176
|
): Promise<Response> => {
|
|
1142
1177
|
// A gateway send carries only its own transport headers, whatever recovery handed in.
|
|
1178
|
+
// An account-change scrub that removed the turn state from the send headers still applies.
|
|
1143
1179
|
let wireHeaders = gatewayTransport ? new Headers(gatewayTransport.headers) : sendHeaders;
|
|
1180
|
+
if (gatewayTransport && !sendHeaders.has("x-codex-turn-state")) wireHeaders.delete("x-codex-turn-state");
|
|
1144
1181
|
sendHeaders = wireHeaders;
|
|
1145
1182
|
const buildCompactSendBody = () => {
|
|
1146
1183
|
if (gatewayReplayParsed) bindRouteReasoningReplayScope({
|
|
@@ -1166,6 +1203,9 @@ export async function handleResponsesCompact(
|
|
|
1166
1203
|
if (!isOpenAiOperatedResponsesDestination(sendProvider) && sendProvider.preserveResponsesMessageMetadata !== true) {
|
|
1167
1204
|
replayBody = stripInternalChatMessageMetadataPassthrough(replayBody) as typeof replayBody;
|
|
1168
1205
|
}
|
|
1206
|
+
if (sendAuthCtx.kind === "pool" && isCanonicalOpenAiForwardProvider(sendProvider)) {
|
|
1207
|
+
replayBody = isolateCodexPoolClientMetadata(replayBody, sendAuthCtx.chatgptAccountId) as typeof replayBody;
|
|
1208
|
+
}
|
|
1169
1209
|
// A queued key selection can refresh the destination; project only for this send.
|
|
1170
1210
|
return isOpenAiOperatedResponsesDestination(sendProvider)
|
|
1171
1211
|
? repairUrlCitationAnnotations(replayBody) : stripCanonicalOnlyInputItems(stripCanonicalOnlyTopLevelFields(replayBody));
|
|
@@ -1222,7 +1262,7 @@ export async function handleResponsesCompact(
|
|
|
1222
1262
|
if (req.signal.aborted) throw req.signal.reason;
|
|
1223
1263
|
stampApiKeyAccountLabel(logCtx, route.providerName, sendProvider);
|
|
1224
1264
|
if (!rebindPhysicalSend(sendBudget, { poolId: logCtx.spendPoolId ?? route.providerName,
|
|
1225
|
-
identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(
|
|
1265
|
+
identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1226
1266
|
noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
|
|
1227
1267
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
1228
1268
|
distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), String(input),
|
|
@@ -1246,7 +1286,7 @@ export async function handleResponsesCompact(
|
|
|
1246
1286
|
? sendSingleCompactAttempt(doFetch)
|
|
1247
1287
|
: fetchWithTransientRetry(doFetch, {
|
|
1248
1288
|
abortSignal: req.signal,
|
|
1249
|
-
label: safeHostLabel(compactUrl),
|
|
1289
|
+
label: safeHostLabel(compactUrl), destination: errorDestinationLabel(compactUrl),
|
|
1250
1290
|
// Key-auth policy is a logical-request total; canonical forward keeps its default
|
|
1251
1291
|
// ladder. Both intersect the same shared base remainder as ordinary Responses.
|
|
1252
1292
|
attempts: sendBudget.remainingBaseSends(transientSendCapFor(
|
|
@@ -1366,6 +1406,8 @@ export async function handleResponsesCompact(
|
|
|
1366
1406
|
outcomeCtx = replay.authCtx;
|
|
1367
1407
|
compactProvider = replay.provider;
|
|
1368
1408
|
headers = replay.headers;
|
|
1409
|
+
const replayBinding = conversationStateBindingFromAuth(replay.authCtx, codexPoolAffinityKey(req.headers));
|
|
1410
|
+
if (replayBinding) applyAccountChangeConversationStateScrub({ body: compactBody, headers, bindingKey: replayBinding.bindingKey, servingAccountId: replayBinding.accountId, logCtx });
|
|
1369
1411
|
logCtx.accountLogLabel = codexAuthContextLogLabel(replay.authCtx, config);
|
|
1370
1412
|
try {
|
|
1371
1413
|
upstream = await sendCompactAttempt(compactProvider, headers, "single", authCtx);
|
|
@@ -1409,20 +1451,24 @@ export async function handleResponsesCompact(
|
|
|
1409
1451
|
recordCompactPoolOutcome(outcomeCtx, outcome);
|
|
1410
1452
|
return formatErrorResponse(502, "upstream_error", "Failed to connect to compact upstream");
|
|
1411
1453
|
};
|
|
1412
|
-
const scrubCompactStateForAlternate = (alternateAuthCtx: CodexAuthContext): void => {
|
|
1413
|
-
const
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
|
|
1417
|
-
|
|
1418
|
-
)
|
|
1454
|
+
const scrubCompactStateForAlternate = (alternateAuthCtx: CodexAuthContext, alternateHeaders: Headers): void => {
|
|
1455
|
+
const affinityKey = compactAlternateAffinityKey(authCtx, () => codexPoolAffinityKey(req.headers))
|
|
1456
|
+
?? codexPoolAffinityKey(req.headers);
|
|
1457
|
+
const priorAccountId = conversationStateAccountId(authCtx);
|
|
1458
|
+
// An unkeyed caller-owned main alternate has no binding of its own, but moving off the issuing
|
|
1459
|
+
// account still makes the carried state foreign. Scrub for this request only; nothing persists.
|
|
1460
|
+
const binding = conversationStateBindingFromAuth(alternateAuthCtx, affinityKey)
|
|
1461
|
+
?? (alternateAuthCtx.kind === "main" && priorAccountId && affinityKey
|
|
1462
|
+
? { bindingKey: affinityKey, accountId: priorAccountId === MAIN_CODEX_ACCOUNT_ID ? "__caller_main__" : MAIN_CODEX_ACCOUNT_ID }
|
|
1463
|
+
: null);
|
|
1419
1464
|
if (!binding) return;
|
|
1420
1465
|
for (const body of [raw, compactBody]) {
|
|
1421
1466
|
applyAccountChangeConversationStateScrub({
|
|
1422
1467
|
body,
|
|
1468
|
+
headers: alternateHeaders,
|
|
1423
1469
|
bindingKey: binding.bindingKey,
|
|
1424
1470
|
servingAccountId: binding.accountId,
|
|
1425
|
-
priorAccountId: authCtx
|
|
1471
|
+
priorAccountId: conversationStateAccountId(authCtx),
|
|
1426
1472
|
logCtx,
|
|
1427
1473
|
});
|
|
1428
1474
|
}
|
|
@@ -1469,6 +1515,12 @@ export async function handleResponsesCompact(
|
|
|
1469
1515
|
excludeAccountId: authCtx.accountId,
|
|
1470
1516
|
turnAdmissionLease,
|
|
1471
1517
|
});
|
|
1518
|
+
if (alternate && "failure" in alternate) {
|
|
1519
|
+
await applyCompactPoolQuotaHeaders(authCtx, upstream);
|
|
1520
|
+
recordCompactPoolOutcome(authCtx, upstream.status, { retryAfter: firstRetryAfter, resetAt: firstResetAt });
|
|
1521
|
+
await upstream.body?.cancel().catch(() => undefined);
|
|
1522
|
+
return alternate.failure;
|
|
1523
|
+
}
|
|
1472
1524
|
// Resolution can await a credential refresh, so the client may have gone away
|
|
1473
1525
|
// while we were choosing B. Re-check before spending anything: recording A,
|
|
1474
1526
|
// cancelling its body, and sending B are all observable side effects, and B's
|
|
@@ -1510,17 +1562,7 @@ export async function handleResponsesCompact(
|
|
|
1510
1562
|
// quota snapshot that produced it, so refresh A's cache before recording its
|
|
1511
1563
|
// rejection. Skipping this leaves quota-strategy routing and the dashboard
|
|
1512
1564
|
// reading numbers from before the account ran out.
|
|
1513
|
-
|
|
1514
|
-
const { applyAccountQuotaFromUpstreamHeaders } = await import("../../codex/auth-api");
|
|
1515
|
-
applyAccountQuotaFromUpstreamHeaders(
|
|
1516
|
-
authCtx.accountId,
|
|
1517
|
-
upstream.headers,
|
|
1518
|
-
authCtx.writerGeneration,
|
|
1519
|
-
authCtx.kind === "main-pool" ? authCtx.mainQuotaWriter : undefined,
|
|
1520
|
-
{ modelId: route.modelId, poolWriter: authCtx.kind === "pool" ? authCtx.poolQuotaWriter : undefined,
|
|
1521
|
-
poolResponse: authCtx.kind === "pool" },
|
|
1522
|
-
);
|
|
1523
|
-
}
|
|
1565
|
+
await applyCompactPoolQuotaHeaders(authCtx, upstream);
|
|
1524
1566
|
recordCompactPoolOutcome(authCtx, upstream.status, {
|
|
1525
1567
|
retryAfter: firstRetryAfter,
|
|
1526
1568
|
resetAt: firstResetAt,
|
|
@@ -1529,7 +1571,7 @@ export async function handleResponsesCompact(
|
|
|
1529
1571
|
await upstream.body?.cancel().catch(() => undefined);
|
|
1530
1572
|
outcomeCtx = alternate.authCtx;
|
|
1531
1573
|
logCtx.accountLogLabel = codexAuthContextLogLabel(alternate.authCtx, config);
|
|
1532
|
-
scrubCompactStateForAlternate(alternate.authCtx);
|
|
1574
|
+
scrubCompactStateForAlternate(alternate.authCtx, alternate.headers);
|
|
1533
1575
|
try {
|
|
1534
1576
|
upstream = await sendCompactAttempt(alternate.provider, alternate.headers, "single", alternate.authCtx);
|
|
1535
1577
|
} catch (err) {
|
|
@@ -1569,6 +1611,12 @@ export async function handleResponsesCompact(
|
|
|
1569
1611
|
excludeAccountId: authCtx.accountId,
|
|
1570
1612
|
turnAdmissionLease,
|
|
1571
1613
|
});
|
|
1614
|
+
if (alternate && "failure" in alternate) {
|
|
1615
|
+
await applyCompactPoolQuotaHeaders(authCtx, upstream);
|
|
1616
|
+
recordCompactPoolOutcome(authCtx, firstStatus, { retryAfter: firstRetryAfter, resetAt: firstResetAt });
|
|
1617
|
+
await upstream.body?.cancel().catch(() => undefined);
|
|
1618
|
+
return alternate.failure;
|
|
1619
|
+
}
|
|
1572
1620
|
if (alternate && req.signal.aborted) {
|
|
1573
1621
|
releaseCodexAuthContextProbeLease(alternate.authCtx);
|
|
1574
1622
|
recordCompactPoolOutcome(outcomeCtx, 499);
|
|
@@ -1580,7 +1628,7 @@ export async function handleResponsesCompact(
|
|
|
1580
1628
|
// B's identity before B's admission, so every budget and spend check runs against B. A's
|
|
1581
1629
|
// response stays intact until B is actually sent.
|
|
1582
1630
|
logCtx.accountLogLabel = codexAuthContextLogLabel(alternate.authCtx, config);
|
|
1583
|
-
scrubCompactStateForAlternate(alternate.authCtx);
|
|
1631
|
+
scrubCompactStateForAlternate(alternate.authCtx, alternate.headers);
|
|
1584
1632
|
const recordFirstMove = () => {
|
|
1585
1633
|
recordCompactPoolOutcome(authCtx, firstStatus, { retryAfter: firstRetryAfter, resetAt: firstResetAt });
|
|
1586
1634
|
void upstream.body?.cancel().catch(() => undefined);
|
|
@@ -1728,7 +1776,7 @@ export async function handleResponsesCompact(
|
|
|
1728
1776
|
const internalHeaders = new Headers({ "content-type": "application/json" });
|
|
1729
1777
|
for (const name of FORWARD_HEADERS) {
|
|
1730
1778
|
const value = req.headers.get(name);
|
|
1731
|
-
if (value) internalHeaders.set(name, value);
|
|
1779
|
+
if (value || (value !== null && (name === "x-codex-installation-id" || name === "x-codex-turn-metadata"))) internalHeaders.set(name, value);
|
|
1732
1780
|
}
|
|
1733
1781
|
copyResponsesClientMetadata(internalHeaders, req.headers, route.provider);
|
|
1734
1782
|
const internalReq = new Request("http://localhost/v1/responses", {
|
|
@@ -1742,7 +1790,7 @@ export async function handleResponsesCompact(
|
|
|
1742
1790
|
// fallback spend four more.
|
|
1743
1791
|
// internalReq keeps only FORWARD_HEADERS, so the caller principal is resolved from req.
|
|
1744
1792
|
const replayPrincipal = { clientPrincipalId: resolveContextPrincipal(req, config, admission) };
|
|
1745
|
-
const response = await handleResponses(internalReq, config, logCtx, { abortSignal: req.signal, turnAdmissionLease, sendBudget, compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride, advisorAdmissionPolicy: options.advisorAdmissionPolicy, replayPrincipal, ...(admission ? { admission } : {}) });
|
|
1793
|
+
const response = await handleResponses(internalReq, config, logCtx, { clientModelLabel: options.clientModelLabel, abortSignal: req.signal, turnAdmissionLease, sendBudget, compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride, advisorAdmissionPolicy: options.advisorAdmissionPolicy, replayPrincipal, ...(admission ? { admission } : {}) });
|
|
1746
1794
|
if (req.signal.aborted) {
|
|
1747
1795
|
void response.body?.cancel(req.signal.reason).catch(() => undefined);
|
|
1748
1796
|
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { clientFacingModelText } from "../../lib/error-destination";
|
|
1
2
|
import type { AdapterEvent, OcxConfig } from "../../types";
|
|
2
3
|
import { carryResponseToolOwnership } from "./response-tool-ownership";
|
|
3
4
|
import { routeConcreteModel, type RouteResult } from "../../router";
|
|
@@ -160,7 +161,8 @@ export async function runWithCompactionRecovery(
|
|
|
160
161
|
let target: RouteResult;
|
|
161
162
|
try { target = routeConcreteModel(config, recovery.model); } catch { return keep(response); }
|
|
162
163
|
if (!routed(target, kind) || identity(sourceRoute) === identity(target)) return keep(response);
|
|
163
|
-
const originalModel = firstOptions.
|
|
164
|
+
const originalModel = firstOptions.clientModelLabel ? clientFacingModelText(firstOptions.clientModelLabel)
|
|
165
|
+
: firstOptions.compactionRoutingOverride?.sourceModel ?? String(snapshot.model);
|
|
164
166
|
// Use the established protocol commit boundary. For runTurn streams the direct event
|
|
165
167
|
// observer additionally preserves side-effect heartbeats that the bridge does not publish.
|
|
166
168
|
if (response.ok && hasResponseMediaType(response.headers, "text/event-stream")) {
|
|
@@ -268,7 +270,7 @@ export async function runWithCompactionRecovery(
|
|
|
268
270
|
options.accountLoad.lease = null;
|
|
269
271
|
}
|
|
270
272
|
fallback = await dispatch(child, config, logCtx, {
|
|
271
|
-
...options, compactionRecoveryAttempted: true, compactionRecoveryPermit: recoveryPermit,
|
|
273
|
+
...options, clientModelLabel: firstOptions.clientModelLabel, compactionRecoveryAttempted: true, compactionRecoveryPermit: recoveryPermit,
|
|
272
274
|
compactionRoutingOverride: { sourceModel: originalModel },
|
|
273
275
|
onRequestBodyRead: undefined, onRequestBodyParsed: undefined,
|
|
274
276
|
onCompactionRecoveryRoute: undefined, onCompactionRecoveryAdapterEvent: undefined,
|
|
@@ -7,6 +7,7 @@ import { resolvePolicyProfileId } from "../../routing/profile";
|
|
|
7
7
|
import { parseSyntheticRowId } from "../fast-row";
|
|
8
8
|
import { recallComboForLane } from "./combo-session-recall";
|
|
9
9
|
import { sessionLaneIdFromRequest } from "../request-log-conversation";
|
|
10
|
+
import { isLocalCompactionCheckpoint } from "../../responses/compaction-history-framing";
|
|
10
11
|
|
|
11
12
|
/** `sourceModel` is the conversation's own selector before the rewrite. */
|
|
12
13
|
export interface CompactionRoutingOverride {
|
|
@@ -38,7 +39,7 @@ function configuredTriggers(value: unknown): readonly string[] | null {
|
|
|
38
39
|
}
|
|
39
40
|
|
|
40
41
|
export interface CompactionRoutingOverrideOptions {
|
|
41
|
-
/**
|
|
42
|
+
/** Responses accepts remote triggers or opted-in local checkpoints; compact carries neither. */
|
|
42
43
|
endpoint?: "responses" | "compact";
|
|
43
44
|
transport?: "websocket";
|
|
44
45
|
}
|
|
@@ -66,8 +67,10 @@ export function applyCompactionRoutingOverride(
|
|
|
66
67
|
? source.startsWith(selector.slice(0, -1)) && source.length > selector.length - 1
|
|
67
68
|
: source === selector)) return null;
|
|
68
69
|
}
|
|
69
|
-
|
|
70
|
-
|
|
70
|
+
const remoteTrigger = Array.isArray(raw.input) && raw.input.some(item => record(item)?.type === "compaction_trigger");
|
|
71
|
+
const localCheckpoint = options.endpoint !== "compact" && !remoteTrigger
|
|
72
|
+
&& config.codexClientCompaction === true && isLocalCompactionCheckpoint(raw.input);
|
|
73
|
+
if (options.endpoint !== "compact" && !remoteTrigger && !localCheckpoint) return null;
|
|
71
74
|
|
|
72
75
|
const metadata: unknown[] = [];
|
|
73
76
|
const header = headers.get("x-codex-turn-metadata");
|
|
@@ -81,7 +84,9 @@ export function applyCompactionRoutingOverride(
|
|
|
81
84
|
try {
|
|
82
85
|
const parsed = record(JSON.parse(value));
|
|
83
86
|
if (parsed?.request_kind !== "compaction") return null;
|
|
84
|
-
const
|
|
87
|
+
const compaction = record(parsed.compaction);
|
|
88
|
+
if (localCheckpoint && compaction?.implementation !== "responses") return null;
|
|
89
|
+
const carried = compaction?.trigger;
|
|
85
90
|
if (typeof carried !== "string" || !triggers.includes(carried)) return null;
|
|
86
91
|
// Copies that name different triggers are not agreement, and picking either one would
|
|
87
92
|
// let a caller widen an override by disagreeing with itself.
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { markProxyError } from "../../lib/client-error-body";
|
|
2
|
+
import { applyClaudeBridgePoolSession } from "../claude-bridge-pool-session";
|
|
1
3
|
import type { OcxProviderConfig, OcxConfig } from "../../types";
|
|
2
4
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
3
5
|
import type { CodexAuthContext } from "../../codex/auth-context";
|
|
@@ -111,7 +113,7 @@ function validatedCallerDirectHeaders(
|
|
|
111
113
|
return captureCallerDirectAuth(headers, config) ? headers : undefined;
|
|
112
114
|
}
|
|
113
115
|
|
|
114
|
-
|
|
116
|
+
function codexRouteCredentialDomainHeadersFor(
|
|
115
117
|
req: Request,
|
|
116
118
|
route: RouteResult,
|
|
117
119
|
options: HandleResponsesOptions,
|
|
@@ -156,6 +158,20 @@ export function codexRouteCredentialDomainHeaders(
|
|
|
156
158
|
}
|
|
157
159
|
|
|
158
160
|
|
|
161
|
+
/**
|
|
162
|
+
* Credential-domain headers for Codex account SELECTION (previews, recovery, final resolution).
|
|
163
|
+
* A Claude bridge pool identity is completed here only; upstream headers are always materialized
|
|
164
|
+
* from the uncompleted form, so the synthesized pair never reaches the wire.
|
|
165
|
+
*/
|
|
166
|
+
export function codexRouteCredentialDomainHeaders(
|
|
167
|
+
req: Request, route: RouteResult, options: HandleResponsesOptions,
|
|
168
|
+
credentialDomainWasRewritten: boolean, config: OcxConfig,
|
|
169
|
+
): Headers {
|
|
170
|
+
return applyClaudeBridgePoolSession(
|
|
171
|
+
codexRouteCredentialDomainHeadersFor(req, route, options, credentialDomainWasRewritten, config), route, options,
|
|
172
|
+
);
|
|
173
|
+
}
|
|
174
|
+
|
|
159
175
|
/**
|
|
160
176
|
* Does this route substitute OUR stored main credential, and does the caller own the credential
|
|
161
177
|
* this request will authenticate with?
|
|
@@ -208,9 +224,9 @@ export async function resolveResponsesCodexAuth(
|
|
|
208
224
|
let authCtx: CodexAuthContext | undefined;
|
|
209
225
|
// Ingress already refuses assertion_only; a later internal hop must not reach a pool or
|
|
210
226
|
// routed credential with it either, because that would be a silent credential swap.
|
|
211
|
-
if (hasAgentAssertionAuthorization(req.headers)) return { ok: false, response: agentAssertionUnsupportedResponse() };
|
|
227
|
+
if (hasAgentAssertionAuthorization(req.headers)) return { ok: false, response: markProxyError(agentAssertionUnsupportedResponse()) };
|
|
212
228
|
try {
|
|
213
|
-
let authInputHeaders =
|
|
229
|
+
let authInputHeaders = codexRouteCredentialDomainHeadersFor(
|
|
214
230
|
req,
|
|
215
231
|
route,
|
|
216
232
|
options,
|
|
@@ -270,7 +286,9 @@ export async function resolveResponsesCodexAuth(
|
|
|
270
286
|
validateForwardAdmissionCredential(authInputHeaders, config);
|
|
271
287
|
}
|
|
272
288
|
if (route.codexAccountMode) {
|
|
273
|
-
|
|
289
|
+
// Only selection sees the Claude bridge pool identity; materialization below keeps the
|
|
290
|
+
// uncompleted headers, so the wire matches the original request.
|
|
291
|
+
authCtx = await resolveCodexAuthContext(applyClaudeBridgePoolSession(authInputHeaders, route, options), config, route.codexAccountMode, {
|
|
274
292
|
admission: options.admission,
|
|
275
293
|
codexAuthPolicy: options.codexAuthPolicy,
|
|
276
294
|
accountId: route.codexAccountId,
|
|
@@ -323,7 +341,7 @@ export async function resolveResponsesCodexAuth(
|
|
|
323
341
|
releaseCodexAuthContextProbeLease(authCtx);
|
|
324
342
|
return {
|
|
325
343
|
ok: false,
|
|
326
|
-
response: formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication"),
|
|
344
|
+
response: markProxyError(formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication")),
|
|
327
345
|
};
|
|
328
346
|
}
|
|
329
347
|
if (stripAuthorization) {
|
|
@@ -371,9 +389,9 @@ export async function resolveResponsesCodexAuth(
|
|
|
371
389
|
console.error(`[codex-auth] Pool account ${safeAccountLabel} token failed; reauthentication required`);
|
|
372
390
|
}
|
|
373
391
|
if (err instanceof ForwardAdmissionCredentialError) {
|
|
374
|
-
return { ok: false, response: formatErrorResponse(401, "authentication_error", err.message) };
|
|
392
|
+
return { ok: false, response: markProxyError(formatErrorResponse(401, "authentication_error", err.message)) };
|
|
375
393
|
}
|
|
376
|
-
if (err instanceof AgentAssertionUnsupportedError) return { ok: false, response: agentAssertionUnsupportedResponse() };
|
|
394
|
+
if (err instanceof AgentAssertionUnsupportedError) return { ok: false, response: markProxyError(agentAssertionUnsupportedResponse()) };
|
|
377
395
|
const response = mapCodexAuthContextErrorToResponse(err, {
|
|
378
396
|
accountSelector: route.codexAccountNamespace,
|
|
379
397
|
now: Date.now(),
|
|
@@ -438,15 +456,15 @@ export function poolCredentialRefreshIncompleteResponse(args: {
|
|
|
438
456
|
if (args.logCtx) markLocalRequestLogRefusal(args.logCtx, CODEX_POOL_REFRESH_INCOMPLETE_LOG_REASON);
|
|
439
457
|
const label = args.accountSelector ?? codexAuthContextLogLabel(args.authCtx, args.config);
|
|
440
458
|
const account = label ? `Codex pool account ${label}` : "the selected Codex pool account";
|
|
441
|
-
const response = formatErrorResponse(
|
|
459
|
+
const response = markProxyError(formatErrorResponse(
|
|
442
460
|
503,
|
|
443
461
|
"server_busy",
|
|
444
462
|
`Codex credential refresh did not complete for ${account}; retry this request. `
|
|
445
463
|
+ "If it keeps failing, sign in to that account again.",
|
|
446
|
-
);
|
|
464
|
+
));
|
|
447
465
|
const headers = new Headers(response.headers);
|
|
448
466
|
headers.set("Retry-After", "1");
|
|
449
|
-
return new Response(response.body, { status: response.status, headers });
|
|
467
|
+
return markProxyError(new Response(response.body, { status: response.status, headers }));
|
|
450
468
|
}
|
|
451
469
|
|
|
452
470
|
|
|
@@ -484,7 +502,7 @@ export async function refreshPoolForwardAuth(args: {
|
|
|
484
502
|
ok: false,
|
|
485
503
|
quarantine: true,
|
|
486
504
|
quarantineGeneration: refreshed.generation,
|
|
487
|
-
response: formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication"),
|
|
505
|
+
response: markProxyError(formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication")),
|
|
488
506
|
};
|
|
489
507
|
}
|
|
490
508
|
// Only a CAS this request performed itself proves the new credential descends from
|
|
@@ -522,7 +540,7 @@ export async function refreshPoolForwardAuth(args: {
|
|
|
522
540
|
return {
|
|
523
541
|
ok: false,
|
|
524
542
|
quarantine: true,
|
|
525
|
-
response: formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication"),
|
|
543
|
+
response: markProxyError(formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication")),
|
|
526
544
|
};
|
|
527
545
|
}
|
|
528
546
|
if (options.abortSignal?.aborted || req.signal.aborted) {
|
|
@@ -564,7 +582,7 @@ export async function refreshNativeMainForwardAuth(args: {
|
|
|
564
582
|
> {
|
|
565
583
|
const { req, config, route, authCtx, substituteMainCredential, options } = args;
|
|
566
584
|
if (authCtx.kind !== "main-pool") {
|
|
567
|
-
return { ok: false, response: formatErrorResponse(401, "authentication_error", "No native main credential to refresh") };
|
|
585
|
+
return { ok: false, response: markProxyError(formatErrorResponse(401, "authentication_error", "No native main credential to refresh")) };
|
|
568
586
|
}
|
|
569
587
|
try {
|
|
570
588
|
const refreshed = await forceRefreshMainAccountToken(authCtx.accessToken, {
|
|
@@ -572,7 +590,7 @@ export async function refreshNativeMainForwardAuth(args: {
|
|
|
572
590
|
...(options.nativeMainRefreshDependencies ?? {}),
|
|
573
591
|
});
|
|
574
592
|
if (!refreshed) {
|
|
575
|
-
return { ok: false, response: formatErrorResponse(401, "authentication_error", "Codex main account needs reauthentication") };
|
|
593
|
+
return { ok: false, response: markProxyError(formatErrorResponse(401, "authentication_error", "Codex main account needs reauthentication")) };
|
|
576
594
|
}
|
|
577
595
|
const refreshedAuthCtx: CodexAuthContext = {
|
|
578
596
|
...authCtx,
|