@mrrlin-dev/mcp 0.4.135 → 0.4.136

package/dist/bin.cjs

@@ -58554,7 +58554,7 @@ function sha256(text) {
   return (0, import_node_crypto11.createHash)("sha256").update(text).digest("hex");
 }
 function commitUncommittedWork(input) {
-  if (git(input.worktreePath, ["status", "--porcelain"]).length === 0) return false;
+  if (git(input.worktreePath, ["status", "--porcelain", "--untracked-files=normal"]).length === 0) return false;
   git(input.worktreePath, ["add", "-A"]);
   git(input.worktreePath, [
     "-c",
@@ -58663,9 +58663,12 @@ function integrateDefaultBranch(input) {
   const merge2 = gitTry(input.worktreePath, [
     "-c",
     `core.hooksPath=${input.hooksDir}`,
+    "-c",
+    "rerere.enabled=false",
     ...MRRLIN_IDENTITY,
     "merge",
     "--no-edit",
+    "--ff",
     "--no-verify",
     "-m",
     integrationCommitMessage(input.defaultBranch, input.runId),
@@ -59189,6 +59192,18 @@ function gitRead(cwd, args) {
     return null;
   }
 }
+function isBridgeRunWorktree(worktreePath, checkout, worktreeRoot) {
+  const real = (target) => {
+    const resolved = (import_node_fs13.realpathSync.native ?? import_node_fs13.realpathSync)(target);
+    return process.platform === "win32" ? resolved.toLowerCase() : resolved;
+  };
+  try {
+    const own = real(worktreePath);
+    return own !== real(checkout) && own.startsWith(`${real(worktreeRoot)}${import_node_path20.default.sep}`);
+  } catch {
+    return false;
+  }
+}
 var short = (sha) => (sha ?? "").slice(0, 7);
 function localLandingNote(outcome, ctx) {
   const { taskId, title, defaultBranch: d, detail } = ctx;
@@ -59417,17 +59432,25 @@ async function applyLocalRunForTool(deps, input) {
         slug: projectSlug,
         runId
       });
+      if (!isBridgeRunWorktree(worktreePath, checkout, deps.worktreeRoot)) {
+        throw new Error(`run_worktree_invalid: ${worktreePath} is not a run worktree under ${deps.worktreeRoot}`);
+      }
       const worktreeHead = gitRead(worktreePath, ["rev-parse", "HEAD"]);
-      if (worktreeHead !== delivered.headSha || gitRead(worktreePath, ["status", "--porcelain"]) !== "") {
+      if (worktreeHead !== delivered.headSha) {
         return {
           outcome: "run_branch_changed",
           previousSha: null,
           headSha: delivered.headSha,
-          detail: `the run worktree is at ${String(worktreeHead).slice(0, 12)} or has uncommitted changes`
+          detail: `the run worktree is at ${String(worktreeHead).slice(0, 12)}, not the signed ${delivered.headSha.slice(0, 12)}`
         };
       }
       if (!runBranchStillSigned()) return branchChanged();
-      (0, import_node_child_process17.execFileSync)("git", ["-C", worktreePath, "-c", `core.hooksPath=${hooksDir}`, "checkout", "-q", "--detach", delivered.headSha], {
+      (0, import_node_child_process17.execFileSync)("git", ["-C", worktreePath, "clean", "-q", "-f", "-d"], {
+        stdio: ["ignore", "pipe", "pipe"],
+        timeout: 3e4,
+        env: gitEnv()
+      });
+      (0, import_node_child_process17.execFileSync)("git", ["-C", worktreePath, "-c", `core.hooksPath=${hooksDir}`, "checkout", "-q", "-f", "--detach", delivered.headSha], {
         stdio: ["ignore", "pipe", "pipe"],
         timeout: 3e4,
         env: gitEnv()
@@ -63643,7 +63666,7 @@ Do NOT derail the current task - if the operator has an in-flight question, answ
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.4.135";
+var PKG_VERSION = "0.4.136";
 
 // src/bridge-allowed-origins.ts
 var DEFAULT_DIRECTOR_BRIDGE_ALLOWED_ORIGINS = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.135",
+  "version": "0.4.136",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"