@markjaquith/agency 1.6.2 → 1.6.3

package/package.json

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

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

@@ -1,5 +1,6 @@
 import { test, expect, describe, beforeEach, afterEach } from "bun:test"
 import { join } from "path"
+import { symlink } from "fs/promises"
 import { task } from "../commands/task"
 import {
 	createTempDir,
@@ -12,6 +13,8 @@ import {
 	runTestEffect,
 	runGitCommand,
 	getCurrentBranch,
+	getGitOutput,
+	addAndCommit,
 } from "../test-utils"
 
 describe("task command", () => {
@@ -937,4 +940,80 @@ describe("task command", () => {
 			expect(metadata.emitBranch).toBe("backward-compat-test")
 		})
 	})
+
+	describe("CLAUDE.md symlink handling", () => {
+		test("commits CLAUDE.md modification when it is a symlink to another file", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+
+			// Create a pre-existing AGENTS.md and CLAUDE.md as a symlink to it
+			await Bun.write(
+				join(tempDir, "AGENTS.md"),
+				"# Agents\n\nOriginal content",
+			)
+			await symlink("AGENTS.md", join(tempDir, "CLAUDE.md"))
+			await addAndCommit(
+				tempDir,
+				["AGENTS.md", "CLAUDE.md"],
+				"Add AGENTS.md and CLAUDE.md symlink",
+			)
+
+			await initAgency(tempDir, "test")
+
+			// Run task - this will modify CLAUDE.md (which is a symlink to AGENTS.md)
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
+
+			// Check that the commit was created and includes both files
+			const commitLog = await getGitOutput(tempDir, [
+				"log",
+				"--oneline",
+				"-n",
+				"2",
+			])
+
+			// Should have the CLAUDE.md edit commit
+			expect(commitLog).toContain("agency edit CLAUDE.md")
+
+			// Verify that both AGENTS.md and CLAUDE.md were staged in the CLAUDE.md commit
+			// by checking the diff of the last commit
+			const lastCommitDiff = await getGitOutput(tempDir, [
+				"diff-tree",
+				"--no-commit-id",
+				"--name-only",
+				"-r",
+				"HEAD",
+			])
+
+			// The CLAUDE.md commit should include AGENTS.md (the symlink target)
+			expect(lastCommitDiff.trim().split("\n")).toContain("AGENTS.md")
+		})
+
+		test("commits CLAUDE.md modification normally when not a symlink", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+
+			// Create a pre-existing CLAUDE.md (not a symlink)
+			await Bun.write(
+				join(tempDir, "CLAUDE.md"),
+				"# Claude\n\nOriginal content",
+			)
+			await addAndCommit(tempDir, "CLAUDE.md", "Add CLAUDE.md")
+
+			await initAgency(tempDir, "test")
+
+			// Run task - this will modify CLAUDE.md
+			await runTestEffect(task({ silent: true, emit: "test-feature" }))
+
+			// Check that the commit was created
+			const commitLog = await getGitOutput(tempDir, [
+				"log",
+				"--oneline",
+				"-n",
+				"2",
+			])
+
+			// Should have the CLAUDE.md edit commit
+			expect(commitLog).toContain("agency edit CLAUDE.md")
+		})
+	})
 })

package/src/commands/task.ts

@@ -847,7 +847,31 @@ export const task = (options: TaskOptions = {}) =>
 		// This commit will be completely removed during emission
 		if (claudeModifiedExisting) {
 			yield* Effect.gen(function* () {
-				yield* git.gitAdd(["CLAUDE.md"], targetPath)
+				// Check if CLAUDE.md is a symlink - if so, we need to add both the symlink
+				// and its target file, since git add on a symlink only stages the symlink itself
+				const claudePath = resolve(targetPath, "CLAUDE.md")
+				const filesToAdd = ["CLAUDE.md"]
+
+				const symlinkTarget = yield* fs.readSymlinkTarget(claudePath)
+				if (symlinkTarget) {
+					// Symlink target can be relative or absolute
+					// If relative, resolve it relative to the symlink's directory
+					const resolvedTarget = symlinkTarget.startsWith("/")
+						? symlinkTarget
+						: resolve(targetPath, symlinkTarget)
+
+					// Make the path relative to targetPath for git add
+					const relativeTarget = resolvedTarget.startsWith(targetPath)
+						? resolvedTarget.slice(targetPath.length + 1)
+						: resolvedTarget
+
+					filesToAdd.push(relativeTarget)
+					verboseLog(
+						`CLAUDE.md is a symlink to ${relativeTarget}, adding both files`,
+					)
+				}
+
+				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`
 				yield* git.gitCommit(commitMessage, targetPath, {