agentplane 0.3.7 → 0.3.8

package/dist/commands/branch/base.js

@@ -1,7 +1,9 @@
 import { clearPinnedBaseBranch, getPinnedBaseBranch, loadConfig, resolveBaseBranch, resolveProject, setPinnedBaseBranch, } from "@agentplaneorg/core";
 import { mapCoreError } from "../../cli/error-map.js";
+import { createCliEmitter } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
+const output = createCliEmitter();
 export async function cmdBranchBaseGet(opts) {
     try {
         const pinned = await getPinnedBaseBranch({
@@ -15,7 +17,7 @@ export async function cmdBranchBaseGet(opts) {
                 message: "Base branch is not pinned (use `agentplane branch base set`).",
             });
         }
-        process.stdout.write(`${pinned}\n`);
+        output.line(pinned);
         return 0;
     }
     catch (err) {
@@ -47,7 +49,7 @@ export async function cmdBranchBaseSet(opts) {
             rootOverride: opts.rootOverride ?? null,
             value: nextValue,
         });
-        process.stdout.write(`${value}\n`);
+        output.line(value);
         return 0;
     }
     catch (err) {
@@ -60,7 +62,7 @@ export async function cmdBranchBaseClear(opts) {
             cwd: opts.cwd,
             rootOverride: opts.rootOverride ?? null,
         });
-        process.stdout.write(`${cleared ? "cleared" : "no-op"}\n`);
+        output.line(cleared ? "cleared" : "no-op");
         return 0;
     }
     catch (err) {
@@ -98,12 +100,14 @@ export async function cmdBranchBaseExplain(opts) {
         if (effective && !(await gitBranchExists(resolved.gitRoot, effective))) {
             warnings.push(`Effective base branch not found: ${effective}`);
         }
-        process.stdout.write(`current_branch=${current ?? "-"}\n`);
-        process.stdout.write(`pinned_base=${pinned ?? "-"}\n`);
-        process.stdout.write(`effective_base=${effective ?? "-"}\n`);
+        output.lines([
+            `current_branch=${current ?? "-"}`,
+            `pinned_base=${pinned ?? "-"}`,
+            `effective_base=${effective ?? "-"}`,
+        ]);
         if (warnings.length > 0) {
             for (const warning of warnings) {
-                process.stdout.write(`warning=${warning}\n`);
+                output.line(`warning=${warning}`);
             }
         }
         return 0;

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":"AAiBA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIpF,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,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0IlB"}
+{"version":3,"file":"cleanup-merged.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/cleanup-merged.ts"],"names":[],"mappings":"AAiBA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAKnC,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,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsIlB"}

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

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { resolveBaseBranch } from "@agentplaneorg/core";
 import { mapBackendError } from "../../cli/error-map.js";
-import { successMessage, unknownEntityMessage, workflowModeMessage } from "../../cli/output.js";
+import { createCliEmitter, unknownEntityMessage, workflowModeMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { ensureGitClean } from "../guard/index.js";
 import { execFileAsync, gitEnv } from "../shared/git.js";
@@ -9,8 +9,9 @@ import { gitDiffNames } from "../shared/git-diff.js";
 import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
 import { findWorktreeForBranch, gitListTaskBranches, parseTaskIdFromBranch, } from "../shared/git-worktree.js";
 import { isPathWithin, resolvePathFallback } from "../shared/path.js";
-import { loadCommandContext } from "../shared/task-backend.js";
+import { listTaskProjection, loadCommandContext, } from "../shared/task-backend.js";
 import { archivePrArtifacts } from "./internal/archive-pr.js";
+const output = createCliEmitter();
 export async function cmdCleanupMerged(opts) {
     try {
         const ctx = opts.ctx ??
@@ -54,7 +55,7 @@ export async function cmdCleanupMerged(opts) {
             });
         }
         const repoRoot = await resolvePathFallback(resolved.gitRoot);
-        const tasks = await ctx.taskBackend.listTasks();
+        const tasks = (await listTaskProjection(ctx)) ?? [];
         const tasksById = new Map(tasks.map((task) => [task.id, task]));
         const prefix = config.branch.task_prefix;
         const branches = await gitListTaskBranches(resolved.gitRoot, prefix);
@@ -80,18 +81,18 @@ export async function cmdCleanupMerged(opts) {
         const sortedCandidates = candidates.toSorted((a, b) => a.taskId.localeCompare(b.taskId));
         if (!opts.quiet) {
             const archiveLabel = opts.archive ? " archive=on" : "";
-            process.stdout.write(`cleanup merged (base=${baseBranch}${archiveLabel})\n`);
+            output.line(`cleanup merged (base=${baseBranch}${archiveLabel})`);
             if (sortedCandidates.length === 0) {
-                process.stdout.write("no candidates\n");
+                output.line("no candidates");
                 return 0;
             }
             for (const item of sortedCandidates) {
-                process.stdout.write(`- ${item.taskId}: branch=${item.branch} worktree=${item.worktreePath ?? "-"}\n`);
+                output.line(`- ${item.taskId}: branch=${item.branch} worktree=${item.worktreePath ?? "-"}`);
             }
         }
         if (!opts.yes) {
             if (!opts.quiet) {
-                process.stdout.write("Re-run with --yes to delete these branches/worktrees.\n");
+                output.line("Re-run with --yes to delete these branches/worktrees.");
             }
             return 0;
         }
@@ -129,7 +130,7 @@ export async function cmdCleanupMerged(opts) {
             });
         }
         if (!opts.quiet) {
-            process.stdout.write(`${successMessage("cleanup merged", undefined, `deleted=${candidates.length}`)}\n`);
+            output.success("cleanup merged", undefined, `deleted=${candidates.length}`);
         }
         return 0;
     }

