@os-eco/overstory-cli 0.6.4 → 0.6.6

package/src/worktree/manager.test.ts

@@ -58,7 +58,7 @@ describe("createWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc123",
+			taskId: "bead-abc123",
 		});
 
 		expect(result.path).toBe(join(worktreesDir, "auth-login"));
@@ -71,7 +71,7 @@ describe("createWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc123",
+			taskId: "bead-abc123",
 		});
 
 		expect(existsSync(result.path)).toBe(true);
@@ -85,7 +85,7 @@ describe("createWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc123",
+			taskId: "bead-abc123",
 		});
 
 		const branchList = await git(repoDir, ["branch", "--list"]);
@@ -98,7 +98,7 @@ describe("createWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc123",
+			taskId: "bead-abc123",
 		});
 
 		await expect(
@@ -107,7 +107,7 @@ describe("createWorktree", () => {
 				baseDir: worktreesDir,
 				agentName: "auth-login",
 				baseBranch: defaultBranch,
-				beadId: "bead-abc123",
+				taskId: "bead-abc123",
 			}),
 		).rejects.toThrow(WorktreeError);
 	});
@@ -119,7 +119,7 @@ describe("createWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc123",
+			taskId: "bead-abc123",
 		});
 
 		try {
@@ -128,7 +128,7 @@ describe("createWorktree", () => {
 				baseDir: worktreesDir,
 				agentName: "auth-login",
 				baseBranch: defaultBranch,
-				beadId: "bead-abc123",
+				taskId: "bead-abc123",
 			});
 			// Should not reach here
 			expect(true).toBe(false);
@@ -174,7 +174,7 @@ describe("listWorktrees", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		await createWorktree({
@@ -182,7 +182,7 @@ describe("listWorktrees", () => {
 			baseDir: worktreesDir,
 			agentName: "data-sync",
 			baseBranch: defaultBranch,
-			beadId: "bead-xyz",
+			taskId: "bead-xyz",
 		});
 
 		const entries = await listWorktrees(repoDir);
@@ -206,7 +206,7 @@ describe("listWorktrees", () => {
 			baseDir: worktreesDir,
 			agentName: "feature-worker",
 			baseBranch: defaultBranch,
-			beadId: "bead-123",
+			taskId: "bead-123",
 		});
 
 		const entries = await listWorktrees(repoDir);
@@ -223,7 +223,7 @@ describe("listWorktrees", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		const entries = await listWorktrees(repoDir);
@@ -266,7 +266,7 @@ describe("isBranchMerged", () => {
 			baseDir: worktreesDir,
 			agentName: "feature-agent",
 			baseBranch: defaultBranch,
-			beadId: "bead-merged",
+			taskId: "bead-merged",
 		});
 
 		// Add a commit to the feature branch
@@ -285,7 +285,7 @@ describe("isBranchMerged", () => {
 			baseDir: worktreesDir,
 			agentName: "feature-agent",
 			baseBranch: defaultBranch,
-			beadId: "bead-unmerged",
+			taskId: "bead-unmerged",
 		});
 
 		// Add a commit to the feature branch (not merged)
@@ -302,7 +302,7 @@ describe("isBranchMerged", () => {
 			baseDir: worktreesDir,
 			agentName: "feature-agent",
 			baseBranch: defaultBranch,
-			beadId: "bead-same",
+			taskId: "bead-same",
 		});
 
 		// The branch was created from defaultBranch with no additional commits,
@@ -334,7 +334,7 @@ describe("removeWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		expect(existsSync(wtPath)).toBe(true);
@@ -350,7 +350,7 @@ describe("removeWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		await removeWorktree(repoDir, wtPath);
@@ -365,7 +365,7 @@ describe("removeWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		await removeWorktree(repoDir, wtPath);
@@ -381,7 +381,7 @@ describe("removeWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		// Create an untracked file in the worktree
@@ -400,7 +400,7 @@ describe("removeWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		// Add a commit in the worktree so the branch diverges (making it "unmerged")
@@ -419,7 +419,7 @@ describe("removeWorktree", () => {
 			baseDir: worktreesDir,
 			agentName: "auth-login",
 			baseBranch: defaultBranch,
-			beadId: "bead-abc",
+			taskId: "bead-abc",
 		});
 
 		// Add a commit to make the branch unmerged

package/src/worktree/manager.ts

@@ -1,3 +1,4 @@
+import { unlink } from "node:fs/promises";
 import { join } from "node:path";
 import { WorktreeError } from "../errors.ts";
 
@@ -38,7 +39,7 @@ async function runGit(
  * Create a new git worktree for an agent.
  *
  * Creates a worktree at `{baseDir}/{agentName}` with a new branch
- * named `overstory/{agentName}/{beadId}` based on `baseBranch`.
+ * named `overstory/{agentName}/{taskId}` based on `baseBranch`.
  *
  * @returns The absolute worktree path and branch name.
  */
@@ -47,12 +48,12 @@ export async function createWorktree(options: {
 	baseDir: string;
 	agentName: string;
 	baseBranch: string;
-	beadId: string;
+	taskId: string;
 }): Promise<{ path: string; branch: string }> {
-	const { repoRoot, baseDir, agentName, baseBranch, beadId } = options;
+	const { repoRoot, baseDir, agentName, baseBranch, taskId } = options;
 
 	const worktreePath = join(baseDir, agentName);
-	const branchName = `overstory/${agentName}/${beadId}`;
+	const branchName = `overstory/${agentName}/${taskId}`;
 
 	await runGit(repoRoot, ["worktree", "add", "-b", branchName, worktreePath, baseBranch], {
 		worktreePath,
@@ -196,3 +197,118 @@ export async function removeWorktree(
 		}
 	}
 }
+
+/**
+ * Preserve .seeds/ changes from a branch into the canonical branch.
+ *
+ * Lead agent branches are never merged via the normal merge pipeline, so
+ * any .seeds/ issue files they create would be lost when the worktree is
+ * cleaned. This function extracts only the .seeds/ diff from the branch
+ * and applies it to the canonical branch via a patch.
+ *
+ * @returns `{ preserved: true }` if changes were found and committed,
+ *          `{ preserved: false }` if there were no .seeds/ changes,
+ *          `{ preserved: false, error: "..." }` if something went wrong.
+ */
+export async function preserveSeedsChanges(
+	repoRoot: string,
+	branch: string,
+	canonicalBranch: string,
+	agentName: string,
+): Promise<{ preserved: boolean; error?: string }> {
+	// Step 1: Get the .seeds/ diff between canonical and the branch (three-dot diff).
+	// Three-dot diff shows changes introduced on branch since it diverged from canonicalBranch.
+	let diff: string;
+	try {
+		diff = await runGit(repoRoot, ["diff", `${canonicalBranch}...${branch}`, "--", ".seeds/"]);
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		return { preserved: false, error: `Failed to compute .seeds/ diff: ${msg}` };
+	}
+
+	if (diff.trim() === "") {
+		// No .seeds/ changes on this branch
+		return { preserved: false };
+	}
+
+	// Step 2: Verify the repo root is currently on canonicalBranch.
+	let currentBranch: string;
+	try {
+		currentBranch = (await runGit(repoRoot, ["rev-parse", "--abbrev-ref", "HEAD"])).trim();
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		return { preserved: false, error: `Failed to determine current branch: ${msg}` };
+	}
+
+	if (currentBranch !== canonicalBranch) {
+		return {
+			preserved: false,
+			error: `Repo root is on '${currentBranch}', expected '${canonicalBranch}'. Cannot apply patch.`,
+		};
+	}
+
+	// Step 3: Check that .seeds/ is clean in the canonical branch.
+	let statusOutput: string;
+	try {
+		statusOutput = await runGit(repoRoot, ["status", "--porcelain", "--", ".seeds/"]);
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		return { preserved: false, error: `Failed to check .seeds/ status: ${msg}` };
+	}
+
+	if (statusOutput.trim() !== "") {
+		return {
+			preserved: false,
+			error: `.seeds/ has uncommitted changes in canonical branch. Cannot apply patch safely.`,
+		};
+	}
+
+	// Step 4: Write diff to a temp file.
+	const tmpFile = join(repoRoot, ".overstory", `_seeds-patch-${Date.now()}.diff`);
+	try {
+		await Bun.write(tmpFile, diff);
+
+		// Step 5: Apply the patch with --index (stages changes).
+		try {
+			await runGit(repoRoot, ["apply", "--index", tmpFile]);
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : String(err);
+			// Revert any partial changes
+			try {
+				await runGit(repoRoot, ["reset", "HEAD", "--", ".seeds/"]);
+				await runGit(repoRoot, ["checkout", "--", ".seeds/"]);
+			} catch {
+				// Best-effort revert
+			}
+			return { preserved: false, error: `Failed to apply .seeds/ patch: ${msg}` };
+		}
+
+		// Step 6: Commit the changes.
+		try {
+			await runGit(repoRoot, [
+				"commit",
+				"-m",
+				`chore: preserve .seeds/ changes from lead ${agentName}`,
+			]);
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : String(err);
+			// Revert any staged changes
+			try {
+				await runGit(repoRoot, ["reset", "HEAD", "--", ".seeds/"]);
+				await runGit(repoRoot, ["checkout", "--", ".seeds/"]);
+			} catch {
+				// Best-effort revert
+			}
+			return { preserved: false, error: `Failed to commit .seeds/ changes: ${msg}` };
+		}
+
+		return { preserved: true };
+	} finally {
+		// Step 8: Always clean up the temp file.
+		try {
+			await unlink(tmpFile);
+		} catch {
+			// Ignore cleanup errors
+		}
+	}
+}

package/src/worktree/tmux.test.ts

@@ -210,15 +210,19 @@ describe("createSession", () => {
 		}
 	});
 
-	test("still creates session when which overstory fails (uses fallback)", async () => {
+	test("still creates session when which ov and which overstory both fail (uses fallback)", async () => {
 		let callCount = 0;
 		spawnSpy.mockImplementation(() => {
 			callCount++;
 			if (callCount === 1) {
+				// which ov fails
+				return mockSpawnResult("", "ov not found", 1);
+			}
+			if (callCount === 2) {
 				// which overstory fails
 				return mockSpawnResult("", "overstory not found", 1);
 			}
-			if (callCount === 2) {
+			if (callCount === 3) {
 				// tmux new-session
 				return mockSpawnResult("", "", 0);
 			}
@@ -230,7 +234,8 @@ describe("createSession", () => {
 		expect(pid).toBe(5555);
 
 		// The tmux command should contain the original command
-		const tmuxCallArgs = spawnSpy.mock.calls[1] as unknown[];
+		// Call 0: which ov, Call 1: which overstory, Call 2: tmux new-session
+		const tmuxCallArgs = spawnSpy.mock.calls[2] as unknown[];
 		const cmd = tmuxCallArgs[0] as string[];
 		const tmuxCmd = cmd[7] as string;
 		expect(tmuxCmd).toContain("echo test");

package/src/worktree/tmux.ts

@@ -13,30 +13,31 @@ import { AgentError } from "../errors.ts";
 /**
  * Detect the directory containing the overstory binary.
  *
- * Checks process.argv[0] first (the bun/node executable path won't help,
- * but process.argv[1] is the script path for `bun run`), then falls back
- * to `which overstory` to find it on the current PATH.
+ * Tries `which ov` first (the short alias), then falls back to
+ * `which overstory` (the original name). Both are registered in
+ * package.json bin, but depending on how the tool was installed
+ * (bun link, npm link, global install), only one may be on PATH.
  *
  * Returns null if detection fails.
  */
 async function detectOverstoryBinDir(): Promise<string | null> {
-	// process.argv[1] is the script entry point (e.g., /path/to/overstory/src/index.ts)
-	// The overstory binary (bun link) resolves to a bin dir
-	// Try `which overstory` for the most reliable result
-	try {
-		const proc = Bun.spawn(["which", "overstory"], {
-			stdout: "pipe",
-			stderr: "pipe",
-		});
-		const exitCode = await proc.exited;
-		if (exitCode === 0) {
-			const binPath = (await new Response(proc.stdout).text()).trim();
-			if (binPath.length > 0) {
-				return dirname(resolve(binPath));
+	// Try both command names — the alias migration may leave only one resolvable
+	for (const cmdName of ["ov", "overstory"]) {
+		try {
+			const proc = Bun.spawn(["which", cmdName], {
+				stdout: "pipe",
+				stderr: "pipe",
+			});
+			const exitCode = await proc.exited;
+			if (exitCode === 0) {
+				const binPath = (await new Response(proc.stdout).text()).trim();
+				if (binPath.length > 0) {
+					return dirname(resolve(binPath));
+				}
 			}
+		} catch {
+			// which not available or command not on PATH — try next
 		}
-	} catch {
-		// which not available or overstory not on PATH
 	}
 
 	// Fallback: if process.argv[1] points to overstory's own entry point (src/index.ts),

package/templates/CLAUDE.md.tmpl

@@ -1,6 +1,6 @@
 # {{PROJECT_NAME}} — Overstory Orchestration
 
-> Auto-generated by `overstory init`. You may edit this file.
+> Auto-generated by `ov init`. You may edit this file.
 
 This project uses **overstory** for Claude Code agent orchestration. Your session
 acts as the orchestrator: you decide what work to delegate, spawn worker agents,
@@ -10,34 +10,34 @@ monitor progress, and merge results.
 
 ```bash
 # Spawn a worker agent
-overstory sling <bead-id> --capability <type> --name <agent-name> \
+ov sling <bead-id> --capability <type> --name <agent-name> \
   [--spec <path>] [--files file1,file2] [--parent <agent>] [--depth <n>]
 
 # Check system status
-overstory status              # Overview of all agents, worktrees, {{TRACKER_NAME}}
-overstory status --json       # Machine-readable output
-overstory status --watch      # Live updating
+ov status              # Overview of all agents, worktrees, {{TRACKER_NAME}}
+ov status --json       # Machine-readable output
+ov status --watch      # Live updating
 
 # Messaging (SQLite-backed, ~1-5ms per query)
-overstory mail send --to <agent> --subject "..." --body "..."
-overstory mail check          # Your inbox
-overstory mail list --unread  # All unread messages
-overstory mail reply <id> --body "..."
+ov mail send --to <agent> --subject "..." --body "..."
+ov mail check          # Your inbox
+ov mail list --unread  # All unread messages
+ov mail reply <id> --body "..."
 
 # Merge completed work
-overstory merge --branch <name>   # Merge a specific branch
-overstory merge --all             # Merge all completed branches
-overstory merge --dry-run --branch <name>  # Preview conflicts
+ov merge --branch <name>   # Merge a specific branch
+ov merge --all             # Merge all completed branches
+ov merge --dry-run --branch <name>  # Preview conflicts
 
 # Worktree management
-overstory worktree list       # Show all worktrees with status
-overstory worktree clean --completed  # Remove finished worktrees
+ov worktree list       # Show all worktrees with status
+ov worktree clean --completed  # Remove finished worktrees
 
 # Context and monitoring
-overstory prime               # Reload context (config, mulch, recent activity)
-overstory watch --background  # Start watchdog daemon
-overstory metrics             # Performance summary
-overstory log <event> --agent <name>  # Hook-driven event logging
+ov prime               # Reload context (config, mulch, recent activity)
+ov watch --background  # Start watchdog daemon
+ov metrics             # Performance summary
+ov log <event> --agent <name>  # Hook-driven event logging
 ```
 
 ## How to Spawn Agents
@@ -46,10 +46,10 @@ overstory log <event> --agent <name>  # Hook-driven event logging
 2. Choose a capability based on the task:
 {{AGENT_DEFINITIONS}}
 3. Assign exclusive file scope so agents do not conflict
-4. Spawn: `overstory sling <bead-id> --capability <type> --name <unique-name> --files src/foo.ts,src/bar.ts`
+4. Spawn: `ov sling <bead-id> --capability <type> --name <unique-name> --files src/foo.ts,src/bar.ts`
 
 Each spawned agent gets its own git worktree, branch, CLAUDE.md overlay, and
-tmux session. Agents communicate via `overstory mail` and report completion
+tmux session. Agents communicate via `ov mail` and report completion
 by closing their {{TRACKER_NAME}} issue (`{{TRACKER_CLI}} close <id> --reason "summary"`).
 
 ## Hierarchical Delegation
@@ -58,10 +58,10 @@ You can spawn **team leads** that themselves spawn sub-workers:
 
 ```
 Orchestrator (this session)
-  └── overstory sling bd-xyz --capability lead --name build-lead
-        ├── overstory sling bd-abc --capability builder --name auth-login
-        ├── overstory sling bd-def --capability builder --name auth-signup
-        └── overstory sling bd-ghi --capability builder --name auth-reset
+  └── ov sling bd-xyz --capability lead --name build-lead
+        ├── ov sling bd-abc --capability builder --name auth-login
+        ├── ov sling bd-def --capability builder --name auth-signup
+        └── ov sling bd-ghi --capability builder --name auth-reset
 ```
 
 Depth limit is configurable (default: 2). Leads use `--parent` and `--depth`
@@ -69,7 +69,7 @@ to track hierarchy.
 
 ## Checking Status
 
-Run `overstory status` to see:
+Run `ov status` to see:
 - Active agents and their states (booting, working, stalled, zombie)
 - Worktree locations and branches
 - Beads issue progress
@@ -83,7 +83,7 @@ All merges target **{{CANONICAL_BRANCH}}**. Agents work on branches named
 ## Conventions
 
 - Agents own files exclusively — no two agents modify the same file
-- Use `overstory mail` for all inter-agent communication (not {{TRACKER_NAME}})
+- Use `ov mail` for all inter-agent communication (not {{TRACKER_NAME}})
 - Use `{{TRACKER_CLI}} close` to report task completion (not mail)
-- Merge via `overstory merge`, not raw `git merge`
+- Merge via `ov merge`, not raw `git merge`
 - Logs live in `.overstory/logs/` — never delete them manually

package/templates/hooks.json.tmpl

@@ -6,7 +6,11 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory prime --agent {{AGENT_NAME}}"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov prime --agent {{AGENT_NAME}}"
+					},
+					{
+						"type": "command",
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov mail check --inject --agent {{AGENT_NAME}}"
 					}
 				]
 			}
@@ -17,7 +21,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory mail check --inject --agent {{AGENT_NAME}}"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov mail check --inject --agent {{AGENT_NAME}}"
 					}
 				]
 			}
@@ -28,7 +32,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory log tool-start --agent {{AGENT_NAME}} --stdin"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov log tool-start --agent {{AGENT_NAME}} --stdin"
 					}
 				]
 			},
@@ -37,7 +41,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "read -r INPUT; CMD=$(echo \"$INPUT\" | sed 's/.*\"command\": *\"\\([^\"]*\\)\".*/\\1/'); if echo \"$CMD\" | grep -qE '\\bgit\\s+push\\b'; then echo '{\"decision\":\"block\",\"reason\":\"git push is blocked — use overstory merge to integrate changes, push manually when ready\"}'; exit 0; fi;"
+						"command": "read -r INPUT; CMD=$(echo \"$INPUT\" | sed 's/.*\"command\": *\"\\([^\"]*\\)\".*/\\1/'); if echo \"$CMD\" | grep -qE '\\bgit\\s+push\\b'; then echo '{\"decision\":\"block\",\"reason\":\"git push is blocked — use ov merge to integrate changes, push manually when ready\"}'; exit 0; fi;"
 					}
 				]
 			}
@@ -48,11 +52,11 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory log tool-end --agent {{AGENT_NAME}} --stdin"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov log tool-end --agent {{AGENT_NAME}} --stdin"
 					},
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory mail check --inject --agent {{AGENT_NAME}} --debounce 500"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov mail check --inject --agent {{AGENT_NAME}} --debounce 500"
 					}
 				]
 			},
@@ -61,7 +65,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory mail check --inject --agent {{AGENT_NAME}} --debounce 30000"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov mail check --inject --agent {{AGENT_NAME}} --debounce 30000"
 					}
 				]
 			},
@@ -70,7 +74,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; read -r INPUT; if echo \"$INPUT\" | grep -qE '\\bgit\\s+commit\\b'; then mulch diff HEAD~1 >/dev/null 2>&1 || true; fi; exit 0;"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; read -r INPUT; if echo \"$INPUT\" | grep -qE '\\bgit\\s+commit\\b'; then ml diff HEAD~1 >/dev/null 2>&1 || true; fi; exit 0;"
 					}
 				]
 			}
@@ -81,11 +85,11 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory log session-end --agent {{AGENT_NAME}} --stdin"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov log session-end --agent {{AGENT_NAME}} --stdin"
 					},
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; mulch learn"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ml learn"
 					}
 				]
 			}
