@katyella/legio 0.1.3 → 0.2.2

package/src/worktree/tmux.test.ts

@@ -128,8 +128,9 @@ describe("createSession", () => {
 		expect(args).toContain("my-session");
 		expect(args).toContain("-c");
 		expect(args).toContain("/work/dir");
-		// The command is the last arg, wrapped with unset prefix
+		// The command is the last arg, wrapped with env -u prefix
 		const wrappedCmd = args[args.length - 1] as string;
+		expect(wrappedCmd).toContain("env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT");
 		expect(wrappedCmd).toContain("echo hello");
 		// PATH is injected via -e flag, not shell export
 		expect(args).toContain("-e");

package/src/worktree/tmux.ts

@@ -99,10 +99,10 @@ export async function createSession(
 ): Promise<number> {
 	// Clear Claude Code nesting detection so child Claude Code instances
 	// don't refuse to start with "cannot be launched inside another session".
-	// This MUST be part of the shell command (not tmux -e) because we need
-	// to *unset* vars inherited from the parent process environment.
-	const shellPrefix = "unset CLAUDECODE CLAUDE_CODE_ENTRYPOINT";
-	const wrappedCommand = `${shellPrefix} && ${command}`;
+	// Use `env -u` instead of shell-builtin `unset` because tmux inherits the
+	// user's default shell which may be fish (where `unset` is invalid syntax).
+	// `env -u VAR cmd` is a standalone binary (/usr/bin/env) that works in any shell.
+	const wrappedCommand = `env -u CLAUDECODE -u CLAUDE_CODE_ENTRYPOINT ${command}`;
 
 	// Build tmux args. Environment variables are passed via `-e KEY=VALUE`
 	// flags (tmux 3.2+) instead of shell `export` commands to avoid

package/templates/hooks.json.tmpl

@@ -6,7 +6,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio prime --agent {{AGENT_NAME}}"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio prime --agent $LEGIO_AGENT_NAME"
 					}
 				]
 			}
@@ -17,7 +17,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio mail check --inject --agent {{AGENT_NAME}}"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio mail check --inject --agent $LEGIO_AGENT_NAME"
 					}
 				]
 			}
@@ -60,35 +60,35 @@
 				]
 			},
 			{
-				"matcher": "",
+				"matcher": "Bash",
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio log tool-start --agent {{AGENT_NAME}} --stdin"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; read -r INPUT; CMD=$(echo \"$INPUT\" | sed 's/.*\"command\": *\"\\([^\"]*\\)\".*/\\1/'); if echo \"$CMD\" | grep -qE '\\bsleep\\b'; then echo '{\"decision\":\"block\",\"reason\":\"sleep is blocked in legio agents - mail delivery is automatic via hooks, no polling needed\"}'; exit 0; fi;"
 					}
 				]
-			}
-		],
-		"PostToolUse": [
+			},
 			{
 				"matcher": "",
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio log tool-end --agent {{AGENT_NAME}} --stdin"
-					},
-					{
-						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio mail check --inject --agent {{AGENT_NAME}} --debounce 500"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio log tool-start --agent $LEGIO_AGENT_NAME --stdin"
 					}
 				]
-			},
+			}
+		],
+		"PostToolUse": [
 			{
 				"matcher": "",
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio mail check --inject --agent {{AGENT_NAME}} --debounce 30000"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio log tool-end --agent $LEGIO_AGENT_NAME --stdin"
+					},
+					{
+						"type": "command",
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio mail check --inject --agent $LEGIO_AGENT_NAME --signal"
 					}
 				]
 			},
@@ -97,7 +97,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; read -r INPUT; CMD=$(echo \"$INPUT\" | sed 's/.*\"command\": *\"\\([^\"]*\\)\".*/\\1/'); if echo \"$CMD\" | grep -qE '\\bgit\\s+commit\\b'; then mulch diff HEAD~1; fi;"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; read -r INPUT; CMD=$(echo \"$INPUT\" | sed 's/.*\"command\": *\"\\([^\"]*\\)\".*/\\1/'); if echo \"$CMD\" | grep -qE '\\bgit\\s+commit\\b'; then git rev-parse HEAD~1 >/dev/null 2>&1 && mulch diff HEAD~1; fi;"
 					}
 				]
 			}
