@markjaquith/agency 2.49.0 → 2.51.0

package/src/services/WorktreeService.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test"
 import { Effect } from "effect"
-import { mkdir, realpath, rename, rm } from "node:fs/promises"
+import { mkdir, realpath, rename, rm, stat } from "node:fs/promises"
 import { join } from "node:path"
 import {
 	captureErrors,
@@ -23,6 +23,17 @@ const git = async (args: string[], cwd?: string) => {
 		throw new Error(await new Response(process.stderr).text())
 }
 
+const jj = async (args: string[], cwd?: string) => {
+	const process = Bun.spawn(["jj", ...args], {
+		cwd,
+		stdout: "pipe",
+		stderr: "pipe",
+	})
+	await process.exited
+	if (process.exitCode !== 0)
+		throw new Error(await new Response(process.stderr).text())
+}
+
 describe("WorktreeService", () => {
 	let root: string
 	let source: string
@@ -81,18 +92,78 @@ describe("WorktreeService", () => {
 		)
 
 		expect(
-			await Bun.file(join(workspace.writablePath, "README.md")).text(),
+			await Bun.file(join(workspace.writablePath!, "README.md")).text(),
 		).toBe("example\n")
 		expect(
 			await Bun.file(join(workspace.codePath, "effect/README.md")).text(),
 		).toBe("example\n")
 		const branch = Bun.spawnSync(
-			["git", "-C", workspace.writablePath, "branch", "--show-current"],
+			["git", "-C", workspace.writablePath!, "branch", "--show-current"],
 			{ stdout: "pipe" },
 		)
 		expect(new TextDecoder().decode(branch.stdout).trim()).toBe("task/example")
 	})
 
+	test("materializes and removes a jj workspace for a jj workbase", async () => {
+		if (!Bun.which("jj")) return
+		const repository = join(root, "repos/agency")
+		await rm(repository, { recursive: true, force: true })
+		await git(["clone", source, repository])
+		await jj(["git", "init", "--colocate", repository])
+		await Bun.write(
+			join(root, "agency.json"),
+			JSON.stringify({ version: 2, vcs: "jj" }),
+		)
+		await runTestEffect(
+			TaskService.pipe(
+				Effect.flatMap((service) =>
+					service.create(
+						{
+							id: "jj-example",
+							ticketUrl: null,
+							repo: "agency",
+							branch: "task/jj-example",
+							base: "main",
+						},
+						root,
+					),
+				),
+			),
+		)
+
+		const workspace = await runTestEffect(
+			WorktreeService.pipe(
+				Effect.flatMap((service) =>
+					service.materialize("jj-example", undefined, root),
+				),
+			),
+		)
+		const jjMetadata = await stat(join(workspace.writablePath!, ".jj"))
+		expect(jjMetadata.isFile() || jjMetadata.isDirectory()).toBe(true)
+		const inspection = await runTestEffect(
+			WorktreeService.pipe(
+				Effect.flatMap((service) =>
+					service.inspect("jj-example", undefined, root),
+				),
+			),
+		)
+		expect(inspection.conflicts).toEqual([])
+		expect(inspection.checkouts[0]).toMatchObject({
+			exists: true,
+			registered: true,
+			actualBranch: "task/jj-example",
+		})
+
+		await runTestEffect(
+			WorktreeService.pipe(
+				Effect.flatMap((service) =>
+					service.remove("jj-example", undefined, root),
+				),
+			),
+		)
+		expect(await Bun.file(workspace.writablePath!).exists()).toBe(false)
+	})
+
 	test("does not fetch the origin for an existing writable worktree", async () => {
 		await runTestEffect(
 			TaskService.pipe(
@@ -272,7 +343,7 @@ describe("WorktreeService", () => {
 			),
 		)
 		expect(
-			await Bun.file(join(workspace.writablePath, "README.md")).text(),
+			await Bun.file(join(workspace.writablePath!, "README.md")).text(),
 		).toBe("example\n")
 	})
 
@@ -599,7 +670,7 @@ pr: null
 
 		expect(
 			await Bun.file(
-				join(originalWorkspace.writablePath, "README.md"),
+				join(originalWorkspace.writablePath!, "README.md"),
 			).exists(),
 		).toBe(false)
 		const movedWorkspace = await runTestEffect(
@@ -613,10 +684,10 @@ pr: null
 			join(root, "tasks/promoted/phases/implementation/code/agency"),
 		)
 		expect(
-			await Bun.file(join(movedWorkspace.writablePath, "README.md")).text(),
+			await Bun.file(join(movedWorkspace.writablePath!, "README.md")).text(),
 		).toBe("example\n")
 		const status = Bun.spawnSync(
-			["git", "-C", movedWorkspace.writablePath, "status", "--porcelain"],
+			["git", "-C", movedWorkspace.writablePath!, "status", "--porcelain"],
 			{ stdout: "pipe", stderr: "pipe" },
 		)
 		expect(status.exitCode).toBe(0)
@@ -1072,7 +1143,7 @@ pr: null
 			),
 		)
 		await Bun.write(
-			join(workspace.writablePath, "uncommitted.txt"),
+			join(workspace.writablePath!, "uncommitted.txt"),
 			"keep me\n",
 		)
 
@@ -1084,7 +1155,7 @@ pr: null
 			),
 		).rejects.toThrow("Failed to remove worktree for 'agency'")
 		expect(
-			await Bun.file(join(workspace.writablePath, "uncommitted.txt")).text(),
+			await Bun.file(join(workspace.writablePath!, "uncommitted.txt")).text(),
 		).toBe("keep me\n")
 	})
 
