@markjaquith/agency 1.11.1 → 2.1.0

package/src/commands/source.test.ts

@@ -1,195 +0,0 @@
-import { test, expect, describe, beforeEach, afterEach } from "bun:test"
-import { join } from "path"
-import { source } from "./source"
-import {
-	createTempDir,
-	cleanupTempDir,
-	initGitRepo,
-	getCurrentBranch,
-	createCommit,
-	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
-}
-
-describe("source 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("switches from emit branch to source branch", async () => {
-			// Create source branch with agency.json
-			await createBranch(tempDir, "agency--feature")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: [],
-				template: "test-template",
-				emitBranch: "feature",
-				createdAt: new Date().toISOString(),
-			} as any)
-			// Stage and commit agency.json
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Setup")
-
-			// Create emit branch and remove agency.json
-			await createBranch(tempDir, "feature")
-			await Bun.spawn(["rm", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-
-			// Run source command (should switch from feature emit branch to agency--feature source)
-			await runTestEffect(source({ silent: true }))
-
-			// Should be on agency--feature now
-			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency--feature")
-		})
-
-		test("works with custom emit branch pattern", async () => {
-			// Create custom config with custom patterns
-			const configPath = join(tempDir, "custom-config.json")
-			await Bun.write(
-				configPath,
-				JSON.stringify({
-					sourceBranchPattern: "WIP--%branch%",
-					emitBranch: "PR--%branch%",
-				}),
-			)
-			process.env.AGENCY_CONFIG_PATH = configPath
-
-			// Create source branch with agency.json
-			await createBranch(tempDir, "WIP--feature")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: [],
-				template: "test-template",
-				emitBranch: "PR--feature",
-				createdAt: new Date().toISOString(),
-			} as any)
-			// Stage and commit
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Feature work")
-
-			// Create emit branch
-			await createBranch(tempDir, "PR--feature")
-			await Bun.spawn(["rm", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-
-			// Run source command (from PR--feature to WIP--feature)
-			await runTestEffect(source({ silent: true }))
-
-			// Should be on WIP--feature now
-			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("WIP--feature")
-		})
-	})
-
-	describe("error handling", () => {
-		test("throws error when not on an emit branch", async () => {
-			// We're on main, which is not an emit branch
-			await expect(runTestEffect(source({ silent: true }))).rejects.toThrow(
-				"Not on an emit branch",
-			)
-		})
-
-		test("throws error when not in a git repository", async () => {
-			const nonGitDir = await createTempDir()
-			process.chdir(nonGitDir)
-
-			await expect(runTestEffect(source({ silent: true }))).rejects.toThrow(
-				"Not in a git repository",
-			)
-
-			await cleanupTempDir(nonGitDir)
-		})
-	})
-
-	describe("silent mode", () => {
-		test("silent flag suppresses output", async () => {
-			// Create source branch with agency.json
-			await createBranch(tempDir, "agency--feature")
-			await writeAgencyMetadata(tempDir, {
-				version: 1,
-				injectedFiles: [],
-				template: "test-template",
-				emitBranch: "feature",
-				createdAt: new Date().toISOString(),
-			} as any)
-			await Bun.spawn(["git", "add", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-			await createCommit(tempDir, "Setup")
-
-			// Create emit branch
-			await createBranch(tempDir, "feature")
-			await Bun.spawn(["rm", "agency.json"], {
-				cwd: tempDir,
-				stdout: "pipe",
-				stderr: "pipe",
-			}).exited
-
-			// Capture output
-			const originalLog = console.log
-			let logCalled = false
-			console.log = () => {
-				logCalled = true
-			}
-
-			await runTestEffect(source({ silent: true }))
-
-			console.log = originalLog
-			expect(logCalled).toBe(false)
-		})
-	})
-})

package/src/commands/source.ts

