@dansyuqri/spark-joy 0.1.5 → 0.2.0

package/dist/app/assets/index-ChCdW9F8.css

@@ -0,0 +1 @@
+:root{--bg:#fbfaf8;--panel:#fff;--ink:#1d1d1f;--muted:#6b6b72;--line:#e4e2dd;--accent:#c2410c;--accent-ink:#fff;--add-bg:#e9f8ec;--add-ink:#116329;--del-bg:#fdeceb;--del-ink:#a40e26;--hunk-bg:#f1f0fb;--note-bg:#fff8e5;--done:#15803d;--partial:#b45309;--todo:#9ca3af;--mono:ui-monospace, "SF Mono", Menlo, Consolas, monospace;--lightningcss-light:initial;--lightningcss-dark: ;color-scheme:light dark}@media (prefers-color-scheme:dark){:root{--lightningcss-light: ;--lightningcss-dark:initial;--bg:#151518;--panel:#1c1c20;--ink:#ececef;--muted:#9a9aa3;--line:#2e2e34;--accent:#fb923c;--accent-ink:#1a1a1a;--add-bg:#12301c;--add-ink:#7ee2a0;--del-bg:#3a1619;--del-ink:#ff9aa5;--hunk-bg:#23233a;--note-bg:#2f2a18;--done:#4ade80;--partial:#fbbf24;--todo:#6b7280}}*{box-sizing:border-box}body{background:var(--bg);color:var(--ink);margin:0;font:14px/1.5 system-ui,-apple-system,Segoe UI,sans-serif}a{color:var(--accent);text-decoration:none}a:hover{text-decoration:underline}code,kbd{font-family:var(--mono);font-size:.92em}kbd{border:1px solid var(--line);border-radius:4px;padding:0 4px}button{font:inherit;border:1px solid var(--line);background:var(--panel);color:var(--ink);cursor:pointer;border-radius:6px;padding:6px 12px}button:hover:not(:disabled){border-color:var(--muted)}button:disabled{opacity:.4;cursor:default}button.primary{background:var(--accent);border-color:var(--accent);color:var(--accent-ink);font-weight:600}textarea{font:inherit;border:1px solid var(--line);background:var(--panel);width:100%;min-height:70px;color:var(--ink);resize:vertical;border-radius:6px;padding:8px}.muted{color:var(--muted)}.small{font-size:12px}.warn{color:var(--partial)}.pre{white-space:pre-wrap}.empty{max-width:640px;margin:80px auto;padding:0 16px}.topbar{z-index:10;background:var(--panel);border-bottom:1px solid var(--line);align-items:center;gap:20px;padding:10px 20px;display:flex;position:sticky;top:0}.brand{white-space:nowrap;font-weight:700}.spark{color:var(--accent)}.run{white-space:nowrap;text-overflow:ellipsis;flex:1;min-width:0;overflow:hidden}.tabs{gap:4px;display:flex}.tabs a{color:var(--muted);border-radius:6px;padding:4px 10px}.tabs a.on{background:var(--hunk-bg);color:var(--ink);font-weight:600}.progress{font-variant-numeric:tabular-nums;align-items:center;gap:8px;display:flex}.progress .bar{background:var(--line);border-radius:3px;width:120px;height:6px;overflow:hidden}.progress .bar div{background:var(--done);height:100%;transition:width .2s}.saving{width:70px;color:var(--muted);font-size:12px}.saving.error{color:var(--del-ink)}.status{vertical-align:-2px;justify-content:center;align-self:center;width:1.2em;display:inline-flex}.status.done{color:var(--done)}.status.partial{color:var(--partial)}.status.todo{color:var(--todo)}.badge{border:1px solid var(--line);color:var(--muted);white-space:nowrap;border-radius:10px;margin-left:6px;padding:0 6px;font-size:11px;display:inline-block}.risk{vertical-align:middle;border-radius:50%;width:8px;height:8px;margin-left:8px;display:inline-block}.risk-high{background:var(--del-ink)}.risk-med{background:var(--partial)}.issues{border:1px solid var(--line);background:var(--panel);border-radius:8px;margin:12px 0;padding:8px 12px}.issues.has-errors{border-color:var(--del-ink)}.issues li.error{color:var(--del-ink)}.issues li.warning{color:var(--partial)}.page{max-width:1200px;padding:24px 32px 80px}.overview{max-width:800px;font-size:15px}.strategies{grid-template-columns:repeat(auto-fit,minmax(340px,1fr));gap:16px;display:grid}.strategy{background:var(--panel);border:1px solid var(--line);border-radius:10px;flex-direction:column;padding:16px;display:flex}.strategy.on{border-color:var(--accent);box-shadow:0 0 0 1px var(--accent)}.strategy h3{margin:0 0 4px}.strategy .stats{color:var(--muted);font-size:12px}.chunk-list{flex:1;padding-left:0;list-style:none}.chunk-list .n{min-width:1.6em;color:var(--muted);font-variant-numeric:tabular-nums}.chunk-list li{align-items:center;gap:4px;padding:3px 0;display:flex}.chunk-list li .title{flex:1}.chunk-list .branch{color:var(--muted);font-size:11px;display:block}.strategy .hint{color:var(--muted);margin:10px 0 0;font-size:12px}.size{font-variant-numeric:tabular-nums;color:var(--muted);margin-left:6px;font-size:12px}.features li{margin-bottom:6px}.review{grid-template-columns:300px 1fr;align-items:start;display:grid}.sidebar{border-right:1px solid var(--line);max-height:calc(100vh - 53px);padding:16px 8px 16px 16px;position:sticky;top:53px;overflow:auto}.sidebar ol{margin:8px 0;padding:0;list-style:none}.sidebar li a{color:var(--ink);border-radius:6px;align-items:baseline;gap:6px;padding:5px 8px;display:flex}.sidebar li a:hover{background:var(--hunk-bg);text-decoration:none}.sidebar li.on a{background:var(--hunk-bg);font-weight:600}.sidebar li.skim{border-top:1px dashed var(--line);margin-top:8px;padding-top:8px}.sidebar .n{color:var(--muted);font-variant-numeric:tabular-nums;min-width:1.4em}.sidebar .title{flex:1}.chunk-head h1{margin:0 0 2px;font-size:20px}.chunk-head .intent{max-width:820px;margin:6px 0 0;font-size:15px}.focus{max-width:820px;color:var(--muted);margin:6px 0 0;padding-left:18px}.diff{margin-top:16px}.file{background:var(--panel);border:1px solid var(--line);border-radius:8px;margin-bottom:14px;overflow:hidden}.file>summary{cursor:pointer;border-bottom:1px solid var(--line);align-items:center;gap:4px;padding:8px 12px;display:flex}.file:not([open])>summary{border-bottom:none}.file .path{font-family:var(--mono);font-weight:600}.file .counts{font-family:var(--mono);margin-left:auto;font-size:12px}.add{color:var(--add-ink)}.del{color:var(--del-ink)}.file table{border-collapse:collapse;width:100%;font-family:var(--mono);table-layout:fixed;font-size:12.5px}.file col.no-col{width:52px}.file td.no{text-align:right;color:var(--muted);-webkit-user-select:none;user-select:none;cursor:pointer;vertical-align:top;padding:0 8px}.file td.no:hover{color:var(--accent)}.file td.code{white-space:pre-wrap;word-break:break-all;padding:0 8px}.sign{width:1.2em;color:var(--muted);-webkit-user-select:none;user-select:none;display:inline-block}tr.add td{background:var(--add-bg)}tr.del td{background:var(--del-bg)}tr.meta td{color:var(--muted);font-style:italic}tr.hunk-header td{background:var(--hunk-bg);color:var(--muted);padding:3px 8px}.hid{color:var(--ink);font-weight:700}tr.placeholder td{color:var(--muted);padding:8px;font-family:system-ui,sans-serif}tr.note-row td{background:var(--bg);padding:6px 12px 6px 112px}.line-note{background:var(--note-bg);border:1px solid var(--line);border-radius:6px;padding:8px 10px;font-family:system-ui,sans-serif;font-size:13px}.line-note .text{white-space:pre-wrap;cursor:text}.line-note .actions{gap:6px;margin-top:6px;display:flex}.line-note .actions button{padding:2px 8px;font-size:12px}.chunk-foot{background:var(--bg);border-top:1px solid var(--line);align-items:flex-end;gap:8px;padding:10px 0;display:flex;position:sticky;bottom:0}.chunk-foot textarea{flex:1;height:34px;min-height:34px;padding:6px 8px;transition:height .1s}.chunk-foot textarea:focus,.chunk-foot textarea:not(:placeholder-shown){height:80px}.totals{margin:0 0 8px;font-size:18px}.chunk-refs a{font-variant-numeric:tabular-nums;margin-left:8px;font-size:12px}.features{padding:0;list-style:none}.note-group{background:var(--panel);border:1px solid var(--line);border-radius:8px;margin-bottom:10px;padding:10px 16px}.note-group p{margin:6px 0}.export textarea{min-height:300px;font-family:var(--mono);font-size:12px}@media (width<=900px){.review{grid-template-columns:1fr}.sidebar{border-right:none;border-bottom:1px solid var(--line);max-height:none;position:static}.page{padding:16px}.run{display:none}}.file{scroll-margin-top:64px}.map-page{flex-direction:column;height:calc(100vh - 53px);display:flex}.crumbs{color:var(--muted);padding:10px 20px;font-size:13px}.map-canvas{cursor:grab;touch-action:none;-webkit-user-select:none;user-select:none;flex:1;position:relative;overflow:hidden}.map-canvas:active{cursor:grabbing}.empty-map{padding:20px}.zoom-in{transform-box:fill-box;animation:.22s ease-out zoom-in}@keyframes zoom-in{0%{opacity:0}}.node{cursor:pointer}.node rect{fill:var(--panel);stroke:var(--line);stroke-width:1.2px}.node:hover rect{stroke:var(--accent)}.node.neighbour rect{fill:var(--bg);stroke-dasharray:4 3}.node.neighbour text{opacity:.7}.node text{fill:var(--ink);font-size:13px}.node .title{font-weight:600}.node.file .title{font-family:var(--mono);font-size:12.5px}.node .n{fill:var(--muted);font-weight:400}.node .meta{fill:var(--muted);font-size:11px}.node .status.done{color:var(--done)}.node .status.partial{color:var(--partial)}.node .status.todo{color:var(--todo)}.node .risk-high{fill:var(--del-ink)}.node .risk-med{fill:var(--partial)}.edge path{fill:none;stroke:var(--muted);opacity:.7;transition:opacity .15s}.edge.link path{stroke-dasharray:5 4}.edge.faded{opacity:.15}.arrowhead{fill:var(--muted)}.edge-label rect{fill:var(--bg);stroke:var(--line)}.edge-label text{fill:var(--ink);font-size:11px}

package/dist/app/index.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>spark-joy review</title>
     <link rel="icon" href="./favicon.svg" type="image/svg+xml" />
-    <script type="module" crossorigin src="/assets/index-XTDapI2X.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BRFjS_MK.css">
+    <script type="module" crossorigin src="/assets/index-CX9CpO88.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-ChCdW9F8.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/cli.js

@@ -1,7 +1,7 @@
 // cli/index.ts
-import { copyFile, mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "fs/promises";
-import { homedir } from "os";
-import { join as join3 } from "path";
+import { copyFile, mkdir as mkdir3, mkdtemp, readFile as readFile4, rm as rm2, writeFile as writeFile3 } from "fs/promises";
+import { homedir, tmpdir } from "os";
+import { join as join4, relative } from "path";
 import { fileURLToPath } from "url";
 import { parseArgs } from "util";
 
@@ -44,6 +44,9 @@ var Meta = z.object({
   mergeBase: z.string(),
   headSha: z.string(),
   working: z.boolean(),
+  // What the diff covers. `mergeBase` is the commit it starts from: the
+  // merge-base for "pr" and "working", HEAD for "staged" and "uncommitted".
+  source: z.enum(["pr", "working", "staged", "uncommitted"]).optional(),
   createdAt: z.string(),
   stats: z.object({
     files: z.number().int(),
@@ -62,7 +65,9 @@ var Chunk = z.object({
   hunks: z.array(z.string()),
   dependsOn: z.array(z.string()).default([]),
   reviewFocus: z.array(z.string()).default([]),
-  risk: Risk.default("low")
+  risk: Risk.default("low"),
+  // Split mode: the branch this chunk becomes.
+  branch: z.string().min(1).optional()
 });
 var Strategy = z.object({
   id: z.string().min(1),
@@ -86,6 +91,8 @@ var PlanLink = z.object({
   label: z.string().min(1)
 });
 var Plan = z.object({
+  // "split" turns the plan into stacked PRs for the author instead of a review.
+  mode: z.enum(["review", "split"]).default("review"),
   title: z.string().optional(),
   overview: z.string().optional(),
   strategies: z.array(Strategy).min(1),
@@ -116,6 +123,10 @@ var emptyState = () => ReviewState.parse({});
 // shared/derive.ts
 var isIgnorable = (h) => h.flags.some((f) => IGNORABLE_FLAGS.includes(f));
 var changedLines = (hs) => hs.reduce((n, h) => n + h.added + h.removed, 0);
+var headLabel = (meta) => meta.source === "staged" ? "index" : meta.working ? "working tree" : `HEAD ${meta.headSha.slice(0, 8)}`;
+var branchSlug = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40).replace(/-+$/, "") || "pr";
+var defaultPrefix = (branch) => branch === "HEAD" ? "split" : `${branch}-split`;
+var branchName = (prefix, n, c) => c.branch ?? `${prefix}/${n}-${branchSlug(c.title)}`;
 var chunkNoteKey = (strategyId, chunkId) => `${strategyId}/${chunkId}`;
 function strategyView(plan, hunks, strategyId) {
   const strategy = plan.strategies.find((s) => s.id === strategyId) ?? plan.strategies[0];
@@ -185,6 +196,7 @@ var PADDING = [
   [/^(introduces|adds support for|implements)\b/i, "drop the opener"],
   [/\b(various|several|some|basically|simply|just|really|very)\b/i, "drop the filler word"]
 ];
+var validBranch = (b) => !/[\s~^:?*[\\]|\.\.|@\{|\/\/|^[/.-]|[/.]$|\.lock$|\/\./.test(b) && b !== "@";
 var words = (s) => s.trim().split(/\s+/).filter(Boolean).length;
 function validatePlan(raw, hunks, budget = CHUNK_LINE_BUDGET) {
   const parsed = Plan.safeParse(raw);
@@ -225,7 +237,12 @@ function validatePlan(raw, hunks, budget = CHUNK_LINE_BUDGET) {
         warn("skim", `${describe(h)} is not flagged mechanical; make sure it really only needs a skim`);
     }
   }
-  if (plan.strategies.length < 2)
+  const split = plan.mode === "split";
+  if (split) {
+    if (plan.strategies.length !== 1 || plan.strategies[0].id !== "split")
+      error("strategies", 'split mode takes exactly one strategy, with id "split"');
+    if (plan.skim.length) error("skim", "split mode has no skim; put every hunk in a PR");
+  } else if (plan.strategies.length < 2)
     warn("strategies", "only one strategy; the reviewer is meant to choose between a foundations-first and a by-feature order");
   const strategyIds = /* @__PURE__ */ new Set();
   for (const s of plan.strategies) {
@@ -234,8 +251,14 @@ function validatePlan(raw, hunks, budget = CHUNK_LINE_BUDGET) {
     strategyIds.add(s.id);
     const seen = /* @__PURE__ */ new Map();
     const chunkIndex = /* @__PURE__ */ new Map();
+    const branches = /* @__PURE__ */ new Set();
     s.chunks.forEach((c, i) => {
       const cw = `${where} / chunk ${c.id}`;
+      if (c.branch !== void 0) {
+        if (!validBranch(c.branch)) error(cw, `invalid branch name "${c.branch}"`);
+        else if (branches.has(c.branch)) error(cw, `branch ${c.branch} is used twice`);
+        branches.add(c.branch);
+      }
       if (chunkIndex.has(c.id)) error(cw, "duplicate chunk id");
       chunkIndex.set(c.id, i);
       if (c.hunks.length === 0) error(cw, "chunk has no hunks");
@@ -267,9 +290,9 @@ function validatePlan(raw, hunks, budget = CHUNK_LINE_BUDGET) {
         }
       }
     });
-    const missing = hunks.filter((h) => !seen.has(h.id) && !skim.has(h.id) && !isIgnorable(h));
+    const missing = hunks.filter((h) => !seen.has(h.id) && !skim.has(h.id) && (split || !isIgnorable(h)));
     if (missing.length)
-      error(where, `hunks not in any chunk or skim: ${missing.map(describe).join(", ")}`);
+      error(where, `hunks not in any ${split ? "PR" : "chunk or skim"}: ${missing.map(describe).join(", ")}`);
   }
   plan.links.forEach((l, i) => {
     const lw = `link ${i + 1} (${l.from}\u2192${l.to})`;
@@ -277,7 +300,7 @@ function validatePlan(raw, hunks, budget = CHUNK_LINE_BUDGET) {
     if (l.from === l.to) error(lw, "links a hunk to itself");
     tooLong(lw, "label", l.label, BUDGET.linkLabel);
   });
-  if (plan.features.length === 0) warn("features", "no features; the summary page will be empty");
+  if (plan.features.length === 0 && !split) warn("features", "no features; the summary page will be empty");
   const inFeature = /* @__PURE__ */ new Set();
   plan.features.forEach((f, i) => {
     const fw = `feature ${i + 1} (${f.title})`;
@@ -646,9 +669,10 @@ function computeLinks(hunks) {
 import { execFile } from "child_process";
 import { promisify } from "util";
 var exec = promisify(execFile);
-async function git(cwd, args, input) {
+async function git(cwd, args, input, env) {
   const child = exec("git", ["-c", "core.quotePath=false", ...args], {
     cwd,
+    ...env ? { env: { ...process.env, ...env } } : {},
     maxBuffer: 1024 * 1024 * 1024,
     encoding: "utf8"
   });
@@ -692,7 +716,8 @@ function diff(cwd, from, to) {
     "--dst-prefix=b/",
     from
   ];
-  if (to) args.push(to);
+  if (to === "index") args.splice(1, 0, "--cached");
+  else if (to) args.push(to);
   return git(cwd, args);
 }
 async function untracked(cwd) {
@@ -726,7 +751,8 @@ function runPaths(root, name) {
     plan: join(dir, "plan.json"),
     state: join(dir, "review-state.json"),
     review: join(dir, "review.md"),
-    links: join(dir, "links.json")
+    links: join(dir, "links.json"),
+    prs: join(dir, "prs.md")
   };
 }
 async function ensureRunsDir(root) {
@@ -843,11 +869,15 @@ function buildHunks(files, attrGenerated = /* @__PURE__ */ new Set(), splitAt) {
 async function extract(opts) {
   const root = await repoRoot(opts.cwd);
   const branch = await currentBranch(root);
-  const base = opts.base ?? await defaultBase(root);
-  const baseSha = await revParse(root, base);
+  const source = opts.source ?? (opts.working ? "working" : "pr");
+  const local = source === "staged" || source === "uncommitted";
+  if (local && opts.base) throw new Error(`--${source} always diffs against HEAD; drop the base`);
   const headSha = await revParse(root, "HEAD");
-  const mb = await mergeBase(root, baseSha, headSha);
-  const text = await diff(root, mb, opts.working ? void 0 : headSha);
+  const base = local ? "HEAD" : opts.base ?? await defaultBase(root);
+  const baseSha = local ? headSha : await revParse(root, base);
+  const mb = local ? headSha : await mergeBase(root, baseSha, headSha);
+  const working = source === "working" || source === "uncommitted";
+  const text = await diff(root, mb, source === "staged" ? "index" : working ? void 0 : headSha);
   const files = parseDiff(text);
   const attr = await generatedByAttr(root, files.map((f) => f.file));
   const hunks = buildHunks(files, attr, opts.splitAt);
@@ -860,7 +890,8 @@ async function extract(opts) {
     baseSha,
     mergeBase: mb,
     headSha,
-    working: !!opts.working,
+    working,
+    source,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     stats: {
       files: files.length,
@@ -875,7 +906,7 @@ async function extract(opts) {
   await writeJson(paths.hunks, hunks);
   await writeJson(paths.meta, meta);
   await writeJson(paths.links, computeLinks(hunks));
-  const untracked2 = opts.working ? await untracked(root) : [];
+  const untracked2 = working ? await untracked(root) : [];
   return { paths, meta, hunks, untracked: untracked2 };
 }
 
@@ -890,11 +921,10 @@ function exportMarkdown(meta, hunks, plan, state) {
   if (!view) return "";
   const reviewed = new Set(state.reviewed);
   const p = progress(view, reviewed);
-  const head = meta.working ? "working tree" : meta.headSha.slice(0, 8);
   const pct = p.linesTotal ? Math.round(100 * p.linesDone / p.linesTotal) : 100;
   const out = [];
   out.push(`# Review: ${plan.title ?? meta.branch}`, "");
-  out.push(`${p.done}/${p.total} chunks \xB7 ${pct}% lines \xB7 \`${meta.base}\` \u2192 ${head}`, "");
+  out.push(`${p.done}/${p.total} chunks \xB7 ${pct}% lines \xB7 \`${meta.base}\` \u2192 ${headLabel(meta)}`, "");
   if (plan.features.length) {
     out.push("## Features", "");
     for (const f of plan.features) {
@@ -930,9 +960,8 @@ function exportMarkdown(meta, hunks, plan, state) {
 var short = (sha) => sha.slice(0, 8);
 var clip = (s, n) => s.length > n ? `${s.slice(0, n - 1)}\u2026` : s;
 function describeMeta(meta) {
-  const head = meta.working ? "working tree" : `HEAD ${short(meta.headSha)}`;
   const { files, hunks, added, removed } = meta.stats;
-  return `run ${meta.run}: ${meta.base} (${short(meta.mergeBase)}) \u2192 ${head} on ${meta.branch}
+  return `run ${meta.run}: ${meta.base} (${short(meta.mergeBase)}) \u2192 ${headLabel(meta)} on ${meta.branch}
 ${files} files, ${hunks} hunks, +${added} \u2212${removed}`;
 }
 function gist(h) {
@@ -1122,6 +1151,215 @@ async function serve(opts) {
   };
 }
 
+// cli/lib/stack.ts
+import { execFile as execFile2 } from "child_process";
+import { lstat, readFile as readFile3, readlink, rm } from "fs/promises";
+import { join as join3 } from "path";
+import { promisify as promisify2 } from "util";
+var execP = promisify2(execFile2);
+var ZERO = "0".repeat(40);
+function toLines(text) {
+  const out = [];
+  let i = 0;
+  while (i < text.length) {
+    const j = text.indexOf("\n", i);
+    if (j < 0) {
+      out.push(text.slice(i));
+      break;
+    }
+    out.push(text.slice(i, j + 1));
+    i = j + 1;
+  }
+  return out;
+}
+function sides(h) {
+  const old = [];
+  const neu = [];
+  h.lines.forEach((l, i) => {
+    const p = l[0];
+    if (p === "\\") return;
+    const text = l.slice(1) + (h.lines[i + 1]?.startsWith("\\") ? "" : "\n");
+    if (p !== "+") old.push(text);
+    if (p !== "-") neu.push(text);
+  });
+  return { old, new: neu };
+}
+function applyHunks(oldText, hunks) {
+  const old = toLines(oldText);
+  const out = [];
+  let pos = 0;
+  for (const h of [...hunks].sort((a, b) => a.oldStart - b.oldStart)) {
+    const start = h.oldLines === 0 ? h.oldStart : h.oldStart - 1;
+    const s = sides(h);
+    if (start < pos || old.slice(start, start + h.oldLines).join("") !== s.old.join(""))
+      throw new Error(`hunk ${h.id} doesn't match ${h.file}; re-run \`spark-joy extract\``);
+    out.push(...old.slice(pos, start), ...s.new);
+    pos = start + h.oldLines;
+  }
+  out.push(...old.slice(pos));
+  return out.join("");
+}
+function groupByFile(hunks) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const h of hunks) {
+    const key = `${h.oldFile ?? ""}\0${h.file}`;
+    let f = groups.get(key);
+    if (!f) groups.set(key, f = { file: h.file, oldFile: h.oldFile, status: h.status, hunks: [] });
+    f.hunks.push(h);
+  }
+  return [...groups.values()];
+}
+async function treeEntry(root, rev, path) {
+  const out = await git(root, ["ls-tree", "-z", rev, "--", path]);
+  const m = /^(\d+) \w+ ([0-9a-f]+)\t/.exec(out);
+  return m ? { mode: m[1], sha: m[2] } : void 0;
+}
+async function targetEntry(root, meta, path) {
+  const source = meta.source ?? (meta.working ? "working" : "pr");
+  let e;
+  if (source === "pr") e = await treeEntry(root, meta.headSha, path);
+  else if (source === "staged") {
+    const m = /^(\d+) ([0-9a-f]+) 0\t/.exec(await git(root, ["ls-files", "-s", "-z", "--", path]));
+    if (m) e = { mode: m[1], sha: m[2] };
+  } else {
+    const full = join3(root, path);
+    const st = await lstat(full);
+    const content = st.isSymbolicLink() ? await readlink(full) : await readFile3(full);
+    const mode = st.isSymbolicLink() ? "120000" : st.mode & 73 ? "100755" : "100644";
+    const sha = st.isSymbolicLink() ? (await git(root, ["hash-object", "-w", "--stdin"], content)).trim() : (await git(root, ["hash-object", "-w", "--", path])).trim();
+    e = { mode, sha };
+  }
+  if (!e) throw new Error(`${path} is missing from the ${source} source; re-run \`spark-joy extract\``);
+  return e;
+}
+var blob = async (root, text) => (await git(root, ["hash-object", "-w", "--stdin"], text)).trim();
+async function fileUpdate(root, meta, f, done) {
+  const applied = f.hunks.filter((h) => done.has(h.id));
+  const all = applied.length === f.hunks.length;
+  const textual = applied.filter((h) => h.lines.length > 0);
+  const oldPath = f.oldFile ?? f.file;
+  const remove = (p) => `0 ${ZERO}	${p}`;
+  const lines = [];
+  if (f.status === "renamed") lines.push(remove(oldPath));
+  if (f.status === "deleted" && all) return [remove(f.file)];
+  const old = f.status === "added" ? void 0 : await treeEntry(root, meta.mergeBase, oldPath);
+  const binary = f.hunks.some((h) => h.flags.includes("binary"));
+  const target = f.status === "deleted" ? void 0 : await targetEntry(root, meta, f.file);
+  if (binary || all && f.hunks.every((h) => h.lines.length === 0)) {
+    lines.push(`${target.mode} ${target.sha}	${f.file}`);
+    return lines;
+  }
+  const oldText = old ? await git(root, ["cat-file", "blob", old.sha]) : "";
+  const sha = await blob(root, applyHunks(oldText, textual));
+  const mode = all && target ? target.mode : old?.mode ?? target.mode;
+  lines.push(`${mode} ${sha}	${f.file}`);
+  return lines;
+}
+async function buildStack(o) {
+  const { root, meta, hunks } = o;
+  const strategy = o.plan.strategies.find((s) => s.id === "split");
+  if (o.plan.mode !== "split" || !strategy) throw new Error('not a split plan; set "mode": "split"');
+  const head = await revParse(root, "HEAD");
+  if (head !== meta.headSha) throw new Error("HEAD moved since extract; re-run `spark-joy extract`");
+  const byId = new Map(hunks.map((h) => [h.id, h]));
+  const files = groupByFile(hunks);
+  const env = { GIT_INDEX_FILE: o.indexFile };
+  await rm(o.indexFile, { force: true });
+  await git(root, ["read-tree", meta.mergeBase], void 0, env);
+  const done = /* @__PURE__ */ new Set();
+  const prs = [];
+  let parent = meta.mergeBase;
+  try {
+    for (const [i, chunk] of strategy.chunks.entries()) {
+      for (const id of chunk.hunks) done.add(id);
+      const ids = new Set(chunk.hunks);
+      const touched = files.filter((f) => f.hunks.some((h) => ids.has(h.id)));
+      const updates = (await Promise.all(touched.map((f) => fileUpdate(root, meta, f, done)))).flat();
+      await git(root, ["update-index", "-z", "--index-info"], updates.map((u) => `${u}\0`).join(""), env);
+      const tree = (await git(root, ["write-tree"], void 0, env)).trim();
+      const message = `${chunk.title}
+
+${chunk.intent}
+`;
+      const commit = (await git(root, ["commit-tree", tree, "-p", parent], message)).trim();
+      prs.push({
+        n: i + 1,
+        chunk,
+        branch: branchName(o.prefix, i + 1, chunk),
+        commit,
+        lines: changedLines(chunk.hunks.map((id) => byId.get(id)).filter(Boolean)),
+        files: touched.length
+      });
+      parent = commit;
+    }
+  } finally {
+    await rm(o.indexFile, { force: true });
+  }
+  await verify(root, meta, parent);
+  return { base: meta.mergeBase, prs };
+}
+async function verify(root, meta, top) {
+  const source = meta.source ?? (meta.working ? "working" : "pr");
+  let differ;
+  if (source === "pr" || source === "staged") {
+    const want = source === "pr" ? `${meta.headSha}^{tree}` : (await git(root, ["write-tree"])).trim();
+    differ = await git(root, ["diff", "--name-only", "--no-ext-diff", "--no-textconv", `${top}^{tree}`, want]);
+  } else differ = await git(root, ["diff", "--name-only", "--no-ext-diff", "--no-textconv", top]);
+  const files = differ.split("\n").filter(Boolean);
+  if (files.length)
+    throw new Error(
+      `the stack doesn't reproduce your changes in ${files.join(", ")}; re-run \`spark-joy extract\`. No branches were created`
+    );
+}
+async function createBranches(root, stack, force) {
+  const current = await currentBranch(root);
+  const taken = [];
+  for (const pr of stack.prs) {
+    const ok = await git(root, ["check-ref-format", "--branch", pr.branch]).then(() => true, () => false);
+    if (!ok) throw new Error(`invalid branch name ${pr.branch}`);
+    if (pr.branch === current) throw new Error(`${pr.branch} is checked out; pick another --prefix`);
+    const exists2 = await git(root, ["rev-parse", "--verify", "--quiet", `refs/heads/${pr.branch}`]).then(() => true, () => false);
+    if (exists2) taken.push(pr.branch);
+  }
+  if (taken.length && !force) throw new Error(`branches already exist: ${taken.join(", ")}; pass --force to move them`);
+  for (const pr of stack.prs) {
+    const args = ["update-ref", "-m", "spark-joy split", `refs/heads/${pr.branch}`, pr.commit];
+    await git(root, force ? args : [...args, ZERO]);
+  }
+}
+async function checkStack(root, stack, cmd, tmp) {
+  const results = [];
+  for (const pr of stack.prs) {
+    const dir = join3(tmp, `pr-${pr.n}`);
+    await git(root, ["worktree", "add", "--detach", "--quiet", dir, pr.commit]);
+    try {
+      const r = await execP(cmd, { cwd: dir, shell: true, maxBuffer: 64 * 1024 * 1024 }).then(
+        (out) => ({ ok: true, out }),
+        (e) => ({ ok: false, out: { stdout: e.stdout ?? "", stderr: e.stderr ?? "" } })
+      );
+      results.push({ n: pr.n, ok: r.ok, output: `${r.out.stdout}${r.out.stderr}` });
+    } finally {
+      await git(root, ["worktree", "remove", "--force", dir]).catch(() => void 0);
+    }
+  }
+  return results;
+}
+function prsMarkdown(meta, stack) {
+  const target = meta.source === "staged" || meta.source === "uncommitted" ? meta.branch : meta.base.replace(/^origin\//, "");
+  const out = [];
+  stack.prs.forEach((pr, i) => {
+    const c = pr.chunk;
+    out.push(`## ${pr.n}. ${c.title}`, "");
+    out.push(`\`${pr.branch}\` \u2192 \`${i === 0 ? target : stack.prs[i - 1].branch}\` \xB7 ${pr.lines} lines`, "");
+    out.push(c.intent, "");
+    for (const q of c.reviewFocus) out.push(`- ${q}`);
+    if (c.reviewFocus.length) out.push("");
+    const deps = c.dependsOn.map((d) => stack.prs.find((p) => p.chunk.id === d)?.n).filter((n) => n && n < pr.n - 1);
+    if (deps.length) out.push(`Depends on ${deps.map((n) => `PR ${n}`).join(", ")}.`, "");
+  });
+  return out.join("\n");
+}
+
 // cli/index.ts
 var PKG_ROOT = fileURLToPath(new URL("..", import.meta.url));
 var HELP = `spark-joy: break a huge PR into reviewable chunks
@@ -1131,6 +1369,8 @@ Usage: spark-joy <command> [options]
 Commands:
   extract [base]        Diff merge-base(base, HEAD)..HEAD into hunks (base defaults to origin's default branch)
       --working         Diff against the working tree (uncommitted changes) instead of HEAD
+      --staged          Only staged changes (HEAD \u2192 index); for split
+      --uncommitted     Only uncommitted changes (HEAD \u2192 working tree); for split
       --split-at <n>    Split hunks longer than n lines (default 150)
   outline               Compact per-file, per-hunk overview of the diff
   show <ids...>         Print hunks in full; accepts h003, h003..h010, or a parent id like h012
@@ -1142,6 +1382,11 @@ Commands:
       --port <n>        Port to listen on (default 4848)
   export                Write review.md with progress, notes and the feature summary
       --stdout          Print instead of writing the file
+  split                 Dry run of a split plan: build the stacked PRs and check they add up
+      --check <cmd>     Run cmd on each PR in a temporary worktree, e.g. "npm ci && npm test"
+      --apply           Create the branches (never pushes)
+      --prefix <name>   Branch prefix (default <branch>-split)
+      --force           Move branches that already exist
   install-skill         Install the Claude Code skill into ~/.claude/skills/spark-joy
       --project         Install into ./.claude/skills/spark-joy instead
 
@@ -1162,6 +1407,12 @@ async function main(argv, cwd = process.cwd()) {
     options: {
       run: { type: "string" },
       working: { type: "boolean" },
+      staged: { type: "boolean" },
+      uncommitted: { type: "boolean" },
+      apply: { type: "boolean" },
+      prefix: { type: "string" },
+      force: { type: "boolean" },
+      check: { type: "string" },
       "split-at": { type: "string" },
       file: { type: "string" },
       json: { type: "boolean" },
@@ -1174,7 +1425,7 @@ async function main(argv, cwd = process.cwd()) {
   });
   const [cmd, ...rest] = positionals;
   if (values.version) {
-    const pkg = JSON.parse(await readFile3(join3(PKG_ROOT, "package.json"), "utf8"));
+    const pkg = JSON.parse(await readFile4(join4(PKG_ROOT, "package.json"), "utf8"));
     console.log(pkg.version);
     return 0;
   }
@@ -1186,9 +1437,11 @@ async function main(argv, cwd = process.cwd()) {
     case "extract": {
       const splitAt = values["split-at"] ? Number(values["split-at"]) : void 0;
       if (splitAt !== void 0 && !(splitAt >= 40)) throw new Error("--split-at must be a number \u2265 40");
-      const r = await extract({ cwd, base: rest[0], working: values.working, run: values.run, splitAt });
+      const flags = ["working", "staged", "uncommitted"].filter((f) => values[f]);
+      if (flags.length > 1) throw new Error(`pick one of ${flags.map((f) => `--${f}`).join(", ")}`);
+      const r = await extract({ cwd, base: rest[0], source: flags[0], run: values.run, splitAt });
       console.log(describeMeta(r.meta));
-      console.log(`wrote ${r.paths.dir}`);
+      console.log(`wrote ${relative(cwd, r.paths.dir)}`);
       if (r.hunks.length === 0) console.log("the diff is empty; nothing to review");
       if (r.untracked.length)
         console.log(`note: ${r.untracked.length} untracked file(s) are not included; \`git add -N <file>\` to include them`);
@@ -1231,7 +1484,7 @@ async function main(argv, cwd = process.cwd()) {
     case "serve": {
       const p = await run(cwd, values.run);
       const port = values.port ? Number(values.port) : 4848;
-      const s = await serve({ paths: p, appDir: join3(PKG_ROOT, "dist", "app"), port });
+      const s = await serve({ paths: p, appDir: join4(PKG_ROOT, "dist", "app"), port });
       console.log(`spark-joy reviewing ${p.name} at ${s.url}  (Ctrl+C to stop)`);
       await new Promise((resolve) => process.once("SIGINT", resolve));
       await s.close();
@@ -1247,14 +1500,59 @@ async function main(argv, cwd = process.cwd()) {
       if (values.stdout) process.stdout.write(md);
       else {
         await writeFile3(p.review, md);
-        console.log(`wrote ${p.review}`);
+        console.log(`wrote ${relative(cwd, p.review)}`);
+      }
+      return 0;
+    }
+    case "split": {
+      const p = await run(cwd, values.run);
+      const raw = await readPlanRaw(p);
+      if (raw === void 0) throw new Error(`no plan yet; write ${p.plan}`);
+      const hunks = await readHunks(p);
+      const result = validatePlan(raw, hunks);
+      if (!result.ok || !result.plan) throw new Error("the plan has errors; run `spark-joy validate`");
+      const meta = await readMeta(p);
+      const prefix = values.prefix ?? defaultPrefix(meta.branch);
+      const stack = await buildStack({
+        root: meta.repoRoot,
+        meta,
+        hunks,
+        plan: result.plan,
+        prefix,
+        indexFile: join4(p.dir, "split.index")
+      });
+      for (const pr of stack.prs)
+        console.log(`${String(pr.n).padStart(2)}  ${pr.branch}  ${pr.lines} lines, ${pr.files} files  ${pr.chunk.title}`);
+      console.log(`${stack.prs.length} PRs; the last one matches your changes exactly`);
+      if (values.check !== void 0) {
+        const tmp = await mkdtemp(join4(tmpdir(), "spark-joy-check-"));
+        try {
+          const results = await checkStack(meta.repoRoot, stack, values.check, tmp);
+          for (const r of results) {
+            console.log(`PR ${r.n}: ${r.ok ? "passed" : "failed"}`);
+            if (!r.ok) console.log(r.output.trimEnd().split("\n").slice(-20).map((l) => `    ${l}`).join("\n"));
+          }
+          if (results.some((r) => !r.ok)) return 1;
+        } finally {
+          await rm2(tmp, { recursive: true, force: true });
+        }
+      }
+      await writeFile3(p.prs, prsMarkdown(meta, stack));
+      if (!values.apply) {
+        console.log(`wrote ${relative(cwd, p.prs)}
+nothing created; add --apply to create the branches`);
+        return 0;
       }
+      await createBranches(meta.repoRoot, stack, !!values.force);
+      console.log(`created ${stack.prs.length} branches; your working tree is unchanged. To publish:`);
+      for (const pr of stack.prs) console.log(`  git push -u origin ${pr.branch}`);
+      console.log(`PR titles and descriptions: ${relative(cwd, p.prs)}`);
       return 0;
     }
     case "install-skill": {
-      const dir = values.project ? join3(await repoRoot(cwd), ".claude", "skills", "spark-joy") : join3(homedir(), ".claude", "skills", "spark-joy");
+      const dir = values.project ? join4(await repoRoot(cwd), ".claude", "skills", "spark-joy") : join4(homedir(), ".claude", "skills", "spark-joy");
       await mkdir3(dir, { recursive: true });
-      await copyFile(join3(PKG_ROOT, "plugin", "skills", "spark-joy", "SKILL.md"), join3(dir, "SKILL.md"));
+      await copyFile(join4(PKG_ROOT, "plugin", "skills", "spark-joy", "SKILL.md"), join4(dir, "SKILL.md"));
       console.log(`installed skill to ${dir}; use /spark-joy in Claude Code`);
       return 0;
     }