@markjaquith/agency 0.7.3 → 1.0.0

package/README.md

@@ -10,11 +10,26 @@ bun install -g @markjaquith/agency
 
 ## Primary Commands
 
-### `agency task [branch-name]`
+### `agency task <branch-name>`
 
-Initialize `AGENTS.md` and `TASK.md` files using the template you've set for this repo. Commits smuggled files and lands you on that branch.
+Create a new feature branch from the latest `origin/main` and initialize `AGENTS.md` and `TASK.md` files using the template you've set for this repo. Commits smuggled files and lands you on that branch.
 
-### `agency task edit`
+**Options:**
+
+- `--from <branch>` - Branch from a specific branch instead of `origin/main`
+- `--from-current` - Initialize on current branch instead of creating a new one
+- `--continue` - Continue a task by copying agency files to a new branch (after PR merge)
+
+**Examples:**
+
+```bash
+agency task my-feature              # Create 'my-feature' from latest origin/main
+agency task my-feature --from dev   # Create 'my-feature' from 'dev' branch
+agency task --from-current          # Initialize on current branch (no new branch)
+agency task --continue my-feature-v2 # Continue task on new branch after PR merge
+```
+
+### `agency edit`
 
 Open `TASK.md` in the system editor for editing. Nice if you have to paste in large amounts of context.
 

package/cli.ts

@@ -426,8 +426,8 @@ Global Options:
 
 Examples:
   agency init                         # Initialize with template (run first)
-  agency task                         # Initialize on current feature branch
-  agency task my-feature              # Create 'my-feature' branch and initialize
+  agency task my-feature              # Create 'my-feature' branch from origin/main
+  agency task --from-current          # Initialize on current feature branch
   agency emit                         # Emit a branch (prompts for base branch)
   agency switch                       # Toggle between source and emitted branch
 

package/package.json

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

package/src/commands/emit.test.ts

