@markjaquith/agency 1.6.3 → 1.8.0

package/cli.ts

@@ -54,9 +54,30 @@ async function runCommand<E>(
 		E,
 		never
 	>
-	const program = Effect.catchAllDefect(providedEffect, (defect) =>
+
+	// Catch typed errors and convert to standard Error objects
+	const programWithErrorHandling = Effect.catchAll(providedEffect, (error) => {
+		// Convert typed errors to standard Error objects with clear messages
+		if (error instanceof Error) {
+			return Effect.fail(error)
+		}
+		// Handle objects with message property (common pattern for tagged errors)
+		if (
+			typeof error === "object" &&
+			error !== null &&
+			"message" in error &&
+			typeof error.message === "string"
+		) {
+			return Effect.fail(new Error(error.message))
+		}
+		// Fallback: convert to string
+		return Effect.fail(new Error(String(error)))
+	})
+
+	// Catch defects (unexpected crashes) and convert to errors
+	const program = Effect.catchAllDefect(programWithErrorHandling, (defect) =>
 		Effect.fail(defect instanceof Error ? defect : new Error(String(defect))),
-	) as Effect.Effect<void, E | Error, never>
+	)
 
 	await Effect.runPromise(program)
 }
@@ -313,6 +334,7 @@ const commands: Record<string, Command> = {
 					from: options.from,
 					fromCurrent: options["from-current"],
 					continue: options.continue,
+					squash: options.squash,
 				}),
 			)
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "1.6.3",
+  "version": "1.8.0",
   "description": "Manages personal agents files",
   "keywords": [
     "agents",

package/src/commands/clean.test.ts

@@ -87,7 +87,7 @@ describe("clean command", () => {
 		test("finds source branches for merged emit branches", async () => {
 			// Create source branch with agency pattern
 			await checkoutBranch(tempDir, "main")
-			await Bun.spawn(["git", "checkout", "-b", "agency/feature-2"], {
+			await Bun.spawn(["git", "checkout", "-b", "agency--feature-2"], {
 				cwd: tempDir,
 				stdout: "pipe",
 				stderr: "pipe",
@@ -132,7 +132,7 @@ describe("clean command", () => {
 			// Verify both emit and source branches were deleted
 			const branches = await getGitOutput(tempDir, ["branch", "--list"])
 			expect(branches).not.toContain("feature-2")
-			expect(branches).not.toContain("agency/feature-2")
+			expect(branches).not.toContain("agency--feature-2")
 			expect(branches).toContain("main")
 		})
 

package/src/commands/clean.ts

@@ -1,9 +1,8 @@
 import { Effect } 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 { parseAgencyMetadata } from "../services/AgencyMetadataService"
 import highlight, { done } from "../utils/colors"
 import { createLoggers, ensureGitRepo } from "../utils/effect"
 import { extractCleanBranch, makeSourceBranchName } from "../utils/pr-branch"
@@ -28,23 +27,7 @@ const readAgencyMetadata = (gitRoot: string, branch: string) =>
 			return null
 		}
 
-		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: AgencyMetadata | null = yield* Effect.try({
-			try: () => Schema.decodeUnknownSync(AgencyMetadata)(data),
-			catch: () => new Error("Invalid agency.json format"),
-		}).pipe(Effect.catchAll(() => Effect.succeed(null)))
-
-		return metadata
+		return yield* parseAgencyMetadata(content)
 	}).pipe(Effect.catchAll(() => Effect.succeed(null)))
 
 /**
@@ -179,7 +162,7 @@ export const clean = (options: CleanOptions = {}) =>
 
 		// Load config to get source and emit patterns
 		const config = yield* configService.loadConfig()
-		const sourcePattern = config.sourceBranchPattern || "agency/%branch%"
+		const sourcePattern = config.sourceBranchPattern || "agency--%branch%"
 		const emitPattern = config.emitBranch || "%branch%"
 
 		verboseLog(

package/src/commands/emit.integration.test.ts

@@ -52,8 +52,8 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 		// Initialize git repo with main branch (already includes initial commit)
 		await initGitRepo(tempDir)
 
-		// Create a source branch (with agency/ prefix)
-		await createBranch(tempDir, "agency/test-feature")
+		// Create a source branch (with agency-- prefix)
+		await createBranch(tempDir, "agency--test-feature")
 
 		// Initialize AGENTS.md and commit in one go
 		await initAgency(tempDir, "test")
@@ -83,7 +83,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 
 		// Go back to main and create a fresh source branch
 		await checkoutBranch(tempDir, "main")
-		await createBranch(tempDir, "agency/feature")
+		await createBranch(tempDir, "agency--feature")
 		// Create agency.json with AGENTS.md as managed file
 		await Bun.write(
 			join(tempDir, "agency.json"),
@@ -104,7 +104,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 
 		// Should still be on feature branch
 		const currentBranch = await getCurrentBranch(tempDir)
-		expect(currentBranch).toBe("agency/feature")
+		expect(currentBranch).toBe("agency--feature")
 
 		// Switch to emit branch to verify files
 		await checkoutBranch(tempDir, "feature")
@@ -132,7 +132,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 		// Store merge-base before advancing main
 		const initialMergeBase = await getGitOutput(tempDir, [
 			"merge-base",
-			"agency/test-feature",
+			"agency--test-feature",
 			"main",
 		])
 
@@ -141,7 +141,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 
 		// Should still be on test-feature branch
 		let currentBranch = await getCurrentBranch(tempDir)
-		expect(currentBranch).toBe("agency/test-feature")
+		expect(currentBranch).toBe("agency--test-feature")
 
 		// Switch to emit branch to verify AGENTS.md is filtered
 		await checkoutBranch(tempDir, "test-feature")
@@ -151,7 +151,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 		expect(files).toContain("feature.txt")
 
 		// Switch back to source branch
-		await checkoutBranch(tempDir, "agency/test-feature")
+		await checkoutBranch(tempDir, "agency--test-feature")
 
 		// Simulate advancing main branch with a different file
 		await checkoutBranch(tempDir, "main")
@@ -159,7 +159,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 		await addAndCommit(tempDir, "main-file.txt", "Main branch advancement")
 
 		// Rebase test-feature onto new main
-		await checkoutBranch(tempDir, "agency/test-feature")
+		await checkoutBranch(tempDir, "agency--test-feature")
 		const rebaseProc = Bun.spawn(["git", "rebase", "main"], {
 			cwd: tempDir,
 			stdout: "pipe",
@@ -174,7 +174,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 		// Verify merge-base has changed after rebase
 		const newMergeBase = await getGitOutput(tempDir, [
 			"merge-base",
-			"agency/test-feature",
+			"agency--test-feature",
 			"main",
 		])
 		expect(newMergeBase.trim()).not.toBe(initialMergeBase.trim())
@@ -184,7 +184,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 
 		// Should still be on test-feature branch
 		currentBranch = await getCurrentBranch(tempDir)
-		expect(currentBranch).toBe("agency/test-feature")
+		expect(currentBranch).toBe("agency--test-feature")
 
 		// Switch to emit branch to verify files
 		await checkoutBranch(tempDir, "test-feature")
@@ -222,7 +222,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 		await addAndCommit(tempDir, "CLAUDE.md", "Add CLAUDE.md")
 
 		// Create a new feature branch
-		await createBranch(tempDir, "agency/claude-test")
+		await createBranch(tempDir, "agency--claude-test")
 
 		// Initialize agency on this branch - first commit has agency files (NOT including CLAUDE.md)
 		await Bun.write(
@@ -260,7 +260,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 
 		// Should still be on source branch
 		const currentBranch = await getCurrentBranch(tempDir)
-		expect(currentBranch).toBe("agency/claude-test")
+		expect(currentBranch).toBe("agency--claude-test")
 
 		// Switch to emit branch to verify CLAUDE.md is reverted to main's version
 		await checkoutBranch(tempDir, "claude-test")
@@ -294,7 +294,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 			await Bun.write(join(tempDir, "FILE2.md"), "Original content 2\n")
 			await addAndCommit(tempDir, "FILE1.md FILE2.md", "Add files")
 
-			await createBranch(tempDir, "agency/contiguous-test")
+			await createBranch(tempDir, "agency--contiguous-test")
 
 			// Create agency.json
 			await Bun.write(
@@ -352,7 +352,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 			await Bun.write(join(tempDir, "FILE2.md"), "Original content 2\n")
 			await addAndCommit(tempDir, "FILE1.md FILE2.md", "Add files")
 
-			await createBranch(tempDir, "agency/non-contiguous-test")
+			await createBranch(tempDir, "agency--non-contiguous-test")
 
 			await Bun.write(
 				join(tempDir, "agency.json"),
@@ -415,7 +415,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 			await Bun.write(join(tempDir, "EXISTING.md"), "Original content\n")
 			await addAndCommit(tempDir, "EXISTING.md", "Add existing file")
 
-			await createBranch(tempDir, "agency/first-commit-test")
+			await createBranch(tempDir, "agency--first-commit-test")
 
 			// First commit is AGENCY_REMOVE_COMMIT (modifying existing file)
 			await Bun.write(join(tempDir, "EXISTING.md"), "Modified content\n")
@@ -463,7 +463,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 			await Bun.write(join(tempDir, "EXISTING.md"), "Original content\n")
 			await addAndCommit(tempDir, "EXISTING.md", "Add existing file")
 
-			await createBranch(tempDir, "agency/last-commit-test")
+			await createBranch(tempDir, "agency--last-commit-test")
 
 			// agency.json first
 			await Bun.write(
@@ -512,7 +512,7 @@ describe("emit command - integration tests (requires git-filter-repo)", () => {
 			await Bun.write(join(tempDir, "EXISTING.md"), "Original content\n")
 			await addAndCommit(tempDir, "EXISTING.md", "Add existing file")
 
-			await createBranch(tempDir, "agency/only-commit-test")
+			await createBranch(tempDir, "agency--only-commit-test")
 
 			// agency.json
 			await Bun.write(

package/src/commands/emit.test.ts

@@ -53,8 +53,8 @@ describe("emit command", () => {
 		// Initialize git repo with main branch (already includes initial commit)
 		await initGitRepo(tempDir)
 
-		// Create a source branch (with agency/ prefix)
-		await createBranch(tempDir, "agency/test-feature")
+		// Create a source branch (with agency-- prefix)
+		await createBranch(tempDir, "agency--test-feature")
 
 		// Initialize AGENTS.md and commit in one go
 		await initAgency(tempDir, "test")
@@ -84,7 +84,7 @@ describe("emit command", () => {
 				return
 			}
 
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			expect(runTestEffect(emit({ silent: true }))).rejects.toThrow(
@@ -95,7 +95,7 @@ describe("emit command", () => {
 		test("creates emit branch with default name", async () => {
 			// Go back to main and create a fresh source branch (no inherited agency.json)
 			await checkoutBranch(tempDir, "main")
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			// Create agency.json for this branch
 			await Bun.write(
 				join(tempDir, "agency.json"),
@@ -121,11 +121,11 @@ describe("emit command", () => {
 
 			// Check we're still on the source branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 		})
 
 		test("creates emit branch with custom name", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			// Skip filter for speed - we're just testing branch creation
@@ -142,11 +142,11 @@ describe("emit command", () => {
 
 			// Check we're still on the source branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 		})
 
 		test("completes emit workflow successfully", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			// Should complete without throwing (skip filter for speed)
@@ -154,11 +154,11 @@ describe("emit command", () => {
 
 			// Should still be on source branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 		})
 
 		test("preserves files on source branch after emit", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			// Skip filter for speed - we're testing source branch preservation
@@ -166,7 +166,7 @@ describe("emit command", () => {
 
 			// Should still be on source branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Check that test file still exists on source branch
 			expect(await fileExists(join(tempDir, "test.txt"))).toBe(true)
@@ -176,7 +176,7 @@ describe("emit command", () => {
 		})
 
 		test("original branch remains untouched", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			// Create emit branch (skip filter for speed)
@@ -184,7 +184,7 @@ describe("emit command", () => {
 
 			// Should still be on feature branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Check that AGENTS.md still exist on original branch
 			const files = await getGitOutput(tempDir, ["ls-files"])
@@ -192,7 +192,7 @@ describe("emit command", () => {
 		})
 
 		test("works correctly when run multiple times (recreates emit branch)", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 
 			// Modify AGENTS.md on feature branch
 			await Bun.write(
@@ -205,7 +205,7 @@ describe("emit command", () => {
 			await runTestEffect(emit({ silent: true, skipFilter: true }))
 
 			// Switch back to feature branch
-			await checkoutBranch(tempDir, "agency/feature")
+			await checkoutBranch(tempDir, "agency--feature")
 
 			// Make another commit
 			await createCommit(tempDir, "Another feature commit")
@@ -215,11 +215,11 @@ describe("emit command", () => {
 
 			// Should complete successfully without interactive prompts and stay on source branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 		})
 
 		test("accepts explicit base branch argument", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			// Create emit branch with explicit base branch (skip filter for speed)
@@ -229,11 +229,11 @@ describe("emit command", () => {
 
 			// Should stay on source branch
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 		})
 
 		test("throws error if provided base branch does not exist", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			// This should fail even with skipFilter since base branch validation happens first
@@ -260,7 +260,7 @@ describe("emit command", () => {
 
 	describe("silent mode", () => {
 		test("silent flag suppresses output", async () => {
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")
 
 			const logs: string[] = []
@@ -284,7 +284,7 @@ describe("emit command", () => {
 		test("constructs correct filter-repo arguments", async () => {
 			// Set up fresh branch with agency.json
 			await checkoutBranch(tempDir, "main")
-			await createBranch(tempDir, "agency/filter-test")
+			await createBranch(tempDir, "agency--filter-test")
 
 			// Create agency.json with injected files
 			await Bun.write(
@@ -329,7 +329,7 @@ describe("emit command", () => {
 		test("includes symlink targets in files to filter", async () => {
 			// Set up fresh branch
 			await checkoutBranch(tempDir, "main")
-			await createBranch(tempDir, "agency/symlink-test")
+			await createBranch(tempDir, "agency--symlink-test")
 
 			// Create AGENTS.md as the real file
 			await Bun.write(join(tempDir, "AGENTS.md"), "# Real file\n")

package/src/commands/emit.ts

@@ -23,6 +23,7 @@ import {
 	withBranchProtection,
 } from "../utils/effect"
 import { withSpinner } from "../utils/spinner"
+import { AGENCY_REMOVE_COMMIT } from "../constants"
 
 interface EmitOptions extends BaseCommandOptions {
 	emit?: string
@@ -42,7 +43,7 @@ export const emit = (options: EmitOptions = {}) =>
 		yield* withBranchProtection(gitRoot, emitCore(gitRoot, options))
 	})
 
-const emitCore = (gitRoot: string, options: EmitOptions) =>
+export const emitCore = (gitRoot: string, options: EmitOptions) =>
 	Effect.gen(function* () {
 		const { force = false, verbose = false, skipFilter = false } = options
 		const { log, verboseLog } = createLoggers(options)
@@ -207,7 +208,7 @@ const emitCore = (gitRoot: string, options: EmitOptions) =>
 				"--commit-callback",
 				// Clear file changes from commits with AGENCY_REMOVE_COMMIT marker
 				// This makes the commit empty (which gets pruned) while preserving the tree state
-				`if b"AGENCY_REMOVE_COMMIT" in commit.message: commit.file_changes = []`,
+				`if b"${AGENCY_REMOVE_COMMIT}" in commit.message: commit.file_changes = []`,
 				"--force",
 				"--refs",
 				`${forkPoint}..${emitBranchName}`,
@@ -433,7 +434,7 @@ Create an emit branch from the current source branch with backpack files (AGENTS
 reverted to their state on the base branch.
 
 Source and Emit Branches:
-  - Source branches: Your working branches with agency-specific files (e.g., agency/feature-foo)
+  - Source branches: Your working branches with agency-specific files (e.g., agency--feature-foo)
   - Emit branches: Clean branches suitable for PRs without agency files (e.g., feature-foo)
   
   This command creates a clean emit branch from your source branch by filtering out
@@ -472,20 +473,20 @@ Options:
 Configuration:
   ~/.config/agency/agency.json can contain:
   {
-    "sourceBranchPattern": "agency/%branch%",  // Pattern for source branch names
+    "sourceBranchPattern": "agency--%branch%",  // Pattern for source branch names
     "emitBranch": "%branch%"                   // Pattern for emit branch names
   }
   
   Use %branch% as placeholder for the clean branch name.
   
   Source Pattern Examples:
-    "agency/%branch%" -> main becomes agency/main (default)
+    "agency--%branch%" -> main becomes agency--main (default)
     "wip/%branch%" -> feature becomes wip/feature
   
   Emit Pattern Examples:
-    "%branch%" -> agency/main emits to main (default)
-    "%branch%--PR" -> agency/feature emits to feature--PR
-    "PR/%branch%" -> agency/feature emits to PR/feature
+    "%branch%" -> agency--main emits to main (default)
+    "%branch%--PR" -> agency--feature emits to feature--PR
+    "PR/%branch%" -> agency--feature emits to PR/feature
 
 Examples:
   agency emit                          # Prompt for base branch (first time) or use saved

package/src/commands/emitted.test.ts

@@ -54,8 +54,8 @@ describe("emitted command", () => {
 
 	describe("basic functionality", () => {
 		test("returns emit branch name when on source branch", async () => {
-			// Create source branch (agency/main)
-			await createBranch(tempDir, "agency/main")
+			// Create source branch (agency--main)
+			await createBranch(tempDir, "agency--main")
 			await createCommit(tempDir, "Work on source")
 
 			// Capture output
@@ -73,7 +73,7 @@ describe("emitted command", () => {
 
 		test("returns emit branch name when on emit branch", async () => {
 			// Create source branch
-			await createBranch(tempDir, "agency/main")
+			await createBranch(tempDir, "agency--main")
 			await createCommit(tempDir, "Work on source")
 
 			// Switch to emit branch (main)
@@ -98,14 +98,14 @@ describe("emitted 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
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature work")
 
 			// Capture output
@@ -123,7 +123,7 @@ describe("emitted command", () => {
 
 		test("returns emit branch from agency.json when present", async () => {
 			// Create source branch
-			await createBranch(tempDir, "agency/feature")
+			await createBranch(tempDir, "agency--feature")
 
 			// Create agency.json with custom emitBranch
 			const agencyJsonPath = join(tempDir, "agency.json")
@@ -181,7 +181,7 @@ describe("emitted command", () => {
 
 	describe("silent mode", () => {
 		test("still outputs when not in silent mode", async () => {
-			await createBranch(tempDir, "agency/main")
+			await createBranch(tempDir, "agency--main")
 
 			const originalLog = console.log
 			let logCalled = false
@@ -196,7 +196,7 @@ describe("emitted command", () => {
 		})
 
 		test("silent flag suppresses output", async () => {
-			await createBranch(tempDir, "agency/main")
+			await createBranch(tempDir, "agency--main")
 
 			const originalLog = console.log
 			let logCalled = false

package/src/commands/emitted.ts

@@ -41,7 +41,7 @@ Usage: agency emitted [options]
 Get the name of the emitted branch (or what it would be).
 
 This command shows the emit branch name corresponding to your current branch:
-  - If on a source branch (e.g., agency/main), shows the emit branch (e.g., main)
+  - If on a source branch (e.g., agency--main), shows the emit branch (e.g., main)
   - If on an emit branch (e.g., main), shows the current branch name
 
 This is useful for scripting and automation where you need to know

package/src/commands/merge.integration.test.ts

@@ -58,8 +58,8 @@ describe("merge command - integration tests (requires git-filter-repo)", () => {
 		// Set up origin for git-filter-repo
 		await setupRemote(tempDir, "origin", tempDir)
 
-		// Create a source branch (with agency/ prefix per new default config)
-		await createBranch(tempDir, "agency/feature")
+		// Create a source branch (with agency-- prefix per new default config)
+		await createBranch(tempDir, "agency--feature")
 
 		// Initialize AGENTS.md on feature branch
 		await initAgency(tempDir, "test")
@@ -102,7 +102,7 @@ describe("merge command - integration tests (requires git-filter-repo)", () => {
 
 			// We're on feature branch (source)
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Run merge - should create feature--PR and merge it to main
 			await runTestEffect(merge({ silent: true }))
@@ -130,7 +130,7 @@ describe("merge command - integration tests (requires git-filter-repo)", () => {
 			await runTestEffect(emit({ silent: true }))
 
 			// Go back to feature branch
-			await checkoutBranch(tempDir, "agency/feature")
+			await checkoutBranch(tempDir, "agency--feature")
 
 			// Make additional changes
 			await createCommit(tempDir, "More feature work")
@@ -186,7 +186,7 @@ describe("merge command - integration tests (requires git-filter-repo)", () => {
 			await checkoutBranch(tempDir, "feature")
 
 			// Delete the source branch
-			await deleteBranch(tempDir, "agency/feature", true)
+			await deleteBranch(tempDir, "agency--feature", true)
 
 			// Try to merge - should fail (error message may vary since source branch is deleted)
 			await expect(runTestEffect(merge({ silent: true }))).rejects.toThrow()

package/src/commands/merge.test.ts

@@ -39,8 +39,8 @@ describe("merge command", () => {
 		// Set up origin for git-filter-repo
 		await setupRemote(tempDir, "origin", tempDir)
 
-		// Create a source branch (with agency/ prefix per new default config)
-		await createBranch(tempDir, "agency/feature")
+		// Create a source branch (with agency-- prefix per new default config)
+		await createBranch(tempDir, "agency--feature")
 
 		// Initialize AGENTS.md on feature branch
 		await initAgency(tempDir, "test")
@@ -119,7 +119,7 @@ describe("merge command", () => {
 		test("performs squash merge when --squash flag is set", async () => {
 			// We're on feature branch (source)
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Run merge with squash flag (skipFilter for speed, we're testing squash behavior)
 			await runTestEffect(
@@ -146,7 +146,7 @@ describe("merge command", () => {
 		test("performs regular merge when --squash flag is not set", async () => {
 			// We're on feature branch (source)
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Run merge without squash flag (skipFilter for speed, we're testing merge behavior)
 			await runTestEffect(
@@ -175,7 +175,7 @@ describe("merge command", () => {
 		test("pushes base branch to origin when --push flag is set", async () => {
 			// We're on feature branch (source)
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Get the current commit on main before merge
 			await checkoutBranch(tempDir, "main")
@@ -184,7 +184,7 @@ describe("merge command", () => {
 			).trim()
 
 			// Go back to feature branch
-			await checkoutBranch(tempDir, "agency/feature")
+			await checkoutBranch(tempDir, "agency--feature")
 
 			// Run merge with push flag (skipFilter for speed, we're testing push behavior)
 			await runTestEffect(merge({ silent: true, push: true, skipFilter: true }))
@@ -213,7 +213,7 @@ describe("merge command", () => {
 		test("does not push when --push flag is not set", async () => {
 			// We're on feature branch (source)
 			const currentBranch = await getCurrentBranch(tempDir)
-			expect(currentBranch).toBe("agency/feature")
+			expect(currentBranch).toBe("agency--feature")
 
 			// Get the current commit on origin/main before merge
 			const beforeOriginCommit = (