@bunny-agent/daemon 0.9.28 → 0.9.29-beta.10

package/dist/index.js

@@ -116838,7 +116838,7 @@ var require_core3 = __commonJS({
       return match2 && match2.index === 0;
     }
     var BACKREF_RE = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
-    function join38(regexps, separator = "|") {
+    function join39(regexps, separator = "|") {
       let numCaptures = 0;
       return regexps.map((regex2) => {
         numCaptures += 1;
@@ -117142,7 +117142,7 @@ var require_core3 = __commonJS({
             this.exec = () => null;
           }
           const terminators = this.regexes.map((el) => el[1]);
-          this.matcherRe = langRe(join38(terminators), true);
+          this.matcherRe = langRe(join39(terminators), true);
           this.lastIndex = 0;
         }
         /** @param {string} s */
@@ -168060,14 +168060,14 @@ var require_graceful_fs = __commonJS({
         return close;
       })(fs16.close);
       fs16.closeSync = (function(fs$closeSync) {
-        function closeSync2(fd) {
+        function closeSync3(fd) {
           fs$closeSync.apply(fs16, arguments);
           resetQueue();
         }
-        Object.defineProperty(closeSync2, previousSymbol, {
+        Object.defineProperty(closeSync3, previousSymbol, {
           value: fs$closeSync
         });
-        return closeSync2;
+        return closeSync3;
       })(fs16.closeSync);
       if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) {
         process.on("exit", function() {
@@ -206434,10 +206434,15 @@ async function fsStat(state, q2) {
   const root = resolveVolumeRoot(state, q2.volume);
   const target = resolveUnderRoot(root, q2.path);
   const stat6 = await fs2.stat(target);
+  const created_at = msToIsoOrNull(stat6.birthtimeMs) ?? msToIsoOrNull(stat6.ctimeMs);
   return ok({
     path: target,
     is_dir: stat6.isDirectory(),
-    size: stat6.isFile() ? stat6.size : 0
+    size: stat6.isFile() ? stat6.size : 0,
+    created_at,
+    modified_at: msToIsoOrNull(
+      stat6.mtimeMs
+    )
   });
 }
 async function fsExists(state, q2) {
@@ -208379,7 +208384,7 @@ function createOpenCodeRunner(options2 = {}) {
 
 // ../../packages/runner-pi/dist/pi-runner.js
 import { appendFileSync as appendFileSync5, existsSync as existsSync28, unlinkSync as unlinkSync6 } from "node:fs";
-import { join as join35 } from "node:path";
+import { join as join36 } from "node:path";
 
 // ../../node_modules/.pnpm/@mariozechner+pi-ai@0.64.0_ws@8.19.0_zod@4.3.6/node_modules/@mariozechner/pi-ai/dist/index.js
 var dist_exports = {};
@@ -263365,25 +263370,146 @@ var generateImageSchema = {
     },
     quality: {
       type: "string",
-      enum: ["standard", "hd"],
-      description: "Image quality (OpenAI only). Defaults to standard."
+      enum: ["low", "medium", "high", "auto"],
+      description: "Image quality. Defaults to auto."
     }
   },
   required: ["prompt"],
   additionalProperties: false
 };
-async function resolveB64(item) {
+async function resolveB64(item, apiKey) {
   if (item.b64_json)
     return item.b64_json;
-  if (item.url) {
-    const res = await fetch(item.url);
+  if (item.b64Json)
+    return item.b64Json;
+  if (item.image_base64)
+    return item.image_base64;
+  if (item.imageBase64)
+    return item.imageBase64;
+  if (item.base64)
+    return item.base64;
+  if (typeof item.image === "string")
+    return item.image;
+  if (item.image?.b64_json)
+    return item.image.b64_json;
+  if (item.image?.base64)
+    return item.image.base64;
+  const url = item.url ?? item.image_url ?? item.imageUrl ?? item.image?.url;
+  if (url) {
+    const headers = {};
+    if (apiKey) {
+      headers.Authorization = `Bearer ${apiKey}`;
+    }
+    const res = await fetch(url, { headers });
     if (res.ok)
       return Buffer.from(await res.arrayBuffer()).toString("base64");
   }
   return void 0;
 }
-async function saveImageItem(item, filePath) {
-  const b64 = await resolveB64(item);
+function pickImageItem(response) {
+  const tryFromObject = (value2) => {
+    if (!value2 || typeof value2 !== "object")
+      return void 0;
+    const obj = value2;
+    return {
+      b64_json: obj.b64_json ?? obj.b64Json,
+      b64Json: obj.b64Json,
+      url: obj.url ?? obj.imageUrl,
+      image_base64: obj.image_base64 ?? obj.imageBase64,
+      imageBase64: obj.imageBase64,
+      image_url: obj.image_url ?? obj.imageUrl,
+      imageUrl: obj.imageUrl,
+      base64: obj.base64,
+      image: obj.image
+    };
+  };
+  const asItem = (value2) => {
+    if (value2 == null)
+      return void 0;
+    if (typeof value2 === "string") {
+      return { base64: value2 };
+    }
+    if (typeof value2 === "object") {
+      const normalized = tryFromObject(value2);
+      if (normalized)
+        return normalized;
+    }
+    return void 0;
+  };
+  const fromDataArray = Array.isArray(response.data) ? asItem(response.data[0]) : void 0;
+  if (fromDataArray)
+    return fromDataArray;
+  const fromDataValue = asItem(response.data);
+  if (fromDataValue)
+    return fromDataValue;
+  const responseRecord = response;
+  const imagesValue = responseRecord.images;
+  const outputValue = responseRecord.output;
+  const fromImagesArray = Array.isArray(imagesValue) ? asItem(imagesValue[0]) : void 0;
+  if (fromImagesArray)
+    return fromImagesArray;
+  const fromImagesValue = asItem(imagesValue);
+  if (fromImagesValue)
+    return fromImagesValue;
+  const fromOutputArray = Array.isArray(outputValue) ? asItem(outputValue[0]) : void 0;
+  if (fromOutputArray)
+    return fromOutputArray;
+  const fromOutputValue = asItem(outputValue);
+  if (fromOutputValue)
+    return fromOutputValue;
+  const fromTopLevel = asItem(response);
+  if (fromTopLevel)
+    return fromTopLevel;
+  const queue = [response];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (current == null)
+      continue;
+    if (typeof current === "string") {
+      if (/^[A-Za-z0-9+/=]{32,}$/.test(current))
+        return { base64: current };
+      continue;
+    }
+    if (typeof current !== "object")
+      continue;
+    const normalized = tryFromObject(current);
+    if (normalized) {
+      const hasUsefulField = Boolean(normalized.b64_json ?? normalized.b64Json ?? normalized.image_base64 ?? normalized.imageBase64 ?? normalized.base64 ?? normalized.url ?? normalized.image_url ?? normalized.imageUrl ?? (typeof normalized.image === "string" ? normalized.image : normalized.image?.b64_json ?? normalized.image?.base64 ?? normalized.image?.url));
+      if (hasUsefulField)
+        return normalized;
+    }
+    if (Array.isArray(current)) {
+      queue.push(...current);
+      continue;
+    }
+    for (const value2 of Object.values(current)) {
+      queue.push(value2);
+    }
+  }
+  return {};
+}
+function detectImageMime(filePath) {
+  const ext2 = extname2(filePath).toLowerCase();
+  if (ext2 === ".jpg" || ext2 === ".jpeg")
+    return "image/jpeg";
+  if (ext2 === ".webp")
+    return "image/webp";
+  if (ext2 === ".gif")
+    return "image/gif";
+  return "image/png";
+}
+function buildPolicySafeEditPrompt(prompt) {
+  const riskyPattern = /\b(watermark|watermarks|logo|logos|copyright|brand mark|remove branding)\b/i;
+  if (!riskyPattern.test(prompt)) {
+    return { prompt, rewritten: false };
+  }
+  return {
+    prompt: "Clean up distracting overlay text or marks naturally while preserving the original scene, style, and layout. Keep the result seamless and high quality.",
+    rewritten: true
+  };
+}
+async function saveImageItem(item, filePath, apiKey) {
+  const b64 = await resolveB64(item, apiKey);
   if (!b64)
     return void 0;
   mkdirSync10(dirname19(filePath), { recursive: true });
@@ -263403,11 +263529,11 @@ function buildImageGenerateTool(cwd, imageModelId, baseUrl, apiKey) {
     ],
     // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
     parameters: generateImageSchema,
-    async execute(_toolCallId, params, _signal, _onUpdate) {
+    async execute(_toolCallId, params, signal, _onUpdate) {
       const p = params;
       const prompt = p.prompt;
       const size = p.size ?? "1024x1024";
-      const quality = p.quality ?? "standard";
+      const quality = p.quality ?? "auto";
       const rawFilename = p.filename;
       const filename = rawFilename ? extname2(rawFilename) ? rawFilename : `${rawFilename}.png` : `image_${Date.now()}.png`;
       const filePath = join34(cwd, filename.replace(/[^a-zA-Z0-9_\-./]/g, "_"));
@@ -263424,24 +263550,28 @@ function buildImageGenerateTool(cwd, imageModelId, baseUrl, apiKey) {
             prompt,
             n: 1,
             size,
-            quality
-          })
+            quality,
+            response_format: "b64_json",
+            output_format: "png"
+          }),
+          signal
         });
         if (!res.ok) {
           throw new Error(`Image generation failed (${res.status}): ${await res.text()}`);
         }
         const json = await res.json();
-        const item = json.data?.[0] ?? {};
-        const savedPath = await saveImageItem(item, filePath);
+        const item = pickImageItem(json);
+        const savedPath = await saveImageItem(item, filePath, apiKey);
         return {
           content: [
             {
               type: "text",
-              text: savedPath ?? "Image generated but could not be saved."
+              text: savedPath ?? `Image generated but could not be saved: no image payload returned; image_model: ${imageModelId}`
             }
           ],
           details: {
             filePath: savedPath,
+            ...json.usage != null ? { usage: { raw: { [imageModelId]: json.usage } } } : {},
             response: json
           }
         };
@@ -263457,13 +263587,504 @@ function buildImageGenerateTool(cwd, imageModelId, baseUrl, apiKey) {
     }
   };
 }
+var editImageSchema = {
+  type: "object",
+  properties: {
+    image: {
+      type: "string",
+      description: "Path to the source image file to edit (relative to working directory or absolute)."
+    },
+    prompt: {
+      type: "string",
+      description: "Text description of the desired final image. Describe the full result, not just the change."
+    },
+    mask: {
+      type: "string",
+      description: "Optional path to a mask image (PNG with transparent areas indicating where to edit). If omitted, the model decides what to change based on the prompt."
+    },
+    filename: {
+      type: "string",
+      description: "Output filename with extension, e.g. 'edited_cat.png'. Defaults to a timestamp-based name."
+    },
+    size: {
+      type: "string",
+      enum: ["1024x1024", "1024x1536", "1536x1024", "auto"],
+      description: "Output image dimensions. Optional; omit or set auto to let model decide."
+    },
+    quality: {
+      type: "string",
+      enum: ["low", "medium", "high", "auto"],
+      description: "Image quality. Optional; omit or set auto to let model decide."
+    }
+  },
+  required: ["image", "prompt"],
+  additionalProperties: false
+};
+function buildMultipartBody(fields, files) {
+  const boundary = `----SandagentBoundary${Date.now()}${Math.random().toString(36).slice(2)}`;
+  const parts = [];
+  for (const { name, value: value2 } of fields) {
+    parts.push(Buffer.from(`--${boundary}\r
+Content-Disposition: form-data; name="${name}"\r
+\r
+${value2}\r
+`));
+  }
+  for (const { name, filename, buffer, mime } of files) {
+    parts.push(Buffer.from(`--${boundary}\r
+Content-Disposition: form-data; name="${name}"; filename="${filename}"\r
+Content-Type: ${mime}\r
+\r
+`));
+    parts.push(buffer);
+    parts.push(Buffer.from("\r\n"));
+  }
+  parts.push(Buffer.from(`--${boundary}--\r
+`));
+  return {
+    body: Buffer.concat(parts),
+    contentType: `multipart/form-data; boundary=${boundary}`
+  };
+}
+function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
+  return {
+    name: "edit_image",
+    label: "edit image",
+    description: "Edit an existing image based on a text prompt. Optionally use a mask to control which areas to modify. Saves the result to disk and returns the file path.",
+    promptSnippet: "edit_image(image, prompt, mask?, filename?, size?, quality?) - edit an existing image",
+    promptGuidelines: [
+      "Use edit_image when the user wants to modify, retouch, or transform an existing image.",
+      "The prompt should describe the full desired final image, not just the change.",
+      "Provide the source image path. Use a mask image (PNG with transparent areas) to control where edits happen.",
+      "Without a mask, the model decides what to change based on the prompt."
+    ],
+    // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
+    parameters: editImageSchema,
+    async execute(_toolCallId, params, signal, _onUpdate) {
+      const { readFileSync: readFileSync24, existsSync: existsSync31 } = await import("node:fs");
+      const { resolve: resolve14, basename: basename12 } = await import("node:path");
+      const p = params;
+      const imagePath = p.image;
+      const prompt = p.prompt;
+      const maskPath = p.mask;
+      const size = p.size;
+      const quality = p.quality;
+      const rawFilename = p.filename;
+      const safePrompt = buildPolicySafeEditPrompt(prompt);
+      const resolvedImage = resolve14(cwd, imagePath);
+      if (!existsSync31(resolvedImage)) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Image edit error: source image not found at ${resolvedImage}`
+            }
+          ],
+          details: void 0
+        };
+      }
+      const filename = rawFilename ? extname2(rawFilename) ? rawFilename : `${rawFilename}.png` : `edited_${Date.now()}.png`;
+      const filePath = join34(cwd, filename.replace(/[^a-zA-Z0-9_\-./]/g, "_"));
+      try {
+        const imageBuffer = readFileSync24(resolvedImage);
+        const fields = [
+          { name: "model", value: imageModelId },
+          { name: "prompt", value: safePrompt.prompt },
+          { name: "n", value: "1" },
+          { name: "response_format", value: "b64_json" },
+          { name: "output_format", value: "png" }
+        ];
+        if (size && size !== "auto") {
+          fields.push({ name: "size", value: size });
+        }
+        if (quality && quality !== "auto") {
+          fields.push({ name: "quality", value: quality });
+        }
+        const files = [
+          {
+            name: "image",
+            filename: basename12(resolvedImage),
+            buffer: imageBuffer,
+            mime: detectImageMime(resolvedImage)
+          }
+        ];
+        if (maskPath) {
+          const resolvedMask = resolve14(cwd, maskPath);
+          if (existsSync31(resolvedMask)) {
+            files.push({
+              name: "mask",
+              filename: basename12(resolvedMask),
+              buffer: readFileSync24(resolvedMask),
+              mime: detectImageMime(resolvedMask)
+            });
+          }
+        }
+        const { body: multipartBody, contentType } = buildMultipartBody(fields, files);
+        const url = `${baseUrl.replace(/\/$/, "")}/v1/images/edits`;
+        const sendRequest = async (body, type) => {
+          const res = await fetch(url, {
+            method: "POST",
+            headers: {
+              "Content-Type": type,
+              Authorization: `Bearer ${apiKey}`
+            },
+            body,
+            signal
+          });
+          if (!res.ok) {
+            throw new Error(`Image edit failed (${res.status}): ${await res.text()}`);
+          }
+          return await res.json();
+        };
+        let json = await sendRequest(multipartBody, contentType);
+        const item = pickImageItem(json);
+        let savedPath = await saveImageItem(item, filePath, apiKey);
+        const firstResponseHasEmptyDataArray = Array.isArray(json.data) && json.data.length === 0;
+        if (!savedPath && safePrompt.rewritten && firstResponseHasEmptyDataArray) {
+          const retryFields = fields.map((f3) => f3.name === "prompt" ? {
+            name: "prompt",
+            value: "Remove only distracting overlay text artifacts naturally and keep all original content unchanged."
+          } : f3);
+          const retryMultipart = buildMultipartBody(retryFields, files);
+          json = await sendRequest(retryMultipart.body, retryMultipart.contentType);
+          const retryItem = pickImageItem(json);
+          savedPath = await saveImageItem(retryItem, filePath, apiKey);
+        }
+        return {
+          content: [
+            {
+              type: "text",
+              text: savedPath ?? `Image edited but could not be saved: no image payload returned; image_model: ${imageModelId}`
+            }
+          ],
+          details: {
+            filePath: savedPath,
+            ...json.usage != null ? { usage: { raw: { [imageModelId]: json.usage } } } : {},
+            response: json
+          }
+        };
+      } catch (e2) {
+        const msg = e2 instanceof Error ? e2.message : String(e2);
+        return {
+          content: [
+            { type: "text", text: `Image edit error: ${msg}` }
+          ],
+          details: void 0
+        };
+      }
+    }
+  };
+}
+
+// ../../packages/runner-pi/dist/session-utils.js
+import { closeSync as closeSync2, fstatSync, openSync as openSync2, readdirSync as readdirSync12, readSync as readSync2, statSync as statSync13 } from "node:fs";
+import { join as join35 } from "node:path";
+var MAX_SESSION_FILE_BYTES = Number(process.env.SANDAGENT_MAX_SESSION_BYTES) || 10 * 1024 * 1024;
+function resolveSessionPathById(cwd, sessionId) {
+  const tempMgr = SessionManager.create(cwd);
+  const sessionsDir = tempMgr.getSessionDir();
+  try {
+    const suffix = `_${sessionId}.jsonl`;
+    const match2 = readdirSync12(sessionsDir).find((f3) => f3.endsWith(suffix));
+    return match2 ? join35(sessionsDir, match2) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function isSessionFileTooLarge(sessionPath2) {
+  try {
+    return statSync13(sessionPath2).size > MAX_SESSION_FILE_BYTES;
+  } catch {
+    return false;
+  }
+}
+function readTailEntries(sessionPath2, tailBytes = 1024 * 1024) {
+  let fd;
+  try {
+    fd = openSync2(sessionPath2, "r");
+  } catch {
+    return [];
+  }
+  try {
+    const fileSize = fstatSync(fd).size;
+    const readStart = Math.max(0, fileSize - tailBytes);
+    const readLen = fileSize - readStart;
+    const buf = Buffer.alloc(readLen);
+    readSync2(fd, buf, 0, readLen, readStart);
+    const tail = buf.toString("utf8");
+    const entries = [];
+    for (const line of tail.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed)
+        continue;
+      try {
+        entries.push(JSON.parse(trimmed));
+      } catch {
+      }
+    }
+    return entries;
+  } finally {
+    closeSync2(fd);
+  }
+}
+function extractSessionContext(sessionPath2) {
+  const entries = readTailEntries(sessionPath2);
+  if (entries.length === 0)
+    return void 0;
+  for (let i2 = entries.length - 1; i2 >= 0; i2--) {
+    const e2 = entries[i2];
+    if (e2.type === "compaction" && typeof e2.summary === "string") {
+      return e2.summary;
+    }
+  }
+  const recentMessages = [];
+  const MAX_MESSAGES = 6;
+  for (let i2 = entries.length - 1; i2 >= 0 && recentMessages.length < MAX_MESSAGES; i2--) {
+    const e2 = entries[i2];
+    if (e2.type !== "message")
+      continue;
+    const msg = e2.message;
+    if (!msg)
+      continue;
+    if (msg.role !== "user" && msg.role !== "assistant")
+      continue;
+    let text = "";
+    if (typeof msg.content === "string") {
+      text = msg.content;
+    } else if (Array.isArray(msg.content)) {
+      text = msg.content.filter((c) => c.type === "text" && c.text).map((c) => c.text).join("\n");
+    }
+    if (text) {
+      recentMessages.unshift(`[${msg.role}]: ${text}`);
+    }
+  }
+  if (recentMessages.length === 0)
+    return void 0;
+  return "## Previous Session Context (auto-extracted)\n\nThe following is the tail of the previous conversation:\n\n" + recentMessages.join("\n\n");
+}
+
+// ../../packages/runner-pi/dist/usage-metadata.js
+function usageToMessageMetadata(usage) {
+  return {
+    input_tokens: usage.input,
+    output_tokens: usage.output,
+    cache_read_input_tokens: usage.cacheRead,
+    cache_creation_input_tokens: usage.cacheWrite
+  };
+}
+function accumulateToolUsage(tally, raw) {
+  for (const [key, row] of Object.entries(raw)) {
+    const existing = tally[key];
+    if (existing) {
+      for (const [field, val] of Object.entries(row)) {
+        if (typeof val === "number")
+          existing[field] = (existing[field] ?? 0) + val;
+      }
+    } else {
+      const nums = {};
+      for (const [field, val] of Object.entries(row)) {
+        if (typeof val === "number")
+          nums[field] = val;
+      }
+      tally[key] = nums;
+    }
+  }
+}
+function getUsageFromAgentEndMessages(messages) {
+  for (let i2 = messages.length - 1; i2 >= 0; i2--) {
+    const m2 = messages[i2];
+    if (m2.role === "assistant" && m2.usage != null)
+      return m2.usage;
+  }
+  return void 0;
+}
+
+// ../../packages/runner-pi/dist/stream-converter.js
+function emitStreamError(errorText) {
+  const errorLine = "data: " + JSON.stringify({ type: "error", errorText }) + "\n\n";
+  const finishLine = "data: " + JSON.stringify({ type: "finish", finishReason: "error" }) + "\n\n";
+  return [errorLine, finishLine, "data: [DONE]\n\n"];
+}
+function extractToolResultText(result) {
+  if (result !== null && typeof result === "object") {
+    const r2 = result;
+    if (Array.isArray(r2.content) && r2.content.length > 0) {
+      const text = r2.content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("\n");
+      if (text.length > 0)
+        return text;
+    }
+  }
+  if (typeof result === "string")
+    return result;
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
+function sseData(obj) {
+  return "data: " + JSON.stringify(obj) + "\n\n";
+}
+var PiAISDKStreamConverter = class {
+  constructor(options2) {
+    this.options = options2;
+    this.messageId = "msg_" + Date.now() + "_" + Math.random().toString(36).slice(2);
+    this.toolUsageTally = {};
+    this.activeTextPartId = null;
+    this.hasStarted = false;
+    this.hasFinished = false;
+  }
+  get finished() {
+    return this.hasFinished;
+  }
+  forceError(errorText) {
+    if (this.hasFinished)
+      return [];
+    return [...this.ensureStart(), ...this.finishError(errorText)];
+  }
+  handleEvent(event, aborted) {
+    if (this.hasFinished)
+      return [];
+    const chunks = [...this.ensureStart()];
+    if (event.type === "message_start") {
+      const msg = event.message;
+      if (msg?.role === "assistant")
+        chunks.push(...this.endTextStreamIfOpen());
+      return chunks;
+    }
+    if (event.type === "message_end")
+      return chunks;
+    if (event.type === "message_update") {
+      const sub = event.assistantMessageEvent;
+      if (sub.type === "text_start")
+        chunks.push(...this.endTextStreamIfOpen(), ...this.openTextStream());
+      else if (sub.type === "text_delta")
+        chunks.push(...this.emitTextDelta(sub.delta));
+      else if (sub.type === "toolcall_start")
+        chunks.push(...this.endTextStreamIfOpen());
+      return chunks;
+    }
+    if (event.type === "tool_execution_start") {
+      chunks.push(...this.endTextStreamIfOpen());
+      chunks.push(sseData({
+        type: "tool-input-start",
+        toolCallId: event.toolCallId,
+        toolName: event.toolName,
+        dynamic: true,
+        providerExecuted: true
+      }), sseData({
+        type: "tool-input-available",
+        toolCallId: event.toolCallId,
+        toolName: event.toolName,
+        input: event.args,
+        dynamic: true,
+        providerExecuted: true
+      }));
+      return chunks;
+    }
+    if (event.type === "tool_execution_end") {
+      const output = this.options.redactText(this.options.normalizeToolOutput(event.result));
+      const raw = event.result?.details?.usage?.raw;
+      if (raw != null)
+        accumulateToolUsage(this.toolUsageTally, raw);
+      chunks.push(sseData({
+        type: "tool-output-available",
+        toolCallId: event.toolCallId,
+        output,
+        isError: event.isError,
+        dynamic: true,
+        providerExecuted: true
+      }));
+      return chunks;
+    }
+    if (event.type === "agent_end") {
+      if (aborted) {
+        chunks.push(...this.finishError("Run aborted by signal."));
+      } else {
+        const errorMsg = this.options.getErrorFromAgentEndMessages(event.messages);
+        if (errorMsg)
+          chunks.push(...this.finishError(errorMsg));
+        else
+          chunks.push(...this.finishSuccess(this.options.getUsageFromAgentEndMessages(event.messages)));
+      }
+      return chunks;
+    }
+    return chunks;
+  }
+  ensureStart() {
+    if (this.hasStarted)
+      return [];
+    this.hasStarted = true;
+    return [
+      sseData({ type: "start", messageId: this.messageId }),
+      sseData({
+        type: "message-metadata",
+        messageMetadata: { sessionId: this.options.sessionId }
+      })
+    ];
+  }
+  newTextPartId() {
+    return "text_" + Date.now() + "_" + Math.random().toString(36).slice(2) + "_" + Math.random().toString(36).slice(2);
+  }
+  openTextStream() {
+    this.activeTextPartId = this.newTextPartId();
+    return [sseData({ type: "text-start", id: this.activeTextPartId })];
+  }
+  emitTextDelta(rawDelta) {
+    const delta = rawDelta ? this.options.redactText(rawDelta) : void 0;
+    if (!delta)
+      return [];
+    const startChunk = this.activeTextPartId == null ? this.openTextStream() : [];
+    return [
+      ...startChunk,
+      sseData({ type: "text-delta", id: this.activeTextPartId, delta })
+    ];
+  }
+  endTextStreamIfOpen() {
+    if (this.activeTextPartId == null)
+      return [];
+    const id = this.activeTextPartId;
+    this.activeTextPartId = null;
+    return [sseData({ type: "text-end", id })];
+  }
+  finishSuccess(usage) {
+    const chunks = [...this.endTextStreamIfOpen()];
+    const raw = {};
+    let chatUsage;
+    if (usage) {
+      const { id } = this.options.model;
+      chatUsage = {
+        type: "chat",
+        ...usageToMessageMetadata(usage)
+      };
+      raw[id] = chatUsage;
+    }
+    for (const [key, tally] of Object.entries(this.toolUsageTally)) {
+      raw[key] = { ...tally };
+    }
+    const finishPayload = {
+      type: "finish",
+      finishReason: "stop"
+    };
+    if (usage) {
+      finishPayload.messageMetadata = { usage: { ...chatUsage, raw } };
+    }
+    chunks.push(sseData(finishPayload), "data: [DONE]\n\n");
+    this.hasFinished = true;
+    return chunks;
+  }
+  finishError(errorText) {
+    this.hasFinished = true;
+    return emitStreamError(errorText);
+  }
+};
 
 // ../../packages/runner-pi/dist/web-tools.js
 var braveProvider = {
   id: "brave",
   label: "Brave Search",
   envKeys: ["BRAVE_API_KEY"],
-  async search({ apiKey, query, count, country, freshness }) {
+  async search({ apiKey, query, count, country, freshness, signal }) {
     const params = new URLSearchParams({
       q: query,
       count: String(Math.min(count, 20))
@@ -263477,7 +264098,8 @@ var braveProvider = {
         Accept: "application/json",
         "Accept-Encoding": "gzip",
         "X-Subscription-Token": apiKey
-      }
+      },
+      signal
     });
     if (!res.ok) {
       const body = await res.text().catch(() => "");
@@ -263498,14 +264120,14 @@ ${body}`);
         });
       }
     }
-    return results;
+    return { results };
   }
 };
 var tavilyProvider = {
   id: "tavily",
   label: "Tavily",
   envKeys: ["TAVILY_API_KEY"],
-  async search({ apiKey, query, count }) {
+  async search({ apiKey, query, count, signal }) {
     const res = await fetch("https://api.tavily.com/search", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -263514,7 +264136,8 @@ var tavilyProvider = {
         query,
         max_results: Math.min(count, 10),
         include_answer: false
-      })
+      }),
+      signal
     });
     if (!res.ok) {
       const body = await res.text().catch(() => "");
@@ -263532,7 +264155,7 @@ ${body}`);
         });
       }
     }
-    return results;
+    return { results };
   }
 };
 var AUTO_DETECT_ORDER = [braveProvider, tavilyProvider];
@@ -263567,9 +264190,12 @@ var BROWSER_UA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/53
 function htmlToText(html2) {
   return html2.replace(/<(script|style|noscript)[^>]*>[\s\S]*?<\/\1>/gi, "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|div|h[1-6]|li|tr)>/gi, "\n").replace(/<(p|div|h[1-6]|li|tr)[^>]*>/gi, "\n").replace(/<[^>]+>/g, "").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ").replace(/[ \t]+/g, " ").replace(/\n{3,}/g, "\n\n").trim();
 }
-async function fetchPageContent(url) {
+async function fetchPageContent(url, externalSignal) {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), 15e3);
+  externalSignal?.addEventListener("abort", () => controller.abort(), {
+    once: true
+  });
   try {
     const res = await fetch(url, {
       headers: {
@@ -263666,7 +264292,7 @@ function buildWebSearchTool(env2) {
     ],
     // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
     parameters: webSearchSchema,
-    async execute(_toolCallId, params, _signal, _onUpdate) {
+    async execute(_toolCallId, params, signal, _onUpdate) {
       const p = params;
       const query = p.query;
       const count = p.count ?? 5;
@@ -263676,18 +264302,29 @@ function buildWebSearchTool(env2) {
       let lastError;
       for (const { provider, apiKey } of providers) {
         try {
-          const results = await provider.search({
+          const { results } = await provider.search({
             apiKey,
             query,
             count,
             country,
-            freshness
+            freshness,
+            signal
           });
+          let fetchedPages = 0;
           if (shouldFetchContent) {
             for (const r2 of results) {
-              r2.content = await fetchPageContent(r2.link);
+              r2.content = await fetchPageContent(r2.link, signal);
+              fetchedPages += 1;
             }
           }
+          const usage = {
+            raw: {
+              [provider.id]: {
+                requests: 1,
+                fetchedPages
+              }
+            }
+          };
           return {
             content: [
               {
@@ -263695,7 +264332,9 @@ function buildWebSearchTool(env2) {
                 text: formatSearchResults(results, provider.label)
               }
             ],
-            details: void 0
+            details: {
+              usage
+            }
           };
         } catch (e2) {
           lastError = e2;
@@ -263731,11 +264370,11 @@ function buildWebFetchTool() {
     ],
     // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
     parameters: webFetchSchema,
-    async execute(_toolCallId, params, _signal, _onUpdate) {
+    async execute(_toolCallId, params, signal, _onUpdate) {
       const p = params;
       const url = p.url;
       try {
-        const content = await fetchPageContent(url);
+        const content = await fetchPageContent(url, signal);
         return {
           content: [{ type: "text", text: content }],
           details: void 0
@@ -263878,52 +264517,6 @@ function applyModelOverrides(model, provider, optionsEnv) {
     model.baseUrl = anthropicBaseUrl;
   }
 }
-function emitStreamError(errorText) {
-  return [
-    `data: ${JSON.stringify({ type: "error", errorText })}
-
-`,
-    `data: ${JSON.stringify({ type: "finish", finishReason: "error" })}
-
-`,
-    "data: [DONE]\n\n"
-  ];
-}
-function extractToolResultText(result) {
-  if (result !== null && typeof result === "object") {
-    const r2 = result;
-    if (Array.isArray(r2.content) && r2.content.length > 0) {
-      const text = r2.content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("\n");
-      if (text.length > 0) {
-        return text;
-      }
-    }
-  }
-  if (typeof result === "string")
-    return result;
-  try {
-    return JSON.stringify(result);
-  } catch {
-    return String(result);
-  }
-}
-function usageToMessageMetadata(usage) {
-  return {
-    input_tokens: usage.input,
-    output_tokens: usage.output,
-    cache_read_input_tokens: usage.cacheRead,
-    cache_creation_input_tokens: usage.cacheWrite
-  };
-}
-function getUsageFromAgentEndMessages(messages) {
-  for (let i2 = messages.length - 1; i2 >= 0; i2--) {
-    const m2 = messages[i2];
-    if (m2.role === "assistant" && m2.usage != null) {
-      return m2.usage;
-    }
-  }
-  return void 0;
-}
 function getErrorFromAgentEndMessages(messages) {
   for (let i2 = messages.length - 1; i2 >= 0; i2--) {
     const m2 = messages[i2];
@@ -263939,7 +264532,7 @@ function traceRawMessage(debugCwd, data, reset = false, optionsEnv) {
   if (!enabled)
     return;
   try {
-    const file = join35(debugCwd, "pi-message-stream-debug.json");
+    const file = join36(debugCwd, "pi-message-stream-debug.json");
     if (reset && existsSync28(file))
       unlinkSync6(file);
     const type = data !== null && typeof data === "object" ? data.type : void 0;
@@ -264008,9 +264601,22 @@ function createPiRunner(options2 = {}) {
             if (resume.includes("/")) {
               return SessionManager.open(resume);
             }
-            const sessions = await SessionManager.list(cwd);
-            const found = sessions.find((s2) => s2.id === resume);
-            return found ? SessionManager.open(found.path) : SessionManager.create(cwd);
+            const sessionPath2 = resolveSessionPathById(cwd, resume);
+            console.error(`${LOG_PREFIX2} resume: id=${resume} path=${sessionPath2 ?? "(not found)"}`);
+            if (sessionPath2) {
+              if (isSessionFileTooLarge(sessionPath2)) {
+                const context = extractSessionContext(sessionPath2);
+                console.error(`${LOG_PREFIX2} session file too large, starting fresh${context ? " (with context)" : ""}`);
+                const newMgr = SessionManager.create(cwd);
+                if (context) {
+                  const firstId = newMgr.getEntries()[0]?.id ?? "";
+                  newMgr.appendCompaction(context, firstId, 0);
+                }
+                return newMgr;
+              }
+              return SessionManager.open(sessionPath2);
+            }
+            return SessionManager.create(cwd);
           }
           return SessionManager.create(cwd);
         })();
@@ -264028,7 +264634,7 @@ function createPiRunner(options2 = {}) {
         const customTools = options2.env && Object.keys(options2.env).length > 0 ? buildSecretAwareTools(cwd, options2.env) : [];
         if (imageModelName) {
           const apiKey = await modelRegistry2.authStorage.getApiKey(provider) ?? "";
-          customTools.push(buildImageGenerateTool(cwd, imageModelName, model.baseUrl, apiKey));
+          customTools.push(buildImageGenerateTool(cwd, imageModelName, model.baseUrl, apiKey), buildImageEditTool(cwd, imageModelName, model.baseUrl, apiKey));
         }
         const { session } = await createAgentSession({
           cwd,
@@ -264068,165 +264674,34 @@ function createPiRunner(options2 = {}) {
         }
         try {
           traceRawMessage(cwd, null, true, options2.env);
-          let promptText = userInput;
-          let images;
-          try {
-            if (userInput.startsWith("[") && userInput.endsWith("]")) {
-              const parsed = JSON.parse(userInput);
-              if (Array.isArray(parsed)) {
-                promptText = parsed.filter((p) => p.type === "text").map((p) => p.text).join("\n");
-                const imageParts = parsed.filter((p) => p.type === "image");
-                if (imageParts.length > 0) {
-                  images = imageParts.map((p) => ({
-                    type: "image",
-                    data: p.data,
-                    mimeType: p.mimeType
-                  }));
-                }
+          const promptText = userInput;
+          const promptPromise = session.prompt(promptText);
+          const streamConverter = new PiAISDKStreamConverter({
+            sessionId: session.sessionId,
+            model,
+            redactText: (value2) => {
+              if (options2.env && Object.keys(options2.env).length > 0) {
+                return redactSecrets(value2, options2.env);
               }
-            }
-          } catch (_e2) {
-          }
-          const promptPromise = session.prompt(promptText, images ? { images } : void 0);
-          const messageId = `msg_${Date.now()}_${Math.random().toString(36).slice(2)}`;
-          let hasStarted = false;
-          let hasFinished = false;
-          const imageToolUsage = { input_tokens: 0, output_tokens: 0 };
-          const newTextPartId = () => `text_${Date.now()}_${Math.random().toString(36).slice(2)}_${Math.random().toString(36).slice(2)}`;
-          let activeTextPartId = null;
-          let textStreamOpen = false;
-          const endTextStreamIfOpen = function* () {
-            if (textStreamOpen && activeTextPartId != null) {
-              yield `data: ${JSON.stringify({ type: "text-end", id: activeTextPartId })}
-
-`;
-              textStreamOpen = false;
-              activeTextPartId = null;
-            }
-          };
-          const beginTextStream = function* () {
-            activeTextPartId = newTextPartId();
-            yield `data: ${JSON.stringify({ type: "text-start", id: activeTextPartId })}
-
-`;
-            textStreamOpen = true;
-          };
-          const ensureStartEvent = async function* () {
-            if (!hasStarted) {
-              yield `data: ${JSON.stringify({ type: "start", messageId })}
-
-`;
-              yield `data: ${JSON.stringify({
-                type: "message-metadata",
-                messageMetadata: { sessionId: session.sessionId }
-              })}
-
-`;
-              hasStarted = true;
-            }
-          };
-          const finishSuccess = async function* (usage) {
-            yield* endTextStreamIfOpen();
-            const finishPayload = { type: "finish", finishReason: "stop" };
-            const hasImageUsage = imageToolUsage.input_tokens > 0 || imageToolUsage.output_tokens > 0;
-            if (usage != null || hasImageUsage) {
-              const base = usage != null ? usageToMessageMetadata(usage) : {};
-              finishPayload.messageMetadata = {
-                usage: {
-                  ...base,
-                  input_tokens: (base.input_tokens ?? 0) + imageToolUsage.input_tokens,
-                  output_tokens: (base.output_tokens ?? 0) + imageToolUsage.output_tokens
-                }
-              };
-            }
-            yield `data: ${JSON.stringify(finishPayload)}
-
-`;
-            yield "data: [DONE]\n\n";
-            hasFinished = true;
-          };
-          const finishError = async function* (errorText) {
-            for (const chunk of emitStreamError(errorText)) {
-              yield chunk;
-            }
-            hasFinished = true;
-          };
+              return value2;
+            },
+            normalizeToolOutput: extractToolResultText,
+            getUsageFromAgentEndMessages,
+            getErrorFromAgentEndMessages
+          });
           while (!isComplete || eventQueue.length > 0) {
             while (eventQueue.length > 0) {
               const event = eventQueue.shift();
               traceRawMessage(cwd, event, false, options2.env);
-              yield* ensureStartEvent();
-              if (event.type === "message_start") {
-                const msg = event.message;
-                if (msg?.role === "assistant") {
-                  yield* endTextStreamIfOpen();
-                }
-              } else if (event.type === "message_update") {
-                const sub = event.assistantMessageEvent;
-                if (sub.type === "text_start") {
-                  yield* endTextStreamIfOpen();
-                  yield* beginTextStream();
-                } else if (sub.type === "text_delta") {
-                  let delta = sub.delta;
-                  if (delta) {
-                    if (options2.env && Object.keys(options2.env).length > 0) {
-                      delta = redactSecrets(delta, options2.env);
-                    }
-                    if (!textStreamOpen) {
-                      yield* beginTextStream();
-                    }
-                    yield `data: ${JSON.stringify({
-                      type: "text-delta",
-                      id: activeTextPartId,
-                      delta
-                    })}
-
-`;
-                  }
-                } else if (sub.type === "toolcall_start") {
-                  yield* endTextStreamIfOpen();
-                }
-              } else if (event.type === "tool_execution_start") {
-                yield* endTextStreamIfOpen();
-                yield `data: ${JSON.stringify({ type: "tool-input-start", toolCallId: event.toolCallId, toolName: event.toolName, dynamic: true, providerExecuted: true })}
-
-`;
-                yield `data: ${JSON.stringify({ type: "tool-input-available", toolCallId: event.toolCallId, toolName: event.toolName, input: event.args, dynamic: true, providerExecuted: true })}
-
-`;
-              } else if (event.type === "tool_execution_end") {
-                let output = extractToolResultText(event.result);
-                if (options2.env && Object.keys(options2.env).length > 0) {
-                  output = redactSecrets(output, options2.env);
-                }
-                if (event.toolName === "generate_image" && event.result !== null && typeof event.result === "object") {
-                  const details = event.result.details;
-                  const u = details?.response?.usage;
-                  if (u) {
-                    imageToolUsage.input_tokens += u.input_tokens ?? 0;
-                    imageToolUsage.output_tokens += u.output_tokens ?? 0;
-                  }
-                }
-                yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: event.toolCallId, output, isError: event.isError, dynamic: true, providerExecuted: true })}
-
-`;
-              } else if (event.type === "agent_end") {
-                if (aborted) {
-                  yield* finishError("Run aborted by signal.");
-                } else {
-                  const errorMsg = getErrorFromAgentEndMessages(event.messages);
-                  if (errorMsg) {
-                    yield* finishError(errorMsg);
-                  } else {
-                    const usage = getUsageFromAgentEndMessages(event.messages);
-                    yield* finishSuccess(usage);
-                  }
-                }
+              const chunks = streamConverter.handleEvent(event, aborted);
+              for (const chunk of chunks) {
+                yield chunk;
               }
             }
-            if (aborted && !hasFinished) {
-              yield* ensureStartEvent();
-              yield* finishError("Run aborted by signal.");
+            if (aborted && !streamConverter.finished) {
+              for (const chunk of streamConverter.forceError("Run aborted by signal.")) {
+                yield chunk;
+              }
               break;
             }
             if (!isComplete && eventQueue.length === 0) {
@@ -264235,22 +264710,24 @@ function createPiRunner(options2 = {}) {
               });
             }
           }
-          if (hasFinished) {
+          if (streamConverter.finished) {
             return;
           }
           try {
             await promptPromise;
           } catch (error) {
-            if (!hasFinished) {
-              yield* ensureStartEvent();
+            if (!streamConverter.finished) {
               const message = error instanceof Error ? error.message : "Pi agent run failed.";
-              yield* finishError(message);
+              for (const chunk of streamConverter.forceError(message)) {
+                yield chunk;
+              }
             }
             return;
           }
-          if (!hasFinished && session.agent.state.error) {
-            yield* ensureStartEvent();
-            yield* finishError(session.agent.state.error);
+          if (!streamConverter.finished && session.agent.state.error) {
+            for (const chunk of streamConverter.forceError(session.agent.state.error)) {
+              yield chunk;
+            }
           }
         } finally {
           if (abortSignal) {
@@ -264270,11 +264747,11 @@ function createPiRunner(options2 = {}) {
 
 // ../../packages/runner-harness/dist/session.js
 import { existsSync as existsSync29, mkdirSync as mkdirSync11, readFileSync as readFileSync23, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join36 } from "node:path";
+import { join as join37 } from "node:path";
 var DIR = ".bunny-agent";
 var FILE = "session-id";
 function sessionPath(cwd) {
-  return join36(cwd, DIR, FILE);
+  return join37(cwd, DIR, FILE);
 }
 function readSessionId(cwd) {
   try {
@@ -264288,28 +264765,28 @@ function readSessionId(cwd) {
 }
 function writeSessionId(cwd, id) {
   try {
-    mkdirSync11(join36(cwd, DIR), { recursive: true });
+    mkdirSync11(join37(cwd, DIR), { recursive: true });
     writeFileSync14(sessionPath(cwd), id, "utf8");
   } catch {
   }
 }
 
 // ../../packages/runner-harness/dist/skills.js
-import { existsSync as existsSync30, readdirSync as readdirSync12, statSync as statSync13 } from "node:fs";
+import { existsSync as existsSync30, readdirSync as readdirSync13, statSync as statSync14 } from "node:fs";
 import { homedir as homedir14 } from "node:os";
-import { join as join37 } from "node:path";
+import { join as join38 } from "node:path";
 function discoverSkillPaths(cwd) {
   const paths = [];
   for (const base of [
-    join37(cwd, "skills"),
-    join37(homedir14(), ".bunny-agent", "skills")
+    join38(cwd, "skills"),
+    join38(homedir14(), ".bunny-agent", "skills")
   ]) {
     if (!existsSync30(base))
       continue;
     try {
-      for (const entry of readdirSync12(base)) {
-        const full = join37(base, entry);
-        if (statSync13(full).isDirectory() && existsSync30(join37(full, "SKILL.md"))) {
+      for (const entry of readdirSync13(base)) {
+        const full = join38(base, entry);
+        if (statSync14(full).isDirectory() && existsSync30(join38(full, "SKILL.md"))) {
           paths.push(full);
         }
       }
@@ -264432,7 +264909,9 @@ async function bunnyAgentRun(req, res, env2) {
       cwd: req.cwd ?? process.env.BUNNY_AGENT_ROOT ?? "/workspace",
       yolo: req.yolo,
       env: env2,
-      abortController
+      abortController,
+      // API: caller owns resume/session; do not read/write cwd/.bunny-agent or auto-load CLAUDE.md.
+      autoInject: false
     });
     for await (const chunk of stream2) {
       res.write(chunk);