@danypops/pi-jittor 0.2.1 → 0.3.0

package/extension/src/settings.ts

@@ -1,22 +1,33 @@
-import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { readFileSync } from "node:fs";
+import { mkdir } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { JITTOR_EXTENSION_SETTINGS_FILENAME, JITTOR_STATE_DIRECTORY, USAGE_PERIODS, type UsagePeriod } from "@danypops/jittor";
+import { createAtomicJsonWriter } from "@danypops/vehicle-core";
+import { createNodeAtomicJsonFsAdapter } from "@danypops/vehicle-server/atomic-json";
 
+const atomicJson = createAtomicJsonWriter({ fs: createNodeAtomicJsonFsAdapter() });
+
+// Every setter persists to disk before resolving, so a caller that awaits it (every real call
+// site in index.ts/settings-tui.ts already runs inside an async handler) observes a completed
+// write -- no fire-and-forget persistence that a subsequent synchronous re-read could race. The
+// return type stays `void | Promise<void>` (not a strict `Promise<void>`) so a test/adapter
+// implementation that has no real persistence to await (e.g. the no-op fallback stubs in
+// index.ts's usageBudgetControl()/recoveryControl()) can stay trivially synchronous.
 export interface EnforcementControl {
 	isEnabled(): boolean;
-	setEnabled(enabled: boolean): void;
+	setEnabled(enabled: boolean): void | Promise<void>;
 	isFooterEnabled(): boolean;
-	setFooterEnabled(enabled: boolean): void;
+	setFooterEnabled(enabled: boolean): void | Promise<void>;
 }
 
 export interface CodexRecoveryControl {
 	isCodexRecoveryEnabled(): boolean;
-	setCodexRecoveryEnabled(enabled: boolean): void;
+	setCodexRecoveryEnabled(enabled: boolean): void | Promise<void>;
 }
 
 export interface UsageBudgetControl {
 	getUsageTokenBudget(period: UsagePeriod): number | undefined;
-	setUsageTokenBudget(period: UsagePeriod, tokens: number | undefined): void;
+	setUsageTokenBudget(period: UsagePeriod, tokens: number | undefined): void | Promise<void>;
 }
 
 export interface PersistentExtensionControl extends EnforcementControl, CodexRecoveryControl, UsageBudgetControl {}
@@ -64,12 +75,9 @@ function loadSettings(path: string): ExtensionSettings {
 	}
 }
 
