Skip to content

revert(subagents): drop the synthesized native chain for encrypted spawns (#3239, #3240) #3242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidge-jun merged 2 commits into from
Sep 2, 2026
Merged

revert(subagents): drop the synthesized native chain for encrypted spawns (#3239, #3240) #3242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79592fc
Revert "fix(subagents): let encrypted-task recovery run before the sy…
Sep 2, 2026
39a71cc
Revert "fix(subagents): auto-fallback encrypted V2 spawns to native C…
Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions src/codex/subagent-model-fallback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
import { existsSync, readdirSync, readFileSync } from "node:fs";
import { join } from "node:path";
import { DEFAULT_SUBAGENT_MODELS, hasOwnProvider } from "../config";
import { hasOwnProvider } from "../config";
import { isRateLimitOrQuotaFailureMessage } from "../lib/errors";
import type { OcxParsedRequest, OcxConfig } from "../types";
import { slugsEquivalent } from "../providers/slug-codec";
Expand Down Expand Up @@ -609,22 +609,9 @@ export function applySubagentModelFallback(
resolvedFallbackChain?: readonly string[] | null,
): { from?: string; to?: string; skipped?: string[] } | null {
if (!isThreadSpawnRequest(headers)) return null;
const configuredFallbackChain = resolvedFallbackChain === undefined
const fallbackChain = resolvedFallbackChain === undefined
? resolveSubagentFallbackChain(parsed, config)
: resolvedFallbackChain;
// Native-only encrypted V2 tasks need a readable ChatGPT backend even when the
// operator configured no fallback chain. Keep ordinary routed spawns unchanged.
//
// Not when encrypted-task recovery is enabled: that operator chose to decrypt the
// assignment and stay on the routed model. The synthesized chain would reroute the
// spawn to native in this first pass, before recovery runs, and recovery's own
// caller-auth / proxy-secret / token-validity gates would never execute
// (tests/agent-task-recovery-security.test.ts went 13/13 -> 2/13 when #3239 landed
// without this guard). A configured chain keeps its existing precedence.
const fallbackChain = configuredFallbackChain === null && nativeFallbackOnly
&& config.agentTaskRecovery?.enabled !== true
? normalizedChain(parsed.modelId, config, [], DEFAULT_SUBAGENT_MODELS)
: configuredFallbackChain;
if (!fallbackChain) return null;
const selection = selectAvailableSubagentModel(
parsed.modelId,
Expand Down
50 changes: 0 additions & 50 deletions tests/subagent-model-fallback.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,56 +1056,6 @@ describe("subagent model fallback chain", () => {
expect((parsed._rawBody as { model?: string }).model).toBe("alibaba-token-plan/qwen3.8-max");
});

test("encrypted routed spawn gets an automatic native fallback when none is configured", () => {
const config = cfg({
subagentModelFallback: undefined,
defaultProvider: "xai",
});
const parsed = {
modelId: "xai/grok-4.5",
options: {},
context: { messages: [] },
_rawBody: { model: "xai/grok-4.5" },
};
const result = applySubagentModelFallback(
parsed as never,
new Headers({ "x-openai-subagent": "collab_spawn" }),
config,
"pool-a",
Date.now(),
true,
);
expect(result?.to).toBe("gpt-5.5");
expect(parsed.modelId).toBe("gpt-5.5");
});

test("the synthesized native chain yields to enabled encrypted-task recovery", () => {
// With recovery on, the first fallback pass must leave the routed spawn alone so
// recoverEncryptedAgentTask runs (and its security gates fire); rerouting here
// would bypass them.
const config = cfg({
subagentModelFallback: undefined,
defaultProvider: "xai",
agentTaskRecovery: { enabled: true },
});
const parsed = {
modelId: "xai/grok-4.5",
options: {},
context: { messages: [] },
_rawBody: { model: "xai/grok-4.5" },
};
const result = applySubagentModelFallback(
parsed as never,
new Headers({ "x-openai-subagent": "collab_spawn" }),
config,
"pool-a",
Date.now(),
true,
);
expect(result).toBeNull();
expect(parsed.modelId).toBe("xai/grok-4.5");
});

test("applySubagentModelFallback is a no-op for main turns", () => {
updateAccountQuota("pool-a", 95);
const parsed = {
Expand Down
Loading