sparkecoder 0.1.122 → 0.1.124

package/dist/agent/index.d.ts

@@ -1,6 +1,6 @@
 import 'ai';
-import '../schema-DxrKyetI.js';
-export { A as Agent, a as AgentOptions, b as AgentRunOptions, c as AgentStreamResult, C as ContextManager, M as MessageAttachment, d as buildSystemPrompt, e as buildTaskPromptAddendum } from '../index-DczYH89U.js';
-import '../search-CVVfuBPZ.js';
+import '../schema-BWbWmfDQ.js';
+export { A as Agent, a as AgentOptions, b as AgentRunOptions, c as AgentStreamResult, C as ContextManager, M as MessageAttachment, d as buildSystemPrompt, e as buildTaskPromptAddendum } from '../index-Bcz0aCAR.js';
+import '../search-DOzC4ojH.js';
 import 'drizzle-orm/sqlite-core';
 import 'zod';

package/dist/agent/index.js

@@ -6865,6 +6865,7 @@ ${summaryContent}`
       ];
     }
     messages = repairToolPairing(messages);
+    messages = ensureToolResultsFollowCalls(messages);
     messages = ensureEndsWithUserOrTool(messages);
     return messages;
   }
@@ -7059,7 +7060,7 @@ ${summaryContent}`
     }
   }
   async addResponseMessages(messages) {
-    const safe = repairToolPairing(messages);
+    const safe = ensureToolResultsFollowCalls(repairToolPairing(messages));
     await messageQueries.addMany(this.sessionId, safe);
     try {
       const { appendTurn: appendTurn2, flattenContent: flattenContent2 } = await Promise.resolve().then(() => (init_conversation_archive(), conversation_archive_exports));
@@ -7133,6 +7134,55 @@ function wrapToolsNeverThrow(tools) {
   }
   return wrapped;
 }
+function ensureToolResultsFollowCalls(messages) {
+  if (!Array.isArray(messages) || messages.length < 3) return messages;
+  let mutated = false;
+  const result = messages.slice();
+  let i = 0;
+  while (i < result.length) {
+    const msg = result[i];
+    if (msg?.role !== "assistant" || !Array.isArray(msg.content)) {
+      i++;
+      continue;
+    }
+    const callIds = /* @__PURE__ */ new Set();
+    for (const part of msg.content) {
+      if (part?.type === "tool-call" && typeof part.toolCallId === "string") {
+        callIds.add(part.toolCallId);
+      }
+    }
+    if (callIds.size === 0) {
+      i++;
+      continue;
+    }
+    let toolIdx = -1;
+    for (let j = i + 1; j < result.length; j++) {
+      const m = result[j];
+      if (m?.role === "assistant" && Array.isArray(m.content) && m.content.some((p) => p?.type === "tool-call")) {
+        break;
+      }
+      if (m?.role === "tool" && Array.isArray(m.content)) {
+        const answersOne = m.content.some(
+          (p) => p?.type === "tool-result" && typeof p.toolCallId === "string" && callIds.has(p.toolCallId)
+        );
+        if (answersOne) {
+          toolIdx = j;
+          break;
+        }
+      }
+    }
+    if (toolIdx > i + 1) {
+      const [toolMsg] = result.splice(toolIdx, 1);
+      result.splice(i + 1, 0, toolMsg);
+      mutated = true;
+      console.warn(
+        `[tool-repair] Reordered tool-result message from index ${toolIdx} to ${i + 1} to immediately follow assistant tool-call(s) (${[...callIds].join(", ")}). ${toolIdx - i - 1} message(s) were wedged between them.`
+      );
+    }
+    i++;
+  }
+  return mutated ? result : messages;
+}
 function repairToolPairing(messages) {
   const toolCallIds = /* @__PURE__ */ new Set();
   const toolResultIds = /* @__PURE__ */ new Set();
@@ -8327,7 +8377,7 @@ ${prompt}` });
     const config = getConfig();
     const userContent = this.buildUserMessageContent(options.prompt, options.attachments);
     if (!options.skipSaveUserMessage) {
-      this.context.addUserMessage(userContent);
+      await this.context.addUserMessage(userContent);
     }
     await sessionQueries.updateStatus(this.session.id, "active");
     let systemPrompt = await buildSystemPrompt({
@@ -8375,9 +8425,10 @@ ${personality.trim()}`;
       // aborted mid-tool). Repairing in `prepareStep` guarantees no orphan
       // ever reaches the model and we never hit AI_MissingToolResultsError.
       prepareStep: async ({ messages: stepMessages }) => {
-        const repaired = repairToolPairing(stepMessages);
-        if (repaired === stepMessages) return {};
-        return { messages: repaired };
+        const paired = repairToolPairing(stepMessages);
+        const ordered = ensureToolResultsFollowCalls(paired);
+        if (ordered === stepMessages) return {};
+        return { messages: ordered };
       },
       onStepFinish: async (step) => {
         options.onStepFinish?.(step);
@@ -8390,7 +8441,7 @@ ${personality.trim()}`;
       const result = await stream;
       const response = await result.response;
       const responseMessages = response.messages;
-      this.context.addResponseMessages(responseMessages);
+      await this.context.addResponseMessages(responseMessages);
     };
     return {
       sessionId: this.session.id,
@@ -8404,7 +8455,7 @@ ${personality.trim()}`;
    */
   async run(options) {
     const config = getConfig();
-    this.context.addUserMessage(options.prompt);
+    await this.context.addUserMessage(options.prompt);
     const systemPrompt = await buildSystemPrompt({
       workingDirectory: this.session.workingDirectory,
       skillsDirectories: config.resolvedSkillsDirectories,
@@ -8428,13 +8479,14 @@ ${personality.trim()}`;
       } : void 0,
       // Repair tool pairing before every step (see `stream()` for full rationale).
       prepareStep: async ({ messages: stepMessages }) => {
-        const repaired = repairToolPairing(stepMessages);
-        if (repaired === stepMessages) return {};
-        return { messages: repaired };
+        const paired = repairToolPairing(stepMessages);
+        const ordered = ensureToolResultsFollowCalls(paired);
+        if (ordered === stepMessages) return {};
+        return { messages: ordered };
       }
     });
     const responseMessages = result.response.messages;
-    this.context.addResponseMessages(responseMessages);
+    await this.context.addResponseMessages(responseMessages);
     return {
       text: result.text,
       steps: result.steps
@@ -8617,9 +8669,10 @@ ${p.text}` : p.text;
         // See the matching note in `stream()` — repair tool pairing before
         // every step so we never feed the model an orphan tool-call.
         prepareStep: async ({ messages: stepMessages }) => {
-          const repaired = repairToolPairing(stepMessages);
-          if (repaired === stepMessages) return {};
-          return { messages: repaired };
+          const paired = repairToolPairing(stepMessages);
+          const ordered = ensureToolResultsFollowCalls(paired);
+          if (ordered === stepMessages) return {};
+          return { messages: ordered };
         },
         onStepFinish: async (step) => {
           options.onStepFinish?.(step);