pi-codebuddy-sdk 0.1.9 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codebuddy-sdk",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "CodeBuddy Agent SDK provider for Pi — native tool execution, 29+ models, thinking controls, session pool",
   "author": "slahser",
   "license": "MIT",

package/src/context.ts

@@ -1,171 +1,204 @@
-import type { Context, ImageContent } from "@earendil-works/pi-ai/compat";
+import type { Context, ImageContent, Message } from "@earendil-works/pi-ai/compat";
+import { convertToLlm } from "@earendil-works/pi-coding-agent";
 import type { UserMessage as CbUserMessage, ContentBlock } from "@tencent-ai/agent-sdk";
 
-/**
- * Build a CodeBuddy UserMessage from the FULL Pi Context.
- * Used on the first turn of a pooled session.
- *
- * Returns either a plain string (text-only) or a structured UserMessage
- * with ContentBlock[] when images are present in the latest user message.
- */
+// ── public API ──
+
 export function buildFullMessage(context: Context): string | CbUserMessage {
   return buildMessage(context, 0);
 }
 
-/**
- * Build a CodeBuddy UserMessage from only NEW messages since startIndex.
- * Used on continuation turns of a pooled session (delta mode).
- *
- * Historical messages before startIndex are omitted — the CodeBuddy
- * session already has them in its internal context.
- */
 export function buildDeltaMessage(context: Context, startIndex: number): string | CbUserMessage {
   return buildMessage(context, startIndex);
 }
 
-// ── internal ──
+// ── tool boundary (like pi-cursor-sdk's getCursorToolBoundaryText) ──
 
