@markjaquith/agency 1.9.2 → 1.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "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.
  *