@helmsmith/workbrokr 0.3.0 → 0.3.1

package/SKILL.md

@@ -65,3 +65,5 @@ work pr <area> --title "feat(area): what changed" --body-file /tmp/pr-body.md
 ```
 
 `work pr` pushes the branch first, then opens the PR through `pritty pr --no-push --auto-approve --json` against the manifest's base branch, and stores `{ number, url, draft }` on the effort (`work status` shows it). Run it again and it returns the same PR; pass `--title`/`--body-file` again to update the PR's words in place. If the stored PR was merged or closed it refuses with `PR_CLOSED`; `--force` opens a new one. Write the body in the repository's PR conventions; the attribution footer comes from pritty's `prFooter`, not from you. Always pass a title and a body: pritty's AI path is the fallback, never the default. Needs `@helmsmith/pritty` 0.1.1 or newer on PATH.
+
+`--story` takes a path relative to the manifest's Storybook host (`app-ui` in skoolscout): a folder, a story or module file, or a bare stem such as `components/discover-schools/dashboards/charts/ChartSkeleton` (storybrokr 0.3.1 or newer resolves a stem to its file).

package/dist/cli.js

@@ -165,6 +165,22 @@ var Git = class _Git {
     else if (this.remoteBranchExists(this.currentBranch())) ref = `origin/${this.currentBranch()}`;
     return this.lines(["rev-list", `${ref}..HEAD`]).length;
   }
+  /** Non-merge commits on HEAD that origin/<base> does not have: the branch's own work (sync merges do not count). */
+  ownCommitCount(base) {
+    const r = this.tryRun(["rev-list", "--count", "--no-merges", `origin/${base}..HEAD`]);
+    return r.code === 0 ? Number(r.out.trim()) || 0 : 0;
+  }
+  /** `branch` is already in origin/<base>: an ancestor of it, patch-equivalent (squash-merged), or without own commits. */
+  branchMergedInto(branch, base) {
+    const target = `origin/${base}`;
+    if (this.isAncestor(branch, target)) return true;
+    const own = this.tryRun(["rev-list", "--count", "--no-merges", `${target}..${branch}`]);
+    if (own.code === 0 && Number(own.out.trim()) === 0) return true;
+    const cherry = this.tryRun(["cherry", target, branch]);
+    if (cherry.code !== 0) return false;
+    const lines = cherry.out.split("\n").map((l) => l.trim()).filter(Boolean);
+    return lines.length > 0 && lines.every((l) => l.startsWith("- "));
+  }
   /** Commits on origin/<base> that HEAD does not have (0 when the ref is unknown). */
   behindCount(base) {
     const r = this.tryRun(["rev-list", "--count", `HEAD..origin/${base}`]);
@@ -1630,7 +1646,7 @@ var storybrokrCli = {
 };
 
 // src/lib/pritty.ts
-var MIN_PRITTY_VERSION = "0.1.1";
+var MIN_PRITTY_VERSION = "0.1.2";
 function assertPrittyVersion(client) {
   const found = client.version();
   if (compareSemver(found, MIN_PRITTY_VERSION) < 0) {
@@ -1696,11 +1712,11 @@ var prittyCli = {
         }
       );
     }
-    const j = lastJsonLine(
-      r.out,
-      "pr --check"
-    );
-    return j.open ? { number: j.open.number, url: j.open.url, draft: Boolean(j.open.draft) } : null;
+    const j = lastJsonLine(r.out, "pr --check");
+    return {
+      open: j.open ? { number: j.open.number, url: j.open.url, draft: Boolean(j.open.draft) } : null,
+      last: j.last ?? null
+    };
   }
 };
 
@@ -2563,7 +2579,9 @@ async function finishEffort(ctx, o) {
       );
     }
   }
-  if (!o.intoArea) {
+  fetchBaseOnce(ctx);
+  const shouldPush = !o.intoArea && (g.ownCommitCount(m.baseBranch) > 0 || g.remoteBranchExists(effort.branch));
+  if (shouldPush) {
     try {
       g.push(effort.branch);
     } catch (err) {
@@ -2597,14 +2615,14 @@ async function finishEffort(ctx, o) {
     ctx.registry.removeEfforts((e) => e.id === effort.id);
     return {
       effort: finished2,
-      pushed: !o.intoArea,
+      pushed: shouldPush,
       parked,
       mergedIntoArea: Boolean(o.intoArea),
       notices
     };
   }
   const finished = ctx.registry.updateEffort(effort.id, { state: "finished", lastActivity: now() });
-  return { effort: finished, pushed: true, parked, notices };
+  return { effort: finished, pushed: shouldPush, parked, notices };
 }
 async function reapLeases(ctx, o = {}) {
   const m = ctx.manifest;
@@ -2719,10 +2737,12 @@ async function retireArea(ctx, o) {
   const branchesDeleted = [];
   const branchesKept = [];
   const allAreaBranches = m.branch.types.map((type) => `${type}/${o.area}`);
+  fetchBaseOnce(ctx);
   for (const branch of allAreaBranches) {
     if (!main.branchExists(branch)) continue;
     const onOrigin = main.remoteBranchExists(branch) && main.tryRun(["rev-list", "--count", `origin/${branch}..${branch}`]).out.trim() === "0";
-    if (onOrigin) {
+    const mergedIntoBase = !onOrigin && main.branchMergedInto(branch, m.baseBranch);
+    if (onOrigin || mergedIntoBase) {
       main.deleteLocalBranch(branch);
       branchesDeleted.push(branch);
     } else branchesKept.push(branch);
@@ -2784,7 +2804,7 @@ async function prEffort(ctx, o) {
     return updated;
   };
   if (effort.pr) {
-    const open = await ctx.pritty.check({ cwd: effort.worktree, base: m.baseBranch });
+    const { open, last } = await ctx.pritty.check({ cwd: effort.worktree, base: m.baseBranch });
     if (open) {
       if (!given) {
         return { effort: store(open), pr: open, created: false, behindBase: behind, warnings };
@@ -2801,10 +2821,11 @@ async function prEffort(ctx, o) {
       return { effort: store(pr2), pr: pr2, created: false, behindBase: behind, warnings };
     }
     if (!o.force) {
+      const fate = last?.number === effort.pr.number ? last.state === "MERGED" ? "was merged" : "was closed without merging" : "is no longer open";
       throw new WorkkitError(
         "PR_CLOSED",
-        `PR #${effort.pr.number} for ${label} is no longer open (${effort.pr.url}); pass --force to open a new one`,
-        { pr: effort.pr }
+        `PR #${effort.pr.number} for ${label} ${fate} (${effort.pr.url}); pass --force to open a new one`,
+        { pr: effort.pr, state: last?.state }
       );
     }
   }