@markjaquith/agency 2.71.25 → 2.71.27

package/package.json

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

package/src/cli.test.ts

@@ -507,6 +507,49 @@ describe("CLI", () => {
 		})
 	})
 
+	test("preserves the JSON error contract when archiving an already archived task", async () => {
+		const root = await createTempDir()
+		tempDirs.push(root)
+		await Bun.write(join(root, "agency.json"), '{"version":2}\n')
+		expect(
+			Bun.spawnSync(["git", "init", "--bare", join(root, "repos/agency")])
+				.exitCode,
+		).toBe(0)
+		await mkdir(join(root, "tasks/example"), { recursive: true })
+		await Bun.write(
+			join(root, "tasks/example/TASK.md"),
+			`---
+ticketUrl: null
+repo: agency
+branch: task/example
+base: main
+pr: null
+status: dropped
+---
+
+# Example
+`,
+		)
+
+		expect((await runCli(["archive", "task", "example"], root)).exitCode).toBe(
+			0,
+		)
+		const result = await runCli(["archive", "task", "example", "--json"], root)
+
+		expect(result.exitCode).toBe(1)
+		expect(result.stderr).toBe("")
+		expect(JSON.parse(result.stdout)).toEqual({
+			version: 1,
+			ok: false,
+			error: {
+				code: "TASK_ERROR",
+				message: "Task 'example' is already archived",
+				fields: {},
+				retryable: false,
+			},
+		})
+	})
+
 	test("rejects malformed input before running a command", async () => {
 		const parent = await createTempDir()
 		tempDirs.push(parent)

package/src/commands/archive.test.ts

@@ -93,6 +93,23 @@ describe("archive command", () => {
 		)
 	})
 
+	test("reports an already archived task", async () => {
+		await runTestEffect(
+			archive({ type: "task", args: ["example"], cwd: root, silent: true }),
+		)
+
+		await expect(
+			runTestEffect(
+				archive({
+					type: "task",
+					args: ["example"],
+					cwd: root,
+					silent: true,
+				}),
+			),
+		).rejects.toThrow("Task 'example' is already archived")
+	})
+
 	test("outputs one deterministic bulk archive object and a concise human summary", async () => {
 		const jsonLogs = await captureLogs(() =>
 			runTestEffect(

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/TaskService.ts

@@ -589,7 +589,9 @@ export class TaskService extends Effect.Service<TaskService>()("TaskService", {
 				const path = join(root, "tasks", validId, "TASK.md")
 				if (!(yield* fs.exists(path))) {
 					return yield* new TaskError({
-						message: `Task '${validId}' does not exist`,
+						message: (yield* fs.exists(archivedTaskDirectory(root, validId)))
+							? `Task '${validId}' is already archived`
+							: `Task '${validId}' does not exist`,
 					})
 				}
 				const content = yield* fs.readFile(path)