agentplane 0.3.16 → 0.3.18

package/dist/commands/hooks/run.js

@@ -0,0 +1,45 @@
+import { mapBackendError } from "../../cli/error-map.js";
+import { CliError } from "../../shared/errors.js";
+import { runCommitMsgHook } from "./run.commit-msg.js";
+import { runPostMergeHook } from "./run.post-merge.js";
+import { runPreCommitHook } from "./run.pre-commit.js";
+import { runPrePushHook } from "./run.pre-push.js";
+async function runHook(opts) {
+    switch (opts.hook) {
+        case "commit-msg": {
+            return await runCommitMsgHook(opts);
+        }
+        case "pre-commit": {
+            return await runPreCommitHook(opts);
+        }
+        case "pre-push": {
+            return await runPrePushHook(opts);
+        }
+        case "post-merge": {
+            return await runPostMergeHook(opts);
+        }
+    }
+}
+export async function cmdHooksRun(opts) {
+    try {
+        return await runHook(opts);
+    }
+    catch (err) {
+        const status = err?.status;
+        const stdout = err?.stdout;
+        const stderr = err?.stderr;
+        if (typeof stdout === "string" && stdout.length > 0)
+            process.stdout.write(stdout);
+        if (typeof stderr === "string" && stderr.length > 0)
+            process.stderr.write(stderr);
+        if (typeof status === "number" && Number.isInteger(status) && status >= 0) {
+            return status;
+        }
+        if (err instanceof CliError)
+            throw err;
+        throw mapBackendError(err, {
+            command: `hooks run ${opts.hook}`,
+            root: opts.rootOverride ?? null,
+        });
+    }
+}

package/dist/commands/hooks/run.post-merge.d.ts

@@ -0,0 +1,3 @@
+import type { HooksRunOptions } from "./run.js";
+export declare function runPostMergeHook(opts: HooksRunOptions): Promise<number>;
+//# sourceMappingURL=run.post-merge.d.ts.map

package/dist/commands/hooks/run.post-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.post-merge.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/run.post-merge.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAuC7E"}

package/dist/commands/hooks/run.post-merge.js

@@ -0,0 +1,44 @@
+import { resolveBaseBranch } from "@agentplaneorg/core/git";
+import { cmdCleanupMerged } from "../branch/index.js";
+import { gitCurrentBranch } from "../shared/git-ops.js";
+import { loadCommandContext } from "../shared/task-backend.js";
+export async function runPostMergeHook(opts) {
+    try {
+        const ctx = await loadCommandContext({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+        });
+        if (ctx.config.workflow_mode !== "branch_pr")
+            return 0;
+        const baseBranch = await resolveBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+            cliBaseOpt: null,
+            mode: ctx.config.workflow_mode,
+        });
+        if (!baseBranch)
+            return 0;
+        const currentBranch = await gitCurrentBranch(ctx.resolvedProject.gitRoot);
+        if (currentBranch !== baseBranch)
+            return 0;
+        return await cmdCleanupMerged({
+            ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            base: baseBranch,
+            yes: true,
+            archive: false,
+            deleteRemoteBranches: false,
+            fetch: false,
+            quiet: true,
+            skipUnsafeWorktrees: true,
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error && error.message.trim().length > 0
+            ? error.message.trim()
+            : String(error);
+        process.stderr.write(`warning: post-merge cleanup skipped: ${message}\n`);
+        return 0;
+    }
+}

package/dist/commands/hooks/run.pre-commit.d.ts

@@ -0,0 +1,3 @@
+import type { HooksRunOptions } from "./run.js";
+export declare function runPreCommitHook(opts: HooksRunOptions): Promise<number>;
+//# sourceMappingURL=run.pre-commit.d.ts.map

package/dist/commands/hooks/run.pre-commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.pre-commit.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/run.pre-commit.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAMhD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAwC7E"}

package/dist/commands/hooks/run.pre-commit.js

