pi-codebuddy-sdk 0.4.36 → 0.4.37

package/README.md

@@ -103,6 +103,8 @@ File: `~/.pi/agent/codebuddy-sdk.json` or `.pi/codebuddy-sdk.json` in a project.
 | `provider.strictMcpConfig` | `true` | Use only Pi-bridged MCP tools |
 | `provider.pathToCodebuddyCode` | auto | Path to the `codebuddy` **CLI entry point** when it is **not** on `PATH`; does not change the JS runtime |
 | `provider.executable` | host runtime | Runtime used to spawn the CLI (e.g. `"node"`). Set it when the host is Bun-compiled (no `bun` on `PATH`); auto-detected otherwise |
+| `provider.isolatedEnv` | `false` | Opt in to a private CodeBuddy config dir with user, auto, and team memory disabled |
+| `provider.codebuddyConfigDir` | `~/.codebuddy-cli-isolated` | Config dir used when `isolatedEnv` is enabled |
 | `provider.contextWindow` | estimated | Override context window (tokens) for **all** models (e.g. `300000`) |
 | `provider.maxTokens` | estimated | Override max output tokens for **all** models (e.g. `32768`) |
 | `provider.modelOverrides` | — | Per-model overrides, keyed by model id or substring (see below) |
@@ -121,7 +123,42 @@ key wins and beats the global `contextWindow` / `maxTokens`:
 }
 ```
 
-Supported per-model keys: `contextWindow`, `maxTokens`, `reasoning`, `images`.
+Supported per-model keys: `contextWindow`, `maxTokens`, `reasoning`, `images`,
+`thinkingLevelMap`.
+
+`thinkingLevelMap` maps a pi thinking level to the effort string sent to the
+CodeBuddy CLI. pi only offers `xhigh` and `max` when a model declares them here
+(pi-ai `getSupportedThinkingLevels`), so a model that supports `max` upstream
+stays unreachable until the map names it:
+
+```json
+{
+  "provider": {
+    "modelOverrides": {
+      "deepseek-v4.1-flash": { "thinkingLevelMap": { "max": "max" } },
+      "space-bunny": { "thinkingLevelMap": { "xhigh": "xhigh", "max": "max" } }
+    }
+  }
+}
+```
+
+Declare only the habits the model actually serves — an effort the backend
+rejects fails the turn.
+
+Set `provider.isolatedEnv` to keep Pi turns away from the CodeBuddy IDE's rules,
+projects, and memory. The extension sends both the CLI subprocess and its own
+session files to one config dir:
+
+```json
+{
+  "provider": {
+    "isolatedEnv": true,
+    "codebuddyConfigDir": "/path/to/private-codebuddy-config"
+  }
+}
+```
+
+The first run against a new dir needs the CodeBuddy CLI login for that dir.
 
 Window values the backend reports for a model are remembered per model id in
 `~/.pi/agent/codebuddy-sdk-learned-windows.json`, so the next start registers the
@@ -134,7 +171,7 @@ again (ids the backend no longer serves are dropped automatically).
 - The extension does **not** send conversation data to this repository or any third-party telemetry endpoint.
 - Credentials are handled entirely by the CodeBuddy CLI on your machine.
 - Optional debug mode (`CODEBUDDY_SDK_DEBUG=1`) writes **local** logs under `~/.pi/agent/`; paths are redacted, prompts and tool payloads are not logged. Delete logs when finished.
-- CodeBuddy loads project instructions, `~/.codebuddy/rules/`, and project memory independently of `--setting-sources`; those files can add context that is not part of the Pi session.
+- CodeBuddy loads project instructions, rules, and project memory independently of `--setting-sources`; those files can add context that is not part of the Pi session. Set `provider.isolatedEnv` to use a private config dir with memory disabled.
 
 ## Troubleshooting
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codebuddy-sdk",
-  "version": "0.4.36",
+  "version": "0.4.37",
   "description": "Pi extension that uses CodeBuddy (via Agent SDK) as a model provider and adds an AskCodebuddy tool.",
   "author": "RealAlexandreAI",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@tencent-ai/agent-sdk": "^0.3.279",
+    "@tencent-ai/agent-sdk": "^0.3.291",
     "change-case": "^5.4.4"
   },
   "peerDependencies": {
@@ -52,6 +52,9 @@
     "typebox": "1.4.3",
     "typescript": "^7.0.2"
   },
+  "overrides": {
+    "undici": "^8.12.3"
+  },
   "pi": {
     "extensions": [
       "./src/index.ts"

package/src/config.ts

@@ -1,4 +1,5 @@
 import type { SettingSource } from "./index-types.js";
+import type { ModelOverrides } from "./models.js";
 import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
@@ -32,17 +33,37 @@ export interface Config {
 		 * host runtime; set this when a Bun-compiled host has no `bun` on `PATH`.
 		 */
 		executable?: string;
+		/** Run the CLI against a private CodeBuddy config dir and disable its memory. */
+		isolatedEnv?: boolean;
+		/** Config dir used when `isolatedEnv` is on. Defaults to `~/.codebuddy-cli-isolated`. */
+		codebuddyConfigDir?: string;
 		/** Override the estimated context window (tokens) for ALL models. */
 		contextWindow?: number;
 		/** Override the estimated max output tokens for ALL models. */
 		maxTokens?: number;
 		/** Per-model overrides keyed by model id (or id substring). */
-		modelOverrides?: Record<string, {
-			contextWindow?: number;
-			maxTokens?: number;
-			reasoning?: boolean;
-			images?: boolean;
-		}>;
+		modelOverrides?: Record<string, ModelOverrides>;
+	};
+}
+
+export function resolveCodebuddyConfigDir(provider?: Config["provider"]): string | undefined {
+	if (provider?.isolatedEnv !== true) return undefined;
+	return provider.codebuddyConfigDir ?? join(homedir(), ".codebuddy-cli-isolated");
+}
+
+export function buildCodebuddyEnv(
+	provider?: Config["provider"],
+	base: NodeJS.ProcessEnv = process.env,
+): NodeJS.ProcessEnv {
+	const env = { ...base, DISABLE_AUTO_COMPACT: "1" };
+	const dir = resolveCodebuddyConfigDir(provider);
+	if (!dir) return env;
+	return {
+		...env,
+		CODEBUDDY_CONFIG_DIR: dir,
+		CODEBUDDY_MEMORY_ENABLED: "0",
+		CODEBUDDY_DISABLE_AUTO_MEMORY: "1",
+		CODEBUDDY_TEAM_MEMORY_ENABLED: "0",
 	};
 }
 

package/src/index.ts

@@ -20,7 +20,7 @@ import { MCP_SERVER_NAME, MCP_TOOL_PREFIX, buildCodebuddySystemPrompt } from "./
 import { verifyWrittenSession as _verifyWrittenSession } from "./session-verify.js";
 import { extractAllToolResults as _extractAllToolResults, type McpResult } from "./extract-tool-results.js";
 import { QueryContext, ctx } from "./query-state.js";
-import { loadConfig, type Config } from "./config.js";
+import { buildCodebuddyEnv, loadConfig, resolveCodebuddyConfigDir, type Config } from "./config.js";
 import { jsonSchemaToZodShape } from "./typebox-to-zod.js";
 import { buildActionSummary, type ToolCallState } from "./askcodebuddy-ui.js";
 import { withSdkGate } from "./sdk-gate.js";
@@ -207,10 +207,6 @@ type ContentBlockParam =
 	| { type: "image"; source: { type: "base64"; media_type: string; data: string } };
 type SettingSource = "user" | "project" | "local";
 
-function resolveModel(input: string) {
-	return _resolveModel(MODELS, input);
-}
-
 function registerCodebuddyProvider(pi: ExtensionAPI, globals: Record<symbol, any> = globalThis as Record<symbol, any>): void {
 	const { streamFn, claimStream } = providerRegistration(globals, streamCodebuddySdk, boundRuntime);
 	pi.registerProvider(PROVIDER_ID, {
@@ -447,7 +443,7 @@ async function runIsolatedSummary(
 			prompt: promptText,
 			options: {
 				cwd,
-				env: { ...process.env, DISABLE_AUTO_COMPACT: "1" },
+				env: buildCodebuddyEnv(loadConfig(cwd).provider),
 				tools: [],
 				strictMcpConfig: true,
 				settingSources: [] as SettingSource[],
@@ -562,7 +558,7 @@ function verifyWrittenSession(
 			`. Report: ${ISSUES_URL}`,
 			"warning",
 		);
-		diagDump("session_verify_fail", { msg, jsonlPath, cwd, realpath: safeRealpath(cwd), codebuddyConfigDir: process.env.CODEBUDDY_CONFIG_DIR ?? null });
+		diagDump("session_verify_fail", { msg, jsonlPath, cwd, realpath: safeRealpath(cwd), codebuddyConfigDir: resolveCodebuddyConfigDir(providerSettings) ?? null });
 	}
 }
 
@@ -691,11 +687,11 @@ function syncSharedSession(
 	const preserveId = previousSessionId !== undefined && !sharedSession?.forceRotate;
 	if (preserveId) {
 		// Wipe prior jsonl + companion dir (no-op if nothing to wipe).
-		deleteSession(previousSessionId!, cwd, process.env.CODEBUDDY_CONFIG_DIR);
+		deleteSession(previousSessionId!, cwd, resolveCodebuddyConfigDir(providerSettings));
 	}
 	const session = createSession({
 		projectPath: cwd,
-		codebuddyDir: process.env.CODEBUDDY_CONFIG_DIR,
+		codebuddyDir: resolveCodebuddyConfigDir(providerSettings),
 		...(preserveId ? { sessionId: previousSessionId } : {}),
 		...(modelId ? { model: modelId } : {}),
 	});
@@ -727,7 +723,11 @@ export const __test = {
 	getSharedSession() {
 		return sharedSession;
 	},
+	setProviderSettings(settings: NonNullable<Config["provider"]>) {
+		providerSettings = settings;
+	},
 	syncSharedSession,
+	promptAndWait,
 };
 
 // --- Provider helpers: tool name mapping ---
@@ -910,7 +910,7 @@ function syncServedContextWindow(label: string, message: CbMessage, model: Model
 // Pi reasoning levels → CC SDK effort levels
 
 const REASONING_TO_EFFORT: Record<string, Effort> = {
-	minimal: "low", low: "low", medium: "medium", high: "high", xhigh: "xhigh",
+	minimal: "low", low: "low", medium: "medium", high: "high", xhigh: "xhigh", max: "max",
 };
 
 // --- Provider helpers: misc ---
@@ -1399,7 +1399,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 	const extraArgs: Record<string, string | null> = { model: cliModel };
 	if (strictMcpConfigEnabled) extraArgs["strict-mcp-config"] = null;
 
-	const childEnv = { ...process.env, DISABLE_AUTO_COMPACT: "1" };
+	const childEnv = buildCodebuddyEnv(providerSettings);
 	const queryOptions: NonNullable<Parameters<typeof query>[0]["options"]> = {
 		cwd,
 		env: childEnv,
@@ -1472,7 +1472,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 			const sessionId = capturedSessionId ?? sharedSession?.sessionId;
 			if (syncResult.preserveSharedSession) {
 				if (capturedSessionId && capturedSessionId !== sharedSession?.sessionId) {
-					deleteSession(capturedSessionId, cwd, process.env.CODEBUDDY_CONFIG_DIR);
+					deleteSession(capturedSessionId, cwd, resolveCodebuddyConfigDir(providerSettings));
 					debug(`provider: query done, deleted ephemeral session ${capturedSessionId.slice(0, 8)} to preserve shared session`);
 				}
 				debug(`provider: query done, ignoring captured session ${capturedSessionId?.slice(0, 8) ?? "none"} to preserve shared session`);
@@ -1571,12 +1571,12 @@ async function promptAndWait(
 		isolated?: boolean;
 		context?: Context["messages"];
 	},
+	runQuery: typeof startQuery = startQuery,
 ): Promise<{ responseText: string; stopReason: string }> {
 	const cwd = process.cwd();
-	const requestedModel = options?.model ?? "opus";
-	const model = resolveModel(requestedModel);
+	const requestedModel = options?.model;
+	const model = requestedModel === undefined ? undefined : _resolveModel(MODELS, requestedModel);
 	const modelId = model?.id ?? requestedModel;
-	const cliModel = model ? codebuddyModelId(model) : modelId;
 
 	// Session resume for shared mode — reuse provider's session if it exists,
 	// otherwise create one from pi's context.
@@ -1613,19 +1613,19 @@ async function promptAndWait(
 
 	const extraArgs: Record<string, string | null> = {
 		"strict-mcp-config": null,
-		model: cliModel,
+		...(modelId !== undefined ? { model: modelId } : {}),
 	};
 
 	debug("askCodebuddy:",
-		`mode=${mode} model=${modelId} cliModel=${cliModel} effort=${effort ?? "default"}`,
+		`mode=${mode} model=${modelId ?? "CLI default"} effort=${effort ?? "default"}`,
 		`isolated=${options?.isolated ?? false} resume=${resumeSessionId?.slice(0, 8) ?? "none"}`,
 		`sysPrompt=${Boolean(askSystemPrompt)} promptLen=${prompt.length}`);
 
-	const sdkQuery = startQuery({
+	const sdkQuery = runQuery({
 		prompt,
 		options: {
 			cwd,
-			env: { ...process.env, DISABLE_AUTO_COMPACT: "1" },
+			env: buildCodebuddyEnv(providerSettings),
 			permissionMode: "bypassPermissions",
 			...(disallowedTools.length ? { disallowedTools } : {}),
 			...(effort ? { effort } : {}),
@@ -1699,6 +1699,10 @@ async function promptAndWait(
 					if (!responseText && message.subtype === "success" && message.result) {
 						responseText = message.result;
 					}
+					if (r.is_error || message.subtype !== "success") {
+						const failure = [responseText, r.result, ...(r.errors ?? [])].filter(Boolean).join("\n");
+						throw new Error(failure || `CodeBuddy query failed (${message.subtype}).`);
+					}
 					break;
 				}
 			}
@@ -1710,6 +1714,13 @@ async function promptAndWait(
 			`sdkMessages=${sdkMessageCount} textDeltas=${textDeltaCount} responseLen=${responseText.length}`,
 			`toolCalls=${toolCalls.size}`);
 		return { responseText, stopReason };
+	} catch (err) {
+		const message = errorMessage(err);
+		const unavailableModel = /model\s*\[([^\]]+)\]\s*service info not found/i.exec(message);
+		if (unavailableModel) {
+			throw new Error(`CodeBuddy model "${unavailableModel[1]}" is unavailable for this account. Choose a model ID supported by your CodeBuddy account, or omit model to use the CLI's account default.\n${message}`);
+		}
+		throw err;
 	} finally {
 		signal?.removeEventListener("abort", onAbort);
 		endQuery(sdkQuery, "askCodebuddy", { log: debug });
@@ -1734,7 +1745,16 @@ async function discoverModels(pi: ExtensionAPI): Promise<void> {
 	await withSdkGate(async () => {
 		let q: ReturnType<typeof startQuery> | undefined;
 		try {
-			q = startQuery({ prompt: " ", options: { maxTurns: 0, permissionMode: "bypassPermissions", tools: [] } });
+			q = startQuery({
+				prompt: " ",
+				options: {
+					maxTurns: 0,
+					permissionMode: "bypassPermissions",
+					tools: [],
+					env: buildCodebuddyEnv(providerSettings),
+					...(providerSettings.pathToCodebuddyCode ? { pathToCodebuddyCode: providerSettings.pathToCodebuddyCode } : {}),
+				},
+			});
 			const supported = await q.supportedModels();
 			await q.return().catch(() => {});
 			if (!supported.length) return;
@@ -1903,11 +1923,11 @@ export default async function (pi: ExtensionAPI) {
 
 	if (askConf?.enabled !== false) {
 		const askCodebuddyParams = Type.Object({
-			prompt: Type.String({ description: "The question or task for CodeBuddy. By default Claude sees the full conversation history. Don't research up front, let Claude explore." }),
+			prompt: Type.String({ description: "The question or task for CodeBuddy. By default CodeBuddy sees the full conversation history. Don't research up front, let CodeBuddy explore." }),
 			mode: Type.Optional(StringEnum(modeValues, { description: modeDesc })),
-			model: Type.Optional(Type.String({ description: 'Claude model (e.g. "opus", "sonnet", "haiku", or full ID). Defaults to "opus".' })),
-			thinking: Type.Optional(StringEnum(["off", "minimal", "low", "medium", "high", "xhigh"] as const, { description: "Thinking effort level. Omit to use CodeBuddy's default." })),
-			isolated: Type.Optional(Type.Boolean({ description: "When true, Claude sees only this prompt (clean session). When false (default), Claude sees the full conversation history." })),
+			model: Type.Optional(Type.String({ description: "CodeBuddy model ID supported by your account. Omit to use the CLI's account default." })),
+			thinking: Type.Optional(StringEnum(["off", "minimal", "low", "medium", "high", "xhigh", "max"] as const, { description: "Thinking effort level. Omit to use CodeBuddy's default." })),
+			isolated: Type.Optional(Type.Boolean({ description: "When true, CodeBuddy sees only this prompt (clean session). When false (default), CodeBuddy sees the full conversation history." })),
 		});
 		pi.registerTool<typeof askCodebuddyParams>({
 			name: askConf?.name ?? "AskCodebuddy",

package/src/models.ts

@@ -95,6 +95,9 @@ export type ModelOverrides = {
 	maxTokens?: number;
 	reasoning?: boolean;
 	images?: boolean;
+	// Pi thinking level -> provider-native effort. Pi only offers `xhigh`/`max`
+	// when the key is present here (pi-ai `getSupportedThinkingLevels`).
+	thinkingLevelMap?: Record<string, string>;
 };
 
 /**
@@ -137,12 +140,16 @@ export function buildModels(
 		const input: ("text" | "image")[] = o.images === undefined
 			? m.input
 			: (o.images ? ["text", "image"] as const : ["text"] as const);
+		const thinkingLevelMap = o.thinkingLevelMap
+			? { ...(m.thinkingLevelMap ?? {}), ...o.thinkingLevelMap }
+			: m.thinkingLevelMap;
 		return {
 			...m,
 			contextWindow,
 			maxTokens,
 			reasoning: o.reasoning ?? m.reasoning,
 			input,
+			...(thinkingLevelMap ? { thinkingLevelMap } : {}),
 			cost: m.cost ?? { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
 		};
 	});