agentplane 0.3.22 → 0.3.24

package/dist/commands/guard/impl/commit-refresh.d.ts

@@ -0,0 +1,25 @@
+import { type CommandContext } from "../../shared/task-backend.js";
+type CommitRef = {
+    hash: string;
+    subject: string;
+} | null;
+export declare function resetRebuildableTaskIndexCache(ctx: CommandContext): Promise<void>;
+export declare function formatCommitRef(commit: CommitRef): string;
+export declare function commitRefreshedTaskArtifacts(opts: {
+    ctx: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    taskId: string;
+    sourceMessage: string;
+    quiet: boolean;
+}): Promise<CommitRef>;
+export declare function refreshBranchPrArtifactsForCloseCommit(opts: {
+    ctx: CommandContext;
+    cwd: string;
+    rootOverride?: string;
+    taskId: string;
+    quiet: boolean;
+    refreshTaskArtifacts: boolean;
+}): Promise<void>;
+export {};
+//# sourceMappingURL=commit-refresh.d.ts.map

package/dist/commands/guard/impl/commit-refresh.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit-refresh.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commit-refresh.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKnE,KAAK,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC;AAE1D,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BvF;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAGzD;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,CAAC,CAgErB;AAED,wBAAsB,sCAAsC,CAAC,IAAI,EAAE;IACjE,GAAG,EAAE,cAAc,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,oBAAoB,EAAE,OAAO,CAAC;CAC/B,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhB"}

package/dist/commands/guard/impl/commit-refresh.js

@@ -0,0 +1,116 @@
+import { mkdir, rm, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { buildTaskArtifactRefreshCommitSubject } from "@agentplaneorg/core/commit";
+import { gitEnv } from "@agentplaneorg/core/git";
+import { execFileAsync } from "@agentplaneorg/core/process";
+import { resolveTaskIndexPath } from "../../../backends/task-index.js";
+import { refreshBranchPrArtifactsAfterTaskCommit } from "../../shared/post-commit-pr-artifacts.js";
+import { isTaskLocalAdvancePath } from "../../shared/task-local-freshness.js";
+import { stageAllowlist } from "./allow.js";
+import { buildGitCommitEnv, resolveCanonicalGitIdentity } from "./env.js";
+import { guardCommitCheck } from "./policy.js";
+export async function resetRebuildableTaskIndexCache(ctx) {
+    const gitRoot = path.resolve(ctx.resolvedProject.gitRoot);
+    const workflowDirAbs = path.resolve(gitRoot, ctx.config.paths.workflow_dir);
+    const cachePath = path.resolve(resolveTaskIndexPath(workflowDirAbs));
+    const relativeCachePath = path.relative(gitRoot, cachePath);
+    if (!relativeCachePath || relativeCachePath.startsWith(".."))
+        return;
+    try {
+        await execFileAsync("git", ["ls-files", "--error-unmatch", "--", relativeCachePath], {
+            cwd: gitRoot,
+            env: gitEnv(),
+        });
+        const gitPath = relativeCachePath.split(path.sep).join("/");
+        const cacheBlob = await execFileAsync("git", ["show", `HEAD:${gitPath}`], {
+            cwd: gitRoot,
+            env: gitEnv(),
+        });
+        await mkdir(path.dirname(cachePath), { recursive: true });
+        await writeFile(cachePath, cacheBlob.stdout, "utf8");
+        await execFileAsync("git", ["restore", "--staged", "--", relativeCachePath], {
+            cwd: gitRoot,
+            env: gitEnv(),
+        });
+    }
+    catch {
+        await rm(cachePath, { force: true });
+    }
+    ctx.git.invalidateStatus();
+}
+export function formatCommitRef(commit) {
+    if (!commit)
+        return "";
+    return `${commit.hash?.slice(0, 12) ?? ""} ${commit.subject ?? ""}`.trim();
+}
+export 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 null;
+    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 = buildTaskArtifactRefreshCommitSubject({
+        taskId: opts.taskId,
+        baseSubject: opts.sourceMessage,
+    });
+    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,
+        gitIdentity: await resolveCanonicalGitIdentity(),
+    });
+    await opts.ctx.git.commit({ message, env });
+    return await opts.ctx.git.headHashSubject();
+}
+export async function refreshBranchPrArtifactsForCloseCommit(opts) {
+    if (opts.refreshTaskArtifacts) {
+        await refreshBranchPrArtifactsAfterTaskCommit({
+            ctx: opts.ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            taskId: opts.taskId,
+            quiet: opts.quiet,
+        });
+    }
+    opts.ctx.git.invalidateStatus();
+}