@@ -1131,7 +1202,7 @@ pr: null
 			"--porcelain",
 		])
 		expect(new TextDecoder().decode(worktrees.stdout)).not.toContain(
-			workspace.writablePath,
+			workspace.writablePath!,
 		)
 		expect(
 			Bun.spawnSync([
@@ -1325,7 +1396,7 @@ pr: null
 			),
 		).rejects.toThrow("multiple Agency owners")
 		expect(
-			await Bun.file(join(workspace.writablePath, "README.md")).exists(),
+			await Bun.file(join(workspace.writablePath!, "README.md")).exists(),
 		).toBe(true)
 	})
 
@@ -1371,7 +1442,7 @@ pr: null
 			]),
 		)
 		expect(
-			await Bun.file(join(original.writablePath, "README.md")).exists(),
+			await Bun.file(join(original.writablePath!, "README.md")).exists(),
 		).toBe(true)
 
 		const rebuilt = await runTestEffect(
@@ -1383,7 +1454,7 @@ pr: null
 		)
 		expect(rebuilt.inspection.conflicts).toEqual([])
 		expect(
-			await Bun.file(join(original.writablePath, "README.md")).exists(),
+			await Bun.file(join(original.writablePath!, "README.md")).exists(),
 		).toBe(true)
 	})
 
@@ -1435,7 +1506,7 @@ pr: null
 			),
 		).rejects.toThrow("original worktrees were restored")
 		expect(
-			await Bun.file(join(workspace.writablePath, "README.md")).exists(),
+			await Bun.file(join(workspace.writablePath!, "README.md")).exists(),
 		).toBe(true)
 	})
 
@@ -1473,7 +1544,7 @@ pr: null
 			),
 		)
 		expect(plan.actions.join("\n")).toContain("worktree prune --expire now")
-		expect(plan.actions).toContain(`prepare ${workspace.writablePath}`)
+		expect(plan.actions).toContain(`prepare ${workspace.writablePath!}`)
 
 		const repaired = await runTestEffect(
 			WorktreeService.pipe(
@@ -1484,7 +1555,7 @@ pr: null
 		)
 		expect(repaired.inspection.conflicts).toEqual([])
 		expect(
-			await Bun.file(join(workspace.writablePath, "README.md")).exists(),
+			await Bun.file(join(workspace.writablePath!, "README.md")).exists(),
 		).toBe(true)
 		expect(
 			Bun.spawnSync([
@@ -1648,7 +1719,7 @@ pr: null
 			),
 		)
 		expect(
-			await Bun.file(join(workspace.writablePath, "README.md")).text(),
+			await Bun.file(join(workspace.writablePath!, "README.md")).text(),
 		).toBe("example\n")
 	})
 })