agentplane 0.3.11 → 0.3.12

package/dist/cli/run-cli/command-catalog/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/cli/run-cli/command-catalog/core.ts"],"names":[],"mappings":"AAgCA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,eAAO,MAAM,aAAa,qYAiOkB,CAAC"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/cli/run-cli/command-catalog/core.ts"],"names":[],"mappings":"AAgCA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,eAAO,MAAM,aAAa,mZA0OkB,CAAC"}

package/dist/cli/run-cli/command-catalog/core.js

@@ -8,7 +8,7 @@ import { workflowRestoreSpec } from "../../../commands/workflow-restore.command.
 import { incidentsAdviseSpec } from "../../../commands/incidents/advise.command.js";
 import { incidentsCollectSpec } from "../../../commands/incidents/collect.command.js";
 import { incidentsSpec } from "../../../commands/incidents/incidents.command.js";
-import { releaseApplySpec } from "../../../commands/release/apply.command.js";
+import { releaseApplySpec, releaseCandidateSpec } from "../../../commands/release/apply.command.js";
 import { releasePlanSpec } from "../../../commands/release/plan.command.js";
 import { releaseSpec } from "../../../commands/release/release.command.js";
 import { configSetSpec, configShowSpec, modeGetSpec, modeSetSpec, profileSetSpec, } from "../commands/config.js";
@@ -47,6 +47,11 @@ export const CORE_COMMANDS = [
         needsLoadedConfig: false,
         needsTaskContext: false,
     }),
