@rui.branco/claude-commands-mcp 2.0.27 → 2.0.29

package/index.js

@@ -113,14 +113,8 @@ function gitPushSync() {
 }
 
 function gitPush(message) {
-  if (needsRecovery()) gitRecover();
-  execSync("git add -A", { cwd: CACHE_DIR, stdio: "pipe" });
-  try {
-    execSync(`git commit -m "${message}"`, { cwd: CACHE_DIR, stdio: "pipe" });
-  } catch {
-    return;
-  }
-  // Push in background — don't block the caller
+  // Everything runs in background — don't block the caller
+  const escapedMessage = message.replace(/"/g, '\\"');
   const child = spawn(
     "node",
     [
@@ -128,6 +122,14 @@ function gitPush(message) {
       `
       const { execSync } = require("child_process");
       const cwd = ${JSON.stringify(CACHE_DIR)};
+      try { const s = execSync("git status --porcelain -b", { cwd, stdio: "pipe" }).toString();
+        if (s.includes("no branch") || s.includes("rebase")) {
+          try { execSync("git rebase --abort", { cwd, stdio: "pipe" }); } catch {}
+          try { execSync("git checkout main", { cwd, stdio: "pipe" }); } catch {}
+        }
+      } catch {}
+      execSync("git add -A", { cwd, stdio: "pipe" });
+      try { execSync('git commit -m "${escapedMessage}"', { cwd, stdio: "pipe" }); } catch { process.exit(0); }
       for (let i = 0; i < 3; i++) {
         try { execSync("git push", { cwd, stdio: "pipe" }); process.exit(0); } catch {}
         try { execSync("git pull --rebase", { cwd, stdio: "pipe" }); } catch {
@@ -304,7 +306,7 @@ server.tool(
 // Tool: save a file and push to git
 server.tool(
   "save_file",
-  "Save/update a file in the commands directory and push to git. Use for tracking data, skill updates, or any file that should persist.",
+  "Save/update a file in the commands directory and push to git. Use for tracking data, skill updates, or any file that should persist. Use append:true for tracking files to add content without overwriting existing data (single tool call, no need to read first).",
   {
     path: z
       .string()
@@ -312,12 +314,18 @@ server.tool(
         "File path relative to commands/ (e.g. 'folder/tracking/2026-02-07.md')",
       ),
     content: z.string().describe("The file content to save"),
+    append: z
+      .boolean()
+      .optional()
+      .describe(
+        "If true, appends content to the existing file instead of overwriting. Creates the file if it doesn't exist.",
+      ),
     message: z
       .string()
       .optional()
       .describe("Git commit message (auto-generated if not provided)"),
   },
-  async ({ path, content, message }) => {
+  async ({ path, content, append, message }) => {
     try {
       // If path has no extension but a .md file exists, use that (matches get_skill behavior)
       if (!extname(path)) {
@@ -331,7 +339,12 @@ server.tool(
         mkdirSync(fileDir, { recursive: true });
       }
 
-      writeFileSync(filePath, content, "utf-8");
+      if (append && existsSync(filePath)) {
+        const existing = readFileSync(filePath, "utf-8");
+        writeFileSync(filePath, existing + content, "utf-8");
+      } else {
+        writeFileSync(filePath, content, "utf-8");
+      }
 
       const commitMsg = message || `update: ${path}`;
       gitPush(commitMsg);
@@ -340,7 +353,7 @@ server.tool(
         content: [
           {
             type: "text",
-            text: `Saved and pushed: commands/${path}`,
+            text: `${append ? "Appended to" : "Saved and pushed"}: commands/${path}`,
           },
         ],
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rui.branco/claude-commands-mcp",
-  "version": "2.0.27",
+  "version": "2.0.29",
   "description": "MCP server that serves Claude Code skill definitions from a git repo",
   "type": "module",
   "main": "index.js",