@markjaquith/agency 2.71.16 → 2.71.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.71.16",
+  "version": "2.71.17",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",
@@ -77,6 +77,7 @@
     "benchmark:finish": "bun scripts/benchmark-finish.ts",
     "benchmark:phase": "bun scripts/benchmark-phase.ts",
     "benchmark:push": "bun scripts/benchmark-push.ts",
+    "benchmark:archive": "bun scripts/benchmark-archive.ts",
     "benchmark:sync": "bun scripts/benchmark-sync.ts",
     "benchmark:task": "bun scripts/benchmark-task.ts",
     "benchmark:validate": "bun scripts/benchmark-validate.ts",

package/src/services/ArchiveBulkService.test.ts

@@ -121,6 +121,35 @@ describe("ArchiveService bulk task archive", () => {
 		)
 	})
 
+	test("reuses loaded records while preflighting task worktrees", async () => {
+		for (const id of ["first", "second"]) {
+			await createTask(id)
+			await dropTask(id)
+		}
+		let taskReads = 0
+		const file = Bun.file(join(root, "tasks/first/TASK.md"))
+		const prototype = Object.getPrototypeOf(file) as {
+			text: () => Promise<string>
+			name: string
+		}
+		const originalText = prototype.text
+		prototype.text = function () {
+			if (this.name.endsWith("/TASK.md")) taskReads += 1
+			return originalText.call(this)
+		}
+
+		try {
+			const result = await archiveTasks(true)
+			expect(result.tasks.map((task) => task.disposition)).toEqual([
+				"planned",
+				"planned",
+			])
+			expect(taskReads).toBe(10)
+		} finally {
+			prototype.text = originalText
+		}
+	})
+
 	test("uses aggregate phase status and archives only when every phase is terminal", async () => {
 		await runTestEffect(
 			TaskService.pipe(

package/src/services/ArchiveService.ts

@@ -887,7 +887,10 @@ export class ArchiveService extends Effect.Service<ArchiveService>()(
 							})
 							continue
 						}
+					}
 
+					for (const context of contexts.values()) {
+						if (skipped.has(context.task.id)) continue
 						const removed: string[] = []
 						let preflightFailure: unknown
 						for (const unit of context.executionUnits) {
@@ -895,6 +898,10 @@ export class ArchiveService extends Effect.Service<ArchiveService>()(
 								.remove(unit.taskId, executionPhaseId(unit), root, {
 									dryRun: true,
 									persistResume: false,
+									task: context.task,
+									phase: unit.phaseId
+										? context.phases.find((phase) => phase.id === unit.phaseId)
+										: undefined,
 								})
 								.pipe(Effect.either)
 							if (Either.isLeft(result)) {
@@ -943,13 +950,13 @@ export class ArchiveService extends Effect.Service<ArchiveService>()(
 										"dirty" in conflict &&
 										conflict.dirty === true,
 								)
-							skipped.set(task.id, {
+							skipped.set(context.task.id, {
 								code: dirty ? "dirty-worktree" : "checkout-preflight-failed",
 								details: [message],
 							})
 							continue
 						}
-						removedByTask.set(task.id, [...new Set(removed)].sort())
+						removedByTask.set(context.task.id, [...new Set(removed)].sort())
 					}
 
 					const cohort = new Set(
@@ -1069,6 +1076,14 @@ export class ArchiveService extends Effect.Service<ArchiveService>()(
 													snapshots,
 													lockHeld: true,
 													persistResume: false,
+													task: contexts.get(unit.taskId)!.task,
+													phase: unit.phaseId
+														? contexts
+																.get(unit.taskId)!
+																.phases.find(
+																	(phase) => phase.id === unit.phaseId,
+																)
+														: undefined,
 												}),
 											)
 										}

package/src/services/WorktreeService.ts

@@ -284,6 +284,8 @@ interface RemoveOptions extends BaseCommandOptions {
 	readonly lockHeld?: boolean
 	readonly allowReferenceDrift?: boolean
 	readonly persistResume?: boolean
+	readonly task?: TaskRecord
+	readonly phase?: PhaseRecord
 }
 
 interface LifecycleOptions extends BaseCommandOptions {
@@ -1575,14 +1577,14 @@ const removeJj = (
 		const phases = yield* PhaseService
 		const backend = yield* versionControl.forWorkbase(root)
 		const inspection = yield* inspectExecution(taskId, phaseId, root)
-		const task = yield* tasks.show(taskId, root)
+		const task = options.task ?? (yield* tasks.show(taskId, root))
 		const execution =
 			"phases" in task.data && phaseId
-				? (yield* phases.show(taskId, phaseId, root)).data
+				? (options.phase ?? (yield* phases.show(taskId, phaseId, root))).data
 				: task.data
 		const phasePath =
 			"phases" in task.data && phaseId
-				? (yield* phases.show(taskId, phaseId, root)).path
+				? (options.phase ?? (yield* phases.show(taskId, phaseId, root))).path
 				: null
 		const resumePath = jjResumePath(task.path, phasePath)
 		if (yield* fs.exists(resumePath)) {
@@ -2909,7 +2911,7 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 											conflicts: blockingConflicts,
 										})
 									}
-									const task = yield* tasks.show(taskId, root)
+									const task = options.task ?? (yield* tasks.show(taskId, root))
 
 									let execution:
 										| {
@@ -2925,7 +2927,9 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 												message: `Task '${taskId}' has multiple phases; phase ID is required`,
 											})
 										}
-										const phase = yield* phases.show(taskId, phaseId, root)
+										const phase =
+											options.phase ??
+											(yield* phases.show(taskId, phaseId, root))
 										execution = phase.data
 										codePath = join(dirname(phase.path), "code")
 									} else {