@markjaquith/agency 1.9.5 → 1.10.0

package/package.json

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

package/src/commands/emit.test.ts

@@ -78,6 +78,29 @@ describe("emit command", () => {
 	})
 
 	describe("basic functionality", () => {
+		test("fails when there are uncommitted changes", async () => {
+			// Create uncommitted changes
+			await Bun.write(join(tempDir, "uncommitted.txt"), "uncommitted\n")
+
+			expect(
+				runTestEffect(emit({ silent: true, skipFilter: true })),
+			).rejects.toThrow(/uncommitted changes/)
+		})
+
+		test("fails when there are staged but uncommitted changes", async () => {
+			// Create a staged but uncommitted change
+			await Bun.write(join(tempDir, "staged.txt"), "staged\n")
+			await Bun.spawn(["git", "add", "staged.txt"], {
+				cwd: tempDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			expect(
+				runTestEffect(emit({ silent: true, skipFilter: true })),
+			).rejects.toThrow(/uncommitted changes/)
+		})
+
 		test("throws error when git-filter-repo is not installed", async () => {
 			const hasGitFilterRepo = await checkGitFilterRepo()
 			if (hasGitFilterRepo) {
@@ -326,6 +349,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

@@ -54,6 +54,21 @@ export const emitCore = (gitRoot: string, options: EmitOptions) =>
 		const fs = yield* FileSystemService
 		const filterRepo = yield* FilterRepoService
 
+		// Check for uncommitted changes
+		const statusOutput = yield* git.getStatus(gitRoot)
+
+		if (statusOutput && statusOutput.trim().length > 0) {
+			return yield* Effect.fail(
+				new Error(
+					`You have uncommitted changes. Please commit or stash them before emitting.\n` +
+						`The emit command performs internal checkouts that would destroy uncommitted work.\n` +
+						`Run 'git status' to see the changes.`,
+				),
+			)
+		}
+
+		verboseLog(`Working directory is clean`)
+
 		// Check if git-filter-repo is installed
 		const hasFilterRepo = yield* filterRepo.isInstalled()
 		if (!hasFilterRepo) {
@@ -248,9 +263,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> {
@@ -29,9 +30,9 @@ async function setupAgencyJson(gitRoot: string): Promise<void> {
 	await addAndCommit(gitRoot, "agency.json", "Add agency.json")
 }
 
-async function setupBareRemote(tempDir: string): Promise<string> {
-	// Create a bare repository to use as remote
-	const remoteDir = join(tempDir, "remote.git")
+async function setupBareRemote(): Promise<string> {
+	// Create a bare repository outside the working tree to avoid polluting git status
+	const remoteDir = await createTempDir()
 	await Bun.spawn(["git", "init", "--bare", remoteDir], {
 		stdout: "pipe",
 		stderr: "pipe",
@@ -63,7 +64,7 @@ describe("push command", () => {
 		}
 
 		// Setup bare remote and push main
-		remoteDir = await setupBareRemote(tempDir)
+		remoteDir = await setupBareRemote()
 		await Bun.spawn(["git", "remote", "add", "origin", remoteDir], {
 			cwd: tempDir,
 			stdout: "pipe",
@@ -87,9 +88,37 @@ describe("push command", () => {
 		process.chdir(originalCwd)
 		delete process.env.AGENCY_CONFIG_PATH
 		await cleanupTempDir(tempDir)
+		await cleanupTempDir(remoteDir)
 	})
 
 	describe("basic functionality", () => {
+		test("fails when there are uncommitted changes", async () => {
+			// Create uncommitted changes
+			await Bun.write(join(tempDir, "uncommitted.txt"), "uncommitted\n")
+
+			expect(
+				runTestEffect(
+					push({ baseBranch: "main", silent: true, skipFilter: true }),
+				),
+			).rejects.toThrow(/uncommitted changes/)
+		})
+
+		test("fails when there are staged but uncommitted changes", async () => {
+			// Create a staged but uncommitted change
+			await Bun.write(join(tempDir, "staged.txt"), "staged\n")
+			await Bun.spawn(["git", "add", "staged.txt"], {
+				cwd: tempDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			expect(
+				runTestEffect(
+					push({ baseBranch: "main", silent: true, skipFilter: true }),
+				),
+			).rejects.toThrow(/uncommitted changes/)
+		})
+
 		test("creates emit branch, pushes it, and returns to source", async () => {
 			// We're on agency--feature branch (source)
 			expect(await getCurrentBranch(tempDir)).toBe("agency--feature")
@@ -187,6 +216,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(

package/src/commands/push.ts

@@ -91,6 +91,21 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 		const git = yield* GitService
 		const configService = yield* ConfigService
 
+		// Check for uncommitted changes
+		const statusOutput = yield* git.getStatus(gitRoot)
+
+		if (statusOutput && statusOutput.trim().length > 0) {
+			return yield* Effect.fail(
+				new Error(
+					`You have uncommitted changes. Please commit or stash them before pushing.\n` +
+						`The push command performs internal checkouts that would destroy uncommitted work.\n` +
+						`Run 'git status' to see the changes.`,
+				),
+			)
+		}
+
+		verboseLog(`Working directory is clean`)
+
 		// Load config to check emit branch pattern
 		const config = yield* configService.loadConfig()
 

package/templates/AGENCY.md

@@ -18,3 +18,5 @@ All work on this repository should begin by reading and understanding `TASK.md`.
 When creating commit messages, do not reference changes to `TASK.md`, `AGENTS.md`, or any files tracked in `agency.json` (such as `opencode.json`). These are project management and configuration files that should not be mentioned in commit messages. Focus commit messages on actual code changes, features, fixes, and refactoring.
 
 **Important:** Even when the only changes in a commit are to tracked files like `TASK.md`, you should still commit those changes. These updates should be co-located with the code changes they describe. Simply omit mentioning the tracked files in the commit message and focus the message on the actual code changes being made.
+
+If a commit only updates `TASK.md`, use `--no-verify` to skip precommit hooks. Do not use `--no-verify` if the commit includes changes to any other file.