package/dist/commands/branch/remove.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/remove.ts"],"names":[],"mappings":"AAYA,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoElB"}
+{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/remove.ts"],"names":[],"mappings":"AAYA,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqElB"}

package/dist/commands/branch/remove.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { loadConfig, resolveProject } from "@agentplaneorg/core";
 import { mapCoreError } from "../../cli/error-map.js";
-import { successMessage, unknownEntityMessage } from "../../cli/output.js";
+import { createCliEmitter, unknownEntityMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { ensureActionApproved } from "../shared/approval-requirements.js";
 import { execFileAsync, gitEnv } from "../shared/git.js";
@@ -10,6 +10,7 @@ import { isPathWithin, resolvePathFallback } from "../shared/path.js";
 export async function cmdBranchRemove(opts) {
     const branch = (opts.branch ?? "").trim();
     const worktree = (opts.worktree ?? "").trim();
+    const output = createCliEmitter();
     if (!branch && !worktree) {
         throw new CliError({
             exitCode: 2,
@@ -45,7 +46,7 @@ export async function cmdBranchRemove(opts) {
             }
             await execFileAsync("git", ["worktree", "remove", ...(opts.force ? ["--force"] : []), worktreePath], { cwd: resolved.gitRoot, env: gitEnv() });
             if (!opts.quiet) {
-                process.stdout.write(`${successMessage("removed worktree", worktreePath)}\n`);
+                output.success("removed worktree", worktreePath);
             }
         }
         if (branch) {
@@ -61,7 +62,7 @@ export async function cmdBranchRemove(opts) {
                 env: gitEnv(),
             });
             if (!opts.quiet) {
-                process.stdout.write(`${successMessage("removed branch", branch)}\n`);
+                output.success("removed branch", branch);
             }
         }
         return 0;

package/dist/commands/branch/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/status.ts"],"names":[],"mappings":"AAUA,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CA0DlB"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/branch/status.ts"],"names":[],"mappings":"AAWA,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CA0DlB"}

package/dist/commands/branch/status.js

@@ -1,11 +1,12 @@
 import { loadConfig, resolveBaseBranch, resolveProject } from "@agentplaneorg/core";
 import { mapCoreError } from "../../cli/error-map.js";
 import { exitCodeForError } from "../../cli/exit-codes.js";
-import { unknownEntityMessage } from "../../cli/output.js";
+import { createCliEmitter, unknownEntityMessage } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { gitAheadBehind } from "../shared/git-diff.js";
 import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
 import { findWorktreeForBranch, parseTaskIdFromBranch } from "../shared/git-worktree.js";
+const output = createCliEmitter();
 export async function cmdBranchStatus(opts) {
     try {
         const resolved = await resolveProject({
@@ -51,9 +52,9 @@ export async function cmdBranchStatus(opts) {
         const taskId = parseTaskIdFromBranch(loaded.config.branch.task_prefix, branch);
         const worktree = await findWorktreeForBranch(resolved.gitRoot, branch);
         const { ahead, behind } = await gitAheadBehind(resolved.gitRoot, base, branch);
-        process.stdout.write(`branch=${branch} base=${base} ahead=${ahead} behind=${behind} task_id=${taskId ?? "-"}\n`);
+        output.line(`branch=${branch} base=${base} ahead=${ahead} behind=${behind} task_id=${taskId ?? "-"}`);
         if (worktree) {
-            process.stdout.write(`worktree=${worktree}\n`);
+            output.line(`worktree=${worktree}`);
         }
         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":"AAaA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,2BAA2B,CAAC;AAuFnC,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,CAkJlB"}
+{"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;AAiInC,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,CAqJlB"}

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

@@ -1,13 +1,15 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { copyFile, mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { resolveBaseBranch } from "@agentplaneorg/core";
+import { LocalBackend } from "../../backends/task-backend.js";
 import { mapBackendError } from "../../cli/error-map.js";
 import { fileExists } from "../../cli/fs-utils.js";
 import { exitCodeForError } from "../../cli/exit-codes.js";
-import { successMessage } from "../../cli/output.js";
+import { createCliEmitter } from "../../cli/output.js";
 import { CliError } from "../../shared/errors.js";
 import { execFileAsync, gitEnv } from "../shared/git.js";
-import { gitBranchExists, gitCurrentBranch } from "../shared/git-ops.js";
+import { gitAheadBehind } from "../shared/git-diff.js";
+import { gitBranchExists, gitBranchUpstream, gitCurrentBranch } from "../shared/git-ops.js";
 import { isPathWithin } from "../shared/path.js";
 import { loadBackendTask, loadCommandContext, } from "../shared/task-backend.js";
 import { ensurePlanApprovedIfRequired } from "../task/shared.js";
@@ -40,6 +42,26 @@ async function writeDirectWorkLock(agentplaneDir, lock) {
     await mkdir(dir, { recursive: true });
     await writeFile(directWorkLockPath(agentplaneDir), JSON.stringify(lock, null, 2) + "\n", "utf8");
 }
+async function materializeLocalBackendReadmesForWorktree(opts) {
+    if (!(opts.backend instanceof LocalBackend))
+        return;
+    const sourceRoot = path.resolve(opts.backend.root);
+    if (!isPathWithin(opts.repoRoot, sourceRoot))
+        return;
+    const relativeRoot = path.relative(opts.repoRoot, sourceRoot);
+    const targetRoot = path.join(opts.worktreePath, relativeRoot);
+    const entries = await readdir(sourceRoot, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+        if (!entry.isDirectory())
+            continue;
+        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);
+    }
+}
 async function ensureGitClean(gitRoot) {
     const { stdout } = await execFileAsync("git", ["status", "--porcelain"], {
         cwd: gitRoot,
@@ -82,8 +104,23 @@ async function ensureGitClean(gitRoot) {
         message: "Working tree has non-task changes. In workflow_mode=direct, agentplane runs tasks in a single stream on the current branch; commit/stash your changes before starting a different task.",
     });
 }
+async function ensureCurrentBaseBranch(gitRoot, baseBranch) {
+    const upstreamBranch = await gitBranchUpstream(gitRoot, baseBranch);
+    if (!upstreamBranch)
+        return;
+    const { behind } = await gitAheadBehind(gitRoot, upstreamBranch, baseBranch);
+    if (behind === 0)
+        return;
+    throw new CliError({
+        exitCode: exitCodeForError("E_GIT"),
+        code: "E_GIT",
+        message: `Base branch ${baseBranch} is behind its upstream ${upstreamBranch} by ${behind} commit(s). ` +
+            "Refresh the base branch before `agentplane work start` to avoid DIRTY hosted PRs.",
+    });
+}
 export async function cmdWorkStart(opts) {
     try {
+        const output = createCliEmitter();
         validateWorkAgent(opts.agent);
         validateWorkSlug(opts.slug);
         const ctx = opts.ctx ??
@@ -132,7 +169,7 @@ export async function cmdWorkStart(opts) {
                 branch: currentBranch,
                 started_at: new Date().toISOString(),
             });
-            process.stdout.write(`${successMessage("work start", opts.taskId, `mode=direct branch=${currentBranch}`)}\n`);
+            output.success("work start", opts.taskId, `mode=direct branch=${currentBranch}`);
             return 0;
         }
         let baseRef = currentBranch;
@@ -157,6 +194,7 @@ export async function cmdWorkStart(opts) {
                     message: `work start must be run on base branch ${baseBranch} (current: ${currentBranch})`,
                 });
             }
+            await ensureCurrentBaseBranch(resolved.gitRoot, baseBranch);
             baseRef = baseBranch;
         }
         const prefix = config.branch.task_prefix;
@@ -185,6 +223,11 @@ export async function cmdWorkStart(opts) {
                 ? ["worktree", "add", worktreePath, branchName]
                 : ["worktree", "add", "-b", branchName, worktreePath, baseRef];
             await execFileAsync("git", worktreeArgs, { cwd: resolved.gitRoot, env: gitEnv() });
+            await materializeLocalBackendReadmesForWorktree({
+                backend: ctx.taskBackend,
+                repoRoot: resolved.gitRoot,
+                worktreePath,
+            });
         }
         else {
             if (branchExists) {
@@ -202,7 +245,7 @@ export async function cmdWorkStart(opts) {
                 });
             }
         }
-        process.stdout.write(`${successMessage("work start", branchName, opts.worktree ? `worktree=${path.relative(resolved.gitRoot, worktreePath)}` : "")}\n`);
+        output.success("work start", branchName, opts.worktree ? `worktree=${path.relative(resolved.gitRoot, worktreePath)}` : "");
         return 0;
     }
     catch (err) {

package/dist/commands/cleanup/merged.command.d.ts

@@ -1,8 +1,7 @@
 import type { CommandCtx, CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
+import { type GroupCommandParsed } from "../../cli/group-command.js";
 import type { CommandContext } from "../shared/task-backend.js";
-type CleanupGroupParsed = {
-    cmd: string[];
-};
+type CleanupGroupParsed = GroupCommandParsed;
 export declare const cleanupSpec: CommandSpec<CleanupGroupParsed>;
 export type CleanupMergedParsed = {
     base: string | null;

package/dist/commands/cleanup/merged.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merged.command.d.ts","sourceRoot":"","sources":["../../../src/commands/cleanup/merged.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,KAAK,kBAAkB,GAAG;IAAE,GAAG,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5C,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,kBAAkB,CAUvD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CAkC9D,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAczD,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC5E,KAAK,UAAU,EAAE,GAAG,mBAAmB,KAAG,OAAO,CAAC,MAAM,CAAC,CAWxE"}
+{"version":3,"file":"merged.command.d.ts","sourceRoot":"","sources":["../../../src/commands/cleanup/merged.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAIhE,KAAK,kBAAkB,GAAG,kBAAkB,CAAC;AAE7C,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,kBAAkB,CAUvD,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,mBAAmB,CAkC9D,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAQzD,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,IAC5E,KAAK,UAAU,EAAE,GAAG,mBAAmB,KAAG,OAAO,CAAC,MAAM,CAAC,CAWxE"}

package/dist/commands/cleanup/merged.command.js

@@ -1,5 +1,5 @@
+import { loadDirectSubcommandNames, parseGroupCommand, throwGroupCommandUsage, } from "../../cli/group-command.js";
 import { usageError } from "../../cli/spec/errors.js";
-import { suggestOne } from "../../cli/spec/suggest.js";
 import { cmdCleanupMerged } from "../branch/index.js";
 export const cleanupSpec = {
     id: ["cleanup"],
@@ -10,7 +10,7 @@ export const cleanupSpec = {
     examples: [
         { cmd: "agentplane cleanup merged --yes", why: "Delete merged task branches/worktrees." },
     ],
-    parse: (raw) => ({ cmd: (raw.args.cmd ?? []) }),
+    parse: (raw) => parseGroupCommand(raw),
 };
 export const cleanupMergedSpec = {
     id: ["cleanup", "merged"],
@@ -47,18 +47,14 @@ export const cleanupMergedSpec = {
         quiet: raw.opts.quiet === true,
     }),
 };
-export const runCleanup = (_ctx, p) => {
-    const input = p.cmd.join(" ");
-    const candidates = ["merged"];
-    const suggestion = suggestOne(input, candidates);
-    const suffix = suggestion ? ` Did you mean: ${suggestion}?` : "";
-    const msg = p.cmd.length === 0 ? "Missing subcommand." : `Unknown subcommand: ${p.cmd[0]}.`;
-    return Promise.reject(usageError({
+export const runCleanup = async (_ctx, p) => {
+    throwGroupCommandUsage({
         spec: cleanupSpec,
+        cmd: p.cmd,
+        subcommands: await loadDirectSubcommandNames(["cleanup"]),
         command: "cleanup",
-        message: `${msg}${suffix}`,
-        context: { command: "cleanup" },
-    }));
+        contextCommand: "cleanup",
+    });
 };
 export function makeRunCleanupMergedHandler(getCtx) {
     return async (ctx, p) => {

package/dist/commands/docs/cli.command.js

@@ -7,7 +7,7 @@ import { writeTextIfChanged } from "../../shared/write-if-changed.js";
 export const docsCliSpec = {
     id: ["docs", "cli"],
     group: "Docs",
-    summary: "Generate an MDX CLI reference from the current cli2 registry/spec.",
+    summary: "Generate an MDX CLI reference from the current command spec catalog.",
     options: [
         {
             kind: "string",
@@ -35,7 +35,7 @@ export function makeRunDocsCliHandler(getHelpJson) {
             throw usageError({
                 spec: docsCliSpec,
                 command: "docs cli",
-                message: `Failed to read cli2 registry/spec for docs generation: ${err instanceof Error ? err.message : String(err)}`,
+                message: `Failed to read command specs for docs generation: ${err instanceof Error ? err.message : String(err)}`,
             });
         }
         const mdx = renderCliDocsMdx(list);

package/dist/commands/doctor/runtime.js

@@ -22,7 +22,7 @@ export function checkRuntimeSourceFacts(cwd, config) {
     }
     const warning = report.mode === "global-in-framework"
         ? "[WARN] Framework checkout detected but the active runtime is still a global installed binary. " +
-            "Run scripts/reinstall-global-agentplane.sh to refresh the wrapper, or run the repo-local binary directly."
+            "Run bun run framework:dev:bootstrap first so the wrapper can hand off to a built repo-local runtime."
         : report.mode === "global-forced-in-framework"
             ? "[WARN] Framework checkout is forcing the global installed binary via AGENTPLANE_USE_GLOBAL_IN_FRAMEWORK=1. Unset it unless that override is intentional."
             : null;

package/dist/commands/doctor/workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../../src/commands/doctor/workflow.ts"],"names":[],"mappings":"AAUA,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAU/E;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAiD7C"}
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../../src/commands/doctor/workflow.ts"],"names":[],"mappings":"AAWA,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAU/E;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAyD7C"}

package/dist/commands/doctor/workflow.js

@@ -1,5 +1,6 @@
 import fs from "node:fs/promises";
 import path from "node:path";
+import { loadConfig } from "@agentplaneorg/core";
 import { emitWorkflowEvent, resolveWorkflowPaths, safeAutofixWorkflowText, validateWorkflowAtPath, } from "../../workflow-runtime/index.js";
 export async function checkWorkflowContract(repoRoot) {
     const result = await validateWorkflowAtPath(repoRoot);
@@ -26,7 +27,15 @@ export async function safeFixWorkflow(repoRoot) {
             return { changed: false, note: "Skip: workflow contract file not found." };
         }
     }
-    const fixed = safeAutofixWorkflowText(current);
+    const loaded = await loadConfig(path.join(repoRoot, ".agentplane"));
+    const fixed = safeAutofixWorkflowText(current, {
+        mode: loaded.config.workflow_mode,
+        approvals: {
+            require_plan: loaded.config.agents?.approvals?.require_plan ?? true,
+            require_verify: loaded.config.agents?.approvals?.require_verify ?? true,
+            require_network: loaded.config.agents?.approvals?.require_network ?? true,
+        },
+    });
     if (fixed.diagnostics.some((d) => d.code === "WF_FIX_SKIPPED_UNSAFE")) {
         const details = fixed.diagnostics.map((d) => `${d.path}`).join(", ");
         return {

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

@@ -1 +1 @@
-{"version":3,"file":"finish.spec.d.ts","sourceRoot":"","sources":["../../src/commands/finish.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AASvD,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,YAAY,CA6ThD,CAAC"}
+{"version":3,"file":"finish.spec.d.ts","sourceRoot":"","sources":["../../src/commands/finish.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AASvD,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,YAAY,CAqUhD,CAAC"}

package/dist/commands/finish.spec.js

@@ -213,6 +213,13 @@ export const finishSpec = {
                 message: "--commit-from-comment/--status-commit requires exactly one task id",
             });
         }
+        if (commitFromComment && statusCommit) {
+            throw usageError({
+                spec: finishSpec,
+                command: "finish",
+                message: "--commit-from-comment cannot be combined with --status-commit in finish; use one deterministic commit path.",
+            });
+        }
         if (commitFromComment && commitAllow.length === 0) {
             throw usageError({
                 spec: finishSpec,

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

@@ -1,5 +1,5 @@
 import type { CommandHandler, CommandSpec } from "../../cli/spec/spec.js";
-export type GuardGroupParsed = Record<string, never>;
-export declare const guardSpec: CommandSpec<GuardGroupParsed>;
-export declare const runGuard: CommandHandler<GuardGroupParsed>;
+import { type GroupCommandParsed } from "../../cli/group-command.js";
+export declare const guardSpec: CommandSpec<GroupCommandParsed>;
+export declare const runGuard: CommandHandler<GroupCommandParsed>;
 //# sourceMappingURL=guard.command.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"guard.command.d.ts","sourceRoot":"","sources":["../../../src/commands/guard/guard.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1E,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAErD,eAAO,MAAM,SAAS,EAAE,WAAW,CAAC,gBAAgB,CAenD,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,gBAAgB,CAGrD,CAAC"}
+{"version":3,"file":"guard.command.d.ts","sourceRoot":"","sources":["../../../src/commands/guard/guard.command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,SAAS,EAAE,WAAW,CAAC,kBAAkB,CAOrD,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,kBAAkB,CAMvD,CAAC"}

package/dist/commands/guard/guard.command.js

@@ -1,21 +1,16 @@
-import { usageError } from "../../cli/spec/errors.js";
+import { loadDirectSubcommandNames, parseGroupCommand, throwGroupCommandUsage, } from "../../cli/group-command.js";
 export const guardSpec = {
     id: ["guard"],
     group: "Guard",
     summary: "Guard commands (commit checks, git hygiene, and allowlist helpers).",
     synopsis: ["agentplane guard <command> [args] [options]"],
-    validateRaw: (raw) => {
-        if (raw.extra.length > 0) {
-            throw usageError({
-                spec: guardSpec,
-                message: `Unknown subcommand: ${raw.extra[0]}`,
-            });
-        }
-        throw usageError({ spec: guardSpec, message: "Missing subcommand." });
-    },
-    parse: () => ({}),
+    args: [{ name: "cmd", required: false, variadic: true, valueHint: "<command>" }],
+    parse: (raw) => parseGroupCommand(raw),
 };
-export const runGuard = () => {
-    // Unreachable (validateRaw always throws).
-    return Promise.resolve(2);
+export const runGuard = async (_ctx, p) => {
+    throwGroupCommandUsage({
+        spec: guardSpec,
+        cmd: p.cmd,
+        subcommands: await loadDirectSubcommandNames(["guard"]),
+    });
 };

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

@@ -15,6 +15,7 @@ export declare function cmdCommit(opts: {
     ctx?: CommandContext;
     cwd: string;
     rootOverride?: string;
+    baseBranchOverride?: string | null;
     taskId: string;
     message: string;
     close: boolean;
@@ -30,5 +31,6 @@ export declare function cmdCommit(opts: {
     quiet: boolean;
     closeUnstageOthers: boolean;
     closeCheckOnly: boolean;
+    closeStageTaskArtifacts?: 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":"AAKA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAQvF,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAuMxE,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,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;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuMlB"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../src/commands/guard/impl/commands.ts"],"names":[],"mappings":"AASA,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,CAuNlB"}