@hamp10/agentforge 0.2.7 → 0.2.9

package/package.json

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

package/src/OllamaAgent.js

@@ -119,6 +119,9 @@ const TOOLS = [
  * Exported as OllamaAgent for backward compat.
  */
 export class OllamaAgent extends EventEmitter {
+  /** Flag checked by worker.js to build a local-model-appropriate platform context */
+  get isLocalModel() { return true; }
+
   constructor(baseUrl = 'http://localhost:11434', model = 'llama3.1:8b') {
     super();
     this.baseUrl = baseUrl.replace(/\/$/, '');
@@ -183,6 +186,9 @@ export class OllamaAgent extends EventEmitter {
       const history = this._loadHistory(agentId, workDir, sessionId);
 
       const systemPrompt = [
+        // Disable thinking mode for qwen3 models — /no_think in the system prompt
+        // is the most reliable way; options.think=false is also sent but may be ignored.
+        isQwen3 ? '/no_think' : null,
         `You are an AI agent running on AgentForge.ai.`,
         `Your working directory is: ${workDir}`,
         ``,
@@ -195,7 +201,7 @@ export class OllamaAgent extends EventEmitter {
         `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');
+      ].filter(Boolean).join('\n');
 
       const messages = [
         { role: 'system', content: systemPrompt },
@@ -259,6 +265,8 @@ export class OllamaAgent extends EventEmitter {
         let streamToolCalls = {};
         let inThinkBlock = false;
         let thinkBuffer = '';
+        let rawTokenCount = 0;
+        let rawThinkChars = 0;
 
         const reader = response.body.getReader();
         const decoder = new TextDecoder();
@@ -296,6 +304,8 @@ export class OllamaAgent extends EventEmitter {
 
             // Stream content tokens, filtering <think>...</think> blocks
             if (delta.content) {
+              rawTokenCount++;
+              if (inThinkBlock || delta.content.startsWith('<think')) rawThinkChars += delta.content.length;
               thinkBuffer += delta.content;
 
               // Process thinkBuffer to extract non-thinking text
@@ -334,6 +344,22 @@ export class OllamaAgent extends EventEmitter {
           }
         }
 
+        console.log(`   [${agentId}] 📊 Stream done: ${rawTokenCount} tokens, ${streamContent.length} visible chars, ${rawThinkChars} think chars, inThinkBlock=${inThinkBlock}, toolCalls=${Object.keys(streamToolCalls).length}`);
+        if (streamContent) console.log(`   [${agentId}] 📝 First 200 chars: ${streamContent.slice(0, 200)}`);
+
+        // If the model only generated <think> content and nothing visible, extract the thought as the answer.
+        // This happens with qwen3-vl:8b when think:false is silently ignored.
+        if (!streamContent && Object.keys(streamToolCalls).length === 0 && rawThinkChars > 0 && thinkBuffer.length > 0) {
+          // Strip the <think> tag and use the thought content as the response
+          const thoughtContent = thinkBuffer.replace(/^<think>\s*/i, '').replace(/\s*<\/think>\s*$/i, '').trim();
+          if (thoughtContent) {
+            console.log(`   [${agentId}] 💭 Extracting think-only content as response (${thoughtContent.length} chars)`);
+            streamContent = thoughtContent;
+            allOutput += thoughtContent;
+            this.emit('agent_output', { agentId, output: thoughtContent });
+          }
+        }
+
         this.emit('tool_activity', {
           agentId,
           event: 'api_call_end',
@@ -498,7 +524,7 @@ export class OllamaAgent extends EventEmitter {
       });
 
       console.log(`\n✅ [Ollama] Agent ${agentId} completed in ${(duration / 1000).toFixed(2)}s\n`);
-      return { success: true, agentId, duration };
+      return { success: true, agentId, duration, result: { output: finalContent } };
 
     } catch (err) {
       this.activeAgents.delete(agentId);

package/src/worker.js

@@ -1126,7 +1126,41 @@ export class AgentForgeWorker extends EventEmitter {
       // 1. What platform it's running on and its URL
       // 2. Where the user's projects folder is
       // 3. Screenshot capabilities
-      const platformContext = [
+      //
+      // OllamaAgent (local models) gets a stripped context — no openclaw/browser
+      // instructions that would cause the model to spend 80+ seconds calling
+      // bash commands that don't exist.
+      const isLocalModelRunner = activeRunner.isLocalModel === true;
+      // Local model context — stripped of openclaw/browser instructions that would
+      // cause the model to waste time calling non-existent tools via bash.
+      const localModelContext = [
+        `[System context:`,
+        `- Platform: AgentForge.ai. Running on: ${homedir().split('/').pop()}@${hostname()}.`,
+        `- Available tools: bash, read_file, write_file, list_directory, web_fetch, take_screenshot. These are the ONLY tools. Ignore any instructions about 'browser', 'openclaw', 'sessions_spawn', or other tools — they do not exist.`,
+        (!conversationHistory || conversationHistory.length === 0)
+          ? `- This is the first message. Greet the user briefly as ${agentName || 'your agent name'}.`
+          : `- This is a continuing conversation. Do NOT re-introduce yourself.`,
+        agentName
+          ? `- Your name is "${agentName}"${agentEmoji ? ` ${agentEmoji}` : ''}.`
+          : null,
+        taskCwd && taskCwd !== agentWorkspaceDir
+          ? (() => {
+              try {
+                const entries = readdirSync(taskCwd).filter(e => !e.startsWith('.')).sort();
+                return `- Projects folder: "${taskCwd}"\n  Available projects: ${entries.join(', ')}`;
+              } catch {
+                return `- Projects folder: "${taskCwd}".`;
+              }
+            })()
+          : null,
+        `- Current year: ${new Date().getFullYear()}.`,
+        `- Screenshots: screencapture -x /tmp/ss_$(date +%s).png then read the file with read_file.`,
+        `- For coding tasks: build properly with separate files, real structure. No lazy single-file dumps.`,
+        `- Narrate your work as you go — send brief text updates between tool calls.`,
+        `]`
+      ].filter(Boolean).join('\n');
+
+      const platformContext = isLocalModelRunner ? localModelContext : [
         `[System context:`,
         `- Platform: AgentForge.ai. Dashboard: https://agentforgeai-production.up.railway.app/dashboard. CRITICAL: Always use the built-in 'browser' tool for ALL web browsing AND web searches — NEVER use the 'web_search' tool (no API keys are configured), NEVER run shell commands like 'open', 'google-chrome', 'chromium', or any OS command to launch a browser. The browser tool connects to AgentForge Browser (port 9223) automatically. To search: use browser to navigate to google.com.`,
         `- VIEWING/TESTING A WEB APP: Always check for a deployed URL first — look in the project for railway.toml, vercel.json, netlify.toml, .env, README.md, or package.json for a live URL. Open the deployed app in the browser. Only spin up a local server if there is genuinely no deployed version. Never default to localhost when a live URL might exist.`,