@markjaquith/agency 2.37.1 → 2.38.1

package/src/workbase/work-target.test.ts

@@ -61,14 +61,14 @@ describe("work target choices", () => {
 		)
 
 		expect(choices.map((choice) => choice.label)).toEqual([
-			"\x1b[35m\x1b[0m delivery\x1b[2m - Ship the release\x1b[0m",
-			"  \x1b[36m󰗡\x1b[0m multi",
-			"    \x1b[34m◐\x1b[0m \x1b[33m󰔚\x1b[0m build",
-			"    \x1b[32m✓\x1b[0m \x1b[33m󰔚\x1b[0m verify",
-			"    \x1b[31m⊘\x1b[0m \x1b[33m󰔚\x1b[0m unlisted",
-			"  \x1b[32m✓\x1b[0m \x1b[36m󰗡\x1b[0m single",
-			"\x1b[2m○\x1b[0m \x1b[36m󰗡\x1b[0m standalone\x1b[2m - Independent work\x1b[0m",
-			"\x1b[35m↗\x1b[0m \x1b[36m󰗡\x1b[0m delegated",
+			"\x1b[38;2;198;160;246m\x1b[0m delivery\x1b[2m - Ship the release\x1b[0m",
+			"\x1b[38;2;125;196;228m󰗡\x1b[0m multi",
+			"\x1b[38;2;138;173;244m󰔟\x1b[0m \x1b[38;2;238;212;159m󰔚\x1b[0m build",
+			"\x1b[38;2;166;218;149m󰄬\x1b[0m \x1b[38;2;238;212;159m󰔚\x1b[0m verify",
+			"\x1b[38;2;237;135;150m󰅖\x1b[0m \x1b[38;2;238;212;159m󰔚\x1b[0m unlisted",
+			"\x1b[38;2;166;218;149m󰄬\x1b[0m \x1b[38;2;125;196;228m󰗡\x1b[0m single",
+			"\x1b[38;2;128;135;162m󰄱\x1b[0m \x1b[38;2;125;196;228m󰗡\x1b[0m standalone\x1b[2m - Independent work\x1b[0m",
+			"\x1b[38;2;198;160;246m󰁕\x1b[0m \x1b[38;2;125;196;228m󰗡\x1b[0m delegated",
 		])
 		expect(choices.map((choice) => choice.target.kind)).toEqual([
 			"epic",
@@ -82,13 +82,27 @@ describe("work target choices", () => {
 		])
 		expect(choices.map((choice) => choice.plainLabel)).toEqual([
 			"epic delivery - Ship the release",
-			"  task multi",
-			"    [working] phase build",
-			"    [done] phase verify",
-			"    [dropped] phase unlisted",
-			"  [done] task single",
+			"task multi",
+			"[working] phase build",
+			"[done] phase verify",
+			"[dropped] phase unlisted",
+			"[done] task single",
 			"[open] task standalone - Independent work",
 			"[delegated] task delegated",
 		])
+		expect(choices.map((choice) => choice.depth)).toEqual([
+			0, 1, 2, 2, 2, 1, 0, 0,
+		])
+		expect(choices[0]!.segments).toEqual([
+			{ text: "", color: "#c6a0f6" },
+			{ text: " delivery" },
+			{ text: " - Ship the release", color: "#6e738d" },
+		])
+		expect(choices[2]!.segments).toEqual([
+			{ text: "󰔟", color: "#8aadf4" },
+			{ text: " " },
+			{ text: "󰔚", color: "#eed49f" },
+			{ text: " build" },
+		])
 	})
 })

package/src/workbase/work-target.ts

@@ -1,6 +1,7 @@
 import { Effect } from "effect"
 import type { WorkStatus } from "./schemas"
