@markjaquith/agency 1.8.6 → 1.9.0

package/cli.ts

@@ -186,6 +186,7 @@ const commands: Record<string, Command> = {
 					emit: options.emit || options.branch,
 					silent: options.silent,
 					force: options.force,
+					noVerify: options["no-verify"],
 					verbose: options.verbose,
 					pr: options.pr,
 				}),
@@ -593,6 +594,9 @@ try {
 				type: "boolean",
 				short: "f",
 			},
+			"no-verify": {
+				type: "boolean",
+			},
 			verbose: {
 				type: "boolean",
 				short: "v",

package/package.json

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

package/src/commands/push.test.ts

@@ -314,6 +314,50 @@ describe("push command", () => {
 			expect(await getCurrentBranch(tempDir)).toBe("agency--feature")
 		})
 
+		test("reports pre-push hook output without suggesting --force", async () => {
+			await Bun.spawn(
+				["git", "config", "core.hooksPath", join(tempDir, ".git", "hooks")],
+				{
+					cwd: tempDir,
+					stdout: "pipe",
+					stderr: "pipe",
+				},
+			).exited
+			const hookPath = join(tempDir, ".git", "hooks", "pre-push")
+			await Bun.write(
+				hookPath,
+				[
+					"#!/bin/sh",
+					"printf 'pre-push hook stdout failure\\n'",
+					"printf 'pre-push hook stderr failure\\n' >&2",
+					"exit 1",
+					"",
+				].join("\n"),
+			)
+			await Bun.spawn(["chmod", "+x", hookPath], {
+				cwd: tempDir,
+				stdout: "pipe",
+				stderr: "pipe",
+			}).exited
+
+			let error: unknown
+			try {
+				await runTestEffect(
+					push({ baseBranch: "main", silent: true, skipFilter: true }),
+				)
+			} catch (caught) {
+				error = caught
+			}
+
+			expect(error).toBeInstanceOf(Error)
+			const message = error instanceof Error ? error.message : String(error)
+			expect(message).toContain("pre-push hook stdout failure")
+			expect(message).toContain("pre-push hook stderr failure")
+			expect(message).not.toContain("agency push --force")
+
+			expect(await getCurrentBranch(tempDir)).toBe("agency--feature")
+		})
+
 		test("does not report force push when --force is provided but not needed", async () => {
 			// Capture output to check for force push message
 			const originalLog = console.log

package/src/commands/push.ts

@@ -19,6 +19,7 @@ interface PushOptions extends BaseCommandOptions {
 	emit?: string
 	branch?: string // Deprecated: use emit instead
 	force?: boolean
+	noVerify?: boolean
 	pr?: boolean
 	skipFilter?: boolean
 }
@@ -44,15 +45,21 @@ const getPushFailureStderr = (error: unknown): string => {
 	return String(error).trim()
 }
 
+const formatProcessOutput = (result: {
+	readonly stdout?: string
+	readonly stderr?: string
+}): string => [result.stdout, result.stderr].filter(Boolean).join("\n").trim()
+
 const pushFailureNeedsForce = (stderr: string): boolean => {
 	const normalized = stderr.toLowerCase()
 
-	return [
-		"non-fast-forward",
-		"updates were rejected because the tip of your current branch is behind",
-		"fetch first",
-		"failed to push some refs",
-	].some((pattern) => normalized.includes(pattern))
+	return (
+		normalized.includes("non-fast-forward") ||
+		normalized.includes(
+			"updates were rejected because the tip of your current branch is behind",
+		) ||
+		(normalized.includes("[rejected]") && normalized.includes("fetch first"))
+	)
 }
 
 const formatPushFailure = (error: unknown): Error => {
@@ -180,6 +187,7 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 			withSpinner(
 				pushBranchToRemoteEffect(gitRoot, emitBranchName, remote, {
 					force: options.force,
+					noVerify: options.noVerify,
 					verbose: options.verbose,
 				}),
 				{
@@ -237,16 +245,17 @@ const pushBranchToRemoteEffect = (
 	remote: string,
 	options: {
 		readonly force?: boolean
+		readonly noVerify?: boolean
 		readonly verbose?: boolean
 	},
 ) =>
 	Effect.gen(function* () {
 		const git = yield* GitService
-		const { force = false } = options
+		const { force = false, noVerify = false } = options
 
 		// Try pushing without force first
 		const pushResult = yield* git
-			.push(gitRoot, remote, branchName, { setUpstream: true })
+			.push(gitRoot, remote, branchName, { setUpstream: true, noVerify })
 			.pipe(
 				Effect.catchAll((error: any) =>
 					Effect.succeed({
@@ -261,7 +270,7 @@ const pushBranchToRemoteEffect = (
 
 		// If push failed, check if we should retry with --force
 		if (pushResult.exitCode !== 0) {
-			const stderr = pushResult.stderr
+			const stderr = formatProcessOutput(pushResult)
 
 			// Check if this is a force-push-needed error
 			const needsForce = pushFailureNeedsForce(stderr)
@@ -269,7 +278,11 @@ const pushBranchToRemoteEffect = (
 			if (needsForce && force) {
 				// User provided --force flag, retry with force
 				const forceResult = yield* git
-					.push(gitRoot, remote, branchName, { setUpstream: true, force: true })
+					.push(gitRoot, remote, branchName, {
+						setUpstream: true,
+						force: true,
+						noVerify,
+					})
 					.pipe(
 						Effect.catchAll((error: any) =>
 							Effect.succeed({
@@ -283,7 +296,7 @@ const pushBranchToRemoteEffect = (
 				if (forceResult.exitCode !== 0) {
 					return yield* Effect.fail(
 						new Error(
-							`Failed to force push branch to remote: ${forceResult.stderr}`,
+							`Failed to force push branch to remote: ${formatProcessOutput(forceResult)}`,
 						),
 					)
 				}
@@ -399,15 +412,17 @@ Arguments:
 
 Options:
   --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)
+	--branch          (Deprecated: use --emit) Custom name for emit branch
+	-f, --force       Force push to remote if branch has diverged
+	--no-verify      Bypass git pre-push hooks
+	--pr              Open GitHub PR in browser after pushing (requires gh CLI)
 
 Examples:
   agency push                          # Create PR, push, return to source
-  agency push origin/main              # Explicitly use origin/main as base
-  agency push --force                  # Force push if branch has diverged
-  agency push --pr                     # Push and open GitHub PR in browser
+	agency push origin/main              # Explicitly use origin/main as base
+	agency push --force                  # Force push if branch has diverged
+	agency push --no-verify              # Push without running pre-push hooks
+	agency push --pr                     # Push and open GitHub PR in browser
 
 Notes:
   - Must be run from a source branch (not a emit branch)

package/src/services/GitService.ts

@@ -1046,6 +1046,7 @@ export class GitService extends Effect.Service<GitService>()("GitService", {
 			options?: {
 				readonly setUpstream?: boolean
 				readonly force?: boolean
+				readonly noVerify?: boolean
 			},
 		) => {
 			const args = ["git", "push"]
@@ -1055,6 +1056,9 @@ export class GitService extends Effect.Service<GitService>()("GitService", {
 			if (options?.force) {
 				args.push("--force")
 			}
+			if (options?.noVerify) {
+				args.push("--no-verify")
+			}
 			args.push(remote, branch)
 
 			return pipe(