@@ -108,7 +108,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio log session-end --agent {{AGENT_NAME}} --stdin"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio log session-end --agent $LEGIO_AGENT_NAME --stdin"
 					},
 					{
 						"type": "command",
@@ -123,7 +123,7 @@
 				"hooks": [
 					{
 						"type": "command",
-						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio prime --agent {{AGENT_NAME}} --compact"
+						"command": "[ -z \"$LEGIO_AGENT_NAME\" ] && exit 0; legio prime --agent $LEGIO_AGENT_NAME --compact"
 					}
 				]
 			}

package/src/beads/client.test.ts

@@ -1,210 +0,0 @@
-import { spawnSync } from "node:child_process";
-import { realpathSync } from "node:fs";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
-import { AgentError } from "../errors.ts";
-import { cleanupTempDir, createTempGitRepo } from "../test-helpers.ts";
-import { type BeadsClient, createBeadsClient } from "./client.ts";
-
-/**
- * Check if the bd CLI is available on this machine (synchronous).
- * Uses spawnSync so the result is available at test registration time
- * for use with test.skipIf().
- */
-function isBdAvailable(): boolean {
-	try {
-		const result = spawnSync("bd", ["--version"], { stdio: "pipe" });
-		return result.status === 0;
-	} catch {
-		return false;
-	}
-}
-
-/**
- * Initialize beads in a git repo directory.
- */
-function initBeads(cwd: string): void {
-	const result = spawnSync("bd", ["init"], { cwd, stdio: "pipe" });
-	if (result.status !== 0) {
-		const stderr = (result.stderr ?? Buffer.alloc(0)).toString();
-		throw new Error(`bd init failed: ${stderr}`);
-	}
-}
-
-const bdAvailable = isBdAvailable();
-
-/**
- * Optimized test suite: uses a single shared repo (beforeAll) instead of
- * creating a fresh repo per test. All 16 original tests share one repo
- * since they create issues with unique IDs and use toContain/not.toContain
- * assertions. This reduces setup from ~96 subprocess spawns to ~6.
- */
-describe("createBeadsClient (integration)", { timeout: 30_000 }, () => {
-	let tempDir: string;
-	let client: BeadsClient;
-
-	// Pre-created issue IDs for tests that need existing issues
-	let openIssueId: string;
-	let claimedIssueId: string;
-	let closedIssueId: string;
-
-	beforeAll(async () => {
-		if (!bdAvailable) return;
-		// realpathSync resolves macOS /var -> /private/var symlink so paths match
-		tempDir = realpathSync(await createTempGitRepo());
-		initBeads(tempDir);
-		client = createBeadsClient(tempDir);
-
-		// Pre-create issues used by read-only tests (list, ready, show)
-		openIssueId = await client.create("Pre-created open issue");
-		claimedIssueId = await client.create("Pre-created claimed issue");
-		await client.claim(claimedIssueId);
-		closedIssueId = await client.create("Pre-created closed issue");
-		await client.close(closedIssueId);
-	});
-
-	afterAll(async () => {
-		if (!bdAvailable) return;
-		await cleanupTempDir(tempDir);
-	});
-
-	describe("create", () => {
-		test.skipIf(!bdAvailable)("returns an issue ID", async () => {
-			const id = await client.create("Integration test issue");
-
-			expect(typeof id).toBe("string");
-			expect(id.length).toBeGreaterThan(0);
-		});
-
-		test.skipIf(!bdAvailable)("returns ID with type and priority options", async () => {
-			const id = await client.create("Typed issue", {
-				type: "bug",
-				priority: 1,
-			});
-
-			expect(typeof id).toBe("string");
-			expect(id.length).toBeGreaterThan(0);
-		});
-
-		test.skipIf(!bdAvailable)("returns ID with description option", async () => {
-			const id = await client.create("Described issue", {
-				description: "A detailed description",
-			});
-
-			expect(typeof id).toBe("string");
-			expect(id.length).toBeGreaterThan(0);
-		});
-	});
-
-	describe("show", () => {
-		test.skipIf(!bdAvailable)("returns issue details for a valid ID", async () => {
-			const id = await client.create("Show test issue", {
-				type: "task",
-				priority: 2,
-			});
-
-			const issue = await client.show(id);
-
-			expect(issue.id).toBe(id);
-			expect(issue.title).toBe("Show test issue");
-			expect(issue.status).toBe("open");
-			expect(issue.priority).toBe(2);
-			expect(issue.type).toBe("task");
-		});
-	});
-
-	describe("claim", () => {
-		test.skipIf(!bdAvailable)("changes issue status to in_progress and returns void", async () => {
-			const id = await client.create("Claim test issue");
-
-			const result = await client.claim(id);
-			expect(result).toBeUndefined();
-
-			const issue = await client.show(id);
-			expect(issue.status).toBe("in_progress");
-		});
-	});
-
-	describe("close", () => {
-		test.skipIf(!bdAvailable)("closes issues with and without reason", async () => {
-			const id1 = await client.create("Close test issue");
-			const id2 = await client.create("Close reason test");
-
-			await client.close(id1);
-			await client.close(id2, "Completed all acceptance criteria");
-
-			const issue1 = await client.show(id1);
-			expect(issue1.status).toBe("closed");
-
-			const issue2 = await client.show(id2);
-			expect(issue2.status).toBe("closed");
-		});
-	});
-
-	describe("list", () => {
-		test.skipIf(!bdAvailable)("returns all issues", async () => {
-			const issues = await client.list();
-
-			// Pre-created issues should be present (plus any from other tests)
-			expect(issues.length).toBeGreaterThanOrEqual(3);
-			const titles = issues.map((i) => i.title);
-			expect(titles).toContain("Pre-created open issue");
-			expect(titles).toContain("Pre-created claimed issue");
-		});
-
-		test.skipIf(!bdAvailable)("filters by status", async () => {
-			const openIssues = await client.list({ status: "open" });
-			const openIds = openIssues.map((i) => i.id);
-			expect(openIds).toContain(openIssueId);
-			expect(openIds).not.toContain(claimedIssueId);
-			expect(openIds).not.toContain(closedIssueId);
-
-			const inProgressIssues = await client.list({ status: "in_progress" });
-			const inProgressIds = inProgressIssues.map((i) => i.id);
-			expect(inProgressIds).toContain(claimedIssueId);
-			expect(inProgressIds).not.toContain(openIssueId);
-		});
-
-		test.skipIf(!bdAvailable)("respects limit option", async () => {
-			const limited = await client.list({ limit: 1 });
-			expect(limited).toHaveLength(1);
-		});
-	});
-
-	describe("ready", () => {
-		test.skipIf(!bdAvailable)(
-			"returns open unblocked issues but not claimed or closed",
-			async () => {
-				const readyIssues = await client.ready();
-				const readyIds = readyIssues.map((i) => i.id);
-
-				// Open issue should appear in ready
-				expect(readyIds).toContain(openIssueId);
-				// Claimed issue should not appear in ready
-				expect(readyIds).not.toContain(claimedIssueId);
-				// Closed issue should not appear in ready
-				expect(readyIds).not.toContain(closedIssueId);
-			},
-		);
-	});
-
-	describe("error handling", () => {
-		test.skipIf(!bdAvailable)("show throws AgentError for nonexistent ID", async () => {
-			await expect(client.show("nonexistent-id")).rejects.toThrow(AgentError);
-		});
-
-		test.skipIf(!bdAvailable)(
-			"throws AgentError when bd is run without beads initialized",
-			async () => {
-				// Create a git repo without bd init — independent from shared repo
-				const bareDir = realpathSync(await createTempGitRepo());
-				const bareClient = createBeadsClient(bareDir);
-
-				try {
-					await expect(bareClient.list()).rejects.toThrow(AgentError);
-				} finally {
-					await cleanupTempDir(bareDir);
-				}
-			},
-		);
-	});
-});