@xynogen/pix-core 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-core",
-	"version": "0.1.2",
+	"version": "0.1.4",
 	"description": "Pi extension — core UI/UX bundle (welcome banner, footer, model picker, self-update)",
 	"type": "module",
 	"main": "src/index.ts",
@@ -42,6 +42,7 @@
 		"access": "public"
 	},
 	"dependencies": {
+		"@xynogen/pix-data": "^0.1.0",
 		"@xynogen/pix-skills": "^0.1.1",
 		"typebox": "^1.1.38"
 	},

package/src/lib/data.ts

@@ -1,241 +1,33 @@
 /**
  * data.ts — model data layer (shim)
  *
- * Re-exports shared data from pix-data (github.com/xynogen/pix-data).
- * Cache lives at ~/.cache/pi/ and is shared across all Pi extensions.
+ * Thin re-export of the shared data layer from @xynogen/pix-data
+ * (github.com/xynogen/pix-mono/tree/main/packages/pix-data). Cache lives at
+ * ~/.cache/pi/ and is shared across all Pi extensions — pix-data warms it on
+ * session start; this extension reads from it.
  *
  * Consumers in this extension dir:
  *   footer.ts  — lookupModelsDev, lookupBenchmark, ModelsDevModel
  *   models.ts  — lookupModelsDev, lookupBenchmark
  */
 
