@markjaquith/agency 2.65.0 → 2.65.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.65.0",
+  "version": "2.65.1",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",

package/src/services/ArchiveBulkService.test.ts

@@ -17,6 +17,13 @@ const git = (args: readonly string[], cwd?: string) => {
 	}
 }
 
+const jj = (args: readonly string[], cwd?: string) => {
+	const result = Bun.spawnSync(["jj", ...args], { cwd })
+	if (result.exitCode !== 0) {
+		throw new Error(new TextDecoder().decode(result.stderr))
+	}
+}
+
 describe("ArchiveService bulk task archive", () => {
 	let root: string
 	let source: string
@@ -436,6 +443,98 @@ claim:
 		).toBe(true)
 	})
 
+	test("archives a jj working-copy commit preserved by its task bookmark", async () => {
+		if (!Bun.which("jj")) return
+		const repository = join(root, "repos/agency")
+		await rm(repository, { recursive: true, force: true })
+		git(["clone", source, repository])
+		jj(["git", "init", "--colocate", repository])
+		await Bun.write(
+			join(root, "agency.json"),
+			JSON.stringify({ version: 2, vcs: "jj" }),
+		)
+		await createTask("jj-bookmarked")
+		await dropTask("jj-bookmarked")
+		const workspace = await runTestEffect(
+			WorktreeService.pipe(
+				Effect.flatMap((service) =>
+					service.materialize("jj-bookmarked", undefined, root),
+				),
+			),
+		)
+		await Bun.write(join(workspace.writablePath!, "preserved.txt"), "keep\n")
+		jj(
+			["bookmark", "set", "task/jj-bookmarked", "-r", "@"],
+			workspace.writablePath!,
+		)
+
+		const preview = await archiveTasks(true)
+		expect(preview.tasks[0]).toMatchObject({
+			id: "jj-bookmarked",
+			disposition: "planned",
+			removedWorktrees: [workspace.writablePath!],
+		})
+		expect(
+			await Bun.file(join(workspace.writablePath!, "preserved.txt")).text(),
+		).toBe("keep\n")
+
+		const result = await archiveTasks()
+		expect(result.tasks[0]).toMatchObject({
+			id: "jj-bookmarked",
+			disposition: "archived",
+		})
+		expect(await Bun.file(workspace.writablePath!).exists()).toBe(false)
+		const preserved = Bun.spawnSync([
+			"jj",
+			"-R",
+			repository,
+			"file",
+			"show",
+			"-r",
+			"task/jj-bookmarked",
+			'root:"preserved.txt"',
+		])
+		if (preserved.exitCode !== 0) {
+			throw new Error(preserved.stderr.toString())
+		}
+		expect(preserved.stdout.toString()).toBe("keep\n")
+	})
+
+	test("archives a forgotten jj workspace preserved by its task bookmark", async () => {
+		if (!Bun.which("jj")) return
+		const repository = join(root, "repos/agency")
+		await rm(repository, { recursive: true, force: true })
+		git(["clone", source, repository])
+		jj(["git", "init", "--colocate", repository])
+		await Bun.write(
+			join(root, "agency.json"),
+			JSON.stringify({ version: 2, vcs: "jj" }),
+		)
+		await createTask("jj-stale")
+		await dropTask("jj-stale")
+		const workspace = await runTestEffect(
+			WorktreeService.pipe(
+				Effect.flatMap((service) =>
+					service.materialize("jj-stale", undefined, root),
+				),
+			),
+		)
+		await Bun.write(join(workspace.writablePath!, "preserved.txt"), "keep\n")
+		jj(["bookmark", "set", "task/jj-stale", "-r", "@"], workspace.writablePath!)
+		jj(["-R", repository, "workspace", "forget", "agency-jj-stale-task-agency"])
+
+		const result = await archiveTasks(true)
+
+		expect(result.tasks[0]).toMatchObject({
+			id: "jj-stale",
+			disposition: "planned",
+			removedWorktrees: [workspace.writablePath!],
+		})
+		expect(
+			await Bun.file(join(workspace.writablePath!, "preserved.txt")).text(),
+		).toBe("keep\n")
+	})
+
 	test("rolls back the entire cohort when application fails", async () => {
 		await runTestEffect(
 			EpicService.pipe(

package/src/services/WorktreeService.ts

@@ -474,7 +474,9 @@ const inspectExecution = (
 						: yield* backend.workspaceHead(checkoutPath)
 					: null
 				const dirty =
-					exists && atPath ? yield* backend.workspaceDirty(checkoutPath) : null
+					exists && atPath
+						? yield* backend.workspaceDirty(checkoutPath)
+						: (atPath?.dirty ?? null)
 				const expectedCommit =
 					"branch" in checkout && context?.skipWritableRevisionResolution
 						? actualCommit
@@ -1659,10 +1661,26 @@ const removeJj = (
 			bookmark: string
 		}[] = []
 		for (const checkout of inspection.checkouts) {
+			const repositoryPath = join(root, "repos", checkout.repo)
+			const registered = checkout.registeredPath
+				? (yield* backend.listWorkspaces(repositoryPath)).find(
+						(workspace) => workspace.path === checkout.registeredPath,
+					)
+				: undefined
 			if (checkout.dirty === true && options.persistResume === false) {
-				return yield* new WorktreeError({
-					message: `Failed to remove workspace for '${checkout.repo}': checkout has uncommitted changes`,
-				})
+				const preservedByBookmark =
+					checkout.kind === "writable" &&
+					registered?.commit !== null &&
+					registered?.commit !== undefined &&
+					(yield* backend.resolveRevision(
+						repositoryPath,
+						checkout.requestedRef,
+					)) === registered.commit
+				if (!preservedByBookmark) {
+					return yield* new WorktreeError({
+						message: `Failed to remove workspace for '${checkout.repo}': checkout has uncommitted changes`,
+					})
+				}
 			}
 			if (
 				checkout.exists &&
@@ -1673,7 +1691,6 @@ const removeJj = (
 					message: `Failed to remove workspace for '${checkout.repo}': checkout cleanliness could not be verified`,
 				})
 			}
-			const repositoryPath = join(root, "repos", checkout.repo)
 			if (!checkout.registeredPath) {
 				const recoveryRevision = recoverable.get(checkout.path)
 				if (!recoveryRevision) continue
@@ -1696,9 +1713,6 @@ const removeJj = (
 				})
 				continue
 			}
-			const registered = (yield* backend.listWorkspaces(repositoryPath)).find(
-				(workspace) => workspace.path === checkout.registeredPath,
-			)
 			if (!registered?.name || !checkout.actualCommit || !registered.commit) {
 				return yield* new WorktreeError({
 					message: `Cannot identify jj workspace at ${checkout.registeredPath}`,