@difflab/pi 0.3.0-rc.202609201610.cddc7d6 → 0.3.0-rc.202609201751.b819639

package/agents/diffpi-orchestrator.md

@@ -18,6 +18,7 @@ Work only as an execution orchestrator through the pi-subagents tools. Optimize
 - Choose the best available agent and model for each task. Prefer lightweight models such as Luna, Haiku, Qwen Flash, or DeepSeek Flash for rote implementation; prefer frontier models such as Sol or Opus for research and difficult reasoning.
 - Use background agents by default, collect every required result, and steer running agents when priorities change.
 - Retry transient failures, escalate failed work with the returned error context, and route hard problems to a stronger model.
+- Never label work as a follow-up or defer a relevant requested change unless the user explicitly asks for deferral or a required decision is genuinely blocked. Apply relevant fixes in the current workflow.
 - Keep conflicting edits and integration work serialized.
 - For `auto` and `address`, delegate coordination to the `reviewer` agent. The reviewer owns review judgment and thread classification, then delegates non-overlapping bounded edits to lightweight `worker` agents.
 - Do not bypass the reviewer by launching Sol workers directly. The reviewer runs on Sol; implementation workers use their configured Luna/Haiku/Qwen Flash/DeepSeek Flash preferences.

package/agents/diffpi-reviewer.md

@@ -14,7 +14,7 @@ metadata:
 
 You review code changes. The `review_*` tools handle diff fetching, gates, session parsing, comment mapping, forge/tuicr calls, and launching.
 
-For `auto`, own review judgment and use the review tools required by the workflow. For `address`, act as the review coordinator: classify threads, form non-overlapping bounded implementation tasks, delegate routine edits to `worker`, collect verification and outcomes, then call `review_respond` for every thread. Do not publish, complete, or merge.
+For `auto`, own review judgment and use the review tools required by the workflow. For `address`, act as the review coordinator: classify threads, form non-overlapping bounded implementation tasks, delegate routine edits to `worker`, collect verification and outcomes, then call `review_respond` for every thread. Do not publish, complete, or merge. Read `skills/review/references/review-standards.md` before classifying threads.
 
 ## Rules
 
@@ -22,6 +22,7 @@ For `auto`, own review judgment and use the review tools required by the workflo
 - Prefer `review_*` and forge/tuicr MCP tools. Do not reimplement their mechanics or shell out to `gh`, `glab`, or `tuicr`.
 - Ground every finding in a real file and line from `review_diff`.
 - Be thorough in what you catch and terse in what you write: name the problem, then the ask. No hype or diff restatement.
+- Never call a relevant requested change a follow-up. Apply it now unless the user explicitly defers it or a real user decision blocks it.
 
 ## Judge
 

package/dist/cli/plan.d.ts

@@ -1,7 +1,9 @@
+import { Command } from 'commander';
 export interface PlanCliIO {
     stdout: Pick<NodeJS.WriteStream, 'write'>;
     stderr: Pick<NodeJS.WriteStream, 'write'>;
 }
+export declare function createPlanCliCommand(io?: PlanCliIO): Command;
 export declare function runPlanCli(args: string[], io?: PlanCliIO): Promise<number>;
 export declare function planCliHelp(): string;
 //# sourceMappingURL=plan.d.ts.map

