@unbrained/pm-cli 2026.6.11 → 2026.6.13

package/dist/cli-bundle/chunks/{history-repair-KVPFJKOS.js → history-repair-UCYS55ZX.js}

@@ -1,32 +1,36 @@
+import {
+  scanHistoryDrift
+} from "./chunk-HWHONML5.js";
 import {
   checkHistoryRewriteOwnership,
   resolveHistorySubject,
   verifyHistoryRewriteNoDrift
-} from "./chunk-RXAP6JL5.js";
+} from "./chunk-4JHJ7YG2.js";
 import "./chunk-O7IWB35H.js";
 import {
   readHistoryEntries
-} from "./chunk-IGVJRZ6H.js";
+} from "./chunk-GRZGHGRG.js";
 import {
   historyEntriesToRaw,
   reanchorHistoryEntries,
   replayHash,
   toReplayDocument,
   verifyHistoryChain
-} from "./chunk-XMBI6TNW.js";
-import "./chunk-QJMGRZO2.js";
+} from "./chunk-GOO4UXBI.js";
+import "./chunk-VYZNX4C5.js";
 import {
   acquireLock,
+  listAllFrontMatterWithBody,
   readLocatedItem
-} from "./chunk-3KLPFWZ4.js";
-import "./chunk-VPEAS7PS.js";
-import "./chunk-73ZPG2I3.js";
+} from "./chunk-XXLMJDUB.js";
+import "./chunk-LGOXXQUW.js";
+import "./chunk-MACCNKSZ.js";
 import {
   resolveItemTypeRegistry
-} from "./chunk-5SCT2JCT.js";
+} from "./chunk-W6KNFAMZ.js";
 import {
   nowIso
-} from "./chunk-IUKD4W6Z.js";
+} from "./chunk-IXVSSHGV.js";
 import {
   EXIT_CODE,
   PmCliError,
@@ -38,7 +42,7 @@ import {
   resolvePmRoot,
   runActiveOnWriteHooks,
   writeFileAtomic
-} from "./chunk-FY4SPXSC.js";
+} from "./chunk-LFW5NQUP.js";
 
 // dist/cli/commands/history-repair.js
 import fs from "node:fs/promises";
@@ -46,7 +50,7 @@ import jsonPatch from "fast-json-patch";
 !(function() {
   try {
     var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "01f463d2-97ef-5ddb-8346-156e456e097b");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "abda868a-80b8-578b-9478-e2138d640b98");
   } catch (e2) {
   }
 })();
@@ -190,7 +194,61 @@ async function runHistoryRepair(id, options, global2) {
     generated_at: nowIso()
   };
 }
