@hamp10/agentforge 0.2.5 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hamp10/agentforge",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "AgentForge worker — connect your machine to agentforge.ai",
   "type": "module",
   "bin": {

package/src/OllamaAgent.js

@@ -160,8 +160,11 @@ export class OllamaAgent extends EventEmitter {
     const startTime = Date.now();
     const controller = new AbortController();
 
-    // Use per-agent model override if provided (and not the placeholder 'Default')
-    const effectiveModel = (agentModel && agentModel !== 'Default') ? agentModel : this.model;
+    // Use per-agent model override if provided (and not the placeholder 'Default').
+    // Strip 'ollama/' prefix — catalog returns IDs like 'ollama/qwen3-vl:8b' but
+    // Ollama's API expects bare names like 'qwen3-vl:8b'.
+    const rawModel = (agentModel && agentModel !== 'Default') ? agentModel : this.model;
+    const effectiveModel = rawModel.startsWith('ollama/') ? rawModel.slice(7) : rawModel;
 
     // Fake proc-like object so worker.js pid checks don't crash
     const fakeProc = { pid: null };
@@ -190,6 +193,8 @@ export class OllamaAgent extends EventEmitter {
         `4. When you take a screenshot, you will receive the actual image back and can see it.`,
         `5. When you are done, write a clear summary of what you accomplished.`,
         `6. Do not ask for clarification — make your best judgment and act.`,
+        `7. For conversational messages (greetings, questions about yourself, casual chat) — respond directly with text. Do NOT use tools just to say hello.`,
+        `8. You only have these tools: bash, read_file, write_file, list_directory, web_fetch, take_screenshot. Ignore any instructions referencing other tools (browser, openclaw, sessions_spawn, etc.) — those do not exist here.`,
       ].join('\n');
 
       const messages = [
@@ -207,7 +212,8 @@ export class OllamaAgent extends EventEmitter {
 
       let finalContent = '';
       let allOutput = ''; // accumulate everything streamed across all turns
-      const MAX_TURNS = 25;
+      const toolsUsed = []; // track tool names called (for fallback summary)
+      const MAX_TURNS = 15; // reduce from 25 — local models get stuck in tool loops
 
       for (let turn = 0; turn < MAX_TURNS; turn++) {
         if (controller.signal.aborted) break;
@@ -360,6 +366,7 @@ export class OllamaAgent extends EventEmitter {
             });
 
             console.log(`   [${agentId}] 🔧 ${name}: ${JSON.stringify(parsedArgs).slice(0, 120)}`);
+            toolsUsed.push(name);
 
             const result = await this._executeTool(name, parsedArgs, workDir);
 
@@ -410,10 +417,15 @@ export class OllamaAgent extends EventEmitter {
         finalContent = allOutput;
       }
 
-      // If still no output (model did only tool calls, never wrote text), ask for a summary
+      // If still no output (model did only tool calls, never wrote text), ask for a summary.
+      // Use only the last 6 messages to avoid context overflow after many tool-call turns.
       if (!finalContent && !controller.signal.aborted) {
         this.emit('agent_output', { agentId, output: '\n' });
-        messages.push({ role: 'user', content: 'Summarize what you just did and show me the result.' });
+        const summaryMessages = [
+          messages[0], // system prompt
+          ...messages.slice(-6), // last 6 messages (recent tool calls + results)
+          { role: 'user', content: 'Summarize what you just did and show me the result.' }
+        ];
 
         try {
           const summaryRes = await fetch(`${this.baseUrl}/v1/chat/completions`, {
@@ -422,7 +434,7 @@ export class OllamaAgent extends EventEmitter {
             signal: controller.signal,
             body: JSON.stringify({
               model: effectiveModel,
-              messages,
+              messages: summaryMessages,
               stream: true,
               ...(isQwen3 ? { options: { think: false } } : {})
             })
@@ -451,8 +463,19 @@ export class OllamaAgent extends EventEmitter {
                 }
               }
             }
+          } else {
+            console.warn(`⚠️ [Ollama] Force-summary failed: ${summaryRes.status}`);
           }
-        } catch {}
+        } catch (summaryErr) {
+          console.warn(`⚠️ [Ollama] Force-summary error: ${summaryErr.message}`);
+        }
+
+        // Last-resort fallback: construct output from tool activity so user sees something
+        if (!finalContent && toolsUsed.length > 0) {
+          const unique = [...new Set(toolsUsed)];
+          finalContent = `I ran the following operations: ${unique.join(', ')}. Task complete.`;
+          this.emit('agent_output', { agentId, output: finalContent });
+        }
       }
 
       // Persist history for next task