@markjaquith/agency 0.5.1 → 0.6.0

package/src/commands/task-branching.test.ts

@@ -42,6 +42,74 @@ describe("task command - branching functionality", () => {
 	})
 
 	describe("--from flag", () => {
+		test("creates new agency/some-branch when using --from some-branch with explicit name", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			// Create a feature branch called 'some-branch'
+			await runGitCommand(tempDir, ["git", "checkout", "-b", "some-branch"])
+			await createFile(tempDir, "feature.txt", "content")
+			await runGitCommand(tempDir, ["git", "add", "."])
+			await runGitCommand(tempDir, ["git", "commit", "-m", "Add feature"])
+
+			// Run agency task my-feature --from some-branch
+			// This should create a NEW branch called agency/my-feature
+			await runTestEffect(
+				task({
+					silent: true,
+					emit: "my-feature",
+					from: "some-branch",
+				}),
+			)
+
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/my-feature")
+
+			// Verify feature.txt exists (came from some-branch)
+			const featureFile = await Bun.file(join(tempDir, "feature.txt")).text()
+			expect(featureFile).toBe("content")
+
+			// Verify TASK.md was created (agency files added)
+			const taskMdExists = await Bun.file(join(tempDir, "TASK.md")).exists()
+			expect(taskMdExists).toBe(true)
+		})
+
+		test("throws error when agency/some-branch already exists", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			// Create a feature branch called 'some-branch'
+			await runGitCommand(tempDir, ["git", "checkout", "-b", "some-branch"])
+			await createFile(tempDir, "feature.txt", "content")
+			await runGitCommand(tempDir, ["git", "add", "."])
+			await runGitCommand(tempDir, ["git", "commit", "-m", "Add feature"])
+
+			// Create agency/my-feature first
+			await runTestEffect(
+				task({
+					silent: true,
+					emit: "my-feature",
+					from: "some-branch",
+				}),
+			)
+
+			// Go back to some-branch
+			await runGitCommand(tempDir, ["git", "checkout", "some-branch"])
+
+			// Try to create it again - should fail
+			await expect(
+				runTestEffect(
+					task({
+						silent: true,
+						emit: "my-feature",
+						from: "some-branch",
+					}),
+				),
+			).rejects.toThrow("already exists")
+		})
+
 		test("branches from specified non-agency branch", async () => {
 			await initGitRepo(tempDir)
 			process.chdir(tempDir)
@@ -60,7 +128,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "my-task",
+					emit: "my-task",
 					from: "feature-base",
 				}),
 			)
@@ -82,7 +150,7 @@ describe("task command - branching functionality", () => {
 				runTestEffect(
 					task({
 						silent: true,
-						branch: "my-task",
+						emit: "my-task",
 						from: "nonexistent-branch",
 					}),
 				),
@@ -98,7 +166,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "first-task",
+					emit: "first-task",
 				}),
 			)
 
@@ -122,7 +190,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "second-task",
+					emit: "second-task",
 					from: "agency/first-task",
 				}),
 			)
@@ -153,7 +221,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "unemitted-task",
+					emit: "unemitted-task",
 				}),
 			)
 
@@ -165,7 +233,7 @@ describe("task command - branching functionality", () => {
 				runTestEffect(
 					task({
 						silent: true,
-						branch: "second-task",
+						emit: "second-task",
 						from: "agency/unemitted-task",
 					}),
 				),
@@ -192,7 +260,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "my-task",
+					emit: "my-task",
 					from: "feature-current",
 				}),
 			)
@@ -214,7 +282,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "first-task",
+					emit: "first-task",
 				}),
 			)
 
@@ -232,7 +300,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "second-task",
+					emit: "second-task",
 					from: "agency/first-task",
 				}),
 			)
@@ -254,7 +322,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "unemitted-task",
+					emit: "unemitted-task",
 				}),
 			)
 
