@markjaquith/agency 1.9.2 → 1.9.4

package/package.json

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

package/src/commands/emit.test.ts

@@ -125,6 +125,50 @@ describe("emit command", () => {
 			expect(currentBranch).toBe("agency--feature")
 		})
 
+		test("sets emit branch upstream when remote branch exists", async () => {
+			await checkoutBranch(tempDir, "main")
+			await createBranch(tempDir, "agency--feature")
+			await Bun.write(
+				join(tempDir, "agency.json"),
+				JSON.stringify({
+					version: 1,
+					injectedFiles: ["AGENTS.md"],
+					template: "test",
+					createdAt: new Date().toISOString(),
+				}),
+			)
+			await addAndCommit(tempDir, "agency.json", "Feature commit")
+
+			await getGitOutput(tempDir, [
+				"update-ref",
+				"refs/remotes/origin/feature",
+				"HEAD",
+			])
+
+			await runTestEffect(emit({ silent: true, skipFilter: true }))
+
+			const remote = await getGitOutput(tempDir, [
+				"config",
+				"--get",
+				"branch.feature.remote",
+			])
+			const merge = await getGitOutput(tempDir, [
+				"config",
+				"--get",
+				"branch.feature.merge",
+			])
+			expect(remote.trim()).toBe("origin")
+			expect(merge.trim()).toBe("refs/heads/feature")
+
+			await checkoutBranch(tempDir, "feature")
+			const pushRef = await getGitOutput(tempDir, [
+				"rev-parse",
+				"--abbrev-ref",
+				"@{push}",
+			])
+			expect(pushRef.trim()).toBe("origin/feature")
+		})
+
 		test("creates emit branch with custom name", async () => {
 			await createBranch(tempDir, "agency--feature")
 			await createCommit(tempDir, "Feature commit")

package/src/commands/emit.ts

@@ -158,9 +158,7 @@ export const emitCore = (gitRoot: string, options: EmitOptions) =>
 			)
 			branchExisted = existed
 
-			// Unset any remote tracking branch for the emit branch
-			yield* git.unsetGitConfig(`branch.${emitBranchName}.remote`, gitRoot)
-			yield* git.unsetGitConfig(`branch.${emitBranchName}.merge`, gitRoot)
+			yield* configureEmitBranchTracking(gitRoot, emitBranchName, verboseLog)
 		})
 
 		yield* withSpinner(createBranch, {
@@ -435,6 +433,48 @@ const getFilterRepoStateDir = (gitRoot: string) =>
 		return resolveGitInternalPath(gitRoot, gitPath)
 	})
 
