@markjaquith/agency 2.49.0 → 2.51.0

package/src/test-utils.ts

@@ -20,6 +20,13 @@ import { SyncService } from "./services/SyncService"
 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-"))
 
@@ -29,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,
@@ -44,6 +55,7 @@ const TestLayer = Layer.mergeAll(
 	ReadinessService.Default,
 	GraphMutationService.Default,
 	DoctorService.Default,
+	ReviewService.Default,
 )
 
 export async function runTestEffect<A, E>(

package/src/work-view.ts

@@ -79,7 +79,11 @@ const rowFor = (
 	executions: readonly ExecutionNode[],
 ): WorkViewRow => {
 	const branches = [
-		...new Set(executions.map((execution) => execution.data.branch)),
+		...new Set(
+			executions.flatMap((execution) =>
+				"branch" in execution.data ? [execution.data.branch] : [],
+			),
+		),
 	]
 	const parent =
 		node.kind === "task"
@@ -105,16 +109,19 @@ const rowFor = (
 				: branches.length === 1
 					? branches[0]!
 					: "multiple",
-		pr: aggregateLabel(executions, (execution) => Boolean(execution.data.pr), [
-			"present",
-			"absent",
-		]),
+		pr: aggregateLabel(
+			executions,
+			(execution) => "pr" in execution.data && Boolean(execution.data.pr),
+			["present", "absent"],
+		),
 		worktree: aggregateLabel(
 			executions,
 			(execution) => execution.workspace?.materialized === true,
 			["materialized", "absent"],
 		),
-		hasPr: executions.some((execution) => Boolean(execution.data.pr)),
+		hasPr: executions.some(
+			(execution) => "pr" in execution.data && Boolean(execution.data.pr),
+		),
 	}
 }
 
@@ -213,6 +220,7 @@ export const getWorkViews = (options: WorkViewOptions = {}) =>
 				return executions.filter(
 					(execution) =>
 						execution.data.taskId === taskId &&
+						"phaseId" in execution.data &&
 						execution.data.phaseId === phaseId,
 				)
 			}

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.test.ts