@@ -0,0 +1,49 @@
+import { loadConfig } from "@agentplaneorg/core/config";
+import { resolveProject } from "@agentplaneorg/core/project";
+import { resolveBaseBranch, GitContext } from "@agentplaneorg/core/git";
+import { evaluatePolicy } from "../../policy/evaluate.js";
+import { gitCurrentBranch } from "../shared/git-ops.js";
+import { throwIfPolicyDenied } from "../shared/policy-deny.js";
+function envFlag(name) {
+    return (process.env[name] ?? "").trim() === "1";
+}
+export async function runPreCommitHook(opts) {
+    const resolved = await resolveProject({
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride ?? null,
+    });
+    const staged = await new GitContext({ gitRoot: resolved.gitRoot }).statusStagedPaths();
+    if (staged.length === 0)
+        return 0;
+    const loaded = await loadConfig(resolved.agentplaneDir);
+    const inBranchPr = loaded.config.workflow_mode === "branch_pr";
+    const baseBranch = inBranchPr
+        ? await resolveBaseBranch({
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride ?? null,
+            cliBaseOpt: null,
+            mode: loaded.config.workflow_mode,
+        })
+        : null;
+    const currentBranch = inBranchPr ? await gitCurrentBranch(resolved.gitRoot) : undefined;
+    const res = evaluatePolicy({
+        action: "hook_pre_commit",
+        config: loaded.config,
+        taskId: (process.env.AGENTPLANE_TASK_ID ?? "").trim(),
+        git: {
+            stagedPaths: staged,
+            currentBranch,
+            baseBranch,
+        },
+        allow: {
+            allowTasks: envFlag("AGENTPLANE_ALLOW_TASKS"),
+            allowBase: envFlag("AGENTPLANE_ALLOW_BASE"),
+            allowPolicy: envFlag("AGENTPLANE_ALLOW_POLICY"),
+            allowConfig: envFlag("AGENTPLANE_ALLOW_CONFIG"),
+            allowHooks: envFlag("AGENTPLANE_ALLOW_HOOKS"),
+            allowCI: envFlag("AGENTPLANE_ALLOW_CI"),
+        },
+    });
+    throwIfPolicyDenied(res);
+    return 0;
+}

package/dist/commands/hooks/run.pre-push.d.ts

@@ -0,0 +1,6 @@
+import type { HooksRunOptions } from "./run.js";
+export declare function resolvePrePushHookScriptPath(gitRoot: string, opts?: {
+    bundledScriptPath?: string;
+}): Promise<string | null>;
+export declare function runPrePushHook(opts: HooksRunOptions): Promise<number>;
+//# sourceMappingURL=run.pre-push.d.ts.map

package/dist/commands/hooks/run.pre-push.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.pre-push.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/run.pre-push.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAMhD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAO,GACxC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB;AA4CD,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAgC3E"}

package/dist/commands/hooks/run.pre-push.js

@@ -0,0 +1,89 @@
+import { resolveProject } from "@agentplaneorg/core/project";
+import { runProcessSync } from "@agentplaneorg/core/process";
+import path from "node:path";
+import { fileExists } from "../../cli/fs-utils.js";
+import { CliError } from "../../shared/errors.js";
+import { resolveAgentplaneRepoScriptPath } from "../../shared/package-paths.js";
+function resolveBundledPrePushHookScriptPath() {
+    return resolveAgentplaneRepoScriptPath("run-pre-push-hook.mjs");
+}
+export async function resolvePrePushHookScriptPath(gitRoot, opts = {}) {
+    const repoScriptPath = path.join(gitRoot, "scripts", "run-pre-push-hook.mjs");
+    if (await fileExists(repoScriptPath))
+        return repoScriptPath;
+    const bundledScriptPath = opts.bundledScriptPath ?? resolveBundledPrePushHookScriptPath();
+    if (await fileExists(bundledScriptPath))
+        return bundledScriptPath;
+    return null;
+}
+async function readHookStdinUtf8(timeoutMs = 25) {
+    if (process.stdin.isTTY)
+        return "";
+    const chunks = [];
+    const consume = () => {
+        let chunk = process.stdin.read();
+        while (chunk !== null) {
+            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
+            chunk = process.stdin.read();
+        }
+    };
+    consume();
+    if (chunks.length > 0 || process.stdin.readableEnded) {
+        return Buffer.concat(chunks).toString("utf8");
+    }
+    await new Promise((resolve) => {
+        const finish = () => {
+            clearTimeout(timer);
+            process.stdin.off("readable", onReadable);
+            process.stdin.off("end", onEnd);
+            resolve();
+        };
+        const onReadable = () => {
+            consume();
+            finish();
+        };
+        const onEnd = () => {
+            consume();
+            finish();
+        };
+        const timer = setTimeout(finish, timeoutMs);
+        process.stdin.on("readable", onReadable);
+        process.stdin.on("end", onEnd);
+        process.stdin.resume();
+    });
+    consume();
+    return Buffer.concat(chunks).toString("utf8");
+}
+export async function runPrePushHook(opts) {
+    const resolved = await resolveProject({
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride ?? null,
+    });
+    const scriptPath = await resolvePrePushHookScriptPath(resolved.gitRoot);
+    if (!scriptPath) {
+        throw new CliError({
+            exitCode: 2,
+            code: "E_USAGE",
+            message: [
+                "Missing pre-push hook script: scripts/run-pre-push-hook.mjs",
+                "The pre-push hook needs a repository-local script or an installed CLI bundle that ships the fallback.",
+                "Fix:",
+                "  1) Restore scripts/run-pre-push-hook.mjs in this repository, or",
+                "  2) Run `agentplane hooks uninstall` if this repository should not use the agentplane pre-push gate.",
+            ].join("\n"),
+        });
+    }
+    const result = runProcessSync({
+        command: "node",
+        args: [scriptPath],
+        cwd: resolved.gitRoot,
+        env: process.env,
+        encoding: "utf8",
+        input: await readHookStdinUtf8(),
+        stdin: "pipe",
+        stdout: "inherit",
+        stderr: "inherit",
+        reject: false,
+    });
+    return result.exitCode ?? (result.signal ? 1 : 0);
+}