-import { choose } from "../utils/chooser"
+import { choose, type ChoiceSegment } from "../utils/chooser"
+import { macchiato } from "../utils/theme"
 
 export type WorkTarget =
 	| {
@@ -56,58 +57,98 @@ interface PhaseRecord {
 export interface WorkTargetChoice {
 	readonly label: string
 	readonly plainLabel: string
+	readonly depth: number
+	readonly segments: readonly ChoiceSegment[]
 	readonly target: WorkTarget
 }
 
-const statusIcons: Record<WorkStatus, string> = {
-	open: "\x1b[2m○\x1b[0m",
-	working: "\x1b[34m◐\x1b[0m",
-	delegated: "\x1b[35m↗\x1b[0m",
-	done: "\x1b[32m✓\x1b[0m",
-	dropped: "\x1b[31m⊘\x1b[0m",
+const statuses: Record<
+	WorkStatus,
+	{ readonly icon: string; readonly color: string }
+> = {
+	open: { icon: "󰄱", color: macchiato.overlay1 },
+	working: { icon: "󰔟", color: macchiato.blue },
+	delegated: { icon: "󰁕", color: macchiato.mauve },
+	done: { icon: "󰄬", color: macchiato.green },
+	dropped: { icon: "󰅖", color: macchiato.red },
 }
 
+const kinds: Record<
+	WorkTarget["kind"],
+	{ readonly icon: string; readonly color: string }
+> = {
+	epic: { icon: "", color: macchiato.mauve },
+	task: { icon: "󰗡", color: macchiato.sapphire },
+	phase: { icon: "󰔚", color: macchiato.yellow },
+}
+
+const hexToAnsi = (color: string) => {
+	const value = color.slice(1)
+	return [0, 2, 4]
+		.map((offset) => Number.parseInt(value.slice(offset, offset + 2), 16))
+		.join(";")
+}
+
+const colorize = (item: { readonly icon: string; readonly color: string }) =>
+	`\x1b[38;2;${hexToAnsi(item.color)}m${item.icon}\x1b[0m`
+
 const label = (
-	indent: string,
 	kind: WorkTarget["kind"],
 	id: string,
 	description?: string,
 	status?: WorkStatus,
 ) =>
-	`${indent}${status === undefined ? "" : `${statusIcons[status]} `}${
-		{
-			epic: "\x1b[35m\x1b[0m",
-			task: "\x1b[36m󰗡\x1b[0m",
-			phase: "\x1b[33m󰔚\x1b[0m",
-		}[kind]
-	} ${id}${description === undefined ? "" : `\x1b[2m - ${description}\x1b[0m`}`
+	`${status === undefined ? "" : `${colorize(statuses[status])} `}${colorize(kinds[kind])} ${id}${description === undefined ? "" : `\x1b[2m - ${description}\x1b[0m`}`
+
+const segments = (
+	kind: WorkTarget["kind"],
+	id: string,
+	description?: string,
+	status?: WorkStatus,
+): readonly ChoiceSegment[] => [
+	...(status === undefined
+		? []
+		: [
+				{ text: statuses[status].icon, color: statuses[status].color },
+				{ text: " " },
+			]),
+	{ text: kinds[kind].icon, color: kinds[kind].color },
+	{ text: ` ${id}` },
+	...(description === undefined
+		? []
+		: [{ text: ` - ${description}`, color: macchiato.overlay0 }]),
+]
 
 const plainLabel = (
-	indent: string,
 	kind: WorkTarget["kind"],
 	id: string,
 	description?: string,
 	status?: WorkStatus,
 ) =>
-	`${indent}${status === undefined ? "" : `[${status}] `}${kind} ${id}${description === undefined ? "" : ` - ${description}`}`
+	`${status === undefined ? "" : `[${status}] `}${kind} ${id}${description === undefined ? "" : ` - ${description}`}`
 
 const taskChoices = (
 	task: TaskRecord,
 	phaseRecords: readonly PhaseRecord[],
-	indent: string,
+	depth: number,
 ): readonly WorkTargetChoice[] => {
 	const multiPhase = "phases" in task.data
 	const choices: WorkTargetChoice[] = [
 		{
 			label: label(
-				indent,
 				"task",
 				task.id,
 				task.data.description,
 				multiPhase ? undefined : (task.data.status ?? "open"),
 			),
 			plainLabel: plainLabel(
-				indent,
+				"task",
+				task.id,
+				task.data.description,
+				multiPhase ? undefined : (task.data.status ?? "open"),
+			),
+			depth,
+			segments: segments(
 				"task",
 				task.id,
 				task.data.description,
@@ -132,14 +173,19 @@ const taskChoices = (
 		renderedPhases.add(record.id)
 		choices.push({
 			label: label(
-				`${indent}  `,
 				"phase",
 				record.id,
 				record.data.description,
 				record.data.status ?? "open",
 			),
 			plainLabel: plainLabel(
-				`${indent}  `,
+				"phase",
+				record.id,
+				record.data.description,
+				record.data.status ?? "open",
+			),
+			depth: depth + 1,
+			segments: segments(
 				"phase",
 				record.id,
 				record.data.description,
@@ -158,14 +204,19 @@ const taskChoices = (
 		if (renderedPhases.has(record.id)) continue
 		choices.push({
 			label: label(
-				`${indent}  `,
 				"phase",
 				record.id,
 				record.data.description,
 				record.data.status ?? "open",
 			),
 			plainLabel: plainLabel(
-				`${indent}  `,
+				"phase",
+				record.id,
+				record.data.description,
+				record.data.status ?? "open",
+			),
+			depth: depth + 1,
+			segments: segments(
 				"phase",
 				record.id,
 				record.data.description,
@@ -200,21 +251,23 @@ 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),
+			label: label("epic", epic.id, epic.data.description),
+			plainLabel: plainLabel("epic", epic.id, epic.data.description),
+			depth: 0,
+			segments: segments("epic", epic.id, epic.data.description),
 			target: { kind: "epic", epicId: epic.id, path: epic.path },
 		})
 		for (const child of epic.data.tasks) {
 			const task = tasks.get(child.id)
 			if (!task || nestedTasks.has(task.id)) continue
 			nestedTasks.add(task.id)
-			choices.push(...taskChoices(task, phases.get(task.id) ?? [], "  "))
+			choices.push(...taskChoices(task, phases.get(task.id) ?? [], 1))
 		}
 	}
 
 	for (const task of taskRecords) {
 		if (nestedTasks.has(task.id)) continue
-		choices.push(...taskChoices(task, phases.get(task.id) ?? [], ""))
+		choices.push(...taskChoices(task, phases.get(task.id) ?? [], 0))
 	}
 
 	return choices
@@ -232,6 +285,8 @@ export const pickWorkTarget: PickWorkTarget = (choices, command) =>
 			key: String(index),
 			label: choice.label,
 			plainLabel: choice.plainLabel,
+			depth: choice.depth,
+			segments: choice.segments,
 			value: choice.target,
 		})),
 		command,