@markjaquith/agency 1.11.1 → 2.1.0

package/src/commands/tasks.ts

@@ -1,161 +0,0 @@
-import { Effect, DateTime } from "effect"
-import { Schema } from "@effect/schema"
-import type { BaseCommandOptions } from "../utils/command"
-import { GitService } from "../services/GitService"
-import { ConfigService } from "../services/ConfigService"
-import { AgencyMetadata } from "../schemas"
-import highlight from "../utils/colors"
-import { createLoggers, ensureGitRepo } from "../utils/effect"
-
-interface TasksOptions extends BaseCommandOptions {
-	json?: boolean
-}
-
-/**
- * Task branch info for output
- */
-interface TaskBranchInfo {
-	branch: string
-	template: string | null
-	baseBranch: string | null
-	createdAt: string | null
-}
-
-/**
- * Read agency.json metadata from a specific branch using git show.
- */
-const readAgencyMetadataFromBranch = (gitRoot: string, branch: string) =>
-	Effect.gen(function* () {
-		const git = yield* GitService
-
-		// Try to read agency.json from the branch using git show
-		const content = yield* git.getFileAtRef(gitRoot, branch, "agency.json")
-
-		if (!content) {
-			return null
-		}
-
-		return yield* parseAgencyMetadata(content)
-	}).pipe(Effect.catchAll(() => Effect.succeed(null)))
-
-/**
- * Parse and validate agency.json content.
- */
-const parseAgencyMetadata = (content: string) =>
-	Effect.gen(function* () {
-		const data = yield* Effect.try({
-			try: () => JSON.parse(content),
-			catch: () => new Error("Failed to parse agency.json"),
-		})
-
-		// Validate version
-		if (typeof data.version !== "number" || data.version !== 1) {
-			return null
-		}
-
-		// Parse and validate using Effect schema
-		const metadata = yield* Effect.try({
-			try: () => Schema.decodeUnknownSync(AgencyMetadata)(data),
-			catch: () => new Error("Invalid agency.json format"),
-		})
-
-		return metadata
-	}).pipe(Effect.catchAll(() => Effect.succeed(null)))
-
-/**
- * Extract the prefix from a source branch pattern (everything before %branch%).
- */
-const getSourceBranchPrefix = (pattern: string): string => {
-	if (pattern.includes("%branch%")) {
-		return pattern.split("%branch%")[0]!
-	}
-	// If no %branch% placeholder, the whole pattern is the prefix
-	return pattern
-}
-
-/**
- * Find all branches that match the source branch pattern prefix
- */
-const findAllTaskBranches = (gitRoot: string) =>
-	Effect.gen(function* () {
-		const git = yield* GitService
-		const configService = yield* ConfigService
-
-		// Get source branch pattern from config
-		const config = yield* configService.loadConfig()
-		const prefix = getSourceBranchPrefix(config.sourceBranchPattern)
-
-		// Get only branches matching the prefix (fast - single git command)
-		const branches = yield* git.getBranchesByPrefix(gitRoot, prefix)
-
-		// For each matching branch, try to read agency.json for metadata
-		const taskBranches: TaskBranchInfo[] = []
-		for (const branch of branches) {
-			const metadata = yield* readAgencyMetadataFromBranch(gitRoot, branch)
-
-			if (metadata) {
-				taskBranches.push({
-					branch,
-					template: metadata.template ?? null,
-					baseBranch: metadata.baseBranch ?? null,
-					createdAt: metadata.createdAt
-						? DateTime.toDateUtc(metadata.createdAt).toISOString()
-						: null,
-				})
-			} else {
-				// Branch matches prefix but has no valid agency.json - still list it
-				taskBranches.push({
-					branch,
-					template: null,
-					baseBranch: null,
-					createdAt: null,
-				})
-			}
-		}
-
-		return taskBranches
-	})
-
-export const tasks = (options: TasksOptions = {}) =>
-	Effect.gen(function* () {
-		const { json = false } = options
-		const { log } = createLoggers(options)
-
-		const gitRoot = yield* ensureGitRepo()
-
-		// Find all branches with agency.json
-		const taskBranches = yield* findAllTaskBranches(gitRoot)
-
-		if (json) {
-			// Output JSON format
-			log(JSON.stringify(taskBranches, null, 2))
-		} else {
-			// Output human-readable format - just branch names
-			if (taskBranches.length === 0) {
-				log("")
-				log("No task branches found.")
-				log(
-					`Run ${highlight.value("agency task")} to create a task on a feature branch.`,
-				)
-				log("")
-			} else {
-				for (const task of taskBranches) {
-					log(task.branch)
-				}
-			}
-		}
-	})
-
-export const help = `
-Usage: agency tasks [options]
-
-List all source branches that have agency tasks (branches matching the source
-branch pattern, e.g. "agency--*").
-
-Options:
-  --json              Output as JSON (includes metadata: template, base branch, created date)
-
-Example:
-  agency tasks                   # List all task branches (names only)
-  agency tasks --json            # Output as JSON with full metadata
-`