package/dist/commands/hooks/shared.d.ts

@@ -0,0 +1,7 @@
+export declare const HOOK_MARKER = "agentplane-hook";
+export declare const SHIM_MARKER = "agentplane-hook-shim";
+export declare const HOOK_NAMES: readonly ["commit-msg", "pre-commit", "pre-push", "post-merge"];
+export type HookName = (typeof HOOK_NAMES)[number];
+export declare function resolveGitHooksDir(cwd: string): Promise<string>;
+export declare function fileIsManaged(filePath: string, marker: string): Promise<boolean>;
+//# sourceMappingURL=shared.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/shared.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,oBAAoB,CAAC;AAC7C,eAAO,MAAM,WAAW,yBAAyB,CAAC;AAClD,eAAO,MAAM,UAAU,iEAAkE,CAAC;AAC1F,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA4BrE;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOtF"}

package/dist/commands/hooks/shared.js

@@ -0,0 +1,41 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { gitRevParse } from "../shared/git-ops.js";
+import { isPathWithin } from "../shared/path.js";
+import { CliError } from "../../shared/errors.js";
+export const HOOK_MARKER = "agentplane-hook";
+export const SHIM_MARKER = "agentplane-hook-shim";
+export const HOOK_NAMES = ["commit-msg", "pre-commit", "pre-push", "post-merge"];
+export async function resolveGitHooksDir(cwd) {
+    const repoRoot = await gitRevParse(cwd, ["--show-toplevel"]);
+    const commonDirRaw = await gitRevParse(cwd, ["--git-common-dir"]);
+    const hooksRaw = await gitRevParse(cwd, ["--git-path", "hooks"]);
+    const commonDir = path.resolve(path.isAbsolute(commonDirRaw) ? commonDirRaw : path.join(repoRoot, commonDirRaw));
+    const hooksDir = path.resolve(path.isAbsolute(hooksRaw) ? hooksRaw : path.join(repoRoot, hooksRaw));
+    const resolvedRoot = path.resolve(repoRoot);
+    if (!isPathWithin(resolvedRoot, hooksDir) && !isPathWithin(commonDir, hooksDir)) {
+        throw new CliError({
+            exitCode: 5,
+            code: "E_GIT",
+            message: [
+                "Refusing to manage git hooks outside the repository.",
+                `hooks_path=${hooksDir}`,
+                `repo_root=${resolvedRoot}`,
+                `common_dir=${commonDir}`,
+                "Fix:",
+                "  1) Use a repo-relative core.hooksPath (e.g., .git/hooks)",
+                "  2) Re-run `agentplane hooks install`",
+            ].join("\n"),
+        });
+    }
+    return hooksDir;
+}
+export async function fileIsManaged(filePath, marker) {
+    try {
+        const content = await readFile(filePath, "utf8");
+        return content.includes(marker);
+    }
+    catch {
+        return false;
+    }
+}