@@ -1,72 +0,0 @@
-import { Effect } from "effect"
-import type { BaseCommandOptions } from "../utils/command"
-import { GitService } from "../services/GitService"
-import { ConfigService } from "../services/ConfigService"
-import { FileSystemService } from "../services/FileSystemService"
-import { resolveBranchPairWithAgencyJson } from "../utils/pr-branch"
-import highlight, { done } from "../utils/colors"
-import {
-	createLoggers,
-	ensureGitRepo,
-	ensureBranchExists,
-} from "../utils/effect"
-
-interface SourceOptions extends BaseCommandOptions {}
-
-export const source = (options: SourceOptions = {}) =>
-	Effect.gen(function* () {
-		const { log } = createLoggers(options)
-
-		const git = yield* GitService
-		const configService = yield* ConfigService
-
-		const gitRoot = yield* ensureGitRepo()
-
-		// Load config
-		const config = yield* configService.loadConfig()
-
-		// Get current branch and resolve the branch pair
-		const currentBranch = yield* git.getCurrentBranch(gitRoot)
-		const { sourceBranch, isOnEmitBranch } =
-			yield* resolveBranchPairWithAgencyJson(
-				gitRoot,
-				currentBranch,
-				config.sourceBranchPattern,
-				config.emitBranch,
-			)
-
-		if (!isOnEmitBranch) {
-			return yield* Effect.fail(
-				new Error(`Not on an emit branch. Current branch: ${currentBranch}`),
-			)
-		}
-
-		// Check if source branch exists
-		yield* ensureBranchExists(
-			gitRoot,
-			sourceBranch,
-			`Source branch ${highlight.branch(sourceBranch)} does not exist`,
-		)
-
-		// Checkout source branch
-		yield* git.checkoutBranch(gitRoot, sourceBranch)
-
-		log(done(`Switched to source branch: ${highlight.branch(sourceBranch)}`))
-	})
-
-export const help = `
-Usage: agency source [options]
-
-Switch back to the source branch from an emit branch.
-
-This command extracts the source branch name from your current emit branch name
-using the configured pattern, and switches back to it.
-
-Example:
-  agency source                  # From main--PR, switch to main
-
-Notes:
-  - Must be run from an emit branch
-  - Source branch must exist
-  - Uses emit branch pattern from ~/.config/agency/agency.json
-`

package/src/commands/switch.test.ts

@@ -1,194 +0,0 @@
-import { test, expect, describe, beforeEach, afterEach } from "bun:test"
-import { join } from "path"
-import { switchBranch } from "./switch"
-import {
-	createTempDir,
-	cleanupTempDir,
-	initGitRepo,
-	getGitOutput,
-	getCurrentBranch,
-	createCommit,
-	checkoutBranch,
-	runTestEffect,
-} from "../test-utils"
-
-async function createBranch(cwd: string, branchName: string): Promise<void> {
-	await Bun.spawn(["git", "checkout", "-b", branchName], {
-		cwd,
-		stdout: "pipe",
-		stderr: "pipe",
-	}).exited
-}
-
-describe("switch 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("switches from emit branch to source branch", async () => {
-			// Create source and emit branches (source=agency--main, emit=main)
-			await createBranch(tempDir, "agency--main")
-			await createCommit(tempDir, "Work on source")
-			// Emit branch is just "main" (already exists from setup)
-			await checkoutBranch(tempDir, "main")
-
-			// Run switch command
-			await runTestEffect(switchBranch({ silent: true }))
-
-			// Should be on source branch now
-			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency--main")
-		})
-
-		test("switches from source branch to emit branch", async () => {
-			// Create source branch (main becomes the emit branch)
-			await createBranch(tempDir, "agency--main")
-			await createCommit(tempDir, "Work on source")
-
-			// We're on agency--main (source), switch to main (emit)
-			// Run switch command
-			await runTestEffect(switchBranch({ silent: true }))
-
-			// Should be on emit branch now
-			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("main")
-		})
-
-		test("toggles back and forth", async () => {
-			// Create source and emit branches
-			await createBranch(tempDir, "agency--main")
-			await createCommit(tempDir, "Work on source")
-			await checkoutBranch(tempDir, "main") // Go to emit
-
-			// Switch to source
-			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("agency--main")
-
-			// Switch back to emit
-			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("main")
-
-			// And back to source
-			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("agency--main")
-		})
-
-		test("works with custom emit branch pattern", async () => {
-			// Create custom config
-			const configPath = join(tempDir, "custom-config.json")
-			await Bun.write(
-				configPath,
-				JSON.stringify({
-					sourceBranchPattern: "agency--%branch%",
-					emitBranch: "PR--%branch%",
-				}),
-			)
-			process.env.AGENCY_CONFIG_PATH = configPath
-
-			// Create source branch and its emit branch
-			await createBranch(tempDir, "agency--feature")
-			await createCommit(tempDir, "Feature work")
-			await createBranch(tempDir, "PR--feature")
-
-			// Switch to source
-			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("agency--feature")
-
-			// Switch back to emit
-			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("PR--feature")
-		})
-	})
-
-	describe("error handling", () => {
-		test("throws error when emit branch doesn't exist", async () => {
-			// Use custom emit pattern so emit branch differs from source
-			const configPath = join(tempDir, "custom-config.json")
-			await Bun.write(
-				configPath,
-				JSON.stringify({
-					sourceBranchPattern: "agency--%branch%",
-					emitBranch: "%branch%--PR",
-				}),
-			)
-			process.env.AGENCY_CONFIG_PATH = configPath
-
-			// Create source branch, but not the emit branch
-			await createBranch(tempDir, "agency--feature")
-			// feature--PR doesn't exist
-
-			await expect(
-				runTestEffect(switchBranch({ silent: true })),
-			).rejects.toThrow(/Emit branch .* does not exist/)
-		})
-
-		test("throws error when emit branch doesn't exist", async () => {
-			// Create source branch but no emit branch
-			await createBranch(tempDir, "agency--feature")
-			// We never created 'feature' (emit), so it doesn't exist
-
-			await expect(
-				runTestEffect(switchBranch({ silent: true })),
-			).rejects.toThrow(/Emit branch .* does not exist/)
-		})
-
-		test("throws error when not in a git repository", async () => {
-			const nonGitDir = await createTempDir()
-			process.chdir(nonGitDir)
-
-			await expect(
-				runTestEffect(switchBranch({ silent: true })),
-			).rejects.toThrow("Not in a git repository")
-
-			await cleanupTempDir(nonGitDir)
-		})
-	})
-
-	describe("silent mode", () => {
-		test("silent flag suppresses output", async () => {
-			await createBranch(tempDir, "agency--main")
-			await checkoutBranch(tempDir, "main")
-
-			// Capture output
-			const originalLog = console.log
-			let logCalled = false
-			console.log = () => {
-				logCalled = true
-			}
-
-			await runTestEffect(switchBranch({ silent: true }))
-
-			console.log = originalLog
-			expect(logCalled).toBe(false)
-		})
-	})
-})

