pi-codebuddy-sdk 0.1.19 → 0.3.1

package/src/config.ts

@@ -1,46 +1,50 @@
-// User-facing extension config. Loaded once at extension registration from
-// ~/.pi/agent/codebuddy-sdk.json and the project Pi config directory, project
-// overriding global. Missing or unparseable files are ignored.
-
+import type { SettingSource } from "./index-types.js";
 import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 
+function redactPath(path: string): string {
+	const home = homedir();
+	return home && path.startsWith(home) ? "~" + path.slice(home.length) : path;
+}
+
+export const CONFIG_BASENAME = "codebuddy-sdk.json";
+
 export interface Config {
-  askCodebuddy?: {
-    enabled?: boolean;
-    name?: string;
-    label?: string;
-    description?: string;
-    defaultMode?: "full" | "read" | "none";
-    defaultIsolated?: boolean;
-    allowFullMode?: boolean;
-    appendSkills?: boolean;
-  };
-  provider?: {
-    appendSystemPrompt?: boolean;
-    pathToCodebuddyExecutable?: string;
-    plan?: "pro" | "max";
-    longContextExtraUsage?: boolean;
-  };
+	askCodebuddy?: {
+		enabled?: boolean;
+		name?: string;
+		label?: string;
+		description?: string;
+		defaultMode?: "full" | "read" | "none";
+		defaultIsolated?: boolean;
+		allowFullMode?: boolean;
+		appendSkills?: boolean;
+	};
+	provider?: {
+		appendSystemPrompt?: boolean;
+		settingSources?: SettingSource[];
+		strictMcpConfig?: boolean;
+		pathToCodebuddyCode?: string;
+	};
 }
 
 export function tryParseJson(path: string): Partial<Config> {
-  if (!existsSync(path)) return {};
-  try {
-    return JSON.parse(readFileSync(path, "utf-8"));
-  } catch (e) {
-    console.error(`codebuddy-sdk: failed to parse ${path}: ${e}`);
-    return {};
-  }
+	if (!existsSync(path)) return {};
+	try {
+		return JSON.parse(readFileSync(path, "utf-8"));
+	} catch (e) {
+		console.error(`codebuddy-sdk: failed to parse ${redactPath(path)}: ${e}`);
+		return {};
+	}
 }
 
 export function loadConfig(cwd: string): Config {
-  const global = tryParseJson(join(homedir(), ".pi", "agent", "codebuddy-sdk.json"));
-  const project = tryParseJson(join(cwd, CONFIG_DIR_NAME, "codebuddy-sdk.json"));
-  return {
-    askCodebuddy: { ...global.askCodebuddy, ...project.askCodebuddy },
-    provider: { ...global.provider, ...project.provider },
-  };
+	const global = tryParseJson(join(homedir(), ".pi", "agent", CONFIG_BASENAME));
+	const project = tryParseJson(join(cwd, CONFIG_DIR_NAME, CONFIG_BASENAME));
+	return {
+		askCodebuddy: { ...global.askCodebuddy, ...project.askCodebuddy },
+		provider: { ...global.provider, ...project.provider },
+	};
 }

package/src/convert.ts

@@ -1,105 +1,101 @@
-// Pure pi -> SDK message conversion helpers.
+// Pi → CodeBuddy message conversion helpers.
 
 import type { Message as PiMessage } from "@earendil-works/pi-ai";
+import type { CbMessage } from "./cb-session-io.js";
+import { pascalCase } from "change-case";
 
 export const PROVIDER_ID = "codebuddy";
 
 export const PI_TO_SDK_TOOL_NAME: Record<string, string> = {
-  read: "Read", write: "Write", edit: "Edit", bash: "Bash",
+	read: "Read", write: "Write", edit: "Edit", bash: "Bash",
 };
 
 export function sanitizeToolId(id: string, cache: Map<string, string>): string {
-  const existing = cache.get(id);
-  if (existing) return existing;
-  const clean = id.replace(/[^a-zA-Z0-9_-]/g, "_");
-  cache.set(id, clean);
-  return clean;
+	const existing = cache.get(id);
+	if (existing) return existing;
+	const clean = id.replace(/[^a-zA-Z0-9_-]/g, "_");
+	cache.set(id, clean);
+	return clean;
 }
 
 export function mapPiToolNameToSdk(name: string, customToolNameToSdk?: Map<string, string>): string {
-  if (!name) return "";
-  const normalized = name.toLowerCase();
-  if (customToolNameToSdk) {
-    const mapped = customToolNameToSdk.get(name) ?? customToolNameToSdk.get(normalized);
-    if (mapped) return mapped;
-  }
-  if (PI_TO_SDK_TOOL_NAME[normalized]) return PI_TO_SDK_TOOL_NAME[normalized];
-  // ponytail: simple PascalCase fallback instead of change-case dep
-  return name.charAt(0).toUpperCase() + name.slice(1);
+	if (!name) return "";
+	const normalized = name.toLowerCase();
+	if (customToolNameToSdk) {
+		const mapped = customToolNameToSdk.get(name) ?? customToolNameToSdk.get(normalized);
+		if (mapped) return mapped;
+	}
+	if (PI_TO_SDK_TOOL_NAME[normalized]) return PI_TO_SDK_TOOL_NAME[normalized];
+	return pascalCase(name);
 }
 
 export function messageContentToText(
-  content: string | Array<{ type: string; text?: string; data?: string; mimeType?: string }>,
+	content: string | Array<{ type: string; text?: string; data?: string; mimeType?: string }>,
 ): string {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  const parts = [];
-  let hasText = false;
-  for (const block of content) {
-    if (block.type === "text" && block.text) { parts.push(block.text); hasText = true; }
-    else if (block.type !== "text" && block.type !== "image") { parts.push(`[${block.type}]`); }
-  }
-  return hasText ? parts.join("\n") : "";
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	const parts = [];
+	let hasText = false;
+	for (const block of content) {
+		if (block.type === "text" && block.text) { parts.push(block.text); hasText = true; }
+		else if (block.type !== "text" && block.type !== "image") { parts.push(`[${block.type}]`); }
+	}
+	return hasText ? parts.join("\n") : "";
 }
 