package/dist/commands/incidents/shared.d.ts

@@ -1,8 +1,7 @@
 import type { TaskData } from "../../backends/task-backend.js";
 import { type IncidentAdviceMatch, type IncidentAdviceQuery, type IncidentCollectionPlan, type IncidentRegistry } from "../../runtime/incidents/index.js";
 import type { CommandContext } from "../shared/task-backend.js";
-export declare const INCIDENTS_POLICY_PATH = ".agentplane/policy/incidents.md";
-export declare const INCIDENTS_POLICY_ASSET_PATH = "packages/agentplane/assets/policy/incidents.md";
+export { INCIDENTS_POLICY_ASSET_PATH, INCIDENTS_POLICY_PATH, } from "../../runtime/incidents/paths.js";
 export type LoadedTaskIncidents = {
     task: TaskData;
     findings: string;

package/dist/commands/incidents/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/commands/incidents/shared.ts"],"names":[],"mappings":"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"}

package/dist/commands/incidents/shared.js

@@ -4,8 +4,8 @@ import { CliError } from "../../shared/errors.js";
 import { writeTextIfChanged } from "../../shared/write-if-changed.js";
 import { appendIncidentRegistryEntries, buildIncidentAdviceQueryFromTask, createIncidentRegistrySkeleton, parseIncidentRegistry, planIncidentCollection, resolveIncidentAdviceMatches, } from "../../runtime/incidents/index.js";
 import { extractDocSection, extractTaskObservationSection, normalizeTaskDocVersion, } from "../task/shared.js";
-export const INCIDENTS_POLICY_PATH = ".agentplane/policy/incidents.md";
-export const INCIDENTS_POLICY_ASSET_PATH = "packages/agentplane/assets/policy/incidents.md";
+import { INCIDENTS_POLICY_ASSET_PATH, INCIDENTS_POLICY_PATH, } from "../../runtime/incidents/paths.js";
+export { INCIDENTS_POLICY_ASSET_PATH, INCIDENTS_POLICY_PATH, } from "../../runtime/incidents/paths.js";
 const INCIDENTS_POLICY_LINE_BUDGET = 100;
 async function readTextIfExists(filePath) {
     try {

package/dist/commands/integrate.command.d.ts

@@ -1,14 +1,5 @@
-import type { CommandCtx, CommandSpec } from "../cli/spec/spec.js";
+import type { CommandCtx } from "../cli/spec/spec.js";
 import type { CommandContext } from "./shared/task-backend.js";
-export type IntegrateParsed = {
-    taskId: string;
-    branch: string | null;
-    base: string | null;
-    mergeStrategy: "squash" | "merge" | "rebase";
-    runVerify: boolean;
-    dryRun: boolean;
-    quiet: boolean;
-};
-export declare const integrateSpec: CommandSpec<IntegrateParsed>;
+import type { IntegrateParsed } from "./integrate.spec.js";
 export declare function makeRunIntegrateHandler(getCtx: (cmd: string) => Promise<CommandContext>): (ctx: CommandCtx, p: IntegrateParsed) => Promise<number>;
 //# sourceMappingURL=integrate.command.d.ts.map

package/dist/commands/integrate.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"integrate.command.d.ts","sourceRoot":"","sources":["../../src/commands/integrate.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,WAAW,CAAC,eAAe,CA0CtD,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACxE,KAAK,UAAU,EAAE,GAAG,eAAe,KAAG,OAAO,CAAC,MAAM,CAAC,CAcpE"}
+{"version":3,"file":"integrate.command.d.ts","sourceRoot":"","sources":["../../src/commands/integrate.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IACxE,KAAK,UAAU,EAAE,GAAG,eAAe,KAAG,OAAO,CAAC,MAAM,CAAC,CAcpE"}

package/dist/commands/integrate.command.js

@@ -1,48 +1,4 @@
-import { usageError } from "../cli/spec/errors.js";
-import { cmdIntegrate } from "./pr/index.js";
-export const integrateSpec = {
-    id: ["integrate"],
-    group: "PR",
-    summary: "Integrate a task branch into the base branch (branch_pr workflow).",
-    args: [{ name: "task-id", required: true, valueHint: "<task-id>" }],
-    options: [
-        { kind: "string", name: "branch", valueHint: "<name>", description: "Branch name override." },
-        { kind: "string", name: "base", valueHint: "<name>", description: "Base branch override." },
-        {
-            kind: "string",
-            name: "merge-strategy",
-            valueHint: "<squash|merge|rebase>",
-            choices: ["squash", "merge", "rebase"],
-            default: "squash",
-            description: "Merge strategy (default: squash).",
-        },
-        { kind: "boolean", name: "run-verify", default: false, description: "Run verify commands." },
-        { kind: "boolean", name: "dry-run", default: false, description: "Do not modify git state." },
-        { kind: "boolean", name: "quiet", default: false, description: "Reduce output noise." },
-    ],
-    examples: [
-        { cmd: "agentplane integrate 202602030608-F1Q8AB --run-verify", why: "Integrate with verify." },
-    ],
-    validateRaw: (raw) => {
-        const base = typeof raw.opts.base === "string" ? raw.opts.base.trim() : "";
-        if (raw.opts.base !== undefined && !base) {
-            throw usageError({ spec: integrateSpec, message: "Invalid value for --base: empty." });
-        }
-        const branch = typeof raw.opts.branch === "string" ? raw.opts.branch.trim() : "";
-        if (raw.opts.branch !== undefined && !branch) {
-            throw usageError({ spec: integrateSpec, message: "Invalid value for --branch: empty." });
-        }
-    },
-    parse: (raw) => ({
-        taskId: String(raw.args["task-id"]),
-        branch: typeof raw.opts.branch === "string" ? raw.opts.branch : null,
-        base: typeof raw.opts.base === "string" ? raw.opts.base : null,
-        mergeStrategy: (raw.opts["merge-strategy"] ?? "squash"),
-        runVerify: raw.opts["run-verify"] === true,
-        dryRun: raw.opts["dry-run"] === true,
-        quiet: raw.opts.quiet === true,
-    }),
-};
+import { cmdIntegrate } from "./pr/integrate/cmd.js";
 export function makeRunIntegrateHandler(getCtx) {
     return async (ctx, p) => {
         return await cmdIntegrate({

package/dist/commands/integrate.spec.d.ts

@@ -0,0 +1,12 @@
+import type { CommandSpec } from "../cli/spec/spec.js";
+export type IntegrateParsed = {
+    taskId: string;
+    branch: string | null;
+    base: string | null;
+    mergeStrategy: "squash" | "merge" | "rebase";
+    runVerify: boolean;
+    dryRun: boolean;
+    quiet: boolean;
+};
+export declare const integrateSpec: CommandSpec<IntegrateParsed>;
+//# sourceMappingURL=integrate.spec.d.ts.map

package/dist/commands/integrate.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"integrate.spec.d.ts","sourceRoot":"","sources":["../../src/commands/integrate.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,WAAW,CAAC,eAAe,CA0CtD,CAAC"}

package/dist/commands/integrate.spec.js

@@ -0,0 +1,44 @@
+import { usageError } from "../cli/spec/errors.js";
+export const integrateSpec = {
+    id: ["integrate"],
+    group: "PR",
+    summary: "Integrate a task branch into the base branch (branch_pr workflow).",
+    args: [{ name: "task-id", required: true, valueHint: "<task-id>" }],
+    options: [
+        { kind: "string", name: "branch", valueHint: "<name>", description: "Branch name override." },
+        { kind: "string", name: "base", valueHint: "<name>", description: "Base branch override." },
+        {
+            kind: "string",
+            name: "merge-strategy",
+            valueHint: "<squash|merge|rebase>",
+            choices: ["squash", "merge", "rebase"],
+            default: "squash",
+            description: "Merge strategy (default: squash).",
+        },
+        { kind: "boolean", name: "run-verify", default: false, description: "Run verify commands." },
+        { kind: "boolean", name: "dry-run", default: false, description: "Do not modify git state." },
+        { kind: "boolean", name: "quiet", default: false, description: "Reduce output noise." },
+    ],
+    examples: [
+        { cmd: "agentplane integrate 202602030608-F1Q8AB --run-verify", why: "Integrate with verify." },
+    ],
+    validateRaw: (raw) => {
+        const base = typeof raw.opts.base === "string" ? raw.opts.base.trim() : "";
+        if (raw.opts.base !== undefined && !base) {
+            throw usageError({ spec: integrateSpec, message: "Invalid value for --base: empty." });
+        }
+        const branch = typeof raw.opts.branch === "string" ? raw.opts.branch.trim() : "";
+        if (raw.opts.branch !== undefined && !branch) {
+            throw usageError({ spec: integrateSpec, message: "Invalid value for --branch: empty." });
+        }
+    },
+    parse: (raw) => ({
+        taskId: String(raw.args["task-id"]),
+        branch: typeof raw.opts.branch === "string" ? raw.opts.branch : null,
+        base: typeof raw.opts.base === "string" ? raw.opts.base : null,
+        mergeStrategy: (raw.opts["merge-strategy"] ?? "squash"),
+        runVerify: raw.opts["run-verify"] === true,
+        dryRun: raw.opts["dry-run"] === true,
+        quiet: raw.opts.quiet === true,
+    }),
+};

package/dist/commands/pr/check.js

@@ -6,7 +6,7 @@ import { fileExists } from "../../cli/fs-utils.js";
 import { createCliEmitter, workflowModeMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { parsePrMeta } from "../shared/pr-meta.js";
-import { findWorktreeForBranch, gitListTaskBranches, parseTaskIdFromBranch, } from "../shared/git-worktree.js";
+import { findWorktreeForBranch, gitListTaskBranches, parseTaskIdFromBranch, } from "@agentplaneorg/core/git";
 import { gitRevParse } from "../shared/git-ops.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
 import { readPrArtifactFromBranch, resolvePrPaths } from "./internal/pr-paths.js";

package/dist/commands/pr/integrate/artifacts.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { exitCodeForError } from "../../../cli/exit-codes.js";
 import { CliError } from "../../../shared/errors.js";
 import { readPrArtifact, readPrArtifactFromBranch } from "../internal/pr-paths.js";
-import { findWorktreeForBranch } from "../../shared/git-worktree.js";
+import { findWorktreeForBranch } from "@agentplaneorg/core/git";
 import { validateReviewContents } from "../internal/review-template.js";
 export async function readAndValidatePrArtifacts(opts) {
     const readPrArtifactTyped = readPrArtifact;

package/dist/commands/pr/integrate/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/cmd.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AA0EnE,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,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,CA6QlB"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/cmd.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AA0EnE,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,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,CA6QlB"}

package/dist/commands/pr/integrate/cmd.js

@@ -6,7 +6,8 @@ import { withDiagnosticContext } from "../../shared/diagnostics.js";
 import { CliError } from "../../../shared/errors.js";
 import { cleanupIntegratedBranch } from "./internal/cleanup.js";
 import { renderPostIntegrateBootstrapFailureGuidance, renderPostIntegrateBootstrapGuidance, shouldRecommendPostIntegrateBootstrap, } from "./internal/bootstrap-guidance.js";
-import { execFileAsync, gitEnv } from "../../shared/git.js";
+import { execFileAsync } from "@agentplaneorg/core/process";
+import { gitEnv } from "@agentplaneorg/core/git";
 import { gitRevParse } from "../../shared/git-ops.js";
 import { buildTaskHandoffArtifact, resolveTaskHandoffPaths, writeTaskHandoff, } from "../../shared/task-handoff.js";
 import { finalizeIntegrate } from "./internal/finalize.js";

package/dist/commands/pr/integrate/internal/cleanup.d.ts

@@ -1,2 +1,2 @@
-export { cleanupMergedLocalBranch as cleanupIntegratedBranch, type MergedBranchCleanupResult as IntegrateCleanupResult, } from "../../../shared/merged-branch-cleanup.js";
+export { cleanupMergedLocalBranch as cleanupIntegratedBranch } from "../../../shared/merged-branch-cleanup.js";
 //# sourceMappingURL=cleanup.d.ts.map

package/dist/commands/pr/integrate/internal/cleanup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,IAAI,uBAAuB,EACnD,KAAK,yBAAyB,IAAI,sBAAsB,GACzD,MAAM,0CAA0C,CAAC"}
+{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,IAAI,uBAAuB,EAAE,MAAM,0CAA0C,CAAC"}

package/dist/commands/pr/integrate/internal/cleanup.js

@@ -1 +1 @@
-export { cleanupMergedLocalBranch as cleanupIntegratedBranch, } from "../../../shared/merged-branch-cleanup.js";
+export { cleanupMergedLocalBranch as cleanupIntegratedBranch } from "../../../shared/merged-branch-cleanup.js";

package/dist/commands/pr/integrate/internal/finalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finalize.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/finalize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAiBrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAUtE,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,aAAa,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IAEzB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2GhB"}
+{"version":3,"file":"finalize.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/finalize.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAiBrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAUtE,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,aAAa,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;IAEzB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2GhB"}

package/dist/commands/pr/integrate/internal/finalize.js

@@ -1,10 +1,11 @@
 import path from "node:path";
 import { readFile } from "node:fs/promises";
+import { normalizeTaskStatus } from "@agentplaneorg/core/tasks";
 import { fileExists } from "../../../../cli/fs-utils.js";
 import { createCliEmitter } from "../../../../cli/output.js";
 import { CliError } from "../../../../shared/errors.js";
 import { writeJsonStableIfChanged, writeTextIfChanged, } from "../../../../shared/write-if-changed.js";
-import { gitDiffStat } from "../../../shared/git-diff.js";
+import { gitDiffStat } from "@agentplaneorg/core/git";
 import { appendVerifyLog, buildIntegratedPrMeta, parsePrMeta, } from "../../../shared/pr-meta.js";
 import { readCommitInfo } from "../../../task/shared.js";
 import { createTaskCloseCommit, writeFinishedTasks } from "../../../task/finish-shared.js";
@@ -14,7 +15,7 @@ function nowIso() {
 }
 export async function finalizeIntegrate(opts) {
     const output = createCliEmitter();
-    const taskAlreadyDone = String(opts.task.status || "TODO").toUpperCase() === "DONE";
+    const taskAlreadyDone = normalizeTaskStatus(opts.task.status) === "DONE";
     if (!(await fileExists(opts.prDir))) {
         throw new CliError({
             exitCode: 3,

package/dist/commands/pr/integrate/internal/merge.js

@@ -1,9 +1,10 @@
+import { validateCommitSubject, extractTaskSuffix } from "@agentplaneorg/core/commit";
 import { mkdir, rename, rm } from "node:fs/promises";
 import path from "node:path";
-import { extractTaskSuffix, validateCommitSubject } from "@agentplaneorg/core";
 import { exitCodeForError } from "../../../../cli/exit-codes.js";
 import { CliError } from "../../../../shared/errors.js";
-import { execFileAsync, gitEnv } from "../../../shared/git.js";
+import { execFileAsync } from "@agentplaneorg/core/process";
+import { gitEnv } from "@agentplaneorg/core/git";
 import { gitRevParse } from "../../../shared/git-ops.js";
 import { buildGithubPrTitle } from "../../internal/review-template.js";
 import { computeVerifyState, runVerifyCommands } from "../verify.js";

package/dist/commands/pr/integrate/internal/post-integrate-bootstrap.d.ts

@@ -1,4 +1,4 @@
-export type PostIntegrateBootstrapResult = {
+type PostIntegrateBootstrapResult = {
     status: "skipped";
 } | {
     status: "ran";
@@ -10,4 +10,5 @@ export declare function maybeRunPostIntegrateBootstrap(opts: {
     gitRoot: string;
     changedPaths: string[];
 }): Promise<PostIntegrateBootstrapResult>;
+export {};
 //# sourceMappingURL=post-integrate-bootstrap.d.ts.map

package/dist/commands/pr/integrate/internal/post-integrate-bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post-integrate-bootstrap.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/post-integrate-bootstrap.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,4BAA4B,GACpC;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE,GACjB;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAUxC,wBAAsB,8BAA8B,CAAC,IAAI,EAAE;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAcxC"}
+{"version":3,"file":"post-integrate-bootstrap.d.ts","sourceRoot":"","sources":["../../../../../src/commands/pr/integrate/internal/post-integrate-bootstrap.ts"],"names":[],"mappings":"AAIA,KAAK,4BAA4B,GAC7B;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,GACrB;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE,GACjB;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAUxC,wBAAsB,8BAA8B,CAAC,IAAI,EAAE;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAcxC"}

package/dist/commands/pr/integrate/internal/post-integrate-bootstrap.js

@@ -1,4 +1,4 @@
-import { execFileAsync } from "../../../shared/git.js";
+import { execFileAsync } from "@agentplaneorg/core/process";
 import { shouldAutoBootstrapAfterIntegrate } from "./bootstrap-guidance.js";
 function compactError(err) {
     if (err instanceof Error) {