@markjaquith/agency 2.51.0 → 2.52.1

package/package.json

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

package/src/services/GraphMutationService.test.ts

@@ -158,6 +158,77 @@ describe("GraphMutationService", () => {
 		)
 	})
 
+	test("sets and clears pull request metadata with materialized code", async () => {
+		await mkdir(join(root, "tasks/alpha/code/agency"), { recursive: true })
+		await mkdir(join(root, "tasks/multi/phases/build/code/agency"), {
+			recursive: true,
+		})
+		const taskPr = "https://github.com/example/agency/pull/12"
+		const phasePr = "https://github.com/example/agency/pull/13"
+
+		await runTestEffect(
+			Effect.gen(function* () {
+				const mutations = yield* GraphMutationService
+				yield* mutations.updateTask("alpha", { pr: taskPr }, root)
+				yield* mutations.updatePhase("multi", "build", { pr: phasePr }, root)
+				const tasks = yield* TaskService
+				const phases = yield* PhaseService
+				expect((yield* tasks.show("alpha", root)).data).toMatchObject({
+					pr: taskPr,
+				})
+				expect((yield* phases.show("multi", "build", root)).data.pr).toBe(
+					phasePr,
+				)
+
+				yield* mutations.updateTask("alpha", { pr: null }, root)
+				yield* mutations.updatePhase("multi", "build", { pr: null }, root)
+				expect((yield* tasks.show("alpha", root)).data).toMatchObject({
+					pr: null,
+				})
+				expect((yield* phases.show("multi", "build", root)).data.pr).toBeNull()
+			}),
+		)
+	})
+
+	test("rejects checkout topology updates with materialized code", async () => {
+		await mkdir(join(root, "tasks/alpha/code/agency"), { recursive: true })
+		await mkdir(join(root, "tasks/multi/phases/build/code/agency"), {
+			recursive: true,
+		})
+		const topologyUpdates = [
+			{ repo: "docs" },
+			{ repos: [{ repo: "docs", ref: "main" }] },
+			{ branch: "feature/materialized" },
+			{ base: "develop" },
+		]
+
+		for (const updates of topologyUpdates) {
+			await expect(
+				runTestEffect(
+					Effect.gen(function* () {
+						return yield* (yield* GraphMutationService).updateTask(
+							"alpha",
+							updates,
+							root,
+						)
+					}),
+				),
+			).rejects.toThrow("materialized code")
+			await expect(
+				runTestEffect(
+					Effect.gen(function* () {
+						return yield* (yield* GraphMutationService).updatePhase(
+							"multi",
+							"build",
+							updates,
+							root,
+						)
+					}),
+				),
+			).rejects.toThrow("materialized code")
+		}
+	})
+
 	test("preserves dependency order and rejects cycles", async () => {
 		await runTestEffect(
 			Effect.gen(function* () {

package/src/services/GraphMutationService.ts

@@ -360,6 +360,12 @@ export class GraphMutationService extends Effect.Service<GraphMutationService>()
 						"base",
 						"pr",
 					].some((key) => updates[key as keyof TaskUpdates] !== undefined)
+					const checkoutTopologyChange = [
+						"repo",
+						"repos",
+						"branch",
+						"base",
+					].some((key) => updates[key as keyof TaskUpdates] !== undefined)
 					if ("review" in record.data && executionChange) {
 						return yield* new GraphMutationError({
 							message: `Review task '${id}' does not have writable execution metadata`,
@@ -390,7 +396,7 @@ export class GraphMutationService extends Effect.Service<GraphMutationService>()
 						})
 					}
 					if (
-						executionChange &&
+						checkoutTopologyChange &&
 						(yield* fs.isDirectory(join(dirname(record.path), "code")))
 					) {
 						return yield* new GraphMutationError({
@@ -506,8 +512,14 @@ export class GraphMutationService extends Effect.Service<GraphMutationService>()
 						"base",
 						"pr",
 					].some((key) => updates[key as keyof PhaseUpdates] !== undefined)
+					const checkoutTopologyChange = [
+						"repo",
+						"repos",
+						"branch",
+						"base",
+					].some((key) => updates[key as keyof PhaseUpdates] !== undefined)
 					if (
-						executionChange &&
+						checkoutTopologyChange &&
 						(yield* fs.isDirectory(join(dirname(record.path), "code")))
 					) {
 						return yield* new GraphMutationError({

package/src/services/VcsMigrationService.test.ts

@@ -3,6 +3,7 @@ import { Effect } from "effect"
 import { lstat, mkdir } from "node:fs/promises"
 import { join } from "node:path"
 import { cleanupTempDir, createTempDir, runTestEffect } from "../test-utils"
+import { ClaimService } from "./ClaimService"
 import { TaskService } from "./TaskService"
 import { VcsMigrationService } from "./VcsMigrationService"
 import { WorktreeService } from "./WorktreeService"
@@ -149,7 +150,7 @@ describe("VcsMigrationService", () => {
 		).toEqual([])
 	})
 
-	test("blocks active and dirty workspaces", async () => {
+	test("allows clean unclaimed working workspaces", async () => {
 		if (!Bun.which("jj")) return
 		await runTestEffect(
 			TaskService.pipe(
@@ -158,6 +159,41 @@ describe("VcsMigrationService", () => {
 				),
 			),
 		)
+		const migrated = await runTestEffect(
+			VcsMigrationService.pipe(
+				Effect.flatMap((service) =>
+					service.migrate("jj", root, { apply: true }),
+				),
+			),
+		)
+		expect(migrated.mode).toBe("apply")
+	})
+
+	test("blocks active claims", async () => {
+		if (!Bun.which("jj")) return
+		const inspected = await runTestEffect(
+			ClaimService.pipe(
+				Effect.flatMap((service) =>
+					service.inspect("example", undefined, root),
+				),
+			),
+		)
+		await runTestEffect(
+			ClaimService.pipe(
+				Effect.flatMap((service) =>
+					service.claim(
+						{
+							taskId: "example",
+							claimant: "orchestrator",
+							runner: "agent",
+							sessionId: "session-1",
+							revision: inspected.revision,
+						},
+						root,
+					),
+				),
+			),
+		)
 		await expect(
 			runTestEffect(
 				VcsMigrationService.pipe(
@@ -167,12 +203,10 @@ describe("VcsMigrationService", () => {
 				),
 			),
 		).rejects.toThrow("is active")
+	})
 
-		await runTestEffect(
-			TaskService.pipe(
-				Effect.flatMap((service) => service.setStatus("example", "open", root)),
-			),
-		)
+	test("blocks dirty workspaces", async () => {
+		if (!Bun.which("jj")) return
 		await Bun.write(join(root, "tasks/example/code/agency/DIRTY.md"), "dirty\n")
 		await expect(
 			runTestEffect(

package/src/services/VcsMigrationService.ts

@@ -243,11 +243,7 @@ const inspectMigration = (startPath: string, requestedTarget?: VcsKind) =>
 
 		const records = yield* executionRecords(root)
 		for (const record of records) {
-			if (
-				record.status === "working" ||
-				record.status === "delegated" ||
-				record.claimActive
-			) {
+			if (record.claimActive) {
 				const label = record.phaseId
 					? `phase:${record.taskId}/${record.phaseId}`
 					: `task:${record.taskId}`