@markjaquith/agency 2.71.18 → 2.71.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markjaquith/agency",
-  "version": "2.71.18",
+  "version": "2.71.19",
   "description": "Manage agentic work across repositories with durable workbases",
   "keywords": [
     "agents",
@@ -77,6 +77,7 @@
     "benchmark:finish": "bun scripts/benchmark-finish.ts",
     "benchmark:epic": "bun scripts/benchmark-epic.ts",
     "benchmark:phase": "bun scripts/benchmark-phase.ts",
+    "benchmark:graph": "bun scripts/benchmark-graph.ts",
     "benchmark:push": "bun scripts/benchmark-push.ts",
     "benchmark:archive": "bun scripts/benchmark-archive.ts",
     "benchmark:sync": "bun scripts/benchmark-sync.ts",

package/src/services/GraphService.test.ts

@@ -6,7 +6,10 @@ import { dirname, join } from "node:path"
 import { AgencyGraph } from "../graph-schema"
 import { cleanupTempDir, createTempDir, runTestEffect } from "../test-utils"
 import { GraphService } from "./GraphService"
-import { VersionControlService } from "./VersionControlService"
+import {
+	VersionControlService,
+	type VersionControlBackend,
+} from "./VersionControlService"
 
 const write = async (root: string, path: string, content: string) => {
 	const fullPath = join(root, path)
@@ -364,6 +367,15 @@ status: open
 
 		const detailed = await getGraph(root, {
 			include: ["bodies", "workspace", "git", "pr"],
+			backend: {
+				kind: "git",
+				inspectRepository: () => Effect.succeed(null),
+				listWorkspaces: () => Effect.succeed([]),
+				resolveRevision: () => Effect.succeed(null),
+				workspaceHead: () => Effect.succeed(null),
+				workspaceDirty: () => Effect.succeed(null),
+				remoteUrl: () => Effect.succeed(null),
+			} as unknown as VersionControlBackend,
 		})
 		expect(detailed.includes).toEqual(["bodies", "git", "pr", "workspace"])
 		expect(detailed.workbase.root).toBe(root)
@@ -386,4 +398,51 @@ status: open
 		expect(execution?.pr).toEqual({ url: null, state: "none" })
 		expect(Schema.decodeUnknownSync(AgencyGraph)(detailed)).toEqual(detailed)
 	})
+
+	test("reuses repository metadata and revision lookups for git details", async () => {
+		const root = await createWorkbase()
+		roots.push(root)
+		const calls = {
+			listWorkspaces: 0,
+			remoteUrl: 0,
+			resolveRevision: new Map<string, number>(),
+		}
+		const backend = {
+			kind: "git",
+			inspectRepository: () => Effect.succeed(null),
+			listWorkspaces: () =>
+				Effect.sync(() => {
+					calls.listWorkspaces += 1
+					return []
+				}),
+			remoteUrl: () =>
+				Effect.sync(() => {
+					calls.remoteUrl += 1
+					return null
+				}),
+			resolveRevision: (_path: string, revision: string) =>
+				Effect.sync(() => {
+					calls.resolveRevision.set(
+						revision,
+						(calls.resolveRevision.get(revision) ?? 0) + 1,
+					)
+					return revision
+				}),
+			workspaceHead: () => Effect.succeed(null),
+			workspaceDirty: () => Effect.succeed(null),
+		} as unknown as VersionControlBackend
+
+		await getGraph(root, { include: ["git"], backend })
+
+		expect(calls.listWorkspaces).toBe(0)
+		expect(calls.remoteUrl).toBe(1)
+		expect(calls.resolveRevision).toEqual(
+			new Map([
+				["feat/prepare", 1],
+				["feat/implement", 1],
+				["feat/verify", 1],
+				["main", 1],
+			]),
+		)
+	})
 })

package/src/services/GraphService.ts

@@ -674,6 +674,40 @@ export class GraphService extends Effect.Service<GraphService>()(
 					}
 					const dependents = (id: string) =>
 						[...(reverseDependencies.get(id) ?? [])].sort()
+					const repositoryWorkspaces = new Map<
+						string,
+						ReturnType<VersionControlBackend["listWorkspaces"]>
+					>()
+					const listWorkspaces = (path: string) => {
+						if (!backend) return Effect.succeed([])
+						const cached = repositoryWorkspaces.get(path)
+						if (cached) return cached
+						const workspaces = backend
+							.listWorkspaces(path)
+							.pipe(Effect.catchAll(() => Effect.succeed([])))
+						repositoryWorkspaces.set(path, workspaces)
+						return workspaces
+					}
+					const repositoryRemotes = new Map<string, string | null>()
+					const remoteUrl = (path: string, remote: string) =>
+						Effect.gen(function* () {
+							if (!backend) return null
+							const key = `${path}\u0000${remote}`
+							if (repositoryRemotes.has(key)) return repositoryRemotes.get(key)!
+							const url = yield* backend.remoteUrl(path, remote)
+							repositoryRemotes.set(key, url)
+							return url
+						})
+					const resolvedRevisions = new Map<string, string | null>()
+					const resolveRevision = (path: string, revision: string) =>
+						Effect.gen(function* () {
+							if (!backend) return null
+							const key = `${path}\u0000${revision}`
+							if (resolvedRevisions.has(key)) return resolvedRevisions.get(key)!
+							const resolved = yield* backend.resolveRevision(path, revision)
+							resolvedRevisions.set(key, resolved)
+							return resolved
+						})
 
 					const documentDetails = <T extends Record<string, unknown>>(
 						document: Document<T>,
@@ -697,11 +731,7 @@ export class GraphService extends Effect.Service<GraphService>()(
 						Effect.gen(function* () {
 							if (!backend) return undefined
 							const inspection = yield* backend.inspectRepository(path)
-							const workspaces = inspection
-								? yield* backend
-										.listWorkspaces(path)
-										.pipe(Effect.catchAll(() => Effect.succeed([])))
-								: []
+							const workspaces = inspection ? yield* listWorkspaces(path) : []
 							const primary = workspaces.find(
 								(workspace) => workspace.path === path,
 							)
@@ -734,15 +764,12 @@ export class GraphService extends Effect.Service<GraphService>()(
 							}
 							if (include.has("git")) {
 								if (!backend) return result
-								const remote = yield* backend.remoteUrl(
-									repositoryPath,
-									"origin",
-								)
+								const remote = yield* remoteUrl(repositoryPath, "origin")
 								const canonicalCheckoutPath = materialized
 									? yield* fs.realPath(checkoutPath)
 									: checkoutPath
 								const actualBranch = materialized
-									? yield* backend.listWorkspaces(repositoryPath).pipe(
+									? yield* listWorkspaces(repositoryPath).pipe(
 											Effect.map(
 												(workspaces) =>
 													workspaces
@@ -783,11 +810,11 @@ export class GraphService extends Effect.Service<GraphService>()(
 										: {
 												branch: data.branch,
 												base: data.base,
-												branchCommit: yield* backend.resolveRevision(
+												branchCommit: yield* resolveRevision(
 													repositoryPath,
 													data.branch,
 												),
-												baseCommit: yield* backend.resolveRevision(
+												baseCommit: yield* resolveRevision(
 													repositoryPath,
 													data.base,
 												),