openmagic 0.36.1 → 0.36.3

package/dist/cli.js

@@ -1532,13 +1532,21 @@ async function chatClaudeCode(messages, context, onChunk, onDone, onError) {
       "--output-format",
       "stream-json",
       "--verbose",
+      "--include-partial-messages",
       "--max-turns",
-      "1"
-      // Single turn — OpenMagic manages its own retry loop
+      "5"
     ],
     {
       stdio: ["pipe", "pipe", "pipe"],
-      cwd: process.cwd()
+      cwd: process.cwd(),
+      env: {
+        ...process.env,
+        // Generous timeouts — Claude may read files and think between turns
+        CLAUDE_STREAM_IDLE_TIMEOUT_MS: "300000",
+        // 5 min idle timeout between chunks
+        API_TIMEOUT_MS: "600000"
+        // 10 min overall API timeout
+      }
     }
   );
   proc.stdin.write(`${SYSTEM_PROMPT}
@@ -1546,6 +1554,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 +1565,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,20 +1596,22 @@ ${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")) {
-        onError("Claude CLI is not authenticated. Run `claude login` in your terminal.");
+        onError("Claude CLI is not authenticated. Run `claude` in your terminal to log in.");
       } else if (err.includes("ENOENT") || err.includes("not found")) {
         onError("Claude CLI not found. Install it with: npm install -g @anthropic-ai/claude-code");
       } else {
@@ -1630,16 +1647,35 @@ 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 proc = spawn2(
+    "codex",
+    ["exec", "--full-auto", "--json", "--skip-git-repo-check", "-"],
+    {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd()
+    }
+  );
+  proc.stdin.write(fullPrompt);
+  proc.stdin.end();
   let fullContent = "";
+  let buffer = "";
   let errOutput = "";
   proc.stdout.on("data", (data) => {
-    const text = data.toString();
-    fullContent += text;
-    onChunk(text);
+    buffer += data.toString();
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      if (!line.trim()) continue;
+      try {
+        const event = JSON.parse(line);
+        const text = extractCodexText(event);
+        if (text) {
+          fullContent += text;
+          onChunk(text);
+        }
+      } catch {
+      }
+    }
   });
   proc.stderr.on("data", (data) => {
     errOutput += data.toString();
@@ -1652,7 +1688,15 @@ ${buildUserMessage(userPrompt, contextParts)}`;
     }
   });
   proc.on("close", (code) => {
-    if (code === 0 || fullContent) {
+    if (buffer.trim()) {
+      try {
+        const event = JSON.parse(buffer);
+        const text = extractCodexText(event);
+        if (text) fullContent += text;
+      } catch {
+      }
+    }
+    if (code === 0 || fullContent.trim()) {
       onDone({ content: fullContent });
     } else {
       const err = errOutput.trim();
@@ -1664,6 +1708,18 @@ ${buildUserMessage(userPrompt, contextParts)}`;
     }
   });
 }
+function extractCodexText(event) {
+  if (event.type === "item.completed" || event.type === "item.updated" || event.type === "item.started") {
+    const item = event.item;
+    if (item?.type === "agent_message" && typeof item.text === "string") {
+      return item.text;
+    }
+  }
+  if (event.type === "error" && typeof event.message === "string") {
+    return void 0;
+  }
+  return void 0;
+}
 
 // src/llm/gemini-cli.ts
 import { spawn as spawn3 } from "child_process";
@@ -1674,18 +1730,55 @@ async function chatGeminiCli(messages, context, onChunk, onDone, onError) {
   const fullPrompt = `${SYSTEM_PROMPT}
 
 ${buildUserMessage(userPrompt, contextParts)}`;
-  const proc = spawn3("gemini", [], {
-    stdio: ["pipe", "pipe", "pipe"],
-    cwd: process.cwd()
-  });
-  proc.stdin.write(fullPrompt);
+  const proc = spawn3(
+    "gemini",
+    [
+      "-p",
+      userPrompt,
+      "--output-format",
+      "stream-json",
+      "--yolo"
+    ],
+    {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd()
+    }
+  );
+  proc.stdin.write(`${SYSTEM_PROMPT}
+
+${buildUserMessage("", contextParts)}`);
   proc.stdin.end();
   let fullContent = "";
+  let resultContent = "";
+  let buffer = "";
   let errOutput = "";
   proc.stdout.on("data", (data) => {
-    const text = data.toString();
-    fullContent += text;
-    onChunk(text);
+    buffer += data.toString();
+    const lines = buffer.split("\n");
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      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 = extractGeminiText(event);
+        if (text) {
+          fullContent += text;
+          onChunk(text);
+        }
+      } catch {
+        const trimmed = line.trim();
+        if (trimmed) {
+          fullContent += trimmed + "\n";
+          onChunk(trimmed + "\n");
+        }
+      }
+    }
   });
   proc.stderr.on("data", (data) => {
     errOutput += data.toString();
@@ -1698,18 +1791,48 @@ ${buildUserMessage(userPrompt, contextParts)}`;
     }
   });
   proc.on("close", (code) => {
-    if (code === 0 || fullContent) {
-      onDone({ content: fullContent });
+    if (buffer.trim()) {
+      try {
+        const event = JSON.parse(buffer);
+        if (event.type === "result" && typeof event.result === "string") {
+          resultContent = event.result;
+        } else {
+          const text = extractGeminiText(event);
+          if (text) fullContent += text;
+        }
+      } catch {
+        const trimmed = buffer.trim();
+        if (trimmed) fullContent += trimmed;
+      }
+    }
+    const finalContent = resultContent || fullContent;
+    if (code === 0 || finalContent.trim()) {
+      onDone({ content: finalContent });
     } else {
       const err = errOutput.trim();
-      if (err.includes("auth") || err.includes("login") || err.includes("credentials")) {
-        onError("Gemini CLI requires Google authentication. Run `gemini auth login` in your terminal.");
+      if (err.includes("auth") || err.includes("GEMINI_API_KEY") || err.includes("credentials") || err.includes("login")) {
+        onError("Gemini CLI requires authentication. Set GEMINI_API_KEY in your environment, or run `gemini` interactively to log in with Google.");
       } else {
         onError(err.slice(0, 500) || `Gemini CLI exited with code ${code}`);
       }
     }
   });
 }
+function extractGeminiText(event) {
+  if (event.type === "assistant" || event.type === "message") {
+    const content = event.content ?? event.message?.content;
+    if (Array.isArray(content)) {
+      return content.filter((b) => b.type === "text" && b.text).map((b) => b.text).join("");
+    }
+    if (typeof content === "string") return content;
+    if (typeof event.text === "string") return event.text;
+  }
+  if (event.type === "content_block_delta") {
+    const delta = event.delta;
+    if (typeof delta?.text === "string") return delta.text;
+  }
+  return void 0;
+}
 
 // src/llm/proxy.ts
 var OPENAI_COMPATIBLE_PROVIDERS = /* @__PURE__ */ new Set([
@@ -2863,12 +2986,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);