@adeildo/pi-look 5.11.2 → 5.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adeildo/pi-look",
-	"version": "5.11.2",
+	"version": "5.12.1",
 	"description": "Pi's start screen, a framed editor and the footer, redrawn around the data that matters and painted only with the theme's colours.",
 	"keywords": [
 		"pi",
@@ -38,7 +38,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@adeildo/pi-kit": "5.11.2"
+		"@adeildo/pi-kit": "5.12.1"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",

package/src/index.ts

@@ -1,10 +1,11 @@
 import { dirname, join } from "node:path";
 
 import {
-	accountStateOf,
+	ACCOUNT,
+	type AccountState,
 	createApp,
-	currentPeers,
-	currentTasks,
+	PEERS,
+	TASKS,
 	defineFeature,
 	drawSkillRefs,
 	type FeatureScope,
@@ -321,7 +322,7 @@ function createScreen(
 			const snapshot = reader.read(ctx, {
 				branch: live.footerData?.getGitBranch() ?? null,
 				git: live.git,
-				account: accountStateOf(scope.events, ctx.model?.provider),
+				account: accountOf(scope, ctx.model?.provider),
 				request: telemetry.request(),
 				last: telemetry.last(),
 				run: telemetry.run(),
@@ -353,18 +354,22 @@ function createScreen(
 		decorate: (line) => {
 			const theme = live.ctx?.ui.theme;
 			if (theme === undefined) return line;
-			return drawSkillRefs(line, skillNames(scope.events), (name) =>
+			return drawSkillRefs(line, skillNames(scope), (name) =>
 				theme.fg("customMessageLabel", `${SKILL_REF}${name}`),
 			);
 		},
-		skills: () => skillNames(scope.events).length > 0,
+		skills: () => skillNames(scope).length > 0,
 	};
 }
 
+function accountOf(scope: FeatureScope, provider: string | undefined): AccountState | undefined {
+	return provider === undefined ? undefined : ACCOUNT.current(scope, provider);
+}
+
 function tasksOf(scope: FeatureScope): Pick<LiveInputs, "tasks" | "peers" | "peersUnread"> {
-	const peers = currentPeers(scope.events);
+	const peers = PEERS.current(scope);
 	return {
-		tasks: currentTasks(scope.events)?.state,
+		tasks: TASKS.current(scope)?.state,
 		peers: peers?.peers,
 		peersUnread: peers?.unread,
 	};

package/src/render/format.ts

@@ -1,6 +1,6 @@
-import { isAbsolute, relative, resolve, sep } from "node:path";
+import { sep } from "node:path";
 
-import { formatCost, formatTokens } from "@adeildo/pi-kit";
+import { formatCost, formatTokens, tildify } from "@adeildo/pi-kit";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 
 export const CELL = {
@@ -57,7 +57,7 @@ export function percent(value: number): string {
 }
 
 export function shortenPath(cwd: string, home: string | undefined, maxWidth: number): string {
-	const full = home === undefined ? cwd : underHome(cwd, home);
+	const full = home === undefined ? cwd : tildify(cwd, home);
 	if (maxWidth <= 0 || visibleWidth(full) <= maxWidth) return full;
 
 	const parts = full.split(sep);
@@ -104,14 +104,6 @@ export function tabs(text: string): string {
 	return text.replace(/\t/g, "   ");
 }
 
-function underHome(cwd: string, home: string): string {
-	const rest = relative(resolve(home), resolve(cwd));
-	const inside =
-		rest === "" || (rest !== ".." && !rest.startsWith(`..${sep}`) && !isAbsolute(rest));
-	if (!inside) return cwd;
-	return rest === "" ? "~" : `~${sep}${rest}`;
-}
-
 function trim(fixed: string): string {
 	return fixed.endsWith(".0") ? fixed.slice(0, -2) : fixed;
 }

package/src/render/glyphs.ts

@@ -37,6 +37,8 @@ export interface Glyphs {
 	empty: string;
 	levels: readonly string[];
 	ellipsis: string;
+	/** Between the agents of the folder and those of each shared room. */
+	apart: string;
 }
 
 const COMMON = {
@@ -48,6 +50,7 @@ const COMMON = {
 	conflicted: "!",
 	sent: "↑",
 	received: "↓",
+	apart: "│",
 };
 
 export const NERD: Glyphs = {
@@ -114,6 +117,7 @@ export const UNICODE: Glyphs = {
 
 export const ASCII: Glyphs = {
 	set: "ascii",
+	apart: "|",
 	folder: "",
 	branch: "",
 	host: "@",

package/src/render/segments.ts

@@ -160,7 +160,7 @@ export const SEGMENTS: Record<BuiltinSegment, Segment> = {
 	peers: {
 		priority: 25,
 		describe:
-			"the other agents in this folder, each by the name it chose and in its colour, then @ how many messages wait for an answer",
+			"the other agents in this folder, then those of each shared room after a rule, each by the name it chose and in its colour, then @ how many messages wait for an answer",
 		// The whole folder, then one name, then the bare mark, as the line runs out of room.
 		render: ({ snapshot, glyphs, paint }) => {
 			const peers = snapshot.peers;
@@ -170,7 +170,12 @@ export const SEGMENTS: Record<BuiltinSegment, Segment> = {
 			if (first === undefined) return mentions === "" ? undefined : { text: mentions };
 			const named = (peer: PeerMark) => paint.raw(peer.color, `${glyphs.peers} ${peer.handle}`);
 			const rest = peers.length > 1 ? paint.dim(` +${peers.length - 1}`) : "";
-			const full = joined([...peers].map(named).join("  "), mentions);
+			const rooms = new Map<string, string[]>();
+			for (const peer of peers)
+				rooms.set(peer.room ?? "", [...(rooms.get(peer.room ?? "") ?? []), named(peer)]);
+			const apart = `  ${paint.dim(glyphs.apart)}  `;
+			const groups = [...rooms.values()].map((group) => group.join("  "));
+			const full = joined(groups.join(apart), mentions);
 			const short = joined(named(first) + rest, mentions);
 			const least = joined(paint.raw(first.color, glyphs.peers), mentions);
 			return {

package/src/render/streaming.ts

@@ -1,11 +1,10 @@
 import { readFileSync, statSync } from "node:fs";
-import { homedir } from "node:os";
 import { resolve } from "node:path";
 
 // While the model writes an edit or a write, pi shows the path, or the first lines of the file,
 // which stopped changing long ago. These show the end instead: the lines arriving, with a cursor
 // where the model is writing, and what it has written so far on the bottom rule.
-import { GLYPH, isObject } from "@adeildo/pi-kit";
+import { GLYPH, isObject, tildify } from "@adeildo/pi-kit";
 import { getLanguageFromPath, highlightCode, type Theme } from "@earendil-works/pi-coding-agent";
 import { stripTerminalSequences } from "@earendil-works/pi-tui";
 
@@ -154,9 +153,7 @@ function pathLine(tool: string, path: string | undefined, theme: Theme): string
 	const title = theme.fg("toolTitle", theme.bold(tool));
 	// Pi's own stand-in for a path not written yet.
 	if (path === undefined) return `${title} ${theme.fg("toolOutput", "...")}`;
-	const home = homedir();
-	const shown = path.startsWith(home) ? `~${path.slice(home.length)}` : path;
-	return `${title} ${theme.fg("accent", printable(shown))}`;
+	return `${title} ${theme.fg("accent", printable(tildify(path)))}`;
 }
 
 /**

package/src/ui/tool-frame.ts

@@ -4,11 +4,9 @@ import {
 	CUT,
 	type CallRuling,
 	type FeatureScope,
-	FRAMED,
-	isObject,
-	RULING_CHANGED,
+	CALLS_FRAMED,
+	RULING,
 	type RulingTone,
-	rulingOf,
 	GLYPH,
 	LINE,
 } from "@adeildo/pi-kit";
@@ -48,12 +46,8 @@ export function registerToolFrames(scope: FeatureScope): void {
 	const written = new Map<string, number>();
 	// The set is asked for on every drawing of every frame, and it changes only with the setting.
 	const set = glyphsOf(() => icons.get(scope));
-	scope.events.on(FRAMED, (data) => {
-		if (isObject(data)) data.framed = true;
-	});
-	scope.events.on(RULING_CHANGED, (data) => {
-		if (isObject(data) && typeof data.toolCallId === "string") redraws.get(data.toolCallId)?.();
-	});
+	CALLS_FRAMED.provide(scope, () => true);
+	RULING.onChanged(scope, (_ruling, toolCallId) => redraws.get(toolCallId)?.());
 	// Pi completes every call of a message only when the message ends, so a call the model finished
 	// before writing the next one would go on writing. The provider says when each one ends. Pi tells
 	// the extensions first and hands every call its arguments right after, which draws the frame.
@@ -119,7 +113,7 @@ function framed(
 			else clock.writtenAt ??= ended ?? now;
 			if (context.executionStarted) clock.startedAt ??= now;
 			const writing = clock.writtenAt === undefined;
-			const ruling = rulingOf(scope.events, context.toolCallId);
+			const ruling = RULING.current(scope, context.toolCallId);
 
 			// Pi hands every call of a message its arguments again on each piece the model writes, so a
 			// call that did not change keeps the frame it has, and its renderer is not asked again.
@@ -178,7 +172,7 @@ function framed(
 		renderResult(shown, options, theme, context) {
 			const clock = clockOf(context);
 			// A blocked call prints nothing but the reason the line above already gives.
-			const blocked = rulingOf(scope.events, context.toolCallId)?.blocked === true;
+			const blocked = RULING.current(scope, context.toolCallId)?.blocked === true;
 			// Pi draws the pictures of a result right below the frame, so the frame counts them.
 			const images = shown.content.filter((block) => block.type === "image").length;
 			if (!options.isPartial) clock.endedAt ??= Date.now();