@markjaquith/agency 0.5.0 → 0.6.0

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

@@ -0,0 +1,311 @@
+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,
+} from "../test-utils"
+
+describe("task --continue", () => {
+	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 not on a branch with agency.json", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// Try to continue without agency files
+		await expect(
+			runTestEffect(
+				task({ silent: true, continue: true, emit: "new-feature" }),
+			),
+		).rejects.toThrow("No agency.json found")
+	})
+
+	test("fails when branch name not provided in silent mode", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// First create a task branch with agency files
+		await runTestEffect(task({ silent: true, emit: "original-feature" }))
+
+		// Try to continue without branch name
+		await expect(
+			runTestEffect(task({ silent: true, continue: true })),
+		).rejects.toThrow("Branch name is required")
+	})
+
+	test("creates new branch with agency files from current 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: "original-feature", task: "Original task" }),
+		)
+
+		// Verify we're on the source branch
+		const originalBranch = await getCurrentBranch(tempDir)
+		expect(originalBranch).toBe("agency/original-feature")
+
+		// Read the original TASK.md
+		const originalTaskContent = await readFile(join(tempDir, "TASK.md"))
+		expect(originalTaskContent).toContain("Original task")
+
+		// Now continue to a new branch
+		await runTestEffect(
+			task({
+				silent: true,
+				continue: true,
+				emit: "continued-feature",
+			}),
+		)
+
+		// Verify we're on the new branch
+		const newBranch = await getCurrentBranch(tempDir)
+		expect(newBranch).toBe("agency/continued-feature")
+
+		// Verify agency files were copied
+		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 content was preserved
+		const newTaskContent = await readFile(join(tempDir, "TASK.md"))
+		expect(newTaskContent).toContain("Original task")
+	})
+
+	test("updates emitBranch in agency.json", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// Create a task branch
+		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
+
+		// Read original agency.json
+		const originalAgencyJson = JSON.parse(
+			await readFile(join(tempDir, "agency.json")),
+		)
+		expect(originalAgencyJson.emitBranch).toBe("feature-v1")
+
+		// Continue to new branch
+		await runTestEffect(
+			task({ silent: true, continue: true, emit: "feature-v2" }),
+		)
+
+		// Read new agency.json
+		const newAgencyJson = JSON.parse(
+			await readFile(join(tempDir, "agency.json")),
+		)
+		expect(newAgencyJson.emitBranch).toBe("feature-v2")
+	})
+
+	test("fails when new branch already exists", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// Create a task branch
+		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
+
+		// Create another branch that would conflict
+		await Bun.spawn(["git", "branch", "agency/feature-v2"], {
+			cwd: tempDir,
+			stdout: "pipe",
+			stderr: "pipe",
+		}).exited
+
+		// Try to continue to the existing branch name
+		await expect(
+			runTestEffect(task({ silent: true, continue: true, emit: "feature-v2" })),
+		).rejects.toThrow("already exists")
+	})
+
+	test("copies injected files from metadata", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// Create a task branch
+		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
+
+		// Verify opencode.json exists (it's in injectedFiles)
+		expect(await fileExists(join(tempDir, "opencode.json"))).toBe(true)
+
+		// Continue to new branch
+		await runTestEffect(
+			task({ silent: true, continue: true, emit: "feature-v2" }),
+		)
+
+		// Verify opencode.json was copied
+		expect(await fileExists(join(tempDir, "opencode.json"))).toBe(true)
+	})
+
+	test("new branch is created from main", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// Create a task branch and add a file
+		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
+
+		// Add a file that's NOT in agency files
+		await Bun.write(join(tempDir, "feature-specific.txt"), "feature content")
+		await Bun.spawn(["git", "add", "feature-specific.txt"], {
+			cwd: tempDir,
+			stdout: "pipe",
+			stderr: "pipe",
+		}).exited
+		await Bun.spawn(
+			["git", "commit", "--no-verify", "-m", "Add feature file"],
+			{
+				cwd: tempDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			},
+		).exited
+
+		// Continue to new branch
+		await runTestEffect(
+			task({ silent: true, continue: true, emit: "feature-v2" }),
+		)
+
+		// The new branch should be based on main, not on the old feature branch
+		// So feature-specific.txt should NOT exist
+		expect(await fileExists(join(tempDir, "feature-specific.txt"))).toBe(false)
+
+		// But agency files should exist
+		expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
+	})
+
+	test("supports --from flag to specify base branch", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		// Create a develop branch
+		await Bun.spawn(["git", "checkout", "-b", "develop"], {
+			cwd: tempDir,
+			stdout: "pipe",
+			stderr: "pipe",
+		}).exited
+
+		// Add a file to develop
+		await Bun.write(join(tempDir, "develop-feature.txt"), "develop content")
+		await Bun.spawn(["git", "add", "develop-feature.txt"], {
+			cwd: tempDir,
+			stdout: "pipe",
+			stderr: "pipe",
+		}).exited
+		await Bun.spawn(
+			["git", "commit", "--no-verify", "-m", "Add develop file"],
+			{
+				cwd: tempDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			},
+		).exited
+
+		// Go back to main
+		await Bun.spawn(["git", "checkout", "main"], {
+			cwd: tempDir,
+			stdout: "pipe",
+			stderr: "pipe",
+		}).exited
+
+		await initAgency(tempDir, "test")
+
+		// Create a task branch
+		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
+
+		// Continue to new branch from develop
+		await runTestEffect(
+			task({
+				silent: true,
+				continue: true,
+				emit: "feature-v2",
+				from: "develop",
+			}),
+		)
+
+		// The new branch should be based on develop
+		// So develop-feature.txt should exist
+		expect(await fileExists(join(tempDir, "develop-feature.txt"))).toBe(true)
+
+		// And agency files should also exist
+		expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
+	})
+
+	test("preserves createdAt in agency.json but updates it", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		await initAgency(tempDir, "test")
+
+		// Create a task branch
+		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
+
+		// Read original agency.json
+		const originalAgencyJson = JSON.parse(
+			await readFile(join(tempDir, "agency.json")),
+		)
+		const originalCreatedAt = originalAgencyJson.createdAt
+
+		// Wait a bit to ensure time difference
+		await new Promise((resolve) => setTimeout(resolve, 10))
+
+		// Continue to new branch
+		await runTestEffect(
+			task({ silent: true, continue: true, emit: "feature-v2" }),
+		)
+
+		// Read new agency.json
+		const newAgencyJson = JSON.parse(
+			await readFile(join(tempDir, "agency.json")),
+		)
+		const newCreatedAt = newAgencyJson.createdAt
+
+		// createdAt should be updated (different from original)
+		expect(newCreatedAt).not.toBe(originalCreatedAt)
+	})
+})

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

