@markjaquith/agency 2.54.1 → 2.54.2

package/package.json

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

package/src/services/DoctorService.ts

@@ -10,6 +10,7 @@ import { RepositoryService } from "./RepositoryService"
 import { TaskService } from "./TaskService"
 import { WorkbaseService } from "./WorkbaseService"
 import { WorktreeService } from "./WorktreeService"
+import { VersionControlService } from "./VersionControlService"
 
 type DoctorCheckLevel = "error" | "warning" | "optional"
 
@@ -87,7 +88,9 @@ export class DoctorService extends Effect.Service<DoctorService>()(
 					const tasks = yield* TaskService
 					const workbases = yield* WorkbaseService
 					const worktrees = yield* WorktreeService
+					const versionControl = yield* VersionControlService
 					const { root, config } = yield* workbases.loadConfig(startPath)
+					const backend = yield* versionControl.forWorkbase(root)
 					const checks: DoctorCheck[] = []
 					const add = (
 						check: Omit<DoctorCheck, "remediation"> & {
@@ -409,32 +412,8 @@ export class DoctorService extends Effect.Service<DoctorService>()(
 						}
 
 						for (const ref of [...(refs.get(repository.alias) ?? [])].sort()) {
-							const local = yield* fs.runCommand(
-								[
-									"git",
-									"-C",
-									repository.path,
-									"rev-parse",
-									"--verify",
-									`${ref}^{commit}`,
-								],
-								{ captureOutput: true },
-							)
-							const remote =
-								local.exitCode === 0
-									? local
-									: yield* fs.runCommand(
-											[
-												"git",
-												"-C",
-												repository.path,
-												"rev-parse",
-												"--verify",
-												`origin/${ref}^{commit}`,
-											],
-											{ captureOutput: true },
-										)
-							const found = local.exitCode === 0 || remote.exitCode === 0
+							const found =
+								(yield* backend.resolveRevision(repository.path, ref)) !== null
 							add({
 								id: `ref.${repository.alias}.${ref}`,
 								category: "ref",

package/src/services/ReviewService.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test"
 import { Effect } from "effect"
-import { mkdir } from "node:fs/promises"
+import { mkdir, rm } from "node:fs/promises"
 import { join } from "node:path"
 import { cleanupTempDir, createTempDir, runTestEffect } from "../test-utils"
 import { TaskService } from "./TaskService"
@@ -13,6 +13,7 @@ import { PhaseService } from "./PhaseService"
 import { ArchiveService } from "./ArchiveService"
 import { ClaimService } from "./ClaimService"
 import { SyncService } from "./SyncService"
+import { DoctorService } from "./DoctorService"
 import { task as taskCommand } from "../commands/task"
 
 const git = async (args: string[], cwd?: string) => {
@@ -26,6 +27,16 @@ const git = async (args: string[], cwd?: string) => {
 		throw new Error(await new Response(child.stderr).text())
 }
 
+const jj = async (args: string[]) => {
+	const child = Bun.spawn(["jj", ...args], {
+		stdout: "pipe",
+		stderr: "pipe",
+	})
+	await child.exited
+	if (child.exitCode !== 0)
+		throw new Error(await new Response(child.stderr).text())
+}
+
 describe("ReviewService", () => {
 	let root: string
 	let source: string
@@ -151,6 +162,78 @@ describe("ReviewService", () => {
 		expect(new TextDecoder().decode(oldPins.stdout).trim()).toBe("")
 	})
 
+	test("imports jj reviews for creation, diagnostics, materialization, and refresh", 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 git(["switch", "-c", "jj-review"], source)
+		await Bun.write(join(source, "README.md"), "jj review one\n")
+		await git(["commit", "-am", "jj review one"], source)
+		await jj(["git", "init", "--colocate", repository])
+		await Bun.write(
+			join(root, "agency.json"),
+			JSON.stringify({ version: 2, vcs: "jj" }),
+		)
+
+		await runTestEffect(
+			taskCommand({
+				subcommand: "create",
+				args: ["jj-review"],
+				review: "agency",
+				ref: "jj-review",
+				cwd: root,
+				silent: true,
+			}),
+		)
+		const created = await runTestEffect(
+			TaskService.pipe(
+				Effect.flatMap((service) => service.show("jj-review", root)),
+			),
+		)
+		const original = "review" in created.data ? created.data.review.commit : ""
+
+		const context = await runTestEffect(
+			ContextService.pipe(
+				Effect.flatMap((service) =>
+					service.get({ target: "jj-review", cwd: root }),
+				),
+			),
+		)
+		expect(context.workspace!.warnings).toEqual([])
+		expect(context.review?.checkout?.resolvedCommit).toBe(original)
+
+		const doctor = await runTestEffect(
+			DoctorService.pipe(Effect.flatMap((service) => service.inspect(root))),
+		)
+		expect(
+			doctor.checks.find((check) => check.id === `ref.agency.${original}`),
+		).toMatchObject({ status: "pass" })
+
+		const workspace = await runTestEffect(
+			WorktreeService.pipe(
+				Effect.flatMap((service) =>
+					service.materialize("jj-review", undefined, root),
+				),
+			),
+		)
+		expect(
+			await Bun.file(join(workspace.reviewPath!, "README.md")).text(),
+		).toBe("jj review one\n")
+
+		await Bun.write(join(source, "README.md"), "jj review two\n")
+		await git(["commit", "-am", "jj review two"], source)
+		const refreshed = await runTestEffect(
+			ReviewService.pipe(
+				Effect.flatMap((service) => service.refresh("jj-review", root)),
+			),
+		)
+		expect(refreshed.changed).toBe(true)
+		expect(
+			await Bun.file(join(workspace.reviewPath!, "README.md")).text(),
+		).toBe("jj review two\n")
+	})
+
 	test("rejects delivery and phase operations even when forced", async () => {
 		await createReview()
 		await expect(

package/src/services/ReviewService.ts

@@ -1,4 +1,4 @@
-import { Data, Effect, Layer } from "effect"
+import { Data, Effect, Either, Layer } from "effect"
 import { randomUUID } from "node:crypto"
 import { lstat, mkdir } from "node:fs/promises"
 import { dirname } from "node:path"
@@ -15,6 +15,7 @@ import {
 	GitVersionControlService,
 	JjVersionControlService,
 	VersionControlService,
+	type VersionControlBackend,
 } from "./VersionControlService"
 import { withWorktreeLocks } from "./WorktreeLock"
 import {
@@ -160,7 +161,11 @@ const normalizeBranch = (input: string, repositoryPath: string) =>
 		return `refs/heads/${name}`
 	})
 
-const fetchCommit = (repoPath: string, sourceRef: string) =>
+const fetchCommit = (
+	repoPath: string,
+	sourceRef: string,
+	backend: VersionControlBackend,
+) =>
 	Effect.gen(function* () {
 		const fs = yield* FileSystemService
 		const temporaryRef = `refs/agency/review-fetch/${process.pid}-${randomUUID()}`
@@ -196,6 +201,17 @@ const fetchCommit = (repoPath: string, sourceRef: string) =>
 			],
 			{ captureOutput: true },
 		)
+		const commit = resolved.stdout.trim()
+		if (resolved.exitCode !== 0 || !/^[a-f0-9]{40}$/.test(commit)) {
+			yield* fs.runCommand(
+				["git", "-C", repoPath, "update-ref", "-d", temporaryRef],
+				{ captureOutput: true },
+			)
+			return yield* new ReviewError({
+				message: `Review source '${sourceRef}' did not resolve to a commit`,
+			})
+		}
+		const imported = yield* Effect.either(backend.importGitRefs(repoPath))
 		const cleanup = yield* fs.runCommand(
 			["git", "-C", repoPath, "update-ref", "-d", temporaryRef],
 			{ captureOutput: true },
@@ -205,10 +221,10 @@ const fetchCommit = (repoPath: string, sourceRef: string) =>
 				message: `Failed to remove temporary review fetch ref: ${cleanup.stderr.trim()}`,
 			})
 		}
-		const commit = resolved.stdout.trim()
-		if (resolved.exitCode !== 0 || !/^[a-f0-9]{40}$/.test(commit)) {
+		if (Either.isLeft(imported)) {
 			return yield* new ReviewError({
-				message: `Review source '${sourceRef}' did not resolve to a commit`,
+				message: `Review source '${sourceRef}' was fetched but could not be imported into ${backend.kind}`,
+				cause: imported.left,
 			})
 		}
 		return commit
@@ -225,6 +241,8 @@ export class ReviewService extends Effect.Service<ReviewService>()(
 			) =>
 				Effect.gen(function* () {
 					const repositories = yield* RepositoryService
+					const versionControl = yield* VersionControlService
+					const backend = yield* versionControl.forWorkbase(startPath)
 					const repository = yield* repositories.show(repo, startPath)
 					if (!repository.remote || repository.states.includes("missing")) {
 						return yield* new ReviewError({
@@ -273,7 +291,7 @@ export class ReviewService extends Effect.Service<ReviewService>()(
 							message: "Exactly one review source is required",
 						})
 					}
-					const commit = yield* fetchCommit(repository.path, sourceRef)
+					const commit = yield* fetchCommit(repository.path, sourceRef, backend)
 					return {
 						repo,
 						source,

package/src/services/VersionControlService.ts

@@ -47,6 +47,9 @@ export interface VersionControlBackend {
 		remote?: string,
 		branch?: string,
 	) => Effect.Effect<void, unknown, any>
+	readonly importGitRefs: (
+		repositoryPath: string,
+	) => Effect.Effect<void, unknown, any>
 	readonly push: (
 		workspacePath: string,
 		remote: string,
@@ -240,6 +243,7 @@ export class GitVersionControlService extends Effect.Service<GitVersionControlSe
 							),
 						)
 					}),
+				importGitRefs: () => Effect.void,
 				push: (workspacePath, remote, branch) =>
 					Effect.gen(function* () {
 						const fs = yield* FileSystemService
@@ -333,18 +337,27 @@ export class JjVersionControlService extends Effect.Service<JjVersionControlServ
 				resolveRevision: (repositoryPath, revision) =>
 					Effect.gen(function* () {
 						const fs = yield* FileSystemService
-						const result = yield* fs.runCommand(
-							jjCommand(repositoryPath, [
-								"log",
-								"--ignore-working-copy",
-								"--no-graph",
-								"-r",
-								revision,
-								"-T",
-								'commit_id ++ "\\n"',
-							]),
-							{ captureOutput: true },
-						)
+						const resolve = () =>
+							fs.runCommand(
+								jjCommand(repositoryPath, [
+									"log",
+									"--ignore-working-copy",
+									"--no-graph",
+									"-r",
+									revision,
+									"-T",
+									'commit_id ++ "\\n"',
+								]),
+								{ captureOutput: true },
+							)
+						let result = yield* resolve()
+						if (result.exitCode !== 0 || !result.stdout.trim()) {
+							const imported = yield* fs.runCommand(
+								jjCommand(repositoryPath, ["git", "import"]),
+								{ captureOutput: true },
+							)
+							if (imported.exitCode === 0) result = yield* resolve()
+						}
 						return result.exitCode === 0 ? result.stdout.trim() || null : null
 					}),
 				workspaceHead: (workspacePath) =>
@@ -430,6 +443,16 @@ export class JjVersionControlService extends Effect.Service<JjVersionControlServ
 							),
 						)
 					}),
+				importGitRefs: (repositoryPath) =>
+					Effect.gen(function* () {
+						const fs = yield* FileSystemService
+						yield* requireSuccess(
+							"Failed to import Git refs into jj",
+							fs.runCommand(jjCommand(repositoryPath, ["git", "import"]), {
+								captureOutput: true,
+							}),
+						)
+					}),
 				push: (workspacePath, remote, branch) =>
 					Effect.gen(function* () {
 						const fs = yield* FileSystemService

package/src/services/WorktreeService.test.ts

@@ -164,6 +164,44 @@ describe("WorktreeService", () => {
 		expect(await Bun.file(workspace.writablePath!).exists()).toBe(false)
 	})
 
+	test("recommends a repository fetch when jj cannot resolve a base", 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-missing",
+							ticketUrl: null,
+							repo: "agency",
+							branch: "task/jj-missing",
+							base: "absent-base",
+						},
+						root,
+					),
+				),
+			),
+		)
+
+		await expect(
+			runTestEffect(
+				WorktreeService.pipe(
+					Effect.flatMap((service) =>
+						service.materialize("jj-missing", undefined, root),
+					),
+				),
+			),
+		).rejects.toThrow("run 'agency repo fetch agency' and retry")
+	})
+
 	test("does not fetch the origin for an existing writable worktree", async () => {
 		await runTestEffect(
 			TaskService.pipe(

package/src/services/WorktreeService.ts

@@ -884,8 +884,12 @@ const materializeJj = (options: {
 					revision = yield* backend.resolveRevision(repositoryPath, base)
 				}
 				if (!revision) {
+					const recovery =
+						backend.kind === "jj"
+							? `; run 'agency repo fetch ${checkout.repo}' and retry`
+							: ""
 					return yield* new WorktreeError({
-						message: `${"branch" in checkout ? "Base" : "Reference"} '${"branch" in checkout ? base : checkout.ref}' for repository '${checkout.repo}' does not resolve to a commit`,
+						message: `${"branch" in checkout ? "Base" : "Reference"} '${"branch" in checkout ? base : checkout.ref}' for repository '${checkout.repo}' does not resolve to a commit${recovery}`,
 					})
 				}