+    entry(releaseCandidateSpec, () => import("../../../commands/release/apply.command.js").then((m) => m.runReleaseCandidate), {
+        needsProject: true,
+        needsLoadedConfig: false,
+        needsTaskContext: false,
+    }),
     entry(quickstartSpec, () => import("../commands/core/quickstart.js").then((m) => m.runQuickstart), {
         needsProject: false,
         needsLoadedConfig: false,

package/dist/cli/run-cli/command-catalog.d.ts

@@ -1,7 +1,7 @@
 import type { CommandId } from "../spec/spec.js";
 import type { CommandEntry } from "./command-catalog/shared.js";
 export type { CommandEntry, RunDeps } from "./command-catalog/shared.js";
-export declare const COMMANDS: readonly [CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry];
+export declare const COMMANDS: readonly [CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry, CommandEntry];
 export type CatalogMatch = {
     entry: (typeof COMMANDS)[number];
     consumed: number;

package/dist/cli/run-cli/command-catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-catalog.d.ts","sourceRoot":"","sources":["../../../src/cli/run-cli/command-catalog.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAOhE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEzE,eAAO,MAAM,QAAQ,2wDAKuB,CAAC;AAE7C,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAYlF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,YAAY,GAAG,IAAI,CAGlF;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,SAAS,GAAG,YAAY,GAAG,IAAI,CAEnE;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,GAAE,SAAc,GAAG,SAAS,YAAY,EAAE,CAE9F;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,GAAE,SAAc,GAAG,SAAS,MAAM,EAAE,CAEtF;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,CAM1D"}
+{"version":3,"file":"command-catalog.d.ts","sourceRoot":"","sources":["../../../src/cli/run-cli/command-catalog.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAOhE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAEzE,eAAO,MAAM,QAAQ,yxDAKuB,CAAC;AAE7C,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAYlF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,YAAY,GAAG,IAAI,CAGlF;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,SAAS,GAAG,YAAY,GAAG,IAAI,CAEnE;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,GAAE,SAAc,GAAG,SAAS,YAAY,EAAE,CAE9F;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,GAAE,SAAc,GAAG,SAAS,MAAM,EAAE,CAEtF;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,CAM1D"}

package/dist/cli/run-cli.test-helpers.d.ts

@@ -70,5 +70,6 @@ export declare function cleanGitEnv(): NodeJS.ProcessEnv;
 export declare function pathExists(filePath: string): Promise<boolean>;
 export declare function gitBranchExists(root: string, branch: string): Promise<boolean>;
 export declare function commitAll(root: string, message: string): Promise<void>;
+export declare function commitPathsIfChanged(root: string, paths: string[], message: string): Promise<boolean>;
 export declare function stageGitignoreIfPresent(root: string): Promise<void>;
 //# sourceMappingURL=run-cli.test-helpers.d.ts.map

package/dist/cli/run-cli.test-helpers.d.ts.map

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

package/dist/cli/run-cli.test-helpers.js

@@ -744,6 +744,20 @@ export async function commitAll(root, message) {
         env: cleanGitEnv(),
     });
 }
+export async function commitPathsIfChanged(root, paths, message) {
+    await execFileAsync("git", ["add", "--", ...paths], { cwd: root, env: cleanGitEnv() });
+    const { stdout } = await execFileAsync("git", ["diff", "--cached", "--name-only", "--", ...paths], {
+        cwd: root,
+        env: cleanGitEnv(),
+    });
+    if (!stdout.trim())
+        return false;
+    await execFileAsync("git", ["commit", "--no-verify", "-m", message], {
+        cwd: root,
+        env: cleanGitEnv(),
+    });
+    return true;
+}
 export async function stageGitignoreIfPresent(root) {
     const gitignorePath = path.join(root, ".gitignore");
     if (!(await pathExists(gitignorePath)))

package/dist/commands/branch/cleanup-merged.d.ts

@@ -9,5 +9,6 @@ export declare function cmdCleanupMerged(opts: {
     deleteRemoteBranches: boolean;
     fetch: boolean;
     quiet: boolean;
+    skipUnsafeWorktrees?: boolean;
 }): Promise<number>;
 //# sourceMappingURL=cleanup-merged.d.ts.map

package/dist/commands/branch/cleanup-merged.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup-merged.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/cleanup-merged.ts"],"names":[],"mappings":"AAqBA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAgInC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiJlB"}
+{"version":3,"file":"cleanup-merged.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/cleanup-merged.ts"],"names":[],"mappings":"AAqBA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAgInC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,GAAG,OAAO,CAAC,MAAM,CAAC,CA8JlB"}

package/dist/commands/branch/cleanup-merged.js

@@ -185,18 +185,26 @@ export async function cmdCleanupMerged(opts) {
             }
             return 0;
         }
+        const skipUnsafeWorktrees = opts.skipUnsafeWorktrees === true;
         let deletedRemoteBranches = 0;
+        let skippedUnsafe = 0;
         for (const item of sortedCandidates) {
             const worktreePath = item.worktreePath ? await resolvePathFallback(item.worktreePath) : null;
             if (worktreePath) {
-                if (!isPathWithin(repoRoot, worktreePath)) {
-                    throw new CliError({
-                        exitCode: 5,
-                        code: "E_GIT",
-                        message: `Refusing to remove worktree outside repo: ${worktreePath}`,
-                    });
-                }
-                if (worktreePath === repoRoot) {
+                const outsideRepo = !isPathWithin(repoRoot, worktreePath);
+                const currentWorktree = worktreePath === repoRoot;
+                if (outsideRepo || currentWorktree) {
+                    if (skipUnsafeWorktrees) {
+                        skippedUnsafe += 1;
+                        continue;
+                    }
+                    if (outsideRepo) {
+                        throw new CliError({
+                            exitCode: 5,
+                            code: "E_GIT",
+                            message: `Refusing to remove worktree outside repo: ${worktreePath}`,
+                        });
+                    }
                     throw new CliError({
                         exitCode: 5,
                         code: "E_GIT",
@@ -234,7 +242,8 @@ export async function cmdCleanupMerged(opts) {
             const remoteDetail = opts.deleteRemoteBranches
                 ? ` remote_deleted=${deletedRemoteBranches}`
                 : "";
-            output.success("cleanup merged", undefined, `deleted=${candidates.length}${remoteDetail}`);
+            const skippedDetail = skipUnsafeWorktrees ? ` skipped_unsafe=${skippedUnsafe}` : "";
+            output.success("cleanup merged", undefined, `deleted=${candidates.length - skippedUnsafe}${remoteDetail}${skippedDetail}`);
         }
         return 0;
     }

package/dist/commands/branch/work-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-start.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/work-start.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAkMnC,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,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6JlB"}
+{"version":3,"file":"work-start.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/work-start.ts"],"names":[],"mappings":"AA0BA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAsRnC,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,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,MAAM,CAAC,CA+JlB"}

package/dist/commands/branch/work-start.js

@@ -1,4 +1,4 @@
-import { copyFile, cp, mkdir, readFile, readdir, symlink, writeFile } from "node:fs/promises";
+import { chmod, copyFile, cp, mkdir, readFile, readdir, rm, symlink, writeFile, } from "node:fs/promises";
 import path from "node:path";
 import { resolveBaseBranch } from "@agentplaneorg/core";
 import { LocalBackend } from "../../backends/task-backend.js";
@@ -11,9 +11,40 @@ import { execFileAsync, gitEnv } from "../shared/git.js";
 import { gitAheadBehind } from "../shared/git-diff.js";
 import { gitBranchExists, gitBranchUpstream, gitCurrentBranch } from "../shared/git-ops.js";
 import { isPathWithin } from "../shared/path.js";
+import { resolveRuntimeSourceInfo } from "../../shared/runtime-source.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
+function isPresentString(value) {
+    return value !== null;
+}
 import { ensurePlanApprovedIfRequired } from "../task/shared.js";
 import { validateWorkAgent, validateWorkSlug } from "./internal/work-validate.js";
+const HOOK_SHIM_MARKER = "agentplane-hook-shim";
+function repoLocalHookShimText() {
+    return [
+        "#!/usr/bin/env sh",
+        `# ${HOOK_SHIM_MARKER} (do not edit)`,
+        "set -e",
+        'SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"',
+        'REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"',
+        'LOCAL_BIN="$REPO_ROOT/packages/agentplane/bin/agentplane.js"',
+        'if command -v node >/dev/null 2>&1 && [ -f "$LOCAL_BIN" ]; then',
+        '  exec node "$LOCAL_BIN" "$@"',
+        "fi",
+        'ENV_BIN="${AGENTPLANE_HOOK_RUNNER:-}"',
+        'if [ -n "$ENV_BIN" ] && command -v node >/dev/null 2>&1 && [ -f "$ENV_BIN" ]; then',
+        '  exec node "$ENV_BIN" "$@"',
+        "fi",
+        "if command -v agentplane >/dev/null 2>&1; then",
+        '  exec agentplane "$@"',
+        "fi",
+        "if command -v npx >/dev/null 2>&1; then",
+        '  exec npx --yes agentplane "$@"',
+        "fi",
+        'echo "agentplane shim: runner not found (need env runner, repo-local source, agentplane in PATH, or node+npx)." >&2',
+        "  exit 127",
+        "",
+    ].join("\n");
+}
 function directWorkLockPath(agentplaneDir) {
     // Intentionally under cache/ so it stays out of git by default.
     return path.join(agentplaneDir, "cache", "direct-work.json");
@@ -54,16 +85,35 @@ async function materializeLocalBackendReadmesForWorktree(opts) {
     for (const entry of entries) {
         if (!entry.isDirectory())
             continue;
+        const sourceTaskRoot = path.join(sourceRoot, entry.name);
         const sourceReadme = path.join(sourceRoot, entry.name, "README.md");
         if (!(await fileExists(sourceReadme)))
             continue;
         const targetReadme = path.join(targetRoot, entry.name, "README.md");
         await mkdir(path.dirname(targetReadme), { recursive: true });
         await copyFile(sourceReadme, targetReadme);
+        if (entry.name !== opts.taskId)
+            continue;
+        // Hand off ownership of the active task README to the task worktree so
+        // later merges cannot collide with a stale untracked copy on the base checkout.
+        await rm(sourceReadme, { force: true });
+        const remainingEntries = await readdir(sourceTaskRoot).catch(() => []);
+        if (remainingEntries.length === 0) {
+            await rm(sourceTaskRoot, { recursive: true, force: true });
+        }
     }
 }
 async function materializeRepoLocalDistForWorktree(opts) {
-    const sourceRoots = [path.resolve(opts.repoRoot), path.resolve(process.cwd())];
+    const runtimeSource = resolveRuntimeSourceInfo({ cwd: process.cwd() });
+    const sourceRoots = [
+        ...new Set([
+            path.resolve(opts.repoRoot),
+            path.resolve(process.cwd()),
+            runtimeSource.agentplane.packageRoot
+                ? path.resolve(runtimeSource.agentplane.packageRoot, "..", "..")
+                : null,
+        ].filter((value) => isPresentString(value))),
+    ];
     const copyTargets = [
         ["packages/core/dist", "packages/core/dist"],
         ["packages/agentplane/dist", "packages/agentplane/dist"],
@@ -88,8 +138,15 @@ async function materializeRepoLocalDistForWorktree(opts) {
     }
 }
 async function linkDirectoryIntoWorktree(opts) {
-    const sourcePath = path.join(opts.repoRoot, opts.relativePath);
-    if (!(await fileExists(sourcePath)))
+    let sourcePath = "";
+    for (const sourceRoot of opts.sourceRoots) {
+        const candidate = path.join(sourceRoot, opts.relativePath);
+        if (await fileExists(candidate)) {
+            sourcePath = candidate;
+            break;
+        }
+    }
+    if (!sourcePath)
         return false;
     const targetPath = path.join(opts.worktreePath, opts.relativePath);
     if (await fileExists(targetPath))
@@ -99,6 +156,16 @@ async function linkDirectoryIntoWorktree(opts) {
     return true;
 }
 async function materializeRepoLocalInstallLayoutForWorktree(opts) {
+    const runtimeSource = resolveRuntimeSourceInfo({ cwd: process.cwd() });
+    const sourceRoots = [
+        ...new Set([
+            path.resolve(opts.repoRoot),
+            path.resolve(process.cwd()),
+            runtimeSource.agentplane.packageRoot
+                ? path.resolve(runtimeSource.agentplane.packageRoot, "..", "..")
+                : null,
+        ].filter((value) => isPresentString(value))),
+    ];
     const linkTargets = [
         "node_modules",
         path.join("packages", "core", "node_modules"),
@@ -107,12 +174,20 @@ async function materializeRepoLocalInstallLayoutForWorktree(opts) {
     ];
     for (const relativePath of linkTargets) {
         await linkDirectoryIntoWorktree({
-            repoRoot: opts.repoRoot,
+            sourceRoots,
             worktreePath: opts.worktreePath,
             relativePath,
         });
     }
 }
+async function materializeHookShimForWorktree(worktreePath) {
+    const shimPath = path.join(worktreePath, ".agentplane", "bin", "agentplane");
+    if (await fileExists(shimPath))
+        return;
+    await mkdir(path.dirname(shimPath), { recursive: true });
+    await writeFile(shimPath, repoLocalHookShimText(), "utf8");
+    await chmod(shimPath, 0o755);
+}
 async function ensureGitClean(gitRoot) {
     const { stdout } = await execFileAsync("git", ["status", "--porcelain"], {
         cwd: gitRoot,
@@ -278,6 +353,7 @@ export async function cmdWorkStart(opts) {
                 backend: ctx.taskBackend,
                 repoRoot: resolved.gitRoot,
                 worktreePath,
+                taskId: opts.taskId,
             });
             await materializeRepoLocalDistForWorktree({
                 repoRoot: resolved.gitRoot,
@@ -287,6 +363,7 @@ export async function cmdWorkStart(opts) {
                 repoRoot: resolved.gitRoot,
                 worktreePath,
             });
+            await materializeHookShimForWorktree(worktreePath);
         }
         else {
             if (branchExists) {

package/dist/commands/doctor/branch-pr.js

@@ -56,8 +56,8 @@ export async function checkBranchPrDoneTaskOpenPrDrift(ctx) {
             state: "DONE branch_pr tasks still have open or unmerged PR artifacts",
             likelyCause: "the task was marked DONE, but its branch_pr PR artifacts were never reconciled to MERGED and the task branch still exists",
             nextAction: {
-                command: "agentplane task normalize --sync-hosted-merges --task-id <task-id>",
-                reason: "reconcile the shipped task's branch_pr PR artifacts to MERGED without scanning unrelated task history",
+                command: "agentplane task normalize --sync-branch-pr-state --task-id <task-id>",
+                reason: "reconcile the shipped task's local branch_pr state and PR artifacts to MERGED without scanning unrelated task history",
             },
             details: [
                 `Affected tasks: ${matches.length}`,

package/dist/commands/guard/impl/commands.d.ts

@@ -32,5 +32,6 @@ export declare function cmdCommit(opts: {
     closeUnstageOthers: boolean;
     closeCheckOnly: boolean;
     closeStageTaskArtifacts?: boolean;
+    closeRefreshTaskArtifacts?: boolean;
 }): Promise<number>;
 //# sourceMappingURL=commands.d.ts.map

package/dist/commands/guard/impl/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commands.ts"],"names":[],"mappings":"AAUA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQvF,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAsOxE,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAa9E;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,OAAO,CAAC,MAAM,CAAC,CA4OlB"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commands.ts"],"names":[],"mappings":"AAaA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQvF,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AA8SxE,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsBlB;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlB;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAa9E;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,GAAG,OAAO,CAAC,MAAM,CAAC,CAsPlB"}

package/dist/commands/guard/impl/commands.js

@@ -1,5 +1,6 @@
 import { mkdir, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
+import { extractTaskSuffix } from "@agentplaneorg/core";
 import { resolveTaskIndexPath } from "../../../backends/task-index.js";
 import { mapCoreError } from "../../../cli/error-map.js";
 import { infoMessage, successMessage } from "../../../cli/output.js";
@@ -7,6 +8,7 @@ import { stripAnsi } from "../../../cli/shared/ansi.js";
 import { withDiagnosticContext } from "../../../shared/diagnostics.js";
 import { CliError } from "../../../shared/errors.js";
 import { refreshBranchPrArtifactsAfterTaskCommit } from "../../shared/post-commit-pr-artifacts.js";
+import { isTaskLocalAdvancePath } from "../../shared/task-local-freshness.js";
 import { loadCommandContext } from "../../shared/task-backend.js";
 import { loadTaskFromContext } from "../../shared/task-backend.js";
 import { execFileAsync, gitEnv } from "../../shared/git.js";
@@ -111,6 +113,64 @@ function detectCommitFailureSignal(output) {
     }
     return null;
 }
+function taskArtifactRefreshCommitMessage(taskId) {
+    return `📝 ${extractTaskSuffix(taskId)} task: refresh PR artifacts`;
+}
+async function commitRefreshedTaskArtifacts(opts) {
+    const changedPaths = await opts.ctx.git.statusChangedPaths();
+    const taskArtifactPaths = changedPaths.filter((relPath) => isTaskLocalAdvancePath({
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        tasksPath: opts.ctx.config.paths.tasks_path,
+        relPath,
+    }));
+    if (taskArtifactPaths.length === 0)
+        return false;
+    await stageAllowlist({
+        ctx: opts.ctx,
+        allow: [],
+        allowTasks: true,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+        tasksPath: opts.ctx.config.paths.tasks_path,
+        workflowDir: opts.ctx.config.paths.workflow_dir,
+        taskId: opts.taskId,
+        allowTaskOnly: true,
+        emptyAllowMessage: "PR artifact refresh produced no task-local files to stage for the follow-up commit.",
+        noMatchMessage: "PR artifact refresh produced changes outside the active task artifact scope; inspect the working tree before retrying the commit flow.",
+    });
+    const message = taskArtifactRefreshCommitMessage(opts.taskId);
+    await guardCommitCheck({
+        ctx: opts.ctx,
+        cwd: opts.cwd,
+        rootOverride: opts.rootOverride,
+        baseBranchOverride: null,
+        taskId: opts.taskId,
+        message,
+        allow: [],
+        allowBase: false,
+        allowTasks: true,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+        requireClean: true,
+        quiet: opts.quiet,
+    });
+    const env = buildGitCommitEnv({
+        taskId: opts.taskId,
+        allowTasks: true,
+        allowBase: false,
+        allowPolicy: false,
+        allowConfig: false,
+        allowHooks: false,
+        allowCI: false,
+    });
+    await opts.ctx.git.commit({ message, env });
+    return true;
+}
 function commitFailureDiagnostic(phase, output) {
     const signal = detectCommitFailureSignal(output);
     if (signal === "formatter") {
@@ -327,15 +387,17 @@ export async function cmdCommit(opts) {
                 return 0;
             }
             if (opts.closeStageTaskArtifacts === true) {
-                await refreshBranchPrArtifactsAfterTaskCommit({
-                    ctx,
-                    cwd: opts.cwd,
-                    rootOverride: opts.rootOverride,
-                    taskId: opts.taskId,
-                    quiet: opts.quiet,
-                });
+                if (opts.closeRefreshTaskArtifacts !== false) {
+                    await refreshBranchPrArtifactsAfterTaskCommit({
+                        ctx,
+                        cwd: opts.cwd,
+                        rootOverride: opts.rootOverride,
+                        taskId: opts.taskId,
+                        quiet: opts.quiet,
+                    });
+                }
                 // Artifact refresh writes tracked task files on disk; invalidate the memoized
-                // porcelain snapshot so staging/cleanliness checks see the refreshed state.
+                // porcelain snapshot so staging/cleanliness checks see the current task artifact state.
                 ctx.git.invalidateStatus();
             }
             await (opts.closeStageTaskArtifacts === true
@@ -459,6 +521,14 @@ export async function cmdCommit(opts) {
             taskId: opts.taskId,
             quiet: opts.quiet,
         });
+        ctx.git.invalidateStatus();
+        await commitRefreshedTaskArtifacts({
+            ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            taskId: opts.taskId,
+            quiet: opts.quiet,
+        });
         if (!opts.quiet) {
             const { hash, subject } = await ctx.git.headHashSubject();
             process.stdout.write(`${successMessage("committed", `${hash?.slice(0, 12) ?? ""} ${subject ?? ""}`.trim(), autoStaged.length > 0 ? `staged=${autoStaged.join(", ")}` : undefined)}\n`);

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

@@ -1,4 +1,4 @@
-export declare const HOOK_NAMES: readonly ["commit-msg", "pre-commit", "pre-push"];
+export declare const HOOK_NAMES: readonly ["commit-msg", "pre-commit", "pre-push", "post-merge"];
 export declare function cmdHooksInstall(opts: {
     cwd: string;
     rootOverride?: string;

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":"AAoBA,eAAO,MAAM,UAAU,mDAAoD,CAAC;AA8K5E,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,CAiJlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/index.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,UAAU,iEAAkE,CAAC;AA8K1F,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,CAoLlB"}

package/dist/commands/hooks/index.js

@@ -8,14 +8,16 @@ 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 { cmdCleanupMerged } from "../branch/index.js";
 import { GitContext } from "../shared/git-context.js";
 import { throwIfPolicyDenied } from "../shared/policy-deny.js";
 import { gitCurrentBranch, gitRevParse } from "../shared/git-ops.js";
 import { parseTaskIdFromBranch, parseTaskIdFromCloseBranch } from "../shared/git-worktree.js";
 import { isPathWithin } from "../shared/path.js";
+import { loadCommandContext } from "../shared/task-backend.js";
 const HOOK_MARKER = "agentplane-hook";
 const SHIM_MARKER = "agentplane-hook-shim";
-export const HOOK_NAMES = ["commit-msg", "pre-commit", "pre-push"];
+export const HOOK_NAMES = ["commit-msg", "pre-commit", "pre-push", "post-merge"];
 async function inferTaskIdFromBranchContext(opts) {
     try {
         const branch = await gitCurrentBranch(opts.gitRoot);
@@ -83,14 +85,14 @@ function shimScriptText() {
         "set -e",
         'SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"',
         'REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"',
-        'ENV_BIN="${AGENTPLANE_HOOK_RUNNER:-}"',
-        'if [ -n "$ENV_BIN" ] && command -v node >/dev/null 2>&1 && [ -f "$ENV_BIN" ]; then',
-        '  exec node "$ENV_BIN" "$@"',
-        "fi",
         'LOCAL_BIN="$REPO_ROOT/packages/agentplane/bin/agentplane.js"',
         'if command -v node >/dev/null 2>&1 && [ -f "$LOCAL_BIN" ]; then',
         '  exec node "$LOCAL_BIN" "$@"',
         "fi",
+        'ENV_BIN="${AGENTPLANE_HOOK_RUNNER:-}"',
+        'if [ -n "$ENV_BIN" ] && command -v node >/dev/null 2>&1 && [ -f "$ENV_BIN" ]; then',
+        '  exec node "$ENV_BIN" "$@"',
+        "fi",
         "if command -v agentplane >/dev/null 2>&1; then",
         '  exec agentplane "$@"',
         "fi",
@@ -344,18 +346,52 @@ export async function cmdHooksRun(opts) {
                 env: process.env,
                 encoding: "utf8",
                 input: await readHookStdinUtf8(),
-                stdio: "pipe",
+                stdio: ["pipe", "inherit", "inherit"],
             });
-            if (typeof result.stdout === "string" && result.stdout.length > 0) {
-                process.stdout.write(result.stdout);
-            }
-            if (typeof result.stderr === "string" && result.stderr.length > 0) {
-                process.stderr.write(result.stderr);
-            }
             if (result.error)
                 throw result.error;
             return result.status ?? (result.signal ? 1 : 0);
         }
+        if (opts.hook === "post-merge") {
+            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;
+            }
+        }
         return 0;
     }
     catch (err) {

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

@@ -1 +1 @@
-{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/check.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAgLnC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2NlB"}
+{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../../src/commands/pr/check.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAkLnC,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6NlB"}

package/dist/commands/pr/check.js

@@ -79,6 +79,7 @@ async function evaluateSnapshotFreshness(opts) {
     const freshness = await assessPrArtifactFreshness({
         gitRoot: opts.gitRoot,
         workflowDir: opts.workflowDir,
+        tasksPath: opts.tasksPath,
         taskId: opts.taskId,
         branchHeadSha: opts.branchHeadSha,
         metaHeadSha: opts.snapshot.meta.head_sha ?? null,
@@ -212,6 +213,7 @@ export async function cmdPrCheck(opts) {
             snapshot: localSnapshot,
             gitRoot: resolved.gitRoot,
             workflowDir: config.paths.workflow_dir,
+            tasksPath: config.paths.tasks_path,
             taskId: task.id,
             branchHeadSha,
             taskVerificationState: task.verification?.state ?? null,
@@ -294,6 +296,7 @@ export async function cmdPrCheck(opts) {
                 snapshot: branchSnapshot,
                 gitRoot: resolved.gitRoot,
                 workflowDir: config.paths.workflow_dir,
+                tasksPath: config.paths.tasks_path,
                 taskId: task.id,
                 branchHeadSha,
                 taskVerificationState: task.verification?.state ?? null,

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":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AASnE,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,CAkNlB"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../../../src/commands/pr/integrate/cmd.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAUnE,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,CA+OlB"}