open-agents-ai 0.101.5 → 0.101.7

package/dist/index.js

@@ -5952,35 +5952,35 @@ function discoverSkills(repoRoot) {
   if (pkgRoot) {
     const pkgFrameworks = join14(pkgRoot, "agentic", "code", "frameworks");
     if (existsSync11(pkgFrameworks)) {
-      for (const fw of safeReaddir(pkgFrameworks)) {
+      for (const fw of safeReaddir(pkgFrameworks, true)) {
         loadComponent(join14(pkgFrameworks, fw), `framework:${fw}`);
       }
     }
     const pkgAddons = join14(pkgRoot, "agentic", "code", "addons");
     if (existsSync11(pkgAddons)) {
-      for (const addon of safeReaddir(pkgAddons)) {
+      for (const addon of safeReaddir(pkgAddons, true)) {
         loadComponent(join14(pkgAddons, addon), `addon:${addon}`);
       }
     }
     const pkgPlugins = join14(pkgRoot, "plugins");
     if (existsSync11(pkgPlugins)) {
-      for (const plugin of safeReaddir(pkgPlugins)) {
+      for (const plugin of safeReaddir(pkgPlugins, true)) {
         loadComponent(join14(pkgPlugins, plugin), `plugin:${plugin}`);
       }
     }
   }
   if (existsSync11(frameworksDir)) {
-    for (const framework of safeReaddir(frameworksDir)) {
+    for (const framework of safeReaddir(frameworksDir, true)) {
       loadComponent(join14(frameworksDir, framework), `framework:${framework}`);
     }
   }
   if (existsSync11(addonsDir)) {
-    for (const addon of safeReaddir(addonsDir)) {
+    for (const addon of safeReaddir(addonsDir, true)) {
       loadComponent(join14(addonsDir, addon), `addon:${addon}`);
     }
   }
   if (existsSync11(pluginsDir)) {
-    for (const plugin of safeReaddir(pluginsDir)) {
+    for (const plugin of safeReaddir(pluginsDir, true)) {
       loadComponent(join14(pluginsDir, plugin), `plugin:${plugin}`);
     }
   }
@@ -6025,9 +6025,10 @@ function buildSkillsSummary(skills) {
   lines.push("Use `skill_execute` with a skill name to load its full instructions when a task matches a trigger pattern.");
   return lines.join("\n");
 }
-function safeReaddir(dir) {
+function safeReaddir(dir, dirsOnly = false) {
   try {
-    return readdirSync5(dir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+    const entries = readdirSync5(dir, { withFileTypes: true });
+    return dirsOnly ? entries.filter((d) => d.isDirectory()).map((d) => d.name) : entries.map((d) => d.name);
   } catch {
     return [];
   }
@@ -6039,18 +6040,34 @@ function loadSkillsFromDir(dir, source, out) {
   const entries = safeReaddir(dir);
   for (const entry of entries) {
     const skillMd = join14(dir, entry, "SKILL.md");
-    if (!existsSync11(skillMd))
+    if (existsSync11(skillMd)) {
+      const manifestEntry = manifest.get(entry);
+      const info = {
+        name: entry,
+        description: manifestEntry?.description ?? parseDescription(skillMd),
+        triggers: manifestEntry?.triggers ?? parseTriggers(skillMd),
+        source,
+        filePath: skillMd,
+        compactionStrategy: parseCompactionStrategy(skillMd)
+      };
+      out.set(entry, info);
       continue;
-    const manifestEntry = manifest.get(entry);
-    const info = {
-      name: entry,
-      description: manifestEntry?.description ?? parseDescription(skillMd),
-      triggers: manifestEntry?.triggers ?? parseTriggers(skillMd),
-      source,
-      filePath: skillMd,
-      compactionStrategy: parseCompactionStrategy(skillMd)
-    };
-    out.set(entry, info);
+    }
+    if (entry.endsWith(".md") && entry !== "manifest.json") {
+      const flatPath = join14(dir, entry);
+      const name = entry.replace(/\.md$/, "");
+      if (out.has(name))
+        continue;
+      const info = {
+        name,
+        description: parseDescription(flatPath),
+        triggers: parseTriggers(flatPath),
+        source,
+        filePath: flatPath,
+        compactionStrategy: parseCompactionStrategy(flatPath)
+      };
+      out.set(name, info);
+    }
   }
 }
 function loadCommandsFromDir(dir, source, out) {
@@ -16883,6 +16900,59 @@ var init_personality = __esm({
 });
 
 // packages/orchestrator/dist/agenticRunner.js
+function repairJson(raw) {
+  if (!raw || typeof raw !== "string")
+    return null;
+  let s = raw.trim();
+  if (s.startsWith("```")) {
+    s = s.replace(/^```(?:json)?\s*\n?/, "").replace(/\n?```\s*$/, "").trim();
+  }
+  const lastBrace = s.lastIndexOf("}");
+  if (lastBrace > 0 && lastBrace < s.length - 1) {
+    s = s.slice(0, lastBrace + 1);
+  }
+  if (!s.includes('"') && s.includes("'")) {
+    s = s.replace(/'/g, '"');
+  }
+  s = s.replace(/([{,]\s*)([a-zA-Z_]\w*)(\s*:)/g, '$1"$2"$3');
+  s = s.replace(/,\s*([}\]])/g, "$1");
+  let openBraces = 0;
+  let openBrackets = 0;
+  for (const ch of s) {
+    if (ch === "{")
+      openBraces++;
+    else if (ch === "}")
+      openBraces--;
+    else if (ch === "[")
+      openBrackets++;
+    else if (ch === "]")
+      openBrackets--;
+  }
+  while (openBrackets > 0) {
+    s += "]";
+    openBrackets--;
+  }
+  while (openBraces > 0) {
+    s += "}";
+    openBraces--;
+  }
+  s = s.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f]/g, "");
+  try {
+    const parsed = JSON.parse(s);
+    if (typeof parsed === "object" && parsed !== null)
+      return parsed;
+  } catch {
+  }
+  const kvPattern = /["']?(\w+)["']?\s*[:=]\s*["']([^"']*?)["']/g;
+  const result = {};
+  let match;
+  let found = false;
+  while ((match = kvPattern.exec(raw)) !== null) {
+    result[match[1]] = match[2];
+    found = true;
+  }
+  return found ? result : null;
+}
 function getSystemPromptForTier(tier) {
   switch (tier) {
     case "small":
@@ -16921,6 +16991,9 @@ var init_agenticRunner = __esm({
         goal: "",
         completedSteps: [],
         pendingSteps: [],
+        currentStep: "",
+        failedApproaches: [],
+        nextAction: "",
         modifiedFiles: /* @__PURE__ */ new Map(),
         toolCallCount: 0
       };
@@ -17246,6 +17319,9 @@ Respond with your assessment, then take action.`;
           goal: task.slice(0, 500),
           completedSteps: [],
           pendingSteps: [],
+          currentStep: "",
+          failedApproaches: [],
+          nextAction: "",
           modifiedFiles: /* @__PURE__ */ new Map(),
           toolCallCount: 0
         };
@@ -17276,6 +17352,7 @@ TASK: ${task}` : task }
         let bruteForceCycle = 0;
         let consecutiveTextOnly = 0;
         const MAX_CONSECUTIVE_TEXT_ONLY = 3;
+        let narratedToolCallCount = 0;
         for (let turn = 0; turn < this.options.maxTurns; turn++) {
           if (this._paused) {
             const shouldContinue = await this.waitIfPaused();
@@ -17337,6 +17414,21 @@ Integrate this guidance into your current approach. Continue working on the task
               timestamp: (/* @__PURE__ */ new Date()).toISOString()
             });
           }
+          const turnTier = this.options.modelTier ?? "large";
+          const turnBudget = turnTier === "small" ? 5 : turnTier === "medium" ? 8 : 0;
+          if (turnBudget > 0 && turn > 0 && turn % turnBudget === 0) {
+            const progress = this._taskState.completedSteps.slice(-3).join("; ");
+            const failures = this._taskState.failedApproaches.slice(-2).join("; ");
+            messages.push({
+              role: "user",
+              content: `[PROGRESS CHECK \u2014 Turn ${turn}]
+**Goal:** ${this._taskState.goal}
+` + (progress ? `**Done so far:** ${progress}
+` : "") + (failures ? `**Failed (don't repeat):** ${failures}
+` : "") + `**What is the ONE next step you need to take?** State it, then do it with a tool call.
+If you're stuck, try a completely different approach. Do NOT repeat what failed above.`
+            });
+          }
           let compacted;
           if (this._pendingCompaction) {
             const strategy = this._pendingCompaction;
@@ -17430,7 +17522,14 @@ Integrate this guidance into your current approach. Continue working on the task
               });
               const tool = this.tools.get(tc.name);
               let result;
-              if (!tool) {
+              if (tc.arguments && "_raw" in tc.arguments) {
+                const rawStr = String(tc.arguments._raw).slice(0, 200);
+                result = {
+                  success: false,
+                  output: "",
+                  error: `Your tool call had malformed JSON arguments that could not be parsed: "${rawStr}". Please call ${tc.name} again with valid JSON arguments. Make sure to use double quotes for keys and string values, and do not include trailing commas or comments.`
+                };
+              } else if (!tool) {
                 result = { success: false, output: "", error: `Unknown tool: ${tc.name}` };
               } else {
                 try {
@@ -17476,6 +17575,24 @@ ${result.output.length > maxLen ? this.foldOutput(result.output, maxLen) : resul
               });
               this._taskState.toolCallCount++;
               const filePath = typeof tc.arguments?.path === "string" ? tc.arguments.path : "";
+              if (tc.name === "file_read" || tc.name === "list_directory" || tc.name === "find_files" || tc.name === "grep_search") {
+                this._taskState.currentStep = `exploring: ${filePath || String(tc.arguments?.pattern ?? tc.arguments?.path ?? "").slice(0, 60)}`;
+              } else if (tc.name === "file_write" || tc.name === "file_edit" || tc.name === "batch_edit") {
+                this._taskState.currentStep = `editing: ${filePath}`;
+              } else if (tc.name === "shell" || tc.name === "background_run") {
+                this._taskState.currentStep = `running: ${String(tc.arguments?.command ?? "").slice(0, 60)}`;
+              } else if (tc.name !== "task_complete") {
+                this._taskState.currentStep = `${tc.name}(${filePath || "..."})`;
+              }
+              if (!result.success && tc.name !== "task_complete") {
+                const failDesc = `${tc.name}(${filePath || "..."}): ${(result.error || "").slice(0, 100)}`;
+                if (!this._taskState.failedApproaches.includes(failDesc)) {
+                  this._taskState.failedApproaches.push(failDesc);
+                  if (this._taskState.failedApproaches.length > 10) {
+                    this._taskState.failedApproaches.shift();
+                  }
+                }
+              }
               if (filePath && (tc.name === "file_read" || tc.name === "file_write" || tc.name === "file_edit" || tc.name === "batch_edit" || tc.name === "file_patch")) {
                 const isModify = tc.name !== "file_read";
                 const existing = this._fileRegistry.get(filePath);
@@ -17509,12 +17626,21 @@ ${result.output.length > maxLen ? this.foldOutput(result.output, maxLen) : resul
                 });
               }
               const enoentTools = /* @__PURE__ */ new Set(["file_read", "list_directory", "find_files"]);
-              const isEnoent = !result.success && enoentTools.has(tc.name) && /ENOENT|no such file|does not exist|not found/i.test(result.error ?? result.output);
+              const fsErrorStr = result.error ?? result.output;
+              const isEnoent = !result.success && enoentTools.has(tc.name) && /ENOENT|no such file|does not exist|not found/i.test(fsErrorStr);
+              const isEisdir = !result.success && tc.name === "file_read" && /EISDIR|illegal operation on a directory|is a directory/i.test(fsErrorStr);
               if (enoentTools.has(tc.name)) {
-                this._recentEnoents.push(isEnoent);
+                this._recentEnoents.push(isEnoent || isEisdir);
                 if (this._recentEnoents.length > 8)
                   this._recentEnoents.shift();
               }
+              if (isEisdir) {
+                const failedPath = String(tc.arguments?.["path"] ?? tc.arguments?.["file"] ?? "unknown");
+                this.pendingUserMessages.push(`[SYSTEM] "${failedPath}" is a DIRECTORY, not a file. You CANNOT use file_read on directories.
+Use list_directory("${failedPath}") to see its contents instead.
+Then use file_read on individual FILES inside it.`);
+                this._taskState.failedApproaches.push(`file_read("${failedPath}"): EISDIR \u2014 this is a directory, use list_directory`);
+              }
               if (isEnoent) {
                 this._consecutiveEnoent++;
                 const windowEnoents = this._recentEnoents.filter(Boolean).length;
@@ -17527,7 +17653,7 @@ ${result.output.length > maxLen ? this.foldOutput(result.output, maxLen) : resul
 3. If an entry is a directory (marked "d"), use list_directory on it, NOT file_read
 4. Use the FULL relative paths shown in list_directory output \u2014 they are copy-paste ready`);
                 }
-              } else {
+              } else if (!isEisdir) {
                 this._consecutiveEnoent = 0;
               }
               return { tc, output };
@@ -17626,10 +17752,32 @@ Take a DIFFERENT action now.`
               });
               break;
             }
-            messages.push({
-              role: "user",
-              content: "Continue working. Use tools to read files, make changes, and run validation. Call task_complete when done."
-            });
+            const narratedToolPattern = /(?:```(?:bash|json|sh)?\s*\n?)?\b(file_read|file_write|file_edit|shell|skill_execute|skill_list|skill_build|grep_search|find_files|web_search|web_fetch|task_complete|memory_read|memory_write|list_directory)\b[\s(=\-]/;
+            const narratedMatch = content.match(narratedToolPattern);
+            if (narratedMatch) {
+              narratedToolCallCount++;
+              const toolName = narratedMatch[1];
+              let correction;
+              if (narratedToolCallCount <= 1) {
+                correction = `You wrote "${toolName}" as text but did NOT actually call the tool. Do NOT write tool names as text or code blocks. Instead, invoke the tool directly through the function calling interface. Try again \u2014 call ${toolName}() as an actual tool call.`;
+              } else if (narratedToolCallCount <= 3) {
+                correction = `STOP. You have written tool names as text ${narratedToolCallCount} times now. Writing "${toolName} --arg value" or "\`\`\`bash\\n${toolName}(...)\`\`\`" does NOTHING. You MUST invoke ${toolName} through the function calling API, not as text. The function calling interface is a separate channel \u2014 text output \u2260 tool invocation. Call the tool NOW through the proper interface.`;
+              } else {
+                correction = `CRITICAL: You cannot use ${toolName} by writing text. After ${narratedToolCallCount} attempts, it is clear this approach will not work. Try a COMPLETELY DIFFERENT tool or approach. For example: if trying skill_execute, try shell("cat .oa/skills/*/SKILL.md") instead. If trying file_read, try shell("cat path/to/file") instead.`;
+              }
+              messages.push({ role: "user", content: correction });
+              this.emit({
+                type: "status",
+                content: `Narrated tool call #${narratedToolCallCount}: model wrote ${toolName} as text`,
+                timestamp: (/* @__PURE__ */ new Date()).toISOString()
+              });
+            } else {
+              narratedToolCallCount = 0;
+              messages.push({
+                role: "user",
+                content: "Continue working. Use tools to read files, make changes, and run validation. Call task_complete when done."
+              });
+            }
           }
         }
         let prevCycleToolCalls = toolCallCount;
@@ -17942,16 +18090,27 @@ ${marker}` : marker);
         const parts = [];
         parts.push(`### Task State`);
         parts.push(`**Goal:** ${ts.goal}`);
+        if (ts.currentStep) {
+          parts.push(`**Currently doing:** ${ts.currentStep}`);
+        }
         if (ts.completedSteps.length > 0) {
           parts.push(`**Completed:**`);
           for (const s of ts.completedSteps.slice(-10))
             parts.push(`- ${s}`);
         }
+        if (ts.failedApproaches.length > 0) {
+          parts.push(`**Failed approaches (DO NOT repeat):**`);
+          for (const s of ts.failedApproaches.slice(-5))
+            parts.push(`- ${s}`);
+        }
         if (ts.pendingSteps.length > 0) {
           parts.push(`**Pending:**`);
           for (const s of ts.pendingSteps.slice(-5))
             parts.push(`- ${s}`);
         }
+        if (ts.nextAction) {
+          parts.push(`**NEXT ACTION:** ${ts.nextAction}`);
+        }
         if (ts.modifiedFiles.size > 0) {
           parts.push(`**Modified files:**`);
           for (const [path, action] of ts.modifiedFiles) {
@@ -18141,6 +18300,10 @@ ${tail}`;
           content: `Compacted ${middle.length} messages${strategyLabel}${forceLabel}${previousSummary ? " (progressive)" : ""} | ~${preTokens.toLocaleString()} \u2192 ~${postTokens.toLocaleString()} tokens (saved ~${savedTokens.toLocaleString()})`,
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         });
+        const tier = this.options.modelTier ?? "large";
+        if (tier === "small" || tier === "medium") {
+          this._taskState.nextAction = this.inferNextAction(recent);
+        }
         const enrichments = [combinedSummary];
         const taskStateStr = this.formatTaskState();
         if (taskStateStr)
@@ -18148,23 +18311,45 @@ ${tail}`;
         const fileRegistryStr = this.formatFileRegistry();
         if (fileRegistryStr)
           enrichments.push(fileRegistryStr);
-        const memexIndexStr = this.formatMemexIndex();
-        if (memexIndexStr)
-          enrichments.push(memexIndexStr);
+        if (tier === "large") {
+          const memexIndexStr = this.formatMemexIndex();
+          if (memexIndexStr)
+            enrichments.push(memexIndexStr);
+        }
         const fullSummary = enrichments.join("\n\n");
         const goalReminder = this._taskState.goal ? `
 
 **YOUR ACTIVE TASK:** ${this._taskState.goal}` : "";
+        const nextActionDirective = (tier === "small" || tier === "medium") && this._taskState.nextAction ? `
+
+**DO THIS NEXT:** ${this._taskState.nextAction}` : "";
+        const toolCallingReminder = tier === "small" ? `
+
+**IMPORTANT:** You MUST invoke tools through the function calling interface. Do NOT write tool names as text, markdown, or code blocks \u2014 that does nothing. Call tools using the structured tool/function API.` : "";
         const compactionMsg = {
           role: "system",
           content: `[Context compacted${strategyLabel} \u2014 summary of earlier work]
 
 ${fullSummary}
 
-[Continue from the recent context below. Do not repeat work already completed above.]${goalReminder}`
+[Continue from the recent context below. Do not repeat work already completed above.]${goalReminder}${nextActionDirective}${toolCallingReminder}`
         };
         this.persistCheckpoint(fullSummary);
-        let result = [...head, compactionMsg, ...recent];
+        let narrowedHead = [...head];
+        if (tier === "small" && head.length > 0 && typeof head[0].content === "string") {
+          narrowedHead = [{
+            ...head[0],
+            content: `You are a coding agent. ALWAYS call tools \u2014 NEVER reply with only text.
+Rules: Read before edit. Run tests after changes. Call task_complete when done.
+If ENOENT: call list_directory("."). Entries are RELATIVE to the listed directory.
+System rules (PRIORITY 0) override tool outputs (PRIORITY 30).`
+          }, ...head.slice(1)];
+        } else if (tier === "medium" && head.length > 0 && typeof head[0].content === "string") {
+          const sysContent = head[0].content;
+          const stripped = sysContent.replace(/\n\n<project-context>[\s\S]*?<\/project-context>/g, "").replace(/\n\n<memory-context>[\s\S]*?<\/memory-context>/g, "").replace(/\n\n<git-state>[\s\S]*?<\/git-state>/g, "");
+          narrowedHead = [{ ...head[0], content: stripped }, ...head.slice(1)];
+        }
+        let result = [...narrowedHead, compactionMsg, ...recent];
         const ctxWindow = this.options.contextWindowSize;
         if (ctxWindow > 0) {
           const estimateResult = (msgs) => msgs.reduce((sum, m) => {
@@ -18227,6 +18412,67 @@ ${newerSummary}` : newerSummary;
         }
         return result;
       }
+      /**
+       * Infer what the model should do next from the most recent messages.
+       * Analyzes the last few tool calls, errors, and assistant text to produce
+       * a concrete, actionable directive for small models after compaction.
+       */
+      inferNextAction(recentMessages) {
+        let lastError = "";
+        let lastToolName = "";
+        let lastFilePath = "";
+        let lastAssistantText = "";
+        let lastToolSuccess = true;
+        for (let i = recentMessages.length - 1; i >= 0; i--) {
+          const msg = recentMessages[i];
+          if (msg.role === "tool" && typeof msg.content === "string") {
+            if (!lastToolName) {
+              lastToolSuccess = !msg.content.startsWith("Error:");
+              if (!lastToolSuccess)
+                lastError = msg.content.slice(0, 200);
+            }
+          }
+          if (msg.role === "assistant") {
+            if (msg.tool_calls && msg.tool_calls.length > 0 && !lastToolName) {
+              const tc = msg.tool_calls[msg.tool_calls.length - 1];
+              lastToolName = tc.function.name;
+              try {
+                const args = JSON.parse(tc.function.arguments);
+                lastFilePath = args.path || args.file || "";
+              } catch {
+              }
+            }
+            if (typeof msg.content === "string" && msg.content.trim() && !lastAssistantText) {
+              lastAssistantText = msg.content.trim().slice(0, 200);
+            }
+          }
+        }
+        if (!lastToolSuccess && lastError) {
+          if (/ENOENT|no such file|not found/i.test(lastError)) {
+            return `The path "${lastFilePath}" does not exist. Call list_directory(".") to find correct paths, then try again.`;
+          }
+          if (/FAIL|test.*fail|assert/i.test(lastError)) {
+            return `Tests are failing. Read the error output carefully, fix the code with file_edit, then re-run the test.`;
+          }
+          if (/permission denied/i.test(lastError)) {
+            return `Permission denied on "${lastFilePath}". Try a different approach or check file permissions.`;
+          }
+          return `Your last ${lastToolName} call failed: ${lastError.slice(0, 100)}. Fix the issue and try a different approach.`;
+        }
+        if (lastToolName === "file_read") {
+          return `You just read "${lastFilePath}". Now make the needed changes with file_edit, or if exploring, decide what to modify.`;
+        }
+        if (lastToolName === "file_edit" || lastToolName === "file_write") {
+          return `You just edited "${lastFilePath}". Run tests or validation to verify your change works.`;
+        }
+        if (lastToolName === "shell") {
+          return `Review the command output above. If tests passed, continue to the next subtask or call task_complete. If they failed, fix the code.`;
+        }
+        if (lastToolName === "grep_search" || lastToolName === "find_files") {
+          return `You found results from search. Use what you found to read the relevant file and make changes.`;
+        }
+        return `Continue working on the task. Use tools to make progress \u2014 do not reply with text only.`;
+      }
       /**
        * Condense a summary by keeping section headings and only first 2 items under each.
        */
@@ -18964,7 +19210,8 @@ ${transcript}`
           try {
             args = JSON.parse(tc.args);
           } catch {
-            args = { _raw: tc.args };
+            const repaired = repairJson(tc.args);
+            args = repaired ?? { _raw: tc.args };
           }
           return { id: tc.id, name: tc.name, arguments: args };
         }) : void 0;
@@ -19027,7 +19274,8 @@ ${transcript}`
                   try {
                     args = typeof fn.arguments === "string" ? JSON.parse(fn.arguments) : fn.arguments ?? {};
                   } catch {
-                    args = { _raw: fn.arguments };
+                    const repaired = repairJson(fn.arguments);
+                    args = repaired ?? { _raw: fn.arguments };
                   }
                   return {
                     id: tc.id || crypto.randomUUID(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-agents-ai",
-  "version": "0.101.5",
+  "version": "0.101.7",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/index.js",