@markjaquith/agency 1.6.3 → 1.7.0

package/src/commands/status.ts

@@ -1,12 +1,14 @@
 import { Effect, DateTime } from "effect"
 import { join } from "node:path"
-import { Schema } from "@effect/schema"
 import type { BaseCommandOptions } from "../utils/command"
 import { GitService } from "../services/GitService"
 import { ConfigService } from "../services/ConfigService"
 import { FileSystemService } from "../services/FileSystemService"
+import {
+	AgencyMetadataService,
+	parseAgencyMetadata,
+} from "../services/AgencyMetadataService"
 import { resolveBranchPairWithAgencyJson } from "../utils/pr-branch"
-import { AgencyMetadata } from "../schemas"
 import highlight, { plural } from "../utils/colors"
 import { createLoggers, ensureGitRepo, getTemplateName } from "../utils/effect"
 
@@ -74,30 +76,6 @@ const readAgencyMetadataFromBranch = (gitRoot: string, branch: string) =>
 		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)))
-
 export const status = (options: StatusOptions = {}) =>
 	Effect.gen(function* () {
 		const { json = false } = options

package/src/commands/switch.test.ts

@@ -55,8 +55,8 @@ describe("switch command", () => {
 
 	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")
+			// 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")
@@ -66,15 +66,15 @@ describe("switch command", () => {
 
 			// Should be on source branch now
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/main")
+			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 createBranch(tempDir, "agency--main")
 			await createCommit(tempDir, "Work on source")
 
-			// We're on agency/main (source), switch to main (emit)
+			// We're on agency--main (source), switch to main (emit)
 			// Run switch command
 			await runTestEffect(switchBranch({ silent: true }))
 
@@ -85,13 +85,13 @@ describe("switch command", () => {
 
 		test("toggles back and forth", async () => {
 			// Create source and emit branches
-			await createBranch(tempDir, "agency/main")
+			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")
+			expect(await getCurrentBranch(tempDir)).toBe("agency--main")
 
 			// Switch back to emit
 			await runTestEffect(switchBranch({ silent: true }))
@@ -99,7 +99,7 @@ describe("switch command", () => {
 
 			// And back to source
 			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("agency/main")
+			expect(await getCurrentBranch(tempDir)).toBe("agency--main")
 		})
 
 		test("works with custom emit branch pattern", async () => {
@@ -108,24 +108,24 @@ describe("switch command", () => {
 			await Bun.write(
 				configPath,
 				JSON.stringify({
-					sourceBranchPattern: "agency/%branch%",
-					emitBranch: "PR/%branch%",
+					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 createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature work")
-			await createBranch(tempDir, "PR/feature")
+			await createBranch(tempDir, "PR--feature")
 
 			// Switch to source
 			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("agency/feature")
+			expect(await getCurrentBranch(tempDir)).toBe("agency--feature")
 
 			// Switch back to emit
 			await runTestEffect(switchBranch({ silent: true }))
-			expect(await getCurrentBranch(tempDir)).toBe("PR/feature")
+			expect(await getCurrentBranch(tempDir)).toBe("PR--feature")
 		})
 	})
 
@@ -136,14 +136,14 @@ describe("switch command", () => {
 			await Bun.write(
 				configPath,
 				JSON.stringify({
-					sourceBranchPattern: "agency/%branch%",
+					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")
+			await createBranch(tempDir, "agency--feature")
 			// feature--PR doesn't exist
 
 			await expect(
@@ -153,7 +153,7 @@ describe("switch command", () => {
 
 		test("throws error when emit branch doesn't exist", async () => {
 			// Create source branch but no emit branch
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			// We never created 'feature' (emit), so it doesn't exist
 
 			await expect(
@@ -175,7 +175,7 @@ describe("switch command", () => {
 
 	describe("silent mode", () => {
 		test("silent flag suppresses output", async () => {
-			await createBranch(tempDir, "agency/main")
+			await createBranch(tempDir, "agency--main")
 			await checkoutBranch(tempDir, "main")
 
 			// Capture output

package/src/commands/switch.ts

@@ -66,13 +66,13 @@ 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)
+  - 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)
+  - 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

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

@@ -42,7 +42,7 @@ describe("task command - branching functionality", () => {
 	})
 
 	describe("--from flag", () => {
-		test("creates new agency/some-branch when using --from some-branch with explicit name", async () => {
+		test("creates new agency--some-branch when using --from some-branch with explicit name", async () => {
 			await initGitRepo(tempDir)
 			process.chdir(tempDir)
 			await initAgency(tempDir, "test")
@@ -54,7 +54,7 @@ describe("task command - branching functionality", () => {
 			await runGitCommand(tempDir, ["git", "commit", "-m", "Add feature"])
 
 			// Run agency task my-feature --from some-branch
-			// This should create a NEW branch called agency/my-feature
+			// This should create a NEW branch called agency--my-feature
 			await runTestEffect(
 				task({
 					silent: true,
@@ -64,7 +64,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-feature")
+			expect(currentBranch).toBe("agency--my-feature")
 
 			// Verify feature.txt exists (came from some-branch)
 			const featureFile = await Bun.file(join(tempDir, "feature.txt")).text()
@@ -75,7 +75,7 @@ describe("task command - branching functionality", () => {
 			expect(taskMdExists).toBe(true)
 		})
 
-		test("throws error when agency/some-branch already exists", async () => {
+		test("throws error when agency--some-branch already exists", async () => {
 			await initGitRepo(tempDir)
 			process.chdir(tempDir)
 			await initAgency(tempDir, "test")
@@ -86,7 +86,7 @@ describe("task command - branching functionality", () => {
 			await runGitCommand(tempDir, ["git", "add", "."])
 			await runGitCommand(tempDir, ["git", "commit", "-m", "Add feature"])
 
-			// Create agency/my-feature first
+			// Create agency--my-feature first
 			await runTestEffect(
 				task({
 					silent: true,
@@ -134,7 +134,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-task")
+			expect(currentBranch).toBe("agency--my-task")
 
 			// Verify feature.txt exists (came from feature-base)
 			const featureFile = await Bun.file(join(tempDir, "feature.txt")).text()
@@ -191,12 +191,12 @@ describe("task command - branching functionality", () => {
 				task({
 					silent: true,
 					emit: "second-task",
-					from: "agency/first-task",
+					from: "agency--first-task",
 				}),
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/second-task")
+			expect(currentBranch).toBe("agency--second-task")
 
 			// Verify first-task.txt exists (came from emit branch)
 			const firstTaskFile = await Bun.file(
@@ -234,7 +234,7 @@ describe("task command - branching functionality", () => {
 					task({
 						silent: true,
 						emit: "second-task",
-						from: "agency/unemitted-task",
+						from: "agency--unemitted-task",
 					}),
 				),
 			).rejects.toThrow("emit branch")
@@ -266,7 +266,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-task")
+			expect(currentBranch).toBe("agency--my-task")
 
 			// Verify current.txt exists
 			const currentFile = await Bun.file(join(tempDir, "current.txt")).text()
@@ -301,12 +301,12 @@ describe("task command - branching functionality", () => {
 				task({
 					silent: true,
 					emit: "second-task",
-					from: "agency/first-task",
+					from: "agency--first-task",
 				}),
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/second-task")
+			expect(currentBranch).toBe("agency--second-task")
 
 			// Verify first.txt exists
 			const firstFile = await Bun.file(join(tempDir, "first.txt")).text()
@@ -335,7 +335,7 @@ describe("task command - branching functionality", () => {
 					task({
 						silent: true,
 						emit: "second-task",
-						from: "agency/unemitted-task",
+						from: "agency--unemitted-task",
 					}),
 				),
 			).rejects.toThrow("emit branch")
@@ -380,7 +380,7 @@ describe("task command - branching functionality", () => {
 			).rejects.toThrow("Branch name")
 		})
 
-		test("agency task out --from foo creates agency/out emitting to out", async () => {
+		test("agency task out --from foo creates agency--out emitting to out", async () => {
 			await initGitRepo(tempDir)
 			process.chdir(tempDir)
 			await initAgency(tempDir, "test")
@@ -397,7 +397,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/out")
+			expect(currentBranch).toBe("agency--out")
 
 			const agencyJson = JSON.parse(
 				await Bun.file(join(tempDir, "agency.json")).text(),
@@ -435,7 +435,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-task")
+			expect(currentBranch).toBe("agency--my-task")
 
 			// Verify main.txt exists but other.txt does not
 			const mainExists = await Bun.file(join(tempDir, "main.txt")).exists()
@@ -532,7 +532,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-task")
+			expect(currentBranch).toBe("agency--my-task")
 
 			// The new branch should have remote-only.txt (from origin/main)
 			const remoteFileExists = await Bun.file(
@@ -585,7 +585,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-task")
+			expect(currentBranch).toBe("agency--my-task")
 
 			// The new branch should have local.txt
 			const localFileExists = await Bun.file(
@@ -627,7 +627,7 @@ describe("task command - branching functionality", () => {
 			)
 
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/my-task")
+			expect(currentBranch).toBe("agency--my-task")
 		})
 	})
 })

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

@@ -82,7 +82,7 @@ describe("task --continue", () => {
 
 		// Verify we're on the source branch
 		const originalBranch = await getCurrentBranch(tempDir)
-		expect(originalBranch).toBe("agency/original-feature")
+		expect(originalBranch).toBe("agency--original-feature")
 
 		// Read the original TASK.md
 		const originalTaskContent = await readFile(join(tempDir, "TASK.md"))
@@ -99,7 +99,7 @@ describe("task --continue", () => {
 
 		// Verify we're on the new branch
 		const newBranch = await getCurrentBranch(tempDir)
-		expect(newBranch).toBe("agency/continued-feature")
+		expect(newBranch).toBe("agency--continued-feature")
 
 		// Verify agency files were copied
 		expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
@@ -148,7 +148,7 @@ describe("task --continue", () => {
 		await runTestEffect(task({ silent: true, emit: "feature-v1" }))
 
 		// Create another branch that would conflict
-		await Bun.spawn(["git", "branch", "agency/feature-v2"], {
+		await Bun.spawn(["git", "branch", "agency--feature-v2"], {
 			cwd: tempDir,
 			stdout: "pipe",
 			stderr: "pipe",

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

@@ -705,7 +705,7 @@ describe("task command", () => {
 			})
 			await proc.exited
 			const currentBranch = await new Response(proc.stdout).text()
-			expect(currentBranch.trim()).toBe("agency/my-feature")
+			expect(currentBranch.trim()).toBe("agency--my-feature")
 
 			// Verify files were created
 			expect(await fileExists(join(tempDir, "AGENTS.md"))).toBe(true)
@@ -716,7 +716,7 @@ describe("task command", () => {
 			process.chdir(tempDir)
 
 			// Create a feature branch first (using source pattern)
-			await Bun.spawn(["git", "checkout", "-b", "agency/existing-branch"], {
+			await Bun.spawn(["git", "checkout", "-b", "agency--existing-branch"], {
 				cwd: tempDir,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -774,7 +774,7 @@ describe("task command", () => {
 
 			// Verify we're on the source branch with agency.json
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/original-feature")
+			expect(currentBranch).toBe("agency--original-feature")
 			expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
 
 			// Try to run agency task again without providing a branch name
@@ -795,7 +795,7 @@ describe("task command", () => {
 
 			// Verify we're on the source branch with agency.json
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/original-feature")
+			expect(currentBranch).toBe("agency--original-feature")
 			expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
 
 			// With a branch name provided, it should work
@@ -803,7 +803,7 @@ describe("task command", () => {
 
 			// Verify we're now on the new branch
 			const newBranch = await getCurrentBranch(tempDir)
-			expect(newBranch).toBe("agency/new-feature")
+			expect(newBranch).toBe("agency--new-feature")
 		})
 	})
 
@@ -931,9 +931,9 @@ describe("task command", () => {
 				}),
 			)
 
-			// Should have created the branch with agency/ prefix
+			// Should have created the branch with agency-- prefix
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/backward-compat-test")
+			expect(currentBranch).toBe("agency--backward-compat-test")
 
 			// Should have correct emitBranch in agency.json
 			const metadata = JSON.parse(await readFile(join(tempDir, "agency.json")))

package/src/commands/task.ts

@@ -8,10 +8,8 @@ import { PromptService } from "../services/PromptService"
 import { TemplateService } from "../services/TemplateService"
 import { OpencodeService } from "../services/OpencodeService"
 import { ClaudeService } from "../services/ClaudeService"
-import {
-	AgencyMetadataService,
-	AgencyMetadataServiceLive,
-} from "../services/AgencyMetadataService"
+import { AgencyMetadataService } from "../services/AgencyMetadataService"
+import { FormatterService } from "../services/FormatterService"
 import { initializeManagedFiles, writeAgencyMetadata } from "../types"
 import { RepositoryNotInitializedError } from "../errors"
 import highlight, { done, info, plural } from "../utils/colors"
@@ -22,6 +20,7 @@ import {
 	makeSourceBranchName,
 } from "../utils/pr-branch"
 import { getTopLevelDir, dirToGlobPattern } from "../utils/glob"
+import { AGENCY_REMOVE_COMMIT } from "../constants"
 
 interface TaskOptions extends BaseCommandOptions {
 	path?: string
@@ -103,7 +102,7 @@ const taskContinue = (options: TaskOptions) =>
 		const existingMetadata = yield* Effect.gen(function* () {
 			const service = yield* AgencyMetadataService
 			return yield* service.readFromDisk(targetPath)
-		}).pipe(Effect.provide(AgencyMetadataServiceLive))
+		}).pipe(Effect.provide(AgencyMetadataService.Default))
 
 		if (!existingMetadata) {
 			return yield* Effect.fail(
@@ -279,6 +278,10 @@ const taskContinue = (options: TaskOptions) =>
 			log(done(`Created ${highlight.file(file)}`))
 		}
 
+		// Format created files using project's formatter (prettier/oxfmt)
+		const formatterService = yield* FormatterService
+		yield* formatterService.formatFiles(targetPath, createdFiles, verboseLog)
+
 		// Git add and commit the created files
 		if (createdFiles.length > 0) {
 			yield* Effect.gen(function* () {
@@ -819,6 +822,10 @@ export const task = (options: TaskOptions = {}) =>
 		}
 		verboseLog(`Tracked backpack file${plural(injectedFiles.length)}`)
 
+		// Format created files using project's formatter (prettier/oxfmt)
+		const formatterService = yield* FormatterService
+		yield* formatterService.formatFiles(targetPath, createdFiles, verboseLog)
+
 		// Git add and commit the created files
 		if (createdFiles.length > 0) {
 			yield* Effect.gen(function* () {
@@ -873,7 +880,7 @@ export const task = (options: TaskOptions = {}) =>
 
 				yield* git.gitAdd(filesToAdd, targetPath)
 				// The AGENCY_REMOVE_COMMIT marker in the commit body tells emit to drop this commit entirely
-				const commitMessage = `chore: agency edit CLAUDE.md\n\nAGENCY_REMOVE_COMMIT`
+				const commitMessage = `chore: agency edit CLAUDE.md\n\n${AGENCY_REMOVE_COMMIT}`
 				yield* git.gitCommit(commitMessage, targetPath, {
 					noVerify: true,
 				})
@@ -1117,7 +1124,7 @@ Base Branch Selection:
   - --from <branch>: Branch from a specific branch
   - --from-current: Initialize on your current branch (no new branch created)
   
-  If the base branch is an agency source branch (e.g., agency/branch-A), the command
+  If the base branch is an agency source branch (e.g., agency--branch-A), the command
   will automatically use its emit branch instead. This allows you to layer work on top
   of other feature branches while maintaining clean branch history.
 

package/src/constants.ts

@@ -0,0 +1,10 @@
+/**
+ * Shared constants for the agency CLI tool.
+ */
+
+/**
+ * Marker used in commit messages to indicate commits that should be
+ * dropped entirely during the emit process. When this marker is found
+ * in a commit message, emit will remove that commit from history.
+ */
+export const AGENCY_REMOVE_COMMIT = "AGENCY_REMOVE_COMMIT"

package/src/schemas.ts

@@ -27,7 +27,7 @@ export class AgencyMetadata extends Schema.Class<AgencyMetadata>(
  */
 export class AgencyConfig extends Schema.Class<AgencyConfig>("AgencyConfig")({
 	sourceBranchPattern: Schema.String.pipe(
-		Schema.annotations({ default: "agency/%branch%" }),
+		Schema.annotations({ default: "agency--%branch%" }),
 	),
 	emitBranch: Schema.String.pipe(Schema.annotations({ default: "%branch%" })),
 }) {}