@p-sw/brainbox 0.1.2-alpha.12 → 0.1.2-alpha.13

package/dist/index.js

@@ -597,6 +597,42 @@ function readAuthString(auth, key, envName) {
 }
 
 class LLMExecutor {
+  async chatWithToolExecution(model, options) {
+    const messages = options.messages.slice();
+    const maxSteps = options.maxSteps ?? 20;
+    let last;
+    for (let step = 0;step < maxSteps; step += 1) {
+      log2.debug(`chatWithToolExecution: step ${step + 1}/${maxSteps} msgs=${messages.length}`);
+      last = await this.chatWithTools(model, {
+        instruction: options.instruction,
+        messages,
+        tools: options.tools,
+        caller: options.caller,
+        reasoningEffort: options.reasoningEffort,
+        parallelToolCalls: options.parallelToolCalls,
+        toolChoice: options.toolChoice
+      });
+      const toolCalls = last.message.toolCalls ?? [];
+      log2.debug(`chatWithToolExecution: step ${step + 1} toolCalls=${toolCalls.length}`);
+      if (toolCalls.length === 0)
+        return last;
+      messages.push({
+        role: "assistant",
+        content: last.message.content,
+        toolCalls
+      });
+      for (const call of toolCalls) {
+        const content = await options.executeTool(call);
+        messages.push({
+          role: "tool",
+          toolCallId: call.id,
+          content
+        });
+      }
+    }
+    log2.warn(`chatWithToolExecution: reached maxSteps (${maxSteps}) without final reply`);
+    return last;
+  }
   static providers = [];
   static registerProvider(p) {
     LLMExecutor.providers.push(p);
@@ -3141,75 +3177,46 @@ class Brain {
         content: userPrompt
       }
     ];
-    for (let step = 0;step < maxSteps; step += 1) {
-      log7.debug(`sendMessage: step ${step + 1}/${maxSteps} → model`);
-      let choice;
-      try {
-        choice = await llm.chatWithTools(llm.models.conversation, {
-          caller: initiate ? "start-conversation" : "send-message",
-          instruction: `${this.brainbase.baseSystemPrompt}
+    try {
+      await llm.chatWithToolExecution(llm.models.conversation, {
+        caller: initiate ? "start-conversation" : "send-message",
+        instruction: `${this.brainbase.baseSystemPrompt}
 
 ${instruction}`,
-          messages,
-          tools
-        });
-      } catch (error) {
-        const reason = error instanceof Error ? error.message : String(error);
-        logger.error(`sendMessage: LLM call failed at step ${step}: ${reason}`);
-        return replyMessages;
-      }
-      const assistantMessage = choice.message;
-      const toolCalls = assistantMessage.toolCalls ?? [];
-      const hasContent = typeof assistantMessage.content === "string" && assistantMessage.content.length > 0;
-      log7.debug(`sendMessage: step ${step + 1} → toolCalls=${toolCalls.length} hasContent=${hasContent}`);
-      if (toolCalls.length === 0) {
-        log7.debug(`sendMessage: model returned no tool calls; finalising with ${replyMessages.length} replies`);
-        return replyMessages;
-      }
-      messages.push(stripAssistantForHistory(assistantMessage));
-      for (const call of toolCalls) {
-        if (call.function.name === "addReplyMessage") {
-          const content = parseAddReplyMessageArguments(call.function.arguments);
-          if (content !== null) {
-            log7.debug(`sendMessage: addReplyMessage[${replyMessages.length}] (${content.length} chars)`);
-            send(content);
-            replyMessages.push(content);
-          } else {
+        messages,
+        tools,
+        maxSteps,
+        executeTool: async (call) => {
+          if (call.function.name === "addReplyMessage") {
+            const content = parseAddReplyMessageArguments(call.function.arguments);
+            if (content !== null) {
+              log7.debug(`sendMessage: addReplyMessage[${replyMessages.length}] (${content.length} chars)`);
+              await send(content);
+              replyMessages.push(content);
+              return JSON.stringify({
+                ok: true,
+                index: replyMessages.length - 1
+              });
+            }
             log7.debug(`sendMessage: addReplyMessage rejected (invalid arguments: ${call.function.arguments})`);
+            return JSON.stringify({ ok: false, error: "invalid arguments" });
           }
-          messages.push({
-            role: "tool",
-            toolCallId: call.id,
-            content: content === null ? JSON.stringify({ ok: false, error: "invalid arguments" }) : JSON.stringify({ ok: true, index: replyMessages.length - 1 })
-          });
-          continue;
-        }
-        if (call.function.name === "searchMemory") {
-          log7.debug(`sendMessage: searchMemory tool call`);
-          const result = await this.executeSearchTool(call.function.arguments);
-          messages.push({
-            role: "tool",
-            toolCallId: call.id,
-            content: result
-          });
-          continue;
-        }
-        log7.debug(`sendMessage: unknown tool "${call.function.name}"`);
-        messages.push({
-          role: "tool",
-          toolCallId: call.id,
-          content: JSON.stringify({
+          if (call.function.name === "searchMemory") {
+            log7.debug(`sendMessage: searchMemory tool call`);
+            return this.executeSearchTool(call.function.arguments);
+          }
+          log7.debug(`sendMessage: unknown tool "${call.function.name}"`);
+          return JSON.stringify({
             ok: false,
             error: `Unknown tool: ${call.function.name}`
-          })
-        });
-      }
-      if (!hasContent && toolCalls.every((c) => c.function.name === "searchMemory")) {
-        log7.debug(`sendMessage: step was pure searchMemory, looping back`);
-        continue;
-      }
+          });
+        }
+      });
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      logger.error(`sendMessage: LLM call failed: ${reason}`);
     }
-    logger.warn(`sendMessage: reached maxSteps (${maxSteps}) without final reply`);
+    log7.debug(`sendMessage: done with ${replyMessages.length} replies`);
     return replyMessages;
   }
   async buildMemoryBlock() {
@@ -3461,13 +3468,6 @@ function parseSearchArguments(json) {
   }
   return null;
 }
-function stripAssistantForHistory(message) {
-  return {
-    role: "assistant",
-    content: message.content,
-    toolCalls: message.toolCalls
-  };
-}
 
 // src/channel/discord.ts
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@p-sw/brainbox",
-  "version": "0.1.2-alpha.12",
+  "version": "0.1.2-alpha.13",
   "module": "dist/index.js",
   "main": "dist/index.js",
   "type": "module",