@markjaquith/agency 0.5.1 → 0.6.1

package/README.md

@@ -22,17 +22,28 @@ Open `TASK.md` in the system editor for editing. Nice if you have to paste in la
 
 Launch Opencode to work on the current task defined in `TASK.md`. All your context will be loaded.
 
-### `agency pr [base-branch]`
+### `agency emit [base-branch]`
 
 Create an emit branch with smuggled files reverted to their merge-base state (removes additions/modifications to those files made on feature branch). Default branch name is current branch with `--PR` suffix.
 
-### `agency push`
+### `agency push [base-branch]`
 
-Runs `agency pr`, pushes the branch, and then switches back to the source branch.
+Runs `agency emit`, pushes the branch, and then switches back to the source branch.
+
+**Options:**
+
+- `--pr` - Open GitHub PR in browser after pushing (requires `gh` CLI)
+- `--force` - Force push to remote if branch has diverged
+- `--branch <name>` - Custom name for emit branch
 
 ### `agency merge`
 
-Runs `agency pr`, and then merges the PR back into the base branch locally.
+Runs `agency emit`, and then merges the PR back into the base branch locally.
+
+**Options:**
+
+- `--squash` - Use squash merge instead of regular merge (stages changes, requires manual commit)
+- `--push` - Push the base branch to origin after merging
 
 ## Other Commands
 

package/cli.ts

@@ -4,12 +4,13 @@ import { parseArgs } from "util"
 import { Effect, Layer } from "effect"
 import { clean, help as cleanHelp } from "./src/commands/clean"
 import { init, help as initHelp } from "./src/commands/init"
-import { task, taskEdit, help as taskHelp } from "./src/commands/task"
+import { task, taskEdit, help as taskHelp, editHelp } from "./src/commands/task"
 import { tasks, help as tasksHelp } from "./src/commands/tasks"
 import { emit, help as emitHelp } from "./src/commands/emit"
 import { emitted, help as emittedHelp } from "./src/commands/emitted"
 import { push, help as pushHelp } from "./src/commands/push"
 import { pull, help as pullHelp } from "./src/commands/pull"
+import { rebase, help as rebaseHelp } from "./src/commands/rebase"
 import { base, help as baseHelp } from "./src/commands/base"
 import { switchBranch, help as switchHelp } from "./src/commands/switch"
 import { source, help as sourceHelp } from "./src/commands/source"
