gossipcat 0.4.7 → 0.4.8

package/dist-mcp/mcp-server.js

@@ -4116,13 +4116,31 @@ var init_git_tools = __esm({
       constructor(cwd) {
         this.cwd = cwd;
       }
+      async execGit(args) {
+        const opts = { cwd: this.cwd, env: { ...process.env } };
+        try {
+          return await execFileAsync2("git", args, opts);
+        } catch (err) {
+          const code = err.code;
+          if (code === "ENOENT") {
+            await new Promise((r) => setTimeout(r, 100));
+            return await execFileAsync2("git", args, opts);
+          }
+          throw err;
+        }
+      }
       async git(...args) {
         try {
-          const { stdout } = await execFileAsync2("git", args, { cwd: this.cwd });
+          const { stdout } = await this.execGit(args);
           return stdout.trim();
         } catch (err) {
           const error48 = err;
-          const msg = error48.stderr ? error48.stderr.trim() : error48.message;
+          let msg = "Unknown error";
+          if (error48 && typeof error48.stderr === "string") {
+            msg = error48.stderr.trim();
+          } else if (error48 && typeof error48.message === "string") {
+            msg = error48.message;
+          }
           throw new Error(`git ${args[0]} failed: ${msg}`);
         }
       }
@@ -4144,13 +4162,11 @@ var init_git_tools = __esm({
         }
         for (const file2 of untrackedFiles) {
           try {
-            const { stdout } = await execFileAsync2(
-              "git",
-              ["diff", "--no-index", "/dev/null", file2],
-              { cwd: this.cwd }
+            const { stdout } = await this.execGit(
+              ["diff", "--no-index", "/dev/null", file2]
             ).catch((err) => {
               const e = err;
-              return { stdout: e.stdout || "" };
+              return { stdout: e.stdout || "", stderr: e.stderr || "" };
             });
             if (stdout) diffs.push(stdout.trim());
           } catch (err) {
@@ -4266,7 +4282,8 @@ var init_sandbox = __esm({
        *                  callers are unchanged.
        */
       validatePath(filePath, allowedRoots = []) {
-        const resolved = (0, import_path5.resolve)(this.root, filePath);
+        const resolutionBase = allowedRoots[0] || this.root;
+        const resolved = (0, import_path5.resolve)(resolutionBase, filePath);
         let checkPath = resolved;
         while (!(0, import_fs4.existsSync)(checkPath)) {
           const parent = (0, import_path5.dirname)(checkPath);
@@ -11901,6 +11918,19 @@ var init_scope_tracker = __esm({
 });
 
 // packages/orchestrator/src/worktree-manager.ts
+async function execGit(args, cwd) {
+  const opts = { cwd, env: { ...process.env } };
+  try {
+    return await execFileAsync3("git", args, opts);
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") {
+      await new Promise((r) => setTimeout(r, 100));
+      return await execFileAsync3("git", args, opts);
+    }
+    throw err;
+  }
+}
 var import_child_process3, import_util8, import_promises2, import_path19, import_os, execFileAsync3, WorktreeManager;
 var init_worktree_manager = __esm({
   "packages/orchestrator/src/worktree-manager.ts"() {
@@ -11918,12 +11948,12 @@ var init_worktree_manager = __esm({
       async create(taskId) {
         const branch = `gossip-${taskId}`;
         const wtPath = await (0, import_promises2.mkdtemp)((0, import_path19.join)((0, import_os.tmpdir)(), "gossip-wt-"));
-        await execFileAsync3("git", ["branch", branch, "HEAD"], { cwd: this.projectRoot });
+        await execGit(["branch", branch, "HEAD"], this.projectRoot);
         try {
-          await execFileAsync3("git", ["worktree", "add", wtPath, branch], { cwd: this.projectRoot });
+          await execGit(["worktree", "add", wtPath, branch], this.projectRoot);
         } catch (err) {
           try {
-            await execFileAsync3("git", ["branch", "-D", branch], { cwd: this.projectRoot });
+            await execGit(["branch", "-D", branch], this.projectRoot);
           } catch {
           }
           throw err;
@@ -11932,14 +11962,14 @@ var init_worktree_manager = __esm({
       }
       async merge(taskId) {
         const branch = `gossip-${taskId}`;
-        const log4 = await execFileAsync3("git", ["log", `HEAD..${branch}`, "--oneline"], { cwd: this.projectRoot });
+        const log4 = await execGit(["log", `HEAD..${branch}`, "--oneline"], this.projectRoot);
         if (!log4.stdout.trim()) return { merged: true };
         try {
-          await execFileAsync3("git", ["merge", branch, "--no-edit"], { cwd: this.projectRoot });
+          await execGit(["merge", branch, "--no-edit"], this.projectRoot);
           return { merged: true };
         } catch {
-          await execFileAsync3("git", ["merge", "--abort"], { cwd: this.projectRoot });
-          const diff = await execFileAsync3("git", ["diff", "--name-only", `HEAD...${branch}`], { cwd: this.projectRoot });
+          await execGit(["merge", "--abort"], this.projectRoot);
+          const diff = await execGit(["diff", "--name-only", `HEAD...${branch}`], this.projectRoot);
           const files = diff.stdout.trim();
           return { merged: false, conflicts: files ? files.split("\n") : [] };
         }
@@ -11947,30 +11977,30 @@ var init_worktree_manager = __esm({
       async cleanup(taskId, wtPath) {
         const branch = `gossip-${taskId}`;
         try {
-          await execFileAsync3("git", ["worktree", "remove", wtPath, "--force"], { cwd: this.projectRoot });
+          await execGit(["worktree", "remove", wtPath, "--force"], this.projectRoot);
         } catch {
         }
         try {
-          await execFileAsync3("git", ["branch", "-D", branch], { cwd: this.projectRoot });
+          await execGit(["branch", "-D", branch], this.projectRoot);
         } catch {
         }
       }
       async pruneOrphans() {
         try {
-          const result = await execFileAsync3("git", ["worktree", "list", "--porcelain"], { cwd: this.projectRoot });
+          const result = await execGit(["worktree", "list", "--porcelain"], this.projectRoot);
           const orphans = result.stdout.split("\n\n").filter((block) => block.includes("gossip-wt-")).map((block) => block.match(/worktree (.+)/)?.[1]).filter(Boolean);
           for (const wtPath of orphans) {
             try {
-              await execFileAsync3("git", ["worktree", "remove", wtPath, "--force"], { cwd: this.projectRoot });
+              await execGit(["worktree", "remove", wtPath, "--force"], this.projectRoot);
             } catch {
             }
           }
-          await execFileAsync3("git", ["worktree", "prune"], { cwd: this.projectRoot });
-          const branchResult = await execFileAsync3("git", ["branch", "--list", "gossip-*"], { cwd: this.projectRoot });
+          await execGit(["worktree", "prune"], this.projectRoot);
+          const branchResult = await execGit(["branch", "--list", "gossip-*"], this.projectRoot);
           const branches = branchResult.stdout.trim().split("\n").map((b) => b.trim().replace(/^\*\s*/, "")).filter(Boolean);
           for (const b of branches) {
             try {
-              await execFileAsync3("git", ["branch", "-D", b], { cwd: this.projectRoot });
+              await execGit(["branch", "-D", b], this.projectRoot);
             } catch {
             }
           }
@@ -21620,7 +21650,7 @@ function expandTmpVariants(path2) {
   }
   return [p];
 }
-function buildAuditExclusions(projectRoot, ownWorktree) {
+function buildAuditExclusions(projectRoot, ownWorktree, scope) {
   const excl = /* @__PURE__ */ new Set();
   const root = canonicalize(projectRoot);
   for (const v of expandTmpVariants(`${root}/.gossip`)) excl.add(v);
@@ -21635,7 +21665,7 @@ function buildAuditExclusions(projectRoot, ownWorktree) {
   }
   try {
     const tmp = canonicalize((0, import_os2.tmpdir)());
-    for (const pat of ["com.apple.*", "itunescloudd", "TemporaryItems"]) {
+    for (const pat of ["com.apple.*", "itunescloudd", "TemporaryItems", "node-compile-cache"]) {
       for (const v of expandTmpVariants(`${tmp}/${pat}`)) excl.add(v);
     }
   } catch {
@@ -21644,6 +21674,10 @@ function buildAuditExclusions(projectRoot, ownWorktree) {
     const wt = canonicalize(ownWorktree);
     for (const v of expandTmpVariants(wt)) excl.add(v);
   }
+  if (scope) {
+    const s = canonicalize((0, import_path38.join)(projectRoot, scope));
+    for (const v of expandTmpVariants(s)) excl.add(v);
+  }
   return Array.from(excl);
 }
 function buildFindPruneArgs(scanRoot, exclusions, sentinel) {
@@ -21687,7 +21721,7 @@ function auditFilesystemSinceSentinel(projectRoot, meta3, options = {}) {
     options.writeMode ?? meta3.writeMode,
     projectRoot
   );
-  const exclusions = buildAuditExclusions(projectRoot, meta3.worktreePath);
+  const exclusions = buildAuditExclusions(projectRoot, meta3.worktreePath, options.scope);
   const findBin = options.findBinary ?? "find";
   const violations = [];
   for (const root of scanRoots) {
@@ -21768,7 +21802,8 @@ function runLayer3Audit(projectRoot, taskId) {
     }
     try {
       const l3 = auditFilesystemSinceSentinel(projectRoot, meta3, {
-        writeMode: meta3.writeMode
+        writeMode: meta3.writeMode,
+        scope: meta3.scope
       });
       if (l3.violations && l3.violations.length > 0) {
         const list = l3.violations.slice(0, 20).join(", ");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gossipcat",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Multi-agent orchestration for Claude Code — parallel review, consensus, adaptive dispatch",
   "mcpName": "io.github.ataberk-xyz/gossipcat",
   "repository": {