@markjaquith/agency 2.24.0 → 2.25.0

package/cli.ts

@@ -683,6 +683,7 @@ try {
 	}
 	if (error instanceof Error) {
 		let message = error.message
+		let details: any = error
 
 		// Handle Effect FiberFailure errors that wrap tagged errors
 		// When the message is generic "An error has occurred", try to extract the actual error
@@ -695,6 +696,7 @@ try {
 				const cause = (error as any)[causeSymbol]
 				if (cause && cause._tag === "Fail" && cause.failure) {
 					const failure = cause.failure
+					details = failure
 					// Try common error message patterns
 					message =
 						failure.message ||
@@ -705,6 +707,14 @@ try {
 				}
 			}
 		}
+		for (const [field, label] of [
+			["completed", "Completed"],
+			["rolledBack", "Rolled back"],
+			["manualRecovery", "Manual recovery"],
+		] as const) {
+			if (Array.isArray(details[field]) && details[field].length > 0)
+				message += `\n${label}: ${details[field].join("; ")}`
+		}
 
 		console.error(`ⓘ ${message}`)
 	} else {

package/package.json

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

package/src/cli-parser.test.ts

@@ -292,6 +292,15 @@ describe("strict CLI parsing", () => {
 		)
 	})
 
+	test("accepts archive dry-run", () => {
+		expect(parseCli(["archive", "task", "example", "--dry-run"])).toMatchObject(
+			{
+				commandName: "archive",
+				values: { "dry-run": true },
+			},
+		)
+	})
+
 	test("validates revision-guarded claim operations", () => {
 		const revision = "0".repeat(64)
 		expect(

package/src/commands/archive.test.ts

@@ -63,6 +63,28 @@ describe("archive command", () => {
 		})
 	})
 
+	test("preflights an archive without moving the task", async () => {
+		const logs = await captureLogs(() =>
+			runTestEffect(
+				archive({
+					type: "task",
+					args: ["example"],
+					cwd: root,
+					dryRun: true,
+					json: true,
+				}),
+			),
+		)
+
+		expect(JSON.parse(logs[0]!).dryRun).toBe(true)
+		expect(await Bun.file(join(root, "tasks/example/TASK.md")).exists()).toBe(
+			true,
+		)
+		expect(await Bun.file(join(root, "archive/tasks/example")).exists()).toBe(
+			false,
+		)
+	})
+
 	test("requires a supported work item type", async () => {
 		await expect(
 			runTestEffect(archive({ args: [], cwd: root, silent: true })),

package/src/commands/archive.ts

@@ -112,7 +112,9 @@ export const archive = (options: ArchiveOptions) =>
 		log(
 			options.json
 				? JSON.stringify(result, null, 2)
-				: `${result.dryRun ? "Would archive" : "Archived"} ${result.kind} '${result.id}' to ${result.path}`,
+				: result.dryRun
+					? `Would archive ${result.kind} '${result.id}' to ${result.path}`
+					: `Archived ${result.kind} '${result.id}' to ${result.path}`,
 		)
 	})
 

package/src/services/ArchiveService.test.ts

@@ -850,4 +850,63 @@ describe("ArchiveService", () => {
 			),
 		).rejects.toThrow("is archived; restore it")
 	})
+
+	test("preflights every phase worktree before removing any of them", async () => {
+		await runTestEffect(
+			TaskService.pipe(
+				Effect.flatMap((service) =>
+					service.create(
+						{
+							id: "multi-dirty",
+							ticketUrl: "https://example.com/task",
+							multiPhase: true,
+						},
+						root,
+					),
+				),
+			),
+		)
+		for (const id of ["clean", "dirty"]) {
+			await runTestEffect(
+				PhaseService.pipe(
+					Effect.flatMap((service) =>
+						service.create(
+							{
+								taskId: "multi-dirty",
+								id,
+								repo: "agency",
+								branch: `task/${id}`,
+								base: "main",
+							},
+							root,
+						),
+					),
+				),
+			)
+			await runTestEffect(
+				WorktreeService.pipe(
+					Effect.flatMap((service) =>
+						service.materialize("multi-dirty", id, root),
+					),
+				),
+			)
+		}
+		await Bun.write(
+			join(root, "tasks/multi-dirty/phases/dirty/code/agency/dirty.txt"),
+			"keep me\n",
+		)
+
+		await expect(
+			runTestEffect(
+				ArchiveService.pipe(
+					Effect.flatMap((service) => service.archiveTask("multi-dirty", root)),
+				),
+			),
+		).rejects.toThrow("uncommitted changes")
+		expect(
+			await Bun.file(
+				join(root, "tasks/multi-dirty/phases/clean/code/agency/README.md"),
+			).exists(),
+		).toBe(true)
+	})
 })