package/dist/cli/plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/cli/plan.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CAC3C;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAE,SAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqBzF;AAED,wBAAgB,WAAW,IAAI,MAAM,CAEpC"}
+{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/cli/plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,WAAW,CAAC;AAKpD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;CAC3C;AAED,wBAAgB,oBAAoB,CAAC,EAAE,GAAE,SAAmB,GAAG,OAAO,CAcrE;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAE,SAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CASzF;AAED,wBAAgB,WAAW,IAAI,MAAM,CAEpC"}

package/dist/cli.d.ts

@@ -1,3 +1,4 @@
 #!/usr/bin/env node
-export declare function main(argv?: string[]): Promise<number>;
+import { type PlanCliIO } from './cli/plan';
+export declare function main(argv?: string[], io?: PlanCliIO): Promise<number>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAIA,wBAAsB,IAAI,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAElE,wBAAsB,IAAI,CAAC,IAAI,WAAwB,EAAE,EAAE,GAAE,SAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBjG"}

package/dist/cli.js

@@ -1,6 +1,37 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
+var __create = Object.create;
+var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
+var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
+  target = mod != null ? __create(__getProtoOf(mod)) : {};
+  const to = isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  if (mod && typeof mod === "object" || typeof mod === "function") {
+    for (let key of __getOwnPropNames(mod))
+      if (!__hasOwnProp.call(to, key))
+        __defProp(to, key, {
+          get: __accessProp.bind(mod, key),
+          enumerable: true
+        });
+  }
+  if (canCache)
+    cache.set(mod, to);
+  return to;
+};
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __exportCjs = (target, getters, setters) => {
   for (var name in getters)
@@ -2086,8 +2117,60 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.useColor = useColor;
 });
 
-// src/cli.ts
-import { pathToFileURL } from "node:url";
+// ../../node_modules/mdast-builder/lib/src/index.js
+var require_src = __commonJS(function(exports) {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  function normalizeChildren(children) {
+    if (Array.isArray(children)) {
+      return children;
+    } else if (typeof children === "function") {
+      const res = children();
+      return normalizeChildren(res);
+    } else if (typeof children === "undefined") {
+      return [];
+    } else {
+      return [children];
+    }
+  }
+  var valueNode = (type, value) => ({
+    type,
+    value
+  });
+  var nodeWithChildren = (type, kids) => ({
+    type,
+    children: normalizeChildren(kids)
+  });
+  exports.text = (value) => valueNode("text", value);
+  exports.inlineCode = (value) => valueNode("inlineCode", value);
+  exports.html = (value) => valueNode("html", value);
+  exports.strong = (kids) => nodeWithChildren("strong", kids);
+  exports.emphasis = (kids) => nodeWithChildren("emphasis", kids);
+  exports.strike = (kids) => nodeWithChildren("delete", kids);
+  exports.tableCell = (kids) => nodeWithChildren("tableCell", kids);
+  exports.tableRow = (kids) => nodeWithChildren("tableRow", kids);
+  exports.table = (align, kids) => Object.assign({}, nodeWithChildren("table", kids), { align });
+  exports.brk = Object.freeze({ type: "break" });
+  exports.separator = exports.text("---");
+  exports.link = (url, title = "", kids) => Object.assign({}, nodeWithChildren("link", kids), {
+    url,
+    title
+  });
+  exports.root = (kids) => nodeWithChildren("root", kids);
+  exports.rootWithTitle = (depth, title, kids) => {
+    return exports.root([exports.heading(depth, title), ...normalizeChildren(kids)]);
+  };
+  exports.paragraph = (kids) => nodeWithChildren("paragraph", kids);
+  exports.image = (url, title, alt, kids) => Object.assign({}, nodeWithChildren("image", kids), { url, title, alt });
+  exports.blockquote = (kids) => nodeWithChildren("blockquote", kids);
+  exports.code = (lang, value) => Object.assign({}, valueNode("code", value), { lang });
+  exports.heading = (depth, kids) => {
+    if (depth < 1)
+      throw new Error(`Invalid depth: ${depth}`);
+    return Object.assign({}, nodeWithChildren("heading", kids), { depth });
+  };
+  exports.list = (ordered, kids) => Object.assign({}, nodeWithChildren("list", kids), { ordered: ordered === "ordered" });
+  exports.listItem = (kids) => nodeWithChildren("listItem", kids);
+});
 
 // ../../node_modules/commander/index.js
 var exports_commander = {};
@@ -2148,6 +2231,9 @@ var {
   Help: Help2
 } = exports_commander;
 
+// src/cli.ts
+import { pathToFileURL } from "node:url";
+
 // src/cli/plan.ts
 import { resolve as resolve4 } from "node:path";
 
