@ai-setting/roy-agent-core 1.7.72 → 1.7.76

package/dist/shared/@ai-setting/{roy-agent-core-40rv283c.js → roy-agent-core-fghc2m8z.js}

@@ -838,6 +838,126 @@ import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 init_logger();
 
+// src/env/llm/orphan-toolcall.ts
+var ORPHAN_PLACEHOLDER_PREFIX = "[Tool result missing: run interrupted]";
+function toolNameOf(tc) {
+  return tc.function?.name || tc.name || "unknown";
+}
+function extractPendingEvent(msg, events) {
+  const added = [];
+  const removed = [];
+  const toolCalls = msg.toolCalls;
+  if (Array.isArray(toolCalls)) {
+    for (const tc of toolCalls) {
+      if (tc?.id)
+        added.push({ id: tc.id, name: toolNameOf(tc) });
+    }
+  }
+  const content = msg.content;
+  if (Array.isArray(content)) {
+    for (const part of content) {
+      if (!part)
+        continue;
+      if (part.type === "tool-call" && typeof part.toolCallId === "string") {
+        added.push({
+          id: part.toolCallId,
+          name: typeof part.toolName === "string" ? part.toolName : "unknown"
+        });
+      }
+      if (part.type === "tool-result" && typeof part.toolCallId === "string") {
+        removed.push(part.toolCallId);
+      }
+    }
+  }
+  if (msg.role === "tool" && typeof msg.toolCallId === "string") {
+    removed.push(msg.toolCallId);
+  }
+  events.push({ added, removed });
+}
+function collectOrphans(roles, events) {
+  const pending = new Map;
+  const orphans = [];
+  const reported = new Set;
+  for (let index = 0;index < roles.length; index++) {
+    const { added, removed } = events[index];
+    for (const id of removed)
+      pending.delete(id);
+    for (const { id, name } of added) {
+      if (!pending.has(id))
+        pending.set(id, name);
+    }
+    const role = roles[index];
+    if ((role === "user" || role === "system") && pending.size > 0) {
+      for (const [id, name] of pending) {
+        if (!reported.has(id)) {
+          reported.add(id);
+          orphans.push({ toolCallId: id, toolName: name, messageIndex: index });
+        }
+      }
+      pending.clear();
+    }
+  }
+  for (const [id, name] of pending) {
+    if (!reported.has(id)) {
+      reported.add(id);
+      orphans.push({
+        toolCallId: id,
+        toolName: name,
+        messageIndex: roles.length
+      });
+    }
+  }
+  return orphans;
+}
+function repairOrphanSdkMessages(messages, options) {
+  const events = [];
+  const roles = [];
+  for (const msg of messages) {
+    roles.push(msg.role);
+    extractPendingEvent(msg, events);
+  }
+  const orphans = collectOrphans(roles, events);
+  if (orphans.length === 0) {
+    return { messages, orphans: [], repairedCount: 0 };
+  }
+  const reason = options?.reason ?? "context limit or crash";
+  const value = JSON.stringify({ error: `${ORPHAN_PLACEHOLDER_PREFIX} ${reason}` });
+  const byIndex = new Map;
+  for (const orphan of orphans) {
+    const list = byIndex.get(orphan.messageIndex) ?? [];
+    list.push(orphan);
+    byIndex.set(orphan.messageIndex, list);
+  }
+  const result = [];
+  const endGroup = byIndex.get(messages.length);
+  const placeholder = (orphan) => ({
+    role: "tool",
+    content: [
+      {
+        type: "tool-result",
+        toolCallId: orphan.toolCallId,
+        toolName: orphan.toolName,
+        output: { type: "text", value }
+      }
+    ]
+  });
+  messages.forEach((msg, index) => {
+    const group = byIndex.get(index);
+    if (group) {
+      for (const orphan of group) {
+        result.push(placeholder(orphan));
+      }
+    }
+    result.push(msg);
+  });
+  if (endGroup) {
+    for (const orphan of endGroup) {
+      result.push(placeholder(orphan));
+    }
+  }
+  return { messages: result, orphans, repairedCount: orphans.length };
+}
+
 // src/env/llm/llm-cache.ts
 function isOpenAICompatibleProvider(providerName) {
   return providerName === "openai-compatible" || providerName === "openai" || providerName.startsWith("minimax") || providerName === "deepseek" || providerName.startsWith("deepseek") || providerName === "glm" || providerName.startsWith("glm");
@@ -1207,6 +1327,24 @@ function convertToSDKMessages(messages, options) {
       };
     }
     if (msg.role === "tool") {
+      if (!msg.toolCallId && Array.isArray(msg.content)) {
+        const part = msg.content.find((p) => p?.type === "tool-result" && typeof p.toolCallId === "string");
+        if (part) {
+          const convertedPart = {
+            role: "tool",
+            content: [{
+              type: "tool-result",
+              toolCallId: part.toolCallId,
+              toolName: part.toolName || "unknown",
+              output: {
+                type: "text",
+                value: typeof part.output === "string" ? part.output : JSON.stringify(part.output ?? "")
+              }
+            }]
+          };
+          return convertedPart;
+        }
+      }
       if (!msg.toolCallId) {
         logger3.warn("Tool message missing toolCallId", { msg });
       }
@@ -1410,6 +1548,12 @@ async function invoke(config, options, ctx) {
       sessionId: options.context?.sessionId,
       provider: providerId
     });
+    const orphanRepair = repairOrphanSdkMessages(messages, {
+      reason: "repaired before AI SDK fallback (Task #4992 defence 2)"
+    });
+    if (orphanRepair.repairedCount > 0) {
+      logger3.warn(`[invoke] Repaired ${orphanRepair.repairedCount} orphan tool-call(s) before AI SDK fallback: ` + orphanRepair.orphans.map((o) => o.toolCallId).join(", "));
+    }
     const toolCallIds = new Set;
     const assistantToolCalls = [];
     const toolResultIds = [];
@@ -1457,7 +1601,7 @@ async function invoke(config, options, ctx) {
     }
     const streamTextOptions = {
       model: provider.languageModel(modelId),
-      messages,
+      messages: orphanRepair.messages,
       tools,
       temperature: providerOptions.temperature,
       maxTokens: providerOptions.maxTokens,
@@ -1704,6 +1848,12 @@ async function invokeNonStream(config, options, ctx) {
     sessionId: options.context?.sessionId,
     provider: providerId
   });
+  const orphanRepair = repairOrphanSdkMessages(messages, {
+    reason: "repaired before AI SDK generateText (Task #4992 defence 2)"
+  });
+  if (orphanRepair.repairedCount > 0) {
+    logger3.warn(`[invokeNonStream] Repaired ${orphanRepair.repairedCount} orphan tool-call(s): ` + orphanRepair.orphans.map((o) => o.toolCallId).join(", "));
+  }
   const tools = options.tools && options.tools.length > 0 ? convertToolsToSDK(options.tools, providerId) : undefined;
   const providerOptions = generateProviderOptions(providerId, {
     temperature: options.temperature,
@@ -1713,7 +1863,7 @@ async function invokeNonStream(config, options, ctx) {
   const genTextFn = generateText;
   const result = await genTextFn({
     model: provider.languageModel(modelId),
-    messages,
+    messages: orphanRepair.messages,
     tools,
     temperature: providerOptions.temperature,
     maxTokens: providerOptions.maxTokens,