@@ -64,6 +64,63 @@ describe("portable repository declarations", () => {
 })
 
 describe("body-of-work descriptions", () => {
+	test("decodes review tasks strictly and rejects writable execution fields", () => {
+		const review = {
+			ticketUrl: null,
+			review: {
+				repo: "agency",
+				source: { kind: "branch", ref: "refs/heads/feature/review" },
+				commit: "a".repeat(40),
+				refreshedAt: "2026-07-23T12:00:00.000Z",
+			},
+		}
+		expect(
+			Schema.decodeUnknownSync(TaskFrontmatter, { onExcessProperty: "error" })(
+				review,
+			),
+		).toMatchObject({ status: "open", review: review.review })
+		for (const field of ["repo", "repos", "branch", "base", "pr"]) {
+			expect(() =>
+				Schema.decodeUnknownSync(TaskFrontmatter, {
+					onExcessProperty: "error",
+				})({ ...review, [field]: field === "repos" ? [] : "forbidden" }),
+			).toThrow()
+		}
+	})
+
+	test("rejects inconsistent pull request source provenance", () => {
+		const source = {
+			kind: "pull-request",
+			provider: "github",
+			repository: "owner/repo",
+			identifier: "42",
+			url: "https://github.com/owner/repo/pull/42",
+			fetchRef: "refs/pull/42/head",
+		}
+		const review = {
+			ticketUrl: null,
+			review: {
+				repo: "agency",
+				source,
+				commit: "a".repeat(40),
+				refreshedAt: "2026-07-23T12:00:00.000Z",
+			},
+		}
+		expect(Schema.decodeUnknownSync(TaskFrontmatter)(review)).toBeDefined()
+		for (const inconsistent of [
+			{ ...source, url: "https://github.com/owner/repo/pull/41" },
+			{ ...source, repository: "other/repo" },
+			{ ...source, fetchRef: "refs/pull/41/head" },
+		]) {
+			expect(() =>
+				Schema.decodeUnknownSync(TaskFrontmatter)({
+					...review,
+					review: { ...review.review, source: inconsistent },
+				}),
+			).toThrow()
+		}
+	})
+
 	test("accepts descriptions on epics, tasks, and phases", () => {
 		const epic = Schema.decodeUnknownSync(EpicFrontmatter)({
 			ticketUrl: "https://example.com/epic",

package/src/workbase/schemas.ts

@@ -43,6 +43,8 @@ const IsoTimestamp = NonEmptyString.pipe(
 	Schema.pattern(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?Z$/),
 )
 
+const GitCommit = Schema.String.pipe(Schema.pattern(/^[a-f0-9]{40}$/))
+
 const DocumentRevision = Schema.String.pipe(Schema.pattern(/^[a-f0-9]{64}$/))
 
 export const ClaimRecord = Schema.Struct({
@@ -94,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 }),
 	),
@@ -172,9 +175,61 @@ const MultiPhaseTaskFrontmatter = Schema.Struct({
 	phases: Schema.Array(Dependency),
 })
 
+export const ReviewPullRequestSource = Schema.Struct({
+	kind: Schema.Literal("pull-request"),
+	provider: Schema.Literal("github"),
+	repository: NonEmptyString,
+	identifier: NonEmptyString.pipe(Schema.pattern(/^\d+$/)),
+	url: GitHubPullRequestUrl,
+	fetchRef: NonEmptyString,
+}).pipe(
+	Schema.filter(
+		(source) =>
+			source.url ===
+				`https://github.com/${source.repository}/pull/${source.identifier}` &&
+			source.fetchRef === `refs/pull/${source.identifier}/head`,
+		{
+			message: () =>
+				"Pull request review source URL, repository, identifier, and fetch ref must agree",
+		},
+	),
+)
+
+export const ReviewBranchSource = Schema.Struct({
+	kind: Schema.Literal("branch"),
+	ref: NonEmptyString.pipe(
+		Schema.pattern(
+			/^refs\/heads\/(?!HEAD$)(?!.*(?:\.\.|@\{|[ ~^:?*\[\\\]]))(?!.*\/\/)(?!.*(?:^|\/)\.)(?!.*\/$)(?!.*\.lock(?:\/|$))[A-Za-z0-9._\/-]+$/,
+		),
+	),
+})
+
+export const ReviewSource = Schema.Union(
+	ReviewPullRequestSource,
+	ReviewBranchSource,
+)
+
+export const ReviewRecord = Schema.Struct({
+	repo: RepositoryAlias,
+	source: ReviewSource,
+	commit: GitCommit,
+	refreshedAt: IsoTimestamp,
+})
+
+const ReviewTaskFrontmatter = Schema.Struct({
+	ticketUrl: Schema.NullOr(Url),
+	description: Description,
+	epic: Schema.optional(EntityId),
+	review: ReviewRecord,
+	status: Schema.optionalWith(WorkStatus, { default: () => "open" as const }),
+	claim: Schema.optional(ClaimRecord),
+	completion: Schema.optional(CompletionRecord),
+})
+
 export const TaskFrontmatter = Schema.Union(
 	SinglePhaseTaskFrontmatter,
 	MultiPhaseTaskFrontmatter,
+	ReviewTaskFrontmatter,
 )
 
 export const PhaseFrontmatter = Schema.Struct({
@@ -195,6 +250,8 @@ export type RepositoryDeclaration = Schema.Schema.Type<
 export type WorkStatus = Schema.Schema.Type<typeof WorkStatus>
 export type ClaimRecord = Schema.Schema.Type<typeof ClaimRecord>
 export type PullRequestRecord = Schema.Schema.Type<typeof PullRequestRecord>
+export type ReviewSource = Schema.Schema.Type<typeof ReviewSource>
+export type ReviewRecord = Schema.Schema.Type<typeof ReviewRecord>
 export type CompletionRecord = Schema.Schema.Type<typeof CompletionRecord>
 export type EpicFrontmatter = Schema.Schema.Type<typeof EpicFrontmatter>
 export type TaskFrontmatter = Schema.Schema.Type<typeof TaskFrontmatter>

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