@markjaquith/agency 2.71.26 → 2.71.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.71.26",
+  "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/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)