package/dist/commands/guard/impl/commit-stage.d.ts

@@ -0,0 +1,21 @@
+import { type CommandContext } from "../../shared/task-backend.js";
+export declare function hasExplicitCommitScope(opts: {
+    allow: string[];
+    allowTasks: boolean;
+    allowPolicy: boolean;
+    allowConfig: boolean;
+    allowHooks: boolean;
+    allowCI: boolean;
+}): boolean;
+export declare function stageActiveTaskArtifactsFromAllowTasks(opts: {
+    ctx: CommandContext;
+    taskId: string;
+    allowTasks: boolean;
+}): Promise<string[]>;
+export declare function stageCloseCommitPaths(opts: {
+    ctx: CommandContext;
+    readmeRel: string;
+    taskId: string;
+    allowPolicy: boolean;
+}): Promise<void>;
+//# sourceMappingURL=commit-stage.d.ts.map

package/dist/commands/guard/impl/commit-stage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit-stage.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commit-stage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB,GAAG,OAAO,CASV;AAED,wBAAsB,sCAAsC,CAAC,IAAI,EAAE;IACjE,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBpB;AAED,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,GAAG,EAAE,cAAc,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhB"}

package/dist/commands/guard/impl/commit-stage.js

@@ -0,0 +1,43 @@
+import { protectedPathKindForFile } from "../../../shared/protected-paths.js";
+import { isTaskLocalAdvancePath } from "../../shared/task-local-freshness.js";
+export function hasExplicitCommitScope(opts) {
+    return (opts.allow.some((prefix) => prefix.trim().length > 0) ||
+        opts.allowTasks ||
+        opts.allowPolicy ||
+        opts.allowConfig ||
+        opts.allowHooks ||
+        opts.allowCI);
+}
+export async function stageActiveTaskArtifactsFromAllowTasks(opts) {
+    if (!opts.allowTasks)
+        return [];
+    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 [];
+    const unique = [...new Set(taskArtifactPaths)].toSorted((a, b) => a.localeCompare(b));
+    await opts.ctx.git.stage(unique);
+    return unique;
+}
+export async function stageCloseCommitPaths(opts) {
+    const stagePaths = new Set([opts.readmeRel]);
+    if (opts.allowPolicy) {
+        const changedPaths = await opts.ctx.git.statusChangedPaths();
+        for (const relPath of changedPaths) {
+            if (protectedPathKindForFile({
+                filePath: relPath,
+                tasksPath: opts.ctx.config.paths.tasks_path,
+                workflowDir: opts.ctx.config.paths.workflow_dir,
+                taskId: opts.taskId,
+            }) === "policy") {
+                stagePaths.add(relPath);
+            }
+        }
+    }
+    await opts.ctx.git.stage([...stagePaths].toSorted((a, b) => a.localeCompare(b)));
+}

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

@@ -1 +1 @@
-{"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commit.ts"],"names":[],"mappings":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAwLtC,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,CAwIlB"}
+{"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commit.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAsBtC,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,CAwIlB"}

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

@@ -1,14 +1,8 @@
-import { mkdir, rm, writeFile } from "node:fs/promises";
-import path from "node:path";
-import { buildTaskArtifactRefreshCommitSubject } from "@agentplaneorg/core/commit";
-import { resolveTaskIndexPath } from "../../../backends/task-index.js";
 import { mapCoreError } from "../../../cli/error-map.js";
 import { infoMessage, successMessage } from "../../../cli/output.js";
 import { withDiagnosticContext } from "../../shared/diagnostics.js";
 import { CliError } from "../../../shared/errors.js";
