@markjaquith/agency 1.11.0 → 2.0.0

package/src/commands/task-squash.test.ts

@@ -1,266 +0,0 @@
-import { test, expect, describe, beforeEach, afterEach } from "bun:test"
-import { join } from "path"
-import { task } from "./task"
-import {
-	createTempDir,
-	cleanupTempDir,
-	initGitRepo,
-	initAgency,
-	fileExists,
-	readFile,
-	runTestEffect,
-	getCurrentBranch,
-	getGitOutput,
-} from "../test-utils"
-
-describe("task --continue --squash", () => {
-	let tempDir: string
-	let originalCwd: string
-	let originalConfigDir: string | undefined
-
-	beforeEach(async () => {
-		tempDir = await createTempDir()
-		originalCwd = process.cwd()
-		originalConfigDir = process.env.AGENCY_CONFIG_DIR
-		process.env.AGENCY_CONFIG_DIR = await createTempDir()
-	})
-
-	afterEach(async () => {
-		process.chdir(originalCwd)
-		if (originalConfigDir !== undefined) {
-			process.env.AGENCY_CONFIG_DIR = originalConfigDir
-		} else {
-			delete process.env.AGENCY_CONFIG_DIR
-		}
-		if (
-			process.env.AGENCY_CONFIG_DIR &&
-			process.env.AGENCY_CONFIG_DIR !== originalConfigDir
-		) {
-			await cleanupTempDir(process.env.AGENCY_CONFIG_DIR)
-		}
-		await cleanupTempDir(tempDir)
-	})
-
-	test("fails when --squash is used without --continue", async () => {
-		await initGitRepo(tempDir)
-		process.chdir(tempDir)
-
-		await initAgency(tempDir, "test")
-
-		await expect(
-			runTestEffect(task({ silent: true, squash: true, emit: "some-branch" })),
-		).rejects.toThrow("--squash flag can only be used with --continue")
-	})
-
-	test("squashes emitted commits into a single commit on new branch", async () => {
-		await initGitRepo(tempDir)
-		process.chdir(tempDir)
-
-		await initAgency(tempDir, "test")
-
-		// Create a task branch with agency files
-		await runTestEffect(
-			task({ silent: true, emit: "feature-v1", task: "Original task" }),
-		)
-
-		// Add two code commits to the branch
-		await Bun.write(join(tempDir, "feature-a.txt"), "feature A content")
-		await Bun.spawn(["git", "add", "feature-a.txt"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-		await Bun.spawn(["git", "commit", "--no-verify", "-m", "Add feature A"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-
-		await Bun.write(join(tempDir, "feature-b.txt"), "feature B content")
-		await Bun.spawn(["git", "add", "feature-b.txt"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-		await Bun.spawn(["git", "commit", "--no-verify", "-m", "Add feature B"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-
-		// Now continue with squash
-		await runTestEffect(
-			task({
-				silent: true,
-				continue: true,
-				squash: true,
-				emit: "feature-v2",
-				task: "New task for v2",
-			}),
-		)
-
-		// Verify we're on the new branch
-		const newBranch = await getCurrentBranch(tempDir)
-		expect(newBranch).toBe("agency--feature-v2")
-
-		// Verify both feature files exist (squash brought them in)
-		expect(await fileExists(join(tempDir, "feature-a.txt"))).toBe(true)
-		expect(await fileExists(join(tempDir, "feature-b.txt"))).toBe(true)
-
-		// Verify agency files exist
-		expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
-		expect(await fileExists(join(tempDir, "TASK.md"))).toBe(true)
-		expect(await fileExists(join(tempDir, "AGENCY.md"))).toBe(true)
-
-		// Verify TASK.md has FRESH content (not the old "Original task")
-		const taskContent = await readFile(join(tempDir, "TASK.md"))
-		expect(taskContent).toContain("New task for v2")
-		expect(taskContent).not.toContain("Original task")
-
-		// Verify agency.json has updated emitBranch
-		const agencyJson = JSON.parse(await readFile(join(tempDir, "agency.json")))
-		expect(agencyJson.emitBranch).toBe("feature-v2")
-
-		// Verify commit history: should be initial commit + squash commit + agency files commit
-		// (not the individual "Add feature A" and "Add feature B" commits)
-		const logOutput = await getGitOutput(tempDir, [
-			"log",
-			"--oneline",
-			"--format=%s",
-		])
-		const commits = logOutput.trim().split("\n")
-
-		// Should NOT contain individual feature commits
-		expect(logOutput).not.toContain("Add feature A")
-		expect(logOutput).not.toContain("Add feature B")
-
-		// Should contain a squash commit
-		expect(logOutput).toContain("squash: prior work from feature-v1")
-	})
-
-	test("creates fresh TASK.md with default placeholder when no task provided in silent mode", async () => {
-		await initGitRepo(tempDir)
-		process.chdir(tempDir)
-
-		await initAgency(tempDir, "test")
-
-		// Create a task branch
-		await runTestEffect(
-			task({ silent: true, emit: "feature-v1", task: "Old task" }),
-		)
-
-		// Add a code commit
-		await Bun.write(join(tempDir, "code.txt"), "code content")
-		await Bun.spawn(["git", "add", "code.txt"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-		await Bun.spawn(["git", "commit", "--no-verify", "-m", "Add code"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-
-		// Continue with squash but no --task option (silent mode)
-		await runTestEffect(
-			task({
-				silent: true,
-				continue: true,
-				squash: true,
-				emit: "feature-v2",
-			}),
-		)
-
-		// TASK.md should have the default placeholder, not the old task
-		const taskContent = await readFile(join(tempDir, "TASK.md"))
-		expect(taskContent).toContain("{task}")
-		expect(taskContent).not.toContain("Old task")
-	})
-
-	test("handles empty squash when old branch has no code commits", async () => {
-		await initGitRepo(tempDir)
-		process.chdir(tempDir)
-
-		await initAgency(tempDir, "test")
-
-		// Create a task branch WITHOUT any code commits
-		await runTestEffect(
-			task({ silent: true, emit: "feature-v1", task: "Just agency files" }),
-		)
-
-		// Continue with squash - should succeed even with no code changes
-		await runTestEffect(
-			task({
-				silent: true,
-				continue: true,
-				squash: true,
-				emit: "feature-v2",
-				task: "New task",
-			}),
-		)
-
-		// Verify we're on the new branch
-		const newBranch = await getCurrentBranch(tempDir)
-		expect(newBranch).toBe("agency--feature-v2")
-
-		// Verify agency files exist
-		expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
-		expect(await fileExists(join(tempDir, "TASK.md"))).toBe(true)
-
-		// Verify fresh TASK.md
-		const taskContent = await readFile(join(tempDir, "TASK.md"))
-		expect(taskContent).toContain("New task")
-	})
-
-	test("preserves other agency files while creating fresh TASK.md", async () => {
-		await initGitRepo(tempDir)
-		process.chdir(tempDir)
-
-		await initAgency(tempDir, "test")
-
-		// Create a task branch
-		await runTestEffect(
-			task({ silent: true, emit: "feature-v1", task: "Old task" }),
-		)
-
-		// Read the original AGENCY.md content
-		const originalAgencyMd = await readFile(join(tempDir, "AGENCY.md"))
-
-		// Add a code commit
-		await Bun.write(join(tempDir, "code.txt"), "code")
-		await Bun.spawn(["git", "add", "code.txt"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-		await Bun.spawn(["git", "commit", "--no-verify", "-m", "Add code"], {
-			cwd: tempDir,
-			stdout: "pipe",
-			stderr: "pipe",
-		}).exited
-
-		// Continue with squash
-		await runTestEffect(
-			task({
-				silent: true,
-				continue: true,
-				squash: true,
-				emit: "feature-v2",
-				task: "New task",
-			}),
-		)
-
-		// AGENCY.md should be carried forward (not fresh)
-		const newAgencyMd = await readFile(join(tempDir, "AGENCY.md"))
-		expect(newAgencyMd).toBe(originalAgencyMd)
-
-		// TASK.md should be fresh
-		const taskContent = await readFile(join(tempDir, "TASK.md"))
-		expect(taskContent).toContain("New task")
-		expect(taskContent).not.toContain("Old task")
-
-		// opencode.json should be carried forward
-		expect(await fileExists(join(tempDir, "opencode.json"))).toBe(true)
-	})
-})

package/src/commands/tasks.test.ts

@@ -1,391 +0,0 @@
-import { test, expect, describe, beforeEach, afterEach } from "bun:test"
-import { join } from "path"
-import { tasks } from "./tasks"
-import {
-	createTempDir,
-	cleanupTempDir,
-	initGitRepo,
-	getCurrentBranch,
-	createCommit,
-	initAgency,
-	runTestEffect,
-} from "../test-utils"
-import { writeAgencyMetadata } from "../types"
-
-async function createBranch(cwd: string, branchName: string): Promise<void> {
-	await Bun.spawn(["git", "checkout", "-b", branchName], {
-		cwd,
-		stdout: "pipe",
-		stderr: "pipe",
-	}).exited
-}
-
-async function checkoutBranch(cwd: string, branchName: string): Promise<void> {
-	await Bun.spawn(["git", "checkout", branchName], {
-		cwd,
-		stdout: "pipe",
-		stderr: "pipe",
-	}).exited
-}
-
-describe("tasks command", () => {
-	let tempDir: string
-	let originalCwd: string
-
-	beforeEach(async () => {
-		tempDir = await createTempDir()
-		originalCwd = process.cwd()
-		process.chdir(tempDir)
-
-		// Set config path to non-existent file to use defaults
-		process.env.AGENCY_CONFIG_PATH = join(tempDir, "non-existent-config.json")
-
-		// Initialize git repo
-		await initGitRepo(tempDir)
-		await createCommit(tempDir, "Initial commit")
-
-		// Rename to main if needed
-		const currentBranch = await getCurrentBranch(tempDir)
-		if (currentBranch === "master") {
-			await Bun.spawn(["git", "branch", "-m", "main"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-		}
-	})
-
-	afterEach(async () => {
-		process.chdir(originalCwd)
-		delete process.env.AGENCY_CONFIG_PATH
-		await cleanupTempDir(tempDir)
-	})
-
-	describe("basic functionality", () => {
-		test("shows no task branches when none exist", async () => {
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			expect(output).toContain("No task branches found")
-			expect(output).toContain("agency task")
-		})
-
-		test("lists single task branch", async () => {
-			// Initialize agency
-			await initAgency(tempDir, "test-template")
-
-			// Create feature branch with agency-- prefix and agency.json
-			await createBranch(tempDir, "agency--feature")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: ["AGENTS.md"],
-				template: "test-template",
-				baseBranch: "main",
-				createdAt: new Date().toISOString(),
-			} as any)
-
-			// Commit agency.json
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add agency.json")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			expect(output).toContain("agency--feature")
-			expect(output.trim()).toBe("agency--feature")
-		})
-
-		test("lists multiple task branches", async () => {
-			await initAgency(tempDir, "test-template")
-
-			// Create first feature branch
-			await createBranch(tempDir, "agency--feature-1")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: ["AGENTS.md"],
-				template: "test-template",
-				baseBranch: "main",
-				createdAt: new Date().toISOString(),
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add agency.json")
-
-			// Go back to main and create second feature branch
-			await checkoutBranch(tempDir, "main")
-			await createBranch(tempDir, "agency--feature-2")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: ["opencode.json"],
-				template: "another-template",
-				baseBranch: "main",
-				createdAt: new Date().toISOString(),
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add agency.json")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			expect(output).toContain("agency--feature-1")
-			expect(output).toContain("agency--feature-2")
-			const lines = output.trim().split("\n")
-			expect(lines.length).toBe(2)
-		})
-
-		test("ignores branches without agency-- prefix", async () => {
-			await initAgency(tempDir, "test-template")
-
-			// Create a branch without agency-- prefix (even with agency.json)
-			await createBranch(tempDir, "no-prefix")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: [],
-				template: "test-template",
-				createdAt: new Date().toISOString(),
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add agency.json")
-
-			// Go back to main and create a branch with agency-- prefix
-			await checkoutBranch(tempDir, "main")
-			await createBranch(tempDir, "agency--with-prefix")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: [],
-				template: "test-template",
-				createdAt: new Date().toISOString(),
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add agency.json")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			expect(output).toContain("agency--with-prefix")
-			expect(output).not.toContain("no-prefix")
-			expect(output.trim()).toBe("agency--with-prefix")
-		})
-
-		test("lists agency-- branches even without agency.json", async () => {
-			// Create a branch with agency-- prefix but no agency.json
-			await createBranch(tempDir, "agency--no-metadata")
-			await createCommit(tempDir, "Some work")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			expect(output).toContain("agency--no-metadata")
-			expect(output.trim()).toBe("agency--no-metadata")
-		})
-	})
-
-	describe("JSON output", () => {
-		test("outputs JSON format when --json is provided", async () => {
-			await initAgency(tempDir, "test-template")
-
-			await createBranch(tempDir, "agency--feature")
-			const createdAt = new Date().toISOString()
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: ["AGENTS.md"],
-				template: "test-template",
-				baseBranch: "main",
-				createdAt,
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add agency.json")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({ json: true }))
-
-			console.log = originalLog
-
-			// Parse JSON output
-			const data = JSON.parse(output.trim())
-			expect(Array.isArray(data)).toBe(true)
-			expect(data.length).toBe(1)
-			expect(data[0].branch).toBe("agency--feature")
-			expect(data[0].template).toBe("test-template")
-			expect(data[0].baseBranch).toBe("main")
-			expect(data[0].createdAt).toBeDefined()
-		})
-
-		test("outputs empty array in JSON format when no task branches exist", async () => {
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({ json: true }))
-
-			console.log = originalLog
-
-			const data = JSON.parse(output.trim())
-			expect(Array.isArray(data)).toBe(true)
-			expect(data.length).toBe(0)
-		})
-
-		test("JSON output shows null metadata for branches without agency.json", async () => {
-			// Create a branch with agency-- prefix but no agency.json
-			await createBranch(tempDir, "agency--no-metadata")
-			await createCommit(tempDir, "Some work")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({ json: true }))
-
-			console.log = originalLog
-
-			const data = JSON.parse(output.trim())
-			expect(Array.isArray(data)).toBe(true)
-			expect(data.length).toBe(1)
-			expect(data[0].branch).toBe("agency--no-metadata")
-			expect(data[0].template).toBeNull()
-			expect(data[0].baseBranch).toBeNull()
-			expect(data[0].createdAt).toBeNull()
-		})
-	})
-
-	describe("edge cases", () => {
-		test("handles branches with invalid agency.json gracefully", async () => {
-			await initAgency(tempDir, "test-template")
-
-			// Create branch with invalid agency.json but agency-- prefix
-			await createBranch(tempDir, "agency--invalid")
-			await Bun.write(join(tempDir, "agency.json"), "{ invalid json }")
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add invalid agency.json")
-
-			// Create branch with valid agency.json and agency-- prefix
-			await checkoutBranch(tempDir, "main")
-			await createBranch(tempDir, "agency--valid")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: [],
-				template: "test-template",
-				createdAt: new Date().toISOString(),
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add valid agency.json")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			// Both branches should be listed since they match the prefix
-			expect(output).toContain("agency--valid")
-			expect(output).toContain("agency--invalid")
-			const lines = output.trim().split("\n")
-			expect(lines.length).toBe(2)
-		})
-
-		test("handles branches with old version agency.json", async () => {
-			await initAgency(tempDir, "test-template")
-
-			// Create branch with version 0 agency.json (future or old version)
-			await createBranch(tempDir, "agency--old-version")
-			await Bun.write(
-				join(tempDir, "agency.json"),
-				JSON.stringify({
-					version: 0,
-					template: "old-template",
-				}),
-			)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Add old version agency.json")
-
-			let output = ""
-			const originalLog = console.log
-			console.log = (msg: string) => {
-				output += msg + "\n"
-			}
-
-			await runTestEffect(tasks({}))
-
-			console.log = originalLog
-			// Branch should still be listed since it matches the prefix
-			expect(output).toContain("agency--old-version")
-		})
-	})
-})