@markjaquith/agency 2.20.0 → 2.21.0

package/src/services/WorkbaseService.ts

@@ -13,7 +13,6 @@ import {
 	TaskFrontmatter,
 	WorkbaseConfig,
 	WorkbaseRegistry,
-	type Dependency,
 	type EpicFrontmatter as EpicData,
 	type PhaseFrontmatter as PhaseData,
 	type TaskFrontmatter as TaskData,
@@ -22,6 +21,7 @@ import {
 } from "../workbase/schemas"
 import { validateWorktreeCreateCommand } from "../workbase/worktree-command"
 import { validateRunners } from "../workbase/runner-command"
+import { findDependencyCycles } from "../workbase/dependency-graph"
 
 class WorkbaseNotFoundError extends Data.TaggedError("WorkbaseNotFoundError")<{
 	readonly message: string
@@ -145,40 +145,6 @@ const writeRegistry = (
 		yield* fs.writeJSON(path, registry)
 	})
 
-const findCycles = (nodes: readonly Dependency[]): readonly string[] => {
-	const dependencies = new Map(
-		nodes.map((node) => [node.id, [...(node.dependsOn ?? [])]]),
-	)
-	const visiting = new Set<string>()
-	const visited = new Set<string>()
-	const cycles = new Set<string>()
-
-	const visit = (id: string) => {
-		if (visiting.has(id)) {
-			cycles.add(id)
-			return
-		}
-		if (visited.has(id)) {
-			return
-		}
-
-		visiting.add(id)
-		for (const dependency of dependencies.get(id) ?? []) {
-			if (dependencies.has(dependency)) {
-				visit(dependency)
-			}
-		}
-		visiting.delete(id)
-		visited.add(id)
-	}
-
-	for (const id of dependencies.keys()) {
-		visit(id)
-	}
-
-	return [...cycles].sort()
-}
-
 export class WorkbaseService extends Effect.Service<WorkbaseService>()(
 	"WorkbaseService",
 	{
@@ -693,7 +659,7 @@ export class WorkbaseService extends Effect.Service<WorkbaseService>()(
 								}
 							}
 						}
-						for (const cycle of findCycles(epic.data.tasks)) {
+						for (const cycle of findDependencyCycles(epic.data.tasks)) {
 							issue(epic.path, `Task dependency cycle includes '${cycle}'`)
 						}
 					}
@@ -739,7 +705,7 @@ export class WorkbaseService extends Effect.Service<WorkbaseService>()(
 									issue(task.path, `Unlisted phase '${phaseId}'`)
 								}
 							}
-							for (const cycle of findCycles(task.data.phases)) {
+							for (const cycle of findDependencyCycles(task.data.phases)) {
 								issue(task.path, `Phase dependency cycle includes '${cycle}'`)
 							}
 						} else if (actualPhaseIds.length > 0) {

package/src/test-utils.ts

@@ -18,6 +18,7 @@ import { GraphService } from "./services/GraphService"
 import { ClaimService } from "./services/ClaimService"
 import { SyncService } from "./services/SyncService"
 import { ReadinessService } from "./services/ReadinessService"
+import { GraphMutationService } from "./services/GraphMutationService"
 
 export const createTempDir = () => mkdtemp(join(tmpdir(), "agency-test-"))
 
@@ -40,6 +41,7 @@ const TestLayer = Layer.mergeAll(
 	ClaimService.Default,
 	SyncService.Default,
 	ReadinessService.Default,
+	GraphMutationService.Default,
 )
 
 export async function runTestEffect<A, E>(

package/src/workbase/dependency-graph.ts

@@ -0,0 +1,51 @@
+import type { Dependency } from "./schemas"
+
+export const findDependencyCycles = (
+	nodes: readonly Dependency[],
+): readonly string[] => {
+	const dependencies = new Map(
+		nodes.map((node) => [node.id, [...(node.dependsOn ?? [])]]),
+	)
+	const visiting = new Set<string>()
+	const visited = new Set<string>()
+	const cycles = new Set<string>()
+
+	const visit = (id: string) => {
+		if (visiting.has(id)) {
+			cycles.add(id)
+			return
+		}
+		if (visited.has(id)) return
+
+		visiting.add(id)
+		for (const dependency of dependencies.get(id) ?? []) {
+			if (dependencies.has(dependency)) visit(dependency)
+		}
+		visiting.delete(id)
+		visited.add(id)
+	}
+
+	for (const id of dependencies.keys()) visit(id)
+	return [...cycles].sort()
+}
+
+export const validateDependencies = (
+	nodes: readonly Dependency[],
+	label: string,
+): string | undefined => {
+	const singular = label.endsWith("s") ? label.slice(0, -1) : label
+	const ids = new Set(nodes.map((node) => node.id))
+	if (ids.size !== nodes.length) return `${label} IDs must be unique`
+	for (const node of nodes) {
+		for (const dependency of node.dependsOn ?? []) {
+			if (dependency === node.id) {
+				return `${singular} '${node.id}' cannot depend on itself`
+			}
+			if (!ids.has(dependency)) {
+				return `Unknown ${singular.toLowerCase()} dependency '${dependency}'`
+			}
+		}
+	}
+	const cycle = findDependencyCycles(nodes)[0]
+	return cycle ? `${singular} dependency cycle includes '${cycle}'` : undefined
+}