Merge origin/master (v0.5.81) into gitea/new_feature
Resolve conflicts: - streamingHandler.js: merge buildStreamErrorBytes onAbortTerminal + local shouldPersistRequestDetail & streamStatusForContent - capabilities.js: preserve server-injected user-asserted caps and models.dev catalog lookup; wire CommandCode /alpha/generate caps inside resolve() - commandcode.js (services/usage): adopt upstream whoami + billing credits/subscriptions with 5h/weekly rate windows and plan caps - openai-to-commandcode.js: merge toNativeImageBlock (data-URI & http(s) support) and assistant reasoning_content preservation - commandcode-to-openai.js: adopt upstream mid-stream error throw for clean retry and abortion - tests: sync commandcode test suite and exclude .next from vitest config
This commit is contained in:
@@ -239,7 +239,7 @@ exports[`GOLDEN request: OpenAI → Kiro > full body (image base64 + tool_result
|
||||
"userInputMessage": {
|
||||
"content": "[Context: Current time is <TS>
|
||||
|
||||
continue",
|
||||
Tool results provided.",
|
||||
"modelId": "claude-sonnet-4.5",
|
||||
"origin": "AI_EDITOR",
|
||||
"userInputMessageContext": {
|
||||
@@ -281,7 +281,11 @@ continue",
|
||||
"history": [
|
||||
{
|
||||
"userInputMessage": {
|
||||
"content": "You are helpful.
|
||||
"content": "[Context: Current time is <TS>
|
||||
|
||||
<instructions>
|
||||
You are helpful.
|
||||
</instructions>
|
||||
|
||||
What's in this image?",
|
||||
"images": [
|
||||
|
||||
188
tests/translator/agent-client-fixes.test.js
Normal file
188
tests/translator/agent-client-fixes.test.js
Normal file
@@ -0,0 +1,188 @@
|
||||
// Fixes for agent clients (Claude Code) driving non-Anthropic upstreams:
|
||||
// - tool-result images survive the Claude → OpenAI / Kiro request translation
|
||||
// - Kiro tool calls stream back under the client's own (unsanitized) names
|
||||
// - the client's thinking `display` is kept on Claude-format upstreams
|
||||
import { describe, it, expect } from "vitest";
|
||||
import "./registerAll.js";
|
||||
import { translateRequest, translateResponse, initState } from "../../open-sse/translator/index.js";
|
||||
import { FORMATS } from "../../open-sse/translator/formats.js";
|
||||
import { applyThinking } from "../../open-sse/translator/concerns/thinkingUnified.js";
|
||||
import { kiroToClaudeResponse } from "../../open-sse/translator/response/kiro-to-claude.js";
|
||||
import { kiroToOpenAIResponse } from "../../open-sse/translator/response/kiro-to-openai.js";
|
||||
import { selectAnthropicBeta } from "../../open-sse/providers/shared.js";
|
||||
import { hoistToolResultImages } from "../../open-sse/translator/formats/claude.js";
|
||||
import { openaiToCommandCodeRequest } from "../../open-sse/translator/request/openai-to-commandcode.js";
|
||||
|
||||
const PNG = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==";
|
||||
|
||||
const screenshotTurn = (extraTools = []) => ({
|
||||
tools: [
|
||||
{ name: "mcp__browser__computer", description: "browser", input_schema: { type: "object", properties: {} } },
|
||||
...extraTools,
|
||||
],
|
||||
messages: [
|
||||
{ role: "user", content: "take a screenshot" },
|
||||
{ role: "assistant", content: [{ type: "tool_use", id: "toolu_1", name: "mcp__browser__computer", input: { action: "screenshot" } }] },
|
||||
{
|
||||
role: "user",
|
||||
content: [{
|
||||
type: "tool_result",
|
||||
tool_use_id: "toolu_1",
|
||||
content: [
|
||||
{ type: "text", text: "Successfully captured screenshot (1x1, png)" },
|
||||
{ type: "image", source: { type: "base64", media_type: "image/png", data: PNG } },
|
||||
],
|
||||
}],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
describe("tool-result images reach OpenAI-format upstreams", () => {
|
||||
it("emits the tool message text and a follow-up user message carrying the image", () => {
|
||||
const out = translateRequest(FORMATS.CLAUDE, FORMATS.OPENAI, "gpt-x", screenshotTurn(), true, null, "openai");
|
||||
const toolMsg = out.messages.find((m) => m.role === "tool");
|
||||
expect(toolMsg.tool_call_id).toBe("toolu_1");
|
||||
expect(toolMsg.content).toBe("Successfully captured screenshot (1x1, png)");
|
||||
expect(toolMsg.content).not.toContain(PNG);
|
||||
const follow = out.messages[out.messages.indexOf(toolMsg) + 1];
|
||||
expect(follow.role).toBe("user");
|
||||
const image = follow.content.find((p) => p.type === "image_url");
|
||||
expect(image.image_url.url).toBe(`data:image/png;base64,${PNG}`);
|
||||
expect(follow.content.find((p) => p.type === "text").text).toContain("toolu_1");
|
||||
});
|
||||
|
||||
it("does not dump base64 into a tool message that had no text", () => {
|
||||
const body = screenshotTurn();
|
||||
body.messages[2].content[0].content = [{ type: "image", source: { type: "base64", media_type: "image/png", data: PNG } }];
|
||||
const out = translateRequest(FORMATS.CLAUDE, FORMATS.OPENAI, "gpt-x", body, true, null, "openai");
|
||||
const toolMsg = out.messages.find((m) => m.role === "tool");
|
||||
expect(toolMsg.content).toBe("");
|
||||
expect(out.messages.some((m) => Array.isArray(m.content) && m.content.some((p) => p.type === "image_url"))).toBe(true);
|
||||
});
|
||||
|
||||
it("leaves text-only tool results exactly as before", () => {
|
||||
const body = screenshotTurn();
|
||||
body.messages[2].content[0].content = "plain result";
|
||||
const out = translateRequest(FORMATS.CLAUDE, FORMATS.OPENAI, "gpt-x", body, true, null, "openai");
|
||||
const toolMsg = out.messages.find((m) => m.role === "tool");
|
||||
expect(toolMsg.content).toBe("plain result");
|
||||
expect(out.messages[out.messages.length - 1]).toBe(toolMsg);
|
||||
});
|
||||
|
||||
it("forwards tool-result images to Kiro as user images", () => {
|
||||
const out = translateRequest(FORMATS.CLAUDE, FORMATS.KIRO, "claude-sonnet-4.5", screenshotTurn(), true, null, "kiro");
|
||||
const json = JSON.stringify(out.conversationState);
|
||||
expect(json).toContain(PNG);
|
||||
expect(json).toContain("Successfully captured screenshot");
|
||||
});
|
||||
});
|
||||
|
||||
describe("Kiro tool names round-trip", () => {
|
||||
it("returns the sanitized→original map on the translated body", () => {
|
||||
const body = screenshotTurn();
|
||||
body.tools = [{ name: "mcp.browser.computer", description: "browser", input_schema: { type: "object", properties: {} } }];
|
||||
const out = translateRequest(FORMATS.CLAUDE, FORMATS.KIRO, "claude-sonnet-4.5", body, true, null, "kiro");
|
||||
expect(out._toolNameMap).toBeInstanceOf(Map);
|
||||
expect(out._toolNameMap.get("mcp_browser_computer")).toBe("mcp.browser.computer");
|
||||
const wire = JSON.parse(JSON.stringify(out.conversationState));
|
||||
expect(JSON.stringify(wire)).toContain("mcp_browser_computer");
|
||||
expect(JSON.stringify(wire)).not.toContain("mcp.browser.computer");
|
||||
});
|
||||
|
||||
it("omits the map when no name changed", () => {
|
||||
const body = screenshotTurn();
|
||||
body.tools = [{ name: "plain_tool", description: "x", input_schema: { type: "object", properties: {} } }];
|
||||
body.messages[1].content[0].name = "plain_tool";
|
||||
const out = translateRequest(FORMATS.CLAUDE, FORMATS.KIRO, "claude-sonnet-4.5", body, true, null, "kiro");
|
||||
expect(out._toolNameMap).toBeUndefined();
|
||||
});
|
||||
|
||||
it("restores the client name on streamed Claude tool_use blocks", () => {
|
||||
const state = { ...initState(FORMATS.CLAUDE), toolNameMap: new Map([["mcp_browser_computer", "mcp__browser__computer"]]) };
|
||||
const chunk = {
|
||||
id: "c1", object: "chat.completion.chunk", created: 1, model: "claude-sonnet-4.5",
|
||||
choices: [{ index: 0, delta: { tool_calls: [{ index: 0, id: "call_1", type: "function", function: { name: "mcp_browser_computer", arguments: "" } }] }, finish_reason: null }],
|
||||
};
|
||||
const events = kiroToClaudeResponse(chunk, state);
|
||||
const start = events.find((e) => e.type === "content_block_start" && e.content_block?.type === "tool_use");
|
||||
expect(start.content_block.name).toBe("mcp__browser__computer");
|
||||
});
|
||||
|
||||
it("passes unknown names through untouched", () => {
|
||||
const state = { ...initState(FORMATS.CLAUDE), toolNameMap: new Map([["mcp_browser_computer", "mcp__browser__computer"]]) };
|
||||
const chunk = {
|
||||
id: "c1", object: "chat.completion.chunk", created: 1, model: "claude-sonnet-4.5",
|
||||
choices: [{ index: 0, delta: { tool_calls: [{ index: 0, id: "call_2", type: "function", function: { name: "other_tool", arguments: "" } }] }, finish_reason: null }],
|
||||
};
|
||||
const events = kiroToClaudeResponse(chunk, state);
|
||||
const start = events.find((e) => e.type === "content_block_start" && e.content_block?.type === "tool_use");
|
||||
expect(start.content_block.name).toBe("other_tool");
|
||||
});
|
||||
|
||||
it("restores the client name on OpenAI chunks passed through kiro-to-openai", () => {
|
||||
const state = { ...initState(FORMATS.OPENAI), toolNameMap: new Map([["mcp_browser_computer", "mcp__browser__computer"]]) };
|
||||
const chunk = {
|
||||
id: "c1", object: "chat.completion.chunk", created: 1, model: "claude-sonnet-4.5",
|
||||
choices: [{ index: 0, delta: { tool_calls: [{ index: 0, id: "call_1", type: "function", function: { name: "mcp_browser_computer", arguments: "{}" } }] }, finish_reason: null }],
|
||||
};
|
||||
const out = kiroToOpenAIResponse(chunk, state);
|
||||
expect(out.choices[0].delta.tool_calls[0].function.name).toBe("mcp__browser__computer");
|
||||
expect(kiroToOpenAIResponse(chunk, initState(FORMATS.OPENAI))).toBe(chunk);
|
||||
});
|
||||
});
|
||||
|
||||
describe("thinking display is preserved for Claude-format upstreams", () => {
|
||||
it("keeps display on adaptive thinking", () => {
|
||||
const body = { model: "claude-sonnet-5", thinking: { type: "adaptive", display: "summarized" }, output_config: { effort: "high" }, messages: [] };
|
||||
applyThinking(FORMATS.CLAUDE, "claude-sonnet-5", body, "claude");
|
||||
expect(body.thinking).toEqual({ type: "adaptive", display: "summarized" });
|
||||
expect(body.output_config).toEqual({ effort: "high" });
|
||||
});
|
||||
|
||||
it("keeps display on budget thinking and omits it when the client sent none", () => {
|
||||
const withDisplay = { model: "claude-haiku-4-5-20251001", thinking: { type: "adaptive", display: "omitted" }, output_config: { effort: "low" }, messages: [] };
|
||||
applyThinking(FORMATS.CLAUDE, "claude-haiku-4-5-20251001", withDisplay, "claude");
|
||||
expect(withDisplay.thinking.type).toBe("enabled");
|
||||
expect(withDisplay.thinking.display).toBe("omitted");
|
||||
|
||||
const without = { model: "claude-sonnet-5", thinking: { type: "adaptive" }, output_config: { effort: "high" }, messages: [] };
|
||||
applyThinking(FORMATS.CLAUDE, "claude-sonnet-5", without, "claude");
|
||||
expect(without.thinking).toEqual({ type: "adaptive" });
|
||||
});
|
||||
});
|
||||
|
||||
describe("redact-thinking beta follows the client's display request", () => {
|
||||
it("keeps redact-thinking by default and drops it for summarized display", () => {
|
||||
expect(selectAnthropicBeta("claude-sonnet-5")).toContain("redact-thinking-2026-02-12");
|
||||
expect(selectAnthropicBeta("claude-sonnet-5", { thinking: { type: "adaptive", display: "omitted" } })).toContain("redact-thinking-2026-02-12");
|
||||
const summarized = selectAnthropicBeta("claude-sonnet-5", { thinking: { type: "adaptive", display: "summarized" } });
|
||||
expect(summarized).not.toContain("redact-thinking-2026-02-12");
|
||||
expect(summarized).toContain("interleaved-thinking-2025-05-14");
|
||||
expect(summarized).toContain("effort-2025-11-24");
|
||||
});
|
||||
});
|
||||
|
||||
describe("tool-result images reach Anthropic-compatible and Command Code upstreams", () => {
|
||||
it("hoists a tool_result image into the same user turn after the results", () => {
|
||||
const body = screenshotTurn();
|
||||
const out = hoistToolResultImages(body);
|
||||
const user = out.messages[2];
|
||||
expect(user.content[0].type).toBe("tool_result");
|
||||
expect(user.content[0].content.every((c) => c.type !== "image")).toBe(true);
|
||||
expect(user.content.some((c) => c.type === "image" && c.source?.data === PNG)).toBe(true);
|
||||
expect(user.content.find((c) => c.type === "text" && /toolu_1/.test(c.text))).toBeTruthy();
|
||||
// No image: untouched object identity.
|
||||
const plain = { messages: [{ role: "user", content: [{ type: "tool_result", tool_use_id: "x", content: "ok" }] }] };
|
||||
expect(hoistToolResultImages(plain)).toBe(plain);
|
||||
});
|
||||
|
||||
it("sends an image block to Command Code instead of a placeholder", () => {
|
||||
const openaiBody = translateRequest(FORMATS.CLAUDE, FORMATS.OPENAI, "muse-spark", screenshotTurn(), true, null, "commandcode");
|
||||
const out = openaiToCommandCodeRequest("muse-spark", openaiBody, true);
|
||||
const json = JSON.stringify(out);
|
||||
expect(json).not.toContain("[image omitted]");
|
||||
expect(json).toContain(`"type":"image"`);
|
||||
expect(json).toContain(`data:image/png;base64,${PNG}`);
|
||||
expect(json).toContain(`"mediaType":"image/png"`);
|
||||
});
|
||||
});
|
||||
@@ -114,9 +114,7 @@ describe("OpenAI → CommandCode", () => {
|
||||
).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
// openai-to-commandcode.js — image blocks now map to {type:"image", image:"data:..."}
|
||||
// FIXED: was "[image omitted]", now preserved as data URI
|
||||
it("image content is preserved", () => {
|
||||
it("image content is preserved as native CommandCode image blocks", () => {
|
||||
const out = O2CC({
|
||||
messages: [
|
||||
{
|
||||
@@ -131,6 +129,15 @@ describe("OpenAI → CommandCode", () => {
|
||||
},
|
||||
],
|
||||
});
|
||||
expect(JSON.stringify(out), "image omitted").toContain("BBBB");
|
||||
expect(JSON.stringify(out)).toContain("BBBB");
|
||||
expect(JSON.stringify(out)).not.toContain("[image omitted]");
|
||||
expect(out.params.messages[0].content).toMatchObject([
|
||||
{ type: "text", text: "look" },
|
||||
{
|
||||
type: "image",
|
||||
image: "data:image/png;base64,BBBB",
|
||||
mimeType: "image/png",
|
||||
},
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
110
tests/translator/kiro-tool-name-roundtrip.test.js
Normal file
110
tests/translator/kiro-tool-name-roundtrip.test.js
Normal file
@@ -0,0 +1,110 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import { normalizeKiroToolSpecs } from "../../open-sse/translator/concerns/kiroConversation.js";
|
||||
import { openaiToKiroRequest } from "../../open-sse/translator/request/openai-to-kiro.js";
|
||||
import { claudeToKiroRequest } from "../../open-sse/translator/request/claude-to-kiro.js";
|
||||
import { kiroToOpenAIResponse } from "../../open-sse/translator/response/kiro-to-openai.js";
|
||||
import { kiroToClaudeResponse, kiroToClaudeNonStreaming } from "../../open-sse/translator/response/kiro-to-claude.js";
|
||||
|
||||
describe("Kiro tool name normalization and roundtrip", () => {
|
||||
it("preserves consecutive underscores like mcp__gitea__search_repos without collapsing", () => {
|
||||
const { specs, nameMap } = normalizeKiroToolSpecs([
|
||||
{ name: "mcp__gitea__search_repos", description: "Search Gitea" },
|
||||
]);
|
||||
expect(specs).toHaveLength(1);
|
||||
expect(specs[0].toolSpecification.name).toBe("mcp__gitea__search_repos");
|
||||
expect(nameMap.get("mcp__gitea__search_repos")).toBe("mcp__gitea__search_repos");
|
||||
});
|
||||
|
||||
it("builds _toolNameMap for illegal characters and deduplicates colliding names", () => {
|
||||
const tools = [
|
||||
{ name: "my.tool/search", description: "tool 1" },
|
||||
{ name: "my_tool_search", description: "tool 2" },
|
||||
];
|
||||
const openaiPayload = openaiToKiroRequest("claude-sonnet-4.6", {
|
||||
tools: tools.map((t) => ({ type: "function", function: t })),
|
||||
messages: [{ role: "user", content: "hello" }],
|
||||
}, true, {});
|
||||
|
||||
expect(openaiPayload._toolNameMap).toBeInstanceOf(Map);
|
||||
// my.tool/search cleaned to my_tool_search. Since my_tool_search comes next, it becomes my_tool_search_2
|
||||
expect(openaiPayload._toolNameMap.get("my_tool_search")).toBe("my.tool/search");
|
||||
|
||||
const claudePayload = claudeToKiroRequest("claude-sonnet-4.6", {
|
||||
tools,
|
||||
messages: [{ role: "user", content: "hello" }],
|
||||
}, true, {});
|
||||
|
||||
expect(claudePayload._toolNameMap).toBeInstanceOf(Map);
|
||||
expect(claudePayload._toolNameMap.get("my_tool_search")).toBe("my.tool/search");
|
||||
});
|
||||
|
||||
it("does not attach _toolNameMap when all tool names are legal and unchanged", () => {
|
||||
const tools = [
|
||||
{ name: "mcp__gitea__search_repos", description: "Search Gitea" },
|
||||
{ name: "bash_exec", description: "Run bash" },
|
||||
];
|
||||
const payload = openaiToKiroRequest("claude-sonnet-4.6", {
|
||||
tools: tools.map((t) => ({ type: "function", function: t })),
|
||||
messages: [{ role: "user", content: "hello" }],
|
||||
}, true, {});
|
||||
|
||||
expect(payload._toolNameMap).toBeUndefined();
|
||||
});
|
||||
|
||||
it("restores original tool name in kiroToOpenAIResponse when state.toolNameMap is present", () => {
|
||||
const state = {
|
||||
toolNameMap: new Map([["my_tool_search", "my.tool/search"]]),
|
||||
};
|
||||
const event = {
|
||||
toolUseEvent: {
|
||||
toolUseId: "call_123",
|
||||
name: "my_tool_search",
|
||||
input: { q: "test" },
|
||||
},
|
||||
};
|
||||
const chunk = kiroToOpenAIResponse(event, state);
|
||||
expect(chunk).not.toBeNull();
|
||||
expect(chunk.choices[0].delta.tool_calls[0].function.name).toBe("my.tool/search");
|
||||
});
|
||||
|
||||
it("restores original tool name in kiroToClaudeResponse streaming when state.toolNameMap is present", () => {
|
||||
const state = {
|
||||
toolNameMap: new Map([["my_tool_search", "my.tool/search"]]),
|
||||
toolCalls: new Map(),
|
||||
nextBlockIndex: 0,
|
||||
};
|
||||
const chunk = {
|
||||
id: "chatcmpl-1",
|
||||
choices: [{
|
||||
delta: {
|
||||
tool_calls: [{
|
||||
index: 0,
|
||||
id: "call_123",
|
||||
type: "function",
|
||||
function: { name: "my_tool_search", arguments: "" },
|
||||
}],
|
||||
},
|
||||
}],
|
||||
};
|
||||
const events = kiroToClaudeResponse(chunk, state);
|
||||
const startEvent = events.find((e) => e.type === "content_block_start");
|
||||
expect(startEvent).toBeDefined();
|
||||
expect(startEvent.content_block.name).toBe("my.tool/search");
|
||||
});
|
||||
|
||||
it("restores original tool name in kiroToClaudeNonStreaming when toolNameMap is present", () => {
|
||||
const data = {
|
||||
choices: [{
|
||||
message: {
|
||||
tool_calls: [{
|
||||
id: "call_123",
|
||||
function: { name: "my_tool_search", arguments: "{}" },
|
||||
}],
|
||||
},
|
||||
}],
|
||||
toolNameMap: new Map([["my_tool_search", "my.tool/search"]]),
|
||||
};
|
||||
const result = kiroToClaudeNonStreaming(data);
|
||||
expect(result.content[0].name).toBe("my.tool/search");
|
||||
});
|
||||
});
|
||||
@@ -250,6 +250,29 @@ describe("applyThinking per provider format", () => {
|
||||
const out = apply("gemini-cli", "gemini-3.5-flash-lite", { reasoning_effort: "medium" }, "gemini-cli");
|
||||
expect(out.generationConfig.thinkingConfig.thinkingLevel).toBe("medium");
|
||||
});
|
||||
it("commandcode envelope writes params.reasoning_effort, not wrapper fields", () => {
|
||||
const out = apply("commandcode", "deepseek/deepseek-v4.1-flash", {
|
||||
params: { model: "deepseek/deepseek-v4.1-flash", messages: [] },
|
||||
reasoning_effort: "high",
|
||||
}, "commandcode");
|
||||
expect(out.params.reasoning_effort).toBe("high");
|
||||
expect(out.reasoning_effort).toBeUndefined();
|
||||
expect(out.thinking).toBeUndefined();
|
||||
});
|
||||
it("commandcode preserves low effort instead of remapping to high", () => {
|
||||
const out = apply("commandcode", "deepseek/deepseek-v4.1-flash", {
|
||||
params: { messages: [] },
|
||||
reasoning_effort: "low",
|
||||
}, "commandcode");
|
||||
expect(out.params.reasoning_effort).toBe("low");
|
||||
});
|
||||
it("commandcode preserves max effort", () => {
|
||||
const out = apply("commandcode", "deepseek/deepseek-v4.1-flash", {
|
||||
params: { messages: [] },
|
||||
reasoning_effort: "max",
|
||||
}, "commandcode");
|
||||
expect(out.params.reasoning_effort).toBe("max");
|
||||
});
|
||||
});
|
||||
|
||||
describe("extractReasoningText (response shapes)", () => {
|
||||
|
||||
Reference in New Issue
Block a user