@markjaquith/agency 1.9.5 → 1.9.6

package/package.json

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

package/src/commands/emit.test.ts

@@ -326,6 +326,36 @@ describe("emit command", () => {
 			clearCapturedFilterRepoCalls()
 		})
 
+		test("throws when emitted CLAUDE.md references AGENCY.md", async () => {
+			await checkoutBranch(tempDir, "main")
+			await createBranch(tempDir, "agency--claude-reference-test")
+
+			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, "CLAUDE.md"),
+				"# Instructions\n\n@AGENCY.md\n",
+			)
+			await addAndCommit(
+				tempDir,
+				["agency.json", "CLAUDE.md"],
+				"Add Claude agency reference",
+			)
+
+			await expect(
+				runTestEffectWithMockFilterRepo(emit({ silent: true })),
+			).rejects.toThrow(
+				"CLAUDE.md on emitted branch claude-reference-test still references @AGENCY.md",
+			)
+		})
+
 		test("constructs correct filter-repo arguments", async () => {
 			// Set up fresh branch with agency.json
 			await checkoutBranch(tempDir, "main")

package/src/commands/emit.ts

@@ -248,9 +248,34 @@ export const emitCore = (gitRoot: string, options: EmitOptions) =>
 			enabled: !options.silent && !verbose,
 		})
 
+		yield* validateClaudeDoesNotReferenceAgency(gitRoot, emitBranchName)
+
 		log(done(`Emitted ${highlight.branch(emitBranchName)}`))
 	})
 
+const validateClaudeDoesNotReferenceAgency = (
+	gitRoot: string,
+	emitBranchName: string,
+) =>
+	Effect.gen(function* () {
+		const git = yield* GitService
+		const claudeContents = yield* git.getFileAtRef(
+			gitRoot,
+			emitBranchName,
+			"CLAUDE.md",
+		)
+
+		if (!claudeContents?.includes("@AGENCY.md")) {
+			return
+		}
+
+		return yield* Effect.fail(
+			new Error(
+				`CLAUDE.md on emitted branch ${emitBranchName} still references @AGENCY.md. Remove the agency file reference before emitting.`,
+			),
+		)
+	})
+
 const logFilterPreflight = (
 	gitRoot: string,
 	forkPoint: string,

package/src/commands/push.test.ts

@@ -13,6 +13,7 @@ import {
 	addAndCommit,
 	renameBranch,
 	runTestEffect,
+	runTestEffectWithMockFilterRepo,
 } from "../test-utils"
 
 async function setupAgencyJson(gitRoot: string): Promise<void> {
@@ -187,6 +188,22 @@ describe("push command", () => {
 	})
 
 	describe("error handling", () => {
+		test("throws when emitted CLAUDE.md references AGENCY.md", async () => {
+			await Bun.write(
+				join(tempDir, "CLAUDE.md"),
+				"# Instructions\n\n@AGENCY.md\n",
+			)
+			await addAndCommit(tempDir, "CLAUDE.md", "Add Claude agency reference")
+
+			await expect(
+				runTestEffectWithMockFilterRepo(
+					push({ baseBranch: "main", silent: true }),
+				),
+			).rejects.toThrow(
+				"Failed to create emit branch: CLAUDE.md on emitted branch feature still references @AGENCY.md",
+			)
+		})
+
 		test("switches to source branch when run from emit branch", async () => {
 			// First create the emit branch from source branch
 			await runTestEffect(