@markjaquith/agency 2.71.24 → 2.71.26

package/package.json

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

package/src/commands/pr.test.ts

@@ -148,6 +148,33 @@ status: open
 		return root
 	}
 
+	const createReviewWorkbase = async () => {
+		const root = join(tempRoot, "review-workbase")
+		await write(root, "agency.json", '{"version":2}\n')
+		await mkdir(join(root, "repos/agency"), { recursive: true })
+		await mkdir(join(root, "tasks/review/code/agency"), { recursive: true })
+		await write(
+			root,
+			"tasks/review/TASK.md",
+			`---
+ticketUrl: null
+description: Review a branch
+review:
+  repo: agency
+  source:
+    kind: branch
+    ref: refs/heads/review
+  commit: 0123456789abcdef0123456789abcdef01234567
+  refreshedAt: 2026-08-19T00:00:00.000Z
+status: working
+---
+
+# Review
+`,
+		)
+		return root
+	}
+
 	test("creates and records an Agency pull request", async () => {
 		const url = "https://github.com/markjaquith/agency/pull/123"
 		let received: unknown[] = []
@@ -221,6 +248,19 @@ status: open
 		])
 	})
 
+	test("focuses a review task invocation on its review checkout", async () => {
+		const root = await createReviewWorkbase()
+		const task = join(root, "tasks/review")
+
+		expect(await runTestEffect(pr(["view", "--web"], task))).toBe(0)
+		expect(await captured()).toEqual([
+			await realpath(join(task, "code/agency")),
+			"pr",
+			"view",
+			"--web",
+		])
+	})
+
 	test("injects the execution branch and repository for jj targets", async () => {
 		const root = await createExecutionWorkbase("jj")
 		const task = join(root, "tasks/single")

package/src/commands/pr.ts

@@ -98,28 +98,31 @@ export const pr = (args: readonly string[], cwd: string = process.cwd()) =>
 			context?.validation.valid && context.workspace?.writable?.materialized
 				? context.authority.writable?.checkoutPath
 				: null
-		const focusedCwd = writableCheckout ?? invocationCwd
+		const reviewCheckout =
+			context?.validation.valid && context.review?.checkout?.materialized
+				? context.review.checkout.checkoutPath
+				: null
+		const focusedCheckout = writableCheckout ?? reviewCheckout
+		const focusedCwd = focusedCheckout ?? invocationCwd
 		let forwardedArgs = args
 		let environment: Record<string, string> = {}
-		if (
-			writableCheckout &&
-			context?.workbase.vcs === "jj" &&
-			context.authority.writable
-		) {
-			const execution =
-				context.documents?.phase?.data ?? context.documents?.task?.data
-			const { config } = yield* workbase.loadConfig(context.workbase.root)
-			const remote =
-				config.repositories?.[context.authority.writable.repo]?.remote
-			if (execution && "branch" in execution && remote) {
-				forwardedArgs = withJjContext(
-					args,
-					execution.branch,
-					repositoryFromRemote(remote),
-				)
+		if (focusedCheckout && context?.workbase.vcs === "jj") {
+			if (writableCheckout && context.authority.writable) {
+				const execution =
+					context.documents?.phase?.data ?? context.documents?.task?.data
+				const { config } = yield* workbase.loadConfig(context.workbase.root)
+				const remote =
+					config.repositories?.[context.authority.writable.repo]?.remote
+				if (execution && "branch" in execution && remote) {
+					forwardedArgs = withJjContext(
+						args,
+						execution.branch,
+						repositoryFromRemote(remote),
+					)
+				}
 			}
 			const backend = yield* versionControl.forWorkbase(context.workbase.root)
-			environment = yield* backend.gitEnvironment(writableCheckout)
+			environment = yield* backend.gitEnvironment(focusedCheckout)
 		}
 		const result = yield* fs.runCommand(["gh", "pr", ...forwardedArgs], {
 			cwd: focusedCwd,

package/src/services/SyncService.test.ts

@@ -1030,10 +1030,16 @@ JSON
 			expect(
 				applied.changes.some(
 					(change) =>
-						change.kind === "record-pr" || change.kind === "mark-done",
+						change.kind === "record-pr" ||
+						change.kind === "mark-done" ||
+						change.kind === "materialize-workspace",
 				),
 			).toBe(false)
+			expect(applied.executions[0]?.checkouts).toEqual([])
 		}
+		expect(
+			await Bun.file(join(root, "tasks/non-pr/code/agency")).exists(),
+		).toBe(false)
 
 		const task = await runTestEffect(
 			TaskService.pipe(
@@ -1080,15 +1086,6 @@ JSON
 					Effect.flatMap((service) => service.materialize(id, undefined, root)),
 				),
 			)
-			await runTestEffect(
-				TaskService.pipe(
-					Effect.flatMap((service) =>
-						service.setStatus(id, "done", root, {
-							summary: `Completed ${id}`,
-						}),
-					),
-				),
-			)
 		}
 
 		const callsPath = join(root, "workspace-list-calls")

package/src/services/SyncService.ts

@@ -506,9 +506,8 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 						? null
 						: mergedPullRequestFromGitHub(data, query)
 					const skipCheckoutReconciliation =
-						remoteMergedPr !== null &&
-						data.claim?.state !== "active" &&
-						!data.completion
+						Boolean(data.completion) ||
+						(remoteMergedPr !== null && data.claim?.state !== "active")
 					let materialize = false
 					let workspaceConflict = false
 					const declared: readonly (