failproofai 0.0.6-beta.4 → 0.0.6-beta.5

package/dist/cli.mjs

@@ -1045,6 +1045,79 @@ function requirePrBeforeStop(ctx) {
     return allow("Could not check PR status, skipping.");
   }
 }
+function requireNoConflictsBeforeStop(ctx) {
+  const cwd = ctx.session?.cwd;
+  if (!cwd)
+    return allow("No working directory available, skipping conflict check.");
+  const branch = getCurrentBranch(cwd);
+  if (!branch || branch === "HEAD")
+    return allow("Detached HEAD, skipping conflict check.");
+  const baseBranch = ctx.params?.baseBranch ?? "main";
+  if (branch === baseBranch) {
+    return allow(`On base branch "${baseBranch}", skipping conflict check.`);
+  }
+  let localSkipped = false;
+  try {
+    execFileSync("git", ["rev-parse", "--verify", `origin/${baseBranch}`], {
+      cwd,
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 3000
+    });
+    const ahead = execFileSync("git", ["log", `origin/${baseBranch}..HEAD`, "--oneline"], { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000 }).trim();
+    if (!ahead) {
+      localSkipped = true;
+    } else {
+      execFileSync("git", ["merge-tree", "--write-tree", "--name-only", `origin/${baseBranch}`, "HEAD"], { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 1e4 });
+    }
+  } catch (err) {
+    const e = err;
+    if (e.status === 1) {
+      const out = (typeof e.stdout === "string" ? e.stdout : e.stdout?.toString("utf8") ?? "").trim();
+      const lines = out.split(`
+`);
+      const files = [];
+      for (let i = 1;i < lines.length; i++) {
+        const line = lines[i];
+        if (line === "")
+          break;
+        files.push(line);
+      }
+      const fileList = files.length ? files.join(", ") : "one or more files";
+      return deny(`Branch "${branch}" has merge conflicts with ${baseBranch} in: ${fileList}. ` + `Rebase or merge origin/${baseBranch} now and resolve the conflicts.`);
+    }
+    localSkipped = true;
+  }
+  try {
+    execSync("gh --version", { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 3000 });
+  } catch {
+    return allow(localSkipped ? "Local conflict check skipped and gh CLI not installed, skipping conflict check." : `Branch "${branch}" merges cleanly with ${baseBranch} locally (gh CLI not installed, PR mergeability not verified).`);
+  }
+  let prJson;
+  try {
+    prJson = execSync("gh pr view --json mergeable,number,url", {
+      cwd,
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 15000
+    }).trim();
+  } catch {
+    return allow(localSkipped ? "No pull request found for branch, skipping conflict check." : `Branch "${branch}" merges cleanly with ${baseBranch} locally (no PR to verify against).`);
+  }
+  let pr;
+  try {
+    pr = JSON.parse(prJson);
+  } catch {
+    return allow("Could not parse gh pr view output, skipping PR mergeability check.");
+  }
+  if (pr.mergeable === "CONFLICTING") {
+    return deny(`PR #${pr.number} has merge conflicts per GitHub (${pr.url}). ` + `Rebase or merge origin/${baseBranch} now and resolve the conflicts.`);
+  }
+  if (pr.mergeable === "UNKNOWN") {
+    return deny(`GitHub is still computing mergeability for PR #${pr.number} (${pr.url}). ` + `Wait ~10 seconds, then re-check with \`gh pr view --json mergeable\` before attempting to stop again.`);
+  }
+  return allow(`PR #${pr.number} merges cleanly per GitHub.`);
+}
 function requireCiGreenBeforeStop(ctx) {
   const cwd = ctx.session?.cwd;
   if (!cwd)
@@ -1502,6 +1575,21 @@ var init_builtin_policies = __esm(() => {
         }
       }
     },