package/src/commands/switch.ts

@@ -1,84 +0,0 @@
-import { Effect } from "effect"
-import type { BaseCommandOptions } from "../utils/command"
-import { GitService } from "../services/GitService"
-import { ConfigService } from "../services/ConfigService"
-import {
-	resolveBranchPairWithAgencyJson,
-	type BranchPair,
-} from "../utils/pr-branch"
-import highlight, { done } from "../utils/colors"
-import {
-	createLoggers,
-	ensureGitRepo,
-	ensureBranchExists,
-} from "../utils/effect"
-
-interface SwitchOptions extends BaseCommandOptions {}
-
-export const switchBranch = (options: SwitchOptions = {}) =>
-	Effect.gen(function* () {
-		const { log } = createLoggers(options)
-
-		const git = yield* GitService
-		const configService = yield* ConfigService
-
-		const gitRoot = yield* ensureGitRepo()
-
-		// Load config
-		const config = yield* configService.loadConfig()
-
-		// Get current branch and resolve the branch pair
-		const currentBranch = yield* git.getCurrentBranch(gitRoot)
-		const branches: BranchPair = yield* resolveBranchPairWithAgencyJson(
-			gitRoot,
-			currentBranch,
-			config.sourceBranchPattern,
-			config.emitBranch,
-		)
-		const { sourceBranch, emitBranch, isOnEmitBranch } = branches
-
-		if (isOnEmitBranch) {
-			// We're on an emit branch, switch to source
-			yield* ensureBranchExists(
-				gitRoot,
-				sourceBranch,
-				`Source branch ${highlight.branch(sourceBranch)} does not exist`,
-			)
-
-			yield* git.checkoutBranch(gitRoot, sourceBranch)
-			log(done(`Switched to source branch: ${highlight.branch(sourceBranch)}`))
-		} else {
-			// We're on a source branch, switch to emit branch
-			yield* ensureBranchExists(
-				gitRoot,
-				emitBranch,
-				`Emit branch ${highlight.branch(emitBranch)} does not exist. Run 'agency emit' to create it.`,
-			)
-
-			yield* git.checkoutBranch(gitRoot, emitBranch)
-			log(done(`Switched to ${highlight.branch(emitBranch)}`))
-		}
-	})
-
-export const help = `
-Usage: agency switch [options]
-
-Toggle between source branch and emit branch.
-
-Source and Emit Branches:
-  - Source branches: Your working branches with agency-specific files (e.g., agency--main)
-  - Emit branches: Clean branches suitable for PRs without agency files (e.g., main)
-
-This command intelligently switches between your source branch and its
-corresponding emit branch:
-  - If on an emit branch (e.g., main), switches to source (agency--main)
-  - If on a source branch (e.g., agency--main), switches to emit branch (main)
-
-Example:
-  agency switch                  # Toggle between branches
-
-Notes:
-  - Target branch must exist
-  - Uses source and emit patterns from ~/.config/agency/agency.json
-  - If emit branch doesn't exist, run 'agency emit' to create it
-`