agentplane 0.1.7 → 0.1.9

package/dist/commands/guard/index.js

@@ -1,18 +1,31 @@
-import { extractTaskSuffix, getStagedFiles, getUnstagedFiles, loadConfig, resolveProject, validateCommitSubject, } from "@agentplaneorg/core";
+import { extractTaskSuffix, getStagedFiles, getUnstagedFiles, loadConfig, resolveBaseBranch, resolveProject, validateCommitSubject, } from "@agentplaneorg/core";
 import { mapCoreError } from "../../cli/error-map.js";
 import { invalidValueMessage, successMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
-import { formatCommentBodyForCommit } from "../../shared/comment-format.js";
+import { formatCommentBodyForCommit, normalizeCommentBodyForCommit, } from "../../shared/comment-format.js";
+import { gitPathIsUnderPrefix, normalizeGitPathPrefix } from "../../shared/git-path.js";
 import { execFileAsync } from "../shared/git.js";
-function pathIsUnder(candidate, prefix) {
-    if (prefix === "." || prefix === "")
-        return true;
-    if (candidate === prefix)
-        return true;
-    return candidate.startsWith(`${prefix}/`);
+import { gitCurrentBranch } from "../shared/git-ops.js";
+import { getProtectedPathOverride, protectedPathKindForFile, } from "../../shared/protected-paths.js";
+import { parseGitLogHashSubject } from "../../shared/git-log.js";
+function parseNullSeparatedPaths(stdout) {
+    const text = Buffer.isBuffer(stdout) ? stdout.toString("utf8") : stdout;
+    return text
+        .split("\0")
+        .map((entry) => entry.trim())
+        .filter((entry) => entry.length > 0);
 }
-function normalizeAllowPrefix(prefix) {
-    return prefix.replace(/\/+$/, "");
+export function buildGitCommitEnv(opts) {
+    return {
+        ...process.env,
+        AGENTPLANE_TASK_ID: opts.taskId,
+        AGENTPLANE_ALLOW_TASKS: opts.allowTasks ? "1" : "0",
+        AGENTPLANE_ALLOW_BASE: opts.allowBase ? "1" : "0",
+        AGENTPLANE_ALLOW_POLICY: opts.allowPolicy ? "1" : "0",
+        AGENTPLANE_ALLOW_CONFIG: opts.allowConfig ? "1" : "0",
+        AGENTPLANE_ALLOW_HOOKS: opts.allowHooks ? "1" : "0",
+        AGENTPLANE_ALLOW_CI: opts.allowCI ? "1" : "0",
+    };
 }
 export function suggestAllowPrefixes(paths) {
     const out = new Set();
@@ -27,10 +40,10 @@ export function suggestAllowPrefixes(paths) {
     }
     return [...out].toSorted((a, b) => a.localeCompare(b));
 }
-export const GUARD_COMMIT_USAGE = "Usage: agentplane guard commit <task-id> -m <message> --allow <path> [--allow <path>...] [--auto-allow] [--allow-tasks] [--require-clean] [--quiet]";
-export const GUARD_COMMIT_USAGE_EXAMPLE = 'agentplane guard commit 202602030608-F1Q8AB -m "✨ F1Q8AB update" --allow packages/agentplane';
+export const GUARD_COMMIT_USAGE = "Usage: agentplane guard commit <task-id> -m <message> --allow <path> [--allow <path>...] [--auto-allow] [--allow-tasks] [--allow-base] [--allow-policy] [--allow-config] [--allow-hooks] [--allow-ci] [--require-clean] [--quiet]";
+export const GUARD_COMMIT_USAGE_EXAMPLE = 'agentplane guard commit 202602030608-F1Q8AB -m "✨ F1Q8AB task: implement allowlist guard" --allow packages/agentplane';
 export const COMMIT_USAGE = "Usage: agentplane commit <task-id> -m <message>";
-export const COMMIT_USAGE_EXAMPLE = 'agentplane commit 202602030608-F1Q8AB -m "✨ F1Q8AB update"';
+export const COMMIT_USAGE_EXAMPLE = 'agentplane commit 202602030608-F1Q8AB -m "✨ F1Q8AB task: implement allowlist guard"';
 async function guardCommitCheck(opts) {
     const resolved = await resolveProject({
         cwd: opts.cwd,
@@ -60,10 +73,8 @@ async function guardCommitCheck(opts) {
             message: "Provide at least one --allow <path> prefix",
         });
     }
-    const allow = opts.allow.map((prefix) => normalizeAllowPrefix(prefix));
-    const denied = new Set();
-    if (!opts.allowTasks)
-        denied.add(".agentplane/tasks.json");
+    const allow = opts.allow.map((prefix) => normalizeGitPathPrefix(prefix));
+    const tasksPath = loaded.config.paths.tasks_path;
     if (opts.requireClean) {
         const unstaged = await getUnstagedFiles({
             cwd: opts.cwd,
@@ -73,15 +84,62 @@ async function guardCommitCheck(opts) {
             throw new CliError({ exitCode: 5, code: "E_GIT", message: "Working tree is dirty" });
         }
     }
+    if (loaded.config.workflow_mode === "branch_pr") {
+        const baseBranch = await resolveBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+            cliBaseOpt: null,
+            mode: loaded.config.workflow_mode,
+        });
+        if (!baseBranch) {
+            throw new CliError({
+                exitCode: 2,
+                code: "E_USAGE",
+                message: "Base branch could not be resolved (use `agentplane branch base set`).",
+            });
+        }
+        const currentBranch = await gitCurrentBranch(resolved.gitRoot);
+        const tasksStaged = staged.includes(tasksPath);
+        const nonTasks = staged.filter((entry) => entry !== tasksPath);
+        if (tasksStaged && currentBranch !== baseBranch) {
+            throw new CliError({
+                exitCode: 5,
+                code: "E_GIT",
+                message: `${tasksPath} commits are allowed only on ${baseBranch} in branch_pr mode`,
+            });
+        }
+        if (nonTasks.length > 0 && currentBranch === baseBranch && !opts.allowBase) {
+            throw new CliError({
+                exitCode: 5,
+                code: "E_GIT",
+                message: `Code commits are forbidden on ${baseBranch} in branch_pr mode`,
+            });
+        }
+    }
     for (const filePath of staged) {
-        if (denied.has(filePath)) {
+        const kind = protectedPathKindForFile({ filePath, tasksPath });
+        if (kind === "tasks" && !opts.allowTasks) {
             throw new CliError({
                 exitCode: 5,
                 code: "E_GIT",
                 message: `Staged file is forbidden by default: ${filePath} (use --allow-tasks to override)`,
             });
         }
-        if (!allow.some((prefix) => pathIsUnder(filePath, prefix))) {
+        if (kind && kind !== "tasks") {
+            const override = getProtectedPathOverride(kind);
+            const allowed = (kind === "policy" && opts.allowPolicy) ||
+                (kind === "config" && opts.allowConfig) ||
+                (kind === "hooks" && opts.allowHooks) ||
+                (kind === "ci" && opts.allowCI);
+            if (!allowed) {
+                throw new CliError({
+                    exitCode: 5,
+                    code: "E_GIT",
+                    message: `Staged file is protected by default: ${filePath} (use ${override.cliFlag} to override)`,
+                });
+            }
+        }
+        if (!allow.some((prefix) => gitPathIsUnderPrefix(filePath, prefix))) {
             throw new CliError({
                 exitCode: 5,
                 code: "E_GIT",
@@ -95,22 +153,22 @@ export async function gitStatusChangedPaths(opts) {
         cwd: opts.cwd,
         rootOverride: opts.rootOverride ?? null,
     });
-    const { stdout } = await execFileAsync("git", ["status", "--porcelain", "-uall"], {
+    const optsExec = {
         cwd: resolved.gitRoot,
-    });
-    const files = [];
-    for (const line of stdout.split("\n")) {
-        const trimmed = line.trim();
-        if (!trimmed)
-            continue;
-        const filePart = trimmed.slice(2).trim();
-        if (!filePart)
-            continue;
-        const name = filePart.includes("->") ? filePart.split("->").at(-1)?.trim() : filePart;
-        if (name)
-            files.push(name);
-    }
-    return files;
+        encoding: "buffer",
+        maxBuffer: 10 * 1024 * 1024,
+    };
+    const [unstaged, staged, untracked] = await Promise.all([
+        execFileAsync("git", ["diff", "--name-only", "-z"], optsExec),
+        execFileAsync("git", ["diff", "--name-only", "--cached", "-z"], optsExec),
+        execFileAsync("git", ["ls-files", "--others", "--exclude-standard", "-z"], optsExec),
+    ]);
+    const files = [
+        ...parseNullSeparatedPaths(unstaged.stdout),
+        ...parseNullSeparatedPaths(staged.stdout),
+        ...parseNullSeparatedPaths(untracked.stdout),
+    ];
+    return [...new Set(files)].toSorted((a, b) => a.localeCompare(b));
 }
 export async function ensureGitClean(opts) {
     const staged = await getStagedFiles({ cwd: opts.cwd, rootOverride: opts.rootOverride ?? null });
@@ -142,15 +200,15 @@ async function stageAllowlist(opts) {
             message: "No changes to stage (working tree clean)",
         });
     }
-    const allow = opts.allow.map((prefix) => normalizeAllowPrefix(prefix.trim().replace(/^\.?\//, "")));
+    const allow = opts.allow.map((prefix) => normalizeGitPathPrefix(prefix));
     const denied = new Set();
     if (!opts.allowTasks)
-        denied.add(".agentplane/tasks.json");
+        denied.add(opts.tasksPath);
     const staged = [];
     for (const filePath of changed) {
         if (denied.has(filePath))
             continue;
-        if (allow.some((prefix) => pathIsUnder(filePath, prefix))) {
+        if (allow.some((prefix) => gitPathIsUnderPrefix(filePath, prefix))) {
             staged.push(filePath);
         }
     }
@@ -162,13 +220,23 @@ async function stageAllowlist(opts) {
             message: "No changes matched allowed prefixes (use --commit-auto-allow or update --commit-allow)",
         });
     }
-    await execFileAsync("git", ["add", "--", ...unique], { cwd: resolved.gitRoot });
+    // `git add <pathspec>` is not reliable for staging deletes/renames across versions/configs.
+    // `-A -- <pathspec...>` makes the allowlist staging semantics deterministic.
+    await execFileAsync("git", ["add", "-A", "--", ...unique], { cwd: resolved.gitRoot });
     return unique;
 }
 function deriveCommitMessageFromComment(opts) {
-    const summary = (opts.formattedComment ?? formatCommentBodyForCommit(opts.body, opts.config))
+    const raw = (opts.formattedComment ?? formatCommentBodyForCommit(opts.body, opts.config))
         .trim()
         .replaceAll(/\s+/g, " ");
+    if (!raw) {
+        throw new CliError({
+            exitCode: 2,
+            code: "E_USAGE",
+            message: "Comment body is required to build a commit message from the task comment",
+        });
+    }
+    const summary = raw.replace(/^(start|blocked|verified):\s+/i, "").trim();
     if (!summary) {
         throw new CliError({
             exitCode: 2,
@@ -192,13 +260,33 @@ function deriveCommitMessageFromComment(opts) {
             message: invalidValueMessage("task id", opts.taskId, "valid task id"),
         });
     }
-    return `${prefix} ${suffix} ${summary}`;
+    return `${prefix} ${suffix} task: ${summary}`;
+}
+function deriveCommitBodyFromComment(opts) {
+    const lines = [
+        `Task: ${opts.taskId}`,
+        ...(opts.author ? [`Agent: ${opts.author}`] : []),
+        ...(opts.statusFrom && opts.statusTo ? [`Status: ${opts.statusFrom} -> ${opts.statusTo}`] : []),
+        `Comment: ${normalizeCommentBodyForCommit(opts.formattedComment || opts.commentBody)}`,
+    ];
+    return lines.join("\n").trimEnd();
 }
 export async function commitFromComment(opts) {
     let allowPrefixes = opts.allow.map((prefix) => prefix.trim()).filter(Boolean);
     if (opts.autoAllow && allowPrefixes.length === 0) {
         const changed = await gitStatusChangedPaths({ cwd: opts.cwd, rootOverride: opts.rootOverride });
-        allowPrefixes = suggestAllowPrefixes(changed);
+        const tasksPath = opts.config.paths.tasks_path;
+        // Auto-allow is for ergonomic status commits. It must never silently
+        // broaden into policy/config/CI changes (those require explicit intent).
+        const eligible = changed.filter((filePath) => {
+            const kind = protectedPathKindForFile({ filePath, tasksPath });
+            if (!kind)
+                return true;
+            if (kind === "tasks")
+                return opts.allowTasks;
+            return false;
+        });
+        allowPrefixes = suggestAllowPrefixes(eligible);
     }
     if (allowPrefixes.length === 0) {
         throw new CliError({
@@ -212,6 +300,7 @@ export async function commitFromComment(opts) {
         rootOverride: opts.rootOverride,
         allow: allowPrefixes,
         allowTasks: opts.allowTasks,
+        tasksPath: opts.config.paths.tasks_path,
     });
     const message = deriveCommitMessageFromComment({
         taskId: opts.taskId,
@@ -220,13 +309,27 @@ export async function commitFromComment(opts) {
         formattedComment: opts.formattedComment,
         config: opts.config,
     });
+    const formattedComment = opts.formattedComment ?? formatCommentBodyForCommit(opts.commentBody, opts.config);
+    const body = deriveCommitBodyFromComment({
+        taskId: opts.taskId,
+        author: opts.author,
+        statusFrom: opts.statusFrom,
+        statusTo: opts.statusTo,
+        commentBody: opts.commentBody,
+        formattedComment,
+    });
     await guardCommitCheck({
         cwd: opts.cwd,
         rootOverride: opts.rootOverride,
         taskId: opts.taskId,
         message,
         allow: allowPrefixes,
+        allowBase: false,
         allowTasks: opts.allowTasks,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
         requireClean: opts.requireClean,
         quiet: opts.quiet,
     });
@@ -234,22 +337,26 @@ export async function commitFromComment(opts) {
         cwd: opts.cwd,
         rootOverride: opts.rootOverride ?? null,
     });
-    const env = {
-        ...process.env,
-        AGENTPLANE_TASK_ID: opts.taskId,
-        AGENTPLANE_ALLOW_TASKS: opts.allowTasks ? "1" : "0",
-        AGENTPLANE_ALLOW_BASE: opts.allowTasks ? "1" : "0",
-    };
-    await execFileAsync("git", ["commit", "-m", message], { cwd: resolved.gitRoot, env });
-    const { stdout } = await execFileAsync("git", ["log", "-1", "--pretty=%H:%s"], {
+    // Never allow base-branch code commits implicitly from comment-driven commits.
+    // Base overrides must be explicit via the `commit` command's --allow-base flag.
+    const env = buildGitCommitEnv({
+        taskId: opts.taskId,
+        allowTasks: opts.allowTasks,
+        allowBase: false,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+    });
+    await execFileAsync("git", ["commit", "-m", message, "-m", body], { cwd: resolved.gitRoot, env });
+    const { stdout } = await execFileAsync("git", ["log", "-1", "--pretty=%H%x00%s"], {
         cwd: resolved.gitRoot,
     });
-    const trimmed = stdout.trim();
-    const [hash, subject] = trimmed.split(":", 2);
+    const { hash, subject } = parseGitLogHashSubject(stdout);
     if (!opts.quiet) {
         process.stdout.write(`${successMessage("committed", `${hash?.slice(0, 12) ?? ""} ${subject ?? ""}`.trim(), `staged=${staged.join(", ")}`)}\n`);
     }
-    return { hash: hash ?? "", message: subject ?? "", staged };
+    return { hash, message: subject, staged };
 }
 export async function cmdGuardClean(opts) {
     try {
@@ -334,7 +441,12 @@ export async function cmdCommit(opts) {
             taskId: opts.taskId,
             message: opts.message,
             allow,
+            allowBase: opts.allowBase,
             allowTasks: opts.allowTasks,
+            allowPolicy: opts.allowPolicy,
+            allowConfig: opts.allowConfig,
+            allowHooks: opts.allowHooks,
+            allowCI: opts.allowCI,
             requireClean: opts.requireClean,
             quiet: opts.quiet,
         });
@@ -342,19 +454,21 @@ export async function cmdCommit(opts) {
             cwd: opts.cwd,
             rootOverride: opts.rootOverride ?? null,
         });
-        const env = {
-            ...process.env,
-            AGENTPLANE_TASK_ID: opts.taskId,
-            AGENTPLANE_ALLOW_TASKS: opts.allowTasks ? "1" : "0",
-            AGENTPLANE_ALLOW_BASE: opts.allowBase ? "1" : "0",
-        };
+        const env = buildGitCommitEnv({
+            taskId: opts.taskId,
+            allowTasks: opts.allowTasks,
+            allowBase: opts.allowBase,
+            allowPolicy: opts.allowPolicy,
+            allowConfig: opts.allowConfig,
+            allowHooks: opts.allowHooks,
+            allowCI: opts.allowCI,
+        });
         await execFileAsync("git", ["commit", "-m", opts.message], { cwd: resolved.gitRoot, env });
         if (!opts.quiet) {
-            const { stdout } = await execFileAsync("git", ["log", "-1", "--pretty=%H:%s"], {
+            const { stdout } = await execFileAsync("git", ["log", "-1", "--pretty=%H%x00%s"], {
                 cwd: resolved.gitRoot,
             });
-            const trimmed = stdout.trim();
-            const [hash, subject] = trimmed.split(":", 2);
+            const { hash, subject } = parseGitLogHashSubject(stdout);
             process.stdout.write(`${successMessage("committed", `${hash?.slice(0, 12) ?? ""} ${subject ?? ""}`.trim())}\n`);
         }
         return 0;

package/dist/commands/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/index.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,UAAU,mDAAoD,CAAC;AAqG5E,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmClB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2HlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/index.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,UAAU,mDAAoD,CAAC;AAgG5E,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmClB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BlB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2IlB"}

package/dist/commands/hooks/index.js

@@ -1,11 +1,11 @@
 import { chmod, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { getStagedFiles, loadConfig, resolveBaseBranch, resolveProject } from "@agentplaneorg/core";
-import { loadTaskBackend } from "../../backends/task-backend.js";
+import { getStagedFiles, loadConfig, resolveBaseBranch, resolveProject, validateCommitSubject, } from "@agentplaneorg/core";
 import { mapBackendError, mapCoreError } from "../../cli/error-map.js";
 import { fileExists } from "../../cli/fs-utils.js";
 import { infoMessage, successMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
+import { getProtectedPathOverride, protectedPathKindForFile, } from "../../shared/protected-paths.js";
 import { gitCurrentBranch, gitRevParse } from "../shared/git-ops.js";
 import { isPathWithin } from "../shared/path.js";
 const HOOK_MARKER = "agentplane-hook";
@@ -96,10 +96,6 @@ function readCommitSubject(message) {
     }
     return "";
 }
-function subjectHasSuffix(subject, suffixes) {
-    const lowered = subject.toLowerCase();
-    return suffixes.some((suffix) => suffix && lowered.includes(suffix.toLowerCase()));
-}
 export async function cmdHooksInstall(opts) {
     try {
         const resolved = await resolveProject({
@@ -187,39 +183,32 @@ export async function cmdHooksRun(opts) {
                     message: "Commit message subject is empty",
                 });
             }
+            const resolved = await resolveProject({
+                cwd: opts.cwd,
+                rootOverride: opts.rootOverride ?? null,
+            });
+            const loaded = await loadConfig(resolved.agentplaneDir);
             const taskId = (process.env.AGENTPLANE_TASK_ID ?? "").trim();
             if (taskId) {
-                const suffix = taskId.split("-").at(-1) ?? "";
-                if (!subject.includes(taskId) && (suffix.length === 0 || !subject.includes(suffix))) {
+                const policy = validateCommitSubject({
+                    subject,
+                    taskId,
+                    genericTokens: loaded.config.commit.generic_tokens,
+                });
+                if (!policy.ok) {
                     throw new CliError({
                         exitCode: 5,
                         code: "E_GIT",
-                        message: "Commit subject must include task id or suffix",
+                        message: policy.errors.join("\n"),
                     });
                 }
                 return 0;
             }
-            const { backend } = await loadTaskBackend({
-                cwd: opts.cwd,
-                rootOverride: opts.rootOverride ?? null,
+            throw new CliError({
+                exitCode: 5,
+                code: "E_GIT",
+                message: "AGENTPLANE_TASK_ID is required (use `agentplane commit ...`)",
             });
-            const tasks = await backend.listTasks();
-            const suffixes = tasks.map((task) => task.id.split("-").at(-1) ?? "").filter(Boolean);
-            if (suffixes.length === 0) {
-                throw new CliError({
-                    exitCode: 5,
-                    code: "E_GIT",
-                    message: "No task IDs available to validate commit subject",
-                });
-            }
-            if (!subjectHasSuffix(subject, suffixes)) {
-                throw new CliError({
-                    exitCode: 5,
-                    code: "E_GIT",
-                    message: "Commit subject must mention a task suffix",
-                });
-            }
-            return 0;
         }
         if (opts.hook === "pre-commit") {
             const staged = await getStagedFiles({
@@ -230,6 +219,10 @@ export async function cmdHooksRun(opts) {
                 return 0;
             const allowTasks = (process.env.AGENTPLANE_ALLOW_TASKS ?? "").trim() === "1";
             const allowBase = (process.env.AGENTPLANE_ALLOW_BASE ?? "").trim() === "1";
+            const allowPolicy = (process.env.AGENTPLANE_ALLOW_POLICY ?? "").trim() === "1";
+            const allowConfig = (process.env.AGENTPLANE_ALLOW_CONFIG ?? "").trim() === "1";
+            const allowHooks = (process.env.AGENTPLANE_ALLOW_HOOKS ?? "").trim() === "1";
+            const allowCI = (process.env.AGENTPLANE_ALLOW_CI ?? "").trim() === "1";
             const resolved = await resolveProject({
                 cwd: opts.cwd,
                 rootOverride: opts.rootOverride ?? null,
@@ -245,6 +238,23 @@ export async function cmdHooksRun(opts) {
                     message: `${tasksPath} is protected by agentplane hooks (set AGENTPLANE_ALLOW_TASKS=1 to override)`,
                 });
             }
+            for (const filePath of staged) {
+                const kind = protectedPathKindForFile({ filePath, tasksPath });
+                if (!kind || kind === "tasks")
+                    continue;
+                const override = getProtectedPathOverride(kind);
+                const allowed = (kind === "policy" && allowPolicy) ||
+                    (kind === "config" && allowConfig) ||
+                    (kind === "hooks" && allowHooks) ||
+                    (kind === "ci" && allowCI);
+                if (!allowed) {
+                    throw new CliError({
+                        exitCode: 5,
+                        code: "E_GIT",
+                        message: `${filePath} is protected by agentplane hooks (set ${override.envVar}=1 to override)`,
+                    });
+                }
+            }
             if (loaded.config.workflow_mode === "branch_pr") {
                 const baseBranch = await resolveBaseBranch({
                     cwd: opts.cwd,

package/dist/commands/pr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/index.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,aAAa,wEAAwE,CAAC;AACnG,eAAO,MAAM,qBAAqB,0DAA0D,CAAC;AAC7F,eAAO,MAAM,eAAe,0CAA0C,CAAC;AACvE,eAAO,MAAM,uBAAuB,6CAA6C,CAAC;AAClF,eAAO,MAAM,cAAc,yCAAyC,CAAC;AACrE,eAAO,MAAM,sBAAsB,4CAA4C,CAAC;AAChF,eAAO,MAAM,aAAa,oEAAoE,CAAC;AAC/F,eAAO,MAAM,qBAAqB,4EACuC,CAAC;AAC1E,eAAO,MAAM,eAAe,wJAC2H,CAAC;AACxJ,eAAO,MAAM,uBAAuB,0DAA0D,CAAC;AA2H/F,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoElB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyFlB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgElB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAwClB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAigBlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/index.ts"],"names":[],"mappings":"AAwCA,eAAO,MAAM,aAAa,wEAAwE,CAAC;AACnG,eAAO,MAAM,qBAAqB,0DAA0D,CAAC;AAC7F,eAAO,MAAM,eAAe,0CAA0C,CAAC;AACvE,eAAO,MAAM,uBAAuB,6CAA6C,CAAC;AAClF,eAAO,MAAM,cAAc,yCAAyC,CAAC;AACrE,eAAO,MAAM,sBAAsB,4CAA4C,CAAC;AAChF,eAAO,MAAM,aAAa,oEAAoE,CAAC;AAC/F,eAAO,MAAM,qBAAqB,4EACuC,CAAC;AAC1E,eAAO,MAAM,eAAe,wJAC2H,CAAC;AACxJ,eAAO,MAAM,uBAAuB,0DAA0D,CAAC;AA2H/F,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoElB;AAED,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAyFlB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgElB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAwClB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAogBlB"}

package/dist/commands/pr/index.js

@@ -1,6 +1,6 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile } from "node:fs/promises";
 import path from "node:path";
-import { loadConfig, resolveBaseBranch, resolveProject, } from "@agentplaneorg/core";
+import { atomicWriteFile, loadConfig, resolveBaseBranch, resolveProject, } from "@agentplaneorg/core";
 import { mapBackendError, mapCoreError } from "../../cli/error-map.js";
 import { fileExists } from "../../cli/fs-utils.js";
 import { successMessage, unknownEntityMessage, usageMessage, workflowModeMessage, } from "../../cli/output.js";
@@ -14,6 +14,7 @@ import { appendVerifyLog, extractLastVerifiedSha, parsePrMeta, runShellCommand,
 import { isPathWithin } from "../shared/path.js";
 import { loadBackendTask } from "../shared/task-backend.js";
 import { cmdFinish } from "../task/index.js";
+import { ensurePlanApprovedIfRequired, ensureVerificationSatisfiedIfRequired, } from "../task/shared.js";
 export const PR_OPEN_USAGE = "Usage: agentplane pr open <task-id> --author <id> [--branch <name>]";
 export const PR_OPEN_USAGE_EXAMPLE = "agentplane pr open 202602030608-F1Q8AB --author CODER";
 export const PR_UPDATE_USAGE = "Usage: agentplane pr update <task-id>";
@@ -167,14 +168,14 @@ export async function cmdPrOpen(opts) {
             last_verified_at: meta?.last_verified_at ?? null,
             verify: meta?.verify ?? { status: "skipped" },
         };
-        await writeFile(metaPath, `${JSON.stringify(nextMeta, null, 2)}\n`, "utf8");
+        await atomicWriteFile(metaPath, `${JSON.stringify(nextMeta, null, 2)}\n`, "utf8");
         if (!(await fileExists(diffstatPath)))
-            await writeFile(diffstatPath, "", "utf8");
+            await atomicWriteFile(diffstatPath, "", "utf8");
         if (!(await fileExists(verifyLogPath)))
-            await writeFile(verifyLogPath, "", "utf8");
+            await atomicWriteFile(verifyLogPath, "", "utf8");
         if (!(await fileExists(reviewPath))) {
             const review = renderPrReviewTemplate({ author, createdAt, branch });
-            await writeFile(reviewPath, review, "utf8");
+            await atomicWriteFile(reviewPath, review, "utf8");
         }
         process.stdout.write(`${successMessage("pr open", path.relative(resolved.gitRoot, prDir))}\n`);
         return 0;
@@ -228,7 +229,7 @@ export async function cmdPrUpdate(opts) {
         const branch = await gitCurrentBranch(resolved.gitRoot);
         const { stdout: diffStatOut } = await execFileAsync("git", ["diff", "--stat", `${baseBranch}...HEAD`], { cwd: resolved.gitRoot, env: gitEnv() });
         const diffstat = diffStatOut.trimEnd();
-        await writeFile(diffstatPath, diffstat ? `${diffstat}\n` : "", "utf8");
+        await atomicWriteFile(diffstatPath, diffstat ? `${diffstat}\n` : "", "utf8");
         const { stdout: headOut } = await execFileAsync("git", ["rev-parse", "HEAD"], {
             cwd: resolved.gitRoot,
             env: gitEnv(),
@@ -245,7 +246,7 @@ export async function cmdPrUpdate(opts) {
         ];
         const reviewText = await readFile(reviewPath, "utf8");
         const nextReview = updateAutoSummaryBlock(reviewText, summaryLines.join("\n"));
-        await writeFile(reviewPath, nextReview, "utf8");
+        await atomicWriteFile(reviewPath, nextReview, "utf8");
         const rawMeta = await readFile(metaPath, "utf8");
         const meta = parsePrMeta(rawMeta, opts.taskId);
         const nextMeta = {
@@ -255,7 +256,7 @@ export async function cmdPrUpdate(opts) {
             last_verified_sha: meta.last_verified_sha ?? null,
             last_verified_at: meta.last_verified_at ?? null,
         };
-        await writeFile(metaPath, `${JSON.stringify(nextMeta, null, 2)}\n`, "utf8");
+        await atomicWriteFile(metaPath, `${JSON.stringify(nextMeta, null, 2)}\n`, "utf8");
         process.stdout.write(`${successMessage("pr update", path.relative(resolved.gitRoot, prDir))}\n`);
         return 0;
     }
@@ -359,7 +360,7 @@ export async function cmdPrNote(opts) {
         }
         const review = await readFile(reviewPath, "utf8");
         const updated = appendHandoffNote(review, `${author}: ${body}`);
-        await writeFile(reviewPath, updated, "utf8");
+        await atomicWriteFile(reviewPath, updated, "utf8");
         process.stdout.write(`${successMessage("pr note", opts.taskId)}\n`);
         return 0;
     }
@@ -390,6 +391,8 @@ export async function cmdIntegrate(opts) {
                 message: workflowModeMessage(loaded.config.workflow_mode, "branch_pr"),
             });
         }
+        ensurePlanApprovedIfRequired(task, loaded.config);
+        ensureVerificationSatisfiedIfRequired(task, loaded.config);
         await ensureGitClean({ cwd: opts.cwd, rootOverride: opts.rootOverride });
         if (opts.base?.trim().length === 0) {
             throw new CliError({
@@ -793,9 +796,9 @@ export async function cmdIntegrate(opts) {
                 ? { ...mergedMeta.verify, status: "pass" }
                 : { status: "pass", command: verifyCommands.join(" && ") };
         }
-        await writeFile(metaPath, `${JSON.stringify(nextMeta, null, 2)}\n`, "utf8");
+        await atomicWriteFile(metaPath, `${JSON.stringify(nextMeta, null, 2)}\n`, "utf8");
         const diffstat = await gitDiffStat(resolved.gitRoot, baseShaBeforeMerge, branch);
-        await writeFile(diffstatPath, diffstat ? `${diffstat}\n` : "", "utf8");
+        await atomicWriteFile(diffstatPath, diffstat ? `${diffstat}\n` : "", "utf8");
         const verifyDesc = verifyCommands.length === 0
             ? "skipped(no commands)"
             : shouldRunVerify