-// SessionMessage is an internal type used by the provider's session persistence.
-// It mirrors the Anthropic API message format.
-export interface SessionMessage {
-  role: "user" | "assistant";
-  content: string | Array<Record<string, unknown>>;
-}
-
-/** Convert pi message array to SDK-compatible format. */
+/** Convert pi message array to session-import format. */
 export function convertPiMessages(
-  messages: PiMessage[],
-  customToolNameToSdk?: Map<string, string>,
-): { anthropicMessages: SessionMessage[]; sanitizedIds: Map<string, string> } {
-  const anthropicMessages: SessionMessage[] = [];
-  const sanitizedIds = new Map<string, string>();
+	messages: PiMessage[],
+	customToolNameToSdk?: Map<string, string>,
+): { anthropicMessages: Array<{ role: "user" | "assistant"; content: string | Array<unknown> }>; sanitizedIds: Map<string, string> } {
+	const anthropicMessages: Array<{ role: "user" | "assistant"; content: string | Array<unknown> }> = [];
+	const sanitizedIds = new Map<string, string>();
 
-  for (const msg of messages) {
-    if (msg.role === "user") {
-      if (typeof msg.content === "string") {
-        anthropicMessages.push({ role: "user", content: msg.content || "[empty]" });
-      } else if (Array.isArray(msg.content)) {
-        const parts: Array<Record<string, unknown>> = [];
-        for (const block of msg.content) {
-          if (block.type === "text" && block.text) parts.push({ type: "text", text: block.text });
-          else if (block.type === "image" && (block as any).data && (block as any).mimeType) {
-            parts.push({ type: "image", source: { type: "base64", media_type: (block as any).mimeType, data: (block as any).data } });
-          }
-        }
-        anthropicMessages.push({ role: "user", content: parts.length ? parts : "[image]" });
-      } else {
-        anthropicMessages.push({ role: "user", content: "[empty]" });
-      }
-    } else if (msg.role === "assistant") {
-      const content = Array.isArray(msg.content) ? msg.content : [];
-      const blocks: Array<Record<string, unknown>> = [];
-      for (const block of content) {
-        if (block.type === "text" && block.text) {
-          blocks.push({ type: "text", text: block.text });
-        } else if (block.type === "thinking") {
-          const sig = (block as any).thinkingSignature;
-          const isCodebuddyProvider = msg.provider === PROVIDER_ID || msg.api === "codebuddy-sdk";
-          if (isCodebuddyProvider && sig) {
-            blocks.push({ type: "thinking", thinking: block.thinking ?? "", signature: sig });
-          }
-        } else if (block.type === "toolCall") {
-          const toolName = mapPiToolNameToSdk((block as any).name, customToolNameToSdk);
-          blocks.push({ type: "tool_use", id: sanitizeToolId((block as any).id, sanitizedIds), name: toolName, input: (block as any).arguments ?? {} });
-        }
-      }
-      if (!blocks.length) blocks.push({ type: "text", text: "[incompatible content omitted]" });
-      anthropicMessages.push({ role: "assistant", content: blocks });
-    } else if (msg.role === "toolResult") {
-      const text = typeof msg.content === "string" ? msg.content : messageContentToText(msg.content);
-      anthropicMessages.push({
-        role: "user",
-        content: [{ type: "tool_result", tool_use_id: sanitizeToolId((msg as any).toolCallId, sanitizedIds), content: text || "", is_error: (msg as any).isError }],
-      });
-    }
-  }
+	for (const msg of messages) {
+		if (msg.role === "user") {
+			if (typeof msg.content === "string") {
+				anthropicMessages.push({ role: "user", content: msg.content || "[empty]" });
+			} else if (Array.isArray(msg.content)) {
+				const parts = [];
+				for (const block of msg.content) {
+					if (block.type === "text" && block.text) parts.push({ type: "text", text: block.text });
+					else if (block.type === "image" && block.data && block.mimeType) {
+						parts.push({ type: "image", source: { type: "base64", media_type: block.mimeType, data: block.data } });
+					}
+				}
+				anthropicMessages.push({ role: "user", content: parts.length ? parts : "[image]" });
+			} else {
+				anthropicMessages.push({ role: "user", content: "[empty]" });
+			}
+		} else if (msg.role === "assistant") {
+			const content = Array.isArray(msg.content) ? msg.content : [];
+			const blocks = [];
+			for (const block of content) {
+				if (block.type === "text" && block.text) {
+					blocks.push({ type: "text", text: block.text });
+				} else if (block.type === "thinking") {
+					const sig = block.thinkingSignature;
+					const isCodebuddyProvider = msg.provider === PROVIDER_ID || msg.provider === "codebuddy-sdk" || msg.api === "codebuddy-sdk";
+					if (isCodebuddyProvider && sig) {
+						blocks.push({ type: "thinking", thinking: block.thinking ?? "", signature: sig });
+					}
+				} else if (block.type === "toolCall") {
+					const toolName = mapPiToolNameToSdk(block.name, customToolNameToSdk);
+					blocks.push({ type: "tool_use", id: sanitizeToolId(block.id, sanitizedIds), name: toolName, input: block.arguments ?? {} });
+				}
+			}
+			if (!blocks.length) blocks.push({ type: "text", text: "[incompatible content omitted]" });
+			anthropicMessages.push({ role: "assistant", content: blocks });
+		} else if (msg.role === "toolResult") {
+			const text = typeof msg.content === "string" ? msg.content : messageContentToText(msg.content);
+			anthropicMessages.push({
+				role: "user",
+				content: [{ type: "tool_result", tool_use_id: sanitizeToolId(msg.toolCallId, sanitizedIds), content: text || "", is_error: msg.isError }],
+			});
+		}
+	}
 
-  return { anthropicMessages, sanitizedIds };
+	return { anthropicMessages, sanitizedIds };
 }
