@markjaquith/agency 1.1.0 → 1.2.0

package/cli.ts

@@ -8,6 +8,7 @@ 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 { pr, help as prHelp } from "./src/commands/pr"
 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"
@@ -118,6 +119,24 @@ const commands: Record<string, Command> = {
 		},
 		help: emittedHelp,
 	},
+	pr: {
+		name: "pr",
+		description: "Run gh pr with the emitted branch name",
+		run: async (args: string[], options: Record<string, any>) => {
+			if (options.help) {
+				console.log(prHelp)
+				return
+			}
+			await runCommand(
+				pr({
+					args,
+					silent: options.silent,
+					verbose: options.verbose,
+				}),
+			)
+		},
+		help: prHelp,
+	},
 	push: {
 		name: "push",
 		description: "Emit, push to remote, return to source",
@@ -428,6 +447,7 @@ Commands:
     delete <file> ...      Delete files from configured template
   emit [base-branch]     Emit a branch with backpack files reverted
   emitted                Get the name of the emitted branch
+  pr <subcommand>        Run gh pr with the emitted branch name
   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

package/package.json

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

package/src/commands/pr.ts

@@ -0,0 +1,77 @@
+import { Effect } from "effect"
+import type { BaseCommandOptions } from "../utils/command"
+import { GitService } from "../services/GitService"
+import { ConfigService } from "../services/ConfigService"
+import { resolveBranchPairWithAgencyJson } from "../utils/pr-branch"
+import { ensureGitRepo } from "../utils/effect"
+
+interface PrOptions extends BaseCommandOptions {
+	/** Arguments to pass to gh pr (subcommand and flags) */
+	args: string[]
+}
+
+export const pr = (options: PrOptions) =>
+	Effect.gen(function* () {
+		const git = yield* GitService
+		const configService = yield* ConfigService
+
+		const gitRoot = yield* ensureGitRepo()
+
+		// Load config
+		const config = yield* configService.loadConfig()
+
+		// Get current branch and resolve the branch pair
+		const currentBranch = yield* git.getCurrentBranch(gitRoot)
+		const branches = yield* resolveBranchPairWithAgencyJson(
+			gitRoot,
+			currentBranch,
+			config.sourceBranchPattern,
+			config.emitBranch,
+		)
+
+		// Build the gh pr command with the emit branch
+		const ghArgs = ["gh", "pr", ...options.args, branches.emitBranch]
+
+		// Run gh pr with stdio inherited so output goes directly to terminal
+		const exitCode = yield* Effect.tryPromise({
+			try: async () => {
+				const proc = Bun.spawn(ghArgs, {
+					cwd: gitRoot,
+					stdin: "inherit",
+					stdout: "inherit",
+					stderr: "inherit",
+				})
+				return proc.exited
+			},
+			catch: (error) =>
+				new Error(
+					`Failed to run gh pr: ${error instanceof Error ? error.message : String(error)}`,
+				),
+		})
+
+		if (exitCode !== 0) {
+			return yield* Effect.fail(
+				new Error(`gh pr command exited with code ${exitCode}`),
+			)
+		}
+	})
+
+export const help = `
+Usage: agency pr <subcommand> [flags]
+
+Wrapper for 'gh pr' that automatically appends the emitted branch name.
+
+This command passes all arguments to 'gh pr' with the emitted branch name
+appended, making it easy to work with PRs for your feature branch without
+needing to remember or type the emit branch name.
+
+Examples:
+  agency pr view --web              # gh pr view --web <emit-branch>
+  agency pr checks                  # gh pr checks <emit-branch>
+  agency pr status                  # gh pr status <emit-branch>
+
+Notes:
+  - Requires gh CLI to be installed and authenticated
+  - Uses source and emit patterns from ~/.config/agency/agency.json
+  - Respects emitBranch field in agency.json when present
+`

package/src/commands/push.ts

@@ -137,6 +137,10 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 			`Step 2: Pushing ${highlight.branch(emitBranchName)} to ${highlight.remote(remote)}...`,
 		)
 
+		// Switch to emit branch before pushing so that pre-push hooks run
+		// in the context of the emit branch (without backpack files)
+		yield* git.checkoutBranch(gitRoot, emitBranchName)
+
 		const pushEither = yield* Effect.either(
 			withSpinner(
 				pushBranchToRemoteEffect(gitRoot, emitBranchName, remote, {
@@ -153,10 +157,8 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 		)
 		if (Either.isLeft(pushEither)) {
 			const error = pushEither.left
-			// If push failed, best-effort switch back to source branch
-			try {
-				yield* git.checkoutBranch(gitRoot, sourceBranch)
-			} catch {}
+			// If push failed, switch back to source branch
+			yield* git.checkoutBranch(gitRoot, sourceBranch)
 			return yield* Effect.fail(error)
 		}
 
@@ -189,14 +191,8 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 			}
 		}
 
-		// Verify we're still on the source branch (emit() now stays on source branch)
-		// Verify we're still on the source branch (best-effort)
-		try {
-			const finalBranch = yield* git.getCurrentBranch(gitRoot)
-			if (finalBranch !== sourceBranch) {
-				yield* git.checkoutBranch(gitRoot, sourceBranch)
-			}
-		} catch {}
+		// Switch back to source branch
+		yield* git.checkoutBranch(gitRoot, sourceBranch)
 	})
 
 // Helper: Push branch to remote with optional force and retry logic