failproofai 0.0.6-beta.3 → 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.3";
+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.3";
+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.3",
+  "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"
@@ -22,7 +22,7 @@
     "predev": "bun run build:cli && bun link",
     "dev": "FAILPROOFAI_TELEMETRY_DISABLED=1 bun scripts/dev.ts --port 8020",
     "build:cli": "bun build --target=node --format=esm --outfile=dist/cli.mjs bin/failproofai.mjs --external posthog-node && node -e \"const fs=require('fs');const c=fs.readFileSync('dist/cli.mjs','utf8');fs.writeFileSync('dist/cli.mjs',c.replace('#!/usr/bin/env bun','#!/usr/bin/env node').replace('// @bun\\n',''))\"",
-    "build": "bun build --target=node --format=cjs --outfile=dist/index.js src/index.ts && bun run build:cli && bun --bun next build && node -e \"const {cpSync}=require('fs');cpSync('.next/static','.next/standalone/.next/static',{recursive:true});\"",
+    "build": "bun build --target=node --format=cjs --outfile=dist/index.js src/index.ts && bun run build:cli && bun --bun next build && node -e \"const {cpSync}=require('fs');cpSync('.next/static','.next/standalone/.next/static',{recursive:true});\" && node scripts/prune-standalone.mjs",
     "prestart": "bun run build:cli && bun link",
     "start": "FAILPROOFAI_TELEMETRY_DISABLED=1 bun scripts/start.ts",
     "test": "vitest",

package/scripts/prune-standalone.mjs

@@ -0,0 +1,128 @@
+#!/usr/bin/env node
+// Prune .next/standalone to shrink the published npm tarball.
+// Safe because (a) images.unoptimized: true in next.config.ts, so sharp never loads,
+// and (b) we only touch .next/standalone/node_modules — server.js and app code untouched.
+
+import { readdirSync, rmSync, statSync, unlinkSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT = resolve(__dirname, "..");
+const STANDALONE = join(ROOT, ".next", "standalone");
+const NM = join(STANDALONE, "node_modules");
+
+function exists(p) {
+  try { statSync(p); return true; } catch { return false; }
+}
+
+function measure(dir) {
+  let bytes = 0, files = 0;
+  function walk(p) {
+    let entries;
+    try { entries = readdirSync(p, { withFileTypes: true }); } catch { return; }
+    for (const e of entries) {
+      const child = join(p, e.name);
+      if (e.isDirectory()) walk(child);
+      else if (e.isFile()) { bytes += statSync(child).size; files += 1; }
+    }
+  }
+  walk(dir);
+  return { bytes, files };
+}
+
+const JUNK_DIRS = new Set([
+  "test", "tests", "__tests__",
+  "doc", "docs",
+  "example", "examples",
+  ".github", ".vscode", ".idea",
+]);
+
+const JUNK_FILE_BASENAMES = new Set([
+  ".npmignore", ".gitignore", ".gitattributes",
+  ".eslintrc", ".eslintrc.js", ".eslintrc.json", ".eslintrc.yml",
+  ".prettierrc", ".prettierrc.js", ".prettierrc.json",
+  ".editorconfig", ".travis.yml", ".nycrc",
+  "AUTHORS", "CONTRIBUTORS", "HISTORY", "HISTORY.md",
+  "CHANGELOG", "CHANGELOG.md", "CHANGES", "CHANGES.md",
+]);
+
+function isJunkFile(name) {
+  const lower = name.toLowerCase();
+  if (JUNK_FILE_BASENAMES.has(name) || JUNK_FILE_BASENAMES.has(lower)) return true;
+  if (lower.endsWith(".md") || lower.endsWith(".markdown")) return true;
+  if (lower.endsWith(".map")) return true;
+  if (lower.endsWith(".ts.map")) return true;
+  return false;
+}
+
+function prune(dir) {
+  let entries;
+  try { entries = readdirSync(dir, { withFileTypes: true }); } catch { return; }
+  for (const e of entries) {
+    const p = join(dir, e.name);
+    if (e.isDirectory()) {
+      if (JUNK_DIRS.has(e.name)) {
+        rmSync(p, { recursive: true, force: true });
+        continue;
+      }
+      prune(p);
+    } else if (e.isFile()) {
+      if (isJunkFile(e.name)) {
+        try { unlinkSync(p); } catch { /* ignore */ }
+      }
+    }
+  }
+}
+
+if (!exists(STANDALONE)) {
+  console.error(`[prune-standalone] ${STANDALONE} does not exist — did you run \`next build\`?`);
+  process.exit(1);
+}
+
+const before = measure(STANDALONE);
+
+// 1. Drop sharp — image optimization is disabled globally (next.config.ts).
+for (const pkg of ["@img", "sharp"]) {
+  rmSync(join(NM, pkg), { recursive: true, force: true });
+}
+
+// 2. Strip docs / tests / sourcemaps from remaining node_modules.
+if (exists(NM)) prune(NM);
+
+// 3. Remove over-traced project artifacts from the standalone root.
+// Next.js NFT pulls in too much (tracked warning: "whole project was traced
+// unintentionally"). The Next server only actually needs server.js, .next/,
+// node_modules/, package.json, public/, and the compiled app code — the rest
+// is source/dev/docs that the runtime never reads.
+const STANDALONE_ROOT_PRUNE = [
+  // Doc / dev directories
+  "docs", "examples", "design-docs", "__tests__",
+  ".claude", ".failproofai", ".github", ".vscode", ".idea",
+  // Failproofai CLI artifacts — the dashboard never loads these
+  "bin", "dist", "scripts", "src",
+];
+const STANDALONE_ROOT_PRUNE_FILES = [
+  // Top-level markdown / licenses / docs
+  "README.md", "CHANGELOG.md", "CLAUDE.md", "AGENTS.md", "CONTRIBUTING.md",
+  "LICENSE", "Dockerfile.docs",
+  // Build / lint / test config (applied at build time, not runtime)
+  "tsconfig.json", "eslint.config.mjs", "tailwind.config.ts", "components.json",
+  "vitest.config.mts", "vitest.config.e2e.mts",
+  // Lockfiles
+  "bun.lock", "bun.lockb", "package-lock.json", "yarn.lock",
+];
+for (const d of STANDALONE_ROOT_PRUNE) {
+  rmSync(join(STANDALONE, d), { recursive: true, force: true });
+}
+for (const f of STANDALONE_ROOT_PRUNE_FILES) {
+  try { unlinkSync(join(STANDALONE, f)); } catch { /* ignore */ }
+}
+
+const after = measure(STANDALONE);
+const mb = (b) => (b / (1024 * 1024)).toFixed(2);
+console.log(
+  `[prune-standalone] ${before.files} files / ${mb(before.bytes)} MB -> ` +
+  `${after.files} files / ${mb(after.bytes)} MB ` +
+  `(saved ${before.files - after.files} files / ${mb(before.bytes - after.bytes)} MB)`
+);

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",