@markjaquith/agency 2.22.0 → 2.24.0

package/src/services/PhaseService.ts

@@ -16,16 +16,19 @@ import {
 	parseFrontmatter,
 } from "../workbase/frontmatter"
 import { canTransitionStatus } from "../readiness"
+import { documentRevision } from "../workbase/document-revision"
+import { archivedPhaseDirectory } from "../workbase/archive"
 
 class PhaseError extends Data.TaggedError("PhaseError")<{
 	readonly message: string
 }> {}
 
-interface PhaseRecord {
+export interface PhaseRecord {
 	readonly taskId: string
 	readonly id: string
 	readonly path: string
 	readonly content: string
+	readonly revision: string
 	readonly data: PhaseData
 }
 
@@ -112,6 +115,11 @@ export class PhaseService extends Effect.Service<PhaseService>()(
 							message: `Phase '${id}' already exists on task '${taskId}'`,
 						})
 					}
+					if (yield* fs.exists(archivedPhaseDirectory(root, taskId, id))) {
+						return yield* new PhaseError({
+							message: `Phase '${id}' on task '${taskId}' is archived; restore it before reusing this ID`,
+						})
+					}
 					const knownPhases = new Set(
 						isMultiPhase
 							? task.data.phases.map((phase) => phase.id)
@@ -261,7 +269,14 @@ export class PhaseService extends Effect.Service<PhaseService>()(
 							task.path,
 							formatMarkdownDocument(convertedTaskData, parsedTask.body),
 						)
-						return { taskId, id, path, content, data } satisfies PhaseRecord
+						return {
+							taskId,
+							id,
+							path,
+							content,
+							revision: documentRevision(content),
+							data,
+						} satisfies PhaseRecord
 					}
 
 					yield* fs.createDirectory(directory)
@@ -283,7 +298,14 @@ export class PhaseService extends Effect.Service<PhaseService>()(
 						formatMarkdownDocument(updatedTaskData, parsedTask.body),
 					)
 
-					return { taskId, id, path, content, data } satisfies PhaseRecord
+					return {
+						taskId,
+						id,
+						path,
+						content,
+						revision: documentRevision(content),
+						data,
+					} satisfies PhaseRecord
 				}),
 
 			list: (taskId: string, startPath: string = process.cwd()) =>
@@ -311,6 +333,7 @@ export class PhaseService extends Effect.Service<PhaseService>()(
 							id: entry.name,
 							path,
 							content,
+							revision: documentRevision(content),
 							data,
 						})
 					}
@@ -363,7 +386,12 @@ export class PhaseService extends Effect.Service<PhaseService>()(
 					const data = { ...record.data, status: validStatus }
 					const content = formatMarkdownDocument(data, parsed.body)
 					yield* fs.writeFile(record.path, content)
-					return { ...record, content, data } satisfies PhaseRecord
+					return {
+						...record,
+						content,
+						revision: documentRevision(content),
+						data,
+					} satisfies PhaseRecord
 				}),
 		}),
 	},

package/src/services/TaskService.ts

@@ -16,6 +16,8 @@ import {
 	parseFrontmatter,
 } from "../workbase/frontmatter"
 import { canTransitionStatus } from "../readiness"
+import { documentRevision } from "../workbase/document-revision"
+import { archivedTaskDirectory } from "../workbase/archive"
 
 class TaskError extends Data.TaggedError("TaskError")<{
 	readonly message: string
@@ -25,6 +27,7 @@ interface TaskRecord {
 	readonly id: string
 	readonly path: string
 	readonly content: string
+	readonly revision: string
 	readonly data: TaskData
 }
 
@@ -83,6 +86,11 @@ export class TaskService extends Effect.Service<TaskService>()("TaskService", {
 						message: `Task '${id}' already exists`,
 					})
 				}
+				if (yield* fs.exists(archivedTaskDirectory(root, id))) {
+					return yield* new TaskError({
+						message: `Task '${id}' is archived; restore it before reusing this ID`,
+					})
+				}
 
 				let data: TaskData
 				if (input.multiPhase) {
@@ -158,7 +166,13 @@ export class TaskService extends Effect.Service<TaskService>()("TaskService", {
 					yield* fs.writeFile(parentEpic.path, updated)
 				}
 
-				return { id, path, content, data } satisfies TaskRecord
+				return {
+					id,
+					path,
+					content,
+					revision: documentRevision(content),
+					data,
+				} satisfies TaskRecord
 			}),
 
 		list: (startPath: string = process.cwd()) =>
@@ -178,7 +192,13 @@ export class TaskService extends Effect.Service<TaskService>()("TaskService", {
 					const content = yield* fs.readFile(path)
 					const parsed = yield* parseFrontmatter(content, path)
 					const data = yield* decodeTask(parsed.data)
-					records.push({ id: entry.name, path, content, data })
+					records.push({
+						id: entry.name,
+						path,
+						content,
+						revision: documentRevision(content),
+						data,
+					})
 				}
 				return records
 			}),
