@selesai/code 0.10.2 → 0.11.0

package/dist/extensions/pi-web-agent/src/types.ts

@@ -1,88 +1,88 @@
-import type { PresentationEnvelope } from './presentation/types.js';
-
-export const TOOL_STATUSES = [
-  'ok',
-  'needs_headless',
-  'blocked',
-  'unsupported',
-  'error'
-] as const;
-
-export type ToolStatus = (typeof TOOL_STATUSES)[number];
-
-export type SearchResult = {
-  title: string;
-  url: string;
-  snippet: string;
-};
-
-export type ToolError = {
-  code: string;
-  message: string;
-};
-
-export type SearchMetadata = {
-  backend: 'duckduckgo' | 'searxng' | 'brave';
-  cacheHit: boolean;
-  fallbackFrom?: 'searxng' | 'brave';
-  fallbackReason?: string;
-};
-
-export type FetchMetadata = {
-  method: 'http' | 'headless' | 'firecrawl';
-  cacheHit: boolean;
-  fallbackFrom?: 'firecrawl';
-  fallbackReason?: string;
-  contentType?: string;
-  truncated?: boolean;
-  browser?: 'configured' | 'chrome' | 'edge' | 'brave' | 'chromium';
-  navigationMs?: number;
-};
-
-export type ExtractedContent = {
-  title?: string;
-  byline?: string;
-  text: string;
-};
-
-export type WebSearchResponse = {
-  status: 'ok' | 'error';
-  results: SearchResult[];
-  metadata: SearchMetadata;
-  presentation?: PresentationEnvelope;
-  error?: ToolError;
-};
-
-export type WebFetchResponse = {
-  status: ToolStatus;
-  url: string;
-  content?: ExtractedContent;
-  metadata: FetchMetadata;
-  presentation?: PresentationEnvelope;
-  error?: ToolError;
-};
-
-export type WebFetchHeadlessResponse = {
-  status: Exclude<ToolStatus, 'needs_headless'>;
-  url: string;
-  content?: ExtractedContent;
-  metadata: FetchMetadata;
-  presentation?: PresentationEnvelope;
-  error?: ToolError;
-};
-
-export type WebExploreResponse = {
-  status: 'ok' | 'error';
-  findings: string[];
-  sources: Array<{ title: string; url: string; method?: 'http' | 'headless' | 'firecrawl' }>;
-  caveat?: string;
-  metadata?: {
-    searchPasses: number;
-    fetchedPages: number;
-    headlessAttempts: number;
-    exhaustedBudget: boolean;
-    caveatReasons?: string[];
-  };
-  presentation?: PresentationEnvelope;
-  error?: ToolError;
-};
+import type { PresentationEnvelope } from './presentation/types.js';
+
+export const TOOL_STATUSES = [
+  'ok',
+  'needs_headless',
+  'blocked',
+  'unsupported',
+  'error'
+] as const;
+
+export type ToolStatus = (typeof TOOL_STATUSES)[number];
+
+export type SearchResult = {
+  title: string;
+  url: string;
+  snippet: string;
+};
+
+export type ToolError = {
+  code: string;
+  message: string;
+};
+
+export type SearchMetadata = {
+  backend: 'duckduckgo' | 'searxng' | 'brave';
+  cacheHit: boolean;
+  fallbackFrom?: 'searxng' | 'brave';
+  fallbackReason?: string;
+};
+
+export type FetchMetadata = {
+  method: 'http' | 'headless' | 'firecrawl';
+  cacheHit: boolean;
+  fallbackFrom?: 'firecrawl';
+  fallbackReason?: string;
+  contentType?: string;
+  truncated?: boolean;
+  browser?: 'configured' | 'chrome' | 'edge' | 'brave' | 'chromium';
+  navigationMs?: number;
+};
+
+export type ExtractedContent = {
+  title?: string;
+  byline?: string;
+  text: string;
+};
+
+export type WebSearchResponse = {
+  status: 'ok' | 'error';
+  results: SearchResult[];
+  metadata: SearchMetadata;
+  presentation?: PresentationEnvelope;
+  error?: ToolError;
+};
+
+export type WebFetchResponse = {
+  status: ToolStatus;
+  url: string;
+  content?: ExtractedContent;
+  metadata: FetchMetadata;
+  presentation?: PresentationEnvelope;
+  error?: ToolError;
+};
+
+export type WebFetchHeadlessResponse = {
+  status: Exclude<ToolStatus, 'needs_headless'>;
+  url: string;
+  content?: ExtractedContent;
+  metadata: FetchMetadata;
+  presentation?: PresentationEnvelope;
+  error?: ToolError;
+};
+
+export type WebExploreResponse = {
+  status: 'ok' | 'error';
+  findings: string[];
+  sources: Array<{ title: string; url: string; method?: 'http' | 'headless' | 'firecrawl' }>;
+  caveat?: string;
+  metadata?: {
+    searchPasses: number;
+    fetchedPages: number;
+    headlessAttempts: number;
+    exhaustedBudget: boolean;
+    caveatReasons?: string[];
+  };
+  presentation?: PresentationEnvelope;
+  error?: ToolError;
+};