+const configureEmitBranchTracking = (
+	gitRoot: string,
+	emitBranchName: string,
+	verboseLog: (message: string) => void,
+) =>
+	Effect.gen(function* () {
+		const git = yield* GitService
+		const remote = yield* git.resolveRemote(gitRoot).pipe(Effect.option)
+
+		if (remote._tag === "None") {
+			yield* git.unsetGitConfig(`branch.${emitBranchName}.remote`, gitRoot)
+			yield* git.unsetGitConfig(`branch.${emitBranchName}.merge`, gitRoot)
+			return
+		}
+
+		const remoteBranch = `${remote.value}/${emitBranchName}`
+		const remoteBranchExists = yield* git.branchExists(gitRoot, remoteBranch)
+
+		if (!remoteBranchExists) {
+			yield* git.unsetGitConfig(`branch.${emitBranchName}.remote`, gitRoot)
+			yield* git.unsetGitConfig(`branch.${emitBranchName}.merge`, gitRoot)
+			verboseLog(
+				`No existing remote branch ${highlight.branch(remoteBranch)}; leaving ${highlight.branch(emitBranchName)} without upstream`,
+			)
+			return
+		}
+
+		yield* git.setGitConfig(
+			`branch.${emitBranchName}.remote`,
+			remote.value,
+			gitRoot,
+		)
+		yield* git.setGitConfig(
+			`branch.${emitBranchName}.merge`,
+			`refs/heads/${emitBranchName}`,
+			gitRoot,
+		)
+		verboseLog(
+			`Set ${highlight.branch(emitBranchName)} upstream to ${highlight.branch(remoteBranch)}`,
+		)
+	})
+
 /**
  * Find the best fork point by checking both local and remote tracking branches.
  *

package/src/commands/push.test.ts

@@ -115,6 +115,39 @@ describe("push command", () => {
 			expect(remoteBranches).toContain("feature")
 		})
 
+		test("forwards verbose output from emit step", async () => {
+			const originalLog = console.log
+			const logMessages: string[] = []
+			console.log = (msg: string) => {
+				logMessages.push(msg)
+			}
+
+			try {
+				await runTestEffect(
+					push({
+						baseBranch: "main",
+						verbose: true,
+						skipFilter: true,
+					}),
+				)
+			} finally {
+				console.log = originalLog
+			}
+
+			expect(logMessages).toContain("Step 1: Emitting...")
+			expect(
+				logMessages.some(
+					(msg) => msg.includes("Using base branch:") && msg.includes("main"),
+				),
+			).toBe(true)
+			expect(
+				logMessages.some((msg) =>
+					msg.includes("Skipping git-filter-repo (skipFilter=true)"),
+				),
+			).toBe(true)
+			expect(logMessages.some((msg) => msg.includes("Emitted"))).toBe(true)
+		})
+
 		test("works with custom branch name", async () => {
 			await runTestEffect(
 				push({

package/src/commands/push.ts

@@ -122,41 +122,36 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 		verboseLog(`Starting push workflow from ${highlight.branch(sourceBranch)}`)
 
 		// Step 1: Create emit branch (agency emit)
-		let emitHadIgnorableFailure = false
-
-		if (!options.skipFilter) {
-			verboseLog("Step 1: Emitting...")
-			// Use emit command - prefer emit option, fallback to branch for backward compatibility
-			const prEffectWithOptions = emit({
-				baseBranch: options.baseBranch,
-				emit: options.emit || options.branch,
-				silent: true, // Suppress emit command output, we'll provide our own
-				force: options.force,
-				verbose: options.verbose,
-				skipFilter: options.skipFilter,
-			})
-
-			const prResult = yield* Effect.either(prEffectWithOptions)
-			if (Either.isLeft(prResult)) {
-				const error =
-					prResult.left instanceof Error
-						? prResult.left
-						: new Error(String(prResult.left))
-				const message = error.message || ""
-				const ignorable =
-					message === "" ||
-					message.includes("already exists") ||
-					message.includes("check if branch exists")
-
-				if (!ignorable) {
-					return yield* Effect.fail(
-						new Error(`Failed to create emit branch: ${message}`),
-					)
-				}
-
-				emitHadIgnorableFailure = true
-				verboseLog("Emit reported existing branch; continuing")
+		verboseLog("Step 1: Emitting...")
+		// Use the emit command for the entire emit step so push and emit stay in sync.
+		const prEffectWithOptions = emit({
+			baseBranch: options.baseBranch,
+			emit: options.emit || options.branch,
+			silent: options.silent,
+			force: options.force,
+			verbose: options.verbose,
+			skipFilter: options.skipFilter,
+		})
+
+		const prResult = yield* Effect.either(prEffectWithOptions)
+		if (Either.isLeft(prResult)) {
+			const error =
+				prResult.left instanceof Error
+					? prResult.left
+					: new Error(String(prResult.left))
+			const message = error.message || ""
+			const ignorable =
+				message === "" ||
+				message.includes("already exists") ||
+				message.includes("check if branch exists")
+
+			if (!ignorable) {
+				return yield* Effect.fail(
+					new Error(`Failed to create emit branch: ${message}`),
+				)
 			}
+
+			verboseLog("Emit reported existing branch; continuing")
 		}
 
 		// Compute the emit branch name (emit() command now stays on source branch)
@@ -164,15 +159,6 @@ const pushCore = (gitRoot: string, options: PushOptions) =>
 		const emitBranchName =
 			options.emit || options.branch || branchInfo.emitBranch
 
-		// If skipFilter, we skipped emit() so we must create the emit branch manually
-		if (options.skipFilter) {
-			yield* git.createOrResetBranch(gitRoot, emitBranchName, sourceBranch)
-			// Switch back to source branch for consistency
-			yield* git.checkoutBranch(gitRoot, sourceBranch)
-		}
-
-		log(done(`Emitted ${highlight.branch(emitBranchName)}`))
-
 		// Step 2: Push to remote (git push)
 		const remote = yield* getRemoteName(gitRoot)
 		verboseLog(