-import { existsSync, readFileSync } from "node:fs";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
-// ── Types ─────────────────────────────────────────────────────────────────────
-
-export interface ModelsDevModel {
-	id: string;
-	name?: string;
-	reasoning?: boolean;
-	modalities?: { input?: string[]; output?: string[] };
-	limit?: { context?: number; output?: number };
-	cost?: {
-		input?: number;
-		output?: number;
-		cache_read?: number;
-		cache_write?: number;
-	};
-}
-
-export type ModelsDevApi = Record<
-	string,
-	{ models?: Record<string, ModelsDevModel> }
->;
-
-export interface BenchmarkEntry {
-	rank: number;
-	model: string;
-	creator: string;
-	sourceType?: string;
-	overallScore: number | null;
-	categoryScores?: Record<string, number | null>;
-	inputPrice: number | null;
-	outputPrice: number | null;
-}
-
-interface BenchmarkResponse {
-	lastUpdated?: string;
-	mode?: string;
-	models: BenchmarkEntry[];
-}
-
-// ── DataSource ─────────────────────────────────────────────────────────────────
-
-interface DataSourceOptions<T> {
-	url: string | (() => string);
-	headers?: () => Record<string, string> | undefined;
-	cachePath: string;
-	ttlMs?: number;
-	timeoutMs?: number;
-	parse: (raw: unknown) => T;
-	parseCache: (data: unknown) => T;
-	empty: T;
-	label: string;
-	skip?: () => boolean;
-}
-
-class DataSource<T> {
-	private _mem: T | null = null;
-	private _inflight: Promise<T> | null = null;
-	private readonly opts: Required<DataSourceOptions<T>>;
-
-	constructor(opts: DataSourceOptions<T>) {
-		this.opts = {
-			ttlMs: 24 * 60 * 60 * 1000,
-			timeoutMs: 10_000,
-			headers: () => undefined,
-			skip: () => false,
-			...opts,
-		};
-	}
-
-	async get(): Promise<T> {
-		if (this._inflight) return this._inflight;
-		this._inflight = this._load().finally(() => {
-			this._inflight = null;
-		});
-		return this._inflight;
-	}
-
-	getCached(): T {
-		if (this._mem) return this._mem;
-		try {
-			if (existsSync(this.opts.cachePath)) {
-				const raw = JSON.parse(readFileSync(this.opts.cachePath, "utf-8")) as {
-					data: unknown;
-				};
-				this._mem = this.opts.parseCache(raw.data);
-				return this._mem;
-			}
-		} catch {
-			// No cache file or parse error — return empty
-		}
-		return this.opts.empty;
-	}
-
-	private async _load(): Promise<T> {
-		if (this.opts.skip()) {
-			this._mem = this.opts.empty;
-			return this.opts.empty;
-		}
-		const cached = await this._readCache();
-		if (cached !== undefined && Date.now() - cached.ts < this.opts.ttlMs) {
-			const val = this.opts.parseCache(cached.data);
-			this._mem = val;
-			return val;
-		}
-		try {
-			const url =
-				typeof this.opts.url === "function" ? this.opts.url() : this.opts.url;
-			const controller = new AbortController();
-			const timer = setTimeout(() => controller.abort(), this.opts.timeoutMs);
-			const response = await fetch(url, {
-				signal: controller.signal,
-				headers: this.opts.headers(),
-			}).finally(() => clearTimeout(timer));
-			if (!response.ok)
-				throw new Error(`${this.opts.label} fetch failed: ${response.status}`);
-			const raw = await response.json();
-			const val = this.opts.parse(raw);
-			this._mem = val;
-			void this._writeCache(raw);
-			return val;
-		} catch (error) {
-			const msg = error instanceof Error ? error.message : String(error);
-			if (cached !== undefined) {
-				console.warn(
-					`${this.opts.label} fetch failed, using stale cache: ${msg}`,
-				);
-				const val = this.opts.parseCache(cached.data);
-				this._mem = val;
-				return val;
-			}
-			console.warn(`${this.opts.label} unavailable: ${msg}`);
-			return this.opts.empty;
-		}
-	}
-
-	private async _readCache(): Promise<
-		{ ts: number; data: unknown } | undefined
-	> {
-		try {
-			const raw = await readFile(this.opts.cachePath, "utf8");
-			const parsed = JSON.parse(raw) as { ts: number; data: unknown };
-			if (typeof parsed.ts !== "number") return undefined;
-			return parsed;
-		} catch {
-			return undefined;
-		}
-	}
-
-	private async _writeCache(data: unknown): Promise<void> {
-		try {
-			await mkdir(dirname(this.opts.cachePath), { recursive: true });
-			await writeFile(
-				this.opts.cachePath,
-				JSON.stringify({ ts: Date.now(), data }),
-			);
-		} catch {
-			// Write failure is non-fatal
-		}
-	}
-}
-
-// ── Cache dir ─────────────────────────────────────────────────────────────────
-
-const CACHE_DIR = join(
-	process.env.XDG_CACHE_HOME || join(homedir(), ".cache"),
-	"pi",
-);
-
-// ── Data sources (shared cache with pix-data) ─────────────────────────────────
-
-const modelsDev = new DataSource<ModelsDevApi>({
-	label: "models.dev",
-	url: "https://models.dev/api.json",
-	cachePath: join(CACHE_DIR, "models.json"),
-	parse: (raw) => raw as ModelsDevApi,
-	parseCache: (data) => (data as ModelsDevApi) ?? {},
-	empty: {},
-});
-
-const benchmark = new DataSource<BenchmarkEntry[]>({
-	label: "benchlm",
-	url: "https://benchlm.ai/api/data/leaderboard",
-	cachePath: join(CACHE_DIR, "benchlm.json"),
-	parse: (raw) => (raw as BenchmarkResponse).models ?? [],
-	parseCache: (data) => (data as BenchmarkResponse)?.models ?? [],
-	empty: [],
-});
-
-// ── Lookup helpers ─────────────────────────────────────────────────────────────
-
-export function lookupModelsDev(
-	provider: string,
-	id: string,
-): ModelsDevModel | undefined {
-	const data = modelsDev.getCached();
-	const canonical = id.includes("/") ? id.slice(id.lastIndexOf("/") + 1) : id;
-	const exact = data[provider]?.models?.[canonical];
-	if (exact) return exact;
-	for (const p of Object.keys(data)) {
-		const hit = data[p]?.models?.[canonical];
-		if (hit) return hit;
-	}
-	return undefined;
-}
-
-function normBench(s: string): string {
-	return s
-		.toLowerCase()
-		.replace(/[-_.]+/g, " ")
-		.replace(/\s+/g, " ")
-		.trim();
-}
-
-export function lookupBenchmark(modelName: string): BenchmarkEntry | undefined {
-	const entries = benchmark.getCached();
-	const needle = normBench(modelName);
-	return (
-		entries.find((e) => normBench(e.model) === needle) ??
-		entries.find((e) => normBench(e.model).includes(needle)) ??
-		entries.find((e) => needle.includes(normBench(e.model)))
-	);
-}
+export {
+	benchmark,
+	buildModelsDevIndex,
+	CACHE_DIR,
+	DataSource,
+	fetchModelsDevIndex,
+	lookupBenchmark,
+	lookupInIndex,
+	lookupModelsDev,
+	modelsDev,
+} from "@xynogen/pix-data";
+export type {
+	BenchmarkEntry,
+	ModelsDevApi,
+	ModelsDevModel,
+} from "@xynogen/pix-data";
 
 export default function (_pi: unknown): void {
-	// pix-data warms this cache on startup — nothing to do here
+	// pix-data warms this cache on startup — nothing to do here.
 }