@@ -96,7 +100,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; overstory prime --agent {{AGENT_NAME}} --compact"
+						"command": "[ -z \"$OVERSTORY_AGENT_NAME\" ] && exit 0; ov prime --agent {{AGENT_NAME}} --compact"
 					}
 				]
 			}

package/templates/overlay.md.tmpl

@@ -1,5 +1,5 @@
 # DO NOT EDIT — Auto-generated by overstory
-# This overlay was written by `overstory sling`. Manual edits will be
+# This overlay was written by `ov sling`. Manual edits will be
 # overwritten on the next spawn. Modify the template at
 # templates/overlay.md.tmpl in the overstory repo instead.
 
@@ -50,26 +50,26 @@ Prime relevant domain knowledge before starting work:
 
 ## Communication
 
-Use `overstory mail` for all communication. Your address is **{{AGENT_NAME}}**.
+Use `ov mail` for all communication. Your address is **{{AGENT_NAME}}**.
 
 ```bash
 # Check your inbox (do this regularly)
-overstory mail check --agent {{AGENT_NAME}}
+ov mail check --agent {{AGENT_NAME}}
 
 # Send a status update to your parent
-overstory mail send --to {{PARENT_AGENT}} --subject "status" \
+ov mail send --to {{PARENT_AGENT}} --subject "status" \
   --body "Progress update here" --type status --agent {{AGENT_NAME}}
 
 # Ask a question
-overstory mail send --to {{PARENT_AGENT}} --subject "question" \
+ov mail send --to {{PARENT_AGENT}} --subject "question" \
   --body "Your question here" --type question --priority high --agent {{AGENT_NAME}}
 
 # Report completion
-overstory mail send --to {{PARENT_AGENT}} --subject "done" \
+ov mail send --to {{PARENT_AGENT}} --subject "done" \
   --body "Summary of what was done" --type result --agent {{AGENT_NAME}}
 
 # Reply to a message
-overstory mail reply <message-id> --body "Your reply" --agent {{AGENT_NAME}}
+ov mail reply <message-id> --body "Your reply" --agent {{AGENT_NAME}}
 ```
 
 ## Spawning Sub-Workers