@@ -60,7 +60,7 @@ describe("emit command", () => {
 		// Initialize AGENTS.md and commit in one go
 		await initAgency(tempDir, "test")
 
-		await runTestEffect(task({ silent: true }))
+		await runTestEffect(task({ silent: true, fromCurrent: true }))
 		await addAndCommit(tempDir, "AGENTS.md", "Add AGENTS.md")
 
 		// Set up origin/main for git-filter-repo

package/src/commands/merge.test.ts

@@ -64,7 +64,7 @@ describe("merge command", () => {
 		// Initialize AGENTS.md on feature branch
 		await initAgency(tempDir, "test")
 
-		await runTestEffect(task({ silent: true }))
+		await runTestEffect(task({ silent: true, fromCurrent: true }))
 
 		// Ensure agency.json has baseBranch set (task should auto-detect it, but ensure it's there)
 		const agencyJsonPath = join(tempDir, "agency.json")

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-main.test.ts

@@ -676,13 +676,13 @@ describe("task command", () => {
 	})
 
 	describe("branch handling", () => {
-		test("fails when on main branch without branch name", async () => {
+		test("fails when no branch name provided (silent mode)", async () => {
 			await initGitRepo(tempDir)
 			process.chdir(tempDir)
 
 			await initAgency(tempDir, "test")
 			await expect(runTestEffect(task({ silent: true }))).rejects.toThrow(
-				"main branch",
+				"Branch name is required",
 			)
 		})
 

package/src/commands/task.ts

@@ -415,7 +415,23 @@ export const task = (options: TaskOptions = {}) =>
 				)
 			}
 		} else {
-			// Default: determine main upstream branch (preferring remote)
+			// Default: fetch and use latest main upstream branch
+			// First, determine the remote to fetch from
+			const remote =
+				(yield* git.getRemoteConfig(targetPath)) ||
+				(yield* git.findDefaultRemote(targetPath))
+
+			if (remote) {
+				verboseLog(`Fetching from remote: ${remote}`)
+				yield* git.fetch(targetPath, remote).pipe(
+					Effect.catchAll((err) => {
+						verboseLog(`Failed to fetch from ${remote}: ${err}`)
+						return Effect.void
+					}),
+				)
+			}
+
+			// Now resolve the main branch (preferring remote)
 			baseBranchToBranchFrom =
 				(yield* git.resolveMainBranch(targetPath)) || undefined
 
@@ -431,7 +447,8 @@ export const task = (options: TaskOptions = {}) =>
 
 		// Check if the base branch is an agency source branch
 		// If so, we need to emit it first and use the emit branch instead
-		if (baseBranchToBranchFrom) {
+		// Skip this check if using --from-current (we want to stay on current branch, not branch from it)
+		if (baseBranchToBranchFrom && !options.fromCurrent) {
 			const cleanFromBase = extractCleanBranch(
 				baseBranchToBranchFrom,
 				config.sourceBranchPattern,
@@ -473,17 +490,14 @@ export const task = (options: TaskOptions = {}) =>
 		// Determine branch name logic
 		let branchName = options.emit || options.branch
 
-		// 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) {
+		// Determine if we need a new branch name:
+		// - With --from-current on a feature branch without agency.json: can stay on current branch
+		// - All other cases: require a new branch name
+		const canStayOnCurrentBranch =
+			options.fromCurrent && isFeature && !hasAgencyJson
+
+		if (!branchName && !canStayOnCurrentBranch) {
 			if (silent) {
-				if (options.from) {
-					return yield* Effect.fail(
-						new Error(
-							`Branch name is required when using --from flag.\n` +
-								`Use: 'agency task <branch-name> --from ${options.from}'`,
-						),
-					)
-				}
 				if (hasAgencyJson) {
 					return yield* Effect.fail(
 						new Error(
@@ -495,10 +509,9 @@ export const task = (options: TaskOptions = {}) =>
 				}
 				return yield* Effect.fail(
 					new Error(
-						`You're currently on ${highlight.branch(currentBranch)}, which appears to be your main branch.\n` +
-							`To initialize on a feature branch, either:\n` +
-							`  1. Switch to an existing feature branch first, then run 'agency task'\n` +
-							`  2. Provide a new branch name: 'agency task <branch-name>'`,
+						`Branch name is required.\n` +
+							`Use: 'agency task <branch-name>'\n` +
+							`Or use --from-current to initialize on the current branch.`,
 					),
 				)
 			}
@@ -910,6 +923,7 @@ const taskEditEffect = (options: TaskEditOptions = {}) =>
 		const { log, verboseLog } = createLoggers(options)
 
 		const fs = yield* FileSystemService
+		const git = yield* GitService
 
 		const gitRoot = yield* ensureGitRepo()
 
@@ -943,6 +957,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 = `
@@ -962,28 +996,22 @@ Example:
 `
 
 export const help = `
-Usage: agency task [branch-name] [options]
+Usage: agency task <branch-name> [options]
 
 Initialize template files (AGENTS.md, TASK.md, opencode.json) in a git repository.
 
 IMPORTANT: 
   - You must run 'agency init' first to select a template
-  - This command must be run on a feature branch, not the main branch
-
-If you're on the main branch, you must either:
-  1. Switch to an existing feature branch first, then run 'agency task'
-  2. Provide a branch name: 'agency task <branch-name>'
-
-Initializes files at the root of the current git repository.
+  - A branch name is required (creates a new branch from the latest origin/main)
 
 Arguments:
-  branch-name       Create and switch to this branch before initializing
+  branch-name       Name for the new feature branch (required)
 
 Options:
   --emit            Branch name to create (alternative to positional arg)
   --branch          (Deprecated: use --emit) Branch name to create
   --from <branch>   Branch to branch from instead of main upstream branch
-  --from-current    Branch from the current branch
+  --from-current    Initialize on current branch instead of creating a new one
   --continue        Continue a task by copying agency files to a new branch
 
 Continue Mode (--continue):
@@ -999,39 +1027,33 @@ Continue Mode (--continue):
   4. The emitBranch in agency.json is updated for the new branch
 
 Base Branch Selection:
-  By default, 'agency task' branches from the main upstream branch (e.g., origin/main).
-  You can override this behavior with:
+  By default, 'agency task' fetches from the remote and branches from the latest
+  main upstream branch (e.g., origin/main). You can override this behavior with:
   
   - --from <branch>: Branch from a specific branch
-  - --from-current: Branch from your current branch
+  - --from-current: Initialize on your current branch (no new branch created)
   
   If the base branch is an agency source branch (e.g., agency/branch-A), the command
   will automatically use its emit branch instead. This allows you to layer work on top
   of other feature branches while maintaining clean branch history.
 
 Examples:
-  agency task                          # Branch from main upstream branch
-  agency task --from agency/branch-B   # Branch from agency/branch-B's emit branch
-  agency task --from-current           # Branch from current branch's emit branch
+  agency task my-feature               # Create 'my-feature' from latest origin/main
   agency task my-feature --from develop # Create 'my-feature' from 'develop'
+  agency task --from-current           # Initialize on current branch (no new branch)
   agency task --continue my-feature-v2 # Continue task on new branch after PR merge
 
 Template Workflow:
   1. Run 'agency init' to select template (saved to .git/config)
-  2. Run 'agency task' to create template files on feature branch
+  2. Run 'agency task <branch-name>' to create feature branch with template files
   3. Use 'agency template save <file>' to update template with local changes
   4. Template directory only created when you save files to it
 
 Branch Creation:
   When creating a new branch without --from or --from-current:
-  1. Auto-detects main upstream branch (origin/main, origin/master, etc.)
-  2. Falls back to configured main branch in .git/config (agency.mainBranch)
-  3. In --silent mode, a base branch must already be configured
-  
-  When using --from with an agency source branch:
-  1. Verifies the emit branch exists for the source branch
-  2. Uses the emit branch as the actual base to avoid agency files
-  3. Fails if emit branch doesn't exist (run 'agency emit' first)
+  1. Fetches from the configured remote (or origin)
+  2. Auto-detects main upstream branch (origin/main, origin/master, etc.)
+  3. Creates new branch from the latest remote main branch
 
 Notes:
   - Files are created at the git repository root, not the current directory

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)),
+			),
 	}),
 }) {}

package/src/types.ts

@@ -55,7 +55,7 @@ Agency is a CLI tool for managing \`AGENTS.md\`, \`TASK.md\`, and \`opencode.jso
 
 ## Key Commands
 
-- \`agency task\` - Initialize template files on a feature branch
+- \`agency task <branch-name>\` - Create feature branch and initialize template files
 - \`agency edit\` - Open TASK.md in system editor
 - \`agency template save\` - Save current file versions back to a template
 - \`agency template use\` - Switch to a different template