package/src/nudge/capability.test.ts

@@ -1,8 +1,11 @@
+import { mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
 import { describe, expect, test } from "bun:test";
 import {
 	buildOrientation,
 	CAPABILITY_REMINDER,
 	countInvocableSkills,
+	graphifyHint,
 	partitionTools,
 } from "./capability.ts";
 
@@ -201,4 +204,32 @@ describe("buildOrientation", () => {
 		const out = buildOrientation([tool("read", "builtin")], []);
 		expect(out.toLowerCase()).toContain("improvis");
 	});
+
+	test("frames the block as non-actionable so the model acts on the prompt", () => {
+		const out = buildOrientation([tool("read", "builtin")], []);
+		const last = out.trim().split("\n").at(-1) ?? "";
+		expect(last.toLowerCase()).toContain("not a task");
+		expect(last.toLowerCase()).toContain("do not reply");
+	});
+});
+
+describe("graphifyHint", () => {
+	const tmpDir = join(import.meta.dir, ".graphify-hint-test-tmp");
+
+	test("returns undefined when graphify-out/graph.json absent", () => {
+		expect(graphifyHint(tmpDir)).toBeUndefined();
+	});
+
+	test("returns hint string when graphify-out/graph.json exists", () => {
+		try {
+			mkdirSync(join(tmpDir, "graphify-out"), { recursive: true });
+			writeFileSync(join(tmpDir, "graphify-out", "graph.json"), "{}");
+			const hint = graphifyHint(tmpDir);
+			expect(hint).toBeTypeOf("string");
+			expect(hint).toContain("graphify");
+			expect(hint).toContain("graphify query");
+		} finally {
+			rmSync(tmpDir, { recursive: true, force: true });
+		}
+	});
 });

package/src/nudge/capability.ts

@@ -20,6 +20,8 @@
  * The `skill` tool IS model-callable: skill() lists/loads bundled skills.
  */
 
+import { existsSync } from "node:fs";
+import { join } from "node:path";
 import type {
 	BuildSystemPromptOptions,
 	ExtensionAPI,
@@ -36,6 +38,20 @@ export const CAPABILITY_REMINDER =
 	"Use /toolbox to discover/enable gated tools. " +
 	"All tools callable via function definitions.";
 
+/**
+ * Build the optional graphify hint line.
+ * Returns a string if graphify-out/graph.json exists in cwd, else undefined.
+ */
+export function graphifyHint(cwd: string): string | undefined {
+	if (existsSync(join(cwd, "graphify-out", "graph.json"))) {
+		return (
+			"graphify-out/graph.json exists — for codebase questions (how does X work, " +
+			'where is Y, trace Z) run `graphify query "<question>"` before reading files.'
+		);
+	}
+	return undefined;
+}
+
 /** Count model-invocable skills (excludes user-only /skill:name entries). */
 export function countInvocableSkills(
 	skills: LoadedSkill[] | undefined,
@@ -118,6 +134,15 @@ export function buildOrientation(
 	if (skillNames.length) {
 		lines.push(`Skills: ${skillNames.join(", ")}.`);
 	}
+	// Graphify hint — only when a graph is already built for this project
+	const gHint = graphifyHint(process.cwd());
+	if (gHint) lines.push(gHint);
+	// Framing — this block is orientation context, not a task. Without it the
+	// model can mistake the first-turn orientation for the prompt and reply
+	// "Ready, waiting for task" instead of acting on the user's request.
+	lines.push(
+		"(Orientation only — not a task. Act on the user's request now; do not reply to this notice.)",
+	);
 	return lines.join("\n");
 }
 
@@ -146,7 +171,12 @@ export default function registerCapabilityNudge(pi: ExtensionAPI): void {
 			}
 			content = buildOrientation(tools, skills, activeToolNames);
 		} else {
-			content = CAPABILITY_REMINDER;
+			// Per-turn reminder — append graphify hint when graph exists
+			const cwd = process.cwd();
+			const gHint = graphifyHint(cwd);
+			content = gHint
+				? `${CAPABILITY_REMINDER}\n${gHint}`
+				: CAPABILITY_REMINDER;
 		}
 
 		return {