@markjaquith/agency 2.23.0 → 2.24.0

package/src/services/EpicService.ts

@@ -13,6 +13,7 @@ import {
 	parseFrontmatter,
 } from "../workbase/frontmatter"
 import { documentRevision } from "../workbase/document-revision"
+import { archivedEpicDirectory } from "../workbase/archive"
 
 class EpicError extends Data.TaggedError("EpicError")<{
 	readonly message: string
@@ -73,6 +74,11 @@ export class EpicService extends Effect.Service<EpicService>()("EpicService", {
 						message: `Epic '${validId}' already exists`,
 					})
 				}
+				if (yield* fs.exists(archivedEpicDirectory(root, validId))) {
+					return yield* new EpicError({
+						message: `Epic '${validId}' is archived; restore it before reusing this ID`,
+					})
+				}
 
 				for (const { repo: alias } of data.repos) {
 					if (!(yield* fs.exists(join(root, "repos", alias)))) {

package/src/services/PhaseService.ts

@@ -17,6 +17,7 @@ import {
 } 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
@@ -114,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)

package/src/services/TaskService.ts

@@ -17,6 +17,7 @@ import {
 } 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
@@ -85,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) {

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/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)