@cosmicstack/mercury-agent 1.0.0 → 1.0.1

package/dist/index.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { readFileSync as readFileSync12, writeFileSync as writeFileSync13, existsSync as existsSync19 } from "fs";
+import { readFileSync as readFileSync12, writeFileSync as writeFileSync14, existsSync as existsSync19 } from "fs";
 import { fileURLToPath } from "url";
-import { dirname as dirname4, join as join12 } from "path";
+import { dirname as dirname4, join as join14 } from "path";
 import { Command } from "commander";
 import readline3 from "readline";
 import chalk7 from "chalk";
@@ -599,7 +599,7 @@ var LongTermMemory = class {
   }
   load() {
     if (!existsSync3(this.filepath)) return;
-    const lines = readFileSync3(this.filepath, "utf-8").split("\n").filter(Boolean);
+    const lines = readFileSync3(this.filepath, "utf-8").split(/\r?\n/).filter(Boolean);
     this.facts = lines.map((line) => {
       try {
         return JSON.parse(line);
@@ -641,7 +641,7 @@ var EpisodicMemory = class {
   }
   load() {
     if (!existsSync3(this.filepath)) return;
-    const lines = readFileSync3(this.filepath, "utf-8").split("\n").filter(Boolean);
+    const lines = readFileSync3(this.filepath, "utf-8").split(/\r?\n/).filter(Boolean);
     this.events = lines.map((line) => {
       try {
         return JSON.parse(line);
@@ -656,17 +656,43 @@ function generateId() {
 }
 
 // src/memory/second-brain-db.ts
-import Database from "better-sqlite3";
-import { existsSync as existsSync4, mkdirSync as mkdirSync4 } from "fs";
-import { dirname } from "path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync4, rmSync as rmSync2 } from "fs";
+import { dirname, join as join4 } from "path";
+import { tmpdir } from "os";
+import { createRequire } from "module";
+var require2 = createRequire(import.meta.url);
+var syncDatabaseClass = null;
+try {
+  const mod = require2("better-sqlite3");
+  const probeDir = join4(tmpdir(), `mercury-sqlite3-probe-${process.pid}`);
+  try {
+    mkdirSync4(probeDir, { recursive: true });
+    const probeDb = new mod(join4(probeDir, "probe.db"));
+    probeDb.close();
+    rmSync2(probeDir, { recursive: true, force: true });
+    syncDatabaseClass = mod;
+  } catch {
+    syncDatabaseClass = null;
+  }
+} catch {
+  syncDatabaseClass = null;
+}
+function isBetterSqlite3Available() {
+  return syncDatabaseClass !== null;
+}
 var SecondBrainDB = class {
   db;
   constructor(dbPath) {
+    if (!syncDatabaseClass) {
+      throw new Error(
+        "better-sqlite3 is not available \u2014 second brain memory requires it. Install build tools (make, gcc/g++, python3) or upgrade to Node >= 20. See: https://github.com/WiseLibs/better-sqlite3/blob/master/docs/compilation.md"
+      );
+    }
     const dir = dirname(dbPath);
     if (!existsSync4(dir)) {
       mkdirSync4(dir, { recursive: true });
     }
-    this.db = new Database(dbPath);
+    this.db = new syncDatabaseClass(dbPath);
     this.db.pragma("journal_mode = WAL");
     this.db.pragma("synchronous = NORMAL");
   }
@@ -954,7 +980,7 @@ var SecondBrainDB = class {
 };
 
 // src/memory/user-memory.ts
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 var MIN_CONFIDENCE = 0.55;
 var UserMemoryStore = class {
   db;
@@ -966,7 +992,7 @@ var UserMemoryStore = class {
     this.userKey = userKey;
     this.maxRecords = config.memory.secondBrain?.maxRecords ?? 50;
     this.consolidateThrottleMs = 5 * 60 * 1e3;
-    const resolvedDbPath = dbPath ?? join4(getMemoryDir(), "second-brain", "second-brain.db");
+    const resolvedDbPath = dbPath ?? join5(getMemoryDir(), "second-brain", "second-brain.db");
     this.db = new SecondBrainDB(resolvedDbPath);
     this.db.init();
   }
@@ -3411,31 +3437,52 @@ var ToolCallLoopDetector = class _ToolCallLoopDetector {
   recentCalls = [];
   totalCalls = 0;
   hardAborted = false;
+  recentStepTexts = [];
   static ABSOLUTE_MAX = 25;
+  static FAILED_ABSOLUTE_MAX = 12;
   static HIGH_TOLERANCE_TOOLS = /* @__PURE__ */ new Set([
     "fetch_url",
     "read_file",
     "list_dir",
     "web_search",
-    "github_api",
-    "run_command"
+    "github_api"
   ]);
-  static getIdenticalThreshold() {
-    return 3;
-  }
-  static getSameToolThreshold(toolName) {
-    return _ToolCallLoopDetector.HIGH_TOLERANCE_TOOLS.has(toolName) ? 8 : 4;
-  }
-  record(toolName, params) {
+  static IDENTICAL_THRESHOLD = 3;
+  static SIMILAR_THRESHOLD = 4;
+  static TEXT_REPEAT_THRESHOLD = 3;
+  static MAX_STEP_TEXTS = 12;
+  static getSameToolThreshold(toolName, failingCount) {
+    const baseHigh = 5;
+    const baseNormal = 3;
+    const isHigh = _ToolCallLoopDetector.HIGH_TOLERANCE_TOOLS.has(toolName);
+    let threshold = isHigh ? baseHigh : baseNormal;
+    if (failingCount >= 3) {
+      threshold = Math.min(threshold, isHigh ? 3 : 2);
+    }
+    return threshold;
+  }
+  record(toolName, params, failed = false) {
     const paramsKey = JSON.stringify(params).slice(0, 200);
-    this.recentCalls.push({ tool: toolName, params: paramsKey });
+    this.recentCalls.push({ tool: toolName, params: paramsKey, failed });
     this.totalCalls++;
     if (this.recentCalls.length > 30) {
       this.recentCalls.shift();
     }
   }
+  recordStepText(text) {
+    if (!text || text.length < 10) return;
+    const normalized = text.toLowerCase().replace(/\s+/g, " ").trim().slice(0, 200);
+    if (!normalized) return;
+    this.recentStepTexts.push(normalized);
+    if (this.recentStepTexts.length > _ToolCallLoopDetector.MAX_STEP_TEXTS) {
+      this.recentStepTexts.shift();
+    }
+  }
   detectAbsoluteLimit() {
-    return this.totalCalls >= _ToolCallLoopDetector.ABSOLUTE_MAX;
+    if (this.totalCalls >= _ToolCallLoopDetector.ABSOLUTE_MAX) return true;
+    const failCount = this.recentCalls.filter((c) => c.failed).length;
+    if (failCount >= _ToolCallLoopDetector.FAILED_ABSOLUTE_MAX) return true;
+    return false;
   }
   detectIdentical() {
     if (this.recentCalls.length < 3) return null;
@@ -3448,7 +3495,7 @@ var ToolCallLoopDetector = class _ToolCallLoopDetector {
         break;
       }
     }
-    if (identicalCount >= _ToolCallLoopDetector.getIdenticalThreshold()) {
+    if (identicalCount >= _ToolCallLoopDetector.IDENTICAL_THRESHOLD) {
       this.hardAborted = true;
       return {
         tool: last.tool,
@@ -3458,18 +3505,73 @@ var ToolCallLoopDetector = class _ToolCallLoopDetector {
     }
     return null;
   }
+  detectSimilarLoop() {
+    if (this.recentCalls.length < 4) return null;
+    const last = this.recentCalls[this.recentCalls.length - 1];
+    let similarCount = 0;
+    for (let i = this.recentCalls.length - 1; i >= 0; i--) {
+      const call = this.recentCalls[i];
+      if (call.tool !== last.tool) break;
+      if (call.failed || last.failed) {
+        similarCount++;
+      } else {
+        break;
+      }
+    }
+    if (similarCount >= _ToolCallLoopDetector.SIMILAR_THRESHOLD) {
+      this.hardAborted = true;
+      return {
+        tool: last.tool,
+        count: similarCount,
+        message: `[SYSTEM] You called "${last.tool}" ${similarCount} times with different params but all are failing. This is a failing loop \u2014 stop immediately. Tell the user you cannot complete this task.`
+      };
+    }
+    return null;
+  }
+  detectTextRepetition() {
+    if (this.recentStepTexts.length < _ToolCallLoopDetector.TEXT_REPEAT_THRESHOLD) return null;
+    const texts = this.recentStepTexts;
+    const last = texts[texts.length - 1];
+    let repeatCount = 0;
+    for (let i = texts.length - 1; i >= 0; i--) {
+      const similarity = this.textSimilarity(last, texts[i]);
+      if (similarity >= 0.7) {
+        repeatCount++;
+      } else {
+        break;
+      }
+    }
+    if (repeatCount >= _ToolCallLoopDetector.TEXT_REPEAT_THRESHOLD) {
+      return {
+        pattern: last.slice(0, 60),
+        count: repeatCount
+      };
+    }
+    return null;
+  }
+  textSimilarity(a, b) {
+    if (a === b) return 1;
+    if (!a || !b) return 0;
+    const setA = new Set(a.split(" "));
+    const setB = new Set(b.split(" "));
+    const intersection = [...setA].filter((w) => setB.has(w)).length;
+    const union = (/* @__PURE__ */ new Set([...setA, ...setB])).size;
+    return union === 0 ? 0 : intersection / union;
+  }
   detectSameTool() {
     if (this.recentCalls.length < 3) return null;
     const last = this.recentCalls[this.recentCalls.length - 1];
     let consecutiveCount = 0;
+    let failingConsecutive = 0;
     for (let i = this.recentCalls.length - 1; i >= 0; i--) {
       if (this.recentCalls[i].tool === last.tool) {
         consecutiveCount++;
+        if (this.recentCalls[i].failed) failingConsecutive++;
       } else {
         break;
       }
     }
-    const threshold = _ToolCallLoopDetector.getSameToolThreshold(last.tool);
+    const threshold = _ToolCallLoopDetector.getSameToolThreshold(last.tool, failingConsecutive);
     if (consecutiveCount >= threshold) {
       return { tool: last.tool, count: consecutiveCount };
     }
@@ -3494,6 +3596,7 @@ var ToolCallLoopDetector = class _ToolCallLoopDetector {
     this.recentCalls = [];
     this.totalCalls = 0;
     this.hardAborted = false;
+    this.recentStepTexts = [];
   }
 };
 var MAX_STEPS = 10;
@@ -3659,7 +3762,7 @@ You can override this:
       const systemPrompt = this.buildSystemPrompt();
       const recentMemory = this.shortTerm.getRecent(msg.channelId, 10);
       const messages = [];
-      const recentSteps = this.shortTerm.getRecent(msg.channelId, 4);
+      const recentSteps = this.shortTerm.getRecent(msg.channelId, 6);
       let loopWarning = null;
       if (recentSteps.length >= 3) {
         const toolCallPattern = /\[Using: (.+?)\]/g;
@@ -3678,10 +3781,24 @@ You can override this:
             loopWarning = `[SYSTEM WARNING] You have called ${last3[0]} 3+ times in a row with the same result. Stop repeating this call. Try a different approach \u2014 if you're failing on permissions, try a different path. If you're failing on git push auth, use github_api with PUT /repos/{owner}/{repo}/contents/{path} to push files directly through the API.`;
           }
         }
+        if (!loopWarning) {
+          const assistantMessages = recentSteps.filter((m) => m.role === "assistant" && m.content.length > 20);
+          if (assistantMessages.length >= 3) {
+            const last3 = assistantMessages.slice(-3);
+            const normalizeText = (t) => t.toLowerCase().replace(/[^\w\s]/g, "").replace(/\s+/g, " ").trim().slice(0, 150);
+            const normalized = last3.map((m) => normalizeText(m.content));
+            const words0 = new Set(normalized[0].split(" "));
+            const overlap01 = normalized[0] && normalized[1] ? [...words0].filter((w) => new Set(normalized[1].split(" ")).has(w)).length / Math.max(words0.size, 1) : 0;
+            const overlap12 = normalized[1] && normalized[2] ? [...new Set(normalized[1].split(" "))].filter((w) => new Set(normalized[2].split(" ")).has(w)).length / Math.max(new Set(normalized[1].split(" ")).size, 1) : 0;
+            if (overlap01 > 0.75 && overlap12 > 0.75) {
+              loopWarning = `[SYSTEM WARNING] Your last 3 responses are nearly identical. You are stuck in a text repetition loop. Stop immediately and give a completely different response. If you cannot complete the task, tell the user clearly why.`;
+            }
+          }
+        }
       }
       if (loopWarning) {
         messages.push({ role: "user", content: loopWarning });
-        messages.push({ role: "assistant", content: "Understood. I will try a different approach." });
+        messages.push({ role: "assistant", content: "Acknowledged. I will stop repeating and respond differently, or clearly state if the task cannot be completed." });
       }
       if (this.userMemory) {
         const memoryContext = this.userMemory.retrieveRelevant(msg.content, { maxRecords: 5, maxChars: 900 });
@@ -3744,11 +3861,15 @@ You can override this:
               maxSteps: MAX_STEPS,
               abortSignal: loopAbortController.signal,
               onStepFinish: async ({ toolCalls, toolResults }) => {
-                if (toolCalls && toolCalls.length > 0) {
+                if (toolCalls && toolResults && toolCalls.length > 0) {
                   const names = toolCalls.map((tc) => tc.toolName).join(", ");
                   logger.info({ tools: names }, "Tool call step");
-                  for (const tc of toolCalls) {
-                    loopDetector.record(tc.toolName, tc.args);
+                  for (let i = 0; i < toolCalls.length; i++) {
+                    const tc = toolCalls[i];
+                    const tr = toolResults[i];
+                    const resultStr = typeof tr?.result === "string" ? tr.result : JSON.stringify(tr?.result ?? "");
+                    const failed = resultStr.length < 5e3 && (resultStr.startsWith("Error:") || resultStr.startsWith("\u26A0") || resultStr.includes("exited with code") || resultStr.includes("Command failed") || resultStr.startsWith("Command exited with code"));
+                    loopDetector.record(tc.toolName, tc.args, failed);
                   }
                   if (loopDetector.detectAbsoluteLimit()) {
                     logger.warn("Absolute tool call limit reached \u2014 aborting");
@@ -3773,6 +3894,17 @@ You can override this:
                     loopAbortController.abort();
                     return;
                   }
+                  const similarLoop = loopDetector.detectSimilarLoop();
+                  if (similarLoop) {
+                    logger.warn({ tool: similarLoop.tool, count: similarLoop.count }, "Failing loop detected \u2014 aborting");
+                    if (!loopWarningSent && channel && msg.channelType !== "internal") {
+                      loopWarningSent = true;
+                      await channel.send(`\u26A0 Failing loop detected \u2014 ${similarLoop.tool} called ${similarLoop.count}x, all failing. Stopping.`, msg.channelId).catch(() => {
+                      });
+                    }
+                    loopAbortController.abort();
+                    return;
+                  }
                   const softLoop = loopDetector.detectSameTool();
                   if (softLoop && !loopWarningSent && channel && msg.channelType !== "internal") {
                     if (this.capabilities.permissions.isAutoApproveAll()) {
@@ -3828,6 +3960,21 @@ You can override this:
                       });
                     }
                   }
+                } else if (toolResults === void 0 || toolCalls === void 0) {
+                  const stepText = toolResults?.text ?? "";
+                  if (stepText) {
+                    loopDetector.recordStepText(String(stepText));
+                  }
+                  const textRepeat = loopDetector.detectTextRepetition();
+                  if (textRepeat) {
+                    logger.warn({ pattern: textRepeat.pattern, count: textRepeat.count }, "Text repetition loop detected \u2014 aborting");
+                    if (!loopWarningSent && channel && msg.channelType !== "internal") {
+                      loopWarningSent = true;
+                      await channel.send("\u26A0 I keep generating the same response. Stopping to prevent repetition.", msg.channelId).catch(() => {
+                      });
+                    }
+                    loopAbortController.abort();
+                  }
                 }
               }
             });
@@ -3852,6 +3999,7 @@ You can override this:
             ]);
             result = { text: fullText, usage };
             streamedText = fullText;
+            loopDetector.recordStepText(fullText);
           } else {
             result = await generateText3({
               model: provider.getModelInstance(),
@@ -3861,11 +4009,15 @@ You can override this:
               maxSteps: MAX_STEPS,
               abortSignal: loopAbortController.signal,
               onStepFinish: async ({ toolCalls, toolResults }) => {
-                if (toolCalls && toolCalls.length > 0) {
+                if (toolCalls && toolResults && toolCalls.length > 0) {
                   const names = toolCalls.map((tc) => tc.toolName).join(", ");
                   logger.info({ tools: names }, "Tool call step");
-                  for (const tc of toolCalls) {
-                    loopDetector.record(tc.toolName, tc.args);
+                  for (let i = 0; i < toolCalls.length; i++) {
+                    const tc = toolCalls[i];
+                    const tr = toolResults[i];
+                    const resultStr = typeof tr?.result === "string" ? tr.result : JSON.stringify(tr?.result ?? "");
+                    const failed = resultStr.length < 5e3 && (resultStr.startsWith("Error:") || resultStr.startsWith("\u26A0") || resultStr.includes("exited with code") || resultStr.includes("Command failed") || resultStr.startsWith("Command exited with code"));
+                    loopDetector.record(tc.toolName, tc.args, failed);
                   }
                   if (loopDetector.detectAbsoluteLimit()) {
                     logger.warn("Absolute tool call limit reached \u2014 aborting");
@@ -3890,6 +4042,17 @@ You can override this:
                     loopAbortController.abort();
                     return;
                   }
+                  const similarLoop = loopDetector.detectSimilarLoop();
+                  if (similarLoop) {
+                    logger.warn({ tool: similarLoop.tool, count: similarLoop.count }, "Failing loop detected \u2014 aborting");
+                    if (!loopWarningSent && channel && msg.channelType !== "internal") {
+                      loopWarningSent = true;
+                      await channel.send(`\u26A0 Failing loop detected \u2014 ${similarLoop.tool} called ${similarLoop.count}x, all failing. Stopping.`, msg.channelId).catch(() => {
+                      });
+                    }
+                    loopAbortController.abort();
+                    return;
+                  }
                   const softLoop = loopDetector.detectSameTool();
                   if (softLoop && !loopWarningSent && channel && msg.channelType !== "internal") {
                     if (this.capabilities.permissions.isAutoApproveAll()) {
@@ -3945,6 +4108,21 @@ You can override this:
                       });
                     }
                   }
+                } else if (toolResults === void 0 || toolCalls === void 0) {
+                  const stepText = toolResults?.text ?? "";
+                  if (stepText) {
+                    loopDetector.recordStepText(String(stepText));
+                  }
+                  const textRepeat = loopDetector.detectTextRepetition();
+                  if (textRepeat) {
+                    logger.warn({ pattern: textRepeat.pattern, count: textRepeat.count }, "Text repetition loop detected \u2014 aborting");
+                    if (!loopWarningSent && channel && msg.channelType !== "internal") {
+                      loopWarningSent = true;
+                      await channel.send("\u26A0 I keep generating the same response. Stopping to prevent repetition.", msg.channelId).catch(() => {
+                      });
+                    }
+                    loopAbortController.abort();
+                  }
                 }
               }
             });
@@ -3959,7 +4137,7 @@ You can override this:
               result = { text: streamedText, usage: void 0 };
             }
             if (!result) {
-              result = { text: "I stopped because I was repeating the same tool calls. What would you like me to do differently?", usage: void 0 };
+              result = { text: "I stopped because I detected I was stuck in a loop (repeating the same action without progress). I cannot complete this task as requested. Please let me know if you'd like me to try a completely different approach, or if there's something else I can help with.", usage: void 0 };
             }
             if (usedProvider) {
               this.providers.markSuccess(usedProvider.name);
@@ -4862,11 +5040,11 @@ Or use /budget override, /budget reset, /budget set <number> anytime.`,
 // src/core/scheduler.ts
 import cron from "node-cron";
 import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync5 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { parse as parseYaml2, stringify as stringifyYaml2 } from "yaml";
 var SCHEDULES_FILE = "schedules.yaml";
 function getSchedulesPath() {
-  return join5(getMercuryHome(), SCHEDULES_FILE);
+  return join6(getMercuryHome(), SCHEDULES_FILE);
 }
 function loadSchedules() {
   const path3 = getSchedulesPath();
@@ -5085,7 +5263,7 @@ var ChannelRegistry = class {
 
 // src/utils/tokens.ts
 import { existsSync as existsSync6, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 var TOKEN_FILE = "token-usage.json";
 var TokenBudget = class {
   constructor(config) {
@@ -5167,7 +5345,7 @@ var TokenBudget = class {
     }
   }
   persist() {
-    const path3 = join6(getMercuryHome(), TOKEN_FILE);
+    const path3 = join7(getMercuryHome(), TOKEN_FILE);
     try {
       const data = {
         dailyUsed: this.dailyUsed,
@@ -5181,7 +5359,7 @@ var TokenBudget = class {
     }
   }
   restore() {
-    const path3 = join6(getMercuryHome(), TOKEN_FILE);
+    const path3 = join7(getMercuryHome(), TOKEN_FILE);
     if (!existsSync6(path3)) return;
     try {
       const raw = readFileSync5(path3, "utf-8");
@@ -5200,7 +5378,7 @@ var TokenBudget = class {
 
 // src/capabilities/permissions.ts
 import { existsSync as existsSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync6, mkdirSync as mkdirSync7 } from "fs";
-import { join as join7, resolve as resolve3, sep } from "path";
+import { join as join8, resolve as resolve3, sep } from "path";
 import { homedir as homedir2 } from "os";
 import { parse as parseYaml3, stringify as stringifyYaml3 } from "yaml";
 var DEFAULT_MANIFEST = {
@@ -5230,7 +5408,15 @@ var DEFAULT_MANIFEST = {
         "init 6",
         "kill -9 1",
         "> /dev/sda",
-        "mv /* /dev/null"
+        "mv /* /dev/null",
+        "del /s /q C:\\*",
+        "rmdir /s /q C:\\*",
+        "format *",
+        "icacls * C:\\* /grant",
+        "net user *",
+        "netsh *",
+        "reg delete *",
+        "cmd /c rd /s /q *"
       ],
       autoApproved: [
         "ls *",
@@ -5257,7 +5443,15 @@ var DEFAULT_MANIFEST = {
         "du *",
         "uname *",
         "curl *",
-        "wget *"
+        "wget *",
+        "dir *",
+        "type *",
+        "cd *",
+        "where *",
+        "tree *",
+        "findstr *",
+        "tasklist *",
+        "systeminfo *"
       ],
       needsApproval: [
         "npm publish *",
@@ -5274,7 +5468,13 @@ var DEFAULT_MANIFEST = {
         "cp -r *",
         "chmod *",
         "mkdir *",
-        "rmdir *"
+        "rmdir *",
+        "xcopy *",
+        "robocopy *",
+        "del *",
+        "rd /s *",
+        "powershell *",
+        "cmd /c *"
       ],
       cwdOnly: true
     },
@@ -5285,7 +5485,7 @@ var DEFAULT_MANIFEST = {
     }
   }
 };
-var PERMISSIONS_FILE = join7(getMercuryHome(), "permissions.yaml");
+var PERMISSIONS_FILE = join8(getMercuryHome(), "permissions.yaml");
 var PermissionManager = class {
   manifest;
   cwd;
@@ -5694,7 +5894,7 @@ function createCreateFileTool(permissions, getCwd) {
 import { tool as tool4 } from "ai";
 import { z as z4 } from "zod";
 import { existsSync as existsSync11, readdirSync as readdirSync2, statSync } from "fs";
-import { resolve as resolve7, isAbsolute as isAbsolute4 } from "path";
+import { resolve as resolve7, isAbsolute as isAbsolute4, join as join9 } from "path";
 function createListDirTool(permissions, getCwd) {
   return tool4({
     description: "List the contents of a directory. Shows file names, types, and sizes.",
@@ -5718,7 +5918,7 @@ function createListDirTool(permissions, getCwd) {
         const entries = readdirSync2(resolved, { withFileTypes: true });
         const lines = entries.map((entry) => {
           const isDir = entry.isDirectory();
-          const fullPath = join8(resolved, entry.name);
+          const fullPath = join9(resolved, entry.name);
           let size = "";
           try {
             if (!isDir) {
@@ -5739,9 +5939,6 @@ ${lines.join("\n")}`;
     }
   });
 }
-function join8(base, name) {
-  return base.endsWith("/") ? base + name : base + "/" + name;
-}
 function formatSize(bytes) {
   if (bytes < 1024) return `${bytes}B`;
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
@@ -5919,6 +6116,7 @@ import { z as z10 } from "zod";
 import { execSync } from "child_process";
 import { resolve as resolve12, isAbsolute as isAbsolute9 } from "path";
 import { existsSync as existsSync14 } from "fs";
+import { homedir as homedir3 } from "os";
 function createRunCommandTool(permissions, getCwd, setCwd) {
   return tool10({
     description: `Run a shell command in the current working directory. Use the cd tool to change directories first \u2014 cd commands within this tool only affect chained commands (e.g., "cd /path && ls"), not subsequent calls.
@@ -5973,7 +6171,7 @@ function detectCd(command, currentCwd, setCwd) {
   const trimmed = command.trim();
   const cdOnly = trimmed.match(/^cd\s+(.+)$/);
   if (cdOnly) {
-    const target = cdOnly[1].replace(/^["']|["']$/g, "").replace(/~/, process.env.HOME || "");
+    const target = cdOnly[1].replace(/^["']|["']$/g, "").replace(/^~/, homedir3());
     const resolved = isAbsolute9(target) ? target : resolve12(currentCwd, target);
     if (existsSync14(resolved)) {
       setCwd(resolved);
@@ -5982,7 +6180,7 @@ function detectCd(command, currentCwd, setCwd) {
   }
   const cdChain = trimmed.match(/cd\s+(.+?)\s*&&/);
   if (cdChain) {
-    const target = cdChain[1].replace(/^["']|["']$/g, "").replace(/~/, process.env.HOME || "");
+    const target = cdChain[1].replace(/^["']|["']$/g, "").replace(/^~/, homedir3());
     const resolved = isAbsolute9(target) ? target : resolve12(currentCwd, target);
     if (existsSync14(resolved)) {
       setCwd(resolved);
@@ -6357,6 +6555,8 @@ function createGitAddTool(getCwd) {
 import { tool as tool24 } from "ai";
 import { z as z24 } from "zod";
 import { execSync as execSync6 } from "child_process";
+import { writeFileSync as writeFileSync10, unlinkSync as unlinkSync3 } from "fs";
+import { join as join10 } from "path";
 var CO_AUTHOR = "Mercury <mercury@cosmicstack.org>";
 function createGitCommitTool(getCwd) {
   return tool24({
@@ -6369,10 +6569,24 @@ function createGitCommitTool(getCwd) {
         const fullMessage = `${message}
 
 Co-authored-by: ${CO_AUTHOR}`;
-        const escapedMsg = fullMessage.replace(/"/g, '\\"');
-        const result = execSync6(`git commit -m "${escapedMsg}"`, { encoding: "utf-8", timeout: 1e4, cwd: getCwd() });
+        const cwd = getCwd();
+        const msgFilePath = join10(cwd, ".git", "MERCU_MSG");
+        writeFileSync10(msgFilePath, fullMessage, "utf-8");
+        const result = execSync6(`git commit -F "${msgFilePath}"`, {
+          encoding: "utf-8",
+          timeout: 1e4,
+          cwd
+        });
+        try {
+          unlinkSync3(msgFilePath);
+        } catch {
+        }
         return result.trim() || "Committed successfully.";
       } catch (err) {
+        try {
+          unlinkSync3(join10(getCwd(), ".git", "MERCU_MSG"));
+        } catch {
+        }
         const stderr = err.stderr?.trim() || "";
         if (stderr.includes("nothing to commit")) {
           return "Nothing to commit \u2014 no staged changes.";
@@ -6912,8 +7126,8 @@ var CapabilityRegistry = class {
 };
 
 // src/skills/loader.ts
-import { existsSync as existsSync16, readFileSync as readFileSync10, readdirSync as readdirSync3, mkdirSync as mkdirSync9, writeFileSync as writeFileSync10 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync10, readdirSync as readdirSync3, mkdirSync as mkdirSync9, writeFileSync as writeFileSync11 } from "fs";
+import { join as join11 } from "path";
 import { parse as parseYaml5 } from "yaml";
 var SKILL_FILE = "SKILL.md";
 function parseSkillMd(content) {
@@ -6937,7 +7151,7 @@ var SkillLoader = class {
   discovered = /* @__PURE__ */ new Map();
   loaded = /* @__PURE__ */ new Map();
   constructor(skillsDir) {
-    this.skillsDir = skillsDir || join9(getMercuryHome(), "skills");
+    this.skillsDir = skillsDir || join11(getMercuryHome(), "skills");
   }
   discover() {
     this.discovered.clear();
@@ -6950,7 +7164,7 @@ var SkillLoader = class {
     const entries = readdirSync3(this.skillsDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith("_")) continue;
-      const skillPath = join9(this.skillsDir, entry.name, SKILL_FILE);
+      const skillPath = join11(this.skillsDir, entry.name, SKILL_FILE);
       if (!existsSync16(skillPath)) continue;
       try {
         const raw = readFileSync10(skillPath, "utf-8");
@@ -6972,18 +7186,18 @@ var SkillLoader = class {
     if (cached) return cached;
     for (const entry of readdirSync3(this.skillsDir, { withFileTypes: true })) {
       if (!entry.isDirectory() || entry.name.startsWith("_")) continue;
-      const skillPath = join9(this.skillsDir, entry.name, SKILL_FILE);
+      const skillPath = join11(this.skillsDir, entry.name, SKILL_FILE);
       if (!existsSync16(skillPath)) continue;
       try {
         const raw = readFileSync10(skillPath, "utf-8");
         const parsed = parseSkillMd(raw);
         if (!parsed || parsed.meta.name !== name) continue;
-        const skillDir = join9(this.skillsDir, entry.name);
+        const skillDir = join11(this.skillsDir, entry.name);
         const skill = {
           ...parsed.meta,
           instructions: parsed.instructions,
-          scriptsDir: existsSync16(join9(skillDir, "scripts")) ? join9(skillDir, "scripts") : void 0,
-          referencesDir: existsSync16(join9(skillDir, "references")) ? join9(skillDir, "references") : void 0
+          scriptsDir: existsSync16(join11(skillDir, "scripts")) ? join11(skillDir, "scripts") : void 0,
+          referencesDir: existsSync16(join11(skillDir, "references")) ? join11(skillDir, "references") : void 0
         };
         this.loaded.set(name, skill);
         return skill;
@@ -7003,17 +7217,17 @@ var SkillLoader = class {
     return "Available skills:\n" + skills.map((s) => `- ${s.name}: ${s.description}`).join("\n");
   }
   saveSkill(name, content) {
-    const skillDir = join9(this.skillsDir, name);
+    const skillDir = join11(this.skillsDir, name);
     if (!existsSync16(skillDir)) {
       mkdirSync9(skillDir, { recursive: true });
     }
-    writeFileSync10(join9(skillDir, SKILL_FILE), content, "utf-8");
+    writeFileSync11(join11(skillDir, SKILL_FILE), content, "utf-8");
     logger.info({ skill: name }, "Skill saved");
     this.discover();
     return skillDir;
   }
   seedTemplate() {
-    const templateDir = join9(this.skillsDir, "_template");
+    const templateDir = join11(this.skillsDir, "_template");
     mkdirSync9(templateDir, { recursive: true });
     const content = `---
 name: template-skill
@@ -7044,7 +7258,7 @@ Describe what this skill enables Mercury to do. When invoked via the use_skill t
 - List only the tools you need in allowed-tools
 - The skill name must be unique among installed skills
 `;
-    writeFileSync10(join9(templateDir, SKILL_FILE), content, "utf-8");
+    writeFileSync11(join11(templateDir, SKILL_FILE), content, "utf-8");
     logger.info("Seeded template skill");
   }
 };
@@ -7213,17 +7427,17 @@ function getManual() {
 
 // src/cli/daemon.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync17, readFileSync as readFileSync11, writeFileSync as writeFileSync11, unlinkSync as unlinkSync3, mkdirSync as mkdirSync10, openSync } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync11, writeFileSync as writeFileSync12, unlinkSync as unlinkSync4, mkdirSync as mkdirSync10, openSync } from "fs";
+import { join as join12 } from "path";
 import process2 from "process";
 import chalk5 from "chalk";
 var PID_FILE = "daemon.pid";
 var LOG_FILE = "daemon.log";
 function pidPath() {
-  return join10(getMercuryHome(), PID_FILE);
+  return join12(getMercuryHome(), PID_FILE);
 }
 function logPath() {
-  return join10(getMercuryHome(), LOG_FILE);
+  return join12(getMercuryHome(), LOG_FILE);
 }
 function readPid() {
   const path3 = pidPath();
@@ -7259,7 +7473,7 @@ function startBackground() {
   }
   if (status.pid && !status.running) {
     try {
-      unlinkSync3(pidPath());
+      unlinkSync4(pidPath());
     } catch {
     }
   }
@@ -7277,7 +7491,7 @@ function startBackground() {
     windowsHide: isWin
   });
   child.unref();
-  writeFileSync11(pidPath(), String(child.pid));
+  writeFileSync12(pidPath(), String(child.pid));
   console.log("");
   console.log(chalk5.green(`  Mercury started in background (PID: ${child.pid})`));
   console.log(chalk5.dim(`  Logs: ${logFile}`));
@@ -7295,7 +7509,7 @@ function stopDaemon() {
   if (!status.running) {
     console.log(chalk5.yellow(`  Stale PID file found (PID: ${status.pid} is not running). Cleaning up.`));
     try {
-      unlinkSync3(pidPath());
+      unlinkSync4(pidPath());
     } catch {
     }
     console.log("");
@@ -7312,7 +7526,7 @@ function stopDaemon() {
     console.log(chalk5.red(`  Failed to stop PID ${status.pid}. You may need to kill it manually.`));
   }
   try {
-    unlinkSync3(pidPath());
+    unlinkSync4(pidPath());
   } catch {
   }
   console.log("");
@@ -7330,13 +7544,13 @@ function restartDaemon() {
     } catch {
     }
     try {
-      unlinkSync3(pidPath());
+      unlinkSync4(pidPath());
     } catch {
     }
     console.log(chalk5.green("  Mercury stopped."));
   } else if (status.pid) {
     try {
-      unlinkSync3(pidPath());
+      unlinkSync4(pidPath());
     } catch {
     }
   }
@@ -7362,7 +7576,7 @@ function tryAutoDaemonize() {
     }
     if (status.pid && !status.running) {
       try {
-        unlinkSync3(pidPath());
+        unlinkSync4(pidPath());
       } catch {
       }
     }
@@ -7383,7 +7597,7 @@ function tryAutoDaemonize() {
     if (!child.pid) {
       return false;
     }
-    writeFileSync11(pidPath(), String(child.pid));
+    writeFileSync12(pidPath(), String(child.pid));
     return true;
   } catch {
     return false;
@@ -7391,9 +7605,9 @@ function tryAutoDaemonize() {
 }
 
 // src/cli/service.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync11, writeFileSync as writeFileSync12, unlinkSync as unlinkSync4 } from "fs";
-import { join as join11 } from "path";
-import { homedir as homedir3 } from "os";
+import { existsSync as existsSync18, mkdirSync as mkdirSync11, writeFileSync as writeFileSync13, unlinkSync as unlinkSync5 } from "fs";
+import { join as join13 } from "path";
+import { homedir as homedir4 } from "os";
 import chalk6 from "chalk";
 import { execSync as execSync8 } from "child_process";
 var SERVICE_DESC = "Mercury \u2014 Soul-Driven AI Agent";
@@ -7401,9 +7615,9 @@ var WIN_TASK_NAME = "MercuryAgent";
 function isServiceInstalled() {
   const platform = process.platform;
   if (platform === "darwin") {
-    return existsSync18(join11(homedir3(), "Library", "LaunchAgents", "com.cosmicstack.mercury.plist"));
+    return existsSync18(join13(homedir4(), "Library", "LaunchAgents", "com.cosmicstack.mercury.plist"));
   } else if (platform === "linux") {
-    return existsSync18(join11(homedir3(), ".config", "systemd", "user", "mercury.service"));
+    return existsSync18(join13(homedir4(), ".config", "systemd", "user", "mercury.service"));
   } else if (platform === "win32") {
     try {
       execSync8(`schtasks /query /tn "${WIN_TASK_NAME}"`, { stdio: "pipe", shell: "cmd.exe" });
@@ -7418,7 +7632,10 @@ function getNodeBinPath() {
   return process.execPath;
 }
 function getDistPath() {
-  return join11(process.argv[1] || "/usr/local/bin/mercury", "..", "..", "lib", "node_modules", "@cosmicstack", "mercury-agent", "dist", "index.js");
+  if (!process.argv[1]) {
+    return join13(homedir4(), ".nvm", "versions", "node", `v${process.version.slice(1)}`, "lib", "node_modules", "@cosmicstack", "mercury-agent", "dist", "index.js");
+  }
+  return join13(process.argv[1], "..", "..", "lib", "node_modules", "@cosmicstack", "mercury-agent", "dist", "index.js");
 }
 function installService() {
   const platform = process.platform;
@@ -7457,16 +7674,16 @@ function showServiceStatus() {
   }
 }
 function installMac() {
-  const plistDir = join11(homedir3(), "Library", "LaunchAgents");
-  const plistPath = join11(plistDir, "com.cosmicstack.mercury.plist");
+  const plistDir = join13(homedir4(), "Library", "LaunchAgents");
+  const plistPath = join13(plistDir, "com.cosmicstack.mercury.plist");
   if (!existsSync18(plistDir)) {
     mkdirSync11(plistDir, { recursive: true });
   }
   const nodeBin = getNodeBinPath();
   const scriptPath = getDistPath();
   const home = getMercuryHome();
-  const logPath2 = join11(home, "daemon.log");
-  const errPath = join11(home, "daemon-error.log");
+  const logPath2 = join13(home, "daemon.log");
+  const errPath = join13(home, "daemon-error.log");
   const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -7496,13 +7713,13 @@ function installMac() {
     <key>PATH</key>
     <string>${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}</string>
     <key>HOME</key>
-    <string>${homedir3()}</string>
+    <string>${homedir4()}</string>
   </dict>
   <key>WorkingDirectory</key>
-  <string>${homedir3()}</string>
+  <string>${homedir4()}</string>
 </dict>
 </plist>`;
-  writeFileSync12(plistPath, plist, "utf-8");
+  writeFileSync13(plistPath, plist, "utf-8");
   try {
     execSync8(`launchctl load ${plistPath}`, { stdio: "inherit" });
   } catch {
@@ -7519,7 +7736,7 @@ function installMac() {
   console.log("");
 }
 function uninstallMac() {
-  const plistPath = join11(homedir3(), "Library", "LaunchAgents", "com.cosmicstack.mercury.plist");
+  const plistPath = join13(homedir4(), "Library", "LaunchAgents", "com.cosmicstack.mercury.plist");
   if (!existsSync18(plistPath)) {
     console.log(chalk6.yellow("  Mercury service is not installed."));
     console.log("");
@@ -7530,7 +7747,7 @@ function uninstallMac() {
   } catch {
   }
   try {
-    unlinkSync4(plistPath);
+    unlinkSync5(plistPath);
   } catch {
     console.log(chalk6.yellow("  Failed to remove plist file. Remove manually:"));
     console.log(chalk6.dim(`    rm ${plistPath}`));
@@ -7540,7 +7757,7 @@ function uninstallMac() {
   console.log("");
 }
 function showMacStatus() {
-  const plistPath = join11(homedir3(), "Library", "LaunchAgents", "com.cosmicstack.mercury.plist");
+  const plistPath = join13(homedir4(), "Library", "LaunchAgents", "com.cosmicstack.mercury.plist");
   if (!existsSync18(plistPath)) {
     console.log(chalk6.yellow("  Mercury service is not installed."));
     console.log(chalk6.dim("  Run `mercury service install` to set it up."));
@@ -7558,11 +7775,11 @@ function showMacStatus() {
   console.log("");
 }
 function installLinux() {
-  const systemdDir = join11(homedir3(), ".config", "systemd", "user");
+  const systemdDir = join13(homedir4(), ".config", "systemd", "user");
   if (!existsSync18(systemdDir)) {
     mkdirSync11(systemdDir, { recursive: true });
   }
-  const servicePath = join11(systemdDir, "mercury.service");
+  const servicePath = join13(systemdDir, "mercury.service");
   const nodeBin = getNodeBinPath();
   const scriptPath = getDistPath();
   const home = getMercuryHome();
@@ -7576,14 +7793,14 @@ ExecStart=${nodeBin} ${scriptPath} start --daemon
 Restart=on-failure
 RestartSec=5
 Environment=PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}
-Environment=HOME=${homedir3()}
-WorkingDirectory=${homedir3()}
-StandardOutput=append:${join11(home, "daemon.log")}
-StandardError=append:${join11(home, "daemon-error.log")}
+Environment=HOME=${homedir4()}
+WorkingDirectory=${homedir4()}
+StandardOutput=append:${join13(home, "daemon.log")}
+StandardError=append:${join13(home, "daemon-error.log")}
 
 [Install]
 WantedBy=default.target`;
-  writeFileSync12(servicePath, service, "utf-8");
+  writeFileSync13(servicePath, service, "utf-8");
   try {
     execSync8("systemctl --user daemon-reload", { stdio: "inherit" });
     execSync8("systemctl --user enable mercury.service", { stdio: "inherit" });
@@ -7603,14 +7820,14 @@ WantedBy=default.target`;
   console.log("");
   console.log(chalk6.green("  Mercury service installed (systemd --user)"));
   console.log(chalk6.dim(`  Service: ${servicePath}`));
-  console.log(chalk6.dim(`  Logs: ${join11(home, "daemon.log")}`));
+  console.log(chalk6.dim(`  Logs: ${join13(home, "daemon.log")}`));
   console.log(chalk6.dim("  Auto-starts on login. Auto-restarts on crash (5s delay)."));
   console.log("");
   console.log(chalk6.dim("  Uninstall: mercury service uninstall"));
   console.log("");
 }
 function uninstallLinux() {
-  const servicePath = join11(homedir3(), ".config", "systemd", "user", "mercury.service");
+  const servicePath = join13(homedir4(), ".config", "systemd", "user", "mercury.service");
   if (!existsSync18(servicePath)) {
     console.log(chalk6.yellow("  Mercury service is not installed."));
     console.log("");
@@ -7622,7 +7839,7 @@ function uninstallLinux() {
   } catch {
   }
   try {
-    unlinkSync4(servicePath);
+    unlinkSync5(servicePath);
   } catch {
     console.log(chalk6.yellow("  Failed to remove service file. Remove manually:"));
     console.log(chalk6.dim(`    rm ${servicePath}`));
@@ -7636,7 +7853,7 @@ function uninstallLinux() {
   console.log("");
 }
 function showLinuxStatus() {
-  const servicePath = join11(homedir3(), ".config", "systemd", "user", "mercury.service");
+  const servicePath = join13(homedir4(), ".config", "systemd", "user", "mercury.service");
   if (!existsSync18(servicePath)) {
     console.log(chalk6.yellow("  Mercury service is not installed."));
     console.log(chalk6.dim("  Run `mercury service install` to set it up."));
@@ -7656,7 +7873,7 @@ function installWindows() {
   const nodeBin = getNodeBinPath();
   const scriptPath = getDistPath();
   const home = getMercuryHome();
-  const logPath2 = join11(home, "daemon.log");
+  const logPath2 = join13(home, "daemon.log");
   const cmd = `"${nodeBin}" "${scriptPath}" start --daemon`;
   try {
     execSync8(
@@ -7938,7 +8155,7 @@ async function fetchProviderModelCatalog(provider, config) {
 
 // src/index.ts
 var __dirname = dirname4(fileURLToPath(import.meta.url));
-var pkgVersion = JSON.parse(readFileSync12(join12(__dirname, "..", "package.json"), "utf8")).version;
+var pkgVersion = JSON.parse(readFileSync12(join14(__dirname, "..", "package.json"), "utf8")).version;
 function hr() {
   console.log(chalk7.dim("\u2500".repeat(50)));
 }
@@ -8223,14 +8440,14 @@ async function promptValidatedValue(prompt, validator, existingValue, options) {
   }
 }
 function appendToEnv(key, value) {
-  const envPath = join12(getMercuryHome(), ".env");
+  const envPath = join14(getMercuryHome(), ".env");
   let envContent = "";
   if (existsSync19(envPath)) {
     envContent = readFileSync12(envPath, "utf-8");
   }
   const lines = envContent.split("\n").filter((l) => !l.startsWith(`${key}=`) && l.trim() !== "");
   lines.push(`${key}=${value}`);
-  writeFileSync13(envPath, lines.join("\n") + "\n", "utf-8");
+  writeFileSync14(envPath, lines.join("\n") + "\n", "utf-8");
   process.env[key] = value;
 }
 function parseGithubRepo(input) {
@@ -8618,7 +8835,7 @@ async function runAgent(isDaemon = false) {
   const longTerm = new LongTermMemory(config);
   const episodic = new EpisodicMemory(config);
   let userMemory = null;
-  if (config.memory.secondBrain?.enabled !== false) {
+  if (config.memory.secondBrain?.enabled !== false && isBetterSqlite3Available()) {
     try {
       userMemory = new UserMemoryStore(config);
       if (!isDaemon) {
@@ -8630,6 +8847,10 @@ async function runAgent(isDaemon = false) {
       logger.warn({ err }, "Second brain initialization failed, continuing without it");
       userMemory = null;
     }
+  } else if (config.memory.secondBrain?.enabled !== false && !isBetterSqlite3Available()) {
+    logger.warn(
+      "better-sqlite3 is not available \u2014 second brain memory is disabled. To enable it, install build tools (make, gcc/g++, python3) and ensure Node >= 20, then reinstall."
+    );
   }
   const channels = new ChannelRegistry(config);
   const capabilities = new CapabilityRegistry(skillLoader, scheduler, tokenBudget);
@@ -9046,10 +9267,10 @@ program.command("upgrade").description("Upgrade Mercury to the latest version fr
   } catch {
     try {
       const globalDir = execSync9("npm root -g", { encoding: "utf-8" }).trim();
-      const pkgDir = join12(globalDir, "@cosmicstack", "mercury-agent");
-      const { rmSync: rmSync2 } = await import("fs");
+      const pkgDir = join14(globalDir, "@cosmicstack", "mercury-agent");
+      const { rmSync: rmSync3 } = await import("fs");
       try {
-        rmSync2(pkgDir, { recursive: true, force: true });
+        rmSync3(pkgDir, { recursive: true, force: true });
       } catch {
       }
     } catch {