openmagic 0.36.2 → 0.36.3

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 join6 } from "path";
+import { resolve as resolve3, join as join5 } 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 join4, dirname as dirname2 } from "path";
+import { join as join3, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import { WebSocketServer, WebSocket } from "ws";
 
@@ -1532,12 +1532,21 @@ async function chatClaudeCode(messages, context, onChunk, onDone, onError) {
       "--output-format",
       "stream-json",
       "--verbose",
+      "--include-partial-messages",
       "--max-turns",
       "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}
@@ -1602,7 +1611,7 @@ ${fullPrompt}`);
     } 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 {
@@ -1631,13 +1640,6 @@ 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.";
@@ -1645,48 +1647,40 @@ async function chatCodexCli(messages, context, onChunk, onDone, onError) {
   const fullPrompt = `${SYSTEM_PROMPT}
 
 ${buildUserMessage(userPrompt, contextParts)}`;
-  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", "-"], {
+  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();
-  }
+    }
+  );
+  proc.stdin.write(fullPrompt);
+  proc.stdin.end();
   let fullContent = "";
+  let buffer = "";
   let errOutput = "";
   proc.stdout.on("data", (data) => {
-    const text = stripAnsi(data.toString());
-    if (text) {
-      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();
   });
   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 {
@@ -1694,24 +1688,38 @@ ${buildUserMessage(userPrompt, contextParts)}`;
     }
   });
   proc.on("close", (code) => {
-    try {
-      unlinkSync2(tmpFile);
-    } catch {
+    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 = stripAnsi(errOutput.trim());
+      const err = 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}`);
       }
     }
   });
 }
+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";
@@ -1722,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();
@@ -1746,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([
@@ -2147,7 +2222,7 @@ async function handleMessage(ws, msg, state, roots) {
         sendError(ws, "invalid_payload", "Missing pattern", msg.id);
         break;
       }
-      const searchRoot = payload.path ? join4(roots[0] || process.cwd(), payload.path) : roots[0] || process.cwd();
+      const searchRoot = payload.path ? join3(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;
@@ -2183,8 +2258,8 @@ function sendError(ws, code, message, id) {
 }
 function serveToolbarBundle(res) {
   const bundlePaths = [
-    join4(__dirname, "toolbar", "index.global.js"),
-    join4(__dirname, "..", "dist", "toolbar", "index.global.js")
+    join3(__dirname, "toolbar", "index.global.js"),
+    join3(__dirname, "..", "dist", "toolbar", "index.global.js")
   ];
   for (const bundlePath of bundlePaths) {
     try {
@@ -2333,7 +2408,7 @@ function buildInjectionScript(token) {
 // src/detect.ts
 import { createConnection } from "net";
 import { readFileSync as readFileSync4, existsSync as existsSync4 } from "fs";
-import { join as join5, resolve as resolve2 } from "path";
+import { join as join4, resolve as resolve2 } from "path";
 import { execSync } from "child_process";
 var COMMON_DEV_PORTS = [
   3e3,
@@ -2490,7 +2565,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 = join5(cwd, "package.json");
+  const pkgPath = join4(cwd, "package.json");
   if (!existsSync4(pkgPath)) return [];
   let pkg;
   try {
@@ -2558,7 +2633,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 = join5(cwd, envFile);
+    const envPath = join4(cwd, envFile);
     if (!existsSync4(envPath)) continue;
     try {
       const content = readFileSync4(envPath, "utf-8");
@@ -2578,7 +2653,7 @@ function scanParentLockfiles(projectDir) {
   let dir = resolve2(project, "..");
   while (dir.length > 1 && dir.length >= home.length) {
     for (const lockfile of LOCKFILE_NAMES) {
-      const p = join5(dir, lockfile);
+      const p = join4(dir, lockfile);
       if (existsSync4(p)) found.push(p);
     }
     const parent = resolve2(dir, "..");
@@ -2588,7 +2663,7 @@ function scanParentLockfiles(projectDir) {
   return found;
 }
 function getProjectName(cwd = process.cwd()) {
-  const pkgPath = join5(cwd, "package.json");
+  const pkgPath = join4(cwd, "package.json");
   if (!existsSync4(pkgPath)) return "this project";
   try {
     const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
@@ -2611,10 +2686,10 @@ var INSTALL_COMMANDS = {
   bun: "bun install"
 };
 function checkDependenciesInstalled(cwd = process.cwd()) {
-  const hasNodeModules = existsSync4(join5(cwd, "node_modules"));
+  const hasNodeModules = existsSync4(join4(cwd, "node_modules"));
   let pm = "npm";
   for (const { file, pm: detectedPm } of LOCK_FILES) {
-    if (existsSync4(join5(cwd, file))) {
+    if (existsSync4(join4(cwd, file))) {
       pm = detectedPm;
       break;
     }
@@ -2962,7 +3037,7 @@ async function offerToStartDevServer(expectedPort) {
   const projectName = getProjectName();
   const scripts = detectDevScripts();
   if (scripts.length === 0) {
-    const htmlPath = join6(process.cwd(), "index.html");
+    const htmlPath = join5(process.cwd(), "index.html");
     if (existsSync5(htmlPath)) {
       console.log(
         chalk.dim("  No dev scripts found, but index.html detected.")
@@ -3227,7 +3302,7 @@ async function offerToStartDevServer(expectedPort) {
     );
     console.log("");
     try {
-      const pkgPath = join6(process.cwd(), "package.json");
+      const pkgPath = join5(process.cwd(), "package.json");
       if (existsSync5(pkgPath)) {
         const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
         if (pkg.engines?.node) {