pi-codebuddy-sdk 0.4.6 → 0.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codebuddy-sdk",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Pi extension that uses CodeBuddy (via Agent SDK) as a model provider and adds an AskCodebuddy tool.",
   "author": "slahser",
   "license": "MIT",
@@ -34,18 +34,18 @@
   "dependencies": {
     "@tencent-ai/agent-sdk": "^0.3.259",
     "change-case": "^5.4.4",
-    "typebox": "^1.3.0"
+    "typebox": "^1.3.34"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.85.1",
-    "@earendil-works/pi-coding-agent": "^0.85.1",
-    "@earendil-works/pi-tui": "^0.85.1"
+    "@earendil-works/pi-ai": "^0.86.0",
+    "@earendil-works/pi-coding-agent": "^0.86.0",
+    "@earendil-works/pi-tui": "^0.86.0"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.85.1",
-    "@earendil-works/pi-coding-agent": "^0.85.1",
-    "@earendil-works/pi-tui": "^0.85.1",
-    "@types/node": "^26.6.1",
+    "@earendil-works/pi-ai": "^0.86.0",
+    "@earendil-works/pi-coding-agent": "^0.86.0",
+    "@earendil-works/pi-tui": "^0.86.0",
+    "@types/node": "^26.6.2",
     "tsx": "^4.23.13",
     "typescript": "^7.0.2"
   },

package/src/index.ts

