@markjaquith/agency 2.15.0 → 2.17.0

package/src/services/WorktreeService.test.ts

@@ -206,6 +206,18 @@ describe("WorktreeService", () => {
 		expect(
 			await Bun.file(join(root, "tasks", "valid-target", "code")).exists(),
 		).toBe(false)
+
+		await expect(
+			runTestEffect(
+				WorktreeService.pipe(
+					Effect.flatMap((service) =>
+						service.materialize("valid-target", undefined, root, {
+							force: true,
+						}),
+					),
+				),
+			),
+		).resolves.toMatchObject({ repo: "agency" })
 	})
 
 	test("uses a configured worktree creation command", async () => {

package/src/services/WorktreeService.ts

@@ -84,6 +84,10 @@ const isCommitId = (ref: string) => /^[0-9a-f]{40,64}$/i.test(ref)
 const originRef = (ref: string) =>
 	ref.replace(/^refs\/remotes\/origin\//, "").replace(/^origin\//, "")
 
+interface MaterializeOptions extends BaseCommandOptions {
+	readonly force?: boolean
+}
+
 export class WorktreeService extends Effect.Service<WorktreeService>()(
 	"WorktreeService",
 	{
@@ -92,7 +96,7 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 				taskId: string,
 				phaseId?: string,
 				startPath: string = process.cwd(),
-				options: BaseCommandOptions = {},
+				options: MaterializeOptions = {},
 			) =>
 				Effect.gen(function* () {
 					const fs = yield* FileSystemService
@@ -105,7 +109,7 @@ export class WorktreeService extends Effect.Service<WorktreeService>()(
 					const { root, config } = yield* workbase.loadConfig(startPath)
 					const report = yield* workbase.validate(root)
 					const validationIssue = report.issues[0]
-					if (validationIssue) {
+					if (validationIssue && !options.force) {
 						return yield* new WorktreeError({
 							message: `${validationIssue.path}: ${validationIssue.message}`,
 						})

package/src/test-utils.ts

@@ -16,6 +16,8 @@ import { IntegrationService } from "./services/IntegrationService"
 import { ContextService } from "./services/ContextService"
 import { GraphService } from "./services/GraphService"
 import { ClaimService } from "./services/ClaimService"
+import { SyncService } from "./services/SyncService"
+import { ReadinessService } from "./services/ReadinessService"
 
 export const createTempDir = () => mkdtemp(join(tmpdir(), "agency-test-"))
 
@@ -36,6 +38,8 @@ const TestLayer = Layer.mergeAll(
 	ContextService.Default,
 	GraphService.Default,
 	ClaimService.Default,
+	SyncService.Default,
+	ReadinessService.Default,
 )
 
 export async function runTestEffect<A, E>(