@noobdemon/noob-cli 1.5.3 → 1.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noobdemon/noob-cli",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "publishConfig": {
     "access": "public"
   },

package/src/agent.js

@@ -175,24 +175,48 @@ function buildPrompt(history) {
 }
 
 // Extract a single tool call from an assistant message, if present.
+// NOTE: we do NOT match up to a closing ``` fence — write_file content routinely
+// contains its own ```code``` fences (e.g. a README), and the first inner fence
+// would close the block early and break the JSON. Instead, find the ```tool (or
+// ```json) opener and brace-match the first balanced JSON object after it.
 export function parseToolCall(text) {
-  // Preferred: ```tool { ... } ```
-  let m = text.match(/```tool\s*\n([\s\S]*?)```/);
-  // Fallback: a ```json block that contains a "name" field.
-  if (!m) {
-    const j = text.match(/```json\s*\n([\s\S]*?)```/);
-    if (j && /"name"\s*:/.test(j[1])) m = j;
-  }
-  if (!m) return null;
-  try {
-    const obj = JSON.parse(m[1].trim());
+  for (const fence of ["tool", "json"]) {
+    const open = text.match(new RegExp("```" + fence + "[ \\t]*\\n"));
+    if (!open) continue;
+    const obj = extractJsonObject(text, open.index + open[0].length);
     if (obj && typeof obj.name === "string") return { name: obj.name, input: obj.input || {} };
-  } catch {
-    /* malformed — treat as prose */
   }
   return null;
 }
 
+// Parse the first balanced {…} at/after `from`, tracking string literals and
+// escapes so braces or backticks INSIDE string values don't throw off the depth
+// count. Returns the parsed object, or null if malformed/truncated (unbalanced).
+function extractJsonObject(s, from) {
+  const start = s.indexOf("{", from);
+  if (start === -1) return null;
+  let depth = 0, inStr = false, esc = false;
+  for (let i = start; i < s.length; i++) {
+    const ch = s[i];
+    if (inStr) {
+      if (esc) esc = false;
+      else if (ch === "\\") esc = true;
+      else if (ch === '"') inStr = false;
+      continue;
+    }
+    if (ch === '"') inStr = true;
+    else if (ch === "{") depth++;
+    else if (ch === "}" && --depth === 0) {
+      try {
+        return JSON.parse(s.slice(start, i + 1));
+      } catch {
+        return null; // malformed JSON — treat as prose
+      }
+    }
+  }
+  return null; // unbalanced (e.g. stream cut mid-block) — auto-continue finishes it
+}
+
 /**
  * Run one agent turn (which may span several tool steps).
  *