-function persistSettings(path: string, settings: ExtensionSettings): void {
-	mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
-	const temporary = `${path}.${process.pid}.tmp`;
-	writeFileSync(temporary, `${JSON.stringify(settings, null, 2)}\n`, { mode: 0o600 });
-	chmodSync(temporary, 0o600);
-	renameSync(temporary, path);
+async function persistSettings(path: string, settings: ExtensionSettings): Promise<void> {
+	await mkdir(dirname(path), { recursive: true, mode: 0o700 });
+	await atomicJson.write(path, settings, { mode: 0o600, pretty: true, trailingNewline: true });
 }
 
 export function persistentEnforcementControl(env: Record<string, string | undefined> = process.env): PersistentExtensionControl {
@@ -77,29 +85,29 @@ export function persistentEnforcementControl(env: Record<string, string | undefi
 	const settings = loadSettings(path);
 	return {
 		isEnabled: () => settings.enforcementEnabled,
-		setEnabled(value: boolean): void {
+		async setEnabled(value: boolean): Promise<void> {
 			settings.enforcementEnabled = value;
-			persistSettings(path, settings);
+			await persistSettings(path, settings);
 		},
 		isFooterEnabled: () => settings.footerEnabled,
-		setFooterEnabled(value: boolean): void {
+		async setFooterEnabled(value: boolean): Promise<void> {
 			settings.footerEnabled = value;
-			persistSettings(path, settings);
+			await persistSettings(path, settings);
 		},
 		isCodexRecoveryEnabled: () => settings.codexRecoveryEnabled,
-		setCodexRecoveryEnabled(value: boolean): void {
+		async setCodexRecoveryEnabled(value: boolean): Promise<void> {
 			settings.codexRecoveryEnabled = value;
-			persistSettings(path, settings);
+			await persistSettings(path, settings);
 		},
 		getUsageTokenBudget(period): number | undefined {
 			return settings.usageTokenBudgets[period];
 		},
-		setUsageTokenBudget(period, tokens): void {
+		async setUsageTokenBudget(period, tokens): Promise<void> {
 			if (tokens !== undefined && (!Number.isFinite(tokens) || tokens <= 0))
 				throw new Error("usage token budget must be a positive finite number");
 			if (tokens === undefined) delete settings.usageTokenBudgets[period];
 			else settings.usageTokenBudgets[period] = tokens;
-			persistSettings(path, settings);
+			await persistSettings(path, settings);
 		},
 	};
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danypops/pi-jittor",
-  "version": "0.2.1",
-  "description": "Pi extension for Jittor: native routing enforcement, footer, settings, usage graphs, and benchmark panels backed by the @danypops/jittor daemon",
+  "version": "0.3.0",
+  "description": "Pi extension for Jittor token and context observability with optimization controls backed by the @danypops/jittor daemon",
   "type": "module",
   "keywords": ["pi-package", "llm-router", "token-budget"],
   "scripts": {
@@ -13,7 +13,9 @@
   },
   "dependencies": {
     "@danypops/vehicle-client": "^0.5.1",
-    "@danypops/jittor": "^0.14.0",
+    "@danypops/vehicle-core": "^0.12.1",
+    "@danypops/vehicle-server": "^0.17.0",
+    "@danypops/jittor": "workspace:^",
     "malevich-tui-components": "^0.16.1"
   },
   "peerDependencies": {
@@ -22,6 +24,10 @@
     "typebox": "*"
   },
   "devDependencies": {
+    "@danypops/pi-extension-harness": "^0.6.2",
+    "@danypops/pi-process-harness": "^0.1.2",
+    "@danypops/pi-tui-harness": "^0.0.2",
+    "@earendil-works/pi-ai": "*",
     "bun-types": "latest"
   },
   "repository": {

package/extension/src/context-view.ts

@@ -1,140 +0,0 @@
-import type { ContextSegment } from "@danypops/jittor";
-import type { ExtensionCommandContext, Theme, ThemeColor } from "@earendil-works/pi-coding-agent";
-import { matchesKey, type TUI, truncateToWidth } from "@earendil-works/pi-tui";
-import {
-	buildContextRows,
-	type ContextBarTheme,
-	type ContextRow,
-	type ContextRowsTheme,
-	type ContextSegment as MalevichContextSegment,
-	renderContextRowLines,
-	renderContextUsageBar,
-} from "malevich-tui-components";
-import type { ContextBreakdown } from "./context-breakdown.ts";
-import { buildContextReport } from "./context-report.ts";
-
-const VISIBLE_ROWS = 24;
-
-/**
- * A dynamically-contributed segment set (any string key from any extension, not a fixed enum)
- * can't use a hardcoded per-key color map the way Papyrus's own ContextViewport did for its
- * fixed seven segments -- this cycles a small categorical palette keyed by a stable hash of the
- * segment key, so the same key always renders the same color within one process without needing
- * every possible contributor's key to be known in advance.
- */
-const PALETTE: ThemeColor[] = ["accent", "success", "syntaxFunction", "warning", "syntaxKeyword", "syntaxType", "muted"];
-
-function paletteColor(key: string): ThemeColor {
-	let hash = 0;
-	for (let index = 0; index < key.length; index += 1) hash = (hash * 31 + key.charCodeAt(index)) >>> 0;
-	return PALETTE[hash % PALETTE.length]!;
-}
-
-function formatTokenCount(tokens: number): string {
-	return tokens >= 1_000 ? `${(tokens / 1_000).toFixed(1)}k` : String(tokens);
-}
-
-function percentOf(part: number, whole: number): string {
-	return whole > 0 ? `${((part / whole) * 100).toFixed(1)}%` : "—";
-}
-
-/** Folds each segment's confidence tier into its label so it survives Malevich's confidence-unaware row builder. */
-function withConfidenceLabel(segment: ContextSegment): MalevichContextSegment {
-	return {
-		key: segment.key,
-		label: `${segment.label} [${segment.confidence}]`,
-		estimatedTokens: segment.estimatedTokens,
-		items: segment.items,
-		unknown: segment.unknown,
-	};
-}
-
-class ContextViewport {
-	private offsetY = 0;
-	private readonly rows: ContextRow[];
-	private readonly segments: readonly MalevichContextSegment[];
-
-	constructor(
-		private readonly tui: TUI,
-		private readonly theme: Theme,
-		private readonly breakdown: ContextBreakdown,
-		private readonly close: () => void,
-	) {
-		// Heaviest-first: Malevich renders segments in the order given, so sorting by weight for a
-		// merged multi-producer view is this viewport's own policy, matching context-report.ts.
-		this.segments = [...breakdown.segments].sort((left, right) => right.estimatedTokens - left.estimatedTokens).map(withConfidenceLabel);
-		this.rows = buildContextRows(this.segments, breakdown.totalTokens ?? undefined);
-	}
-
-	invalidate(): void {}
-
-	render(width: number): string[] {
-		const theme = this.theme;
-		const contentWidth = Math.max(1, width);
-		const border = theme.fg("borderMuted", "─".repeat(contentWidth));
-		const lines: string[] = [border, truncateToWidth(theme.fg("accent", theme.bold("Context")), contentWidth, "")];
-
-		const { totalTokens, effectiveBudget } = this.breakdown;
-		if (totalTokens !== null && effectiveBudget !== null) {
-			lines.push(
-				truncateToWidth(
-					`${formatTokenCount(totalTokens)} / ${formatTokenCount(effectiveBudget)} tokens (${percentOf(totalTokens, effectiveBudget)} of usable budget)`,
-					contentWidth,
-					"",
-				),
-			);
-		} else if (totalTokens !== null) {
-			lines.push(truncateToWidth(`${formatTokenCount(totalTokens)} tokens (model context window unknown)`, contentWidth, ""));
-		} else {
-			lines.push(theme.fg("dim", "No real usage reported yet — sizes below are estimates only"));
-		}
-
-		const colorFor = (key: string) => (s: string) => theme.fg(paletteColor(key), s);
-		const barTheme: ContextBarTheme = { colorFor, empty: (s) => theme.fg("dim", s) };
-		lines.push(renderContextUsageBar(barTheme, this.segments, contentWidth, effectiveBudget ?? undefined, totalTokens ?? undefined));
-		if (this.breakdown.overshootTokens > 0) {
-			lines.push(
-				truncateToWidth(
-					theme.fg(
-						"warning",
-						`Estimates exceed real total by ~${this.breakdown.overshootTokens} tok — sizes below are approximate, not exact`,
-					),
-					contentWidth,
-					"",
-				),
-			);
-		}
-		lines.push("");
-
-		const rowsTheme: ContextRowsTheme = { colorFor, header: (s) => theme.bold(s) };
-		const visible = this.rows.slice(this.offsetY, this.offsetY + VISIBLE_ROWS);
-		lines.push(...renderContextRowLines(visible, contentWidth, rowsTheme));
-		if (this.rows.length === 0) lines.push(theme.fg("dim", "  (nothing observed yet)"));
-		else lines.push(theme.fg("muted", `  ${Math.min(this.offsetY + VISIBLE_ROWS, this.rows.length)}/${this.rows.length}`));
-
-		lines.push("");
-		lines.push(theme.fg("dim", "↑↓ scroll · esc close"));
-		lines.push(border);
-		return lines;
-	}
-
-	handleInput(data: string): void {
-		if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
-			this.close();
-			return;
-		}
-		if (matchesKey(data, "up")) this.offsetY = Math.max(0, this.offsetY - 1);
-		else if (matchesKey(data, "down")) this.offsetY = Math.min(Math.max(0, this.rows.length - VISIBLE_ROWS), this.offsetY + 1);
-		else return;
-		this.tui.requestRender();
-	}
-}
-
-/** Interactive scrollable Context Hub view in TUI mode; the same plain-text report as /context's non-interactive path otherwise. */
-export async function showContextView(ctx: ExtensionCommandContext, breakdown: ContextBreakdown): Promise<void> {
-	if (ctx.mode !== "tui") {
-		ctx.ui.notify(buildContextReport(breakdown), "info");
-		return;
-	}
-	await ctx.ui.custom<void>((tui, theme, _keybindings, done) => new ContextViewport(tui, theme, breakdown, done));
-}