Add thinktank clean command to manage worktree accumulation (#98)

- Lists and removes all thinktank worktrees (safely unlinks junctions first)
- Prunes orphaned worktrees, deletes thinktank/* branches
- --all flag to also delete .thinktank/ run history
- 5 tests for clean functionality

Generated by thinktank Opus (5 agents, 2 succeeded, Agent #5 recommended).

Closes #56

Co-authored-by: unknown <that-github-user@github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: 3 people

src/cli.ts

@@ -2,6 +2,7 @@
 
 import { Command } from "commander";
 import { apply } from "./commands/apply.js";
+import { clean } from "./commands/clean.js";
 import { compare } from "./commands/compare.js";
 import { list } from "./commands/list.js";
 import { run } from "./commands/run.js";
@@ -98,6 +99,16 @@ program
     await list();
   });
 
+program
+  .command("clean")
+  .description("Remove thinktank worktrees, branches, and optionally run history")
+  .option("--all", "Also delete .thinktank/ run history")
+  .action(async (opts) => {
+    await clean({
+      all: opts.all ?? false,
+    });
+  });
+
 program
   .command("stats")
   .description("Show aggregate statistics across all thinktank runs")

src/commands/clean.test.ts

@@ -0,0 +1,49 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { parseThinktankWorktrees } from "./clean.js";
+
+describe("parseThinktankWorktrees", () => {
+  it("extracts thinktank-agent paths from git worktree list output", () => {
+    const output = [
+      "/home/user/project  abc1234 [main]",
+      "/tmp/thinktank-agent-1-abcd1234  def5678 [thinktank/agent-1-abcd1234]",
+      "/tmp/thinktank-agent-2-efgh5678  ghi9012 [thinktank/agent-2-efgh5678]",
+    ].join("\n");
+
+    const result = parseThinktankWorktrees(output);
+    assert.deepEqual(result, [
+      "/tmp/thinktank-agent-1-abcd1234",
+      "/tmp/thinktank-agent-2-efgh5678",
+    ]);
+  });
+
+  it("returns empty array when no thinktank worktrees exist", () => {
+    const output = "/home/user/project  abc1234 [main]\n";
+    const result = parseThinktankWorktrees(output);
+    assert.deepEqual(result, []);
+  });
+
+  it("returns empty array for empty output", () => {
+    assert.deepEqual(parseThinktankWorktrees(""), []);
+  });
+
+  it("handles Windows-style paths", () => {
+    const output = [
+      "C:/Users/dev/project  abc1234 [main]",
+      "C:/Users/dev/AppData/Local/Temp/thinktank-agent-3-xyz  def5678 [thinktank/agent-3-xyz]",
+    ].join("\n");
+
+    const result = parseThinktankWorktrees(output);
+    assert.deepEqual(result, ["C:/Users/dev/AppData/Local/Temp/thinktank-agent-3-xyz"]);
+  });
+
+  it("ignores paths that contain thinktank but not thinktank-agent", () => {
+    const output = [
+      "/home/user/thinktank  abc1234 [main]",
+      "/tmp/thinktank-agent-1-abcd  def5678 [thinktank/agent-1-abcd]",
+    ].join("\n");
+
+    const result = parseThinktankWorktrees(output);
+    assert.deepEqual(result, ["/tmp/thinktank-agent-1-abcd"]);
+  });
+});

src/commands/clean.ts

@@ -0,0 +1,107 @@
+import { execFile } from "node:child_process";
+import { rm } from "node:fs/promises";
+import { promisify } from "node:util";
+import pc from "picocolors";
+import { cleanupBranches, getRepoRoot, removeWorktree } from "../utils/git.js";
+
+const exec = promisify(execFile);
+
+export interface CleanOptions {
+  all?: boolean;
+}
+
+/**
+ * Parse `git worktree list` output and return paths of thinktank worktrees.
+ */
+export function parseThinktankWorktrees(worktreeOutput: string): string[] {
+  const paths: string[] = [];
+  for (const line of worktreeOutput.split("\n")) {
+    // Each line: /path/to/worktree  <hash> [branch]
+    const worktreePath = line.split(/\s+/)[0];
+    if (worktreePath && /thinktank-agent/.test(worktreePath)) {
+      paths.push(worktreePath);
+    }
+  }
+  return paths;
+}
+
+export async function clean(opts: CleanOptions): Promise<void> {
+  const repoRoot = await getRepoRoot();
+  let removedCount = 0;
+
+  // Step 1: List and remove thinktank worktrees
+  console.log();
+  console.log(pc.bold("  Cleaning thinktank worktrees..."));
+
+  let worktrees: string[] = [];
+  try {
+    const { stdout } = await exec("git", ["worktree", "list"], { cwd: repoRoot });
+    worktrees = parseThinktankWorktrees(stdout);
+  } catch {
+    console.log(pc.yellow("  Could not list worktrees."));
+  }
+
+  if (worktrees.length === 0) {
+    console.log(pc.dim("  No thinktank worktrees found."));
+  } else {
+    for (const wt of worktrees) {
+      try {
+        await removeWorktree(wt);
+        console.log(`  ${pc.green("✓")} Removed ${pc.dim(wt)}`);
+        removedCount++;
+      } catch {
+        console.log(`  ${pc.yellow("!")} Failed to remove ${pc.dim(wt)}`);
+      }
+    }
+  }
+
+  // Step 2: Prune orphaned worktrees
+  console.log(pc.bold("  Pruning orphaned worktrees..."));
+  try {
+    await exec("git", ["worktree", "prune"], { cwd: repoRoot });
+    console.log(`  ${pc.green("✓")} Pruned`);
+  } catch {
+    console.log(pc.yellow("  Could not prune worktrees."));
+  }
+
+  // Step 3: Delete thinktank/* branches
+  console.log(pc.bold("  Deleting thinktank/* branches..."));
+  try {
+    const { stdout } = await exec("git", ["branch", "--list", "thinktank/*"], { cwd: repoRoot });
+    const branches = stdout
+      .split("\n")
+      .map((b) => b.trim())
+      .filter(Boolean);
+    if (branches.length === 0) {
+      console.log(pc.dim("  No thinktank branches found."));
+    } else {
+      await cleanupBranches();
+      console.log(
+        `  ${pc.green("✓")} Deleted ${branches.length} branch${branches.length === 1 ? "" : "es"}`,
+      );
+    }
+  } catch {
+    console.log(pc.dim("  No thinktank branches found."));
+  }
+
+  // Step 4: Optionally delete .thinktank/ run history
+  if (opts.all) {
+    console.log(pc.bold("  Deleting .thinktank/ run history..."));
+    try {
+      await rm(".thinktank", { recursive: true, force: true });
+      console.log(`  ${pc.green("✓")} Deleted .thinktank/`);
+    } catch {
+      console.log(pc.dim("  No .thinktank/ directory found."));
+    }
+  }
+
+  // Summary
+  console.log();
+  console.log(
+    pc.bold("  Done.") +
+      (removedCount > 0
+        ? ` Removed ${removedCount} worktree${removedCount === 1 ? "" : "s"}.`
+        : " Nothing to clean up."),
+  );
+  console.log();
+}