pi-codebuddy-sdk 0.4.0 → 0.4.2

package/README.md

@@ -136,6 +136,12 @@ export CODEBUDDY_SDK_DEBUG=1
 
 Default log: `~/.pi/agent/codebuddy-sdk.log`. See [CONTRIBUTING.md](CONTRIBUTING.md) for maintainer details.
 
+**After `pi -r`, the previously selected codebuddy model is gone from `/model`?**
+The last-known-good model list is cached to `~/.pi/agent/codebuddy-sdk-models.json` on every
+successful discovery, so a new pi process can re-register it synchronously at module load —
+even when SDK discovery is still in flight (new process, gate busy, or stale auth). If the
+model is still missing, share the debug log (`CODEBUDDY_SDK_DEBUG=1`) and the cache file.
+
 ## Development
 
 Maintainers: [CONTRIBUTING.md](CONTRIBUTING.md).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codebuddy-sdk",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Pi extension that uses CodeBuddy (via Agent SDK) as a model provider and adds an AskCodebuddy tool.",
   "author": "slahser",
   "license": "MIT",

package/src/index.ts

@@ -10,6 +10,7 @@ import { homedir } from "os";
 import { dirname, join } from "path";
 import { PROVIDER_ID, messageContentToText, convertPiMessages } from "./convert.js";
 import { buildModels, codebuddyModelId, FALLBACK_MODELS, rawModelsFromSdk, resolveModel as _resolveModel, type PiModel } from "./models.js";
+import { readModelsCache, writeModelsCache } from "./models-cache.js";
 import { MCP_SERVER_NAME, MCP_TOOL_PREFIX, buildCodebuddySystemPrompt } from "./skills.js";
 import { verifyWrittenSession as _verifyWrittenSession } from "./session-verify.js";
 import { extractAllToolResults as _extractAllToolResults, type McpResult } from "./extract-tool-results.js";
