@markjaquith/agency 2.8.0 → 2.10.0

package/src/services/WorktreeService.test.ts

@@ -3,7 +3,7 @@ import { Effect } from "effect"
 import { mkdir, rm } from "node:fs/promises"
 import { join } from "node:path"
 import {
-	captureLogs,
+	captureErrors,
 	cleanupTempDir,
 	createTempDir,
 	runTestEffect,
@@ -287,7 +287,7 @@ describe("WorktreeService", () => {
 			),
 		)
 
-		const logs = await captureLogs(() =>
+		const logs = await captureErrors(() =>
 			runTestEffect(
 				WorktreeService.pipe(
 					Effect.flatMap((service) =>

package/src/test-utils.ts

@@ -13,6 +13,7 @@ import { WorktreeService } from "./services/WorktreeService"
 import { PullRequestService } from "./services/PullRequestService"
 import { ArchiveService } from "./services/ArchiveService"
 import { IntegrationService } from "./services/IntegrationService"
+import { ContextService } from "./services/ContextService"
 
 export const createTempDir = () => mkdtemp(join(tmpdir(), "agency-test-"))
 
@@ -30,6 +31,7 @@ const TestLayer = Layer.mergeAll(
 	PullRequestService.Default,
 	ArchiveService.Default,
 	IntegrationService.Default,
+	ContextService.Default,
 )
 
 export async function runTestEffect<A, E>(
@@ -45,17 +47,24 @@ export async function runTestEffect<A, E>(
 	return Effect.runPromise(program)
 }
 
-export async function captureLogs(
+async function captureConsole(
+	method: "log" | "error",
 	run: () => Promise<unknown>,
 ): Promise<string[]> {
 	const logs: string[] = []
-	const log = spyOn(console, "log").mockImplementation((...args) => {
+	const output = spyOn(console, method).mockImplementation((...args) => {
 		logs.push(args.join(" "))
 	})
 	try {
 		await run()
 		return logs
 	} finally {
-		log.mockRestore()
+		output.mockRestore()
 	}
 }
+
+export const captureLogs = (run: () => Promise<unknown>) =>
+	captureConsole("log", run)
+
+export const captureErrors = (run: () => Promise<unknown>) =>
+	captureConsole("error", run)

package/src/utils/effect.test.ts

@@ -1,24 +1,30 @@
-import { describe, expect, test } from "bun:test"
+import { describe, expect, spyOn, test } from "bun:test"
 import { captureLogs } from "../test-utils"
 import { createLoggers } from "./effect"
 
 describe("createLoggers", () => {
 	test("keeps JSON output machine-readable when verbose is enabled", async () => {
+		const errors: string[] = []
+		const error = spyOn(console, "error").mockImplementation((...args) => {
+			errors.push(args.join(" "))
+		})
 		const logs = await captureLogs(async () => {
 			const { log, verboseLog } = createLoggers({ json: true, verbose: true })
 			verboseLog("debug")
 			log('{"ok":true}')
 		})
+		error.mockRestore()
 
 		expect(logs).toEqual(['{"ok":true}'])
+		expect(errors).toEqual(["debug"])
 	})
 
-	test("lets silent suppress JSON output", async () => {
+	test("lets JSON output override silent", async () => {
 		const logs = await captureLogs(async () => {
 			const { log } = createLoggers({ json: true, silent: true })
 			log('{"ok":true}')
 		})
 
-		expect(logs).toEqual([])
+		expect(logs).toEqual(['{"ok":true}'])
 	})
 })

package/src/utils/effect.ts

@@ -1,3 +1,5 @@
+import { emitCommandResult } from "../protocol"
+
 export function createLoggers(options: {
 	readonly silent?: boolean
 	readonly verbose?: boolean
@@ -5,7 +7,7 @@ export function createLoggers(options: {
 }) {
 	const { silent = false, verbose = false, json = false } = options
 	return {
-		log: silent ? () => {} : console.log,
-		verboseLog: verbose && !silent && !json ? console.log : () => {},
+		log: json ? emitCommandResult : silent ? () => {} : console.log,
+		verboseLog: verbose && !silent ? console.error : () => {},
 	}
 }