openmagic 0.36.1 → 0.36.2

package/dist/cli.js

@@ -4,7 +4,7 @@
 import { Command } from "commander";
 import chalk from "chalk";
 import open from "open";
-import { resolve as resolve3, join as join5 } from "path";
+import { resolve as resolve3, join as join6 } from "path";
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
 import { spawn as spawn4 } from "child_process";
 import { createInterface } from "readline";
@@ -32,7 +32,7 @@ function validateToken(token) {
 
 // src/server.ts
 import { readFileSync as readFileSync3, existsSync as existsSync3 } from "fs";
-import { join as join3, dirname as dirname2 } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import { WebSocketServer, WebSocket } from "ws";
 
@@ -1533,8 +1533,7 @@ async function chatClaudeCode(messages, context, onChunk, onDone, onError) {
       "stream-json",
       "--verbose",
       "--max-turns",
-      "1"
-      // Single turn — OpenMagic manages its own retry loop
+      "5"
     ],
     {
       stdio: ["pipe", "pipe", "pipe"],
@@ -1546,6 +1545,7 @@ async function chatClaudeCode(messages, context, onChunk, onDone, onError) {
 ${fullPrompt}`);
   proc.stdin.end();
   let fullContent = "";
+  let resultContent = "";
   let buffer = "";
   let errOutput = "";
   proc.stdout.on("data", (data) => {
@@ -1556,6 +1556,12 @@ ${fullPrompt}`);
       if (!line.trim()) continue;
       try {
         const event = JSON.parse(line);
+        if (event.type === "result") {
+          if (typeof event.result === "string") {
+            resultContent = event.result;
+          }
+          continue;
+        }
         const text = extractText(event);
         if (text) {
           fullContent += text;
@@ -1581,16 +1587,18 @@ ${fullPrompt}`);
     if (buffer.trim()) {
       try {
         const event = JSON.parse(buffer);
-        const text = extractText(event);
-        if (text) fullContent += text;
-        if (event.result && typeof event.result === "string") {
-          fullContent = event.result;
+        if (event.type === "result" && typeof event.result === "string") {
+          resultContent = event.result;
+        } else {
+          const text = extractText(event);
+          if (text) fullContent += text;
         }
       } catch {
       }
     }
-    if (code === 0 || fullContent) {
-      onDone({ content: fullContent });
+    const finalContent = resultContent || fullContent;
+    if (code === 0 || finalContent) {
+      onDone({ content: finalContent });
     } else {
       const err = errOutput.trim();
       if (err.includes("not authenticated") || err.includes("login")) {
@@ -1623,6 +1631,13 @@ function extractText(event) {
 
 // src/llm/codex-cli.ts
 import { spawn as spawn2 } from "child_process";
+import { writeFileSync as writeFileSync3, unlinkSync as unlinkSync2 } from "fs";
+import { join as join3 } from "path";
+import { tmpdir as tmpdir2 } from "os";
+import { randomBytes as randomBytes2 } from "crypto";
+function stripAnsi(text) {
+  return text.replace(/\x1B\[[0-9;]*[A-Za-z]/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\r\n/g, "\n").replace(/\r/g, "");
+}
 async function chatCodexCli(messages, context, onChunk, onDone, onError) {
   const lastUserMsg = [...messages].reverse().find((m) => m.role === "user");
   const userPrompt = typeof lastUserMsg?.content === "string" ? lastUserMsg.content : "Help me with this element.";
@@ -1630,21 +1645,48 @@ async function chatCodexCli(messages, context, onChunk, onDone, onError) {
   const fullPrompt = `${SYSTEM_PROMPT}
 
 ${buildUserMessage(userPrompt, contextParts)}`;
-  const proc = spawn2("codex", ["--full-auto", fullPrompt], {
-    stdio: ["ignore", "pipe", "pipe"],
-    cwd: process.cwd()
-  });
+  const tmpFile = join3(tmpdir2(), `openmagic-codex-${randomBytes2(8).toString("hex")}.txt`);
+  writeFileSync3(tmpFile, fullPrompt);
+  let proc;
+  if (process.platform === "darwin") {
+    proc = spawn2("script", ["-q", "/dev/null", "codex", "--full-auto", "--quiet", "-"], {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd()
+    });
+    proc.stdin.write(fullPrompt);
+    proc.stdin.end();
+  } else if (process.platform === "linux") {
+    proc = spawn2("script", ["-qc", `codex --full-auto --quiet -`, "/dev/null"], {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd()
+    });
+    proc.stdin.write(fullPrompt);
+    proc.stdin.end();
+  } else {
+    proc = spawn2("codex", ["--full-auto", "--quiet", "-"], {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd()
+    });
+    proc.stdin.write(fullPrompt);
+    proc.stdin.end();
+  }
   let fullContent = "";
   let errOutput = "";
   proc.stdout.on("data", (data) => {
-    const text = data.toString();
-    fullContent += text;
-    onChunk(text);
+    const text = stripAnsi(data.toString());
+    if (text) {
+      fullContent += text;
+      onChunk(text);
+    }
   });
   proc.stderr.on("data", (data) => {
     errOutput += data.toString();
   });
   proc.on("error", (err) => {
+    try {
+      unlinkSync2(tmpFile);
+    } catch {
+    }
     if (err.message.includes("ENOENT")) {
       onError("Codex CLI not found. Install it with: npm install -g @openai/codex");
     } else {
@@ -1652,12 +1694,18 @@ ${buildUserMessage(userPrompt, contextParts)}`;
     }
   });
   proc.on("close", (code) => {
-    if (code === 0 || fullContent) {
+    try {
+      unlinkSync2(tmpFile);
+    } catch {
+    }
+    if (code === 0 || fullContent.trim()) {
       onDone({ content: fullContent });
     } else {
-      const err = errOutput.trim();
+      const err = stripAnsi(errOutput.trim());
       if (err.includes("OPENAI_API_KEY") || err.includes("api key") || err.includes("unauthorized")) {
         onError("Codex CLI requires OPENAI_API_KEY in your environment. Set it with: export OPENAI_API_KEY=sk-...");
+      } else if (err.includes("stdin is not a terminal") || err.includes("not a tty")) {
+        onError("Codex CLI requires a terminal. This platform may not support the PTY wrapper. Try using OpenAI provider instead.");
       } else {
         onError(err.slice(0, 500) || `Codex CLI exited with code ${code}`);
       }
@@ -2099,7 +2147,7 @@ async function handleMessage(ws, msg, state, roots) {
         sendError(ws, "invalid_payload", "Missing pattern", msg.id);
         break;
       }
-      const searchRoot = payload.path ? join3(roots[0] || process.cwd(), payload.path) : roots[0] || process.cwd();
+      const searchRoot = payload.path ? join4(roots[0] || process.cwd(), payload.path) : roots[0] || process.cwd();
       const results = grepFiles(payload.pattern, searchRoot, roots);
       send(ws, { id: msg.id, type: "fs.grep.result", payload: { results } });
       break;
@@ -2135,8 +2183,8 @@ function sendError(ws, code, message, id) {
 }
 function serveToolbarBundle(res) {
   const bundlePaths = [
-    join3(__dirname, "toolbar", "index.global.js"),
-    join3(__dirname, "..", "dist", "toolbar", "index.global.js")
+    join4(__dirname, "toolbar", "index.global.js"),
+    join4(__dirname, "..", "dist", "toolbar", "index.global.js")
   ];
   for (const bundlePath of bundlePaths) {
     try {
@@ -2285,7 +2333,7 @@ function buildInjectionScript(token) {
 // src/detect.ts
 import { createConnection } from "net";
 import { readFileSync as readFileSync4, existsSync as existsSync4 } from "fs";
-import { join as join4, resolve as resolve2 } from "path";
+import { join as join5, resolve as resolve2 } from "path";
 import { execSync } from "child_process";
 var COMMON_DEV_PORTS = [
   3e3,
@@ -2442,7 +2490,7 @@ var FRAMEWORK_PATTERNS = [
 ];
 var DEV_SCRIPT_NAMES = ["dev", "start", "serve", "develop", "dev:start", "start:dev", "server", "dev:server", "web", "frontend"];
 function detectDevScripts(cwd = process.cwd()) {
-  const pkgPath = join4(cwd, "package.json");
+  const pkgPath = join5(cwd, "package.json");
   if (!existsSync4(pkgPath)) return [];
   let pkg;
   try {
@@ -2510,7 +2558,7 @@ function checkNodeCompatibility(framework) {
 function checkEnvPort(cwd = process.cwd()) {
   const envFiles = [".env.local", ".env.development.local", ".env.development", ".env"];
   for (const envFile of envFiles) {
-    const envPath = join4(cwd, envFile);
+    const envPath = join5(cwd, envFile);
     if (!existsSync4(envPath)) continue;
     try {
       const content = readFileSync4(envPath, "utf-8");
@@ -2530,7 +2578,7 @@ function scanParentLockfiles(projectDir) {
   let dir = resolve2(project, "..");
   while (dir.length > 1 && dir.length >= home.length) {
     for (const lockfile of LOCKFILE_NAMES) {
-      const p = join4(dir, lockfile);
+      const p = join5(dir, lockfile);
       if (existsSync4(p)) found.push(p);
     }
     const parent = resolve2(dir, "..");
@@ -2540,7 +2588,7 @@ function scanParentLockfiles(projectDir) {
   return found;
 }
 function getProjectName(cwd = process.cwd()) {
-  const pkgPath = join4(cwd, "package.json");
+  const pkgPath = join5(cwd, "package.json");
   if (!existsSync4(pkgPath)) return "this project";
   try {
     const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
@@ -2563,10 +2611,10 @@ var INSTALL_COMMANDS = {
   bun: "bun install"
 };
 function checkDependenciesInstalled(cwd = process.cwd()) {
-  const hasNodeModules = existsSync4(join4(cwd, "node_modules"));
+  const hasNodeModules = existsSync4(join5(cwd, "node_modules"));
   let pm = "npm";
   for (const { file, pm: detectedPm } of LOCK_FILES) {
-    if (existsSync4(join4(cwd, file))) {
+    if (existsSync4(join5(cwd, file))) {
       pm = detectedPm;
       break;
     }
@@ -2863,12 +2911,49 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
       });
     }
   });
+  let shuttingDown = false;
   const shutdown = () => {
+    if (shuttingDown) return;
+    shuttingDown = true;
     console.log("");
     console.log(chalk.dim("  Shutting down OpenMagic..."));
     cleanupBackups();
     proxyServer.close();
-    process.exit(0);
+    for (const cp of childProcesses) {
+      try {
+        cp.kill("SIGTERM");
+      } catch {
+      }
+    }
+    const forceExit = setTimeout(() => {
+      for (const cp of childProcesses) {
+        try {
+          cp.kill("SIGKILL");
+        } catch {
+        }
+      }
+      process.exit(0);
+    }, 2e3);
+    forceExit.unref();
+    const allDead = childProcesses.every((cp) => cp.killed || cp.exitCode !== null);
+    if (allDead) {
+      clearTimeout(forceExit);
+      process.exit(0);
+    }
+    let remaining = childProcesses.filter((cp) => !cp.killed && cp.exitCode === null).length;
+    if (remaining === 0) {
+      clearTimeout(forceExit);
+      process.exit(0);
+    }
+    for (const cp of childProcesses) {
+      cp.once("exit", () => {
+        remaining--;
+        if (remaining <= 0) {
+          clearTimeout(forceExit);
+          process.exit(0);
+        }
+      });
+    }
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
@@ -2877,7 +2962,7 @@ async function offerToStartDevServer(expectedPort) {
   const projectName = getProjectName();
   const scripts = detectDevScripts();
   if (scripts.length === 0) {
-    const htmlPath = join5(process.cwd(), "index.html");
+    const htmlPath = join6(process.cwd(), "index.html");
     if (existsSync5(htmlPath)) {
       console.log(
         chalk.dim("  No dev scripts found, but index.html detected.")
@@ -3142,7 +3227,7 @@ async function offerToStartDevServer(expectedPort) {
     );
     console.log("");
     try {
-      const pkgPath = join5(process.cwd(), "package.json");
+      const pkgPath = join6(process.cwd(), "package.json");
       if (existsSync5(pkgPath)) {
         const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
         if (pkg.engines?.node) {