@markjaquith/agency 2.13.0 → 2.15.0

package/src/workbase/work-target.ts

@@ -1,5 +1,6 @@
 import { Effect } from "effect"
 import type { WorkStatus } from "./schemas"
+import { choose } from "../utils/chooser"
 
 export type WorkTarget =
 	| {
@@ -52,6 +53,7 @@ interface PhaseRecord {
 
 export interface WorkTargetChoice {
 	readonly label: string
+	readonly plainLabel: string
 	readonly target: WorkTarget
 }
 
@@ -78,6 +80,15 @@ const label = (
 		}[kind]
 	} ${id}${description === undefined ? "" : `\x1b[2m - ${description}\x1b[0m`}`
 
+const plainLabel = (
+	indent: string,
+	kind: WorkTarget["kind"],
+	id: string,
+	description?: string,
+	status?: WorkStatus,
+) =>
+	`${indent}${status === undefined ? "" : `[${status}] `}${kind} ${id}${description === undefined ? "" : ` - ${description}`}`
+
 const taskChoices = (
 	task: TaskRecord,
 	phaseRecords: readonly PhaseRecord[],
@@ -93,6 +104,13 @@ const taskChoices = (
 				task.data.description,
 				multiPhase ? undefined : (task.data.status ?? "open"),
 			),
+			plainLabel: plainLabel(
+				indent,
+				"task",
+				task.id,
+				task.data.description,
+				multiPhase ? undefined : (task.data.status ?? "open"),
+			),
 			target: {
 				kind: "task",
 				taskId: task.id,
@@ -117,6 +135,13 @@ const taskChoices = (
 				record.data.description,
 				record.data.status ?? "open",
 			),
+			plainLabel: plainLabel(
+				`${indent}  `,
+				"phase",
+				record.id,
+				record.data.description,
+				record.data.status ?? "open",
+			),
 			target: {
 				kind: "phase",
 				taskId: task.id,
@@ -135,6 +160,13 @@ const taskChoices = (
 				record.data.description,
 				record.data.status ?? "open",
 			),
+			plainLabel: plainLabel(
+				`${indent}  `,
+				"phase",
+				record.id,
+				record.data.description,
+				record.data.status ?? "open",
+			),
 			target: {
 				kind: "phase",
 				taskId: task.id,
@@ -164,6 +196,7 @@ export const buildWorkTargetChoices = (
 	for (const epic of epicRecords) {
 		choices.push({
 			label: label("", "epic", epic.id, epic.data.description),
+			plainLabel: plainLabel("", "epic", epic.id, epic.data.description),
 			target: { kind: "epic", epicId: epic.id, path: epic.path },
 		})
 		for (const child of epic.data.tasks) {
@@ -184,40 +217,17 @@ export const buildWorkTargetChoices = (
 
 export type PickWorkTarget = (
 	choices: readonly WorkTargetChoice[],
+	command?: readonly string[],
 ) => Effect.Effect<WorkTarget | null, Error>
 
-const parseWorkTargetSelection = (
-	output: string,
-	choices: readonly WorkTargetChoice[],
-) => {
-	const index = Number.parseInt(output.split("\t", 1)[0] ?? "", 10)
-	return choices[index]?.target ?? null
-}
-
-export const pickWorkTarget: PickWorkTarget = (choices) =>
-	Effect.tryPromise({
-		try: async () => {
-			const input = choices
-				.map((choice, index) => `${index}\t${choice.label}`)
-				.join("\n")
-			const process = Bun.spawn(
-				[
-					"fzf",
-					"--ansi",
-					"--delimiter=\t",
-					"--with-nth=2..",
-					"--prompt=Work on> ",
-				],
-				{ stdin: new Blob([input]), stdout: "pipe", stderr: "inherit" },
-			)
-			const [exitCode, output] = await Promise.all([
-				process.exited,
-				new Response(process.stdout).text(),
-			])
-			if (exitCode === 1 || exitCode === 130) return null
-			if (exitCode !== 0) throw new Error(`fzf exited with code ${exitCode}`)
-			return parseWorkTargetSelection(output, choices)
-		},
-		catch: (cause) =>
-			new Error("Failed to select a work target with fzf", { cause }),
-	})
+export const pickWorkTarget: PickWorkTarget = (choices, command) =>
+	choose(
+		"Work on",
+		choices.map((choice, index) => ({
+			key: String(index),
+			label: choice.label,
+			plainLabel: choice.plainLabel,
+			value: choice.target,
+		})),
+		command,
+	)

package/src/workbase/workbase-choice.ts

@@ -1,43 +1,30 @@
 import { Effect } from "effect"
 import { resolve } from "node:path"
-import { FileSystemService } from "../services/FileSystemService"
 import { WorkbaseService } from "../services/WorkbaseService"
+import { choose } from "../utils/chooser"
 
 export type PickWorkbase = (
 	workbases: readonly string[],
+	command?: readonly string[],
 ) => Effect.Effect<string | null, Error>
 
-export const pickWorkbase: PickWorkbase = (workbases) =>
-	Effect.tryPromise({
-		try: async () => {
-			const input = workbases
-				.map((workbase, index) => `${index}\t${workbase}`)
-				.join("\n")
-			const process = Bun.spawn(
-				["fzf", "--delimiter=\t", "--with-nth=2..", "--prompt=Workbase> "],
-				{ stdin: new Blob([input]), stdout: "pipe", stderr: "inherit" },
-			)
-			const [exitCode, output] = await Promise.all([
-				process.exited,
-				new Response(process.stdout).text(),
-			])
-			if (exitCode === 1 || exitCode === 130) return null
-			if (exitCode !== 0) throw new Error(`fzf exited with code ${exitCode}`)
-			const index = Number.parseInt(output.split("\t", 1)[0] ?? "", 10)
-			return workbases[index] ?? null
-		},
-		catch: (cause) =>
-			new Error("Failed to select a workbase with fzf", { cause }),
-	})
+export const pickWorkbase: PickWorkbase = (workbases, command) =>
+	choose(
+		"Workbase",
+		workbases.map((workbase, index) => ({
+			key: String(index),
+			label: workbase,
+			value: workbase,
+		})),
+		command,
+	)
 
 export const resolveWorkbase = (
 	startPath: string,
-	log: (message: string) => void,
 	pick: PickWorkbase = pickWorkbase,
 	inputAllowed = true,
 ) =>
 	Effect.gen(function* () {
-		const fs = yield* FileSystemService
 		const workbase = yield* WorkbaseService
 
 		return yield* workbase.discover(startPath).pipe(
@@ -59,18 +46,6 @@ export const resolveWorkbase = (
 						)
 					}
 
-					const fzf = yield* fs.runCommand(["which", "fzf"], {
-						captureOutput: true,
-					})
-					if (fzf.exitCode !== 0) {
-						for (const path of registered) log(path)
-						return yield* Effect.fail(
-							new Error(
-								"fzf is required to select a workbase; install fzf or run Agency from a registered workbase",
-							),
-						)
-					}
-
 					const selected = yield* pick(registered)
 					return selected ? yield* workbase.discover(selected) : null
 				}),