-import { protectedPathKindForFile } from "../../../shared/protected-paths.js";
 import { refreshBranchPrArtifactsAfterTaskCommit } from "../../shared/post-commit-pr-artifacts.js";
-import { isTaskLocalAdvancePath } from "../../shared/task-local-freshness.js";
 import { loadCommandContext, loadTaskFromContext, } from "../../shared/task-backend.js";
 import { execFileAsync } from "@agentplaneorg/core/process";
 import { gitEnv } from "@agentplaneorg/core/git";
@@ -18,141 +12,9 @@ import { resolveIgnoredDirectCloseDirtyPaths } from "./close-dirt.js";
 import { buildCloseCommitMessage, taskReadmePathForTask } from "./close-message.js";
 import { asCommitFailure } from "./commit-diagnostics.js";
 import { buildGitCommitEnv, resolveCanonicalGitIdentity } from "./env.js";
+import { commitRefreshedTaskArtifacts, formatCommitRef, refreshBranchPrArtifactsForCloseCommit, resetRebuildableTaskIndexCache, } from "./commit-refresh.js";
+import { hasExplicitCommitScope, stageActiveTaskArtifactsFromAllowTasks, stageCloseCommitPaths, } from "./commit-stage.js";
 import { guardCommitCheck } from "./policy.js";
