sparkecoder 0.1.76 → 0.1.78

package/dist/cli.js

@@ -3735,26 +3735,29 @@ function cacheKey(buffer) {
   return createHash("sha256").update(buffer).digest("hex");
 }
 async function resizeImageIfNeeded(buffer, mediaType) {
+  const inputMediaType = mediaType || "image/png";
   let metadata;
   try {
     metadata = await sharp(buffer).metadata();
   } catch {
-    return buffer;
+    return { buffer, mediaType: inputMediaType };
   }
   const { width, height } = metadata;
-  if (!width || !height) return buffer;
+  if (!width || !height) return { buffer, mediaType: inputMediaType };
   const longEdge = Math.max(width, height);
   const needsResize = longEdge > MAX_LONG_EDGE;
   const needsShrink = buffer.length > MAX_FILE_BYTES;
-  if (!needsResize && !needsShrink) return buffer;
+  if (!needsResize && !needsShrink) return { buffer, mediaType: inputMediaType };
   const key = cacheKey(buffer);
   const cacheDir = getCacheDir();
-  const isPng = mediaType?.includes("png");
-  const ext = isPng ? ".png" : ".jpg";
+  const isPng = inputMediaType.includes("png");
+  const willConvertToJpeg = isPng && (needsShrink || buffer.length > 2 * 1024 * 1024);
+  const outputMediaType = willConvertToJpeg || !isPng ? "image/jpeg" : "image/png";
+  const ext = outputMediaType === "image/png" ? ".png" : ".jpg";
   const cachePath = join3(cacheDir, key + ext);
   if (existsSync3(cachePath)) {
     console.log(`[image-resize] Cache hit for ${width}x${height} image`);
-    return readFileSync2(cachePath);
+    return { buffer: readFileSync2(cachePath), mediaType: outputMediaType };
   }
   let pipeline = sharp(buffer);
   if (needsResize) {
@@ -3764,25 +3767,27 @@ async function resizeImageIfNeeded(buffer, mediaType) {
     });
   }
   let result;
-  if (isPng && (needsShrink || buffer.length > 2 * 1024 * 1024)) {
+  if (willConvertToJpeg) {
     result = await pipeline.jpeg({ quality: 85 }).toBuffer();
   } else if (isPng) {
     result = await pipeline.png().toBuffer();
   } else {
     result = await pipeline.jpeg({ quality: 85 }).toBuffer();
   }
+  let finalMediaType = outputMediaType;
   if (result.length > MAX_FILE_BYTES) {
     for (const quality of [70, 50, 30]) {
       result = await sharp(buffer).resize(MAX_LONG_EDGE, MAX_LONG_EDGE, { fit: "inside", withoutEnlargement: true }).jpeg({ quality }).toBuffer();
       if (result.length <= MAX_FILE_BYTES) break;
     }
+    finalMediaType = "image/jpeg";
   }
   writeFileSync2(cachePath, result);
   const resultMeta = await sharp(result).metadata();
   console.log(
-    `[image-resize] ${width}x${height} -> ${resultMeta.width}x${resultMeta.height} (${(buffer.length / 1024).toFixed(0)}KB -> ${(result.length / 1024).toFixed(0)}KB)`
+    `[image-resize] ${width}x${height} -> ${resultMeta.width}x${resultMeta.height} (${(buffer.length / 1024).toFixed(0)}KB -> ${(result.length / 1024).toFixed(0)}KB, ${finalMediaType})`
   );
-  return result;
+  return { buffer: result, mediaType: finalMediaType };
 }
 
 // src/tools/read-file.ts
@@ -3849,15 +3854,15 @@ Use this to understand existing code, check file contents, view screenshots, or
             };
           }
           const rawBuffer = await readFile2(absolutePath);
-          const mediaType = getImageMediaType(absolutePath);
-          const buffer = await resizeImageIfNeeded(rawBuffer, mediaType);
-          const base64 = buffer.toString("base64");
+          const originalMediaType = getImageMediaType(absolutePath);
+          const resized = await resizeImageIfNeeded(rawBuffer, originalMediaType);
+          const base64 = resized.buffer.toString("base64");
           return {
             success: true,
             path: absolutePath,
             relativePath: relative(options.workingDirectory, absolutePath),
-            content: `[Image: ${relativePath} (${mediaType}, ${(stats.size / 1024).toFixed(1)}KB)]`,
-            mediaType,
+            content: `[Image: ${relativePath} (${resized.mediaType}, ${(stats.size / 1024).toFixed(1)}KB)]`,
+            mediaType: resized.mediaType,
             imageData: base64,
             sizeBytes: stats.size
           };