@@ -2368,18 +2454,6 @@ async function atomicJson(path, value) {
 function integer(value) {
   return typeof value === "number" && Number.isInteger(value) ? value : undefined;
 }
-// src/plan/escalation.ts
-import { z } from "zod";
-var escalationSchema = z.object({
-  planId: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
-  executionId: z.string().min(1),
-  phaseId: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
-  taskId: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/).optional(),
-  blocker: z.string().min(1),
-  attempts: z.array(z.string()),
-  evidence: z.array(z.string()),
-  needsUserDecision: z.boolean()
-}).strict();
 // src/plan/transitions.ts
 var STABLE_ID = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 function isStableId(value) {
@@ -2399,7 +2473,124 @@ function assertUniqueIds(ids, label) {
   }
 }
 
+// src/plan/store.ts
+import { open, mkdir as mkdir3, readdir, readFile as readFile3, realpath as realpath3, rename as rename2, rm as rm2 } from "node:fs/promises";
+import { basename as basename3, dirname as dirname3, join as join5, resolve as resolve3, sep } from "node:path";
+
+// src/store.ts
+import { createHash } from "node:crypto";
+import { lstat, mkdir as mkdir2, readlink, realpath as realpath2, symlink, unlink } from "node:fs/promises";
+import { homedir } from "node:os";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join4, resolve as resolve2 } from "node:path";
+
+// src/extensions/gitx.ts
+import { realpath } from "node:fs/promises";
+import { basename as basename2, isAbsolute, join as join3, resolve } from "node:path";
+async function gitToplevel(cwd) {
+  const result = await run("git", ["-C", cwd, "rev-parse", "--show-toplevel"]);
+  const top = result.stdout.trim();
+  return result.code === 0 && top ? top : resolve(cwd);
+}
+async function inspectGitRepository(cwd) {
+  const root = await gitToplevel(cwd);
+  const remoteResult = await run("git", ["-C", root, "remote", "get-url", "origin"]);
+  const remote = remoteResult.code === 0 ? remoteResult.stdout.trim() : "";
+  const commonResult = await run("git", ["-C", root, "rev-parse", "--git-common-dir"]);
+  const common = commonResult.stdout.trim();
+  const commonPath = commonResult.code === 0 && common ? resolve(isAbsolute(common) ? common : join3(root, common)) : root;
+  const commonDir = await canonicalPath(commonPath);
+  return {
+    root,
+    commonDir,
+    ...remote ? { remote } : {},
+    name: remote ? repositoryName(remote) : basename2(resolve(commonDir, "..")) || basename2(root),
+    identity: remote ? `remote:${normalizeRemote(remote)}` : `git-common-dir:${commonDir}`
+  };
+}
+function normalizeRemote(remote) {
+  return remote.trim().replace(/\.git\/?$/i, "").replace(/\/+$/, "").toLowerCase();
+}
+function repositoryName(remote) {
+  const normalized = remote.trim().replace(/\.git\/?$/i, "").replace(/\/+$/, "");
+  return normalized.split(/[/\\:]/).filter(Boolean).at(-1) ?? "";
+}
+async function canonicalPath(path) {
+  try {
+    return await realpath(path);
+  } catch {
+    return resolve(path);
+  }
+}
+
+// src/store.ts
+var STORE_LINK = ".diffpi";
+var LEGACY_STORE_LINK = join4(".pi", "diffpi");
+function storeGlobalRoot(homeDir = homedir()) {
+  return join4(homeDir, ".difflab", "diffpi", "projects");
+}
+async function ensureStore(cwd, homeDir = homedir()) {
+  const repository = await inspectGitRepository(cwd);
+  const root = repository.root;
+  const slug = projectSlug(repository);
+  const dest = join4(storeGlobalRoot(homeDir), slug);
+  const link = join4(root, STORE_LINK);
+  await mkdir2(dest, { recursive: true });
+  try {
+    await assertStoreLink(link, dest);
+  } catch (error) {
+    if (error.code !== "ENOENT")
+      throw error;
+    await symlink(dest, link);
+  }
+  await removeLegacyStoreLink(join4(root, LEGACY_STORE_LINK), dest);
+  return { slug, root, dest, link, linked: true };
+}
+async function plansDir(cwd, homeDir = homedir()) {
+  const store = await ensureStore(cwd, homeDir);
+  const dir = join4(store.link, "plan");
+  await mkdir2(dir, { recursive: true });
+  return dir;
+}
+async function assertStoreLink(path, dest) {
+  const entry = await lstat(path);
+  if (!entry.isSymbolicLink())
+    throw new Error(`${path} exists and is not a symlink.`);
+  const target = await symlinkTarget(path);
+  if (target !== await canonicalPath2(dest))
+    throw new Error(`${path} points to ${target}, not ${dest}.`);
+}
+async function removeLegacyStoreLink(path, dest) {
+  try {
+    const entry = await lstat(path);
+    if (!entry.isSymbolicLink())
+      return;
+    const target = await symlinkTarget(path);
+    if (target === await canonicalPath2(dest))
+      await unlink(path);
+  } catch (error) {
+    if (error.code !== "ENOENT")
+      throw error;
+  }
+}
+async function symlinkTarget(path) {
+  const target = await readlink(path);
+  return canonicalPath2(isAbsolute2(target) ? target : resolve2(dirname2(path), target));
+}
+async function canonicalPath2(path) {
+  try {
+    return await realpath2(path);
+  } catch {
+    return resolve2(path);
+  }
+}
+function projectSlug(repository) {
+  const readable = repository.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "unnamed";
+  const digest = createHash("sha256").update(repository.identity).digest("hex").slice(0, 12);
+  return `${readable}-${digest}`;
+}
+
 // src/plan/markdown.ts