package/dist/extensions/pi-zentui/extensions/zentui/format.ts

@@ -93,9 +93,13 @@ type SessionEntry = {
 	id?: string | number;
 	timestamp?: string | number;
 	usage?: SessionUsage;
+	customType?: string;
+	data?: unknown;
 	message?: {
 		role?: string;
 		usage?: SessionUsage;
+		provider?: string;
+		responseId?: string;
 	};
 };
 
@@ -105,6 +109,16 @@ type SelectedUsage = {
 	isAssistant: boolean;
 };
 
+/** A cost-reconcile entry written by the cost-reconcile extension. */
+export type CostReconcileData = {
+	version?: number;
+	provider?: string;
+	model?: string;
+	responseId?: string;
+	cost?: number;
+	reconciledAt?: number;
+};
+
 type UsageCacheEntry = {
 	key: string;
 	totals: UsageTotals;
@@ -206,6 +220,15 @@ function normalizedUsage(usage: SessionUsage | undefined) {
 }
 
 function entryIdentity(entry: SessionEntry): string {
+	if (entry.type === "custom") {
+		return JSON.stringify([
+			entry.id ?? null,
+			entry.timestamp ?? null,
+			entry.type ?? null,
+			entry.customType ?? null,
+			entry.data ?? null,
+		]);
+	}
 	const selected = usageForEntry(entry);
 	if (!selected) return "unsupported";
 	const usage = normalizedUsage(selected.usage);
@@ -214,6 +237,7 @@ function entryIdentity(entry: SessionEntry): string {
 		entry.timestamp ?? null,
 		entry.type ?? null,
 		entry.message?.role ?? null,
+		entry.customType ?? null,
 		selected.location,
 		usage.input,
 		usage.output,
@@ -236,6 +260,19 @@ function computeUsageTotals(entries: readonly SessionEntry[]): UsageTotals {
 	let latestCacheHitRate: number | undefined;
 	let cost = 0;
 
+	// Costs reconciled from the gateway (authoritative billed amounts) keyed by
+	// `provider:responseId`. When present they replace the rate-card estimate
+	// for that response.
+	const reconciledCosts = new Map<string, number>();
+	for (const entry of entries) {
+		if (entry.type !== "custom" || entry.customType !== "cost-reconcile") continue;
+		const data = entry.data as CostReconcileData | undefined;
+		if (!data || typeof data !== "object") continue;
+		if (typeof data.provider !== "string" || typeof data.responseId !== "string") continue;
+		if (typeof data.cost !== "number" || !Number.isFinite(data.cost) || data.cost < 0) continue;
+		reconciledCosts.set(`${data.provider}:${data.responseId}`, data.cost);
+	}
+
 	for (const entry of entries) {
 		const selected = usageForEntry(entry);
 		if (!selected) continue;
@@ -245,7 +282,15 @@ function computeUsageTotals(entries: readonly SessionEntry[]): UsageTotals {
 		output = addUsageTotal(output, usage.output);
 		cacheRead = addUsageTotal(cacheRead, usage.cacheRead);
 		cacheWrite = addUsageTotal(cacheWrite, usage.cacheWrite);
-		cost = addUsageTotal(cost, usage.cost);
+		const entryCost = usage.cost;
+		let effectiveCost = entryCost;
+		const provider = entry.message?.provider;
+		const responseId = entry.message?.responseId;
+		if (provider && responseId) {
+			const reconciled = reconciledCosts.get(`${provider}:${responseId}`);
+			if (reconciled !== undefined) effectiveCost = reconciled;
+		}
+		cost = addUsageTotal(cost, effectiveCost);
 		if (selected.isAssistant) {
 			latestCacheHitRate = calculateCacheHitRate(usage.input, usage.cacheRead, usage.cacheWrite);
 		}

package/dist/extensions/pi-zentui/extensions/zentui/index.ts

@@ -1385,6 +1385,16 @@ export default function (pi: ExtensionAPI) {
 				// A transcript persistence failure must not break settlement cleanup.
 			}
 		}
+		// Gateway cost reconciliation lands a few seconds after settle; refresh
+		// once late so the cost label picks up authoritative totals when they
+		// arrive. Best-effort: harmless in non-TUI contexts.
+		sessionLifecycle.defer(
+			() => {
+				invalidateUsageTotalsCache();
+				refreshInteractiveState(ctx);
+			},
+			12_000,
+		);
 	});
 	pi.on("tool_execution_start", (event, ctx) => {
 		liveContext.clear();

package/dist/extensions/pi-zentui/extensions/zentui/user-message-styles.ts

@@ -45,7 +45,7 @@ function makeMarkdownTheme(theme: Theme | undefined): MarkdownTheme {
 
 function renderMarkdown(text: string, width: number, theme: Theme | undefined): string[] {
 	const renderer = new Markdown(text, 0, 0, makeMarkdownTheme(theme), {
-		color: (content) => themeFg(theme, "userMessageText", content),
+		color: (content) => themeFg(theme, "accent", content),
 	});
 	const lines = renderer.render(Math.max(1, width));
 	return lines.length > 0 ? lines : [""];

package/dist/extensions/pi-zentui/test/extension-compliance.test.ts

@@ -2157,7 +2157,7 @@ describe("Pi docs compliance", () => {
 		const raw = new UserMessageComponent("hello").render(80).join("\n");
 		expect(raw).toMatch(/\[accent\]│|\u001b\[34m│\u001b\[0m/);
 		expect(raw).toMatch(/\[borderMuted\]────|\u001b\[90m────/);
-		expect(rendered).toContain("[userMessageText]");
+		expect(rendered).toContain("[accent]");
 		expect(rendered).toContain("[bold]");
 		expect(rendered).not.toContain("**zentui**");
 		expect(rendered).not.toContain("claude-sonnet");
@@ -2296,8 +2296,8 @@ describe("Pi docs compliance", () => {
 
 		expect(cachedRender).toBe(firstRender);
 		expect(invalidate).toHaveBeenCalledTimes(1);
-		expect(invalidatedRender).toContain("[second:userMessageText]hello");
-		expect(invalidatedRender).not.toContain("[first:userMessageText]hello");
+		expect(invalidatedRender).toContain("[second:accent]hello");
+		expect(invalidatedRender).not.toContain("[first:accent]hello");
 	});
 
 	it("renders selector borders from their independent canonical color source", () => {

package/dist/extensions/pi-zentui/test/format.test.ts

@@ -58,8 +58,17 @@ function makeAssistantEntry(
 	return makeMessageUsageEntry("assistant", makeUsage(input, output, cost, cacheRead, cacheWrite));
 }
 
-function makeMessageUsageEntry(role: string, usage: TestUsage | undefined) {
-	return { type: "message", message: { role, usage } };
+function makeMessageUsageEntry(role: string, usage: TestUsage | undefined, extra: Record<string, unknown> = {}) {
+	return { type: "message", message: { role, usage, ...extra } };
+}
+
+function makeReconcileEntry(provider: string, responseId: string, cost: number) {
+	return {
+		type: "custom",
+		customType: "cost-reconcile",
+		id: `reconcile-${provider}-${responseId}`,
+		data: { version: 1, provider, model: "test-model", responseId, cost, reconciledAt: 0 },
+	};
 }
 
 function makeSummaryUsageEntry(
@@ -114,6 +123,45 @@ describe("usage formatting", () => {
 		expect(buildCostLabel(totals)).toBe("$26.000");
 	});
 
+	it("prefers reconciled gateway cost over the rate-card estimate", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0.42), {
+			provider: "openrouter",
+			responseId: "gen-abc123",
+		});
+		const reconcile = makeReconcileEntry("openrouter", "gen-abc123", 0.0123);
+		const ctx = makeSessionContext([assistant, reconcile]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.0123);
+		expect(buildCostLabel(totals)).toBe("$0.012");
+	});
+
+	it("keeps the rate-card estimate when no reconcile entry exists", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0.42), {
+			provider: "openrouter",
+			responseId: "gen-abc123",
+		});
+		const ctx = makeSessionContext([assistant]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.42);
+	});
+
+	it("reconcile entries do not double-count when the estimate is zero", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0), {
+			provider: "openrouter",
+			responseId: "gen-abc123",
+		});
+		const reconcile = makeReconcileEntry("openrouter", "gen-abc123", 0.0123);
+		const ctx = makeSessionContext([assistant, reconcile]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.0123);
+	});
+
 	it("formats cache atoms independently and omits zero totals", () => {
 		expect(buildCacheReadLabel(1_200)).toBe("R1.2k");
 		expect(buildCacheWriteLabel(300)).toBe("W300");

package/dist/extensions/ponytail/package.json

@@ -1,8 +1,8 @@
-{
-  "name": "ponytail",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "test": "node --test ./test/*.test.js"
-  }
-}
+{
+  "name": "ponytail",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "test": "node --test ./test/*.test.js"
+  }
+}

package/dist/extensions/question/constants.ts

@@ -1,31 +1,31 @@
-// All constants for the question extension.
-
-import { Key } from "@earendil-works/pi-tui";
-import type { ResolvedShortcut } from "./types.ts";
-
-export const QUESTION_VERSION = "2";
-
-export const SPLIT_PANE_MIN_WIDTH = 84;
-export const SPLIT_PANE_LEFT_MIN_WIDTH = 32;
-export const SPLIT_PANE_RIGHT_MIN_WIDTH = 28;
-export const SPLIT_PANE_SEPARATOR = " │ ";
-
-export const FREEFORM_LABEL = "Type custom answer — enter a custom response";
-export const COMMENT_TOGGLE_LABEL = "Add extra context after selection";
-
-export const DEFAULT_COMMENT_TOGGLE_KEY = "ctrl+g";
-
-export const BOX_BORDER_LEFT = "│ ";
-export const BOX_BORDER_RIGHT = " │";
-export const BOX_BORDER_OVERHEAD = BOX_BORDER_LEFT.length + BOX_BORDER_RIGHT.length;
-
-export const SHORTCUT_DISABLE_VALUES = new Set(["off", "none", "disabled", ""]);
-
-export const DISABLED_SHORTCUT: ResolvedShortcut = {
-	disabled: true,
-	spec: null,
-	matches: ((_data: string) => false) as (data: string) => false,
-};
-
-export const VIM_UP = Key.ctrl("k");
+// All constants for the question extension.
+
+import { Key } from "@earendil-works/pi-tui";
+import type { ResolvedShortcut } from "./types.ts";
+
+export const QUESTION_VERSION = "2";
+
+export const SPLIT_PANE_MIN_WIDTH = 84;
+export const SPLIT_PANE_LEFT_MIN_WIDTH = 32;
+export const SPLIT_PANE_RIGHT_MIN_WIDTH = 28;
+export const SPLIT_PANE_SEPARATOR = " │ ";
+
+export const FREEFORM_LABEL = "Type custom answer — enter a custom response";
+export const COMMENT_TOGGLE_LABEL = "Add extra context after selection";
+
+export const DEFAULT_COMMENT_TOGGLE_KEY = "ctrl+g";
+
+export const BOX_BORDER_LEFT = "│ ";
+export const BOX_BORDER_RIGHT = " │";
+export const BOX_BORDER_OVERHEAD = BOX_BORDER_LEFT.length + BOX_BORDER_RIGHT.length;
+
+export const SHORTCUT_DISABLE_VALUES = new Set(["off", "none", "disabled", ""]);
+
+export const DISABLED_SHORTCUT: ResolvedShortcut = {
+	disabled: true,
+	spec: null,
+	matches: ((_data: string) => false) as (data: string) => false,
+};
+
+export const VIM_UP = Key.ctrl("k");
 export const VIM_DOWN = Key.ctrl("j");

package/dist/extensions/question/helpers.ts

@@ -1,58 +1,58 @@
-// Pure helper functions for the question extension.
-
-import type { PreparedQuestion, QuestionOption, QuestionResponse } from "./types.ts";
-
-export function trimText(value: string | null | undefined): string | undefined {
-	const trimmed = value?.trim();
-	return trimmed || undefined;
-}
-
-export function oneLine(value: unknown, max = 100): string {
-	const text = String(value ?? "").replace(/\s+/g, " ").trim();
-	return text.length > max ? `${text.slice(0, Math.max(0, max - 1))}…` : text;
-}
-
-export function previewText(value: unknown, max = 160, maxLines = 2): string {
-	const lines = String(value ?? "").trim().split(/\r?\n/);
-	const limited = lines.slice(0, maxLines).join("\n");
-	const wasCut = lines.length > maxLines || limited.length > max;
-	const text = limited.length > max ? limited.slice(0, Math.max(0, max - 1)) : limited;
-	return wasCut ? `${text}…` : text;
-}
-
-export function createTextResponse(text: string | null | undefined): QuestionResponse | null {
-	const normalized = trimText(text);
-	return normalized ? { kind: "text", text: normalized } : null;
-}
-
-export function createSelectionResponse(values: string[], otherText?: string | null): QuestionResponse | null {
-	const normalizedValues = values.map((value) => value.trim()).filter(Boolean);
-	const normalizedOther = trimText(otherText);
-	if (normalizedValues.length === 0 && !normalizedOther) return null;
-	return normalizedOther
-		? { kind: "selection", values: normalizedValues, otherText: normalizedOther }
-		: { kind: "selection", values: normalizedValues };
-}
-
-export function formatResponseSummary(response: QuestionResponse): string {
-	if (response.kind === "text") return response.text;
-	return [...response.values, ...(response.otherText ? [response.otherText] : [])].join(", ");
-}
-
-export function formatQuestionResponse(question: PreparedQuestion, response: QuestionResponse): string {
-	if (response.kind === "text") return response.text;
-	const labels = response.values.map(
-		(value) => question.options.find((option) => option.value === value)?.label ?? value,
-	);
-	if (response.otherText) labels.push(`Other: ${response.otherText}`);
-	return labels.join(", ");
-}
-
-export function formatOptionsForMessage(options: QuestionOption[]): string {
-	return options
-		.map((option, index) => {
-			const description = option.description ? ` — ${option.description}` : "";
-			return `${index + 1}. ${option.label}${description}`;
-		})
-		.join("\n");
-}
+// Pure helper functions for the question extension.
+
+import type { PreparedQuestion, QuestionOption, QuestionResponse } from "./types.ts";
+
+export function trimText(value: string | null | undefined): string | undefined {
+	const trimmed = value?.trim();
+	return trimmed || undefined;
+}
+
+export function oneLine(value: unknown, max = 100): string {
+	const text = String(value ?? "").replace(/\s+/g, " ").trim();
+	return text.length > max ? `${text.slice(0, Math.max(0, max - 1))}…` : text;
+}
+
+export function previewText(value: unknown, max = 160, maxLines = 2): string {
+	const lines = String(value ?? "").trim().split(/\r?\n/);
+	const limited = lines.slice(0, maxLines).join("\n");
+	const wasCut = lines.length > maxLines || limited.length > max;
+	const text = limited.length > max ? limited.slice(0, Math.max(0, max - 1)) : limited;
+	return wasCut ? `${text}…` : text;
+}
+
+export function createTextResponse(text: string | null | undefined): QuestionResponse | null {
+	const normalized = trimText(text);
+	return normalized ? { kind: "text", text: normalized } : null;
+}
+
+export function createSelectionResponse(values: string[], otherText?: string | null): QuestionResponse | null {
+	const normalizedValues = values.map((value) => value.trim()).filter(Boolean);
+	const normalizedOther = trimText(otherText);
+	if (normalizedValues.length === 0 && !normalizedOther) return null;
+	return normalizedOther
+		? { kind: "selection", values: normalizedValues, otherText: normalizedOther }
+		: { kind: "selection", values: normalizedValues };
+}
+
+export function formatResponseSummary(response: QuestionResponse): string {
+	if (response.kind === "text") return response.text;
+	return [...response.values, ...(response.otherText ? [response.otherText] : [])].join(", ");
+}
+
+export function formatQuestionResponse(question: PreparedQuestion, response: QuestionResponse): string {
+	if (response.kind === "text") return response.text;
+	const labels = response.values.map(
+		(value) => question.options.find((option) => option.value === value)?.label ?? value,
+	);
+	if (response.otherText) labels.push(`Other: ${response.otherText}`);
+	return labels.join(", ");
+}
+
+export function formatOptionsForMessage(options: QuestionOption[]): string {
+	return options
+		.map((option, index) => {
+			const description = option.description ? ` — ${option.description}` : "";
+			return `${index + 1}. ${option.label}${description}`;
+		})
+		.join("\n");
+}

package/dist/extensions/question/navigation.ts

@@ -1,14 +1,14 @@
-// Vim-style navigation aliases (ctrl+j/k don't collide with fuzzy-search input).
-
-import type { KeybindingsManager } from "@selesai/code";
-import { matchesKey } from "@earendil-works/pi-tui";
-
-import { VIM_DOWN, VIM_UP } from "./constants.ts";
-
-export function matchesUp(data: string, keybindings: KeybindingsManager): boolean {
-	return keybindings.matches(data, "tui.select.up") || matchesKey(data, VIM_UP);
-}
-
-export function matchesDown(data: string, keybindings: KeybindingsManager): boolean {
-	return keybindings.matches(data, "tui.select.down") || matchesKey(data, VIM_DOWN);
-}
+// Vim-style navigation aliases (ctrl+j/k don't collide with fuzzy-search input).
+
+import type { KeybindingsManager } from "@selesai/code";
+import { matchesKey } from "@earendil-works/pi-tui";
+
+import { VIM_DOWN, VIM_UP } from "./constants.ts";
+
+export function matchesUp(data: string, keybindings: KeybindingsManager): boolean {
+	return keybindings.matches(data, "tui.select.up") || matchesKey(data, VIM_UP);
+}
+
+export function matchesDown(data: string, keybindings: KeybindingsManager): boolean {
+	return keybindings.matches(data, "tui.select.down") || matchesKey(data, VIM_DOWN);
+}

package/dist/extensions/question/package.json

@@ -1,19 +1,19 @@
-{
-	"name": "@selesai/question",
-	"version": "0.0.1",
-	"private": true,
-	"description": "Interactive question tool extension for the agent.",
-	"type": "module",
-	"pi": {
-		"extensions": ["./index.ts"]
-	},
-	"peerDependencies": {
-		"@selesai/code": "*",
-		"@earendil-works/pi-ai": "*",
-		"@earendil-works/pi-tui": "*",
-		"typebox": "*"
-	},
-	"scripts": {
-		"test": "tsx --test tests/**/*.test.ts"
-	}
-}
+{
+	"name": "@selesai/question",
+	"version": "0.0.1",
+	"private": true,
+	"description": "Interactive question tool extension for the agent.",
+	"type": "module",
+	"pi": {
+		"extensions": ["./index.ts"]
+	},
+	"peerDependencies": {
+		"@selesai/code": "*",
+		"@earendil-works/pi-ai": "*",
+		"@earendil-works/pi-tui": "*",
+		"typebox": "*"
+	},
+	"scripts": {
+		"test": "tsx --test tests/**/*.test.ts"
+	}
+}