@neurynae/toolcairn-mcp 0.10.9 → 0.10.10

package/dist/index.js

@@ -4473,9 +4473,7 @@ function getOpenCodeMcpEntry(serverPath) {
 
 // ../../packages/tools-local/dist/auto-init.js
 var logger18 = (0, import_errors20.createMcpLogger)({ name: "@toolcairn/tools:auto-init" });
-var INSTRUCTION_SENTINEL = "## ToolCairn \u2014 Tool Intelligence MCP";
-var GITIGNORE_SENTINEL = "# ToolCairn";
-var GITIGNORE_BLOCK = "\n# ToolCairn\n.toolcairn/events.jsonl\n.toolcairn/audit-log.jsonl\n.toolcairn/audit-log.archive.jsonl\n.toolcairn/config.lock\n";
+var GITIGNORE_BLOCK = "\n# ToolCairn\n.toolcairn/events.jsonl\n.toolcairn/audit-log.jsonl\n.toolcairn/audit-log.archive.jsonl\n.toolcairn/config.json\n";
 async function autoInitProject(input) {
   const { projectRoot, agent, batchResolve, serverPath, reason } = input;
   logger18.info({ projectRoot, agent }, "autoInitProject starting");
@@ -4620,20 +4618,16 @@ async function applySetupFiles(projectRoot, args) {
 }
 async function applyInstructionFile(abs, relPath, content) {
   try {
-    const exists = await fileExists(abs);
-    if (exists) {
+    if (await fileExists(abs)) {
       const current = await readFile28(abs, "utf-8");
-      if (current.includes(INSTRUCTION_SENTINEL)) {
+      if (current === content) {
         return {
           file: relPath,
           action: "append-or-create",
           applied: false,
-          reason: "ToolCairn rules block already present"
+          reason: "content already up to date"
         };
       }
-      const separator = current.endsWith("\n") ? "" : "\n";
-      await writeFileAtomic3(abs, `${current}${separator}${content}`, "utf-8");
-      return { file: relPath, action: "append-or-create", applied: true };
     }
     await writeFileAtomic3(abs, content, "utf-8");
     return { file: relPath, action: "append-or-create", applied: true };
@@ -4666,20 +4660,25 @@ async function applyMcpConfig(abs, relPath, entry, isOpenCode) {
       };
     }
     const existingServers = parsed[topKey] && typeof parsed[topKey] === "object" && !Array.isArray(parsed[topKey]) ? parsed[topKey] : {};
-    if (existingServers.toolcairn !== void 0) {
+    const toolcairnEntry = entry.toolcairn ?? entry;
+    const merged = {
+      ...parsed,
+      [topKey]: {
+        ...existingServers,
+        toolcairn: toolcairnEntry
+      }
+    };
+    const nextJson = `${JSON.stringify(merged, null, 2)}
+`;
+    if (raw === nextJson) {
       return {
         file: relPath,
         action: "merge-or-create",
         applied: false,
-        reason: `${topKey}.toolcairn already present`
+        reason: "toolcairn entry already up to date"
       };
     }
-    const merged = {
-      ...parsed,
-      [topKey]: { ...existingServers, ...entry }
-    };
-    await writeFileAtomic3(abs, `${JSON.stringify(merged, null, 2)}
-`, "utf-8");
+    await writeFileAtomic3(abs, nextJson, "utf-8");
     return { file: relPath, action: "merge-or-create", applied: true };
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
@@ -4687,25 +4686,43 @@ async function applyMcpConfig(abs, relPath, entry, isOpenCode) {
     return { file: relPath, action: "merge-or-create", applied: false, reason };
   }
 }
+var GITIGNORE_BLOCK_START = "# toolcairn:start";
+var GITIGNORE_BLOCK_END = "# toolcairn:end";
+function buildGitignoreBlock() {
+  return `${GITIGNORE_BLOCK_START}${GITIGNORE_BLOCK}${GITIGNORE_BLOCK_END}
+`;
+}
 async function applyGitignore(abs) {
   const relPath = ".gitignore";
   try {
     const exists = await fileExists(abs);
+    const ourBlock = buildGitignoreBlock();
     if (!exists) {
-      await writeFileAtomic3(abs, GITIGNORE_BLOCK.replace(/^\n/, ""), "utf-8");
+      await writeFileAtomic3(abs, ourBlock, "utf-8");
       return { file: relPath, action: "append", applied: true };
     }
     const current = await readFile28(abs, "utf-8");
-    if (current.includes(GITIGNORE_SENTINEL)) {
+    const startIdx = current.indexOf(GITIGNORE_BLOCK_START);
+    const endIdx = current.indexOf(GITIGNORE_BLOCK_END);
+    let next;
+    if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
+      const lineStart = current.lastIndexOf("\n", startIdx) + 1;
+      const afterEndOfLine = current.indexOf("\n", endIdx);
+      const sliceEnd = afterEndOfLine === -1 ? current.length : afterEndOfLine + 1;
+      next = current.slice(0, lineStart) + ourBlock + current.slice(sliceEnd);
+    } else {
+      const separator = current.endsWith("\n") ? "" : "\n";
+      next = `${current}${separator}${ourBlock}`;
+    }
+    if (next === current) {
       return {
         file: relPath,
         action: "append",
         applied: false,
-        reason: "ToolCairn gitignore block already present"
+        reason: "block already up to date"
       };
     }
-    const separator = current.endsWith("\n") ? "" : "\n";
-    await writeFileAtomic3(abs, `${current}${separator}${GITIGNORE_BLOCK}`, "utf-8");
+    await writeFileAtomic3(abs, next, "utf-8");
     return { file: relPath, action: "append", applied: true };
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);