diff --git a/src/agents/provider-capabilities.ts b/src/agents/provider-capabilities.ts
index c52be686387..dd3bcfb2a84 100644
--- a/src/agents/provider-capabilities.ts
+++ b/src/agents/provider-capabilities.ts
@@ -50,6 +50,10 @@ const PLUGIN_CAPABILITIES_FALLBACKS: Record<string, Partial<ProviderCapabilities
     providerFamily: "anthropic",
     dropThinkingBlockModelHints: ["claude"],
   },
+  moonshot: {
+    transcriptToolCallIdMode: "strict",
+    transcriptToolCallIdModelHints: ["kimi", "moonshot"],
+  },
   mistral: {
     transcriptToolCallIdMode: "strict9",
     transcriptToolCallIdModelHints: [
@@ -197,10 +201,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