@@ -7619,6 +7624,13 @@ function truncateWriteFileInput(input) {
   return out;
 }
 var approvalResolvers = /* @__PURE__ */ new Map();
+function stripDataUrlPrefix(data) {
+  const commaIdx = data.indexOf(",");
+  if (commaIdx !== -1 && data.startsWith("data:")) {
+    return data.slice(commaIdx + 1);
+  }
+  return data;
+}
 var Agent = class _Agent {
   session;
   context;
@@ -7719,8 +7731,7 @@ ${prompt}` });
       if (attachment.type === "image") {
         contentParts.push({
           type: "image",
-          image: attachment.data,
-          // base64 data URL or raw base64
+          image: stripDataUrlPrefix(attachment.data),
           mediaType: attachment.mediaType,
           filename: attachment.filename,
           savedPath: attachment.savedPath
@@ -7728,7 +7739,7 @@ ${prompt}` });
       } else {
         contentParts.push({
           type: "file",
-          data: attachment.data,
+          data: stripDataUrlPrefix(attachment.data),
           mediaType: attachment.mediaType || "application/octet-stream",
           filename: attachment.filename,
           savedPath: attachment.savedPath
@@ -9397,14 +9408,22 @@ async function saveAttachmentToDisk(sessionId, attachment, index) {
   }
   let buffer = Buffer.from(base64Data, "base64");
   if (attachment.type === "image") {
-    buffer = await resizeImageIfNeeded(buffer, attachment.mediaType);
-    const prefix = attachment.data.includes(",") ? attachment.data.split(",")[0] + "," : "";
-    attachment.data = prefix + buffer.toString("base64");
+    const resized = await resizeImageIfNeeded(buffer, attachment.mediaType);
+    buffer = resized.buffer;
+    attachment.mediaType = resized.mediaType;
+    attachment.data = buffer.toString("base64");
   }
   const filePath = join9(attachmentsDir, filename);
   writeFileSync4(filePath, buffer);
   return filePath;
 }
+function stripDataUrlPrefix2(data) {
+  const commaIdx = data.indexOf(",");
+  if (commaIdx !== -1 && data.startsWith("data:")) {
+    return data.slice(commaIdx + 1);
+  }
+  return data;
+}
 function getExtensionFromMediaType(mediaType, type) {
   if (!mediaType) {
     return type === "image" ? ".png" : ".bin";
@@ -9496,7 +9515,7 @@ ${prompt}` });
             if (attachment.type === "image") {
               contentParts.push({
                 type: "image",
-                image: attachment.data,
+                image: stripDataUrlPrefix2(attachment.data),
                 mediaType: attachment.mediaType,
                 filename: attachment.filename,
                 savedPath: attachment.savedPath
@@ -9504,7 +9523,7 @@ ${prompt}` });
             } else {
               contentParts.push({
                 type: "file",
-                data: attachment.data,
+                data: stripDataUrlPrefix2(attachment.data),
                 mediaType: attachment.mediaType || "application/octet-stream",
                 filename: attachment.filename,
                 savedPath: attachment.savedPath
@@ -9791,8 +9810,7 @@ ${prompt}` });
         if (attachment.type === "image") {
           contentParts.push({
             type: "image",
-            image: attachment.data,
-            // base64 data URL or raw base64
+            image: stripDataUrlPrefix2(attachment.data),
             mediaType: attachment.mediaType,
             filename: attachment.filename,
             savedPath: attachment.savedPath
@@ -9800,7 +9818,7 @@ ${prompt}` });
         } else {
           contentParts.push({
             type: "file",
-            data: attachment.data,
+            data: stripDataUrlPrefix2(attachment.data),
             mediaType: attachment.mediaType || "application/octet-stream",
             filename: attachment.filename,
             savedPath: attachment.savedPath