openmagic 0.25.3 → 0.26.0

package/dist/cli.js

@@ -1447,7 +1447,7 @@ async function handleLlmChat(params, onChunk, onDone, onError) {
 }
 
 // src/server.ts
-var VERSION = "0.25.3";
+var VERSION = "0.26.0";
 var __dirname = dirname2(fileURLToPath(import.meta.url));
 function attachOpenMagic(httpServer, roots) {
   function handleRequest(req, res) {
@@ -1980,7 +1980,8 @@ process.on("uncaughtException", (err) => {
   process.exit(1);
 });
 var childProcesses = [];
-var VERSION2 = "0.25.3";
+var lastDetectedPort = null;
+var VERSION2 = "0.26.0";
 function ask(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve3) => {
@@ -2089,34 +2090,11 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
   "-r, --root <paths...>",
   "Project root directories (defaults to cwd)"
 ).option("--no-open", "Don't auto-open browser").option("--host <host>", "Dev server host", "127.0.0.1").action(async (opts) => {
-  const g = chalk.hex("#fdcb6e");
-  const p = chalk.hex("#a29bfe");
-  const b = chalk.bold.hex("#6c5ce7");
   console.log("");
-  console.log(p("                                    ."));
-  console.log(p("                                    |"));
-  console.log(p("         .                         ") + g("/") + p("|") + g("\\"));
-  console.log(g("        /|\\                      /") + p(" | ") + g("\\"));
-  console.log(p("         |                     ") + g("/") + p("  |  ") + g("\\"));
-  console.log(p("         .                ") + p(".") + g("--") + p("'   |   '") + g("--") + p("."));
-  console.log(p("                           ") + g("--") + p("     ") + b("|||") + p("     ") + g("--"));
-  console.log(p("              .        .") + g("--") + p("'       ") + b("|||") + p("       '") + g("--") + p("."));
-  console.log(g("             /|\\") + p("      ") + g("--") + p("          ") + b("|||") + p("          ") + g("--"));
-  console.log(p("              |   ") + g("--") + p("             ") + b("|||") + p("             ") + g("--"));
-  console.log(p("  . . .") + g("--------") + p("               ") + b("|||||") + p("               ") + g("--------") + p(". . ."));
-  console.log(p("              |   ") + g("--") + p("             ") + b("|||") + p("             ") + g("--"));
-  console.log(g("             \\|/") + p("      ") + g("--") + p("          ") + b("|||") + p("          ") + g("--"));
-  console.log(p("              .        .") + g("--") + p(".       ") + b("|||") + p("       .") + g("--") + p("."));
-  console.log(p("                           ") + g("--") + p("     ") + b("|||") + p("     ") + g("--"));
-  console.log(p("         .                .") + g("--") + p(".   |   .") + g("--") + p("."));
-  console.log(g("        \\|/") + p("                     ") + g("\\") + p("  |  ") + g("/"));
-  console.log(p("         |                      ") + g("\\") + p(" | ") + g("/"));
-  console.log(p("         .                       ") + g("\\") + p("|") + g("/"));
-  console.log(p("                                    |"));
-  console.log(p("                                    ."));
-  console.log("");
-  console.log(b("          O P E N M A G I C") + chalk.dim(` v${VERSION2}`));
-  console.log(chalk.dim("          AI coding toolbar for any web app"));
+  console.log(
+    "  \u{1FA84} " + chalk.bold.hex("#6c5ce7")("OpenMagic") + chalk.dim(` v${VERSION2}`) + " \u2728"
+  );
+  console.log(chalk.dim("  AI coding toolbar for any web app"));
   console.log("");
   let targetPort;
   let targetHost = opts.host;
@@ -2128,10 +2106,14 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
       if (!started) {
         process.exit(1);
       }
-      const recheck = await detectDevServer();
-      if (recheck) {
-        targetPort = recheck.port;
-        targetHost = recheck.host;
+      if (lastDetectedPort) {
+        targetPort = lastDetectedPort;
+      } else {
+        const recheck = await detectDevServer();
+        if (recheck) {
+          targetPort = recheck.port;
+          targetHost = recheck.host;
+        }
       }
     }
   } else {
@@ -2145,15 +2127,19 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
       if (!started) {
         process.exit(1);
       }
-      const redetected = await detectDevServer();
-      if (!redetected) {
-        console.log(chalk.red("  \u2717  Could not detect the dev server after starting."));
-        console.log(chalk.dim("     Try specifying the port: npx openmagic --port 3000"));
-        console.log("");
-        process.exit(1);
+      if (lastDetectedPort) {
+        targetPort = lastDetectedPort;
+      } else {
+        const redetected = await detectDevServer();
+        if (!redetected) {
+          console.log(chalk.red("  \u2717  Could not detect the dev server after starting."));
+          console.log(chalk.dim("     Try specifying the port: npx openmagic --port 3000"));
+          console.log("");
+          process.exit(1);
+        }
+        targetPort = redetected.port;
+        targetHost = redetected.host;
       }
-      targetPort = redetected.port;
-      targetHost = redetected.host;
     }
   }
   console.log(
@@ -2175,15 +2161,15 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
   }
   const proxyServer = createProxyServer(targetHost, targetPort, roots);
   proxyServer.listen(proxyPort, "127.0.0.1", async () => {
+    const proxyUrl = `http://localhost:${proxyPort}`;
+    console.log("");
+    console.log(chalk.bold.green("  Ready!"));
     console.log("");
     console.log(
-      chalk.bold.green(`  Proxy running at \u2192 `) + chalk.bold.underline.cyan(`http://localhost:${proxyPort}`)
+      chalk.bold("  \u2192 ") + chalk.bold.underline.cyan(proxyUrl)
     );
     console.log("");
     await healthCheck(proxyPort, targetPort);
-    console.log(
-      chalk.dim("  Open the URL above in your browser to start.")
-    );
     console.log(chalk.dim("  Press Ctrl+C to stop."));
     console.log(
       chalk.dim("  Errors below are from your dev server, not OpenMagic.")
@@ -2324,14 +2310,26 @@ async function offerToStartDevServer(expectedPort) {
   }
   childProcesses.push(child);
   let childExited = false;
+  let detectedPort = null;
+  function parsePortFromOutput(line) {
+    const portMatch = line.match(/https?:\/\/(?:localhost|127\.0\.0\.1|0\.0\.0\.0):(\d+)/);
+    if (portMatch && !detectedPort) {
+      const p = parseInt(portMatch[1], 10);
+      if (p > 0 && p < 65536 && p !== port) {
+        detectedPort = p;
+      }
+    }
+  }
   child.stdout?.on("data", (data) => {
     for (const line of data.toString().trim().split("\n")) {
+      parsePortFromOutput(line);
       const formatted = formatDevServerLine(line);
       if (formatted) process.stdout.write(formatted + "\n");
     }
   });
   child.stderr?.on("data", (data) => {
     for (const line of data.toString().trim().split("\n")) {
+      parsePortFromOutput(line);
       const formatted = formatDevServerLine(line);
       if (formatted) process.stdout.write(formatted + "\n");
     }
@@ -2366,9 +2364,23 @@ async function offerToStartDevServer(expectedPort) {
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   console.log(
-    chalk.dim(`  Waiting for port ${port}...`)
+    chalk.dim(`  Waiting for dev server...`)
   );
-  const isUp = await waitForPort(port, 3e4, () => childExited);
+  const isUp = await waitForPort(port, 3e4, () => {
+    if (childExited) return true;
+    if (detectedPort) return true;
+    return false;
+  });
+  if (!isUp && detectedPort) {
+    const altUp = await isPortOpen(detectedPort);
+    if (altUp) {
+      console.log(
+        chalk.green(`  \u2713  Dev server is on port ${detectedPort} (configured in project, not default ${port})`)
+      );
+      lastDetectedPort = detectedPort;
+      return true;
+    }
+  }
   if (childExited && !isUp) {
     console.log(
       chalk.red(`  \u2717  Dev server exited before it was ready.`)