@markjaquith/agency 0.7.3 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "description": "Manages personal agents files",
   "license": "MIT",
   "author": "Mark Jaquith",

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

@@ -8,7 +8,10 @@ import {
 	initAgency,
 	readFile,
 	runTestEffect,
+	createFile,
+	runGitCommand,
 } from "../test-utils"
+import { chmod } from "fs/promises"
 
 describe("edit command", () => {
 	let tempDir: string
@@ -138,4 +141,95 @@ describe("edit command", () => {
 			"Editor exited with code",
 		)
 	})
+
+	test("commits TASK.md with 'chore: agency edit' when file is modified", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		// Initialize to create TASK.md
+		await initAgency(tempDir, "test-task")
+		await runTestEffect(task({ silent: true, emit: "test-feature" }))
+
+		// Get initial commit count
+		const result = Bun.spawnSync({
+			cmd: ["git", "rev-list", "--count", "HEAD"],
+			cwd: tempDir,
+			stdout: "pipe",
+		})
+		const initialCommits = new TextDecoder().decode(result.stdout).trim()
+
+		// Use a script that modifies TASK.md
+		const scriptPath = join(tempDir, "edit-script.sh")
+		await createFile(
+			tempDir,
+			"edit-script.sh",
+			'#!/bin/bash\necho "Updated task" >> "$1"\n',
+		)
+		await chmod(scriptPath, 0o755)
+		process.env.EDITOR = scriptPath
+
+		// Run edit command
+		await runTestEffect(taskEdit({ silent: true }))
+
+		// Check that a new commit was created
+		const finalResult = Bun.spawnSync({
+			cmd: ["git", "rev-list", "--count", "HEAD"],
+			cwd: tempDir,
+			stdout: "pipe",
+		})
+		const finalCommits = new TextDecoder().decode(finalResult.stdout).trim()
+		expect(Number.parseInt(finalCommits)).toBe(
+			Number.parseInt(initialCommits) + 1,
+		)
+
+		// Check the commit message
+		const msgResult = Bun.spawnSync({
+			cmd: ["git", "log", "-1", "--format=%s"],
+			cwd: tempDir,
+			stdout: "pipe",
+		})
+		const commitMessage = new TextDecoder().decode(msgResult.stdout).trim()
+		expect(commitMessage).toBe("chore: agency edit")
+
+		// Check that only TASK.md was committed
+		const filesResult = Bun.spawnSync({
+			cmd: ["git", "diff-tree", "--no-commit-id", "--name-only", "-r", "HEAD"],
+			cwd: tempDir,
+			stdout: "pipe",
+		})
+		const filesInCommit = new TextDecoder().decode(filesResult.stdout).trim()
+		expect(filesInCommit).toBe("TASK.md")
+	})
+
+	test("does not commit when TASK.md is not modified", async () => {
+		await initGitRepo(tempDir)
+		process.chdir(tempDir)
+
+		// Initialize to create TASK.md
+		await initAgency(tempDir, "test-task")
+		await runTestEffect(task({ silent: true, emit: "test-feature" }))
+
+		// Get initial commit count
+		const result = Bun.spawnSync({
+			cmd: ["git", "rev-list", "--count", "HEAD"],
+			cwd: tempDir,
+			stdout: "pipe",
+		})
+		const initialCommits = new TextDecoder().decode(result.stdout).trim()
+
+		// Use a mock editor that doesn't modify the file
+		process.env.EDITOR = "true"
+
+		// Run edit command
+		await runTestEffect(taskEdit({ silent: true }))
+
+		// Check that no new commit was created
+		const finalResult = Bun.spawnSync({
+			cmd: ["git", "rev-list", "--count", "HEAD"],
+			cwd: tempDir,
+			stdout: "pipe",
+		})
+		const finalCommits = new TextDecoder().decode(finalResult.stdout).trim()
+		expect(Number.parseInt(finalCommits)).toBe(Number.parseInt(initialCommits))
+	})
 })

package/src/commands/task.ts

@@ -910,6 +910,7 @@ const taskEditEffect = (options: TaskEditOptions = {}) =>
 		const { log, verboseLog } = createLoggers(options)
 
 		const fs = yield* FileSystemService
+		const git = yield* GitService
 
 		const gitRoot = yield* ensureGitRepo()
 
@@ -943,6 +944,26 @@ const taskEditEffect = (options: TaskEditOptions = {}) =>
 		}
 
 		log(done("TASK.md edited"))
+
+		// Check if TASK.md has uncommitted changes
+		const hasChanges = yield* git.hasUncommittedChanges(gitRoot, "TASK.md")
+		verboseLog(`TASK.md has uncommitted changes: ${hasChanges}`)
+
+		if (hasChanges) {
+			// Commit the changes
+			yield* Effect.gen(function* () {
+				yield* git.gitAdd(["TASK.md"], gitRoot)
+				yield* git.gitCommit("chore: agency edit", gitRoot, {
+					noVerify: true,
+				})
+				log(done("Committed TASK.md changes"))
+			}).pipe(
+				Effect.catchAll((err) => {
+					verboseLog(`Failed to commit TASK.md: ${err}`)
+					return Effect.void
+				}),
+			)
+		}
 	})
 
 export const editHelp = `

package/src/services/GitService.ts

@@ -850,5 +850,21 @@ export class GitService extends Effect.Service<GitService>()("GitService", {
 				Effect.map((result) => (result.exitCode === 0 ? result.stdout : null)),
 				Effect.catchAll(() => Effect.succeed(null)),
 			),
+
+		/**
+		 * Check if a file has uncommitted changes (staged or unstaged).
+		 * Uses `git diff HEAD` to check for any changes to the file.
+		 * @param gitRoot - The git repository root
+		 * @param filePath - Path to the file relative to git root
+		 * @returns true if the file has changes, false otherwise
+		 */
+		hasUncommittedChanges: (gitRoot: string, filePath: string) =>
+			pipe(
+				runGitCommand(["git", "diff", "HEAD", "--", filePath], gitRoot),
+				Effect.map(
+					(result) => result.exitCode === 0 && result.stdout.length > 0,
+				),
+				Effect.catchAll(() => Effect.succeed(false)),
+			),
 	}),
 }) {}