Skip to content

Commit dcb7261

Browse files
fix(claude): keep claude update advice when the session is also below the required version
AI-assisted; verified with the tests and tools listed above.
1 parent 0b40d64 commit dcb7261

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6597,9 +6597,9 @@ describe("ClaudeAdapterV2 background wake turns", () => {
65976597
},
65986598
{ name: "a model version error without a custom endpoint", installed: "2.1.322" },
65996599
{
6600-
name: "a model version error from an outdated Claude Code",
6600+
name: "a model version error from a Claude Code still below the required version",
66016601
baseUrl: "https://gateway.example.test/v1",
6602-
installed: "2.1.280",
6602+
installed: "2.1.285",
66036603
},
66046604
].map((row) => {
66056605
const result =

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4110,18 +4110,20 @@ function gatewayCooldownResetAt(
41104110
}
41114111

41124112
const CLAUDE_UNSUPPORTED_VERSION_ERROR =
4113-
/^API Error: 400 Claude Code (\d+\.\d+\.\d+) does not support this model; version \d+\.\d+\.\d+ or newer is required\./;
4113+
/^API Error: 400 Claude Code (\d+\.\d+\.\d+) does not support this model; version (\d+\.\d+\.\d+) or newer is required\./;
41144114

4115-
/** The version a gateway sent in place of the session's own, when a model error names an older one. */
4115+
/** The version a gateway sent in place of the session's own, when the session itself meets the requirement. */
41164116
function claudeRewrittenVersion(
41174117
message: SDKResultMessage,
41184118
sessionVersion: string | undefined,
41194119
): string | undefined {
41204120
if (message.subtype !== "success" || message.terminal_reason !== "api_error") return undefined;
4121-
const reported = CLAUDE_UNSUPPORTED_VERSION_ERROR.exec(message.result.trim())?.[1];
4122-
return reported !== undefined &&
4123-
sessionVersion !== undefined &&
4124-
compareSemverVersions(reported, sessionVersion) < 0
4121+
const [, reported, required] = CLAUDE_UNSUPPORTED_VERSION_ERROR.exec(message.result.trim()) ?? [];
4122+
if (reported === undefined || required === undefined || sessionVersion === undefined) {
4123+
return undefined;
4124+
}
4125+
return compareSemverVersions(reported, sessionVersion) < 0 &&
4126+
compareSemverVersions(sessionVersion, required) >= 0
41254127
? reported
41264128
: undefined;
41274129
}

0 commit comments

Comments
 (0)