@ducci/jarvis 1.0.52 → 1.0.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducci/jarvis",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "description": "A fully automated agent system that lives on a server.",
   "main": "./src/index.js",
   "type": "module",

package/src/server/agent.js

@@ -9,6 +9,12 @@ import chalk from 'chalk';
 
 const FORMAT_NUDGE = 'Your previous response was not valid JSON. Respond only with the required JSON object: {"response": "...", "logSummary": "..."}';
 const LOOP_DETECTION_THRESHOLD = 3;
+
+// Strip markdown code fences (```json...``` or ```...```) that models sometimes
+// wrap around JSON responses, which would otherwise cause JSON.parse to throw.
+function stripCodeFence(text) {
+  return text.replace(/^```(?:json)?\s*\n([\s\S]*?)\n?```\s*$/, '$1').trim();
+}
 const CONSECUTIVE_FAILURE_THRESHOLD = 3;
 const MAX_TOOL_RESULT = 4000;
 
@@ -396,20 +402,20 @@ export async function runAgentLoop(client, config, session, prepareMessages, usa
         if (nudgeContent.trim()) {
           content = nudgeContent;
         }
-        parsed = JSON.parse(nudgeContent);
+        parsed = JSON.parse(stripCodeFence(nudgeContent));
       } catch {
         // Fall through to !parsed handler; content may now carry the nudge text
       }
     } else {
       try {
-        parsed = JSON.parse(content);
+        parsed = JSON.parse(stripCodeFence(content));
       } catch {
         // Step 1: retry with fallback model
         try {
           const fallbackResult = await callModel(client, config.fallbackModel, preparedMessages, toolDefs);
           accumulateUsage(usageAccum, fallbackResult);
           const fallbackContent = fallbackResult.choices[0]?.message?.content || '';
-          parsed = JSON.parse(fallbackContent);
+          parsed = JSON.parse(stripCodeFence(fallbackContent));
           content = fallbackContent;
         } catch {
           // Step 2: nudge retry via both models
@@ -418,7 +424,7 @@ export async function runAgentLoop(client, config, session, prepareMessages, usa
             const nudgeResult = await callModelWithFallback(client, config, nudgeMessages, toolDefs);
             accumulateUsage(usageAccum, nudgeResult);
             const nudgeContent = nudgeResult.choices[0]?.message?.content || '';
-            parsed = JSON.parse(nudgeContent);
+            parsed = JSON.parse(stripCodeFence(nudgeContent));
             content = nudgeContent;
           } catch {
             // Give up
@@ -489,14 +495,14 @@ export async function runAgentLoop(client, config, session, prepareMessages, usa
 
     // Try JSON parse; if it fails, nudge retry (Layer 2)
     try {
-      parsedWrapUp = JSON.parse(wrapUpContent);
+      parsedWrapUp = JSON.parse(stripCodeFence(wrapUpContent));
     } catch {
       try {
         const nudgeMessages = [...wrapUpMessages, { role: 'user', content: FORMAT_NUDGE }];
         const nudgeResult = await callModelWithFallback(client, config, nudgeMessages, []);
         accumulateUsage(usageAccum, nudgeResult);
         const nudgeContent = nudgeResult.choices[0]?.message?.content || '';
-        parsedWrapUp = JSON.parse(nudgeContent);
+        parsedWrapUp = JSON.parse(stripCodeFence(nudgeContent));
         wrapUpContent = nudgeContent;
       } catch {
         // Layer 3: use raw text as best-effort response below

package/src/server/tools.js

@@ -38,7 +38,7 @@ const SEED_TOOLS = {
       },
     },
     code: `
-      const targetPath = path.resolve(args.path);
+      const targetPath = path.resolve(args.path.replace(/^~(?=\/|$)/, require('os').homedir()));
       const raw = await fs.promises.readFile(targetPath, 'utf8');
       const lines = raw.split('\\n');
       const offset = args.offset ? args.offset - 1 : 0;
@@ -308,7 +308,7 @@ const SEED_TOOLS = {
       },
     },
     code: `
-      const targetPath = path.resolve(args.path);
+      const targetPath = path.resolve(args.path.replace(/^~(?=\/|$)/, require('os').homedir()));
       await fs.promises.mkdir(path.dirname(targetPath), { recursive: true });
       await fs.promises.writeFile(targetPath, args.content, 'utf8');
       if (args.mode) {
@@ -345,7 +345,7 @@ const SEED_TOOLS = {
       },
     },
     code: `
-      const targetPath = path.resolve(args.path);
+      const targetPath = path.resolve(args.path.replace(/^~(?=\/|$)/, require('os').homedir()));
       const content = await fs.promises.readFile(targetPath, 'utf8');
       const count = content.split(args.old_string).length - 1;
       if (count === 0) {