@@ -233,7 +253,12 @@ export class TaskService extends Effect.Service<TaskService>()("TaskService", {
 				const data = { ...record.data, status: validStatus }
 				const content = formatMarkdownDocument(data, parsed.body)
 				yield* fs.writeFile(record.path, content)
-				return { ...record, content, data } satisfies TaskRecord
+				return {
+					...record,
+					content,
+					revision: documentRevision(content),
+					data,
+				} satisfies TaskRecord
 			}),
 	}),
 }) {}

package/src/services/WorktreeService.ts

@@ -88,6 +88,8 @@ interface MaterializeOptions extends BaseCommandOptions {
 	readonly force?: boolean
 }
 
+interface RemoveOptions extends BaseCommandOptions {}
+
 export class WorktreeService extends Effect.Service<WorktreeService>()(
 	"WorktreeService",
 	{
@@ -558,6 +560,7 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 				taskId: string,
 				phaseId?: string,
 				startPath: string = process.cwd(),
+				options: RemoveOptions = {},
 			) =>
 				Effect.gen(function* () {
 					const fs = yield* FileSystemService
@@ -592,11 +595,22 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 					}
 
 					const codeDirectoryExists = yield* fs.isDirectory(codePath)
-					const removed: string[] = []
-					for (const alias of [
+					const aliases = [
 						execution.repo,
 						...(execution.repos ?? []).map((reference) => reference.repo),
-					]) {
+					]
+					if (codeDirectoryExists) {
+						const unmanaged = (yield* fs.readDirectory(codePath)).filter(
+							(entry) => !aliases.includes(entry.name),
+						)
+						if (unmanaged.length > 0) {
+							return yield* new WorktreeError({
+								message: `Cannot remove ${codePath}; it contains unmanaged entries: ${unmanaged.map((entry) => entry.name).join(", ")}`,
+							})
+						}
+					}
+					const removed: string[] = []
+					for (const alias of aliases) {
 						const repositoryPath = join(root, "repos", alias)
 						const checkoutPath = join(codePath, alias)
 						const listed = yield* fs.runCommand(
@@ -643,6 +657,19 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 							}
 							continue
 						}
+						if (checkoutExists) {
+							const status = yield* fs.runCommand(
+								["git", "-C", checkoutPath, "status", "--porcelain"],
+								{ captureOutput: true },
+							)
+							if (status.exitCode !== 0 || status.stdout.trim()) {
+								return yield* new WorktreeError({
+									message: `Failed to remove worktree for '${alias}': worktree has uncommitted changes`,
+								})
+							}
+							removed.push(checkoutPath)
+						}
+						if (options.dryRun) continue
 
 						const result = yield* fs.runCommand(
 							[
@@ -661,10 +688,13 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 								message: `Failed to remove worktree for '${alias}': ${result.stderr}`,
 							})
 						}
-						if (checkoutExists) removed.push(checkoutPath)
 					}
 
-					if (codeDirectoryExists && (yield* fs.isDirectory(codePath))) {
+					if (
+						!options.dryRun &&
+						codeDirectoryExists &&
+						(yield* fs.isDirectory(codePath))
+					) {
 						const remaining = yield* fs.readDirectory(codePath)
 						if (remaining.length > 0) {
 							return yield* new WorktreeError({

package/src/work-view.ts

@@ -23,6 +23,7 @@ export interface WorkViewRow {
 	readonly kind: "epic" | "task" | "phase"
 	readonly id: string
 	readonly key: string
+	readonly revision: string
 	readonly parent: string
 	readonly status: WorkStatus
 	readonly readiness: "ready" | "blocked" | "waiting" | "terminal"
@@ -91,6 +92,7 @@ const rowFor = (
 		kind: node.kind,
 		id,
 		key: node.key,
+		revision: node.data.sha256,
 		parent,
 		status: node.status,
 		readiness: readinessLabel(node),

package/src/workbase/archive.ts

@@ -0,0 +1,18 @@
+import { join } from "node:path"
+
+const lifecycleManifestName = ".agency-lifecycle.json"
+
+export const archivedEpicDirectory = (root: string, id: string) =>
+	join(root, "archive", "epics", id)
+
+export const archivedTaskDirectory = (root: string, id: string) =>
+	join(root, "archive", "tasks", id)
+
+export const archivedPhaseDirectory = (
+	root: string,
+	taskId: string,
+	id: string,
+) => join(archivedTaskDirectory(root, taskId), "phases", id)
+
+export const lifecycleManifestPath = (directory: string) =>
+	join(directory, lifecycleManifestName)

package/src/workbase/document-revision.ts

@@ -1,2 +1,18 @@
+import { Data } from "effect"
+
 export const documentRevision = (content: string) =>
 	new Bun.CryptoHasher("sha256").update(content).digest("hex")
+
+export const isDocumentRevision = (revision: string) =>
+	/^[a-f0-9]{64}$/.test(revision)
+
+export class RevisionConflictError extends Data.TaggedError(
+	"RevisionConflictError",
+)<{
+	readonly message: string
+	readonly path: string
+	readonly target?: string
+	readonly expectedRevision: string
+	readonly currentRevision: string
+	readonly claim?: unknown
+}> {}