+function assertHistoryRepairTarget(id, all) {
+  if (all && id !== void 0) {
+    throw new PmCliError("history-repair: <id> and --all are mutually exclusive; pass an item id to repair one stream or --all to repair every drifted stream.", EXIT_CODE.USAGE);
+  }
+  if (!all && id === void 0) {
+    throw new PmCliError("history-repair: provide an item <id> or pass --all to repair every drifted stream.", EXIT_CODE.USAGE);
+  }
+}
+async function runHistoryRepairAll(options, global2) {
+  const pmRoot = resolvePmRoot(process.cwd(), global2.path);
+  if (!await pathExists(getSettingsPath(pmRoot))) {
+    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);
+  }
+  const settings = await readSettings(pmRoot);
+  const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());
+  const itemReadWarnings = [];
+  const items = await listAllFrontMatterWithBody(pmRoot, settings.item_format, typeRegistry.type_to_folder, itemReadWarnings, settings.schema);
+  const drift = await scanHistoryDrift(pmRoot, items);
+  const streams = [];
+  const totals = { repaired: 0, skipped_clean: 0, failed: 0 };
+  for (const driftedId of drift.driftedItems) {
+    try {
+      const result = await runHistoryRepair(driftedId, options, global2);
+      const outcome = result.changed ? "repaired" : "skipped_clean";
+      totals[outcome] += 1;
+      streams.push({
+        id: driftedId,
+        outcome,
+        entries_rehashed: result.history.entries_rehashed,
+        entries_patch_repaired: result.history.entries_patch_repaired,
+        reconciled_with_item: result.history.reconciled_with_item
+      });
+    } catch (error) {
+      totals.failed += 1;
+      streams.push({
+        id: driftedId,
+        outcome: "failed",
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  return {
+    all: true,
+    dry_run: Boolean(options.dryRun),
+    scanned_streams: items.length,
+    drifted_streams: drift.driftedItems.length,
+    streams,
+    totals,
+    warnings: [...new Set(itemReadWarnings)].sort((left, right) => left.localeCompare(right)),
+    generated_at: nowIso()
+  };
+}
 export {
-  runHistoryRepair
+  assertHistoryRepairTarget,
+  runHistoryRepair,
+  runHistoryRepairAll
 };
-//# sourceMappingURL=history-repair-KVPFJKOS.js.map
+//# sourceMappingURL=history-repair-UCYS55ZX.js.map

package/dist/cli-bundle/chunks/history-repair-UCYS55ZX.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../../cli/commands/history-repair.ts"],
+  "sourcesContent": ["import fs from \"node:fs/promises\";\nimport jsonPatch from \"fast-json-patch\";\nimport { pathExists, readFileIfExists, writeFileAtomic } from \"../../core/fs/fs-utils.js\";\nimport {\n  checkHistoryRewriteOwnership,\n  verifyHistoryRewriteNoDrift,\n} from \"../../core/history/history-rewrite.js\";\nimport {\n  historyEntriesToRaw,\n  reanchorHistoryEntries,\n  replayHash,\n  toReplayDocument,\n  verifyHistoryChain,\n  type ReplayDocument,\n} from \"../../core/history/replay.js\";\nimport { scanHistoryDrift } from \"../../core/history/drift-scan.js\";\nimport { resolveItemTypeRegistry } from \"../../core/item/type-registry.js\";\nimport { acquireLock } from \"../../core/lock/lock.js\";\nimport { EXIT_CODE } from \"../../core/shared/constants.js\";\nimport type { GlobalOptions } from \"../../core/shared/command-types.js\";\nimport { PmCliError } from \"../../core/shared/errors.js\";\nimport { nowIso } from \"../../core/shared/time.js\";\nimport { getActiveExtensionRegistrations, runActiveOnWriteHooks } from \"../../core/extensions/index.js\";\nimport { listAllFrontMatterWithBody, readLocatedItem } from \"../../core/store/item-store.js\";\nimport { getSettingsPath, resolvePmRoot } from \"../../core/store/paths.js\";\nimport { readSettings } from \"../../core/store/settings.js\";\nimport type { HistoryEntry, HistoryPatchOp, ItemMetadata } from \"../../types/index.js\";\nimport { readHistoryEntries } from \"./history.js\";\nimport { resolveHistorySubject } from \"./history-redact.js\";\n\nexport interface HistoryRepairCommandOptions {\n  dryRun?: boolean;\n  author?: string;\n  message?: string;\n  force?: boolean;\n}\n\nexport interface HistoryRepairResult {\n  id: string;\n  dry_run: boolean;\n  changed: boolean;\n  history: {\n    path: string;\n    entries_scanned: number;\n    chain_drift_before: boolean;\n    entries_rehashed: number;\n    entries_patch_repaired: number;\n    converted_replace_to_add: number;\n    skipped_ops: number;\n    reconciled_with_item: boolean;\n    audit_entry_added: boolean;\n    verify_ok: boolean;\n    verify_errors: string[];\n  };\n  item: {\n    exists: boolean;\n    path: string | null;\n    matched_chain_before: boolean | null;\n  };\n  warnings: string[];\n  generated_at: string;\n}\n\nfunction toAuthor(candidate: string | undefined, defaultAuthor: string): string {\n  const resolved = candidate ?? process.env.PM_AUTHOR ?? defaultAuthor;\n  const trimmed = resolved.trim();\n  return trimmed.length > 0 ? trimmed : \"unknown\";\n}\n\nexport async function runHistoryRepair(\n  id: string,\n  options: HistoryRepairCommandOptions,\n  global: GlobalOptions,\n): Promise<HistoryRepairResult> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);\n  }\n\n  const settings = await readSettings(pmRoot);\n  const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());\n  const subject = await resolveHistorySubject(pmRoot, id, settings, typeRegistry.type_to_folder);\n\n  if (!(await pathExists(subject.historyPath))) {\n    throw new PmCliError(`No history stream exists for ${subject.id}.`, EXIT_CODE.NOT_FOUND);\n  }\n  const historyRawBeforeLock = await readFileIfExists(subject.historyPath);\n  const historyEntries = await readHistoryEntries(subject.historyPath, subject.id);\n  if (historyEntries.length === 0) {\n    throw new PmCliError(`No history entries exist for ${subject.id}; nothing to repair.`, EXIT_CODE.USAGE);\n  }\n\n  const chainBefore = verifyHistoryChain(historyEntries);\n  const reanchor = reanchorHistoryEntries(historyEntries);\n\n  // Reconcile the replayed chain with the current on-disk item document so the\n  // latest after_hash matches what pm validate/health compute for the item.\n  let currentItemReplay: ReplayDocument | null = null;\n  const currentItemPath: string | null = subject.located?.itemPath ?? null;\n  let matchedChainBefore: boolean | null = null;\n  const loadedItem = subject.located\n    ? await readLocatedItem(subject.located, { schema: settings.schema })\n    : null;\n  const currentItemRawBeforeLock = loadedItem?.raw ?? null;\n  if (loadedItem) {\n    // Use the shared canonical replay form so reconciliation hashing matches the\n    // semantics pm validate/health use for the on-disk item (avoids hash divergence).\n    currentItemReplay = toReplayDocument(loadedItem.document);\n    const lastOriginalAfterHash = historyEntries[historyEntries.length - 1]?.after_hash;\n    matchedChainBefore = replayHash(currentItemReplay) === lastOriginalAfterHash;\n  }\n\n  const finalReplay = reanchor.finalDocument;\n  const reconcileNeeded =\n    currentItemReplay !== null && replayHash(finalReplay) !== replayHash(currentItemReplay);\n\n  const changed = reanchor.entriesRehashed > 0 || reanchor.entriesPatchRepaired > 0 || reconcileNeeded;\n  const author = toAuthor(options.author, settings.author_default);\n  const dryRun = Boolean(options.dryRun);\n\n  const repairMessage =\n    typeof options.message === \"string\" && options.message.trim().length > 0\n      ? options.message\n      : `history-repair re-anchored ${reanchor.entriesRehashed} entr${\n          reanchor.entriesRehashed === 1 ? \"y\" : \"ies\"\n        }${reanchor.entriesPatchRepaired > 0 ? `, repaired ${reanchor.entriesPatchRepaired} patch(es)` : \"\"}${\n          reconcileNeeded ? \", reconciled chain with on-disk item\" : \"\"\n        }.`;\n\n  const rewrittenEntries: HistoryEntry[] = [...reanchor.entries];\n  let auditEntryAdded = false;\n  if (changed) {\n    if (reconcileNeeded && currentItemReplay) {\n      rewrittenEntries.push({\n        ts: nowIso(),\n        author,\n        op: \"history_repair\",\n        patch: jsonPatch.compare(finalReplay, currentItemReplay) as HistoryPatchOp[],\n        before_hash: replayHash(finalReplay),\n        after_hash: replayHash(currentItemReplay),\n        message: repairMessage,\n      });\n    } else {\n      rewrittenEntries.push({\n        ts: nowIso(),\n        author,\n        op: \"history_repair\",\n        patch: [],\n        before_hash: replayHash(finalReplay),\n        after_hash: replayHash(finalReplay),\n        message: repairMessage,\n      });\n    }\n    auditEntryAdded = true;\n  }\n\n  const historyVerify = verifyHistoryChain(rewrittenEntries);\n  if (!historyVerify.ok) {\n    throw new PmCliError(\n      `history-repair produced an invalid rewritten chain (${historyVerify.errors.join(\", \")}).`,\n      EXIT_CODE.GENERIC_FAILURE,\n    );\n  }\n\n  const warnings: string[] = [];\n  if (!changed) {\n    warnings.push(\"history_repair_no_changes\");\n  }\n  if (reanchor.skippedOps > 0) {\n    warnings.push(`history_repair_skipped_unresolvable_ops:${reanchor.skippedOps}`);\n  }\n\n  if (changed && !dryRun) {\n    warnings.push(\n      ...checkHistoryRewriteOwnership({\n        itemDocument: loadedItem?.document ?? null,\n        subjectId: subject.id,\n        author,\n        force: options.force,\n        settings,\n      }),\n    );\n\n    const releaseLock = await acquireLock(\n      pmRoot,\n      subject.id,\n      settings.locks.ttl_seconds,\n      author,\n      Boolean(options.force),\n      settings.governance.force_required_for_stale_lock,\n    );\n    try {\n      const { historyRawUnderLock } = await verifyHistoryRewriteNoDrift({\n        pmRoot,\n        subject,\n        settings,\n        typeRegistry,\n        historyRawBeforeLock,\n        currentItemRawBeforeLock,\n        operation: \"history-repair\",\n      });\n      try {\n        await writeFileAtomic(subject.historyPath, historyEntriesToRaw(rewrittenEntries));\n      } catch (error) {\n        if (historyRawUnderLock === null) {\n          await fs.rm(subject.historyPath, { force: true });\n        } else {\n          await writeFileAtomic(subject.historyPath, historyRawUnderLock);\n        }\n        throw error;\n      }\n      warnings.push(\n        ...(await runActiveOnWriteHooks({\n          path: subject.historyPath,\n          scope: \"project\",\n          op: \"history_repair:history\",\n        })),\n      );\n    } finally {\n      await releaseLock();\n    }\n  }\n\n  return {\n    id: subject.id,\n    dry_run: dryRun,\n    changed,\n    history: {\n      path: subject.historyPath,\n      entries_scanned: historyEntries.length,\n      chain_drift_before: !chainBefore.ok,\n      entries_rehashed: reanchor.entriesRehashed,\n      entries_patch_repaired: reanchor.entriesPatchRepaired,\n      converted_replace_to_add: reanchor.convertedReplaceToAdd,\n      skipped_ops: reanchor.skippedOps,\n      reconciled_with_item: reconcileNeeded,\n      audit_entry_added: auditEntryAdded,\n      verify_ok: historyVerify.ok,\n      verify_errors: historyVerify.errors,\n    },\n    item: {\n      exists: currentItemPath !== null,\n      path: currentItemPath,\n      matched_chain_before: matchedChainBefore,\n    },\n    warnings: [...new Set(warnings)].sort((left, right) => left.localeCompare(right)),\n    generated_at: nowIso(),\n  };\n}\n\nexport interface HistoryRepairAllStreamResult {\n  id: string;\n  outcome: \"repaired\" | \"skipped_clean\" | \"failed\";\n  entries_rehashed?: number;\n  entries_patch_repaired?: number;\n  reconciled_with_item?: boolean;\n  error?: string;\n}\n\nexport interface HistoryRepairAllResult {\n  all: true;\n  dry_run: boolean;\n  scanned_streams: number;\n  drifted_streams: number;\n  /** One compact row per drifted stream (clean streams are summarized by the counts only). */\n  streams: HistoryRepairAllStreamResult[];\n  totals: { repaired: number; skipped_clean: number; failed: number };\n  warnings: string[];\n  generated_at: string;\n}\n\n/**\n * Enforce the `pm history-repair` target contract shared by the CLI and MCP\n * surfaces: exactly one of an item `<id>` or `--all` must be provided.\n */\nexport function assertHistoryRepairTarget(id: string | undefined, all: boolean): void {\n  if (all && id !== undefined) {\n    throw new PmCliError(\n      \"history-repair: <id> and --all are mutually exclusive; pass an item id to repair one stream or --all to repair every drifted stream.\",\n      EXIT_CODE.USAGE,\n    );\n  }\n  if (!all && id === undefined) {\n    throw new PmCliError(\n      \"history-repair: provide an item <id> or pass --all to repair every drifted stream.\",\n      EXIT_CODE.USAGE,\n    );\n  }\n}\n\n/**\n * Bulk drift repair: scan every item's history stream with the same drift scan\n * `pm health` uses, then run the audited single-stream repair (ownership check,\n * lock, no-drift verification, audit marker) for each drifted stream. One\n * failing stream never aborts the rest; failures are collected per row and the\n * caller decides the exit code from `totals.failed`.\n */\nexport async function runHistoryRepairAll(\n  options: HistoryRepairCommandOptions,\n  global: GlobalOptions,\n): Promise<HistoryRepairAllResult> {\n  const pmRoot = resolvePmRoot(process.cwd(), global.path);\n  if (!(await pathExists(getSettingsPath(pmRoot)))) {\n    throw new PmCliError(`Tracker is not initialized at ${pmRoot}. Run pm init first.`, EXIT_CODE.NOT_FOUND);\n  }\n\n  const settings = await readSettings(pmRoot);\n  const typeRegistry = resolveItemTypeRegistry(settings, getActiveExtensionRegistrations());\n  const itemReadWarnings: string[] = [];\n  const items = await listAllFrontMatterWithBody(\n    pmRoot,\n    settings.item_format,\n    typeRegistry.type_to_folder,\n    itemReadWarnings,\n    settings.schema,\n  );\n  const drift = await scanHistoryDrift(pmRoot, items as Array<ItemMetadata & { body: string }>);\n\n  const streams: HistoryRepairAllStreamResult[] = [];\n  const totals = { repaired: 0, skipped_clean: 0, failed: 0 };\n  for (const driftedId of drift.driftedItems) {\n    try {\n      const result = await runHistoryRepair(driftedId, options, global);\n      const outcome = result.changed ? \"repaired\" : \"skipped_clean\";\n      totals[outcome] += 1;\n      streams.push({\n        id: driftedId,\n        outcome,\n        entries_rehashed: result.history.entries_rehashed,\n        entries_patch_repaired: result.history.entries_patch_repaired,\n        reconciled_with_item: result.history.reconciled_with_item,\n      });\n    } catch (error) {\n      totals.failed += 1;\n      streams.push({\n        id: driftedId,\n        outcome: \"failed\",\n        error: error instanceof Error ? error.message : String(error),\n      });\n    }\n  }\n\n  return {\n    all: true,\n    dry_run: Boolean(options.dryRun),\n    scanned_streams: items.length,\n    drifted_streams: drift.driftedItems.length,\n    streams,\n    totals,\n    warnings: [...new Set(itemReadWarnings)].sort((left, right) => left.localeCompare(right)),\n    generated_at: nowIso(),\n  };\n}\n"],
+  "mappings": "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",
+  "names": ["global"]
+}

package/dist/cli-bundle/chunks/init-JJFYRUKG.js

@@ -0,0 +1,17 @@
+import {
+  runInit,
+  summarizeInitResult
+} from "./chunk-WLH7X4RN.js";
+import "./chunk-UCVJP4JL.js";
+import "./chunk-SQDKAEKG.js";
+import "./chunk-5LMF75Q7.js";
+import "./chunk-3HUE7XOF.js";
+import "./chunk-LGOXXQUW.js";
+import "./chunk-W6KNFAMZ.js";
+import "./chunk-IXVSSHGV.js";
+import "./chunk-LFW5NQUP.js";
+export {
+  runInit,
+  summarizeInitResult
+};
+//# sourceMappingURL=init-JJFYRUKG.js.map

package/dist/cli-bundle/chunks/{init-S5WEGUJY.js → init-MXV57LKL.js}

@@ -3,19 +3,19 @@
 import {
   runInit,
   summarizeInitResult
-} from "./chunk-F75JSIOZ.js";
-import "./chunk-FDH2X65L.js";
-import "./chunk-S2ZLDYGS.js";
-import "./chunk-VAOUX6TK.js";
+} from "./chunk-2J2AH4V5.js";
+import "./chunk-TSXWFN3L.js";
+import "./chunk-SOHXUA2Q.js";
+import "./chunk-JCTZV7TO.js";
 import "./chunk-LXYVKYMQ.js";
-import "./chunk-ATEES5SX.js";
-import "./chunk-CCX4RSYZ.js";
-import "./chunk-WUNFKP7M.js";
-import "./chunk-A6LXQFO7.js";
+import "./chunk-6ZFTM65G.js";
+import "./chunk-32XSW44C.js";
+import "./chunk-IZHCCG4S.js";
+import "./chunk-S2CDTRJ6.js";
 export {
   runInit,
   summarizeInitResult
 };
-//# sourceMappingURL=init-S5WEGUJY.js.map
+//# sourceMappingURL=init-MXV57LKL.js.map
 
 //# debugId=45eac7fa-f181-5cca-93b7-cfb58909dbb3

package/dist/cli-bundle/chunks/{learnings-HQXSSKZ5.js → learnings-L6KTZGOT.js}

@@ -3,18 +3,18 @@
 import {
   parseAnnotationTextInput,
   runAnnotationCommand
-} from "./chunk-OASDW5UI.js";
+} from "./chunk-AUDDXKNX.js";
 import "./chunk-J27KIHTG.js";
 import {
   createStdinTokenResolver
-} from "./chunk-I7NYDZDV.js";
-import "./chunk-P5U5EOMA.js";
-import "./chunk-HI7STVF2.js";
-import "./chunk-ATEES5SX.js";
-import "./chunk-UUWGCWBU.js";
-import "./chunk-CCX4RSYZ.js";
-import "./chunk-WUNFKP7M.js";
-import "./chunk-A6LXQFO7.js";
+} from "./chunk-3VULHQNS.js";
+import "./chunk-NN6RKGFW.js";
+import "./chunk-L6YQONLM.js";
+import "./chunk-6ZFTM65G.js";
+import "./chunk-QQG4HEX7.js";
+import "./chunk-32XSW44C.js";
+import "./chunk-IZHCCG4S.js";
+import "./chunk-S2CDTRJ6.js";
 
 // dist/cli/commands/learnings.js
 async function runLearnings(id, options, global) {
@@ -39,6 +39,6 @@ async function runLearnings(id, options, global) {
 export {
   runLearnings
 };
-//# sourceMappingURL=learnings-HQXSSKZ5.js.map
+//# sourceMappingURL=learnings-L6KTZGOT.js.map
 
 //# debugId=ba6067a5-4bff-5ab2-ae61-451511221c4d

package/dist/cli-bundle/chunks/{learnings-XK3P4ZDR.js → learnings-QKJOKEAO.js}

@@ -1,18 +1,18 @@
 import {
   parseAnnotationTextInput,
   runAnnotationCommand
-} from "./chunk-TK5VZFHY.js";
+} from "./chunk-6TBR5AZ2.js";
 import "./chunk-O7IWB35H.js";
 import {
   createStdinTokenResolver
-} from "./chunk-TNAP7EJX.js";
-import "./chunk-QJMGRZO2.js";
-import "./chunk-3KLPFWZ4.js";
-import "./chunk-VPEAS7PS.js";
-import "./chunk-73ZPG2I3.js";
-import "./chunk-5SCT2JCT.js";
-import "./chunk-IUKD4W6Z.js";
-import "./chunk-FY4SPXSC.js";
+} from "./chunk-HZOX5BYD.js";
+import "./chunk-VYZNX4C5.js";
+import "./chunk-XXLMJDUB.js";
+import "./chunk-LGOXXQUW.js";
+import "./chunk-MACCNKSZ.js";
+import "./chunk-W6KNFAMZ.js";
+import "./chunk-IXVSSHGV.js";
+import "./chunk-LFW5NQUP.js";
 
 // dist/cli/commands/learnings.js
 !(function() {
@@ -44,4 +44,4 @@ async function runLearnings(id, options, global2) {
 export {
   runLearnings
 };
-//# sourceMappingURL=learnings-XK3P4ZDR.js.map
+//# sourceMappingURL=learnings-QKJOKEAO.js.map

package/dist/cli-bundle/chunks/{list-6CL3XFT6.js → list-GGVPXEV6.js}

@@ -4,20 +4,20 @@ import {
   LIST_SORT_FIELDS,
   LIST_SORT_ORDER_VALUES,
   runList
-} from "./chunk-CW6E4NAT.js";
-import "./chunk-AVGHVVF7.js";
-import "./chunk-P5U5EOMA.js";
-import "./chunk-HI7STVF2.js";
-import "./chunk-ATEES5SX.js";
-import "./chunk-UUWGCWBU.js";
-import "./chunk-CCX4RSYZ.js";
-import "./chunk-WUNFKP7M.js";
-import "./chunk-A6LXQFO7.js";
+} from "./chunk-LYNQ3NGI.js";
+import "./chunk-V4KP3TCN.js";
+import "./chunk-NN6RKGFW.js";
+import "./chunk-L6YQONLM.js";
+import "./chunk-6ZFTM65G.js";
+import "./chunk-QQG4HEX7.js";
+import "./chunk-32XSW44C.js";
+import "./chunk-IZHCCG4S.js";
+import "./chunk-S2CDTRJ6.js";
 export {
   LIST_SORT_FIELDS,
   LIST_SORT_ORDER_VALUES,
   runList
 };
-//# sourceMappingURL=list-6CL3XFT6.js.map
+//# sourceMappingURL=list-GGVPXEV6.js.map
 
 //# debugId=45eac7fa-f181-5cca-93b7-cfb58909dbb3

package/dist/cli-bundle/chunks/list-VOQDQHA4.js

@@ -0,0 +1,19 @@
+import {
+  LIST_SORT_FIELDS,
+  LIST_SORT_ORDER_VALUES,
+  runList
+} from "./chunk-M3SI2REU.js";
+import "./chunk-C24PWDFG.js";
+import "./chunk-VYZNX4C5.js";
+import "./chunk-XXLMJDUB.js";
+import "./chunk-LGOXXQUW.js";
+import "./chunk-MACCNKSZ.js";
+import "./chunk-W6KNFAMZ.js";
+import "./chunk-IXVSSHGV.js";
+import "./chunk-LFW5NQUP.js";
+export {
+  LIST_SORT_FIELDS,
+  LIST_SORT_ORDER_VALUES,
+  runList
+};
+//# sourceMappingURL=list-VOQDQHA4.js.map

package/dist/cli-bundle/chunks/{notes-5T6P7C5V.js → notes-3NLK7WTZ.js}

@@ -3,18 +3,18 @@
 import {
   parseAnnotationTextInput,
   runAnnotationCommand
-} from "./chunk-OASDW5UI.js";
+} from "./chunk-AUDDXKNX.js";
 import "./chunk-J27KIHTG.js";
 import {
   createStdinTokenResolver
-} from "./chunk-I7NYDZDV.js";
-import "./chunk-P5U5EOMA.js";
-import "./chunk-HI7STVF2.js";
-import "./chunk-ATEES5SX.js";
-import "./chunk-UUWGCWBU.js";
-import "./chunk-CCX4RSYZ.js";
-import "./chunk-WUNFKP7M.js";
-import "./chunk-A6LXQFO7.js";
+} from "./chunk-3VULHQNS.js";
+import "./chunk-NN6RKGFW.js";
+import "./chunk-L6YQONLM.js";
+import "./chunk-6ZFTM65G.js";
+import "./chunk-QQG4HEX7.js";
+import "./chunk-32XSW44C.js";
+import "./chunk-IZHCCG4S.js";
+import "./chunk-S2CDTRJ6.js";
 
 // dist/cli/commands/notes.js
 async function runNotes(id, options, global) {
@@ -39,6 +39,6 @@ async function runNotes(id, options, global) {
 export {
   runNotes
 };
-//# sourceMappingURL=notes-5T6P7C5V.js.map
+//# sourceMappingURL=notes-3NLK7WTZ.js.map
 
 //# debugId=110ed0ca-0531-5471-a668-b58dfbd092cd

package/dist/cli-bundle/chunks/{notes-U5FZCSBT.js → notes-HMCB7TK6.js}

@@ -1,18 +1,18 @@
 import {
   parseAnnotationTextInput,
   runAnnotationCommand
-} from "./chunk-TK5VZFHY.js";
+} from "./chunk-6TBR5AZ2.js";
 import "./chunk-O7IWB35H.js";
 import {
   createStdinTokenResolver
-} from "./chunk-TNAP7EJX.js";
-import "./chunk-QJMGRZO2.js";
-import "./chunk-3KLPFWZ4.js";
-import "./chunk-VPEAS7PS.js";
-import "./chunk-73ZPG2I3.js";
-import "./chunk-5SCT2JCT.js";
-import "./chunk-IUKD4W6Z.js";
-import "./chunk-FY4SPXSC.js";
+} from "./chunk-HZOX5BYD.js";
+import "./chunk-VYZNX4C5.js";
+import "./chunk-XXLMJDUB.js";
+import "./chunk-LGOXXQUW.js";
+import "./chunk-MACCNKSZ.js";
+import "./chunk-W6KNFAMZ.js";
+import "./chunk-IXVSSHGV.js";
+import "./chunk-LFW5NQUP.js";
 
 // dist/cli/commands/notes.js
 !(function() {
@@ -44,4 +44,4 @@ async function runNotes(id, options, global2) {
 export {
   runNotes
 };
-//# sourceMappingURL=notes-U5FZCSBT.js.map
+//# sourceMappingURL=notes-HMCB7TK6.js.map

package/dist/cli-bundle/chunks/{plan-VNUG3WZZ.js → plan-DWBYI5C6.js}

@@ -1,13 +1,13 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ded50a19-e249-51bd-b1da-8244e75cdfbe")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="0e234648-f6c8-569f-a685-5d296eba2da1")}catch(e){}}();
 import {
   runCreate
-} from "./chunk-J3GD64J2.js";
-import "./chunk-4HFU4UO2.js";
-import "./chunk-I7NYDZDV.js";
-import "./chunk-Y3YKK7CY.js";
-import "./chunk-FDH2X65L.js";
-import "./chunk-I2IJY2NL.js";
+} from "./chunk-SGMGMCIF.js";
+import "./chunk-CEGUH2E5.js";
+import "./chunk-3VULHQNS.js";
+import "./chunk-DWG4FHPY.js";
+import "./chunk-TSXWFN3L.js";
+import "./chunk-LOAR5TKX.js";
 import {
   splitCommaList
 } from "./chunk-LXYVKYMQ.js";
@@ -15,16 +15,16 @@ import {
   locateItem,
   mutateItem,
   readLocatedItem
-} from "./chunk-HI7STVF2.js";
-import "./chunk-ATEES5SX.js";
-import "./chunk-UUWGCWBU.js";
+} from "./chunk-L6YQONLM.js";
+import "./chunk-6ZFTM65G.js";
+import "./chunk-QQG4HEX7.js";
 import {
   resolveItemTypeRegistry,
   resolveTypeName
-} from "./chunk-CCX4RSYZ.js";
+} from "./chunk-32XSW44C.js";
 import {
   nowIso
-} from "./chunk-WUNFKP7M.js";
+} from "./chunk-IZHCCG4S.js";
 import {
   EXIT_CODE,
   PLAN_HARNESS_VALUES,
@@ -37,7 +37,7 @@ import {
   pathExists,
   readSettings,
   resolvePmRoot
-} from "./chunk-A6LXQFO7.js";
+} from "./chunk-S2CDTRJ6.js";
 
 // dist/cli/commands/plan.js
 var PLAN_SUBCOMMANDS = [
@@ -66,6 +66,10 @@ function resolveAuthor(candidate, fallback) {
   const trimmed = resolved.trim();
   return trimmed.length > 0 ? trimmed : "unknown";
 }
+function toOrderedStepTitles(value) {
+  const values = Array.isArray(value) ? value : value === void 0 || value === null ? [] : [value];
+  return values.filter((entry) => entry !== void 0 && entry !== null).map((entry) => (typeof entry === "string" ? entry : String(entry)).trim()).filter((entry) => entry.length > 0);
+}
 function toArray(value) {
   if (Array.isArray(value))
     return value.flatMap((entry) => splitCommaList(entry, { unique: false }));
@@ -492,17 +496,31 @@ async function planCreate(options, global, ctx) {
     command: initialValidationCommand || void 0,
     expected: initialValidationExpected || void 0
   } : void 0;
-  if (options.stepTitle?.trim()) {
+  const stepTitleFlag = options.stepTitle?.trim();
+  const repeatedStepTitles = toOrderedStepTitles(options.step);
+  const stepTitles = stepTitleFlag ? [stepTitleFlag, ...repeatedStepTitles] : repeatedStepTitles;
+  const hasPerStepDetailOptions = Boolean(options.stepBody?.trim()) || Boolean(options.stepOwner?.trim()) || Boolean(options.stepStatus?.trim()) || Boolean(options.stepEvidence?.trim()) || Boolean(options.stepBlockedReason?.trim()) || Boolean(options.stepReplacement?.trim()) || toArray(options.dependsOn).length > 0 || toArray(options.link).length > 0 || toSpecArray(options.file).length > 0 || toSpecArray(options.test).length > 0 || toSpecArray(options.doc).length > 0;
+  if (stepTitles.length > 1 && hasPerStepDetailOptions) {
+    throw new PmCliError("pm plan create per-step options apply to a single initial step; with multiple --step values create the plan first, then refine steps individually", EXIT_CODE.USAGE, {
+      code: "ambiguous_option_combination",
+      examples: [
+        'pm plan create --title "Execution plan" --step "Read the code" --step "Write the fix"',
+        'pm plan update-step <plan-id> plan-step-001 --step-body "Inspect retry path"'
+      ]
+    });
+  }
+  let initialSteps = [];
+  if (stepTitles.length === 1) {
     const status = asStepStatus(options.stepStatus, "pending");
     const linkedItems = buildLinkInputs(options, "depends_on");
     const files = toSpecArray(options.file).map(parseStepFile);
     const tests = toSpecArray(options.test).map(parseStepTest);
     const docs = toSpecArray(options.doc).map(parseStepDoc);
     const now = nowIso();
-    initialStep = {
+    initialSteps = [{
       id: "plan-step-001",
       order: 1,
-      title: options.stepTitle.trim(),
+      title: stepTitles[0],
       body: options.stepBody?.trim() || void 0,
       status,
       owner: options.stepOwner?.trim() || void 0,
@@ -515,17 +533,30 @@ async function planCreate(options, global, ctx) {
       created_at: now,
       updated_at: now,
       completed_at: status === "completed" ? now : void 0
-    };
+    }];
+  } else if (stepTitles.length > 1) {
+    const now = nowIso();
+    initialSteps = stepTitles.map((stepTitle, index) => ({
+      id: `${STEP_ID_PREFIX}${String(index + 1).padStart(3, "0")}`,
+      order: index + 1,
+      title: stepTitle,
+      status: "pending",
+      created_at: now,
+      updated_at: now
+    }));
+  }
+  if (initialSteps.length > 0) {
+    initialStep = initialSteps[0];
     const stepped = await mutateItem({
       pmRoot: ctx.pmRoot,
       settings: ctx.settings,
       id: createResult.item.id,
       op: "plan_create_initial_step",
       author: resolveAuthor(options.author, ctx.settings.author_default),
-      message: `plan create initial step "${initialStep.title}"`,
+      message: initialSteps.length === 1 ? `plan create initial step "${initialSteps[0].title}"` : `plan create ${initialSteps.length} initial steps`,
       mutate(doc) {
         ensurePlanItem(doc.metadata);
-        doc.metadata.plan_steps = [initialStep];
+        doc.metadata.plan_steps = initialSteps;
         if (initialValidation) {
           doc.metadata.plan_validation = [...doc.metadata.plan_validation ?? [], initialValidation];
         }
@@ -548,8 +579,8 @@ async function planCreate(options, global, ctx) {
       }
     });
     finalMetadata = validated.item;
-  } else if (options.stepBody?.trim() || options.stepOwner?.trim() || options.stepStatus?.trim() || options.stepEvidence?.trim() || options.stepBlockedReason?.trim() || options.stepReplacement?.trim() || toArray(options.dependsOn).length > 0 || toArray(options.link).length > 0 || toSpecArray(options.file).length > 0 || toSpecArray(options.test).length > 0 || toSpecArray(options.doc).length > 0) {
-    throw new PmCliError("pm plan create step options require --step-title", EXIT_CODE.USAGE, {
+  } else if (hasPerStepDetailOptions) {
+    throw new PmCliError("pm plan create step options require --step-title (or a single --step)", EXIT_CODE.USAGE, {
       code: "missing_required_option",
       examples: ['pm plan create --title "Execution plan" --step-title "Read the code"']
     });
@@ -1094,6 +1125,15 @@ async function planMaterialize(id, options, ctx) {
 }
 async function runPlan(input) {
   const ctx = await loadContext(input.global);
+  if (input.subcommand !== "create") {
+    const stepValues = toOrderedStepTitles(input.options.step);
+    if (stepValues.length > 1) {
+      throw new PmCliError(`pm plan ${input.subcommand} accepts a single --step/--step-title value (repeated --step seeds ordered steps only on pm plan create)`, EXIT_CODE.USAGE);
+    }
+    if (stepValues.length === 1 && !input.options.stepTitle?.trim()) {
+      input = { ...input, options: { ...input.options, stepTitle: stepValues[0] } };
+    }
+  }
   switch (input.subcommand) {
     case "create":
       return planCreate(input.options, input.global, ctx);
@@ -1166,6 +1206,6 @@ export {
   PLAN_SUBCOMMANDS,
   runPlan
 };
-//# sourceMappingURL=plan-VNUG3WZZ.js.map
+//# sourceMappingURL=plan-DWBYI5C6.js.map
 
-//# debugId=ded50a19-e249-51bd-b1da-8244e75cdfbe
+//# debugId=0e234648-f6c8-569f-a685-5d296eba2da1