-function buildMessage(context: Context, startIndex: number): string | CbUserMessage {
-  const prefix = buildHistoryPrefix(context, startIndex);
-  const lastUserMsg = findLastUserMessage(context, startIndex);
-  const images = extractImages(lastUserMsg);
+const CODEBUDDY_TOOL_BOUNDARY = [
+  "CodeBuddy SDK tool boundary:",
+  "Call only CodeBuddy SDK native tools (Read, Write, Bash, Grep, Edit, Glob, etc.).",
+  "Do not call any Pi-ecosystem tools — they are not registered in this session.",
+  "Tool names from conversation history refer to a prior provider; they are unavailable now.",
+  "CodeBuddy executes tools locally on the filesystem.",
+].join("\n");
 
-  if (images.length === 0) {
-    return prefix + extractTextFromMessage(lastUserMsg);
-  }
+const CODEBUDDY_TOOL_TAIL = [
+  "Answer the latest user request above using CodeBuddy SDK tools and capabilities.",
+  "Shell: cd to repo path for project commands; session cwd may differ from tool args.",
+  "Exact-output requests: output exactly the requested text; no preamble or checks unless asked.",
+  "Tools: call available CodeBuddy SDK tools; never print tool cards or names as assistant text.",
+].join("\n");
 
-  // Image support: build ContentBlock[]
-  const blocks: ContentBlock[] = [];
+// ── system prompt sanitization (like pi-cursor-sdk's sanitizeSystemPromptForCursor) ──
 
-  if (prefix) {
-    blocks.push({ type: "text", text: prefix });
-  }
+function sanitizeSystemPrompt(prompt: string): string {
+  let s = prompt;
 
-  for (const block of lastUserMsg!.content) {
-    if (typeof block === "string") {
-      blocks.push({ type: "text", text: block });
-    } else if (block.type === "text") {
-      blocks.push({ type: "text", text: block.text });
-    } else if (block.type === "image") {
-      blocks.push({
-        type: "image",
-        source: {
-          type: "base64",
-          media_type: parseImageMediaType(block.mimeType),
-          data: stripBase64Prefix(block.data),
-        },
-      });
-    }
-  }
+  // Strip Pi tool catalog section
+  s = s.replace(
+    /Available tools:\n[\s\S]*?\n\nIn addition to the tools above[\s\S]*?\n\n/g,
+    "Pi tool catalog omitted: CodeBuddy can call only CodeBuddy SDK tools.\n\n",
+  );
 
-  return {
-    type: "user",
-    session_id: "",
-    message: { role: "user", content: blocks },
-    parent_tool_use_id: null,
-  };
-}
+  // Strip Guidelines section (Pi-specific guidelines)
+  s = s.replace(
+    /Guidelines:\n[\s\S]*?\n\nPi documentation /g,
+    "Guidelines:\n- Be concise in your responses.\n- Show file paths clearly when working with files.\n\nPi documentation ",
+  );
 
-/**
- * Build conversation history prefix for messages in [startIndex, end).
- * The latest user message is always excluded (handled separately).
- */
-function buildHistoryPrefix(context: Context, startIndex: number): string {
-  // ponytail: on first turn, send only previous user messages as context.
-  // Assistant messages, tool calls, tool results, system injections
-  // (context-mode state, compaction XML, MCP references) are all from
-  // another provider and confuse CodeBuddy models.
-  if (startIndex === 0) {
-    return buildUserOnlyPrefix(context);
-  }
+  // Strip semantic code intelligence priority section
+  s = s.replace(/\n+Semantic code intelligence priority:[\s\S]*$/g, "");
 
-  // Continuation turns: include all new messages (from this CodeBuddy session).
-  const parts: string[] = [];
-  const messages = context.messages;
+  return s.trim();
+}
 
-  for (let i = startIndex; i < messages.length; i++) {
-    const msg = messages[i];
-    if (i === messages.length - 1 && msg.role === "user") continue;
+// ── message formatting ──
 
-    if (msg.role === "user") {
+function formatMessage(msg: Message): string | undefined {
+  switch (msg.role) {
+    case "user": {
       const text = extractTextContent(msg.content);
       const hasImages = extractImages(msg).length > 0;
       if (text) {
-        parts.push(`User: ${text}${hasImages ? " [image omitted]" : ""}`);
-      } else if (hasImages) {
-        parts.push("User: [image omitted]");
+        return `User: ${text}${hasImages ? " [image omitted]" : ""}`;
       }
-    } else if (msg.role === "assistant") {
-      const text = extractTextContent(msg.content);
-      if (text) parts.push(`Assistant: ${text}`);
-      for (const block of msg.content) {
-        if (block.type === "toolCall") {
-          parts.push(
-            `[Tool used: ${block.name}(${JSON.stringify(block.arguments)})]`,
-          );
+      if (hasImages) return "User: [image omitted]";
+      return undefined;
+    }
+    case "assistant": {
+      const blocks = Array.isArray(msg.content) ? msg.content : [];
+      const parts: string[] = [];
+      for (const block of blocks) {
+        if (typeof block === "object" && block !== null && "type" in block) {
+          if (block.type === "text") {
+            parts.push((block as { text: string }).text);
+          } else if (block.type === "toolCall") {
+            const tc = block as { name: string; arguments: Record<string, unknown> };
+            parts.push(`[Tool used: ${tc.name}(${JSON.stringify(tc.arguments)})]`);
+          }
+          // Skip thinking content blocks
         }
       }
-    } else if (msg.role === "toolResult") {
+      return parts.length > 0 ? `Assistant: ${parts.join("\n")}` : undefined;
+    }
+    case "toolResult": {
       const text = extractTextContent(msg.content);
-      const status = msg.isError ? "Error" : "Result";
+      const label = msg.isError ? "Tool error" : "Tool result";
       const snippet = truncateToolResult(text);
-      parts.push(`[Tool ${status} (${msg.toolName}): ${snippet}]`);
+      return `[${label} (${msg.toolName}): ${snippet}]`;
     }
+    default:
+      return undefined;
   }
-
-  return parts.length > 0 ? parts.join("\n") + "\n\n" : "";
 }
 
-/**
- * Truncate tool result with head + tail strategy (industry best practice).
- * Head 1200 chars (captures output start), tail 600 chars (captures errors/summaries),
- * marker in middle.
- */
+// ── truncation ──
+
 const TOOL_RESULT_HEAD = 1200;
 const TOOL_RESULT_TAIL = 600;
 
 function truncateToolResult(text: string): string {
   if (!text) return "(empty)";
   if (text.length <= TOOL_RESULT_HEAD + TOOL_RESULT_TAIL + 50) return text;
-
   const head = text.slice(0, TOOL_RESULT_HEAD);
   const tail = text.slice(-TOOL_RESULT_TAIL);
   const skipped = text.length - TOOL_RESULT_HEAD - TOOL_RESULT_TAIL;
   return `${head}\n...[${skipped.toLocaleString()} chars skipped]...\n${tail}`;
 }
 
-// ── helpers ──
-
-/**
- * First-turn prefix: only previous user messages.
- * Skips assistant, tool results, system injections — all provider noise.
- */
-function buildUserOnlyPrefix(context: Context): string {
-  const messages = context.messages;
-  if (messages.length <= 1) return "";
+// ── main builder ──
 
+function buildMessage(context: Context, startIndex: number): string | CbUserMessage {
   const parts: string[] = [];
-  for (let i = 0; i < messages.length - 1; i++) {
-    const msg = messages[i];
-    if (msg.role === "user") {
-      const text = extractTextContent(msg.content);
-      const hasImages = extractImages(msg).length > 0;
-      if (text) {
-        parts.push(`User: ${text}${hasImages ? " [image omitted]" : ""}`);
-      } else if (hasImages) {
-        parts.push("User: [image omitted]");
-      }
+
+  // 1. Tool boundary (always first)
+  parts.push(CODEBUDDY_TOOL_BOUNDARY);
+
+  // 2. Sanitized system prompt (first turn only — like pi-cursor-sdk)
+  if (startIndex === 0 && context.systemPrompt) {
+    const sanitized = sanitizeSystemPrompt(context.systemPrompt);
+    if (sanitized) {
+      parts.push(`System instructions from pi:\n${sanitized}`);
     }
-    // skip everything else: assistant, toolResult, system injections
   }
-  return parts.length > 0 ? parts.join("\n") + "\n\n" : "";
+
+  // 3. Normalize and format messages (filter out non-LLM roles via convertToLlm)
+  const rawMessages = context.messages as Parameters<typeof convertToLlm>[0];
+  let llmMessages = convertToLlm(rawMessages);
+
+  // ponytail: filter compaction/branch summary user messages on first turn.
+  // convertToLlm wraps them as user messages with <summary> tags; Hunyuan
+  // parrots context-mode state from them. Smarter models follow boundary text.
+  if (startIndex === 0) {
+    llmMessages = llmMessages.filter((m) => {
+      if (m.role !== "user") return true;
+      const text = extractTextContent(m.content);
+      // Compaction summaries are large blocks with context-mode state
+      if (text.includes("<summary>") || text.includes("compacted into")) return false;
+      // context-mode session state injection
+      if (text.includes("context-mode active") || text.includes("<session_state")) return false;
+      return true;
+    });
+  }
+  const latestUserIdx = findLatestUserIndex(llmMessages);
+  const msgParts: string[] = [];
+  for (let i = startIndex; i < llmMessages.length; i++) {
+    if (i === latestUserIdx) continue; // handled separately (images etc.)
+    const formatted = formatMessage(llmMessages[i]);
+    if (formatted) msgParts.push(formatted);
+  }
+
+  // 4. Latest user message
+  const lastUser = latestUserIdx >= 0 ? llmMessages[latestUserIdx] : null;
+  const lastUserText = lastUser ? extractTextContent(lastUser.content) : "Continue.";
+  const images = lastUser ? extractImages(lastUser) : [];
+
+  // 5. Tool tail guard
+  parts.push(
+    msgParts.length > 0 ? msgParts.join("\n") : "(new conversation)",
+  );
+  parts.push(CODEBUDDY_TOOL_TAIL);
+
+  const prefix = parts.join("\n\n");
+
+  // Plain text (no images)
+  if (images.length === 0) {
+    return prefix + "\n\n" + lastUserText;
+  }
+
+  // Structured message with images
+  const blocks: ContentBlock[] = [];
+  blocks.push({ type: "text", text: prefix });
+  blocks.push({ type: "text", text: lastUserText });
+  for (const block of lastUser!.content) {
+    if (typeof block === "object" && block !== null && "type" in block && (block as { type: string }).type === "image") {
+      const img = block as ImageContent;
+      blocks.push({
+        type: "image",
+        source: {
+          type: "base64",
+          media_type: parseImageMediaType(img.mimeType),
+          data: stripBase64Prefix(img.data),
+        },
+      });
+    }
+  }
+
+  return {
+    type: "user",
+    session_id: "",
+    message: { role: "user", content: blocks },
+    parent_tool_use_id: null,
+  };
 }
 
-function findLastUserMessage(context: Context, startIndex: number) {
-  for (let i = context.messages.length - 1; i >= startIndex; i--) {
-    if (context.messages[i].role === "user") return context.messages[i];
+// ── helpers ──
+
+function findLatestUserIndex(messages: Message[]): number {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].role === "user") return i;
   }
-  return null;
+  return -1;
 }
 
 function extractImages(msg: any): ImageContent[] {
@@ -175,11 +208,6 @@ function extractImages(msg: any): ImageContent[] {
   );
 }
 
-function extractTextFromMessage(msg: any): string {
-  if (!msg) return "Continue.";
-  return extractTextContent(msg.content) || "Continue.";
-}
-
 function extractTextContent(content: unknown): string {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -199,14 +227,8 @@ function extractTextContent(content: unknown): string {
 type ImageMediaType = "image/png" | "image/jpeg" | "image/gif" | "image/webp";
 
 function parseImageMediaType(mimeType: string): ImageMediaType {
-  const valid: ImageMediaType[] = [
-    "image/png",
-    "image/jpeg",
-    "image/gif",
-    "image/webp",
-  ];
-  if (valid.includes(mimeType as ImageMediaType))
-    return mimeType as ImageMediaType;
+  const valid: ImageMediaType[] = ["image/png", "image/jpeg", "image/gif", "image/webp"];
+  if (valid.includes(mimeType as ImageMediaType)) return mimeType as ImageMediaType;
   return "image/png";
 }
 

package/src/dump-context.ts

@@ -0,0 +1,11 @@
+/**
+ * Check what Pi actually injects into Context.messages.
+ * Logs all messages with their role and first 100 chars of content.
+ */
+import { createAssistantMessageEventStream } from '@earendil-works/pi-ai';
+
+// Register a fake provider to intercept Context
+// We can't easily intercept Context without running Pi, so let's just
+// dump what our extension sees when loaded from Pi.
+console.log("Run this from Pi: pi -e src/dump-context.ts --provider codebuddy --model hy3-preview-agent-ioa -p 'test'");
+console.log("Then check the console output for injected messages.");