pi-codebuddy-sdk 0.1.14 → 0.1.16

package/package.json

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

package/src/index.ts

@@ -10,7 +10,7 @@
  * Two files: index.ts (registration + model discovery), provider.ts (streaming).
  */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { ProviderApi, SimpleStreamOptions } from "@earendil-works/pi-ai/compat";
+import type { ProviderApi } from "@earendil-works/pi-ai/compat";
 import { streamCodebuddy } from "./provider.js";
 
 // ── provider registration ──
@@ -25,7 +25,6 @@ export default function activate(api: ExtensionAPI) {
     streamSimple: streamCodebuddy,
   });
 
-  // Lazy model discovery at startup
   queueMicrotask(async () => {
     try {
       const models = await discoverModels();
@@ -38,8 +37,7 @@ export default function activate(api: ExtensionAPI) {
         streamSimple: streamCodebuddy,
       });
     } catch {
-      // Model discovery failed — provider registered with empty models,
-      // user can still try manually.
+      // Model discovery failed — provider stays with empty models, user can try manually.
     }
   });
 }
@@ -52,13 +50,13 @@ async function getSdk() {
   return _sdk;
 }
 
-export async function discoverModels(): Promise<ProviderApi["models"]> {
+async function discoverModels(): Promise<ProviderApi["models"]> {
   const sdk = await getSdk();
   const q = sdk.query({ prompt: " ", options: { maxTurns: 0 } });
   const supported = await q.supportedModels();
   await q.interrupt();
 
-  const models = supported.map((m) => {
+  return supported.map((m) => {
     const caps = detectCapabilities(m.id);
     return {
       id: m.id,
@@ -72,11 +70,9 @@ export async function discoverModels(): Promise<ProviderApi["models"]> {
       maxTokens: caps.maxTokens,
     };
   });
-
-  return models;
 }
 
-// ── capability detection (pattern-based, like pi-claude-bridge) ──
+// ── capability detection ──
 
 const THINKING_PATTERNS = [/claude/i, /gemini/i, /gpt-5/i];
 const IMAGE_PATTERNS = [/claude/i, /gemini/i, /gpt/i];

package/src/provider.ts

@@ -2,7 +2,7 @@
  * Provider entry point — pi-claude-bridge pattern.
  *
  * For each Pi turn:
- * 1. Extract the latest user message (strip context-mode injection)
+ * 1. Extract the latest user message
  * 2. Call sdk.query() — stateless, CodeBuddy uses its own system prompt
  * 3. Stream events back to Pi (text, thinking, toolcalls)
  */
@@ -54,39 +54,16 @@ function makeErrorPartial(model: Model<any>, error: unknown): AssistantMessage {
 
 // ── extract user message ──
 
-/**
- * Extract the latest user message from Pi Context.
- * Strips context-mode session state injection.
- *
- * Like pi-claude-bridge's extractUserPrompt() but with context-mode defense.
- */
 function extractUserMessage(context: Context): string {
   const msgs = context.messages;
-
-  // Pi injects context-mode state as the LAST user message (after the real one).
-  // Search from the end, skip obvious context-mode injections.
   for (let i = msgs.length - 1; i >= 0; i--) {
     if (msgs[i].role !== "user") continue;
     const raw = contentToText((msgs[i] as any).content);
-    if (!raw) continue;
-
-    // Skip messages that are entirely context-mode injection
-    if (isContextModeInjection(raw)) continue;
-
-    return stripPiInjection(raw);
+    if (raw) return raw.trim();
   }
   return "Continue.";
 }
 
-/** Detect if a user message is a Pi context-mode state injection (not a real message). */
-function isContextModeInjection(text: string): boolean {
-  const t = text.trim();
-  if (t.startsWith("context-mode active.")) return true;
-  if (t.includes("<session_state") || t.includes("<session_mode")) return true;
-  if (t.startsWith("<summary>") && t.includes("</summary>")) return true;
-  return false;
-}
-
 function contentToText(content: unknown): string {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -96,55 +73,6 @@ function contentToText(content: unknown): string {
     .join("\n");
 }
 
-/**
- * Strip context-mode session state that Pi prepends to user messages.
- *
- * Pi injects several formats:
- *   context-mode active. Hierarchy: ...
- *   <session_state source="compaction"> ... </session_state>
- *   <summary>Compacted: ...</summary>
- *
- * Strip all of them, keep only the actual user message.
- */
-function stripPiInjection(text: string): string {
-  // Fast path
-  if (!text.includes("context-mode") && !text.includes("<session_state") && !text.includes("<summary>")) {
-    return text;
-  }
-
-  // 1. Remove <summary> blocks (compaction summaries contain context-mode state)
-  text = text.replace(/<summary>[\s\S]*?<\/summary>\s*/g, "");
-
-  // 2. Remove <session_state> block and everything between "context-mode" and </session_state>
-  const sessionEnd = text.lastIndexOf("</session_state>");
-  if (sessionEnd >= 0) {
-    const after = text.slice(sessionEnd + "</session_state>".length).trimStart();
-    if (after) {
-      text = after;
-    } else {
-      // All content was in the session_state block
-      const before = text.slice(0, text.indexOf("<session_state")).trim();
-      if (before) text = before;
-    }
-  }
-
-  // 3. Remove "context-mode active." line and everything after until a blank line
-  //    Pattern: "context-mode active. ... Hierarchy: ..." followed by blank line, then real message
-  const cmRe = /context-mode active\.[\s\S]*?\n\s*\n([\s\S]*)$/;
-  const cmMatch = text.match(cmRe);
-  if (cmMatch?.[1]?.trim()) {
-    text = cmMatch[1].trim();
-  }
-
-  // 4. If "context-mode" is still the only content, return empty
-  if (text.trim() === "context-mode active." || text.trim().startsWith("context-mode active.")) {
-    const afterCm = text.replace(/context-mode active\.[\s\S]*/, "").trim();
-    if (afterCm) text = afterCm;
-  }
-
-  return text.trim() || text;
-}
-
 // ── thinking config ──
 
 const THINKING_BUDGETS: Record<string, number> = {
@@ -228,7 +156,7 @@ export function streamCodebuddy(
         if (options.signal.aborted) { await onAbort(); return; }
       }
 
-      // ── per-block tracking (for stream_event delta accumulation) ──
+      // ── per-block tracking ──
       type BlockKind = "text" | "thinking" | "tool_use" | "redacted_thinking";
       const blockKind = new Map<number, BlockKind>();
       const blockAccum = new Map<number, string>();
@@ -304,7 +232,6 @@ export function streamCodebuddy(
           continue;
         }
 
-        // Token-level streaming via stream_event (preferred)
         if (msg.type === "stream_event") {
           hasStreamEvents = true;
           const evt = msg.event;
@@ -326,7 +253,7 @@ export function streamCodebuddy(
           continue;
         }
 
-        // Fallback: full assistant messages
+        // Fallback: full assistant messages (when model doesn't support streaming)
         if (msg.type === "assistant" && !hasStreamEvents) {
           let ci = 0;
           for (const block of msg.message.content) {

package/src/provider-debug.patch

@@ -1 +0,0 @@
-# Temporary: add debug logging to extractUserMessage