+    {
+      name: "require-no-conflicts-before-stop",
+      description: "Require the current branch to merge cleanly with the base branch before Claude stops",
+      fn: requireNoConflictsBeforeStop,
+      match: { events: ["Stop"] },
+      defaultEnabled: false,
+      category: "Workflow",
+      params: {
+        baseBranch: {
+          type: "string",
+          description: "Base branch to check for conflicts against (default: main)",
+          default: "main"
+        }
+      }
+    },
     {
       name: "require-ci-green-before-stop",
       description: "Require CI checks to pass on the current branch before Claude stops",
@@ -2065,7 +2153,7 @@ var init_hook_activity_store = __esm(() => {
 });
 
 // package.json
-var version2 = "0.0.6-beta.4";
+var version2 = "0.0.6-beta.5";
 var init_package = () => {};
 
 // src/posthog-key.ts
@@ -4378,7 +4466,7 @@ import { realpathSync as realpathSync2 } from "fs";
 import { dirname as dirname7, resolve as resolve8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 // package.json
-var version = "0.0.6-beta.4";
+var version = "0.0.6-beta.5";
 
 // bin/failproofai.mjs
 if (!process.env.FAILPROOFAI_PACKAGE_ROOT) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "failproofai",
-  "version": "0.0.6-beta.4",
+  "version": "0.0.6-beta.5",
   "description": "The easiest way to manage policies that keep your AI agents reliable, on-task, and running autonomously — for Claude Code & the Agents SDK",
   "bin": {
     "failproofai": "./dist/cli.mjs"

package/src/hooks/builtin-policies.ts

@@ -1185,6 +1185,108 @@ function requirePrBeforeStop(ctx: PolicyContext): PolicyResult {
   }
 }
 
+function requireNoConflictsBeforeStop(ctx: PolicyContext): PolicyResult {
+  const cwd = ctx.session?.cwd;
+  if (!cwd) return allow("No working directory available, skipping conflict check.");
+
+  const branch = getCurrentBranch(cwd);
+  if (!branch || branch === "HEAD") return allow("Detached HEAD, skipping conflict check.");
+
+  const baseBranch = (ctx.params?.baseBranch as string) ?? "main";
+  if (branch === baseBranch) {
+    return allow(`On base branch "${baseBranch}", skipping conflict check.`);
+  }
+
+  // -- Layer 1: local git merge-tree --
+  let localSkipped = false;
+  try {
+    execFileSync("git", ["rev-parse", "--verify", `origin/${baseBranch}`], {
+      cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 3000,
+    });
+
+    const ahead = execFileSync(
+      "git", ["log", `origin/${baseBranch}..HEAD`, "--oneline"],
+      { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000 },
+    ).trim();
+
+    if (!ahead) {
+      // Nothing ahead of base — Layer 1 doesn't apply, fall through to Layer 2.
+      localSkipped = true;
+    } else {
+      execFileSync(
+        "git",
+        ["merge-tree", "--write-tree", "--name-only", `origin/${baseBranch}`, "HEAD"],
+        { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 10000 },
+      );
+      // exit 0 → clean merge, fall through to Layer 2
+    }
+  } catch (err) {
+    const e = err as { status?: number; stdout?: string | Buffer };
+    if (e.status === 1) {
+      // git merge-tree exit 1 = conflicts. stdout: <tree>\n<file>\n<file>\n\n<messages>
+      const out = (typeof e.stdout === "string" ? e.stdout : e.stdout?.toString("utf8") ?? "").trim();
+      const lines = out.split("\n");
+      const files: string[] = [];
+      for (let i = 1; i < lines.length; i++) {
+        const line = lines[i];
+        if (line === "") break;
+        files.push(line);
+      }
+      const fileList = files.length ? files.join(", ") : "one or more files";
+      return deny(
+        `Branch "${branch}" has merge conflicts with ${baseBranch} in: ${fileList}. ` +
+        `Rebase or merge origin/${baseBranch} now and resolve the conflicts.`,
+      );
+    }
+    localSkipped = true;
+  }
+
+  // -- Layer 2: GitHub PR mergeability --
+  try {
+    execSync("gh --version", { cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 3000 });
+  } catch {
+    return allow(
+      localSkipped
+        ? "Local conflict check skipped and gh CLI not installed, skipping conflict check."
+        : `Branch "${branch}" merges cleanly with ${baseBranch} locally (gh CLI not installed, PR mergeability not verified).`,
+    );
+  }
+
+  let prJson: string;
+  try {
+    prJson = execSync("gh pr view --json mergeable,number,url", {
+      cwd, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 15000,
+    }).trim();
+  } catch {
+    return allow(
+      localSkipped
+        ? "No pull request found for branch, skipping conflict check."
+        : `Branch "${branch}" merges cleanly with ${baseBranch} locally (no PR to verify against).`,
+    );
+  }
+
+  let pr: { mergeable: string; number: number; url: string };
+  try {
+    pr = JSON.parse(prJson);
+  } catch {
+    return allow("Could not parse gh pr view output, skipping PR mergeability check.");
+  }
+
+  if (pr.mergeable === "CONFLICTING") {
+    return deny(
+      `PR #${pr.number} has merge conflicts per GitHub (${pr.url}). ` +
+      `Rebase or merge origin/${baseBranch} now and resolve the conflicts.`,
+    );
+  }
+  if (pr.mergeable === "UNKNOWN") {
+    return deny(
+      `GitHub is still computing mergeability for PR #${pr.number} (${pr.url}). ` +
+      `Wait ~10 seconds, then re-check with \`gh pr view --json mergeable\` before attempting to stop again.`,
+    );
+  }
+  return allow(`PR #${pr.number} merges cleanly per GitHub.`);
+}
+
 function requireCiGreenBeforeStop(ctx: PolicyContext): PolicyResult {
   const cwd = ctx.session?.cwd;
   if (!cwd) return allow("No working directory available, skipping CI check.");
@@ -1590,6 +1692,21 @@ export const BUILTIN_POLICIES: BuiltinPolicyDefinition[] = [
       },
     } satisfies PolicyParamsSchema,
   },
+  {
+    name: "require-no-conflicts-before-stop",
+    description: "Require the current branch to merge cleanly with the base branch before Claude stops",
+    fn: requireNoConflictsBeforeStop,
+    match: { events: ["Stop"] },
+    defaultEnabled: false,
+    category: "Workflow",
+    params: {
+      baseBranch: {
+        type: "string",
+        description: "Base branch to check for conflicts against (default: main)",
+        default: "main",
+      },
+    } satisfies PolicyParamsSchema,
+  },
   {
     name: "require-ci-green-before-stop",
     description: "Require CI checks to pass on the current branch before Claude stops",