@markjaquith/agency 0.6.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Manages personal agents files",
   "license": "MIT",
   "author": "Mark Jaquith",
@@ -14,7 +14,7 @@
     "agency": "cli.ts"
   },
   "scripts": {
-    "test": "bun test",
+    "test": "find src -name '*.test.ts' -print0 | xargs -0 -n 1 -P 4 bun test",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "knip": "knip --production",

package/src/commands/emit.test.ts

@@ -377,6 +377,76 @@ describe("emit command", () => {
 			expect(logOutput).toContain("Add feature file")
 			expect(logOutput).not.toContain("Add AGENTS.md")
 		})
+
+		test("filters pre-existing CLAUDE.md that gets edited by agency", async () => {
+			if (!hasGitFilterRepo) {
+				console.log("Skipping test: git-filter-repo not installed")
+				return
+			}
+
+			// Start fresh on main branch
+			await checkoutBranch(tempDir, "main")
+
+			// Create CLAUDE.md on main branch (simulating pre-existing file)
+			await Bun.write(
+				join(tempDir, "CLAUDE.md"),
+				"# Original Claude Instructions\n\nSome content here.\n",
+			)
+			await addAndCommit(tempDir, "CLAUDE.md", "Add CLAUDE.md")
+
+			// Create a new feature branch
+			await createBranch(tempDir, "agency/claude-test")
+
+			// Initialize agency on this branch (this will modify CLAUDE.md)
+			await Bun.write(
+				join(tempDir, "agency.json"),
+				JSON.stringify({
+					version: 1,
+					injectedFiles: ["AGENTS.md"],
+					template: "test",
+					createdAt: new Date().toISOString(),
+				}),
+			)
+			await Bun.write(join(tempDir, "AGENTS.md"), "# Test AGENTS\n")
+
+			// Simulate what agency task does - inject into CLAUDE.md
+			const originalClaude = await Bun.file(join(tempDir, "CLAUDE.md")).text()
+			const modifiedClaude = `${originalClaude}\n# Agency References\n@AGENTS.md\n@TASK.md\n`
+			await Bun.write(join(tempDir, "CLAUDE.md"), modifiedClaude)
+
+			await addAndCommit(
+				tempDir,
+				"agency.json AGENTS.md CLAUDE.md",
+				"Initialize agency files",
+			)
+
+			// Add a feature file
+			await createCommit(tempDir, "Feature commit")
+
+			// Create emit branch (this should filter CLAUDE.md)
+			await runTestEffect(emit({ silent: true, baseBranch: "main" }))
+
+			// Should still be on source branch
+			const currentBranch = await getCurrentBranch(tempDir)
+			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")
+
+			const files = await getGitOutput(tempDir, ["ls-files"])
+			expect(files).toContain("CLAUDE.md") // File should exist (from main)
+			expect(files).not.toContain("AGENTS.md") // Should be filtered
+			expect(files).not.toContain("TASK.md") // Should be filtered
+			expect(files).toContain("test.txt") // Feature file should exist
+
+			// Verify CLAUDE.md was reverted to original (no agency references)
+			const claudeContent = await Bun.file(join(tempDir, "CLAUDE.md")).text()
+			expect(claudeContent).toBe(
+				"# Original Claude Instructions\n\nSome content here.\n",
+			)
+			expect(claudeContent).not.toContain("@AGENTS.md")
+			expect(claudeContent).not.toContain("@TASK.md")
+		})
 	})
 
 	describe("error handling", () => {

package/src/commands/push.ts

@@ -278,23 +278,41 @@ const openGitHubPR = (
 		const { verbose = false } = options
 
 		// Run gh pr create --web with --head to specify the emit branch
-		const ghResult = yield* spawnProcess(
+		// Set environment variables to ensure non-interactive mode in CI
+		// Add a 3 second timeout to prevent hanging in CI environments
+		const ghEffect = spawnProcess(
 			["gh", "pr", "create", "--web", "--head", branchName],
 			{
 				cwd: gitRoot,
 				stdout: verbose ? "inherit" : "pipe",
 				stderr: "pipe",
+				env: {
+					GH_PROMPT_DISABLED: "1",
+					NO_COLOR: "1",
+				},
 			},
 		).pipe(
-			Effect.catchAll((error) =>
-				Effect.succeed({
-					exitCode: error.exitCode,
+			Effect.timeout("3 seconds"),
+			Effect.catchAll((error) => {
+				// Handle timeout or process errors
+				if (error._tag === "TimeoutException") {
+					return Effect.succeed({
+						exitCode: -1,
+						stdout: "",
+						stderr: "gh command timed out after 3 seconds",
+					})
+				}
+				// Handle ProcessError
+				return Effect.succeed({
+					exitCode: (error as any).exitCode ?? -1,
 					stdout: "",
-					stderr: error.stderr,
-				}),
-			),
+					stderr: (error as any).stderr ?? String(error),
+				})
+			}),
 		)
 
+		const ghResult = yield* ghEffect
+
 		if (ghResult.exitCode !== 0) {
 			return yield* Effect.fail(
 				new Error(`gh CLI command failed: ${ghResult.stderr.trim()}`),

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

@@ -759,6 +759,49 @@ describe("task command", () => {
 
 			expect(await fileExists(join(tempDir, "AGENTS.md"))).toBe(true)
 		})
+
+		test("fails when on agency source branch without branch name in silent mode", 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" }))
+
+			// Verify we're on the source branch with agency.json
+			const currentBranch = await getCurrentBranch(tempDir)
+			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
+			// This should fail because we're on an agency source branch
+			await expect(runTestEffect(task({ silent: true }))).rejects.toThrow(
+				"agency source branch",
+			)
+		})
+
+		test("prompts for branch name when on agency source 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" }))
+
+			// Verify we're on the source branch with agency.json
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/original-feature")
+			expect(await fileExists(join(tempDir, "agency.json"))).toBe(true)
+
+			// With a branch name provided, it should work
+			await runTestEffect(task({ silent: true, emit: "new-feature" }))
+
+			// Verify we're now on the new branch
+			const newBranch = await getCurrentBranch(tempDir)
+			expect(newBranch).toBe("agency/new-feature")
+		})
 	})
 
 	describe("template-based source files", () => {

package/src/commands/task.ts

@@ -212,11 +212,21 @@ const taskContinue = (options: TaskOptions) =>
 			targetPath,
 			baseBranchToBranchFrom,
 		)
+		// Calculate the emit branch name for display
+		const cleanBranchForDisplay =
+			extractCleanBranch(sourceBranchName, config.sourceBranchPattern) ||
+			sourceBranchName
+		const emitBranchForDisplay = makeEmitBranchName(
+			cleanBranchForDisplay,
+			config.emitBranch,
+		)
+
 		log(
-			done(
-				`Created and switched to branch ${highlight.branch(sourceBranchName)} based on ${highlight.branch(baseBranchToBranchFrom)}`,
+			info(
+				`(${highlight.branch(baseBranchToBranchFrom)}) ${highlight.branch(sourceBranchName)} → ${highlight.branch(emitBranchForDisplay)}`,
 			),
 		)
+		log(done(`Created and switched to ${highlight.branch(sourceBranchName)}`))
 
 		// Calculate the new emit branch name
 		const newEmitBranchName = makeEmitBranchName(branchName, config.emitBranch)
@@ -367,6 +377,11 @@ export const task = (options: TaskOptions = {}) =>
 		const isFeature = yield* git.isFeatureBranch(currentBranch, targetPath)
 		verboseLog(`Is feature branch: ${isFeature}`)
 
+		// Check if we're on an agency source branch (has agency.json with backpacked files)
+		const agencyJsonPath = resolve(targetPath, "agency.json")
+		const hasAgencyJson = yield* fs.exists(agencyJsonPath)
+		verboseLog(`Has agency.json: ${hasAgencyJson}`)
+
 		// Determine base branch to branch from
 		let baseBranchToBranchFrom: string | undefined
 
@@ -458,8 +473,8 @@ export const task = (options: TaskOptions = {}) =>
 		// Determine branch name logic
 		let branchName = options.emit || options.branch
 
-		// If on main branch or using --from without a branch name, prompt for it (unless in silent mode)
-		if ((!isFeature || options.from) && !branchName) {
+		// If on main branch, using --from, or on an agency source branch without a branch name, prompt for it (unless in silent mode)
+		if ((!isFeature || options.from || hasAgencyJson) && !branchName) {
 			if (silent) {
 				if (options.from) {
 					return yield* Effect.fail(
@@ -469,6 +484,15 @@ export const task = (options: TaskOptions = {}) =>
 						),
 					)
 				}
+				if (hasAgencyJson) {
+					return yield* Effect.fail(
+						new Error(
+							`You're currently on ${highlight.branch(currentBranch)}, which is an agency source branch.\n` +
+								`Branch name is required when re-importing backpacked files.\n` +
+								`Use: 'agency task <branch-name>' or 'agency task --continue <branch-name>'`,
+						),
+					)
+				}
 				return yield* Effect.fail(
 					new Error(
 						`You're currently on ${highlight.branch(currentBranch)}, which appears to be your main branch.\n` +
@@ -823,11 +847,27 @@ const createFeatureBranchEffect = (
 		}
 
 		yield* git.createBranch(branchName, targetPath, baseBranch)
+
+		// Load config for emit pattern calculation
+		const configService = yield* ConfigService
+		const config = yield* configService.loadConfig()
+
+		// Calculate the emit branch name for display
+		const cleanBranchForDisplay =
+			extractCleanBranch(branchName, config.sourceBranchPattern) || branchName
+		const emitBranchForDisplay = makeEmitBranchName(
+			cleanBranchForDisplay,
+			config.emitBranch,
+		)
+
 		log(
-			done(
-				`Created and switched to branch ${highlight.branch(branchName)}${baseBranch ? ` based on ${highlight.branch(baseBranch)}` : ""}`,
+			info(
+				baseBranch
+					? `(${highlight.branch(baseBranch)}) ${highlight.branch(branchName)} → ${highlight.branch(emitBranchForDisplay)}`
+					: `${highlight.branch(branchName)} → ${highlight.branch(emitBranchForDisplay)}`,
 			),
 		)
+		log(done(`Created and switched to ${highlight.branch(branchName)}`))
 	})
 
 // Helper: Discover template files

package/src/services/AgencyMetadataService.ts

@@ -49,7 +49,7 @@ export class AgencyMetadataService extends Context.Tag("AgencyMetadataService")<
 
 		/**
 		 * Get list of files to filter during PR/merge operations.
-		 * Always includes TASK.md, AGENCY.md, and agency.json, plus any injectedFiles from metadata.
+		 * Always includes TASK.md, AGENCY.md, CLAUDE.md, and agency.json, plus any injectedFiles from metadata.
 		 */
 		readonly getFilesToFilter: (
 			gitRoot: string,
@@ -165,7 +165,7 @@ export const AgencyMetadataServiceLive = Layer.succeed(
 				const metadataPath = join(gitRoot, "agency.json")
 
 				const exists = yield* fs.exists(metadataPath)
-				const baseFiles = ["TASK.md", "AGENCY.md", "agency.json"]
+				const baseFiles = ["TASK.md", "AGENCY.md", "CLAUDE.md", "agency.json"]
 
 				if (!exists) {
 					return baseFiles
@@ -195,7 +195,7 @@ export const AgencyMetadataServiceLive = Layer.succeed(
 				return expandedFiles
 			}).pipe(
 				Effect.catchAll(() =>
-					Effect.succeed(["TASK.md", "AGENCY.md", "agency.json"]),
+					Effect.succeed(["TASK.md", "AGENCY.md", "CLAUDE.md", "agency.json"]),
 				),
 			),
 

package/src/types.ts

@@ -160,7 +160,7 @@ export async function writeAgencyMetadata(
 
 /**
  * Get list of files to filter during PR/merge operations.
- * Always includes TASK.md, AGENCY.md, and agency.json, plus any backpack files from metadata.
+ * Always includes TASK.md, AGENCY.md, CLAUDE.md, and agency.json, plus any backpack files from metadata.
  * @deprecated Use AgencyMetadataService.getFilesToFilter instead
  */
 export async function getFilesToFilter(gitRoot: string): Promise<string[]> {

package/templates/opencode.json

@@ -1,4 +1,4 @@
 {
-	"$schema": "https://opencode.ai/config.json",
-	"instructions": ["AGENCY.md", "TASK.md"]
+  "$schema": "https://opencode.ai/config.json",
+  "instructions": ["AGENCY.md", "TASK.md"]
 }