@pify/swarm 0.3.0 → 0.4.0

package/README.md

@@ -39,3 +39,5 @@ Without it, parallel agents cannot see each other, so two of them cheerfully fix
 ## License
 
 MIT © [Pify maintainers](https://github.com/pifydev)
+
+**Isolated runs clean up after themselves** (v0.4): a worktree whose child changed nothing is removed along with its branch — otherwise a read-only step left one of each behind, per run. Anything uncommitted, or any commit the child made, is kept and reported.

package/extensions/swarm.ts

@@ -25,7 +25,7 @@ import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 
 import { BUILTIN_AGENTS } from "../src/builtin.ts";
-import { createIsolationWorktree, isolationNote } from "../src/isolate.ts";
+import { createIsolationWorktree, isolationNote, removeIfUnchanged } from "../src/isolate.ts";
 import { formatInbox, mailboxDir, mailboxPrompt, postMessage, readInbox } from "../src/mailbox.ts";
 import { parseAgentFile } from "../src/frontmatter.ts";
 import { buildReport, buildStatusLine } from "../src/report.ts";
@@ -43,6 +43,8 @@ import { readFileSync, readdirSync } from "node:fs";
 import { basename, join } from "node:path";
 
 const RUN_ENTRY = "swarm-run";
+const CLEAN_WORKTREE_NOTE =
+  "Ran isolated in a temporary worktree; it changed nothing, so the worktree was removed.";
 
 type UiContext = ExtensionContext;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pify/swarm",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Coordinate multiple pi agents in parallel: swarm_run fan-out with per-item auto-routing, concurrency queue, aggregated reports",
   "keywords": [
     "pi-package",
@@ -61,8 +61,8 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
+    "@earendil-works/pi-coding-agent": "^0.85.1",
+    "@earendil-works/pi-tui": "^0.85.1",
     "@types/node": "^22.10.2",
     "typebox": "^1.1.38",
     "typescript": "^5.7.2"

package/src/isolate.ts

@@ -79,3 +79,36 @@ export function isolationNote(isolation: Isolation): string {
     `or inspect: cd "${isolation.path}" && git log --stat`,
   ].join("\n");
 }
+
+/**
+ * Remove a worktree the child left untouched. An isolated run that changed
+ * nothing is the common case — a review, a search, a question — and keeping
+ * its worktree means a directory and a branch per run accumulate under
+ * ~/.worktrees for as long as the machine runs. A worktree with any change,
+ * staged or not, committed or not, is kept: that is someone's work.
+ *
+ * Returns true when it was removed. Never throws: failing to clean up must
+ * not fail the run that already succeeded.
+ */
+export function removeIfUnchanged(cwd: string, isolation: Isolation): boolean {
+  try {
+    // Uncommitted work, tracked or not.
+    if (git(isolation.path, ["status", "--porcelain"]).trim()) return false;
+    // Commits made inside the worktree: the branch moved off the commit it
+    // was cut from. (A fresh agent/<slug> branch has no upstream, so asking
+    // git for "ahead of upstream" would throw here rather than answer.)
+    const head = git(isolation.path, ["rev-parse", "HEAD"]).trim();
+    const base = git(cwd, ["rev-parse", "HEAD"]).trim();
+    if (!head || head !== base) return false;
+  } catch {
+    // A worktree we cannot inspect is one we must not delete.
+    return false;
+  }
+  try {
+    git(cwd, ["worktree", "remove", "--force", isolation.path]);
+    git(cwd, ["branch", "-D", isolation.branch]);
+    return true;
+  } catch {
+    return false;
+  }
+}