@@ -124,10 +125,6 @@ const SDK_TO_PI_TOOL_NAME: Record<string, string> = {
 let MODELS: PiModel[] = buildModels(FALLBACK_MODELS);
 let providerSettings: NonNullable<Config["provider"]> = {};
 
-// Last-known-good model list, kept in a shared global so a module reload
-// during session resume can recover it when SDK discovery fails.
-const MODELS_CACHE_KEY = Symbol.for("codebuddy-sdk:modelsCache");
-
 type ContentBlockParam =
 	| { type: "text"; text: string }
 	| { type: "image"; source: { type: "base64"; media_type: string; data: string } };
@@ -1595,7 +1592,10 @@ async function discoverModels(pi: ExtensionAPI): Promise<void> {
 			// Persist the successful discovery globally so a later session
 			// resume (module reload) can recover the real model list even if
 			// discovery fails that time (e.g. SDK subprocess gate is busy).
-			(globalThis as Record<symbol, any>)[MODELS_CACHE_KEY] = MODELS;
+			// Written to disk so a NEW pi process (`pi -r` after exit) can also
+			// recover it synchronously at module load — the in-process global
+			// alone dies with the old process.
+			writeModelsCache(MODELS);
 			const g = globalThis as Record<symbol, any>;
 			const streamFn = g[ACTIVE_STREAM_SIMPLE_KEY] ?? streamCodebuddySdk;
 			pi.registerProvider(PROVIDER_ID, {
@@ -1614,7 +1614,7 @@ async function discoverModels(pi: ExtensionAPI): Promise<void> {
 			// model list instead of collapsing to the single fallback model —
 			// otherwise the previously selected codebuddy model disappears
 			// from /model after `pi -r` and the user must re-pick it.
-			const cached = (globalThis as Record<symbol, any>)[MODELS_CACHE_KEY] as PiModel[] | undefined;
+			const cached = readModelsCache();
 			if (cached && cached.length) {
 				MODELS = cached;
 				debug(`discoverModels: failed, recovered ${MODELS.length} cached models`, err);
@@ -1642,23 +1642,27 @@ async function ensureModelsDiscovered(): Promise<void> {
 	await discoverInFlight;
 }
 
-export default function (pi: ExtensionAPI) {
+export default async function (pi: ExtensionAPI) {
 	piApi = pi;
 	const config = loadConfig(process.cwd());
 	debug("loadConfig:", JSON.stringify(config));
 	providerSettings = config.provider ?? {};
 	// Apply config overrides to the fallback models immediately, and recover
-	// a previously cached model list across module reloads (session resume).
-	const cached = (globalThis as Record<symbol, any>)[MODELS_CACHE_KEY] as PiModel[] | undefined;
+	// a previously cached model list across module reloads (session resume)
+	// or across processes (`pi -r` after exit).
+	const cached = readModelsCache();
 	if (cached && cached.length) {
 		MODELS = cached;
 		debug(`default: recovered ${MODELS.length} cached models from prior discovery`);
 	} else {
 		MODELS = buildModels(FALLBACK_MODELS, providerSettings, providerSettings.modelOverrides);
 	}
-	const registeredModels = MODELS;
 
-	discoverInFlight = discoverModels(pi);
+	// Discover real models BEFORE registering the provider, so the first
+	// (synchronous-flush) registration carries live models instead of the
+	// FALLBACK_MODELS snapshot. pi awaits this async factory before startup
+	// continues, so the model list shown at startup is never the fallback.
+	await ensureModelsDiscovered();
 
 	const clearSession = (event: string) => {
 		debug(`${event}: clearing session ${sharedSession?.sessionId?.slice(0, 8) ?? "none"}`);
@@ -1746,7 +1750,7 @@ export default function (pi: ExtensionAPI) {
 			baseUrl: PROVIDER_ID,
 			apiKey: "not-used",
 			api: "codebuddy-sdk",
-			models: registeredModels as any,
+			models: MODELS as any,
 			// Cast: pi-ai AssistantMessageEventStream diamond dep between pi-coding-agent and pi-agent-core
 			streamSimple: streamCodebuddySdk as any,
 		});

package/src/models-cache.ts

@@ -0,0 +1,48 @@
+// Persisted last-known-good model list.
+//
+// `pi -r` after exiting pi spawns a NEW process: the Symbol.for in-process
+// cache from v0.4.0 dies with the old process, so a session-resume model
+// resolution that runs while SDK discovery is still in flight only sees the
+// fallback list and the previously selected codebuddy model drops out of
+// /model (user must re-pick it). Persisting the list to disk lets the new
+// process register the full model list synchronously at module load.
+
+import { homedir } from "os";
+import { dirname, join } from "path";
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
+import type { PiModel } from "./models.js";
+
+export const MODELS_CACHE_KEY = Symbol.for("codebuddy-sdk:modelsCache");
+
+const defaultCacheFile = () => join(homedir(), ".pi", "agent", "codebuddy-sdk-models.json");
+
+// Injectable for tests.
+const cacheFile = () => process.env.CODEBUDDY_SDK_MODELS_CACHE_PATH || defaultCacheFile();
+
+export function readModelsCache(): PiModel[] | undefined {
+	// In-process shared cache first (module reloads within a process).
+	const inProcess = (globalThis as Record<symbol, unknown>)[MODELS_CACHE_KEY] as PiModel[] | undefined;
+	if (inProcess?.length) return inProcess;
+	// Disk cache second (new process — `pi -r` after exiting pi).
+	try {
+		const parsed: unknown = JSON.parse(readFileSync(cacheFile(), "utf8"));
+		if (Array.isArray(parsed) && parsed.length) return parsed as PiModel[];
+	} catch {
+		// No cache yet, or corrupt file — caller falls back.
+	}
+	return undefined;
+}
+
+export function writeModelsCache(models: PiModel[]): void {
+	if (!models.length) return;
+	(globalThis as Record<symbol, unknown>)[MODELS_CACHE_KEY] = models;
+	try {
+		const path = cacheFile();
+		mkdirSync(dirname(path), { recursive: true });
+		const tmp = `${path}.tmp`;
+		writeFileSync(tmp, JSON.stringify(models));
+		renameSync(tmp, path);
+	} catch {
+		// Cache is best-effort; discovery retries next load.
+	}
+}