@markjaquith/agency 2.50.0 → 2.52.0

package/src/test-utils.ts

@@ -21,6 +21,12 @@ import { ReadinessService } from "./services/ReadinessService"
 import { GraphMutationService } from "./services/GraphMutationService"
 import { DoctorService } from "./services/DoctorService"
 import { ReviewService } from "./services/ReviewService"
+import {
+	GitVersionControlService,
+	JjVersionControlService,
+	VersionControlService,
+} from "./services/VersionControlService"
+import { VcsMigrationService } from "./services/VcsMigrationService"
 
 export const createTempDir = () => mkdtemp(join(tmpdir(), "agency-test-"))
 
@@ -30,6 +36,10 @@ export const cleanupTempDir = (path: string) =>
 const TestLayer = Layer.mergeAll(
 	FileSystemService.Default,
 	WorkbaseService.Default,
+	GitVersionControlService.Default,
+	JjVersionControlService.Default,
+	VersionControlService.Default,
+	VcsMigrationService.Default,
 	RepositoryService.Default,
 	EpicService.Default,
 	TaskService.Default,

package/src/workbase/AGENTS.md

@@ -1,8 +1,8 @@
 # Agency Workbase
 
 This directory is an Agency workbase. Epics, tasks, and phases are durable
-Markdown documents; repository aliases and generated Git worktrees provide code
-access.
+Markdown documents; repository aliases and generated Git worktrees or jj
+workspaces provide code access according to the workbase's `vcs` setting.
 
 ## Bootstrap
 

package/src/workbase/schemas.ts

@@ -96,6 +96,7 @@ const DeliveryProvider = Schema.Struct({
 
 export const WorkbaseConfig = Schema.Struct({
 	version: Schema.Literal(2),
+	vcs: Schema.optional(Schema.Literal("git", "jj")),
 	repositories: Schema.optional(
 		Schema.Record({ key: RepositoryAlias, value: RepositoryDeclaration }),
 	),

package/src/workbase/version-control.ts

@@ -0,0 +1,5 @@
+export type VersionControlKind = "git" | "jj"
+
+export const preferredVersionControl = (
+	which: (executable: string) => string | null = Bun.which,
+): VersionControlKind => (which("jj") ? "jj" : "git")