@markjaquith/agency 1.9.6 → 1.11.0

package/README.md

@@ -104,6 +104,31 @@ Toggle between source branch and emit branch. If on an emit branch (e.g., `foo--
 
 Switch to the source branch for the current emit branch.
 
+### `agency completions <bash|zsh>`
+
+Generate shell completion scripts. The generated scripts are static, so shell startup and tab completion do not call `agency`.
+
+**zsh:**
+
+```bash
+mkdir -p ~/.zsh/completions
+agency completions zsh > ~/.zsh/completions/_agency
+```
+
+Then add this to `~/.zshrc` before `compinit`:
+
+```bash
+fpath=(~/.zsh/completions $fpath)
+autoload -Uz compinit && compinit
+```
+
+**bash:**
+
+```bash
+mkdir -p ~/.local/share/bash-completion/completions
+agency completions bash > ~/.local/share/bash-completion/completions/agency
+```
+
 ## Requirements
 
 - [Bun](https://bun.sh) >= 1.0.0 (recommended)

package/cli.ts

@@ -20,6 +20,10 @@ import { template, help as templateHelp } from "./src/commands/template"
 import { work, help as workHelp } from "./src/commands/work"
 import { loop, help as loopHelp } from "./src/commands/loop"
 import { status, help as statusHelp } from "./src/commands/status"
+import {
+	completions,
+	help as completionsHelp,
+} from "./src/commands/completions"
 import type { Command } from "./src/types"
 import { setColorsEnabled } from "./src/utils/colors"
 import { GitService } from "./src/services/GitService"
@@ -469,6 +473,18 @@ const commands: Record<string, Command> = {
 		},
 		help: loopHelp,
 	},
+	completions: {
+		name: "completions",
+		description: "Generate shell completion scripts",
+		run: async (args: string[], options: Record<string, any>) => {
+			if (options.help) {
+				console.log(completionsHelp)
+				return
+			}
+			await runCommand(completions(args[0]))
+		},
+		help: completionsHelp,
+	},
 }
 
 function showMainHelp() {
@@ -502,6 +518,7 @@ Commands:
   source                 Switch to source branch from emitted branch
   merge                  Merge emitted branch into base branch
   status                 Show agency status for this repository
+  completions <shell>    Generate bash or zsh completion scripts
 
 Global Options:
   -h, --help             Show help for a command

package/package.json

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

package/src/commands/completions.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { completions } from "./completions"
+
+const captureCompletions = async (shell: string) => {
+	const originalLog = console.log
+	let output = ""
+	console.log = (message: string) => {
+		output += message
+	}
+
+	try {
+		await Effect.runPromise(completions(shell))
+	} finally {
+		console.log = originalLog
+	}
+
+	return output
+}
+
+describe("completions command", () => {
+	test("generates bash completions", async () => {
+		const output = await captureCompletions("bash")
+
+		expect(output).toContain("_agency_completions()")
+		expect(output).toContain("complete -F _agency_completions agency")
+		expect(output).toContain("completions")
+		expect(output).toContain("bash zsh")
+	})
+
+	test("generates zsh completions", async () => {
+		const output = await captureCompletions("zsh")
+
+		expect(output).toContain("#compdef agency")
+		expect(output).toContain("_agency()")
+		expect(output).toContain("agency_commands=(")
+		expect(output).toContain("bash\\:Generate\\ bash\\ completions")
+	})
+
+	test("prints the requested completion script", async () => {
+		const output = await captureCompletions("zsh")
+
+		expect(output).toContain("#compdef agency")
+	})
+
+	test("rejects unsupported shells", async () => {
+		await expect(Effect.runPromise(completions("fish"))).rejects.toThrow(
+			"Usage: agency completions <bash|zsh>",
+		)
+	})
+})

package/src/commands/completions.ts

@@ -0,0 +1,308 @@
+import { Effect } from "effect"
+
+const shells = ["bash", "zsh"] as const
+type Shell = (typeof shells)[number]
+
+const commands = [
+	"init",
+	"task",
+	"tasks",
+	"edit",
+	"work",
+	"template",
+	"emit",
+	"emitted",
+	"pr",
+	"push",
+	"pull",
+	"rebase",
+	"base",
+	"switch",
+	"source",
+	"merge",
+	"status",
+	"clean",
+	"loop",
+	"completions",
+] as const
+
+const templateSubcommands = ["use", "save", "list", "view", "delete"] as const
+const baseSubcommands = ["get", "set"] as const
+const completionSubcommands = shells
+
+const globalOptions = [
+	"--help",
+	"-h",
+	"--version",
+	"-v",
+	"--no-color",
+	"--silent",
+	"-s",
+	"--verbose",
+] as const
+
+const commandOptions: Record<string, readonly string[]> = {
+	init: [
+		"--help",
+		"-h",
+		"--template",
+		"-t",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	emit: [
+		"--help",
+		"-h",
+		"--emit",
+		"--branch",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	push: [
+		"--help",
+		"-h",
+		"--emit",
+		"--branch",
+		"--force",
+		"-f",
+		"--no-verify",
+		"--pr",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	pull: ["--help", "-h", "--remote", "-r", "--silent", "-s", "--verbose", "-v"],
+	rebase: [
+		"--help",
+		"-h",
+		"--emit",
+		"--branch",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	task: [
+		"--help",
+		"-h",
+		"--emit",
+		"--branch",
+		"--task",
+		"--from",
+		"--from-current",
+		"--continue",
+		"--squash",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	tasks: ["--help", "-h", "--json", "--silent", "-s", "--verbose", "-v"],
+	base: ["--help", "-h", "--repo", "--silent", "-s", "--verbose", "-v"],
+	template: [
+		"--help",
+		"-h",
+		"--template",
+		"-t",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	work: [
+		"--help",
+		"-h",
+		"--opencode",
+		"--claude",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	loop: [
+		"--help",
+		"-h",
+		"--min-loops",
+		"--max-loops",
+		"--opencode",
+		"--claude",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	status: ["--help", "-h", "--json", "--silent", "-s", "--verbose", "-v"],
+	clean: [
+		"--help",
+		"-h",
+		"--dry-run",
+		"--merged-into",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	],
+	completions: ["--help", "-h"],
+}
+
+const words = (values: readonly string[]) => values.join(" ")
+
+const bashCase = (command: string, subcommands?: readonly string[]) => {
+	const options = commandOptions[command] ?? [
+		"--help",
+		"-h",
+		"--silent",
+		"-s",
+		"--verbose",
+		"-v",
+	]
+	const completions = subcommands ? [...subcommands, ...options] : options
+	return `\t\t${command})\n\t\t\tCOMPREPLY=( $(compgen -W "${words(completions)}" -- "$cur") )\n\t\t\treturn 0\n\t\t\t;;`
+}
+
+const zshCommandSpec = (command: string, description: string) =>
+	`    '${command}:${description}'`
+
+const generateBashCompletions = () => `# bash completion for agency
+_agency_completions() {
+	local cur prev command
+	COMPREPLY=()
+	cur="\${COMP_WORDS[COMP_CWORD]}"
+	prev="\${COMP_WORDS[COMP_CWORD-1]}"
+
+	if [[ $COMP_CWORD -eq 1 ]]; then
+		COMPREPLY=( $(compgen -W "${words([...commands, ...globalOptions])}" -- "$cur") )
+		return 0
+	fi
+
+	command="\${COMP_WORDS[1]}"
+	case "$command" in
+${bashCase("template", templateSubcommands)}
+${bashCase("base", baseSubcommands)}
+${bashCase("completions", completionSubcommands)}
+${commands
+	.filter((command) => !["template", "base", "completions"].includes(command))
+	.map((command) => bashCase(command))
+	.join("\n")}
+	esac
+
+	case "$prev" in
+		--template|-t|--emit|--branch|--task|--from|--remote|-r|--merged-into)
+			return 0
+			;;
+	esac
+}
+
+complete -F _agency_completions agency
+`
+
+const generateZshCompletions = () => `#compdef agency
+# zsh completion for agency
+
+_agency() {
+  local context state line
+  local -a agency_commands
+  typeset -A opt_args
+
+  agency_commands=(
+${zshCommandSpec("init", "Initialize agency with template selection")}
+${zshCommandSpec("task", "Initialize template files on a feature branch")}
+${zshCommandSpec("tasks", "List all task branches")}
+${zshCommandSpec("edit", "Open TASK.md in system editor")}
+${zshCommandSpec("work", "Start working on TASK.md with OpenCode")}
+${zshCommandSpec("template", "Template management commands")}
+${zshCommandSpec("emit", "Emit a branch with backpack files reverted")}
+${zshCommandSpec("emitted", "Get the name of the emitted branch")}
+${zshCommandSpec("pr", "Run gh pr with the emitted branch name")}
+${zshCommandSpec("push", "Emit, push to remote, return to source")}
+${zshCommandSpec("pull", "Pull commits from remote emit branch to source")}
+${zshCommandSpec("rebase", "Rebase source branch onto base branch")}
+${zshCommandSpec("base", "Get or set the base branch")}
+${zshCommandSpec("switch", "Toggle between source and emitted branch")}
+${zshCommandSpec("source", "Switch to source branch from emitted branch")}
+${zshCommandSpec("merge", "Merge emitted branch into base branch")}
+${zshCommandSpec("status", "Show agency status for this repository")}
+${zshCommandSpec("clean", "Delete branches merged into a specified branch")}
+${zshCommandSpec("loop", "Run a Ralph Wiggum loop to complete all tasks")}
+${zshCommandSpec("completions", "Generate shell completion scripts")}
+  )
+
+  _arguments -C \\
+    '(-h --help)'{-h,--help}'[show help]' \\
+    '(-v --version)'{-v,--version}'[show version]' \\
+    '--no-color[disable color output]' \\
+    '(-s --silent)'{-s,--silent}'[suppress output messages]' \\
+    '--verbose[show verbose output]' \\
+    '1:command:->command' \\
+    '*::arg:->args'
+
+  case $state in
+    command)
+      _describe 'agency command' agency_commands
+      ;;
+    args)
+      case $line[1] in
+        template)
+          _arguments \\
+            '(-h --help)'{-h,--help}'[show help]' \\
+            '(-t --template)'{-t,--template}'[template name]:template:' \\
+            '(-s --silent)'{-s,--silent}'[suppress output messages]' \\
+            '--verbose[show verbose output]' \\
+            '1:subcommand:((use\\:Set\\ template save\\:Save\\ files list\\:List\\ files view\\:View\\ file delete\\:Delete\\ files))' \\
+            '*:file:_files'
+          ;;
+        base)
+          _arguments \\
+            '(-h --help)'{-h,--help}'[show help]' \\
+            '--repo[use repository-local configuration]' \\
+            '(-s --silent)'{-s,--silent}'[suppress output messages]' \\
+            '--verbose[show verbose output]' \\
+            '1:subcommand:((get\\:Get\\ base\\ branch set\\:Set\\ base\\ branch))' \\
+            '*:branch:'
+          ;;
+        completions)
+          _arguments \\
+            '(-h --help)'{-h,--help}'[show help]' \\
+            '1:shell:((bash\\:Generate\\ bash\\ completions zsh\\:Generate\\ zsh\\ completions))'
+          ;;
+        *)
+          _arguments \\
+            '(-h --help)'{-h,--help}'[show help]' \\
+            '(-s --silent)'{-s,--silent}'[suppress output messages]' \\
+            '--verbose[show verbose output]'
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_agency "$@"
+`
+
+export const completions = (shell: string | undefined) =>
+	Effect.gen(function* () {
+		if (!shell || !shells.includes(shell as Shell)) {
+			return yield* Effect.fail(
+				new Error("Usage: agency completions <bash|zsh>"),
+			)
+		}
+
+		console.log(
+			shell === "bash" ? generateBashCompletions() : generateZshCompletions(),
+		)
+	})
+
+export const help = `
+Usage: agency completions <bash|zsh>
+
+Generate shell completion scripts.
+
+Examples:
+  agency completions zsh > ~/.zsh/completions/_agency
+  agency completions bash > ~/.local/share/bash-completion/completions/agency
+`

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) {

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) {

package/src/commands/push.test.ts

@@ -30,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",
@@ -64,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",
@@ -88,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")

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.