@os-eco/overstory-cli 0.6.8 → 0.6.10

package/src/commands/feed.ts

@@ -11,6 +11,7 @@ import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
 import { createEventStore } from "../events/store.ts";
+import { jsonOutput } from "../json.ts";
 import type { ColorFn } from "../logging/color.ts";
 import { color } from "../logging/color.ts";
 import type { EventType, StoredEvent } from "../types.ts";
@@ -189,7 +190,7 @@ async function executeFeed(opts: FeedOpts): Promise<void> {
 	const eventsFile = Bun.file(eventsDbPath);
 	if (!(await eventsFile.exists())) {
 		if (json) {
-			process.stdout.write("[]\n");
+			jsonOutput("feed", { events: [] });
 		} else {
 			process.stdout.write("No events data yet.\n");
 		}
@@ -228,7 +229,7 @@ async function executeFeed(opts: FeedOpts): Promise<void> {
 			const events = queryEvents({ since, limit });
 
 			if (json) {
-				process.stdout.write(`${JSON.stringify(events)}\n`);
+				jsonOutput("feed", { events });
 				return;
 			}
 
@@ -263,7 +264,7 @@ async function executeFeed(opts: FeedOpts): Promise<void> {
 		} else {
 			// JSON mode: print each event as a line
 			for (const event of initialEvents) {
-				process.stdout.write(`${JSON.stringify(event)}\n`);
+				jsonOutput("feed", { event });
 			}
 			if (initialEvents.length > 0) {
 				const lastEvent = initialEvents[initialEvents.length - 1];
@@ -307,7 +308,7 @@ async function executeFeed(opts: FeedOpts): Promise<void> {
 				} else {
 					// JSON mode: print each event as a line
 					for (const event of newEvents) {
-						process.stdout.write(`${JSON.stringify(event)}\n`);
+						jsonOutput("feed", { event });
 					}
 				}
 

package/src/commands/group.ts

@@ -11,7 +11,8 @@ import { join } from "node:path";
 import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { GroupError, ValidationError } from "../errors.ts";
-import { printHint, printSuccess } from "../logging/color.ts";
+import { jsonOutput } from "../json.ts";
+import { accent, printHint, printSuccess } from "../logging/color.ts";
 import { createTrackerClient, resolveBackend, type TrackerClient } from "../tracker/factory.ts";
 import type { TaskGroup, TaskGroupProgress } from "../types.ts";
 
@@ -247,7 +248,9 @@ async function getGroupProgress(
 		group.status = "completed";
 		group.completedAt = new Date().toISOString();
 		await saveGroups(projectRoot, groups);
-		process.stdout.write(`Group "${group.name}" (${group.id}) auto-closed: all issues done\n`);
+		process.stdout.write(
+			`Group "${group.name}" (${accent(group.id)}) auto-closed: all issues done\n`,
+		);
 
 		// Notify coordinator via mail (best-effort)
 		try {
@@ -286,7 +289,7 @@ function printGroupProgress(progress: TaskGroupProgress): void {
 	const w = process.stdout.write.bind(process.stdout);
 	const { group, total, completed, inProgress, blocked, open } = progress;
 	const status = group.status === "completed" ? "[completed]" : "[active]";
-	w(`${group.name} (${group.id}) ${status}\n`);
+	w(`${group.name} (${accent(group.id)}) ${status}\n`);
 	w(`  Issues: ${total} total`);
 	w(` | ${completed} completed`);
 	w(` | ${inProgress} in_progress`);
@@ -325,10 +328,12 @@ export function createGroupCommand(): Command {
 					tracker,
 				);
 				if (opts.json) {
-					process.stdout.write(`${JSON.stringify(group, null, "\t")}\n`);
+					jsonOutput("group create", { ...group });
 				} else {
 					printSuccess("Created group", group.name);
-					process.stdout.write(`  Members: ${group.memberIssueIds.join(", ")}\n`);
+					process.stdout.write(
+						`  Members: ${group.memberIssueIds.map((id) => accent(id)).join(", ")}\n`,
+					);
 				}
 			},
 		);
@@ -356,7 +361,7 @@ export function createGroupCommand(): Command {
 					}
 					const progress = await getGroupProgress(projectRoot, group, groups, tracker);
 					if (json) {
-						process.stdout.write(`${JSON.stringify(progress, null, "\t")}\n`);
+						jsonOutput("group status", { ...progress });
 					} else {
 						printGroupProgress(progress);
 					}
@@ -364,7 +369,7 @@ export function createGroupCommand(): Command {
 					const activeGroups = groups.filter((g) => g.status === "active");
 					if (activeGroups.length === 0) {
 						if (json) {
-							process.stdout.write("[]\n");
+							jsonOutput("group status", { groups: [] });
 						} else {
 							printHint("No active groups");
 						}
@@ -376,7 +381,7 @@ export function createGroupCommand(): Command {
 						progressList.push(progress);
 					}
 					if (json) {
-						process.stdout.write(`${JSON.stringify(progressList, null, "\t")}\n`);
+						jsonOutput("group status", { groups: progressList });
 					} else {
 						for (const progress of progressList) {
 							printGroupProgress(progress);
@@ -413,10 +418,12 @@ export function createGroupCommand(): Command {
 					tracker,
 				);
 				if (opts.json) {
-					process.stdout.write(`${JSON.stringify(group, null, "\t")}\n`);
+					jsonOutput("group add", { ...group });
 				} else {
 					printSuccess("Added to group", group.name);
-					process.stdout.write(`  Members: ${group.memberIssueIds.join(", ")}\n`);
+					process.stdout.write(
+						`  Members: ${group.memberIssueIds.map((id) => accent(id)).join(", ")}\n`,
+					);
 				}
 			},
 		);
@@ -433,10 +440,12 @@ export function createGroupCommand(): Command {
 
 			const group = await removeFromGroup(projectRoot, groupId, ids);
 			if (opts.json) {
-				process.stdout.write(`${JSON.stringify(group, null, "\t")}\n`);
+				jsonOutput("group remove", { ...group });
 			} else {
 				printSuccess("Removed from group", group.name);
-				process.stdout.write(`  Members: ${group.memberIssueIds.join(", ")}\n`);
+				process.stdout.write(
+					`  Members: ${group.memberIssueIds.map((id) => accent(id)).join(", ")}\n`,
+				);
 			}
 		});
 
@@ -458,12 +467,12 @@ export function createGroupCommand(): Command {
 				return;
 			}
 			if (opts.json) {
-				process.stdout.write(`${JSON.stringify(groups, null, "\t")}\n`);
+				jsonOutput("group list", { groups });
 			} else {
 				for (const group of groups) {
 					const status = group.status === "completed" ? "[completed]" : "[active]";
 					process.stdout.write(
-						`${group.id} ${status} "${group.name}" (${group.memberIssueIds.length} issues)\n`,
+						`${accent(group.id)} ${status} "${group.name}" (${group.memberIssueIds.length} issues)\n`,
 					);
 				}
 			}

package/src/commands/hooks.ts

@@ -15,6 +15,7 @@ import { join } from "node:path";
 import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
+import { jsonOutput } from "../json.ts";
 import { printHint, printSuccess, printWarning } from "../logging/color.ts";
 
 interface HookEntry {
@@ -189,7 +190,7 @@ async function statusHooks(json: boolean): Promise<void> {
 	}
 
 	if (json) {
-		process.stdout.write(`${JSON.stringify({ sourceExists, installed })}\n`);
+		jsonOutput("hooks status", { sourceExists, installed });
 	} else {
 		process.stdout.write(
 			`Hooks source (.overstory/hooks.json): ${sourceExists ? "present" : "missing"}\n`,

package/src/commands/init.test.ts

@@ -345,3 +345,107 @@ describe("initCommand: canonical branch detection", () => {
 		expect(content).toContain("canonicalBranch: main");
 	});
 });
+
+describe("initCommand: --yes flag", () => {
+	let tempDir: string;
+	let originalCwd: string;
+	let originalWrite: typeof process.stdout.write;
+
+	beforeEach(async () => {
+		tempDir = await createTempGitRepo();
+		originalCwd = process.cwd();
+		process.chdir(tempDir);
+
+		// Suppress stdout noise from initCommand
+		originalWrite = process.stdout.write;
+		process.stdout.write = (() => true) as typeof process.stdout.write;
+	});
+
+	afterEach(async () => {
+		process.chdir(originalCwd);
+		process.stdout.write = originalWrite;
+		await cleanupTempDir(tempDir);
+	});
+
+	test("--yes reinitializes when .overstory/ already exists", async () => {
+		// First init
+		await initCommand({});
+
+		// Tamper with config to verify reinit happens
+		const configPath = join(tempDir, ".overstory", "config.yaml");
+		await Bun.write(configPath, "# tampered\n");
+
+		// Second init with --yes should reinitialize (not return early)
+		await initCommand({ yes: true });
+
+		// Verify config was regenerated (not the tampered content)
+		const content = await Bun.file(configPath).text();
+		expect(content).not.toBe("# tampered\n");
+		expect(content).toContain("# Overstory configuration");
+	});
+
+	test("--yes works on fresh project (no .overstory/ yet)", async () => {
+		await initCommand({ yes: true });
+
+		const configPath = join(tempDir, ".overstory", "config.yaml");
+		const exists = await Bun.file(configPath).exists();
+		expect(exists).toBe(true);
+
+		const content = await Bun.file(configPath).text();
+		expect(content).toContain("# Overstory configuration");
+	});
+
+	test("--yes overwrites agent-defs on reinit", async () => {
+		// First init
+		await initCommand({});
+
+		// Tamper with an agent def
+		const scoutPath = join(tempDir, ".overstory", "agent-defs", "scout.md");
+		await Bun.write(scoutPath, "TAMPERED CONTENT");
+
+		// Reinit with --yes should overwrite
+		await initCommand({ yes: true });
+
+		const restored = await Bun.file(scoutPath).text();
+		expect(restored).not.toBe("TAMPERED CONTENT");
+	});
+});
+
+describe("initCommand: --name flag", () => {
+	let tempDir: string;
+	let originalCwd: string;
+	let originalWrite: typeof process.stdout.write;
+
+	beforeEach(async () => {
+		tempDir = await createTempGitRepo();
+		originalCwd = process.cwd();
+		process.chdir(tempDir);
+
+		// Suppress stdout noise from initCommand
+		originalWrite = process.stdout.write;
+		process.stdout.write = (() => true) as typeof process.stdout.write;
+	});
+
+	afterEach(async () => {
+		process.chdir(originalCwd);
+		process.stdout.write = originalWrite;
+		await cleanupTempDir(tempDir);
+	});
+
+	test("--name overrides auto-detected project name", async () => {
+		await initCommand({ name: "custom-project" });
+
+		const configPath = join(tempDir, ".overstory", "config.yaml");
+		const content = await Bun.file(configPath).text();
+		expect(content).toContain("name: custom-project");
+	});
+
+	test("--name combined with --yes works for fully non-interactive init", async () => {
+		await initCommand({ yes: true, name: "scripted-project" });
+
+		const configPath = join(tempDir, ".overstory", "config.yaml");
+		const content = await Bun.file(configPath).text();
+		expect(content).toContain("name: scripted-project");
+		expect(content).toContain("# Overstory configuration");
+	});
+});

package/src/commands/init.ts

@@ -1,5 +1,5 @@
 /**
- * CLI command: ov init [--force]
+ * CLI command: ov init [--force] [--yes|-y] [--name <name>]
  *
  * Scaffolds the `.overstory/` directory in the current project with:
  * - config.yaml (serialized from DEFAULT_CONFIG)
@@ -516,6 +516,8 @@ export async function writeOverstoryReadme(overstoryPath: string): Promise<void>
 }
 
 export interface InitOptions {
+	yes?: boolean;
+	name?: string;
 	force?: boolean;
 }
 
@@ -527,7 +529,7 @@ function printCreated(relativePath: string): void {
 }
 
 /**
- * Entry point for `ov init [--force]`.
+ * Entry point for `ov init [--force] [--yes|-y] [--name <name>]`.
  *
  * Scaffolds the .overstory/ directory structure in the current working directory.
  *
@@ -535,6 +537,7 @@ function printCreated(relativePath: string): void {
  */
 export async function initCommand(opts: InitOptions): Promise<void> {
 	const force = opts.force ?? false;
+	const yes = opts.yes ?? false;
 	const projectRoot = process.cwd();
 	const overstoryPath = join(projectRoot, OVERSTORY_DIR);
 
@@ -554,18 +557,19 @@ export async function initCommand(opts: InitOptions): Promise<void> {
 	// 1. Check if .overstory/ already exists
 	const existingDir = Bun.file(join(overstoryPath, "config.yaml"));
 	if (await existingDir.exists()) {
-		if (!force) {
+		if (!force && !yes) {
 			process.stdout.write(
 				"Warning: .overstory/ already initialized in this project.\n" +
-					"Use --force to reinitialize.\n",
+					"Use --force or --yes to reinitialize.\n",
 			);
 			return;
 		}
-		process.stdout.write("Reinitializing .overstory/ (--force)\n\n");
+		const flag = yes ? "--yes" : "--force";
+		process.stdout.write(`Reinitializing .overstory/ (${flag})\n\n`);
 	}
 
 	// 2. Detect project info
-	const projectName = await detectProjectName(projectRoot);
+	const projectName = opts.name ?? (await detectProjectName(projectRoot));
 	const canonicalBranch = await detectCanonicalBranch(projectRoot);
 
 	process.stdout.write(`Initializing overstory for "${projectName}"...\n\n`);
@@ -629,7 +633,7 @@ export async function initCommand(opts: InitOptions): Promise<void> {
 	printCreated(`${OVERSTORY_DIR}/README.md`);
 
 	// 8. Migrate existing SQLite databases on --force reinit
-	if (force) {
+	if (force || yes) {
 		const migrated = await migrateExistingDatabases(overstoryPath);
 		for (const dbName of migrated) {
 			printSuccess("Migrated", dbName);

package/src/commands/inspect.test.ts

@@ -546,6 +546,8 @@ describe("inspectCommand", () => {
 			const out = output();
 
 			const parsed = JSON.parse(out);
+			expect(parsed.success).toBe(true);
+			expect(parsed.command).toBe("inspect");
 			expect(parsed.session.agentName).toBe("builder-1");
 			expect(parsed.timeSinceLastActivity).toBeGreaterThan(0);
 		});

package/src/commands/inspect.ts

@@ -10,7 +10,8 @@ import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
 import { createEventStore } from "../events/store.ts";
-import { color } from "../logging/color.ts";
+import { jsonOutput } from "../json.ts";
+import { accent, color } from "../logging/color.ts";
 import { createMetricsStore } from "../metrics/store.ts";
 import { openSessionStore } from "../sessions/compat.ts";
 import type { AgentSession, StoredEvent, ToolStats } from "../types.ts";
@@ -252,21 +253,21 @@ export function printInspectData(data: InspectData): void {
 	const w = process.stdout.write.bind(process.stdout);
 	const { session } = data;
 
-	w(`\nAgent Inspection: ${session.agentName}\n`);
+	w(`\nAgent Inspection: ${accent(session.agentName)}\n`);
 	w(`${"═".repeat(80)}\n\n`);
 
 	// Agent state and metadata
 	const stateIcon = getStateIcon(session.state);
 	w(`${stateIcon} State: ${session.state}\n`);
 	w(`Last activity: ${formatDuration(data.timeSinceLastActivity)} ago\n`);
-	w(`Task: ${session.taskId}\n`);
+	w(`Task: ${accent(session.taskId)}\n`);
 	w(`Capability: ${session.capability}\n`);
-	w(`Branch: ${session.branchName}\n`);
+	w(`Branch: ${accent(session.branchName)}\n`);
 	if (session.parentAgent) {
-		w(`Parent: ${session.parentAgent} (depth: ${session.depth})\n`);
+		w(`Parent: ${accent(session.parentAgent)} (depth: ${session.depth})\n`);
 	}
 	w(`Started: ${session.startedAt}\n`);
-	w(`Tmux: ${session.tmuxSession}\n`);
+	w(`Tmux: ${accent(session.tmuxSession)}\n`);
 	w("\n");
 
 	// Current file
@@ -376,7 +377,7 @@ async function executeInspect(agentName: string, opts: InspectOpts): Promise<voi
 				tmuxLines: 30,
 			});
 			if (json) {
-				process.stdout.write(`${JSON.stringify(data, null, "\t")}\n`);
+				jsonOutput("inspect", data as unknown as Record<string, unknown>);
 			} else {
 				printInspectData(data);
 			}
@@ -386,7 +387,7 @@ async function executeInspect(agentName: string, opts: InspectOpts): Promise<voi
 		// Single snapshot
 		const data = await gatherInspectData(root, agentName, { limit, noTmux, tmuxLines: 30 });
 		if (json) {
-			process.stdout.write(`${JSON.stringify(data, null, "\t")}\n`);
+			jsonOutput("inspect", data as unknown as Record<string, unknown>);
 		} else {
 			printInspectData(data);
 		}

package/src/commands/logs.test.ts

@@ -281,13 +281,12 @@ describe("logsCommand", () => {
 		});
 
 		// Parse JSON output
-		const parsed: unknown = JSON.parse(output.trim());
-		expect(Array.isArray(parsed)).toBe(true);
+		const parsed = JSON.parse(output.trim()) as { entries: LogEvent[] };
+		expect(Array.isArray(parsed.entries)).toBe(true);
 
-		const arr = parsed as LogEvent[];
-		expect(arr).toHaveLength(2);
-		expect(arr[0]?.event).toBe("tool.start");
-		expect(arr[1]?.event).toBe("spawn.failed");
+		expect(parsed.entries).toHaveLength(2);
+		expect(parsed.entries[0]?.event).toBe("tool.start");
+		expect(parsed.entries[1]?.event).toBe("spawn.failed");
 	});
 
 	test("filters by --since with ISO timestamp", async () => {

package/src/commands/logs.ts

@@ -13,6 +13,7 @@ import { join } from "node:path";
 import { Command } from "commander";
 import { loadConfig } from "../config.ts";
 import { ValidationError } from "../errors.ts";
+import { jsonOutput } from "../json.ts";
 import type { ColorFn } from "../logging/color.ts";
 import { color } from "../logging/color.ts";
 import type { LogEvent } from "../types.ts";
@@ -500,7 +501,7 @@ async function executeLogs(opts: LogsOpts): Promise<void> {
 	const limited = filtered.slice(-limit);
 
 	if (json) {
-		process.stdout.write(`${JSON.stringify(limited)}\n`);
+		jsonOutput("logs", { entries: limited });
 		return;
 	}
 

package/src/commands/mail.test.ts

@@ -10,6 +10,7 @@ import { mkdir, mkdtemp, readdir, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { createEventStore } from "../events/store.ts";
+import { stripAnsi } from "../logging/color.ts";
 import { createMailClient } from "../mail/client.ts";
 import { createMailStore } from "../mail/store.ts";
 import type { StoredEvent } from "../types.ts";
@@ -851,9 +852,9 @@ describe("mailCommand", () => {
 			]);
 
 			expect(output).toContain("Broadcast sent to 3 recipients (@all)");
-			expect(output).toContain("→ builder-1");
-			expect(output).toContain("→ builder-2");
-			expect(output).toContain("→ scout-1");
+			expect(stripAnsi(output)).toContain("→ builder-1");
+			expect(stripAnsi(output)).toContain("→ builder-2");
+			expect(stripAnsi(output)).toContain("→ scout-1");
 			expect(output).not.toContain("orchestrator"); // sender excluded
 
 			// Verify messages were actually stored
@@ -881,8 +882,8 @@ describe("mailCommand", () => {
 			]);
 
 			expect(output).toContain("Broadcast sent to 2 recipients (@builders)");
-			expect(output).toContain("→ builder-1");
-			expect(output).toContain("→ builder-2");
+			expect(stripAnsi(output)).toContain("→ builder-1");
+			expect(stripAnsi(output)).toContain("→ builder-2");
 			expect(output).not.toContain("scout-1");
 
 			// Verify messages
@@ -909,7 +910,7 @@ describe("mailCommand", () => {
 			]);
 
 			expect(output).toContain("Broadcast sent to 1 recipient (@scouts)");
-			expect(output).toContain("→ scout-1");
+			expect(stripAnsi(output)).toContain("→ scout-1");
 
 			const store = createMailStore(join(tempDir, ".overstory", "mail.db"));
 			const client = createMailClient(store);
@@ -935,8 +936,8 @@ describe("mailCommand", () => {
 			]);
 
 			expect(output).toContain("Broadcast sent to 2 recipients (@builder)");
-			expect(output).toContain("→ builder-1");
-			expect(output).toContain("→ builder-2");
+			expect(stripAnsi(output)).toContain("→ builder-1");
+			expect(stripAnsi(output)).toContain("→ builder-2");
 		});
 
 		test("sender is excluded from broadcast recipients", async () => {
@@ -956,8 +957,8 @@ describe("mailCommand", () => {
 			]);
 
 			expect(output).toContain("Broadcast sent to 1 recipient (@builders)");
-			expect(output).toContain("→ builder-2");
-			expect(output).not.toContain("builder-1");
+			expect(stripAnsi(output)).toContain("→ builder-2");
+			expect(stripAnsi(output)).not.toContain("→ builder-1");
 
 			const store = createMailStore(join(tempDir, ".overstory", "mail.db"));
 			const client = createMailClient(store);

package/src/commands/mail.ts

@@ -11,7 +11,8 @@ import { Command } from "commander";
 import { resolveProjectRoot } from "../config.ts";
 import { ValidationError } from "../errors.ts";
 import { createEventStore } from "../events/store.ts";
-import { printHint, printSuccess } from "../logging/color.ts";
+import { jsonOutput } from "../json.ts";
+import { accent, printHint, printSuccess } from "../logging/color.ts";
 import { isGroupAddress, resolveGroupAddress } from "../mail/broadcast.ts";
 import { createMailClient } from "../mail/client.ts";
 import { createMailStore } from "../mail/store.ts";
@@ -36,7 +37,7 @@ function formatMessage(msg: MailMessage): string {
 	const readMarker = msg.read ? " " : "*";
 	const priorityTag = msg.priority !== "normal" ? ` [${msg.priority.toUpperCase()}]` : "";
 	const lines: string[] = [
-		`${readMarker} ${msg.id}  From: ${msg.from} → To: ${msg.to}${priorityTag}`,
+		`${readMarker} ${accent(msg.id)}  From: ${accent(msg.from)} → To: ${accent(msg.to)}${priorityTag}`,
 		`  Subject: ${msg.subject}  (${msg.type})`,
 		`  ${msg.body}`,
 	];
@@ -369,9 +370,7 @@ async function handleSend(opts: SendOpts, cwd: string): Promise<void> {
 
 			// Output broadcast summary
 			if (opts.json) {
-				process.stdout.write(
-					`${JSON.stringify({ messageIds, recipientCount: recipients.length })}\n`,
-				);
+				jsonOutput("mail send", { messageIds, recipientCount: recipients.length });
 			} else {
 				process.stdout.write(
 					`Broadcast sent to ${recipients.length} recipient${recipients.length === 1 ? "" : "s"} (${to})\n`,
@@ -379,7 +378,7 @@ async function handleSend(opts: SendOpts, cwd: string): Promise<void> {
 				for (let i = 0; i < recipients.length; i++) {
 					const recipient = recipients[i];
 					const msgId = messageIds[i];
-					process.stdout.write(`   → ${recipient} (${msgId})\n`);
+					process.stdout.write(`   → ${accent(recipient)} (${accent(msgId)})\n`);
 				}
 			}
 
@@ -428,7 +427,7 @@ async function handleSend(opts: SendOpts, cwd: string): Promise<void> {
 		}
 
 		if (opts.json) {
-			process.stdout.write(`${JSON.stringify({ id })}\n`);
+			jsonOutput("mail send", { id });
 		} else {
 			printSuccess("Sent message", id);
 		}
@@ -557,7 +556,7 @@ async function handleCheck(opts: CheckOpts, cwd: string): Promise<void> {
 			const messages = client.check(agent);
 
 			if (json) {
-				process.stdout.write(`${JSON.stringify(messages)}\n`);
+				jsonOutput("mail check", { messages });
 			} else if (messages.length === 0) {
 				printHint("No new messages");
 			} else {
@@ -592,7 +591,7 @@ function handleList(opts: ListOpts, cwd: string): void {
 		const messages = client.list({ from, to, unread });
 
 		if (json) {
-			process.stdout.write(`${JSON.stringify(messages)}\n`);
+			jsonOutput("mail list", { messages });
 		} else if (messages.length === 0) {
 			printHint("No messages found");
 		} else {
@@ -614,7 +613,7 @@ function handleRead(id: string, cwd: string): void {
 	try {
 		const { alreadyRead } = client.markRead(id);
 		if (alreadyRead) {
-			printHint(`Message ${id} was already read`);
+			printHint(`Message ${accent(id)} was already read`);
 		} else {
 			printSuccess("Marked as read", id);
 		}
@@ -633,7 +632,7 @@ function handleReply(id: string, opts: ReplyOpts, cwd: string): void {
 		const replyId = client.reply(id, body, from);
 
 		if (opts.json) {
-			process.stdout.write(`${JSON.stringify({ id: replyId })}\n`);
+			jsonOutput("mail reply", { id: replyId });
 		} else {
 			printSuccess("Reply sent", replyId);
 		}
@@ -673,7 +672,7 @@ function handlePurge(opts: PurgeOpts, cwd: string): void {
 		const purged = store.purge({ all, olderThanMs, agent });
 
 		if (json) {
-			process.stdout.write(`${JSON.stringify({ purged })}\n`);
+			jsonOutput("mail purge", { purged });
 		} else {
 			printSuccess(`Purged ${purged} message(s)`);
 		}