@@ -11,6 +11,7 @@ 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 { readTranscript } from "./transcript-compat.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";
@@ -413,7 +414,8 @@ async function runIsolatedSummary(
 	};
 
 	try {
-		const promptText = extractIsolatedSummaryPrompt(context.messages);
+		const view = readTranscript(context);
+		const promptText = extractIsolatedSummaryPrompt(view.messages);
 		const cwd = (options as { cwd?: string } | undefined)?.cwd ?? process.cwd();
 		const codebuddyExecutable = loadConfig(cwd).provider?.pathToCodebuddyCode;
 		const cliModel = codebuddyModelId(model);
@@ -428,7 +430,7 @@ async function runIsolatedSummary(
 				strictMcpConfig: true,
 				settingSources: [] as SettingSource[],
 				persistSession: false,
-				systemPrompt: context.systemPrompt,
+				systemPrompt: view.systemPrompt,
 				model: cliModel,
 				maxTurns: 1,
 				...(codebuddyExecutable ? { pathToCodebuddyCode: codebuddyExecutable } : {}),
@@ -772,7 +774,7 @@ function contextForToolResults(results: McpResult[]): QueryContext | undefined {
 	return undefined;
 }
 
-function resolveMcpTools(context: Context, excludeToolName?: string): {
+function resolveMcpTools(declaredTools: Tool[] | undefined, excludeToolName?: string): {
 	mcpTools: Tool[];
 	customToolNameToSdk: Map<string, string>;
 	customToolNameToPi: Map<string, string>;
@@ -781,9 +783,9 @@ function resolveMcpTools(context: Context, excludeToolName?: string): {
 	const customToolNameToSdk = new Map<string, string>();
 	const customToolNameToPi = new Map<string, string>();
 
-	if (!context.tools) return { mcpTools, customToolNameToSdk, customToolNameToPi };
+	if (!declaredTools) return { mcpTools, customToolNameToSdk, customToolNameToPi };
 
-	for (const tool of context.tools) {
+	for (const tool of declaredTools) {
 		if (tool.name === excludeToolName) continue;
 		const sdkName = `${MCP_TOOL_PREFIX}${tool.name}`;
 		mcpTools.push(tool);
@@ -1187,8 +1189,12 @@ async function consumeQuery(
 function streamCodebuddySdk(model: Model<any>, context: Context, options?: SimpleStreamOptions): AssistantMessageEventStream {
 	const stream = newAssistantMessageEventStream();
 
+	// Upstream #9548: pi-ai >= 0.85.2 passes a normalized transcript (prompt + tools carried by
+	// system messages). Read both shapes so this provider works before and after that change.
+	const { messages: convoMessages, systemPrompt: baseSystemPrompt, tools: declaredTools } = readTranscript(context);
+
 	// DEBUG: trace followUp message triggering
-	const lastMsgRole = context.messages[context.messages.length - 1]?.role;
+	const lastMsgRole = convoMessages[convoMessages.length - 1]?.role;
 	debug(`provider: streamCodebuddySdk called, activeQuery=${!!ctx().activeQuery}, lastMsgRole=${lastMsgRole}, isReentrant=${ctx().activeQuery !== null}`);
 
 	const activeQuery = ctx().activeQuery !== null;
@@ -1196,7 +1202,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 	const resultCtx = allResults.length > 0 ? contextForToolResults(allResults) : undefined;
 	const isReentrantUserQuery = activeQuery && lastMsgRole === "user" && allResults.length === 0;
 	if (isReentrantUserQuery) {
-		debug(`provider: active query user-only call treated as reentrant fresh query, waitingHandlers=${ctx().pendingToolCalls.size}, ctx.msgs=${context.messages.length}`);
+		debug(`provider: active query user-only call treated as reentrant fresh query, waitingHandlers=${ctx().pendingToolCalls.size}, ctx.msgs=${convoMessages.length}`);
 	}
 
 	// --- Tool result delivery ---
@@ -1206,7 +1212,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 	if (resultCtx) {
 		claimCurrentPiStream(stream, "tool-result", resultCtx);
 		resultCtx.resetTurnState(model);
-		debug(`provider: tool results, ${allResults.length} results, ${resultCtx.pendingToolCalls.size} waiting handlers, ctx.msgs=${context.messages.length}`);
+		debug(`provider: tool results, ${allResults.length} results, ${resultCtx.pendingToolCalls.size} waiting handlers, ctx.msgs=${convoMessages.length}`);
 		for (const result of allResults) {
 			const id = result.toolCallId;
 			if (id && resultCtx.pendingToolCalls.has(id)) {
@@ -1245,25 +1251,25 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 		// The bridge can't forward these mid-query (the SDK query is in progress),
 		// so we save them for replay as continuation queries after consumeQuery ends.
 		if (lastMsgRole === "user") {
-			const userPrompt = extractUserPrompt(context.messages);
+			const userPrompt = extractUserPrompt(convoMessages);
 			if (userPrompt) {
 				resultCtx.deferredUserMessages.push(userPrompt);
 				debug(`provider: deferred user message for replay after query (len=${userPrompt.length})`);
 			}
 		}
 
-		if (sharedSession) sharedSession.cursor = context.messages.length;
-		resultCtx.latestCursor = Math.max(resultCtx.latestCursor, context.messages.length);
+		if (sharedSession) sharedSession.cursor = convoMessages.length;
+		resultCtx.latestCursor = Math.max(resultCtx.latestCursor, convoMessages.length);
 		return stream;
 	}
 
 	// --- Orphaned tool result (e.g. user aborted a tool call) ---
 	// The query is gone but pi still delivered the result. Nothing to do — just
 	// emit end_turn so pi waits for the next real user message.
-	const lastMsg = context.messages[context.messages.length - 1];
+	const lastMsg = convoMessages[convoMessages.length - 1];
 	if (lastMsg?.role === "toolResult") {
 		debug(`provider: orphaned tool result after abort, emitting end_turn`);
-		if (sharedSession) sharedSession.cursor = context.messages.length;
+		if (sharedSession) sharedSession.cursor = convoMessages.length;
 		const c = ctx();  // capture current context for the microtask
 		queueMicrotask(() => {
 			c.resetTurnState(model);
@@ -1291,24 +1297,24 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 	queryCtx.resetTurnState(model);
 	queryCtx.latestCursor = 0;
 
-	const { mcpTools, customToolNameToSdk, customToolNameToPi } = resolveMcpTools(context, askCodebuddyToolName);
+	const { mcpTools, customToolNameToSdk, customToolNameToPi } = resolveMcpTools(declaredTools, askCodebuddyToolName);
 	const cwd = (options as { cwd?: string } | undefined)?.cwd ?? process.cwd();
-	const syncResult = syncSharedSession(context.messages, cwd, customToolNameToSdk, model.id, Boolean(isReentrant));
+	const syncResult = syncSharedSession(convoMessages, cwd, customToolNameToSdk, model.id, Boolean(isReentrant));
 	const { sessionId: resumeSessionId } = syncResult;
-	const promptBlocks = extractUserPromptBlocks(context.messages);
-	let promptText = extractUserPrompt(context.messages) ?? "";
+	const promptBlocks = extractUserPromptBlocks(convoMessages);
+	let promptText = extractUserPrompt(convoMessages) ?? "";
 
 	// Guard: empty prompt means the last context message isn't a user message.
 	// This should never happen with per-query state — dump diagnostics if it does.
 	if (!promptText && !promptBlocks) {
 		diagDump("empty_prompt", {
-			contextLength: context.messages.length,
+			contextLength: convoMessages.length,
 			lastMsgRole: lastMsg?.role,
 			isReentrant,
 			activeQueryContexts: activeQueryContexts.size,
 			activeQueryExists: queryCtx.activeQuery !== null,
 			sharedSession: sharedSession ? { sessionId: sharedSession.sessionId.slice(0, 8), cursor: sharedSession.cursor } : null,
-			messageRoles: context.messages.map((m, i) => `[${i}]${m.role}`).join(" "),
+			messageRoles: convoMessages.map((m, i) => `[${i}]${m.role}`).join(" "),
 		});
 		// Recover: use a continuation prompt so the SDK doesn't send an empty text block
 		promptText = "[continue]";
@@ -1320,7 +1326,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 	const mcpServers = buildMcpServers(mcpTools, queryCtx);
 	const appendSystemPrompt = providerSettings.appendSystemPrompt !== false;
 	const systemPrompt = appendSystemPrompt
-		? buildCodebuddySystemPrompt(context.systemPrompt)
+		? buildCodebuddySystemPrompt(baseSystemPrompt)
 		: undefined;
 
 	// MCP auto-loading suppression: CC reads MCP servers from ~/.claude.json (top-level
@@ -1366,7 +1372,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 	};
 
 	debug("provider: fresh query",
-		`model=${cliModel} msgs=${context.messages.length} tools=${mcpTools.length}`,
+		`model=${cliModel} msgs=${convoMessages.length} tools=${mcpTools.length}`,
 		`resume=${resumeSessionId?.slice(0, 8) ?? "none"} effort=${effort ?? "default"}`,
 		`appendSys=${appendSystemPrompt} strictMcp=${strictMcpConfigEnabled}`,
 		`promptLen=${promptText.length}${promptBlocks ? " [+images]" : ""}`);
@@ -1426,7 +1432,7 @@ function streamCodebuddySdk(model: Model<any>, context: Context, options?: Simpl
 				}
 				debug(`provider: query done, ignoring captured session ${capturedSessionId?.slice(0, 8) ?? "none"} to preserve shared session`);
 			} else if (sessionId) {
-				const cursor = Math.max(context.messages.length, queryCtx.latestCursor, sharedSession?.cursor ?? 0);
+				const cursor = Math.max(convoMessages.length, queryCtx.latestCursor, sharedSession?.cursor ?? 0);
 				debug(`provider: query done, session=${sessionId.slice(0, 8)}, cursor=${cursor}`);
 				sharedSession = { sessionId, cursor, cwd };
 			}

package/src/transcript-compat.ts

@@ -0,0 +1,81 @@
+import * as piAi from "@earendil-works/pi-ai";
+import type { Message, Tool } from "@earendil-works/pi-ai";
+
+// Upstream #9548 ("Mid conversation system messages") folds `Context.systemPrompt` and
+// `Context.tools` into the transcript's system messages, so provider-facing code receives a
+// `TranscriptContext` that only carries `messages`. This module reads both shapes so the
+// provider keeps working on pi-ai <= 0.85.1 and >= 0.85.2 without a hard version bump.
+
+export interface TranscriptView {
+	/** Conversation messages with system messages removed (the pre-#9548 shape). */
+	messages: Message[];
+	/** Rendered system prompt, or undefined when the request carries none. */
+	systemPrompt: string | undefined;
+	/** Tool declarations available for this request. */
+	tools: Tool[] | undefined;
+}
+
+type MaybeTranscript = {
+	messages: Message[];
+	systemPrompt?: string;
+	tools?: Tool[];
+};
+
+const ai = piAi as unknown as Record<string, unknown>;
+
+function textOfContent(content: unknown): string {
+	if (typeof content === "string") return content;
+	if (Array.isArray(content)) {
+		return content
+			.map((part) =>
+				part && typeof part === "object" && typeof (part as { text?: unknown }).text === "string"
+					? (part as { text: string }).text
+					: "",
+			)
+			.join("");
+	}
+	return "";
+}
+
+/**
+ * Read the system prompt, tool declarations, and conversation from a request context that
+ * may be either a legacy `Context` or a normalized `TranscriptContext`.
+ */
+export function readTranscript(context: MaybeTranscript): TranscriptView {
+	const messages = Array.isArray(context.messages) ? context.messages : [];
+
+	// Legacy shape (pi-ai <= 0.85.1): prompt and tools are top-level fields.
+	if (typeof context.systemPrompt === "string" || Array.isArray(context.tools)) {
+		return { messages, systemPrompt: context.systemPrompt, tools: context.tools };
+	}
+
+	// Normalized shape (pi-ai >= 0.85.2): replay the transcript through upstream helpers.
+	const collapseSystemMessages = ai.collapseSystemMessages as
+		| ((c: { messages: Message[] }) => { messages: Message[] })
+		| undefined;
+	const getCurrentSystemPrompt = ai.getCurrentSystemPrompt as ((m: readonly unknown[]) => string) | undefined;
+	const getCurrentTools = ai.getCurrentTools as ((m: readonly unknown[]) => Tool[]) | undefined;
+	if (
+		typeof collapseSystemMessages === "function" &&
+		typeof getCurrentSystemPrompt === "function" &&
+		typeof getCurrentTools === "function"
+	) {
+		const collapsed = collapseSystemMessages({ messages });
+		return {
+			messages: collapsed.messages.filter((message) => (message as { role?: string }).role !== "system"),
+			systemPrompt: getCurrentSystemPrompt(collapsed.messages) || undefined,
+			tools: getCurrentTools(collapsed.messages),
+		};
+	}
+
+	// No upstream helpers available: best-effort replay of the leading system message.
+	const systemMessages = messages.filter((message) => (message as { role?: string }).role === "system");
+	const conversation = messages.filter((message) => (message as { role?: string }).role !== "system");
+	const head = systemMessages[0] as (Message & { content?: unknown; toolsAdded?: Tool[] }) | undefined;
+	if (!head) return { messages: conversation, systemPrompt: undefined, tools: undefined };
+	return {
+		messages: conversation,
+		systemPrompt: textOfContent(head.content) || undefined,
+		tools: head.toolsAdded,
+	};
+}