+
+export type SessionMessage = CbMessage;

package/src/extract-tool-results.ts

@@ -0,0 +1,47 @@
+// Tool-result extraction: walks the context tail to collect this turn's
+// tool results. Pi appends results to context and calls the provider again;
+// this scrapes them back out. Walks past user messages (steer/followUp) that
+// pi may inject between toolResults. Stops at the nearest assistant message
+// (turn boundary).
+// Extracted from index.ts so tests can import without activating the extension.
+
+export type McpContent = Array<
+	| { type: "text"; text: string }
+	| { type: "image"; data: string; mimeType: string }
+>;
+
+export interface McpResult {
+	content: McpContent;
+	isError?: boolean;
+	toolCallId?: string;
+	[key: string]: unknown;
+}
+
+export function toolResultToMcpContent(
+	content: string | Array<{ type: string; text?: string; data?: string; mimeType?: string }>,
+): McpContent {
+	if (typeof content === "string") return [{ type: "text", text: content || "" }];
+	if (!Array.isArray(content)) return [{ type: "text", text: "" }];
+	const blocks: McpContent = [];
+	for (const block of content) {
+		if (block.type === "text" && block.text) blocks.push({ type: "text", text: block.text });
+		else if (block.type === "image" && block.data && block.mimeType) blocks.push({ type: "image", data: block.data, mimeType: block.mimeType });
+	}
+	return blocks.length ? blocks : [{ type: "text", text: "" }];
+}
+
+// Returns { results, stopIdx } so callers can log the walk boundary.
+export function extractAllToolResults(
+	messages: Array<{ role: string; content?: unknown; toolCallId?: string; isError?: boolean; [key: string]: unknown }>,
+): { results: McpResult[]; stopIdx: number } {
+	const results: McpResult[] = [];
+	let stopIdx = -1;
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const msg = messages[i];
+		if (msg.role === "toolResult") {
+			results.unshift({ content: toolResultToMcpContent(msg.content as string | Array<{ type: string; text?: string; data?: string; mimeType?: string }>), isError: msg.isError, toolCallId: msg.toolCallId });
+		} else if (msg.role === "assistant") { stopIdx = i; break; }
+		// user messages: skip (steer/followUp injected mid-tool-execution)
+	}
+	return { results, stopIdx };
+}

package/src/index-types.ts

@@ -0,0 +1 @@
+export type SettingSource = "user" | "project" | "local";