@gavin-hu/my-pi-agent 0.8.1 → 0.10.0

package/extensions/job/format.ts

@@ -14,7 +14,8 @@
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { GLYPHS } from "../../lib/ui.ts";
+import { GLYPHS, SEPARATORS } from "../../lib/tui/glyphs.ts";
+import { paint, type TuiRole } from "../../lib/tui/tokens.ts";
 import type { JobRecord, JobStatus } from "./types.ts";
 
 /** Longest sanitized log line kept for display; longer lines are clipped. */
@@ -76,22 +77,43 @@ export function elapsedMs(job: JobRecord, now: number): number {
 	return (job.finishedAt ?? now) - job.startedAt;
 }
 
-/** Width-1 themed glyph for a status. */
-export function statusGlyph(status: JobStatus, theme: Theme): string {
+/** The design role a job status is drawn in. */
+export function statusRole(status: JobStatus): TuiRole {
 	switch (status) {
 		case "exited":
-			return theme.fg("success", GLYPHS.check);
+			return "ok";
 		case "failed":
-			return theme.fg("error", GLYPHS.jobsFailure);
+			return "bad";
 		case "killed":
-			return theme.fg("muted", GLYPHS.killed);
+			return "meta";
 		case "unknown":
-			return theme.fg("dim", GLYPHS.unknown);
+			return "faint";
 		default:
-			return theme.fg("accent", GLYPHS.jobsRunning);
+			return "accent";
 	}
 }
 
+/** Width-1 glyph for a status, from the shared vocabulary. */
+export function statusGlyphChar(status: JobStatus): string {
+	switch (status) {
+		case "exited":
+			return GLYPHS.check;
+		case "failed":
+			return GLYPHS.jobsFailure;
+		case "killed":
+			return GLYPHS.killed;
+		case "unknown":
+			return GLYPHS.unknown;
+		default:
+			return GLYPHS.jobsRunning;
+	}
+}
+
+/** Width-1 themed glyph for a status. */
+export function statusGlyph(status: JobStatus, theme: Theme): string {
+	return paint(theme, statusRole(status), statusGlyphChar(status));
+}
+
 /** Short status word for text output. */
 function statusWord(job: JobRecord): string {
 	if (job.status === "failed" && job.exitCode !== null) return `failed (exit ${job.exitCode})`;
@@ -229,18 +251,19 @@ export function jobOutcome(job: JobRecord): string {
 
 /** One-line outcome for a single job, themed for the transcript result. */
 export function formatJobOutcomeLine(job: JobRecord, theme: Theme, now = Date.now()): string {
-	const sep = theme.fg("dim", " · ");
-	const outcome = job.status === "failed" ? theme.fg("error", jobOutcome(job)) : theme.fg("dim", jobOutcome(job));
+	const sep = paint(theme, "faint", SEPARATORS.item);
+	const outcome =
+		job.status === "failed" ? paint(theme, "bad", jobOutcome(job)) : paint(theme, "faint", jobOutcome(job));
 	return (
 		statusGlyph(job.status, theme) +
 		" " +
-		theme.fg("accent", job.id) +
+		paint(theme, "accent", job.id) +
 		" " +
-		theme.fg("muted", shortLabel(job)) +
+		paint(theme, "meta", shortLabel(job)) +
 		sep +
 		outcome +
 		sep +
-		theme.fg("dim", formatDuration(elapsedMs(job, now)))
+		paint(theme, "faint", formatDuration(elapsedMs(job, now)))
 	);
 }
 

package/extensions/job/index.ts

@@ -4,18 +4,19 @@
  * Registers the `job` tool and `/jobs` command. Jobs run as detached shell
  * processes with their output streamed to log files; the status chip shows
  * running and unreported-failure counts, and finished jobs are reported to the
- * model at the next turn (or, for `wake` jobs, by triggering one turn).
+ * model — and shown as a bytefly notice — at the next turn, or by triggering one
+ * turn for a `wake` job.
  *
  * Load with:  pi --extension ./extensions/job
  */
 
-import type { AgentMessage } from "@earendil-works/pi-agent-core";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { isExtensionEnabled } from "../../lib/env.ts";
 import { JOB_FINISHED_CHANNEL, type JobFinishedEvent } from "../../lib/events.ts";
-import { STATUS_KEYS } from "../../lib/ui.ts";
+import { noticeMessage, type NoticeMessage, pruneStaleNotices } from "../../lib/notice.ts";
+import { STATUS_KEYS } from "../../lib/tui/glyphs.ts";
 import { registerCommands } from "./commands.ts";
-import { formatCompletion } from "./format.ts";
+import { formatCompletion, jobOutcome, shortLabel } from "./format.ts";
 import { createJobsRuntime, type JobsRuntime } from "./runtime.ts";
 import { registerTools } from "./tools.ts";
 import type { Job, JobRecord } from "./types.ts";
@@ -23,16 +24,26 @@ import type { Job, JobRecord } from "./types.ts";
 /** Marker embedded in the injected completion context. */
 const JOB_CONTEXT_MARKER = "[BACKGROUND JOBS]";
 
-/** Custom-entry type used for the injected completion message. */
-export const JOB_CONTEXT_TYPE = "job-context";
-
 function buildContext(jobs: JobRecord[]): string {
 	const lines = jobs.map((job) => formatCompletion(job));
 	return `${JOB_CONTEXT_MARKER}\n${jobs.length} background job${jobs.length === 1 ? "" : "s"} finished:\n${lines.join("\n")}\nRun \`job logs <id>\` for output.`;
 }
 
-function isJobContext(message: AgentMessage): boolean {
-	return (message as AgentMessage & { customType?: string }).customType === JOB_CONTEXT_TYPE;
+/** The shared notice for pending completions: model text plus renderer details. */
+function jobNotice(jobs: JobRecord[]): NoticeMessage {
+	const count = jobs.length;
+	return noticeMessage({
+		content: buildContext(jobs),
+		details: {
+			source: "job",
+			title: `${count} background job${count === 1 ? "" : "s"} finished`,
+			items: jobs.map((job) => ({
+				label: `${job.id} ${shortLabel(job)}`,
+				detail: jobOutcome(job),
+				severity: job.status === "failed" ? "bad" : job.status === "exited" ? "ok" : "warn",
+			})),
+		},
+	});
 }
 
 /** Trim a finished record to the fields the event bus carries. */
@@ -67,10 +78,7 @@ export default function jobs(pi: ExtensionAPI, deps: JobsDeps = {}): void {
 		const pending = runtime.pendingCompletions();
 		if (pending.length === 0) return;
 		try {
-			pi.sendMessage(
-				{ customType: JOB_CONTEXT_TYPE, content: buildContext(pending), display: false },
-				{ triggerTurn: true },
-			);
+			pi.sendMessage(jobNotice(pending), { triggerTurn: true });
 			// Mark only once the send succeeded; a throw leaves them for the next turn.
 			runtime.markReported(pending.map((job) => job.id));
 		} catch {
@@ -113,17 +121,14 @@ export default function jobs(pi: ExtensionAPI, deps: JobsDeps = {}): void {
 		if (pending.length === 0) return undefined;
 		runtime.markReported(pending.map((job) => job.id));
 		runtime.setStatus(ctx);
-		return {
-			message: { customType: JOB_CONTEXT_TYPE, content: buildContext(pending), display: false },
-		};
+		return { message: jobNotice(pending) };
 	});
 
-	// Keep stale completion notes out of later turns.
+	// Keep stale completion notices out of later turns. Only this extension's
+	// notices are pruned; another source's are left for its own handler.
 	pi.on("context", (event) => {
-		const contexts = event.messages.filter(isJobContext);
-		if (contexts.length <= 1) return undefined;
-		const last = contexts[contexts.length - 1];
-		return { messages: event.messages.filter((message) => !isJobContext(message) || message === last) };
+		const pruned = pruneStaleNotices(event.messages, "job");
+		return pruned ? { messages: pruned } : undefined;
 	});
 
 	pi.on("session_shutdown", async (_event, ctx) => {

package/extensions/job/tools.ts

@@ -9,7 +9,9 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { sanitizeLine } from "../../lib/format.ts";
-import { reuseText, toolDetails } from "../../lib/tui.ts";
+import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
+import { SEPARATORS } from "../../lib/tui/glyphs.ts";
+import { paint } from "../../lib/tui/tokens.ts";
 import {
 	compareJobs,
 	formatCallText,
@@ -208,8 +210,9 @@ export function registerTools(pi: ExtensionAPI, runtime: JobsRuntime): void {
 			const text = reuseText(context.lastComponent);
 			text.setText(
 				theme.fg("toolTitle", theme.bold(`${TOOL_NAME} `)) +
-					theme.fg(
-						"muted",
+					paint(
+						theme,
+						"meta",
 						sanitizeLine(formatCallText(action, args as Record<string, unknown>, context.argsComplete)),
 					),
 			);
@@ -225,20 +228,20 @@ export function registerTools(pi: ExtensionAPI, runtime: JobsRuntime): void {
 				return text;
 			}
 			if (details.error) {
-				text.setText(theme.fg("error", `Error: ${sanitizeLine(details.error)}`));
+				text.setText(paint(theme, "bad", `Error: ${sanitizeLine(details.error)}`));
 				return text;
 			}
 
 			if (options.isPartial) {
 				const id = details.job?.id;
-				text.setText(theme.fg("warning", id ? `Waiting on ${id}…` : "Waiting…"));
+				text.setText(paint(theme, "warn", id ? `Waiting on ${id}…` : "Waiting…"));
 				return text;
 			}
 
 			if (details.action === "logs" && details.logs !== undefined) {
 				const all = details.logs === "" ? [] : details.logs.split("\n");
 				if (all.length === 0) {
-					text.setText(theme.fg("muted", "No output yet."));
+					text.setText(paint(theme, "meta", "No output yet."));
 					return text;
 				}
 				const shown = options.expanded ? all : all.slice(Math.max(0, all.length - RESULT_ROWS));
@@ -250,7 +253,7 @@ export function registerTools(pi: ExtensionAPI, runtime: JobsRuntime): void {
 
 			if (details.action === "list" && details.jobs) {
 				if (details.jobs.length === 0) {
-					text.setText(theme.fg("muted", "No jobs."));
+					text.setText(paint(theme, "meta", "No jobs."));
 					return text;
 				}
 				const ordered = [...details.jobs].sort(compareJobs);
@@ -264,7 +267,7 @@ export function registerTools(pi: ExtensionAPI, runtime: JobsRuntime): void {
 			if (details.action === "clear") {
 				const count = details.cleared ?? 0;
 				text.setText(
-					theme.fg("muted", count === 0 ? "Nothing to clear." : `Cleared ${count} job${count === 1 ? "" : "s"}.`),
+					paint(theme, "meta", count === 0 ? "Nothing to clear." : `Cleared ${count} job${count === 1 ? "" : "s"}.`),
 				);
 				return text;
 			}
@@ -272,16 +275,16 @@ export function registerTools(pi: ExtensionAPI, runtime: JobsRuntime): void {
 			if (details.job) {
 				let line = formatJobOutcomeLine(details.job, theme);
 				if (details.action === "wait" && details.timedOut) {
-					line += theme.fg("warning", " · still running after the timeout");
+					line += paint(theme, "warn", " · still running after the timeout");
 				} else if (details.action === "wait" && details.cancelled) {
-					line += theme.fg("warning", " · wait cancelled; job still running");
+					line += paint(theme, "warn", " · wait cancelled; job still running");
 				} else if (details.action === "kill" && details.signalled) {
-					line += theme.fg("warning", ` · ${details.signal ?? "SIGTERM"} sent`);
+					line += paint(theme, "warn", ` · ${details.signal ?? "SIGTERM"} sent`);
 				} else if (details.action === "start") {
 					const badges: string[] = [];
 					if (details.job.detached) badges.push("detached");
 					if (details.job.wake) badges.push("wake");
-					if (badges.length > 0) line += theme.fg("dim", ` · ${badges.join(" · ")}`);
+					if (badges.length > 0) line += paint(theme, "faint", `${SEPARATORS.item}${badges.join(SEPARATORS.item)}`);
 				}
 				text.setText(line);
 				return text;