Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions packages/cli/src/handlers/composed-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,38 @@ export class ComposedHandler implements ModelHandler {
// 4. Build request payload
let requestPayload = adapter.buildPayload(claudeRequest, messages, tools);

// 4b. Strip inline system messages from messages[] for Anthropic-transport providers.
// Claude Code v2.1.153+ injects system messages inline (e.g. system-reminders).
// Providers like Z.AI reject role:"system" in messages — only role:"user"/"assistant" accepted.
// Merge them into the top-level system field instead.
if (this.provider.streamFormat === "anthropic-sse" && requestPayload.messages) {
const inlineSystemTexts: string[] = [];
requestPayload.messages = requestPayload.messages.filter((msg: any) => {
if (msg.role === "system") {
const text = typeof msg.content === "string"
? msg.content
: Array.isArray(msg.content)
? msg.content.map((c: any) => c.text || "").join("\n")
: "";
if (text) inlineSystemTexts.push(text);
return false;
}
return true;
});
if (inlineSystemTexts.length > 0) {
const merged = inlineSystemTexts.join("\n\n");
if (requestPayload.system) {
const existing = Array.isArray(requestPayload.system)
? requestPayload.system.map((s: any) => s.text || s).join("\n\n")
: requestPayload.system;
requestPayload.system = existing + "\n\n" + merged;
} else {
requestPayload.system = merged;
}
log(`[ComposedHandler] Merged ${inlineSystemTexts.length} inline system message(s) into system prompt for ${this.provider.displayName}`);
}
}

// Merge provider-specific extra fields
const extraFields = this.provider.getExtraPayloadFields?.();
if (extraFields) {
Expand Down
14 changes: 14 additions & 0 deletions packages/cli/src/handlers/shared/format/openai-messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,20 @@ export function convertMessagesToOpenAI(
for (const msg of req.messages) {
if (msg.role === "user") processUserMessage(msg, messages, simpleFormat);
else if (msg.role === "assistant") processAssistantMessage(msg, messages, simpleFormat);
else if (msg.role === "system") {
const content = typeof msg.content === "string"
? msg.content
: Array.isArray(msg.content)
? msg.content.map((c: any) => c.text || "").join("\n")
: "";
if (content) {
if (messages.length > 0 && messages[0].role === "system") {
messages[0].content += "\n\n" + content;
} else {
messages.unshift({ role: "system", content });
}
}
}
}
}

Expand Down