@markjaquith/agency 2.61.1 → 2.61.2

package/package.json

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

package/src/commands/sync.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test"
 import { Effect } from "effect"
-import { mkdir } from "node:fs/promises"
+import { chmod, mkdir } from "node:fs/promises"
 import { join } from "node:path"
 import { TaskService } from "../services/TaskService"
 import {
@@ -99,6 +99,44 @@ describe("sync command", () => {
 		})
 	})
 
+	test("groups repeated human-readable warnings by affected target", async () => {
+		await runTestEffect(
+			TaskService.pipe(
+				Effect.flatMap((service) =>
+					service.create(
+						{
+							id: "second",
+							ticketUrl: null,
+							repo: "agency",
+							branch: "task/second",
+							base: "main",
+						},
+						root,
+					),
+				),
+			),
+		)
+		const originalPath = process.env.PATH
+		const bin = join(root, "bin")
+		await mkdir(bin)
+		await Bun.write(
+			join(bin, "gh"),
+			'#!/bin/sh\necho "provider unavailable" >&2\nexit 1\n',
+		)
+		await chmod(join(bin, "gh"), 0o755)
+		process.env.PATH = `${bin}:${originalPath}`
+		try {
+			const logs = await captureLogs(() =>
+				runTestEffect(sync({ cwd: root, dryRun: true })),
+			)
+			expect(
+				logs.filter((line) => line.includes("provider unavailable")),
+			).toEqual(["Warning 'task:example', 'task:second': provider unavailable"])
+		} finally {
+			process.env.PATH = originalPath
+		}
+	})
+
 	test("reports human-readable progress without polluting JSON output", async () => {
 		const updates: string[] = []
 		const progress: Progress = {

package/src/commands/sync.ts

@@ -8,6 +8,27 @@ interface SyncCommandOptions extends BaseCommandOptions {
 	readonly dryRun?: boolean
 }
 
+interface Notice {
+	readonly kind: string
+	readonly target: string
+	readonly message: string
+	readonly action?: string
+}
+
+const groupedNotices = <T extends Notice>(notices: readonly T[]) => {
+	const groups = new Map<string, { notice: T; targets: string[] }>()
+	for (const notice of notices) {
+		const key = JSON.stringify([notice.kind, notice.message, notice.action])
+		const group = groups.get(key)
+		if (group) group.targets.push(notice.target)
+		else groups.set(key, { notice, targets: [notice.target] })
+	}
+	return groups.values()
+}
+
+const formatTargets = (targets: readonly string[]) =>
+	targets.map((target) => `'${target}'`).join(", ")
+
 export const sync = (
 	options: SyncCommandOptions = {},
 	progress: Progress = createProgress({
@@ -62,9 +83,11 @@ export const sync = (
 				`${change.status === "applied" ? "Applied" : "Planned"} ${change.kind} '${change.target}': ${change.message}`,
 			)
 		}
-		for (const warning of result.warnings) {
+		for (const { notice: warning, targets } of groupedNotices(
+			result.warnings,
+		)) {
 			log(
-				`Warning '${warning.target}': ${warning.message}${warning.action ? `. ${warning.action}` : ""}`,
+				`Warning ${formatTargets(targets)}: ${warning.message}${warning.action ? `. ${warning.action}` : ""}`,
 			)
 		}
 		for (const issue of result.repositories.unresolved) {
@@ -72,9 +95,11 @@ export const sync = (
 				`Unresolved repository '${issue.alias}': ${issue.message}. ${issue.action}`,
 			)
 		}
-		for (const issue of result.unresolved) {
+		for (const { notice: issue, targets } of groupedNotices(
+			result.unresolved,
+		)) {
 			log(
-				`Unresolved '${issue.target}': ${issue.message}${issue.action ? `. ${issue.action}` : ""}`,
+				`Unresolved ${formatTargets(targets)}: ${issue.message}${issue.action ? `. ${issue.action}` : ""}`,
 			)
 		}
 		if (

package/src/services/SyncService.test.ts

@@ -64,14 +64,17 @@ case "$*" in
 *mergeable*) ;;
 *) echo "mergeable field was not requested" >&2; exit 2 ;;
 esac
+case "$*" in
+*baseRepository*) echo "unsupported baseRepository field was requested" >&2; exit 3 ;;
+esac
 if [ "$2" = "view" ]; then
 cat <<'JSON'
-{"number":42,"state":"MERGED","title":"Ship","isDraft":false,"headRefName":"feat/example","baseRefName":"main","headRepository":{"nameWithOwner":"example/agency"},"baseRepository":{"nameWithOwner":"example/agency"},"url":"https://github.com/example/agency/pull/42","mergedAt":"2100-01-01T00:00:00Z","mergeCommit":{"oid":"abc"},"mergeable":"MERGEABLE"}
+{"number":42,"state":"MERGED","title":"Ship","isDraft":false,"headRefName":"feat/example","baseRefName":"main","headRepository":{"nameWithOwner":"example/agency"},"url":"https://github.com/example/agency/pull/42","mergedAt":"2100-01-01T00:00:00Z","mergeCommit":{"oid":"abc"},"mergeable":"MERGEABLE"}
 JSON
 exit 0
 fi
 cat <<'JSON'
-[{"number":42,"state":"MERGED","title":"Ship","isDraft":false,"headRefName":"feat/example","baseRefName":"main","headRepository":{"nameWithOwner":"example/agency"},"baseRepository":{"nameWithOwner":"example/agency"},"url":"https://github.com/example/agency/pull/42","mergedAt":"2100-01-01T00:00:00Z","mergeCommit":{"oid":"abc"},"mergeable":"MERGEABLE"}]
+[{"number":42,"state":"MERGED","title":"Ship","isDraft":false,"headRefName":"feat/example","baseRefName":"main","headRepository":{"nameWithOwner":"example/agency"},"url":"https://github.com/example/agency/pull/42","mergedAt":"2100-01-01T00:00:00Z","mergeCommit":{"oid":"abc"},"mergeable":"MERGEABLE"}]
 JSON
 `,
 		)
@@ -172,6 +175,7 @@ pr: null
 		)
 		const invocation = await Bun.file(capture).text()
 		expect(invocation).toContain("--repo\n")
+		expect(invocation).not.toContain("baseRepository")
 		expect(invocation).toContain("GIT_DIR=")
 		expect(invocation).toContain(".jj")
 
@@ -1013,4 +1017,44 @@ exit 9
 			),
 		).toEqual([])
 	})
+
+	test("keeps pull request query failures concise", async () => {
+		await runTestEffect(
+			TaskService.pipe(
+				Effect.flatMap((service) =>
+					service.create(
+						{
+							id: "unavailable",
+							ticketUrl: null,
+							repo: "agency",
+							branch: "feat/unavailable",
+							base: "main",
+						},
+						root,
+					),
+				),
+			),
+		)
+		await Bun.write(
+			join(root, "bin", "gh"),
+			`#!/bin/sh
+echo "Unknown JSON field: unsupported" >&2
+echo "Available fields:" >&2
+echo "  additions" >&2
+exit 1
+`,
+		)
+		await chmod(join(root, "bin", "gh"), 0o755)
+
+		const result = await runTestEffect(
+			SyncService.pipe(
+				Effect.flatMap((service) => service.reconcile({ cwd: root })),
+			),
+		)
+		expect(result.warnings).toContainEqual({
+			kind: "pr-discovery-unavailable",
+			target: "task:unavailable",
+			message: "Unknown JSON field: unsupported",
+		})
+	})
 })

package/src/services/SyncService.ts

@@ -153,6 +153,15 @@ const isCommitId = (ref: string) => /^[0-9a-f]{40,64}$/i.test(ref)
 const originRef = (ref: string) =>
 	ref.replace(/^refs\/remotes\/origin\//, "").replace(/^origin\//, "")
 
+const GITHUB_PR_FIELDS =
+	"number,state,title,isDraft,headRefName,baseRefName,headRepository,url,mergedAt,mergeCommit,mergeable"
+
+const commandErrorSummary = (stderr: string, fallback: string) =>
+	stderr
+		.split("\n")
+		.map((line) => line.trim())
+		.find(Boolean) ?? fallback
+
 export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 	sync: () => ({
 		reconcile: (
@@ -349,7 +358,7 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 											"view",
 											existing.url,
 											"--json",
-											"number,state,title,isDraft,headRefName,baseRefName,headRepository,baseRepository,url,mergedAt,mergeCommit,mergeable",
+											GITHUB_PR_FIELDS,
 										],
 										{
 											cwd: repositoryPath,
@@ -372,7 +381,7 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 											"--state",
 											"all",
 											"--json",
-											"number,state,title,isDraft,headRefName,baseRefName,headRepository,baseRepository,url,mergedAt,mergeCommit,mergeable",
+											GITHUB_PR_FIELDS,
 										],
 										{
 											cwd: repositoryPath,
@@ -824,8 +833,10 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 							warnings.push({
 								kind: existing ? "pr-unavailable" : "pr-discovery-unavailable",
 								target: record.key,
-								message:
-									queried.stderr.trim() || "Could not query delivery provider",
+								message: commandErrorSummary(
+									queried.stderr,
+									"Could not query delivery provider",
+								),
 							})
 						}
 					} else if (existing) {
@@ -858,7 +869,7 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 							warnings.push({
 								kind: "pr-unavailable",
 								target: record.key,
-								message: `Could not inspect ${existing.url}: ${viewed.stderr.trim()}`,
+								message: `Could not inspect ${existing.url}: ${commandErrorSummary(viewed.stderr, "GitHub query failed")}`,
 							})
 						}
 					} else {
@@ -901,8 +912,10 @@ export class SyncService extends Effect.Service<SyncService>()("SyncService", {
 							warnings.push({
 								kind: "pr-discovery-unavailable",
 								target: record.key,
-								message:
-									listed.stderr.trim() || "Could not discover pull requests",
+								message: commandErrorSummary(
+									listed.stderr,
+									"Could not discover pull requests",
+								),
 							})
 						}
 					}