@markjaquith/agency 1.8.6 → 1.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "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

@@ -44,15 +44,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 => {
@@ -261,7 +267,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)
@@ -283,7 +289,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)}`,
 						),
 					)
 				}