diff --git a/src/app/[locale]/settings/config/page.tsx b/src/app/[locale]/settings/config/page.tsx
index 72cc51a6d..059d8f476 100644
--- a/src/app/[locale]/settings/config/page.tsx
+++ b/src/app/[locale]/settings/config/page.tsx
@@ -63,6 +63,7 @@ async function SettingsConfigContent({ locale }: { locale: string }) {
enableThinkingBudgetRectifier: settings.enableThinkingBudgetRectifier,
enableThinkingEffortConflictRectifier: settings.enableThinkingEffortConflictRectifier,
enableBillingHeaderRectifier: settings.enableBillingHeaderRectifier,
+ enableSystemMessageRectifier: settings.enableSystemMessageRectifier,
enableResponseInputRectifier: settings.enableResponseInputRectifier,
allowNonConversationEndpointProviderFallback:
settings.allowNonConversationEndpointProviderFallback,
diff --git a/src/app/api/admin/system-config/route.ts b/src/app/api/admin/system-config/route.ts
index 93cc54a68..9611b76eb 100644
--- a/src/app/api/admin/system-config/route.ts
+++ b/src/app/api/admin/system-config/route.ts
@@ -77,6 +77,7 @@ export async function POST(req: Request) {
enableThinkingSignatureRectifier: validated.enableThinkingSignatureRectifier,
enableThinkingBudgetRectifier: validated.enableThinkingBudgetRectifier,
enableBillingHeaderRectifier: validated.enableBillingHeaderRectifier,
+ enableSystemMessageRectifier: validated.enableSystemMessageRectifier,
enableResponseInputRectifier: validated.enableResponseInputRectifier,
enableCodexSessionIdCompletion: validated.enableCodexSessionIdCompletion,
enableClaudeMetadataUserIdInjection: validated.enableClaudeMetadataUserIdInjection,
diff --git a/src/app/v1/_lib/proxy/forwarder.ts b/src/app/v1/_lib/proxy/forwarder.ts
index 523f63a0f..35c08763b 100644
--- a/src/app/v1/_lib/proxy/forwarder.ts
+++ b/src/app/v1/_lib/proxy/forwarder.ts
@@ -92,6 +92,7 @@ import { ProxyProviderResolver } from "./provider-selector";
import { finalizeHedgeLoserBilling } from "./response-handler";
import type { ProxySession } from "./session";
import { setDeferredStreamingFinalization } from "./stream-finalization";
+import { rectifySystemMessages } from "./system-message-rectifier";
import {
detectThinkingBudgetRectifierTrigger,
rectifyThinkingBudget,
@@ -2523,10 +2524,40 @@ export class ProxyForwarder {
// Anthropic 供应商级参数覆写（默认 inherit=遵循客户端）
// 说明：允许管理员在供应商层面强制覆写 max_tokens 和 thinking.budget_tokens
if (provider.providerType === "claude" || provider.providerType === "claude-auth") {
+ const rectifierSettings = await getCachedSystemSettings();
+
+ // System message rectifier: move role:"system" entries from messages array
+ // into the top-level system field (Claude Code 2.1.172+ with custom model names).
+ // Must run before the billing header rectifier so any billing-header text block
+ // carried inside a role:"system" message lands in `system` before stripping.
+ {
+ const systemMessageRectifierEnabled =
+ rectifierSettings.enableSystemMessageRectifier ?? true;
+ if (systemMessageRectifierEnabled) {
+ const systemMessageResult = rectifySystemMessages(
+ session.request.message as Record
+ );
+ if (systemMessageResult.applied) {
+ session.addSpecialSetting({
+ type: "system_message_rectifier",
+ scope: "request",
+ hit: true,
+ movedCount: systemMessageResult.movedCount,
+ extractedValues: systemMessageResult.extractedValues,
+ });
+ logger.info("ProxyForwarder: System message rectifier applied", {
+ providerId: provider.id,
+ providerName: provider.name,
+ movedCount: systemMessageResult.movedCount,
+ });
+ await persistSpecialSettings(session);
+ }
+ }
+ }
+
// Billing header rectifier: proactively strip x-anthropic-billing-header from system prompt
{
- const settings = await getCachedSystemSettings();
- const billingRectifierEnabled = settings.enableBillingHeaderRectifier ?? true;
+ const billingRectifierEnabled = rectifierSettings.enableBillingHeaderRectifier ?? true;
if (billingRectifierEnabled) {
const billingResult = rectifyBillingHeader(
session.request.message as Record
diff --git a/src/app/v1/_lib/proxy/system-message-rectifier.ts b/src/app/v1/_lib/proxy/system-message-rectifier.ts
new file mode 100644
index 000000000..5876a2bcf
--- /dev/null
+++ b/src/app/v1/_lib/proxy/system-message-rectifier.ts
@@ -0,0 +1,119 @@
+/**
+ * System Message Rectifier - Proactive (pre-send) rectifier for Claude Code client
+ * `role: "system"` message injection.
+ *
+ * Problem: Claude Code client v2.1.172+ (behavior introduced after v2.1.153) injects
+ * the skills list as a standalone `{"role": "system", "content": "..."}` entry in the
+ * `messages` array when the configured model name is not a built-in official Claude
+ * model ID. The official Anthropic API accepts this, but strict Anthropic-compatible
+ * upstreams (Vertex / Bedrock style conversion layers) only allow `user` / `assistant`
+ * roles in `messages` and reject the request with a 400 error.
+ *
+ * Solution: Before forwarding, extract `role: "system"` entries from `messages` and
+ * merge their text content into the top-level `system` field (appending as
+ * `{type: "text", text}` blocks). This matches how the official API interprets such
+ * messages, so permissive upstreams see no behavior change while strict upstreams no
+ * longer reject the request.
+ */
+
+export type SystemMessageRectifierResult = {
+ applied: boolean;
+ movedCount: number;
+ extractedValues: string[];
+};
+
+function createNoopResult(): SystemMessageRectifierResult {
+ return {
+ applied: false,
+ movedCount: 0,
+ extractedValues: [],
+ };
+}
+
+type TextBlock = { type: "text"; text: string; [key: string]: unknown };
+
+function isTextBlock(block: unknown): block is TextBlock {
+ return (
+ typeof block === "object" &&
+ block !== null &&
+ (block as Record).type === "text" &&
+ typeof (block as Record).text === "string"
+ );
+}
+
+/**
+ * Convert the content of a `role: "system"` message into text blocks suitable for
+ * the top-level `system` array. String content becomes a single text block; array
+ * content keeps its text blocks as-is (preserving extra fields like cache_control)
+ * and drops non-text blocks, which are not valid in a system prompt anyway.
+ */
+function contentToTextBlocks(content: unknown): TextBlock[] {
+ if (typeof content === "string") {
+ return content.length > 0 ? [{ type: "text", text: content }] : [];
+ }
+ if (Array.isArray(content)) {
+ return content.filter(isTextBlock);
+ }
+ return [];
+}
+
+/**
+ * Move `role: "system"` entries out of the `messages` array and append their text
+ * content to the top-level `system` field. Mutates the message object in place
+ * (matches existing rectifier conventions).
+ */
+export function rectifySystemMessages(
+ message: Record
+): SystemMessageRectifierResult {
+ const messages = message.messages;
+ if (!Array.isArray(messages)) {
+ return createNoopResult();
+ }
+
+ const extractedBlocks: TextBlock[] = [];
+ const extractedValues: string[] = [];
+ const remaining: unknown[] = [];
+ let movedCount = 0;
+
+ for (const entry of messages) {
+ if (
+ entry &&
+ typeof entry === "object" &&
+ (entry as Record).role === "system"
+ ) {
+ movedCount++;
+ const blocks = contentToTextBlocks((entry as Record).content);
+ extractedBlocks.push(...blocks);
+ extractedValues.push(...blocks.map((block) => block.text));
+ } else {
+ remaining.push(entry);
+ }
+ }
+
+ if (movedCount === 0) {
+ return createNoopResult();
+ }
+
+ // Mutate in place: replace messages array contents
+ messages.length = 0;
+ for (const entry of remaining) {
+ messages.push(entry);
+ }
+
+ if (extractedBlocks.length > 0) {
+ const system = message.system;
+ if (system === undefined || system === null) {
+ message.system = extractedBlocks;
+ } else if (typeof system === "string") {
+ const head: TextBlock[] = system.length > 0 ? [{ type: "text", text: system }] : [];
+ message.system = [...head, ...extractedBlocks];
+ } else if (Array.isArray(system)) {
+ system.push(...extractedBlocks);
+ } else {
+ // Unknown system type: replace with extracted blocks to avoid dropping content
+ message.system = extractedBlocks;
+ }
+ }
+
+ return { applied: true, movedCount, extractedValues };
+}
diff --git a/src/drizzle/schema.ts b/src/drizzle/schema.ts
index ff1a76a2a..431564c80 100644
--- a/src/drizzle/schema.ts
+++ b/src/drizzle/schema.ts
@@ -817,6 +817,13 @@ export const systemSettings = pgTable('system_settings', {
.notNull()
.default(true),
+ // system message 整流器（默认开启）
+ // 开启后：将 messages 数组中的 role:"system" 消息合并到顶层 system 字段，
+ // 避免严格校验的 Anthropic 兼容上游（Vertex/Bedrock 类）返回 400
+ enableSystemMessageRectifier: boolean('enable_system_message_rectifier')
+ .notNull()
+ .default(true),
+
// Response API input 整流器（默认开启）
// 开启后：当 /v1/responses 端点收到非数组 input 时，自动规范化为数组格式
enableResponseInputRectifier: boolean('enable_response_input_rectifier')
diff --git a/src/lib/api-client/v1/openapi-types.gen.ts b/src/lib/api-client/v1/openapi-types.gen.ts
index dcb27e819..b920c90c3 100644
--- a/src/lib/api-client/v1/openapi-types.gen.ts
+++ b/src/lib/api-client/v1/openapi-types.gen.ts
@@ -11679,6 +11679,8 @@ export interface operations {
enableThinkingEffortConflictRectifier: boolean;
/** @description Whether billing-header rectifier is enabled. */
enableBillingHeaderRectifier: boolean;
+ /** @description Whether system message rectifier is enabled. */
+ enableSystemMessageRectifier: boolean;
/** @description Whether Responses API input rectifier is enabled. */
enableResponseInputRectifier: boolean;
/** @description Whether non-conversation endpoints may fall back across providers. */
@@ -11939,6 +11941,8 @@ export interface operations {
enableThinkingEffortConflictRectifier?: boolean;
/** @description Whether billing-header rectifier is enabled. */
enableBillingHeaderRectifier?: boolean;
+ /** @description Whether system message rectifier is enabled. */
+ enableSystemMessageRectifier?: boolean;
/** @description Whether Responses API input rectifier is enabled. */
enableResponseInputRectifier?: boolean;
/** @description Whether non-conversation endpoints may fall back across providers. */
@@ -12072,6 +12076,8 @@ export interface operations {
enableThinkingEffortConflictRectifier: boolean;
/** @description Whether billing-header rectifier is enabled. */
enableBillingHeaderRectifier: boolean;
+ /** @description Whether system message rectifier is enabled. */
+ enableSystemMessageRectifier: boolean;
/** @description Whether Responses API input rectifier is enabled. */
enableResponseInputRectifier: boolean;
/** @description Whether non-conversation endpoints may fall back across providers. */
diff --git a/src/lib/api/v1/schemas/system-config.ts b/src/lib/api/v1/schemas/system-config.ts
index 944699f0c..9e24484dc 100644
--- a/src/lib/api/v1/schemas/system-config.ts
+++ b/src/lib/api/v1/schemas/system-config.ts
@@ -132,6 +132,9 @@ export const SystemSettingsSchema = z
enableBillingHeaderRectifier: z
.boolean()
.describe("Whether billing-header rectifier is enabled."),
+ enableSystemMessageRectifier: z
+ .boolean()
+ .describe("Whether system message rectifier is enabled."),
enableResponseInputRectifier: z
.boolean()
.describe("Whether Responses API input rectifier is enabled."),
diff --git a/src/lib/config/system-settings-cache.ts b/src/lib/config/system-settings-cache.ts
index 2b4043460..4b0049347 100644
--- a/src/lib/config/system-settings-cache.ts
+++ b/src/lib/config/system-settings-cache.ts
@@ -43,6 +43,7 @@ const DEFAULT_SETTINGS: Pick<
| "enableThinkingBudgetRectifier"
| "enableThinkingEffortConflictRectifier"
| "enableBillingHeaderRectifier"
+ | "enableSystemMessageRectifier"
| "enableResponseInputRectifier"
| "allowNonConversationEndpointProviderFallback"
| "fakeStreamingWhitelist"
@@ -63,6 +64,7 @@ const DEFAULT_SETTINGS: Pick<
enableThinkingBudgetRectifier: true,
enableThinkingEffortConflictRectifier: true,
enableBillingHeaderRectifier: true,
+ enableSystemMessageRectifier: true,
enableResponseInputRectifier: true,
// 安全敏感开关：冷缓存 / DB 读取失败时 fail-closed，避免意外重新开启跨供应商 raw fallback。
allowNonConversationEndpointProviderFallback: false,
@@ -152,6 +154,7 @@ export async function getCachedSystemSettings(): Promise {
enableThinkingBudgetRectifier: DEFAULT_SETTINGS.enableThinkingBudgetRectifier,
enableThinkingEffortConflictRectifier: DEFAULT_SETTINGS.enableThinkingEffortConflictRectifier,
enableBillingHeaderRectifier: DEFAULT_SETTINGS.enableBillingHeaderRectifier,
+ enableSystemMessageRectifier: DEFAULT_SETTINGS.enableSystemMessageRectifier,
enableResponseInputRectifier: DEFAULT_SETTINGS.enableResponseInputRectifier,
allowNonConversationEndpointProviderFallback:
DEFAULT_SETTINGS.allowNonConversationEndpointProviderFallback,
diff --git a/src/lib/utils/special-settings.ts b/src/lib/utils/special-settings.ts
index 09922e741..bba8532ff 100644
--- a/src/lib/utils/special-settings.ts
+++ b/src/lib/utils/special-settings.ts
@@ -120,6 +120,8 @@ function buildSettingKey(setting: SpecialSetting): string {
]);
case "billing_header_rectifier":
return JSON.stringify([setting.type, setting.hit, setting.removedCount]);
+ case "system_message_rectifier":
+ return JSON.stringify([setting.type, setting.hit, setting.movedCount]);
case "gemini_google_search_override":
return JSON.stringify([
setting.type,
diff --git a/src/lib/validation/schemas.ts b/src/lib/validation/schemas.ts
index 5640440ff..70e50ea9a 100644
--- a/src/lib/validation/schemas.ts
+++ b/src/lib/validation/schemas.ts
@@ -1009,6 +1009,8 @@ export const UpdateSystemSettingsSchema = z.object({
enableThinkingEffortConflictRectifier: z.boolean().optional(),
// billing header 整流器（可选）
enableBillingHeaderRectifier: z.boolean().optional(),
+ // system message 整流器（可选）
+ enableSystemMessageRectifier: z.boolean().optional(),
// Response API input 整流器（可选）
enableResponseInputRectifier: z.boolean().optional(),
// 非对话端点跨供应商 fallback（可选）
diff --git a/src/repository/_shared/transformers.ts b/src/repository/_shared/transformers.ts
index 353b5e5d6..981300d86 100644
--- a/src/repository/_shared/transformers.ts
+++ b/src/repository/_shared/transformers.ts
@@ -269,6 +269,7 @@ export function toSystemSettings(dbSettings: any): SystemSettings {
enableThinkingEffortConflictRectifier:
dbSettings?.enableThinkingEffortConflictRectifier ?? true,
enableBillingHeaderRectifier: dbSettings?.enableBillingHeaderRectifier ?? true,
+ enableSystemMessageRectifier: dbSettings?.enableSystemMessageRectifier ?? true,
enableResponseInputRectifier: dbSettings?.enableResponseInputRectifier ?? true,
allowNonConversationEndpointProviderFallback:
dbSettings?.allowNonConversationEndpointProviderFallback ?? true,
diff --git a/src/repository/system-config.ts b/src/repository/system-config.ts
index d3f6262b6..b99bbc195 100644
--- a/src/repository/system-config.ts
+++ b/src/repository/system-config.ts
@@ -165,6 +165,7 @@ function createFallbackSettings(): SystemSettings {
enableThinkingBudgetRectifier: true,
enableThinkingEffortConflictRectifier: true,
enableBillingHeaderRectifier: true,
+ enableSystemMessageRectifier: true,
enableResponseInputRectifier: true,
allowNonConversationEndpointProviderFallback: true,
fakeStreamingWhitelist: DEFAULT_FAKE_STREAMING_WHITELIST.map((entry) => ({
@@ -283,6 +284,7 @@ export async function getSystemSettings(): Promise {
updatedAt: systemSettings.updatedAt,
};
const fullSelection = {
+ enableSystemMessageRectifier: systemSettings.enableSystemMessageRectifier,
billHedgeLosers: systemSettings.billHedgeLosers,
billNonSuccessfulRequests: systemSettings.billNonSuccessfulRequests,
passThroughUpstreamErrorMessage: systemSettings.passThroughUpstreamErrorMessage,
@@ -305,11 +307,35 @@ export async function getSystemSettings(): Promise {
error,
});
- // 最新降级：移除最近新增的 enableThinkingEffortConflictRectifier 列。
+ // 最新降级：移除最近新增的 enableSystemMessageRectifier 列。
+ const {
+ enableSystemMessageRectifier: _omitSystemMessageRectifier,
+ ...selectionWithoutSystemMessageRectifier
+ } = fullSelection;
+
+ try {
+ const [row] = await db
+ .select(selectionWithoutSystemMessageRectifier)
+ .from(systemSettings)
+ .orderBy(asc(systemSettings.id))
+ .limit(1);
+ return row ?? null;
+ } catch (systemMessageRectifierFallbackError) {
+ if (!isUndefinedColumnError(systemMessageRectifierFallbackError)) {
+ throw systemMessageRectifierFallbackError;
+ }
+
+ logger.warn(
+ "system_settings 表除 enableSystemMessageRectifier 外仍有列缺失，继续回退到上一代字段集。",
+ { error: systemMessageRectifierFallbackError }
+ );
+ }
+
+ // 次新降级：再移除 enableThinkingEffortConflictRectifier 列。
const {
enableThinkingEffortConflictRectifier: _omitEffortConflict,
...selectionWithoutEffortConflict
- } = fullSelection;
+ } = selectionWithoutSystemMessageRectifier;
try {
const [row] = await db
@@ -329,7 +355,7 @@ export async function getSystemSettings(): Promise {
);
}
- // 次新降级：移除 billHedgeLosers 列。
+ // 再次降级：移除 billHedgeLosers 列。
const { billHedgeLosers: _omitBillHedgeLosers, ...selectionWithoutBillHedgeLosers } =
selectionWithoutEffortConflict;
@@ -669,6 +695,7 @@ export async function updateSystemSettings(
updatedAt: systemSettings.updatedAt,
};
const fullReturning = {
+ enableSystemMessageRectifier: systemSettings.enableSystemMessageRectifier,
billHedgeLosers: systemSettings.billHedgeLosers,
billNonSuccessfulRequests: systemSettings.billNonSuccessfulRequests,
passThroughUpstreamErrorMessage: systemSettings.passThroughUpstreamErrorMessage,
@@ -790,6 +817,11 @@ export async function updateSystemSettings(
updates.enableBillingHeaderRectifier = payload.enableBillingHeaderRectifier;
}
+ // system message 整流器开关（如果提供）
+ if (payload.enableSystemMessageRectifier !== undefined) {
+ updates.enableSystemMessageRectifier = payload.enableSystemMessageRectifier;
+ }
+
// Response API input 整流器开关（如果提供）
if (payload.enableResponseInputRectifier !== undefined) {
updates.enableResponseInputRectifier = payload.enableResponseInputRectifier;
@@ -880,36 +912,63 @@ export async function updateSystemSettings(
error,
});
- // 最新降级：移除最近新增的 enableThinkingEffortConflictRectifier 列。
+ // 最新降级：移除最近新增的 enableSystemMessageRectifier 列。
const {
- enableThinkingEffortConflictRectifier: _omitUpdateEffortConflict,
- ...updatesWithoutEffortConflict
+ enableSystemMessageRectifier: _omitUpdateSystemMessageRectifier,
+ ...updatesWithoutSystemMessageRectifier
} = updates;
const {
- enableThinkingEffortConflictRectifier: _omitReturningEffortConflict,
- ...returningWithoutEffortConflict
+ enableSystemMessageRectifier: _omitReturningSystemMessageRectifier,
+ ...returningWithoutSystemMessageRectifier
} = fullReturning;
try {
[updated] = await executor
.update(systemSettings)
- .set(updatesWithoutEffortConflict)
+ .set(updatesWithoutSystemMessageRectifier)
.where(eq(systemSettings.id, current.id))
- .returning(returningWithoutEffortConflict);
- } catch (effortConflictFallbackError) {
- if (!isUndefinedColumnError(effortConflictFallbackError)) {
- throw effortConflictFallbackError;
+ .returning(returningWithoutSystemMessageRectifier);
+ } catch (systemMessageRectifierFallbackError) {
+ if (!isUndefinedColumnError(systemMessageRectifierFallbackError)) {
+ throw systemMessageRectifierFallbackError;
}
logger.warn(
- "system_settings 表除 enableThinkingEffortConflictRectifier 外仍有列缺失，继续降级更新。",
- {
- error: effortConflictFallbackError,
- }
+ "system_settings 表除 enableSystemMessageRectifier 外仍有列缺失，继续降级更新。",
+ { error: systemMessageRectifierFallbackError }
);
}
- // 次新降级：移除 billHedgeLosers 列。
+ // 次新降级：再移除 enableThinkingEffortConflictRectifier 列。
+ const {
+ enableThinkingEffortConflictRectifier: _omitUpdateEffortConflict,
+ ...updatesWithoutEffortConflict
+ } = updatesWithoutSystemMessageRectifier;
+ const {
+ enableThinkingEffortConflictRectifier: _omitReturningEffortConflict,
+ ...returningWithoutEffortConflict
+ } = returningWithoutSystemMessageRectifier;
+
+ if (!updated) {
+ try {
+ [updated] = await executor
+ .update(systemSettings)
+ .set(updatesWithoutEffortConflict)
+ .where(eq(systemSettings.id, current.id))
+ .returning(returningWithoutEffortConflict);
+ } catch (effortConflictFallbackError) {
+ if (!isUndefinedColumnError(effortConflictFallbackError)) {
+ throw effortConflictFallbackError;
+ }
+
+ logger.warn(
+ "system_settings 表除 enableThinkingEffortConflictRectifier 外仍有列缺失，继续降级更新。",
+ { error: effortConflictFallbackError }
+ );
+ }
+ }
+
+ // 再次降级：移除 billHedgeLosers 列。
const { billHedgeLosers: _omitUpdateBillHedgeLosers, ...updatesWithoutBillHedgeLosers } =
updatesWithoutEffortConflict;
const { billHedgeLosers: _omitReturningBillHedgeLosers, ...returningWithoutBillHedgeLosers } =
@@ -933,7 +992,7 @@ export async function updateSystemSettings(
}
}
- // 次新降级：移除 billNonSuccessfulRequests 列。
+ // 次次新降级：移除 billNonSuccessfulRequests 列。
const {
billNonSuccessfulRequests: _omitUpdateBillNonSuccessful,
...updatesWithoutBillNonSuccessful
diff --git a/src/types/special-settings.ts b/src/types/special-settings.ts
index c24bc1930..138b40866 100644
--- a/src/types/special-settings.ts
+++ b/src/types/special-settings.ts
@@ -13,6 +13,7 @@ export type SpecialSetting =
| ThinkingBudgetRectifierSpecialSetting
| ThinkingEffortConflictRectifierSpecialSetting
| BillingHeaderRectifierSpecialSetting
+ | SystemMessageRectifierSpecialSetting
| CodexSessionIdCompletionSpecialSetting
| ClaudeMetadataUserIdInjectionSpecialSetting
| AnthropicEffortSpecialSetting
@@ -216,6 +217,22 @@ export type BillingHeaderRectifierSpecialSetting = {
extractedValues: string[];
};
+/**
+ * System message 整流器审计
+ *
+ * 用于记录：当请求 messages 数组中包含 role:"system" 消息时
+ * （Claude Code 2.1.172+ 配合自定义模型名会注入），
+ * 系统将其内容合并到顶层 system 字段的行为，
+ * 避免严格校验的 Anthropic 兼容上游（Vertex/Bedrock 类）返回 400。
+ */
+export type SystemMessageRectifierSpecialSetting = {
+ type: "system_message_rectifier";
+ scope: "request";
+ hit: boolean;
+ movedCount: number;
+ extractedValues: string[];
+};
+
export type ThinkingBudgetRectifierSpecialSetting = {
type: "thinking_budget_rectifier";
scope: "request";
diff --git a/src/types/system-config.ts b/src/types/system-config.ts
index d0d168ed7..e8d0231ac 100644
--- a/src/types/system-config.ts
+++ b/src/types/system-config.ts
@@ -101,6 +101,11 @@ export interface SystemSettings {
// 防止 Amazon Bedrock 等非原生 Anthropic 上游返回 400 错误
enableBillingHeaderRectifier: boolean;
+ // system message 整流器（默认开启）
+ // 目标：将 messages 数组中的 role:"system" 消息（Claude Code 2.1.172+ 配合自定义模型名注入）
+ // 合并到顶层 system 字段，避免严格校验的 Anthropic 兼容上游（Vertex/Bedrock 类）返回 400 错误
+ enableSystemMessageRectifier: boolean;
+
// Response API input 整流器（默认开启）
// 目标：当 /v1/responses 端点收到非数组 input（字符串或单对象）时，
// 自动规范化为数组格式，确保下游处理兼容 OpenAI 完整规范
@@ -207,6 +212,9 @@ export interface UpdateSystemSettingsInput {
// billing header 整流器（可选）
enableBillingHeaderRectifier?: boolean;
+ // system message 整流器（可选）
+ enableSystemMessageRectifier?: boolean;
+
// Response API input 整流器（可选）
enableResponseInputRectifier?: boolean;
diff --git a/tests/unit/proxy/system-message-rectifier.test.ts b/tests/unit/proxy/system-message-rectifier.test.ts
new file mode 100644
index 000000000..baa8ee521
--- /dev/null
+++ b/tests/unit/proxy/system-message-rectifier.test.ts
@@ -0,0 +1,262 @@
+import { describe, expect, test } from "vitest";
+import { rectifyBillingHeader } from "@/app/v1/_lib/proxy/billing-header-rectifier";
+import { rectifySystemMessages } from "@/app/v1/_lib/proxy/system-message-rectifier";
+
+describe("rectifySystemMessages", () => {
+ test("system message with string content, no top-level system - moves it into system array", () => {
+ const message: Record = {
+ messages: [
+ { role: "user", content: "hi" },
+ { role: "system", content: "The following skills are available: ..." },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(result.movedCount).toBe(1);
+ expect(result.extractedValues).toEqual(["The following skills are available: ..."]);
+ expect(message.messages).toEqual([{ role: "user", content: "hi" }]);
+ expect(message.system).toEqual([
+ { type: "text", text: "The following skills are available: ..." },
+ ]);
+ });
+
+ test("system message with existing top-level system array - appends to the end", () => {
+ const message: Record = {
+ system: [{ type: "text", text: "You are a helpful assistant." }],
+ messages: [
+ { role: "user", content: "hi" },
+ { role: "system", content: "skills list" },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(message.system).toEqual([
+ { type: "text", text: "You are a helpful assistant." },
+ { type: "text", text: "skills list" },
+ ]);
+ });
+
+ test("system message with existing top-level system string - converts string to leading text block", () => {
+ const message: Record = {
+ system: "You are a helpful assistant.",
+ messages: [
+ { role: "user", content: "hi" },
+ { role: "system", content: "skills list" },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(message.system).toEqual([
+ { type: "text", text: "You are a helpful assistant." },
+ { type: "text", text: "skills list" },
+ ]);
+ });
+
+ test("system message with array content - keeps text blocks including extra fields", () => {
+ const message: Record = {
+ messages: [
+ { role: "user", content: "hi" },
+ {
+ role: "system",
+ content: [
+ { type: "text", text: "skills list", cache_control: { type: "ephemeral" } },
+ { type: "image", source: { type: "base64", data: "..." } },
+ ],
+ },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(result.movedCount).toBe(1);
+ expect(result.extractedValues).toEqual(["skills list"]);
+ expect(message.system).toEqual([
+ { type: "text", text: "skills list", cache_control: { type: "ephemeral" } },
+ ]);
+ });
+
+ test("multiple system messages - moves all, preserves order", () => {
+ const message: Record = {
+ messages: [
+ { role: "system", content: "first" },
+ { role: "user", content: "hi" },
+ { role: "system", content: "second" },
+ { role: "assistant", content: "hello" },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(result.movedCount).toBe(2);
+ expect(result.extractedValues).toEqual(["first", "second"]);
+ expect(message.messages).toEqual([
+ { role: "user", content: "hi" },
+ { role: "assistant", content: "hello" },
+ ]);
+ expect(message.system).toEqual([
+ { type: "text", text: "first" },
+ { type: "text", text: "second" },
+ ]);
+ });
+
+ test("no system messages - applied=false, messages unchanged", () => {
+ const original = [
+ { role: "user", content: "hi" },
+ { role: "assistant", content: "hello" },
+ ];
+ const message: Record = {
+ messages: [...original],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(false);
+ expect(result.movedCount).toBe(0);
+ expect(result.extractedValues).toEqual([]);
+ expect(message.messages).toEqual(original);
+ expect(message.system).toBeUndefined();
+ });
+
+ test("messages missing - applied=false", () => {
+ const message: Record = {};
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(false);
+ expect(result.movedCount).toBe(0);
+ });
+
+ test("messages is not an array - applied=false", () => {
+ const message: Record = { messages: "not-an-array" };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(false);
+ });
+
+ test("system message with empty string content - removed from messages without adding empty block", () => {
+ const message: Record = {
+ messages: [
+ { role: "user", content: "hi" },
+ { role: "system", content: "" },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(result.movedCount).toBe(1);
+ expect(result.extractedValues).toEqual([]);
+ expect(message.messages).toEqual([{ role: "user", content: "hi" }]);
+ expect(message.system).toBeUndefined();
+ });
+
+ test("system message with non-string non-array content - removed without merging", () => {
+ const message: Record = {
+ messages: [
+ { role: "user", content: "hi" },
+ { role: "system", content: { unexpected: true } },
+ ],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(result.movedCount).toBe(1);
+ expect(result.extractedValues).toEqual([]);
+ expect(message.system).toBeUndefined();
+ });
+
+ test("top-level system is empty string - no empty leading block", () => {
+ const message: Record = {
+ system: "",
+ messages: [{ role: "system", content: "skills list" }],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(message.system).toEqual([{ type: "text", text: "skills list" }]);
+ });
+
+ test("top-level system has unknown type - replaced with extracted blocks", () => {
+ const message: Record = {
+ system: 42,
+ messages: [{ role: "system", content: "skills list" }],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(message.system).toEqual([{ type: "text", text: "skills list" }]);
+ });
+
+ test("mutates messages array in place (same reference)", () => {
+ const messagesRef: unknown[] = [
+ { role: "user", content: "hi" },
+ { role: "system", content: "skills list" },
+ ];
+ const message: Record = { messages: messagesRef };
+
+ rectifySystemMessages(message);
+
+ expect(message.messages).toBe(messagesRef);
+ expect(messagesRef).toHaveLength(1);
+ });
+
+ test("mutates existing system array in place (same reference)", () => {
+ const systemRef: unknown[] = [{ type: "text", text: "base prompt" }];
+ const message: Record = {
+ system: systemRef,
+ messages: [{ role: "system", content: "skills list" }],
+ };
+
+ rectifySystemMessages(message);
+
+ expect(message.system).toBe(systemRef);
+ expect(systemRef).toHaveLength(2);
+ });
+
+ test("billing header inside system message is stripped when billing rectifier runs after (forwarder order)", () => {
+ const message: Record = {
+ messages: [
+ { role: "user", content: "hi" },
+ {
+ role: "system",
+ content: [
+ { type: "text", text: "skills list" },
+ { type: "text", text: "x-anthropic-billing-header: cc_version=2.1.172;" },
+ ],
+ },
+ ],
+ };
+
+ const systemResult = rectifySystemMessages(message);
+ const billingResult = rectifyBillingHeader(message);
+
+ expect(systemResult.applied).toBe(true);
+ expect(billingResult.applied).toBe(true);
+ expect(billingResult.removedCount).toBe(1);
+ expect(message.system).toEqual([{ type: "text", text: "skills list" }]);
+ });
+
+ test("null and non-object entries in messages are preserved", () => {
+ const message: Record = {
+ messages: [null, "weird", { role: "system", content: "skills list" }, { role: "user" }],
+ };
+
+ const result = rectifySystemMessages(message);
+
+ expect(result.applied).toBe(true);
+ expect(result.movedCount).toBe(1);
+ expect(message.messages).toEqual([null, "weird", { role: "user" }]);
+ });
+});
diff --git a/tests/unit/repository/system-config-update-missing-columns.test.ts b/tests/unit/repository/system-config-update-missing-columns.test.ts
index addafccb0..e44800447 100644
--- a/tests/unit/repository/system-config-update-missing-columns.test.ts
+++ b/tests/unit/repository/system-config-update-missing-columns.test.ts
@@ -291,7 +291,7 @@ describe("SystemSettings：数据库缺列时的保存兜底", () => {
vi.useRealTimers();
});
- test("getSystemSettings 在仅缺 enable_thinking_effort_conflict_rectifier 新列时应降级读取并默认开启", async () => {
+ test("getSystemSettings 在仅缺 enable_system_message_rectifier 新列时应降级读取并默认开启", async () => {
vi.resetModules();
const now = new Date("2026-01-04T00:00:00.000Z");
@@ -299,7 +299,7 @@ describe("SystemSettings：数据库缺列时的保存兜底", () => {
vi.setSystemTime(now);
// 第一次 select(fullSelection) 因新列缺失而抛 42703；
- // 第二次 select(selectionWithoutEffortConflict) 命中——验证新列已加入降级链最外层。
+ // 第二次 select(selectionWithoutSystemMessageRectifier) 命中——验证新列已加入降级链最外层。
const selectMock = vi
.fn()
.mockReturnValueOnce(createRejectedThenableQuery({ code: "42703" }))
@@ -315,6 +315,7 @@ describe("SystemSettings：数据库缺列时的保存兜底", () => {
enableHttp2: true,
enableThinkingSignatureRectifier: true,
enableThinkingBudgetRectifier: true,
+ enableThinkingEffortConflictRectifier: true,
createdAt: now,
updatedAt: now,
},
@@ -339,15 +340,69 @@ describe("SystemSettings：数据库缺列时的保存兜底", () => {
expect(result.siteTitle).toBe("Claude Code Hub");
expect(result.enableHttp2).toBe(true);
- // 关键回归保护：第二次 select 必须恰好剥离了新列（最外层降级），
- // 而非旧行为先剥离 billHedgeLosers。若新列未加入降级链最外层，下面两条断言会失败。
+ // 关键回归保护：第二次 select 必须恰好剥离了最新列 enableSystemMessageRectifier（最外层降级），
+ // 而 enableThinkingEffortConflictRectifier（次新列）应仍保留。
const secondSelection = selectMock.mock.calls[1]?.[0] as Record;
- expect(secondSelection).not.toHaveProperty("enableThinkingEffortConflictRectifier");
+ expect(secondSelection).not.toHaveProperty("enableSystemMessageRectifier");
+ expect(secondSelection).toHaveProperty("enableThinkingEffortConflictRectifier");
expect(secondSelection).toHaveProperty("billHedgeLosers");
vi.useRealTimers();
});
+ test("getSystemSettings 在缺最新两列时应继续剥离 enable_thinking_effort_conflict_rectifier", async () => {
+ vi.resetModules();
+
+ const now = new Date("2026-01-04T00:00:00.000Z");
+ vi.useFakeTimers();
+ vi.setSystemTime(now);
+
+ // 三次 select：fullSelection → withoutSystemMessageRectifier → withoutEffortConflict 命中
+ const selectMock = vi
+ .fn()
+ .mockReturnValueOnce(createRejectedThenableQuery({ code: "42703" }))
+ .mockReturnValueOnce(createRejectedThenableQuery({ code: "42703" }))
+ .mockReturnValueOnce(
+ createThenableQuery([
+ {
+ id: 1,
+ siteTitle: "Claude Code Hub",
+ allowGlobalUsageView: false,
+ currencyDisplay: "USD",
+ billingModelSource: "original",
+ codexPriorityBillingSource: "requested",
+ enableHttp2: true,
+ createdAt: now,
+ updatedAt: now,
+ },
+ ])
+ );
+
+ vi.doMock("@/drizzle/db", () => ({
+ db: {
+ select: selectMock,
+ update: vi.fn(() => createThenableQuery([])),
+ insert: vi.fn(() => createThenableQuery([])),
+ execute: vi.fn(async () => ({ count: 0 })),
+ },
+ }));
+
+ const { getSystemSettings } = await import("@/repository/system-config");
+
+ const result = await getSystemSettings();
+
+ expect(selectMock).toHaveBeenCalledTimes(3);
+ expect(result.siteTitle).toBe("Claude Code Hub");
+
+ // 第三次 select 必须同时剥离两列。
+ const thirdSelection = selectMock.mock.calls[2]?.[0] as Record;
+ expect(thirdSelection).not.toHaveProperty("enableSystemMessageRectifier");
+ expect(thirdSelection).not.toHaveProperty("enableThinkingEffortConflictRectifier");
+ expect(thirdSelection).toHaveProperty("billHedgeLosers");
+
+ vi.useRealTimers();
+ });
+
test("getSystemSettings 在缺少新列且无记录时应使用降级插入初始化", async () => {
vi.resetModules();