openmagic 0.40.0 → 0.41.1

package/dist/cli.js

@@ -1485,6 +1485,8 @@ async function chatAnthropic(model, apiKey, messages, context, onChunk, onDone,
     if (msg.role === "user" && typeof msg.content === "string" && i === lastUserIdx) {
       const enrichedContent = buildUserMessage(msg.content, buildContextParts(context));
       if (context.screenshot) {
+        const mimeMatch = context.screenshot.match(/^data:(image\/[a-z+]+);base64,/);
+        const mediaType = mimeMatch?.[1] || "image/jpeg";
         const base64Data = context.screenshot.replace(
           /^data:image\/\w+;base64,/,
           ""
@@ -1497,7 +1499,7 @@ async function chatAnthropic(model, apiKey, messages, context, onChunk, onDone,
               type: "image",
               source: {
                 type: "base64",
-                media_type: "image/png",
+                media_type: mediaType,
                 data: base64Data
               }
             }
@@ -1601,13 +1603,15 @@ async function chatGoogle(model, apiKey, messages, context, onChunk, onDone, onE
         { text: enrichedContent }
       ];
       if (context.screenshot) {
+        const mimeMatch = context.screenshot.match(/^data:(image\/[a-z+]+);base64,/);
+        const mimeType = mimeMatch?.[1] || "image/jpeg";
         const base64Data = context.screenshot.replace(
           /^data:image\/\w+;base64,/,
           ""
         );
         parts.push({
           inline_data: {
-            mime_type: "image/png",
+            mime_type: mimeType,
             data: base64Data
           }
         });
@@ -3012,53 +3016,70 @@ async function healthCheck(proxyPort, _targetPort) {
 }
 var detectedFramework = null;
 async function validateAppHealth(targetHost, targetPort) {
-  try {
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), 8e3);
-    const res = await fetch(`http://${targetHost}:${targetPort}/`, {
-      signal: controller.signal,
-      redirect: "manual",
-      headers: { Accept: "text/html" }
-    });
-    clearTimeout(timeout);
-    const status = res.status;
-    if (status >= 200 && status < 400) return;
-    if (status === 404) {
-      console.log(chalk.yellow('  \u26A0  Your app returned 404 for the root path ("/").'));
-      console.log(chalk.dim("     The dev server is running, but no page matched."));
-      console.log("");
-      if (detectedFramework === "Next.js") {
-        const strayLockfiles = scanParentLockfiles(process.cwd());
-        if (strayLockfiles.length > 0) {
-          console.log(chalk.yellow("     Found lockfiles in parent directories that confuse Turbopack:"));
-          for (const f of strayLockfiles) {
-            console.log(chalk.dim(`       \u2022 ${f}`));
+  for (let attempt = 0; attempt < 10; attempt++) {
+    try {
+      const controller = new AbortController();
+      const timeout = setTimeout(() => controller.abort(), 3e3);
+      const res = await fetch(`http://${targetHost}:${targetPort}/`, {
+        signal: controller.signal,
+        redirect: "manual",
+        headers: { Accept: "text/html" }
+      });
+      clearTimeout(timeout);
+      const status = res.status;
+      if (status >= 200 && status < 400) return true;
+      if (status === 404 && attempt < 6) {
+        await new Promise((r) => setTimeout(r, 1500));
+        continue;
+      }
+      if (status === 404) {
+        console.log(chalk.yellow('  \u26A0  Your app returned 404 for the root path ("/").'));
+        console.log(chalk.dim("     The dev server is running, but no page matched."));
+        console.log("");
+        if (detectedFramework === "Next.js") {
+          const strayLockfiles = scanParentLockfiles(process.cwd());
+          if (strayLockfiles.length > 0) {
+            console.log(chalk.yellow("     Found lockfiles in parent directories that confuse Turbopack:"));
+            for (const f of strayLockfiles) {
+              console.log(chalk.dim(`       \u2022 ${f}`));
+            }
+            console.log("");
+            console.log(chalk.dim("     Fix: remove them, or add to your next.config:"));
+            console.log(chalk.cyan("       turbopack: { root: __dirname }"));
+          } else {
+            console.log(chalk.dim("     Common Next.js causes:"));
+            console.log(chalk.dim("     \u2022 Missing src/app/page.tsx (App Router) or pages/index.tsx"));
+            console.log(chalk.dim("     \u2022 Middleware redirecting all routes to an auth provider"));
           }
-          console.log("");
-          console.log(chalk.dim("     Fix: remove them, or add to your next.config:"));
-          console.log(chalk.cyan("       turbopack: { root: __dirname }"));
+        } else if (detectedFramework === "Angular") {
+          console.log(chalk.dim("     Angular hint: ensure the base href matches the proxy path."));
+        } else if (detectedFramework === "Vite") {
+          console.log(chalk.dim("     Vite hint: check that index.html exists in the project root."));
         } else {
-          console.log(chalk.dim("     Common Next.js causes:"));
-          console.log(chalk.dim("     \u2022 Missing src/app/page.tsx (App Router) or pages/index.tsx"));
-          console.log(chalk.dim("     \u2022 Middleware redirecting all routes to an auth provider"));
+          console.log(chalk.dim("     Check your framework's routing configuration."));
         }
-      } else if (detectedFramework === "Angular") {
-        console.log(chalk.dim("     Angular hint: ensure the base href matches the proxy path."));
-      } else if (detectedFramework === "Vite") {
-        console.log(chalk.dim("     Vite hint: check that index.html exists in the project root."));
-      } else {
-        console.log(chalk.dim("     Check your framework's routing configuration."));
+        console.log("");
+        console.log(chalk.dim("     The toolbar is still available \u2014 navigate to a working route."));
+        console.log("");
+        return false;
+      } else if (status >= 500) {
+        console.log(chalk.yellow(`  \u26A0  Your app returned HTTP ${status} on the root path.`));
+        console.log(chalk.dim("     There may be a server-side error. Check your dev server output."));
+        console.log("");
+        if (attempt < 4) {
+          await new Promise((r) => setTimeout(r, 2e3));
+          continue;
+        }
+        return false;
+      }
+    } catch {
+      if (attempt < 6) {
+        await new Promise((r) => setTimeout(r, 1500));
+        continue;
       }
-      console.log("");
-      console.log(chalk.dim("     The toolbar is still available \u2014 navigate to a working route."));
-      console.log("");
-    } else if (status >= 500) {
-      console.log(chalk.yellow(`  \u26A0  Your app returned HTTP ${status} on the root path.`));
-      console.log(chalk.dim("     There may be a server-side error. Check your dev server output."));
-      console.log("");
     }
-  } catch {
   }
+  return false;
 }
 var program = new Command();
 program.name("openmagic").description("AI-powered coding toolbar for any web application").version(VERSION2).option("-p, --port <port>", "Dev server port to proxy", "").option(
@@ -3221,7 +3242,11 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
     );
     console.log("");
     await healthCheck(proxyPort, targetPort);
-    await validateAppHealth(targetHost, targetPort);
+    console.log(chalk.dim("  Waiting for app to compile..."));
+    const appReady = await validateAppHealth(targetHost, targetPort);
+    if (appReady) {
+      console.log(chalk.green("  \u2713  App is ready."));
+    }
     console.log(chalk.dim("  Press Ctrl+C to stop."));
     console.log(
       chalk.dim("  Errors below are from your dev server, not OpenMagic.")