@@ -266,7 +334,7 @@ describe("task command - branching functionality", () => {
 				runTestEffect(
 					task({
 						silent: true,
-						branch: "second-task",
+						emit: "second-task",
 						from: "agency/unemitted-task",
 					}),
 				),
@@ -284,7 +352,7 @@ describe("task command - branching functionality", () => {
 				runTestEffect(
 					task({
 						silent: true,
-						branch: "my-task",
+						emit: "my-task",
 						from: "main",
 						fromCurrent: true,
 					}),
@@ -293,6 +361,51 @@ describe("task command - branching functionality", () => {
 		})
 	})
 
+	describe("--from flag branch naming", () => {
+		test("agency task --from foo requires explicit branch name in silent mode", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			await runGitCommand(tempDir, ["git", "checkout", "-b", "foo"])
+			await runGitCommand(tempDir, ["git", "checkout", "main"])
+
+			await expect(
+				runTestEffect(
+					task({
+						silent: true,
+						from: "foo",
+					}),
+				),
+			).rejects.toThrow("Branch name")
+		})
+
+		test("agency task out --from foo creates agency/out emitting to out", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			await runGitCommand(tempDir, ["git", "checkout", "-b", "foo"])
+			await runGitCommand(tempDir, ["git", "checkout", "main"])
+
+			await runTestEffect(
+				task({
+					silent: true,
+					emit: "out",
+					from: "foo",
+				}),
+			)
+
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/out")
+
+			const agencyJson = JSON.parse(
+				await Bun.file(join(tempDir, "agency.json")).text(),
+			)
+			expect(agencyJson.emitBranch).toBe("out")
+		})
+	})
+
 	describe("default branching behavior", () => {
 		test("branches from auto-detected main branch by default", async () => {
 			await initGitRepo(tempDir)
@@ -317,7 +430,7 @@ describe("task command - branching functionality", () => {
 			await runTestEffect(
 				task({
 					silent: true,
-					branch: "my-task",
+					emit: "my-task",
 				}),
 			)
 
@@ -331,4 +444,190 @@ describe("task command - branching functionality", () => {
 			expect(otherExists).toBe(false)
 		})
 	})
+
+	describe("remote branch preference", () => {
+		let remoteDir: string
+
+		beforeEach(async () => {
+			// Create a bare repository to act as the "remote"
+			remoteDir = await createTempDir()
+			await runGitCommand(remoteDir, ["git", "init", "--bare", "-b", "main"])
+		})
+
+		afterEach(async () => {
+			await cleanupTempDir(remoteDir)
+		})
+
+		test("prefers origin/main over local main when remote is ahead", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			// Add the remote
+			await runGitCommand(tempDir, [
+				"git",
+				"remote",
+				"add",
+				"origin",
+				remoteDir,
+			])
+
+			// Push current state to remote
+			await runGitCommand(tempDir, ["git", "push", "-u", "origin", "main"])
+
+			// Make a commit on local main
+			await createFile(tempDir, "local-only.txt", "local content")
+			await runGitCommand(tempDir, ["git", "add", "."])
+			await runGitCommand(tempDir, ["git", "commit", "-m", "Local-only commit"])
+
+			// Reset local main back to origin/main (simulate local being behind)
+			await runGitCommand(tempDir, ["git", "reset", "--hard", "origin/main"])
+
+			// Make a NEW commit on origin/main by pushing from a separate clone
+			const cloneDir = await createTempDir()
+			await runGitCommand(cloneDir, ["git", "clone", remoteDir, "."])
+			await runGitCommand(cloneDir, [
+				"git",
+				"config",
+				"user.email",
+				"test@example.com",
+			])
+			await runGitCommand(cloneDir, ["git", "config", "user.name", "Test User"])
+			await createFile(cloneDir, "remote-only.txt", "remote content")
+			await runGitCommand(cloneDir, ["git", "add", "."])
+			await runGitCommand(cloneDir, [
+				"git",
+				"commit",
+				"-m",
+				"Remote-only commit",
+			])
+			await runGitCommand(cloneDir, ["git", "push", "origin", "main"])
+			await cleanupTempDir(cloneDir)
+
+			// Fetch so origin/main is updated but local main stays behind
+			await runGitCommand(tempDir, ["git", "fetch", "origin"])
+
+			// Configure agency.mainBranch to "main" (local) and agency.remote to "origin"
+			await runGitCommand(tempDir, [
+				"git",
+				"config",
+				"--local",
+				"agency.mainBranch",
+				"main",
+			])
+			await runGitCommand(tempDir, [
+				"git",
+				"config",
+				"--local",
+				"agency.remote",
+				"origin",
+			])
+
+			// Create task - should branch from origin/main (which has remote-only.txt)
+			await runTestEffect(
+				task({
+					silent: true,
+					emit: "my-task",
+				}),
+			)
+
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/my-task")
+
+			// The new branch should have remote-only.txt (from origin/main)
+			const remoteFileExists = await Bun.file(
+				join(tempDir, "remote-only.txt"),
+			).exists()
+			expect(remoteFileExists).toBe(true)
+		})
+
+		test("falls back to local main when remote branch does not exist", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			// Create a commit on local main
+			await createFile(tempDir, "local.txt", "local content")
+			await runGitCommand(tempDir, ["git", "add", "."])
+			await runGitCommand(tempDir, ["git", "commit", "-m", "Local commit"])
+
+			// Add a remote but don't push (so origin/main doesn't exist)
+			await runGitCommand(tempDir, [
+				"git",
+				"remote",
+				"add",
+				"origin",
+				remoteDir,
+			])
+
+			// Configure agency.mainBranch to "main" and agency.remote to "origin"
+			await runGitCommand(tempDir, [
+				"git",
+				"config",
+				"--local",
+				"agency.mainBranch",
+				"main",
+			])
+			await runGitCommand(tempDir, [
+				"git",
+				"config",
+				"--local",
+				"agency.remote",
+				"origin",
+			])
+
+			// Create task - should fall back to local main since origin/main doesn't exist
+			await runTestEffect(
+				task({
+					silent: true,
+					emit: "my-task",
+				}),
+			)
+
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/my-task")
+
+			// The new branch should have local.txt
+			const localFileExists = await Bun.file(
+				join(tempDir, "local.txt"),
+			).exists()
+			expect(localFileExists).toBe(true)
+		})
+
+		test("uses configured remote branch as-is when it already has remote prefix", async () => {
+			await initGitRepo(tempDir)
+			process.chdir(tempDir)
+			await initAgency(tempDir, "test")
+
+			// Add the remote and push
+			await runGitCommand(tempDir, [
+				"git",
+				"remote",
+				"add",
+				"origin",
+				remoteDir,
+			])
+			await runGitCommand(tempDir, ["git", "push", "-u", "origin", "main"])
+
+			// Configure agency.mainBranch to "origin/main" (already has remote prefix)
+			await runGitCommand(tempDir, [
+				"git",
+				"config",
+				"--local",
+				"agency.mainBranch",
+				"origin/main",
+			])
+
+			// Create task
+			await runTestEffect(
+				task({
+					silent: true,
+					emit: "my-task",
+				}),
+			)
+
+			const currentBranch = await getCurrentBranch(tempDir)
+			expect(currentBranch).toBe("agency/my-task")
+		})
+	})
 })