-async function resetRebuildableTaskIndexCache(ctx) {
-    const gitRoot = path.resolve(ctx.resolvedProject.gitRoot);
-    const workflowDirAbs = path.resolve(gitRoot, ctx.config.paths.workflow_dir);
-    const cachePath = path.resolve(resolveTaskIndexPath(workflowDirAbs));
-    const relativeCachePath = path.relative(gitRoot, cachePath);
-    if (!relativeCachePath || relativeCachePath.startsWith(".."))
-        return;
-    try {
-        await execFileAsync("git", ["ls-files", "--error-unmatch", "--", relativeCachePath], {
-            cwd: gitRoot,
-            env: gitEnv(),
-        });
-        const gitPath = relativeCachePath.split(path.sep).join("/");
-        const cacheBlob = await execFileAsync("git", ["show", `HEAD:${gitPath}`], {
-            cwd: gitRoot,
-            env: gitEnv(),
-        });
-        await mkdir(path.dirname(cachePath), { recursive: true });
-        await writeFile(cachePath, cacheBlob.stdout, "utf8");
-        await execFileAsync("git", ["restore", "--staged", "--", relativeCachePath], {
-            cwd: gitRoot,
-            env: gitEnv(),
-        });
-    }
-    catch {
-        await rm(cachePath, { force: true });
-    }
-    ctx.git.invalidateStatus();
-}
-async function stageCloseCommitPaths(opts) {
-    const stagePaths = new Set([opts.readmeRel]);
-    if (opts.allowPolicy) {
-        const changedPaths = await opts.ctx.git.statusChangedPaths();
-        for (const relPath of changedPaths) {
-            if (protectedPathKindForFile({
-                filePath: relPath,
-                tasksPath: opts.ctx.config.paths.tasks_path,
-                workflowDir: opts.ctx.config.paths.workflow_dir,
-                taskId: opts.taskId,
-            }) === "policy") {
-                stagePaths.add(relPath);
-            }
-        }
-    }
-    await opts.ctx.git.stage([...stagePaths].toSorted((a, b) => a.localeCompare(b)));
-}
-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 null;
-    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 = buildTaskArtifactRefreshCommitSubject({
-        taskId: opts.taskId,
-        baseSubject: opts.sourceMessage,
-    });
-    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,
-        gitIdentity: await resolveCanonicalGitIdentity(),
-    });
-    await opts.ctx.git.commit({ message, env });
-    return await opts.ctx.git.headHashSubject();
-}
-function hasExplicitCommitScope(opts) {
-    return (opts.allow.some((prefix) => prefix.trim().length > 0) ||
-        opts.allowTasks ||
-        opts.allowPolicy ||
-        opts.allowConfig ||
-        opts.allowHooks ||
-        opts.allowCI);
-}
-function formatCommitRef(commit) {
-    if (!commit)
-        return "";
-    return `${commit.hash?.slice(0, 12) ?? ""} ${commit.subject ?? ""}`.trim();
-}
-async function stageActiveTaskArtifactsFromAllowTasks(opts) {
-    if (!opts.allowTasks)
-        return [];
-    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 [];
-    const unique = [...new Set(taskArtifactPaths)].toSorted((a, b) => a.localeCompare(b));
-    await opts.ctx.git.stage(unique);
-    return unique;
-}
 export async function cmdCommit(opts) {
     try {
         const ctx = opts.ctx ??
@@ -321,16 +183,14 @@ async function cmdCloseCommit(opts) {
         return 0;
     }
     if (opts.closeStageTaskArtifacts === true) {
-        if (opts.closeRefreshTaskArtifacts !== false) {
-            await refreshBranchPrArtifactsAfterTaskCommit({
-                ctx: opts.ctx,
-                cwd: opts.cwd,
-                rootOverride: opts.rootOverride,
-                taskId: opts.taskId,
-                quiet: opts.quiet,
-            });
-        }
-        opts.ctx.git.invalidateStatus();
+        await refreshBranchPrArtifactsForCloseCommit({
+            ctx: opts.ctx,
+            cwd: opts.cwd,
+            rootOverride: opts.rootOverride,
+            taskId: opts.taskId,
+            quiet: opts.quiet,
+            refreshTaskArtifacts: opts.closeRefreshTaskArtifacts !== false,
+        });
     }
     await (opts.closeStageTaskArtifacts === true
         ? stageAllowlist({

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

@@ -1,3 +1,7 @@
+export declare function collectHooksInstallConflicts(opts: {
+    gitRoot: string;
+    agentplaneDir: string;
+}): Promise<string[]>;
 export declare function cmdHooksInstall(opts: {
     cwd: string;
     rootOverride?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/install.ts"],"names":[],"mappings":"AAgGA,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"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/install.ts"],"names":[],"mappings":"AA+CA,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBpB;AAmDD,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"}

package/dist/commands/hooks/install.js

@@ -32,6 +32,25 @@ function resolveInstalledHookRunnerPath() {
     const activeBin = String(process.env.AGENTPLANE_RUNTIME_ACTIVE_BIN ?? "").trim();
     return activeBin || resolveAgentplaneBinPath();
 }
+export async function collectHooksInstallConflicts(opts) {
+    const hooksDir = await resolveGitHooksDir(opts.gitRoot);
+    const conflicts = [];
+    const shimPath = path.join(opts.agentplaneDir, "bin", "agentplane");
+    if (await fileExists(shimPath)) {
+        const managed = await fileIsManaged(shimPath, SHIM_MARKER);
+        if (!managed)
+            conflicts.push(shimPath);
+    }
+    for (const hook of HOOK_NAMES) {
+        const hookPath = path.join(hooksDir, hook);
+        if (!(await fileExists(hookPath)))
+            continue;
+        const managed = await fileIsManaged(hookPath, HOOK_MARKER);
+        if (!managed)
+            conflicts.push(hookPath);
+    }
+    return conflicts;
+}
 function shimScriptText(installedRunnerPath) {
     return [
         "#!/usr/bin/env sh",

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

@@ -1 +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;AAyBhD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAO,GACxC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB;AA+TD,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAuB3E"}
+{"version":3,"file":"run.pre-push.d.ts","sourceRoot":"","sources":["../../../src/commands/hooks/run.pre-push.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAyBhD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAO,GACxC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB;AAiUD,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAuB3E"}

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

@@ -4,6 +4,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileExists } from "../../cli/fs-utils.js";
 import { resolveAgentplaneRepoScriptPath } from "../../shared/package-paths.js";
+import { resolvePreferredNodeExecutable, withPreferredRuntimePath, } from "../../shared/runtime-env.js";
 function resolveBundledPrePushHookScriptPath() {
     return resolveAgentplaneRepoScriptPath("run-pre-push-hook.mjs");
 }
@@ -45,7 +46,7 @@ function runHookCommand(gitRoot, command, args) {
         command,
         args,
         cwd: gitRoot,
-        env: process.env,
+        env: withPreferredRuntimePath(process.env),
         stdout: "inherit",
         stderr: "inherit",
         reject: false,
@@ -222,7 +223,9 @@ function runInternalPrePushHook(gitRoot, stdin) {
         if (isReleasePush) {
             const releaseNotesScript = path.join(gitRoot, "scripts", "check-release-notes.mjs");
             if (fileExistsSync(releaseNotesScript)) {
-                const notesExitCode = runHookCommand(gitRoot, "node", ["scripts/check-release-notes.mjs"]);
+                const notesExitCode = runHookCommand(gitRoot, resolvePreferredNodeExecutable(process.env), [
+                    "scripts/check-release-notes.mjs",
+                ]);
                 if (notesExitCode !== 0)
                     return notesExitCode;
             }

package/dist/commands/recipes/impl/installed-recipes.d.ts

@@ -1,5 +1,9 @@
 import { type InstalledRecipesFile } from "@agentplaneorg/recipes";
+type ValidateInstalledRecipesFileOptions = {
+    dropInvalidEntries?: boolean;
+};
 export declare function readInstalledRecipesFile(filePath: string): Promise<InstalledRecipesFile>;
-export declare function readAndMigrateInstalledRecipesFile(filePath: string): Promise<InstalledRecipesFile>;
+export declare function readAndMigrateInstalledRecipesFile(filePath: string, opts?: ValidateInstalledRecipesFileOptions): Promise<InstalledRecipesFile>;
 export declare function writeInstalledRecipesFile(filePath: string, file: InstalledRecipesFile): Promise<void>;
+export {};
 //# sourceMappingURL=installed-recipes.d.ts.map

package/dist/commands/recipes/impl/installed-recipes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installed-recipes.d.ts","sourceRoot":"","sources":["../../../../src/commands/recipes/impl/installed-recipes.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAC;AAgDhC,wBAAsB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAS9F;AAED,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,oBAAoB,CAAC,CAc/B;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC,CAOf"}
+{"version":3,"file":"installed-recipes.d.ts","sourceRoot":"","sources":["../../../../src/commands/recipes/impl/installed-recipes.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAC;AAMhC,KAAK,mCAAmC,GAAG;IACzC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAgEF,wBAAsB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAS9F;AAED,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,mCAAmC,GACzC,OAAO,CAAC,oBAAoB,CAAC,CAc/B;AAED,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,oBAAoB,GACzB,OAAO,CAAC,IAAI,CAAC,CAOf"}

package/dist/commands/recipes/impl/installed-recipes.js

@@ -5,7 +5,39 @@ import { normalizeRecipeTags, validateRecipeManifest, } from "@agentplaneorg/rec
 import { invalidFieldMessage } from "../../../cli/output.js";
 import { isRecord } from "../../../shared/guards.js";
 import { writeJsonStableIfChanged } from "../../../shared/write-if-changed.js";
-function validateInstalledRecipesFile(raw) {
+function normalizeInstalledRecipeEntry(entry, opts) {
+    if (!isRecord(entry)) {
+        if (opts?.dropInvalidEntries)
+            return null;
+        throw new Error(invalidFieldMessage("recipes.json.recipes[]", "object"));
+    }
+    let manifest;
+    try {
+        manifest = validateRecipeManifest(entry.manifest);
+    }
+    catch (error) {
+        if (opts?.dropInvalidEntries)
+            return null;
+        throw error;
+    }
+    const id = typeof entry.id === "string" ? entry.id.trim() : manifest.id;
+    const version = typeof entry.version === "string" ? entry.version.trim() : manifest.version;
+    const source = typeof entry.source === "string" ? entry.source.trim() : "";
+    const installedAt = typeof entry.installed_at === "string" ? entry.installed_at.trim() : "";
+    if (!id || !version || !source || !installedAt) {
+        if (opts?.dropInvalidEntries)
+            return null;
+        throw new Error(invalidFieldMessage("recipes.json.recipes[]", "id, version, source, installed_at"));
+    }
+    if (id !== manifest.id || version !== manifest.version) {
+        if (opts?.dropInvalidEntries)
+            return null;
+        throw new Error(invalidFieldMessage("recipes.json.recipes[]", "id/version match manifest"));
+    }
+    const tags = normalizeRecipeTags(entry.tags ?? manifest.tags ?? []);
+    return { id, version, source, installed_at: installedAt, tags, manifest };
+}
+function validateInstalledRecipesFile(raw, opts) {
     if (!isRecord(raw))
         throw new Error(invalidFieldMessage("recipes.json", "object"));
     if (raw.schema_version !== 1)
@@ -13,22 +45,9 @@ function validateInstalledRecipesFile(raw) {
     if (!Array.isArray(raw.recipes))
         throw new Error(invalidFieldMessage("recipes.json.recipes", "array"));
     const updatedAt = typeof raw.updated_at === "string" ? raw.updated_at : "";
-    const recipes = raw.recipes
-        .filter((entry) => isRecord(entry))
-        .map((entry) => {
-        const manifest = validateRecipeManifest(entry.manifest);
-        const id = typeof entry.id === "string" ? entry.id.trim() : manifest.id;
-        const version = typeof entry.version === "string" ? entry.version.trim() : manifest.version;
-        const source = typeof entry.source === "string" ? entry.source.trim() : "";
-        const installedAt = typeof entry.installed_at === "string" ? entry.installed_at.trim() : "";
-        if (!id || !version || !source || !installedAt) {
-            throw new Error(invalidFieldMessage("recipes.json.recipes[]", "id, version, source, installed_at"));
-        }
-        if (id !== manifest.id || version !== manifest.version) {
-            throw new Error(invalidFieldMessage("recipes.json.recipes[]", "id/version match manifest"));
-        }
-        const tags = normalizeRecipeTags(entry.tags ?? manifest.tags ?? []);
-        return { id, version, source, installed_at: installedAt, tags, manifest };
+    const recipes = raw.recipes.flatMap((entry) => {
+        const normalized = normalizeInstalledRecipeEntry(entry, opts);
+        return normalized ? [normalized] : [];
     });
     return { schema_version: 1, updated_at: updatedAt, recipes };
 }
@@ -54,10 +73,10 @@ export async function readInstalledRecipesFile(filePath) {
         throw err;
     }
 }
-export async function readAndMigrateInstalledRecipesFile(filePath) {
+export async function readAndMigrateInstalledRecipesFile(filePath, opts) {
     try {
         const raw = JSON.parse(await readFile(filePath, "utf8"));
-        const normalized = sortInstalledRecipes(validateInstalledRecipesFile(raw));
+        const normalized = sortInstalledRecipes(validateInstalledRecipesFile(raw, opts));
         if (installedRecipesNeedMigration(raw, normalized)) {
             await mkdir(path.dirname(filePath), { recursive: true });
             await writeJsonStableIfChanged(filePath, normalized);

package/dist/commands/release/apply.mutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.mutation.d.ts","sourceRoot":"","sources":["../../../src/commands/release/apply.mutation.ts"],"names":[],"mappings":"AASA,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,wBAAsB,gCAAgC,CACpD,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAqCf;AAED,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,wBAAsB,8BAA8B,CAClD,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,wBAAgB,YAAY,IAAI,MAAM,CAAC,UAAU,CAOhD"}
+{"version":3,"file":"apply.mutation.d.ts","sourceRoot":"","sources":["../../../src/commands/release/apply.mutation.ts"],"names":[],"mappings":"AAaA,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,wBAAsB,gCAAgC,CACpD,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAqCf;AAED,wBAAsB,+BAA+B,CACnD,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,CAyBlB;AAED,wBAAsB,8BAA8B,CAClD,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAQlB;AAED,wBAAgB,YAAY,IAAI,MAAM,CAAC,UAAU,CAOhD"}

package/dist/commands/release/apply.mutation.js

@@ -3,6 +3,7 @@ import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { exitCodeForError } from "../../cli/exit-codes.js";
 import { CliError } from "../../shared/errors.js";
+import { resolvePreferredNodeExecutable, withPreferredRuntimePath, } from "../../shared/runtime-env.js";
 import { execFileAsync } from "@agentplaneorg/core/process";
 import { gitEnv } from "@agentplaneorg/core/git";
 export async function replacePackageVersionInFile(pkgJsonPath, nextVersion) {
@@ -75,7 +76,7 @@ export async function maybeUpdateBunLockfile(gitRoot, fileExists) {
     try {
         await execFileAsync("bun", ["install", "--ignore-scripts"], {
             cwd: gitRoot,
-            env: process.env,
+            env: withPreferredRuntimePath(process.env),
             maxBuffer: 50 * 1024 * 1024,
         });
     }
@@ -97,9 +98,9 @@ export async function maybeRefreshGeneratedReference(gitRoot, fileExists) {
     if (!(await fileExists(scriptPath)))
         return false;
     try {
-        await execFileAsync("node", [scriptPath], {
+        await execFileAsync(resolvePreferredNodeExecutable(process.env), [scriptPath], {
             cwd: gitRoot,
-            env: process.env,
+            env: withPreferredRuntimePath(process.env),
             maxBuffer: 20 * 1024 * 1024,
         });
     }
@@ -132,5 +133,5 @@ export function cleanHookEnv() {
     delete env.AGENTPLANE_STATUS_TO;
     delete env.AGENTPLANE_AGENT_ID;
     env.AGENTPLANE_ALLOW_CONFIG = "1";
-    return env;
+    return withPreferredRuntimePath(env);
 }

package/dist/commands/release/apply.pipeline/mutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/apply.pipeline/mutation.ts"],"names":[],"mappings":"AAKA,OAAO,EAAU,UAAU,EAAyB,MAAM,yBAAyB,CAAC;AAYpF,OAAO,KAAK,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGrF,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA6DlC;AAED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,sBAAsB,CAAC,CAgBjC"}
+{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../../../../src/commands/release/apply.pipeline/mutation.ts"],"names":[],"mappings":"AAKA,OAAO,EAAU,UAAU,EAAyB,MAAM,yBAAyB,CAAC;AAYpF,OAAO,KAAK,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGrF,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,UAAU,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAuElC;AAED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,mBAAmB,GACzB,OAAO,CAAC,sBAAsB,CAAC,CAgBjC"}

package/dist/commands/release/apply.pipeline/mutation.js

@@ -14,9 +14,14 @@ export async function applyReleaseMutation(opts) {
     ]);
     const shouldUpdateTestkitAgentplaneDependency = (await fileExists(opts.testkitPkgPath)) &&
         (await packageDependencyExists(opts.testkitPkgPath, "agentplane"));
+    const shouldUpdateTestkitCoreDependency = (await fileExists(opts.testkitPkgPath)) &&
+        (await packageDependencyExists(opts.testkitPkgPath, "@agentplaneorg/core"));
     if (shouldUpdateTestkitAgentplaneDependency) {
         await replacePackageDependencyVersion(opts.testkitPkgPath, "agentplane", opts.nextVersion);
     }
+    if (shouldUpdateTestkitCoreDependency) {
+        await replacePackageDependencyVersion(opts.testkitPkgPath, "@agentplaneorg/core", opts.nextVersion);
+    }
     const expectedCliVersionPersisted = await maybePersistExpectedCliVersion(opts.agentplaneDir, opts.nextVersion);
     await maybeUpdateBunLockfile(opts.gitRoot, fileExists);
     const generatedReferenceExists = await maybeRefreshGeneratedReference(opts.gitRoot, fileExists);
@@ -26,7 +31,7 @@ export async function applyReleaseMutation(opts) {
         "packages/recipes/package.json",
         path.relative(opts.gitRoot, opts.notesPath),
     ];
-    if (shouldUpdateTestkitAgentplaneDependency) {
+    if (shouldUpdateTestkitAgentplaneDependency || shouldUpdateTestkitCoreDependency) {
         stagePaths.push("packages/testkit/package.json");
     }
     if (expectedCliVersionPersisted) {