From 42cd74528f9cede5a7f933eebc1f865d45b8e212 Mon Sep 17 00:00:00 2001
From: Jason Simon <jason@example.com>
Date: Fri, 20 Mar 2026 12:05:03 -0500
Subject: [PATCH] fix: Add Moonshot provider tool call ID sanitization to
 prevent 'duplicated' errors

- Add Moonshot to PLUGIN_CAPABILITIES_FALLBACKS with transcriptToolCallIdMode: 'strict'
- Update resolveTranscriptToolCallIdMode to return 'strict' mode in addition to 'strict9'
- Enable sanitizeToolCallIds when providerToolCallIdMode is set

Fixes HTTP 400 error: 'tool call id write:XXX is duplicated' when using Moonshot/Kimi provider
---
 src/agents/provider-capabilities.ts | 8 ++++++--
 src/agents/transcript-policy.ts     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/agents/provider-capabilities.ts b/src/agents/provider-capabilities.ts
index 2fe11666766..0b68d97f4f6 100644
--- a/src/agents/provider-capabilities.ts
+++ b/src/agents/provider-capabilities.ts
@@ -46,6 +46,10 @@ const PLUGIN_CAPABILITIES_FALLBACKS: Record<string, Partial<ProviderCapabilities
     providerFamily: "anthropic",
     dropThinkingBlockModelHints: ["claude"],
   },
+  moonshot: {
+    transcriptToolCallIdMode: "strict",
+    transcriptToolCallIdModelHints: ["kimi", "moonshot"],
+  },
   mistral: {
     transcriptToolCallIdMode: "strict9",
     transcriptToolCallIdModelHints: [
@@ -193,10 +197,10 @@ export function resolveTranscriptToolCallIdMode(
   provider?: string | null,
   modelId?: string | null,
   options?: ProviderCapabilityLookupOptions,
-): "strict9" | undefined {
+): "strict9" | "strict" | undefined {
   const capabilities = resolveProviderCapabilities(provider, options);
   const mode = capabilities.transcriptToolCallIdMode;
-  if (mode === "strict9") {
+  if (mode === "strict9" || mode === "strict") {
     return mode;
   }
   if (modelIncludesAnyHint(modelId, capabilities.transcriptToolCallIdModelHints)) {
diff --git a/src/agents/transcript-policy.ts b/src/agents/transcript-policy.ts
index 784770f2e28..9d82fc0c521 100644
--- a/src/agents/transcript-policy.ts
+++ b/src/agents/transcript-policy.ts
@@ -92,7 +92,7 @@ export function resolveTranscriptPolicy(params: {
     isGoogle || isAnthropic || isMistral || shouldSanitizeGeminiThoughtSignaturesForProvider;
 
   const sanitizeToolCallIds =
-    isGoogle || isMistral || isAnthropic || requiresOpenAiCompatibleToolIdSanitization;
+    isGoogle || isMistral || isAnthropic || requiresOpenAiCompatibleToolIdSanitization || !!providerToolCallIdMode;
   const toolCallIdMode: ToolCallIdMode | undefined = providerToolCallIdMode
     ? providerToolCallIdMode
     : isMistral