@@ -93,7 +94,7 @@ const commands: Record<string, Command> = {
 			await runCommand(
 				emit({
 					baseBranch: args[0],
-					branch: options.branch,
+					emit: options.emit || options.branch,
 					silent: options.silent,
 					force: options.verbose,
 					verbose: options.verbose,
@@ -127,7 +128,7 @@ const commands: Record<string, Command> = {
 			await runCommand(
 				push({
 					baseBranch: args[0],
-					branch: options.branch,
+					emit: options.emit || options.branch,
 					silent: options.silent,
 					force: options.force,
 					verbose: options.verbose,
@@ -155,6 +156,25 @@ const commands: Record<string, Command> = {
 		},
 		help: pullHelp,
 	},
+	rebase: {
+		name: "rebase",
+		description: "Rebase source branch onto base branch",
+		run: async (args: string[], options: Record<string, any>) => {
+			if (options.help) {
+				console.log(rebaseHelp)
+				return
+			}
+			await runCommand(
+				rebase({
+					baseBranch: args[0],
+					emit: options.emit || options.branch,
+					silent: options.silent,
+					verbose: options.verbose,
+				}),
+			)
+		},
+		help: rebaseHelp,
+	},
 	template: {
 		name: "template",
 		description: "Template management commands",
@@ -251,15 +271,16 @@ const commands: Record<string, Command> = {
 				return
 			}
 			// Initialize with optional branch name
-			const branch = args[0] || options.branch
+			const branch = args[0] || options.emit || options.branch
 			await runCommand(
 				task({
-					branch,
+					emit: branch,
 					silent: options.silent,
 					verbose: options.verbose,
 					task: options.task,
 					from: options.from,
 					fromCurrent: options["from-current"],
+					continue: options.continue,
 				}),
 			)
 		},
@@ -288,21 +309,7 @@ const commands: Record<string, Command> = {
 		description: "Open TASK.md in system editor",
 		run: async (_args: string[], options: Record<string, any>) => {
 			if (options.help) {
-				console.log(`
-Usage: agency edit [options]
-
-Open TASK.md in the system editor for editing.
-
-Notes:
-  - Requires TASK.md to exist (run 'agency task' first)
-  - Respects VISUAL and EDITOR environment variables
-  - On macOS, defaults to 'open' which uses the default app for .md files
-  - On other platforms, defaults to 'vim'
-  - The command waits for the editor to close before returning
-
-Example:
-  agency edit                   # Open TASK.md in default editor
-				`)
+				console.log(editHelp)
 				return
 			}
 			await runCommand(
@@ -312,7 +319,7 @@ Example:
 				}),
 			)
 		},
-		help: `Open TASK.md in system editor`,
+		help: editHelp,
 	},
 	work: {
 		name: "work",
@@ -401,6 +408,7 @@ Commands:
   emitted                Get the name of the emitted branch
   push [base-branch]     Emit, push to remote, return to source
   pull                   Pull commits from remote emit branch to source
+  rebase [base-branch]   Rebase source branch onto base branch
   base                   Get or set the base branch
     set <branch>           Set the base branch for the current feature branch
     get                    Get the configured base branch
@@ -508,9 +516,11 @@ try {
 				type: "string",
 				short: "t",
 			},
+			emit: {
+				type: "string",
+			},
 			branch: {
 				type: "string",
-				short: "b",
 			},
 			task: {
 				type: "string",
@@ -521,6 +531,9 @@ try {
 			"from-current": {
 				type: "boolean",
 			},
+			continue: {
+				type: "boolean",
+			},
 			json: {
 				type: "boolean",
 			},

package/package.json

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

package/src/commands/emit.test.ts

@@ -130,7 +130,7 @@ describe("emit command", () => {
 
 			// Skip filter for speed - we're just testing branch creation
 			await runTestEffect(
-				emit({ branch: "custom-pr", silent: true, skipFilter: true }),
+				emit({ emit: "custom-pr", silent: true, skipFilter: true }),
 			)
 
 			const branches = await getGitOutput(tempDir, [
@@ -377,6 +377,76 @@ describe("emit command", () => {
 			expect(logOutput).toContain("Add feature file")
 			expect(logOutput).not.toContain("Add AGENTS.md")
 		})
+
+		test("filters pre-existing CLAUDE.md that gets edited by agency", async () => {
+			if (!hasGitFilterRepo) {
+				console.log("Skipping test: git-filter-repo not installed")
+				return
+			}
+
+			// Start fresh on main branch
+			await checkoutBranch(tempDir, "main")
+
+			// Create CLAUDE.md on main branch (simulating pre-existing file)
+			await Bun.write(
+				join(tempDir, "CLAUDE.md"),
+				"# Original Claude Instructions\n\nSome content here.\n",
+			)
+			await addAndCommit(tempDir, "CLAUDE.md", "Add CLAUDE.md")
+
+			// Create a new feature branch
+			await createBranch(tempDir, "agency/claude-test")
+
+			// Initialize agency on this branch (this will modify CLAUDE.md)
+			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, "AGENTS.md"), "# Test AGENTS\n")
+
+			// Simulate what agency task does - inject into CLAUDE.md
+			const originalClaude = await Bun.file(join(tempDir, "CLAUDE.md")).text()
+			const modifiedClaude = `${originalClaude}\n# Agency References\n@AGENTS.md\n@TASK.md\n`
+			await Bun.write(join(tempDir, "CLAUDE.md"), modifiedClaude)
+
+			await addAndCommit(
+				tempDir,
+				"agency.json AGENTS.md CLAUDE.md",
+				"Initialize agency files",
+			)
+
+			// Add a feature file
+			await createCommit(tempDir, "Feature commit")
+
+			// Create emit branch (this should filter CLAUDE.md)
+			await runTestEffect(emit({ silent: true, baseBranch: "main" }))
+
+			// Should still be on source branch
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/claude-test")
+
+			// Switch to emit branch to verify CLAUDE.md is reverted to main's version
+			await checkoutBranch(tempDir, "claude-test")
+
+			const files = await getGitOutput(tempDir, ["ls-files"])
+			expect(files).toContain("CLAUDE.md") // File should exist (from main)
+			expect(files).not.toContain("AGENTS.md") // Should be filtered
+			expect(files).not.toContain("TASK.md") // Should be filtered
+			expect(files).toContain("test.txt") // Feature file should exist
+
+			// Verify CLAUDE.md was reverted to original (no agency references)
+			const claudeContent = await Bun.file(join(tempDir, "CLAUDE.md")).text()
+			expect(claudeContent).toBe(
+				"# Original Claude Instructions\n\nSome content here.\n",
+			)
+			expect(claudeContent).not.toContain("@AGENTS.md")
+			expect(claudeContent).not.toContain("@TASK.md")
+		})
 	})
 
 	describe("error handling", () => {

package/src/commands/emit.ts

@@ -24,7 +24,8 @@ import {
 import { withSpinner } from "../utils/spinner"
 
 interface EmitOptions extends BaseCommandOptions {
-	branch?: string
+	emit?: string
+	branch?: string // Deprecated: use emit instead
 	baseBranch?: string
 	force?: boolean
 	/** Skip the git-filter-repo step (for testing) */
@@ -101,9 +102,12 @@ const emitCore = (gitRoot: string, options: EmitOptions) =>
 
 		let emitBranchName: string
 
-		if (options.branch) {
+		// Support both --emit (new) and --branch (deprecated)
+		const explicitBranchName = options.emit || options.branch
+
+		if (explicitBranchName) {
 			// Explicit branch name provided via CLI
-			emitBranchName = options.branch
+			emitBranchName = explicitBranchName
 		} else if (metadata?.emitBranch) {
 			// Use emitBranch from agency.json (source of truth)
 			emitBranchName = metadata.emitBranch
@@ -267,7 +271,13 @@ const ensureEmitBranchInMetadata = (
 
 		// Stage and commit the change
 		yield* git.gitAdd(["agency.json"], gitRoot)
-		yield* git.gitCommit("chore: agency emit", gitRoot, { noVerify: true })
+		// Note: baseBranch not available in this helper function context
+		// This commit only happens when backfilling emitBranch in legacy repos
+		yield* git.gitCommit(
+			`chore: agency emit ${currentBranch} → ${emitBranchName}`,
+			gitRoot,
+			{ noVerify: true },
+		)
 	})
 
 /**
@@ -476,7 +486,8 @@ Arguments:
                     If not provided, will use saved config or prompt interactively
 
 Options:
-  -b, --branch      Custom name for emit branch (defaults to pattern from config)
+  --emit            Custom name for emit branch (defaults to pattern from config)
+  --branch          (Deprecated: use --emit) Custom name for emit branch
   -f, --force       Force emit branch creation even if current branch looks like an emit branch
 
 Configuration:

package/src/commands/push.test.ts

@@ -119,7 +119,7 @@ describe("push command", () => {
 			await runTestEffect(
 				push({
 					baseBranch: "main",
-					branch: "custom-pr-branch",
+					emit: "custom-pr-branch",
 					silent: true,
 					skipFilter: true,
 				}),

package/src/commands/push.ts

@@ -21,7 +21,8 @@ import { spawnProcess } from "../utils/process"
 
 interface PushOptions extends BaseCommandOptions {
 	baseBranch?: string
-	branch?: string
+	emit?: string
+	branch?: string // Deprecated: use emit instead
 	force?: boolean
 	pr?: boolean
 	skipFilter?: boolean
@@ -77,10 +78,10 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 
 		// Step 1: Create emit branch (agency emit)
 		verboseLog("Step 1: Emitting...")
-		// Use emit command
+		// Use emit command - prefer emit option, fallback to branch for backward compatibility
 		const prEffectWithOptions = emit({
 			baseBranch: options.baseBranch,
-			branch: options.branch,
+			emit: options.emit || options.branch,
 			silent: true, // Suppress emit command output, we'll provide our own
 			force: options.force,
 			verbose: options.verbose,
@@ -99,7 +100,8 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 
 		// Compute the emit branch name (emit() command now stays on source branch)
 		// Use the branchInfo we already computed earlier
-		const emitBranchName = options.branch || branchInfo.emitBranch
+		const emitBranchName =
+			options.emit || options.branch || branchInfo.emitBranch
 		log(done(`Emitted ${highlight.branch(emitBranchName)}`))
 
 		// Step 2: Push to remote (git push)
@@ -327,7 +329,8 @@ Arguments:
                     If not provided, will use saved config or auto-detect
 
 Options:
-  -b, --branch      Custom name for emit branch (defaults to pattern from config)
+  --emit            Custom name for emit branch (defaults to pattern from config)
+  --branch          (Deprecated: use --emit) Custom name for emit branch
   -f, --force       Force push to remote if branch has diverged
   --pr              Open GitHub PR in browser after pushing (requires gh CLI)