@@ -70,7 +70,7 @@ describe("edit command", () => {
 		// Initialize to create TASK.md
 		await initAgency(tempDir, "test-task")
 
-		await runTestEffect(task({ silent: true, branch: "test-feature" }))
+		await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 		// Use a mock editor that just exits successfully
 		process.env.EDITOR = "true" // 'true' is a command that always exits with code 0
@@ -88,7 +88,7 @@ describe("edit command", () => {
 		// Initialize to create TASK.md
 		await initAgency(tempDir, "test-task")
 
-		await runTestEffect(task({ silent: true, branch: "test-feature" }))
+		await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 		// Use 'true' command which exits successfully without doing anything
 		process.env.EDITOR = "true"
@@ -106,7 +106,7 @@ describe("edit command", () => {
 		// Initialize to create TASK.md
 		await initAgency(tempDir, "test-task")
 
-		await runTestEffect(task({ silent: true, branch: "test-feature" }))
+		await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 		// Set VISUAL to 'true' and EDITOR to 'false'
 		// If VISUAL is used (correct), it should succeed
@@ -127,7 +127,7 @@ describe("edit command", () => {
 		// Initialize to create TASK.md
 		await initAgency(tempDir, "test-task")
 
-		await runTestEffect(task({ silent: true, branch: "test-feature" }))
+		await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 		// Clear VISUAL to ensure EDITOR is used
 		delete process.env.VISUAL

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

@@ -10,6 +10,8 @@ import {
 	fileExists,
 	readFile,
 	runTestEffect,
+	runGitCommand,
+	getCurrentBranch,
 } from "../test-utils"
 
 describe("task command", () => {
@@ -48,7 +50,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			expect(await fileExists(join(tempDir, "AGENTS.md"))).toBe(true)
 		})
@@ -59,7 +61,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "AGENTS.md"))
 			expect(content).toContain("Repo Instructions")
@@ -73,7 +75,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			expect(await fileExists(join(tempDir, "AGENTS.md"))).toBe(true)
 			expect(await fileExists(join(subdir, "AGENTS.md"))).toBe(false)
@@ -88,7 +90,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "AGENTS.md"))
 			expect(content).toBe(existingContent)
@@ -112,7 +114,7 @@ describe("task command", () => {
 				task({
 					path: tempDir,
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -144,7 +146,7 @@ describe("task command", () => {
 				task({
 					path: "..",
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -159,7 +161,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			expect(await fileExists(join(tempDir, "opencode.json"))).toBe(true)
 		})
@@ -170,7 +172,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "opencode.json"))
 			const parsed = JSON.parse(content)
@@ -193,7 +195,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "opencode.json"))
 			const parsed = JSON.parse(content)
@@ -228,7 +230,7 @@ describe("task command", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -251,7 +253,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Should update opencode.jsonc, not create opencode.json
 			expect(await fileExists(join(tempDir, "opencode.jsonc"))).toBe(true)
@@ -291,7 +293,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Should merge with opencode.jsonc (not opencode.json)
 			const jsoncContent = await readFile(join(tempDir, "opencode.jsonc"))
@@ -320,7 +322,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "opencode.jsonc"))
 			const parsed = JSON.parse(content)
@@ -355,7 +357,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Should update .opencode/opencode.json, not create root opencode.json
 			expect(await fileExists(join(dotOpencodeDir, "opencode.json"))).toBe(true)
@@ -393,7 +395,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Should update .opencode/opencode.jsonc, not create root opencode.json
 			expect(await fileExists(join(dotOpencodeDir, "opencode.jsonc"))).toBe(
@@ -441,7 +443,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Should merge with .opencode/opencode.jsonc (not root opencode.json)
 			const dotDirContent = await readFile(
@@ -486,7 +488,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Should merge with .opencode/opencode.json (not root opencode.jsonc)
 			const dotDirContent = await readFile(
@@ -520,7 +522,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// Check agency.json to verify .opencode/opencode.json is in injectedFiles
 			const agencyJsonContent = await readFile(join(tempDir, "agency.json"))
@@ -537,7 +539,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			expect(await fileExists(join(tempDir, "TASK.md"))).toBe(true)
 		})
@@ -548,7 +550,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "TASK.md"))
 			expect(content).toContain("{task}")
@@ -563,7 +565,7 @@ describe("task command", () => {
 				task({
 					silent: true,
 					task: "Build new feature",
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -582,7 +584,7 @@ describe("task command", () => {
 			await initAgency(tempDir, "test")
 
 			// Should succeed but skip TASK.md
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			// TASK.md should not be overwritten
 			const content = await readFile(join(tempDir, "TASK.md"))
@@ -611,7 +613,7 @@ describe("task command", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -632,7 +634,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			console.log = originalLog
 
@@ -662,7 +664,7 @@ describe("task command", () => {
 				task({
 					silent: false,
 					task: "Test task",
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -690,7 +692,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "my-feature" }))
+			await runTestEffect(task({ silent: true, emit: "my-feature" }))
 
 			// Verify we're now on the new branch
 			const proc = Bun.spawn(["git", "branch", "--show-current"], {
@@ -731,7 +733,7 @@ describe("task command", () => {
 					return await runTestEffect(
 						task({
 							silent: true,
-							branch: "existing-branch",
+							emit: "existing-branch",
 							task: "This should not be asked for",
 						}),
 					)
@@ -753,7 +755,7 @@ describe("task command", () => {
 			// Should succeed without needing branch option
 			await initAgency(tempDir, "test")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			expect(await fileExists(join(tempDir, "AGENTS.md"))).toBe(true)
 		})
@@ -796,7 +798,7 @@ describe("task command", () => {
 
 			await initAgency(tempDir, "custom")
 
-			await runTestEffect(task({ silent: true, branch: "test-feature" }))
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
 
 			const content = await readFile(join(tempDir, "AGENTS.md"))
 			expect(content).toBe(sourceContent)
@@ -811,7 +813,7 @@ describe("task command", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -829,7 +831,7 @@ describe("task command", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -854,7 +856,7 @@ describe("task command", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "test-feature",
+					emit: "test-feature",
 				}),
 			)
 
@@ -868,5 +870,28 @@ describe("task command", () => {
 			// opencode.json should be in injectedFiles
 			expect(metadata.injectedFiles).toContain("opencode.json")
 		})
+
+		test("supports deprecated --branch flag for backward compatibility", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+
+			await initAgency(tempDir, "test")
+
+			// Use deprecated --branch flag instead of --emit
+			await runTestEffect(
+				task({
+					silent: true,
+					branch: "backward-compat-test",
+				}),
+			)
+
+			// Should have created the branch with agency/ prefix
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/backward-compat-test")
+
+			// Should have correct emitBranch in agency.json
+			const metadata = JSON.parse(await readFile(join(tempDir, "agency.json")))
+			expect(metadata.emitBranch).toBe("backward-compat-test")
+		})
 	})
 })