Skip to content
TypeScript

fix(provider-acp): Kiro's html_render pages show in the thread (#28253)

Julius Marminge8c9945d44d4b
diff --git a/packages/provider-acp/src/server/runtimeModel.test.ts b/packages/provider-acp/src/server/runtimeModel.test.ts
index c35789ec47d..086628fcfae 100644
--- a/packages/provider-acp/src/server/runtimeModel.test.ts
+++ b/packages/provider-acp/src/server/runtimeModel.test.ts
@@ -1366,6 +1366,20 @@ describe("extractMcpToolCallIdentity", () => {
}
});
+ it("recovers T3 identity from Kiro's @-scoped titles", () => {
+ for (const tool of ["html_render", "t3_thread_read", "delegate_task"]) {
+ const toolCall = toolCallFromUpdate({
+ sessionUpdate: "tool_call",
+ toolCallId: "kiro-1",
+ kind: "other",
+ title: `@t3-code/${tool}`,
+ status: "pending",
+ rawInput: { tool_id: `t3-code::${tool}`, arguments: { threadId: "thread-1" } },
+ });
+ expect(extractMcpToolCallIdentity(toolCall), tool).toEqual({ server: "t3-code", tool });
+ }
+ });
+
it("does not claim an agent's own tool that shares a T3 tool name", () => {
const toolCall = toolCallFromUpdate({
sessionUpdate: "tool_call",
diff --git a/packages/provider-acp/src/server/runtimeModel.ts b/packages/provider-acp/src/server/runtimeModel.ts
index ba571af271d..bc418eefcb2 100644
--- a/packages/provider-acp/src/server/runtimeModel.ts
+++ b/packages/provider-acp/src/server/runtimeModel.ts
@@ -1067,9 +1067,9 @@ function acpMcpFallbackInput(value: string | undefined): Record<string, unknown>
return undefined;
}
-// Known T3 inventory gates matches, so server-name separators can stay loose.
+// Known T3 inventory gates matches, so server-name separators can stay loose. Kiro titles "@t3-code/<tool>".
const T3_MCP_TITLE_CALL =
- /^(?:mcp[-_]{1,2})?t3[-_ ]?code[-_.:/ ]{1,3}(?<tool>[A-Za-z0-9][A-Za-z0-9_.-]*)(?::.*)?$/i;
+ /^(?:@|mcp[-_]{1,2})?t3[-_ ]?code[-_.:/ ]{1,3}(?<tool>[A-Za-z0-9][A-Za-z0-9_.-]*)(?::.*)?$/i;
const T3_MCP_TITLE_SUFFIX_CALL =
/^(?<tool>[A-Za-z0-9][A-Za-z0-9_.-]*?)(?: \(t3[-_ ]?code MCP Server\)(?::|$)|[-_.]t3[-_ ]?code$)/i;