+var import_mdast_builder = __toESM(require_src(), 1);
 var PLAN_MARKER = /<!-- diffpi-plan: (\{[^\n]+\}) -->/;
 var PHASE_MARKER = /<!-- diffpi-phase: (\{[^\n]+\}) -->/g;
 var TASK_MARKER = /<!-- diffpi-task: (\{[^\n]+\}) -->/g;
@@ -2618,121 +2809,6 @@ function parseMarker(value, label) {
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-// src/plan/store.ts
-import { open, mkdir as mkdir3, readdir, readFile as readFile3, realpath as realpath3, rename as rename2, rm as rm2 } from "node:fs/promises";
-import { basename as basename3, dirname as dirname3, join as join5, resolve as resolve3, sep } from "node:path";
-
-// src/store.ts
-import { createHash } from "node:crypto";
-import { lstat, mkdir as mkdir2, readlink, realpath as realpath2, symlink, unlink } from "node:fs/promises";
-import { homedir } from "node:os";
-import { dirname as dirname2, isAbsolute as isAbsolute2, join as join4, resolve as resolve2 } from "node:path";
-
-// src/extensions/gitx.ts
-import { realpath } from "node:fs/promises";
-import { basename as basename2, isAbsolute, join as join3, resolve } from "node:path";
-async function gitToplevel(cwd) {
-  const result = await run("git", ["-C", cwd, "rev-parse", "--show-toplevel"]);
-  const top = result.stdout.trim();
-  return result.code === 0 && top ? top : resolve(cwd);
-}
-async function inspectGitRepository(cwd) {
-  const root = await gitToplevel(cwd);
-  const remoteResult = await run("git", ["-C", root, "remote", "get-url", "origin"]);
-  const remote = remoteResult.code === 0 ? remoteResult.stdout.trim() : "";
-  const commonResult = await run("git", ["-C", root, "rev-parse", "--git-common-dir"]);
-  const common = commonResult.stdout.trim();
-  const commonPath = commonResult.code === 0 && common ? resolve(isAbsolute(common) ? common : join3(root, common)) : root;
-  const commonDir = await canonicalPath(commonPath);
-  return {
-    root,
-    commonDir,
-    ...remote ? { remote } : {},
-    name: remote ? repositoryName(remote) : basename2(resolve(commonDir, "..")) || basename2(root),
-    identity: remote ? `remote:${normalizeRemote(remote)}` : `git-common-dir:${commonDir}`
-  };
-}
-function normalizeRemote(remote) {
-  return remote.trim().replace(/\.git\/?$/i, "").replace(/\/+$/, "").toLowerCase();
-}
-function repositoryName(remote) {
-  const normalized = remote.trim().replace(/\.git\/?$/i, "").replace(/\/+$/, "");
-  return normalized.split(/[/\\:]/).filter(Boolean).at(-1) ?? "";
-}
-async function canonicalPath(path) {
-  try {
-    return await realpath(path);
-  } catch {
-    return resolve(path);
-  }
-}
-
-// src/store.ts
-var STORE_LINK = ".diffpi";
-var LEGACY_STORE_LINK = join4(".pi", "diffpi");
-function storeGlobalRoot(homeDir = homedir()) {
-  return join4(homeDir, ".difflab", "diffpi", "projects");
-}
-async function ensureStore(cwd, homeDir = homedir()) {
-  const repository = await inspectGitRepository(cwd);
-  const root = repository.root;
-  const slug = projectSlug(repository);
-  const dest = join4(storeGlobalRoot(homeDir), slug);
-  const link = join4(root, STORE_LINK);
-  await mkdir2(dest, { recursive: true });
-  try {
-    await assertStoreLink(link, dest);
-  } catch (error) {
-    if (error.code !== "ENOENT")
-      throw error;
-    await symlink(dest, link);
-  }
-  await removeLegacyStoreLink(join4(root, LEGACY_STORE_LINK), dest);
-  return { slug, root, dest, link, linked: true };
-}
-async function plansDir(cwd, homeDir = homedir()) {
-  const store = await ensureStore(cwd, homeDir);
-  const dir = join4(store.link, "plan");
-  await mkdir2(dir, { recursive: true });
-  return dir;
-}
-async function assertStoreLink(path, dest) {
-  const entry = await lstat(path);
-  if (!entry.isSymbolicLink())
-    throw new Error(`${path} exists and is not a symlink.`);
-  const target = await symlinkTarget(path);
-  if (target !== await canonicalPath2(dest))
-    throw new Error(`${path} points to ${target}, not ${dest}.`);
-}
-async function removeLegacyStoreLink(path, dest) {
-  try {
-    const entry = await lstat(path);
-    if (!entry.isSymbolicLink())
-      return;
-    const target = await symlinkTarget(path);
-    if (target === await canonicalPath2(dest))
-      await unlink(path);
-  } catch (error) {
-    if (error.code !== "ENOENT")
-      throw error;
-  }
-}
-async function symlinkTarget(path) {
-  const target = await readlink(path);
-  return canonicalPath2(isAbsolute2(target) ? target : resolve2(dirname2(path), target));
-}
-async function canonicalPath2(path) {
-  try {
-    return await realpath2(path);
-  } catch {
-    return resolve2(path);
-  }
-}
-function projectSlug(repository) {
-  const readable = repository.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "unnamed";
-  const digest = createHash("sha256").update(repository.identity).digest("hex").slice(0, 12);
-  return `${readable}-${digest}`;
-}
 
 // src/plan/store.ts
 async function resolvePlan(cwd, query, filters = {}, options = {}) {
@@ -2767,7 +2843,15 @@ async function readRecord(dir) {
   const logPath = join5(dir, "logs.txt");
   const source = await readFile3(planPath, "utf8");
   const document = parsePlanDocument(source, planPath);
-  return { id: basename3(dir), dir, planPath, logPath, document, source };
+  return {
+    id: basename3(dir),
+    dir,
+    planPath,
+    logPath,
+    implementationDir: join5(dir, "implementation"),
+    document,
+    source
+  };
 }
 async function assertContained(root, candidate) {
   const canonicalRoot = await realpath3(root);
@@ -2790,22 +2874,27 @@ function normalizeQuery(value) {
 function stripDate(value) {
   return value.replace(/^\d{6}-/, "");
 }
+// src/plan/escalation.ts
+import { z } from "zod";
+var escalationSchema = z.object({
+  planId: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
+  executionId: z.string().min(1),
+  phaseId: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
+  taskId: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/).optional(),
+  blocker: z.string().min(1),
+  attempts: z.array(z.string()),
+  evidence: z.array(z.string()),
+  needsUserDecision: z.boolean()
+}).strict();
 // src/cli/plan.ts
-async function runPlanCli(args, io = process) {
-  const program = new Command2().name("diffpi plan").description("Plan annotation commands").showHelpAfterError().exitOverride().configureOutput({
+function createPlanCliCommand(io = process) {
+  const program = new Command2().name("plan").description("Plan annotation commands").showHelpAfterError().exitOverride().configureOutput({
     writeOut: (message) => io.stdout.write(message),
     writeErr: (message) => io.stderr.write(message)
   });
   addAnnotationCommand(program, "annotate", io);
   addAnnotationCommand(program, "annotations", io);
-  try {
-    await program.parseAsync(["node", "diffpi plan", ...args]);
-    return 0;
-  } catch (error) {
-    if (error instanceof CommanderError2)
-      return error.exitCode;
-    throw error;
-  }
+  return program;
 }
 function addAnnotationCommand(program, verb, io) {
   program.command(`${verb} [plan]`).description(verb === "annotate" ? "Open a plan in tuicr for annotation" : "Print plan annotations as JSON").option("--cwd <path>", "Repository working directory", process.cwd()).action(async (query, options) => {
@@ -2830,16 +2919,20 @@ async function resolveCliPlan(cwd, query) {
 }
 
 // src/cli.ts
-async function main(argv = process.argv.slice(2)) {
-  const [command, ...args] = argv;
-  if (command === "--help" || command === "-h" || !command) {
-    process.stdout.write(`Usage: diffpi plan <annotate|annotations> [options]
-`);
+async function main(argv = process.argv.slice(2), io = process) {
+  const program = new Command2().name("diffpi").description("Diffpi command-line tools").showHelpAfterError().exitOverride().configureOutput({
+    writeOut: (message) => io.stdout.write(message),
+    writeErr: (message) => io.stderr.write(message)
+  });
+  program.addCommand(createPlanCliCommand(io));
+  try {
+    await program.parseAsync(["node", "diffpi", ...argv]);
     return 0;
+  } catch (error) {
+    if (error instanceof CommanderError2)
+      return error.exitCode;
+    throw error;
   }
-  if (command !== "plan")
-    throw new Error(`Unknown command: ${command}.`);
-  return runPlanCli(args);
 }
 if (import.meta.url === pathToFileURL(process.argv[1] ?? "").href) {
   main().then((code) => {

package/dist/commands/background.d.ts

@@ -24,6 +24,7 @@ export interface LaunchBackgroundPiOptions {
     prompt: string;
     packetPath?: string;
 }
+/** Delegate scheduling to pi-background-tasks through its `/bg --agent` command. */
 export declare function launchBackgroundPi(pi: Pick<ExtensionAPI, 'sendUserMessage'>, options: LaunchBackgroundPiOptions): Promise<{
     name: string;
     command: string;

package/dist/commands/background.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/commands/background.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAKpE,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,EACzC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,IAAI,CAAA;CAAE,CAAC,CA0B1D;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,GAAG,WAAW,CAAC,EAC/D,MAAM,GAAE,sBAA2B,GAClC,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,WAAW,SAAK,EAChB,QAAQ,SAAY,GACnB,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBrD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAE5D"}
+{"version":3,"file":"background.d.ts","sourceRoot":"","sources":["../../src/commands/background.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAKpE,MAAM,WAAW,sBAAsB;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,oFAAoF;AACpF,wBAAsB,kBAAkB,CACtC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,EACzC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,IAAI,CAAA;CAAE,CAAC,CA0B1D;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,GAAG,WAAW,CAAC,EAC/D,MAAM,GAAE,sBAA2B,GAClC,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,SAAS,OAAO,EAAE,EAC3B,WAAW,SAAK,EAChB,QAAQ,SAAY,GACnB,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBrD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAE5D"}