package/src/commands/template-delete.test.ts

@@ -1,178 +0,0 @@
-import { describe, expect, test, beforeEach, afterEach } from "bun:test"
-import { templateDelete } from "./template-delete"
-import { mkdir, writeFile, rm } from "node:fs/promises"
-import { join } from "node:path"
-import { tmpdir } from "node:os"
-import { runTestEffect } from "../test-utils"
-
-describe("template delete command", () => {
-	let testDir: string
-	let gitRoot: string
-	let templateDir: string
-
-	beforeEach(async () => {
-		// Create temporary test directory
-		testDir = join(tmpdir(), `agency-test-delete-${Date.now()}`)
-		await mkdir(testDir, { recursive: true })
-		gitRoot = join(testDir, "repo")
-		await mkdir(gitRoot, { recursive: true })
-
-		// Initialize git repo
-		await Bun.spawn(["git", "init"], {
-			cwd: gitRoot,
-			stdout: "ignore",
-			stderr: "ignore",
-		}).exited
-
-		// Set up config dir
-		const configDir = join(testDir, "config")
-		templateDir = join(configDir, "templates", "test-template")
-		await mkdir(templateDir, { recursive: true })
-
-		// Set environment variable for config
-		process.env.AGENCY_CONFIG_DIR = configDir
-
-		// Set git config
-		await Bun.spawn(["git", "config", "agency.template", "test-template"], {
-			cwd: gitRoot,
-			stdout: "ignore",
-			stderr: "ignore",
-		}).exited
-	})
-
-	afterEach(async () => {
-		// Clean up
-		await rm(testDir, { recursive: true, force: true })
-		delete process.env.AGENCY_CONFIG_DIR
-	})
-
-	test("deletes file from template directory", async () => {
-		// Create test file in template
-		const testFile = join(templateDir, "test.md")
-		await writeFile(testFile, "# Test")
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await runTestEffect(templateDelete({ files: ["test.md"], silent: true }))
-
-			// Verify file was deleted
-			const file = Bun.file(testFile)
-			expect(await file.exists()).toBe(false)
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("deletes multiple files", async () => {
-		// Create test files in template
-		await writeFile(join(templateDir, "file1.md"), "# File 1")
-		await writeFile(join(templateDir, "file2.md"), "# File 2")
-		await writeFile(join(templateDir, "file3.md"), "# File 3")
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await runTestEffect(
-				templateDelete({
-					files: ["file1.md", "file2.md"],
-					silent: true,
-				}),
-			)
-
-			// Verify files were deleted
-			expect(await Bun.file(join(templateDir, "file1.md")).exists()).toBe(false)
-			expect(await Bun.file(join(templateDir, "file2.md")).exists()).toBe(false)
-			// file3.md should still exist
-			expect(await Bun.file(join(templateDir, "file3.md")).exists()).toBe(true)
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("deletes directory recursively", async () => {
-		// Create test directory with files
-		const docsDir = join(templateDir, "docs")
-		await mkdir(docsDir, { recursive: true })
-		await writeFile(join(docsDir, "README.md"), "# Docs")
-		await writeFile(join(docsDir, "guide.md"), "# Guide")
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await runTestEffect(templateDelete({ files: ["docs"], silent: true }))
-
-			// Verify directory was deleted
-			const dir = Bun.file(docsDir)
-			expect(await dir.exists()).toBe(false)
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("handles non-existent files gracefully", async () => {
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			// Should not throw error for non-existent file
-			await runTestEffect(
-				templateDelete({ files: ["nonexistent.md"], silent: true }),
-			)
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("throws error when no files specified", async () => {
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await expect(
-				runTestEffect(templateDelete({ files: [], silent: true })),
-			).rejects.toThrow("No files specified")
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("throws error when not in git repository", async () => {
-		const nonGitDir = join(testDir, "non-git")
-		await mkdir(nonGitDir, { recursive: true })
-
-		const originalCwd = process.cwd()
-		process.chdir(nonGitDir)
-
-		try {
-			await expect(
-				runTestEffect(templateDelete({ files: ["test.md"], silent: true })),
-			).rejects.toThrow("Not in a git repository")
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("throws error when template not configured", async () => {
-		// Remove git config
-		await Bun.spawn(["git", "config", "--unset", "agency.template"], {
-			cwd: gitRoot,
-			stdout: "ignore",
-			stderr: "ignore",
-		}).exited
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await expect(
-				runTestEffect(templateDelete({ files: ["test.md"], silent: true })),
-			).rejects.toThrow("Repository not initialized")
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-})

package/src/commands/template-delete.ts

@@ -1,98 +0,0 @@
-import { resolve } from "path"
-import { rm } from "node:fs/promises"
-import { Effect } from "effect"
-import type { BaseCommandOptions } from "../utils/command"
-import { TemplateService } from "../services/TemplateService"
-import { FileSystemService } from "../services/FileSystemService"
-import { RepositoryNotInitializedError } from "../errors"
-import highlight, { done } from "../utils/colors"
-import { createLoggers, ensureGitRepo, getTemplateName } from "../utils/effect"
-
-interface DeleteOptions extends BaseCommandOptions {
-	files?: string[]
-}
-
-export const templateDelete = (options: DeleteOptions = {}) =>
-	Effect.gen(function* () {
-		const { files: filesToDelete = [] } = options
-		const { log, verboseLog } = createLoggers(options)
-
-		const templateService = yield* TemplateService
-		const fs = yield* FileSystemService
-
-		const gitRoot = yield* ensureGitRepo()
-
-		// Get template name from git config
-		const templateName = yield* getTemplateName(gitRoot)
-		if (!templateName) {
-			return yield* Effect.fail(new RepositoryNotInitializedError())
-		}
-
-		if (filesToDelete.length === 0) {
-			return yield* Effect.fail(
-				new Error(
-					"No files specified. Usage: agency template delete <file> [file ...]",
-				),
-			)
-		}
-
-		verboseLog(`Deleting from template: ${highlight.template(templateName)}`)
-
-		// Get template directory
-		const templateDir = yield* templateService.getTemplateDir(templateName)
-
-		// Delete each file
-		for (const filePath of filesToDelete) {
-			const templateFilePath = resolve(templateDir, filePath)
-
-			// Check if file exists
-			const exists = yield* fs.exists(templateFilePath)
-			if (!exists) {
-				verboseLog(`Skipping ${filePath} (does not exist in template)`)
-				continue
-			}
-
-			// Delete the file/directory
-			yield* Effect.tryPromise({
-				try: () => rm(templateFilePath, { recursive: true, force: true }),
-				catch: (error) => new Error(`Failed to delete ${filePath}: ${error}`),
-			})
-
-			log(
-				done(
-					`Deleted ${highlight.file(filePath)} from ${highlight.template(templateName)} template`,
-				),
-			)
-		}
-	})
-
-// Help text for reference (not exported as it's handled by template command)
-const help = `
-Usage: agency template delete <file> [file ...] [options]
-
-Delete specified files from the configured template directory.
-
-This command removes files from the template directory configured in 
-.git/config (agency.template).
-
-Arguments:
-  <file>            File path to delete (relative to template root)
-  [file ...]        Additional files to delete
-
-Options:
-  -h, --help        Show this help message
-  -s, --silent      Suppress output messages
-  -v, --verbose     Show verbose output
-
-Examples:
-  agency template delete AGENTS.md           # Delete specific file
-  agency template delete docs/ src/          # Delete directories
-  agency template delete file1 file2 file3   # Delete multiple files
-
-Notes:
-  - Requires agency.template to be set (run 'agency init' first)
-  - At least one file must be specified
-  - Files are deleted from ~/.config/agency/templates/{template-name}/
-  - Non-existent files are skipped with a warning in verbose mode
-  - Directories are deleted recursively
-`

package/src/commands/template-list.test.ts

@@ -1,135 +0,0 @@
-import { describe, expect, test, beforeEach, afterEach } from "bun:test"
-import { templateList } from "./template-list"
-import { mkdir, writeFile, rm } from "node:fs/promises"
-import { join } from "node:path"
-import { tmpdir } from "node:os"
-import { runTestEffect } from "../test-utils"
-
-describe("template list command", () => {
-	let testDir: string
-	let gitRoot: string
-	let templateDir: string
-
-	beforeEach(async () => {
-		// Create temporary test directory
-		testDir = join(tmpdir(), `agency-test-list-${Date.now()}`)
-		await mkdir(testDir, { recursive: true })
-		gitRoot = join(testDir, "repo")
-		await mkdir(gitRoot, { recursive: true })
-
-		// Initialize git repo
-		await Bun.spawn(["git", "init"], {
-			cwd: gitRoot,
-			stdout: "ignore",
-			stderr: "ignore",
-		}).exited
-
-		// Set up config dir
-		const configDir = join(testDir, "config")
-		templateDir = join(configDir, "templates", "test-template")
-		await mkdir(templateDir, { recursive: true })
-
-		// Set environment variable for config
-		process.env.AGENCY_CONFIG_DIR = configDir
-
-		// Set git config
-		await Bun.spawn(["git", "config", "agency.template", "test-template"], {
-			cwd: gitRoot,
-			stdout: "ignore",
-			stderr: "ignore",
-		}).exited
-	})
-
-	afterEach(async () => {
-		// Clean up
-		await rm(testDir, { recursive: true, force: true })
-		delete process.env.AGENCY_CONFIG_DIR
-	})
-
-	test("lists files in template directory", async () => {
-		// Create test files in template
-		await writeFile(join(templateDir, "AGENTS.md"), "# Agents")
-		await writeFile(join(templateDir, "opencode.json"), "{}")
-		await mkdir(join(templateDir, "docs"), { recursive: true })
-		await writeFile(join(templateDir, "docs", "README.md"), "# Docs")
-
-		// Capture output
-		const output: string[] = []
-		const originalLog = console.log
-		console.log = (...args: any[]) => {
-			output.push(args.join(" "))
-		}
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await runTestEffect(templateList({ silent: false }))
-		} finally {
-			process.chdir(originalCwd)
-			console.log = originalLog
-		}
-
-		expect(output.length).toBeGreaterThan(0)
-		expect(output.some((line) => line.includes("AGENTS.md"))).toBe(true)
-		expect(output.some((line) => line.includes("opencode.json"))).toBe(true)
-		expect(output.some((line) => line.includes("docs/README.md"))).toBe(true)
-	})
-
-	test("handles empty template directory", async () => {
-		// Capture output
-		const output: string[] = []
-		const originalLog = console.log
-		console.log = (...args: any[]) => {
-			output.push(args.join(" "))
-		}
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await runTestEffect(templateList({ silent: false }))
-		} finally {
-			process.chdir(originalCwd)
-			console.log = originalLog
-		}
-
-		expect(output.some((line) => line.includes("has no files"))).toBe(true)
-	})
-
-	test("throws error when not in git repository", async () => {
-		const nonGitDir = join(testDir, "non-git")
-		await mkdir(nonGitDir, { recursive: true })
-
-		const originalCwd = process.cwd()
-		process.chdir(nonGitDir)
-
-		try {
-			await expect(
-				runTestEffect(templateList({ silent: true })),
-			).rejects.toThrow("Not in a git repository")
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-
-	test("throws error when template not configured", async () => {
-		// Remove git config
-		await Bun.spawn(["git", "config", "--unset", "agency.template"], {
-			cwd: gitRoot,
-			stdout: "ignore",
-			stderr: "ignore",
-		}).exited
-
-		const originalCwd = process.cwd()
-		process.chdir(gitRoot)
-
-		try {
-			await expect(
-				runTestEffect(templateList({ silent: true })),
-			).rejects.toThrow("Repository not initialized")
-		} finally {
-			process.chdir(originalCwd)
-		}
-	})
-})

package/src/commands/template-list.ts

@@ -1,87 +0,0 @@
-import { Effect } from "effect"
-import type { BaseCommandOptions } from "../utils/command"
-import { TemplateService } from "../services/TemplateService"
-import { FileSystemService } from "../services/FileSystemService"
-import { RepositoryNotInitializedError } from "../errors"
-import highlight from "../utils/colors"
-import { createLoggers, ensureGitRepo, getTemplateName } from "../utils/effect"
-
-interface ListOptions extends BaseCommandOptions {}
-
-export const templateList = (options: ListOptions = {}) =>
-	Effect.gen(function* () {
-		const { log, verboseLog } = createLoggers(options)
-
-		const templateService = yield* TemplateService
-		const fs = yield* FileSystemService
-
-		const gitRoot = yield* ensureGitRepo()
-
-		// Get template name from git config
-		const templateName = yield* getTemplateName(gitRoot)
-		if (!templateName) {
-			return yield* Effect.fail(new RepositoryNotInitializedError())
-		}
-
-		verboseLog(`Listing files in template: ${highlight.template(templateName)}`)
-
-		// Get template directory
-		const templateDir = yield* templateService.getTemplateDir(templateName)
-
-		// Check if template directory exists and is a directory
-		const isDirectory = yield* Effect.tryPromise({
-			try: async () => {
-				const file = Bun.file(templateDir)
-				const stat = await file.stat()
-				return stat?.isDirectory?.() ?? false
-			},
-			catch: (error) =>
-				new Error(`Failed to check template directory: ${error}`),
-		})
-		if (!isDirectory) {
-			return yield* Effect.fail(
-				new Error(
-					`Template directory does not exist: ${highlight.template(templateName)}`,
-				),
-			)
-		}
-
-		// Collect all files recursively
-		const files = yield* fs.collectFiles(templateDir, {
-			exclude: [".gitkeep"],
-			sort: true,
-		})
-
-		if (files.length === 0) {
-			log(`Template ${highlight.template(templateName)} has no files`)
-			return
-		}
-
-		for (const file of files) {
-			log(highlight.file(file))
-		}
-	})
-
-// Help text for reference (not exported as it's handled by template command)
-const help = `
-Usage: agency template list [options]
-
-List all files in the configured template directory.
-
-This command displays all files stored in the template configured for the
-current git repository.
-
-Options:
-  -h, --help        Show this help message
-  -s, --silent      Suppress output messages
-  -v, --verbose     Show verbose output
-
-Example:
-  agency template list                # List files in current template
-
-Notes:
-  - Requires agency.template to be set (run 'agency init' first)
-  - Shows files relative to template root directory
-  - Files are listed in alphabetical order
-  - Template directory must exist (created when you save files)
-`