openmagic 0.35.0 → 0.36.0

package/dist/cli.js

@@ -6,7 +6,7 @@ import chalk from "chalk";
 import open from "open";
 import { resolve as resolve3, join as join5 } from "path";
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
-import { spawn } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { createInterface } from "readline";
 
 // src/proxy.ts
@@ -326,6 +326,57 @@ function getProjectTree(roots) {
 
 // src/llm/registry.ts
 var MODEL_REGISTRY = {
+  // ─── Claude Code (CLI) ────────────────────────────────────────
+  "claude-code": {
+    name: "Claude Code (CLI)",
+    models: [
+      {
+        id: "claude-code",
+        name: "Claude Code",
+        vision: false,
+        context: 2e5,
+        maxOutput: 64e3
+      }
+    ],
+    apiBase: "",
+    keyPrefix: "",
+    keyPlaceholder: "not required",
+    local: true
+  },
+  // ─── Codex CLI ────────────────────────────────────────────────
+  "codex-cli": {
+    name: "Codex CLI",
+    models: [
+      {
+        id: "codex-cli",
+        name: "Codex CLI",
+        vision: false,
+        context: 192e3,
+        maxOutput: 1e5
+      }
+    ],
+    apiBase: "",
+    keyPrefix: "",
+    keyPlaceholder: "not required",
+    local: true
+  },
+  // ─── Gemini CLI ───────────────────────────────────────────────
+  "gemini-cli": {
+    name: "Gemini CLI",
+    models: [
+      {
+        id: "gemini-cli",
+        name: "Gemini CLI",
+        vision: false,
+        context: 1048576,
+        maxOutput: 65536
+      }
+    ],
+    apiBase: "",
+    keyPrefix: "",
+    keyPlaceholder: "not required",
+    local: true
+  },
   // ─── OpenAI ───────────────────────────────────────────────────
   openai: {
     name: "OpenAI",
@@ -1467,6 +1518,201 @@ async function chatGoogle(model, apiKey, messages, context, onChunk, onDone, onE
   }
 }
 
+// src/llm/claude-code.ts
+import { spawn } from "child_process";
+async function chatClaudeCode(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.";
+  const contextParts = buildContextParts(context);
+  const fullPrompt = buildUserMessage(userPrompt, contextParts);
+  const proc = spawn(
+    "claude",
+    [
+      "-p",
+      "--output-format",
+      "stream-json",
+      "--max-turns",
+      "1"
+      // Single turn — OpenMagic manages its own retry loop
+    ],
+    {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd()
+    }
+  );
+  proc.stdin.write(`${SYSTEM_PROMPT}
+
+${fullPrompt}`);
+  proc.stdin.end();
+  let fullContent = "";
+  let buffer = "";
+  let errOutput = "";
+  proc.stdout.on("data", (data) => {
+    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 = extractText(event);
+        if (text) {
+          fullContent += text;
+          onChunk(text);
+        }
+      } catch {
+      }
+    }
+  });
+  proc.stderr.on("data", (data) => {
+    errOutput += data.toString();
+  });
+  proc.on("error", (err) => {
+    if (err.message.includes("ENOENT")) {
+      onError(
+        "Claude CLI not found. Install it with: npm install -g @anthropic-ai/claude-code"
+      );
+    } else {
+      onError(`Claude CLI error: ${err.message}`);
+    }
+  });
+  proc.on("close", (code) => {
+    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;
+        }
+      } catch {
+      }
+    }
+    if (code === 0 || fullContent) {
+      onDone({ content: fullContent });
+    } 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.");
+      } 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 {
+        onError(err.slice(0, 500) || `Claude CLI exited with code ${code}`);
+      }
+    }
+  });
+}
+function extractText(event) {
+  if (event.type === "assistant") {
+    const msg = event.message;
+    if (msg?.content) {
+      if (Array.isArray(msg.content)) {
+        return msg.content.filter((b) => b.type === "text" && b.text).map((b) => b.text).join("");
+      }
+      if (typeof msg.content === "string") return msg.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/codex-cli.ts
+import { spawn as spawn2 } from "child_process";
+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.";
+  const contextParts = buildContextParts(context);
+  const fullPrompt = `${SYSTEM_PROMPT}
+
+${buildUserMessage(userPrompt, contextParts)}`;
+  const proc = spawn2("codex", ["-q"], {
+    stdio: ["pipe", "pipe", "pipe"],
+    cwd: process.cwd(),
+    env: { ...process.env, CODEX_QUIET_MODE: "1" }
+  });
+  proc.stdin.write(fullPrompt);
+  proc.stdin.end();
+  let fullContent = "";
+  let errOutput = "";
+  proc.stdout.on("data", (data) => {
+    const text = data.toString();
+    fullContent += text;
+    onChunk(text);
+  });
+  proc.stderr.on("data", (data) => {
+    errOutput += data.toString();
+  });
+  proc.on("error", (err) => {
+    if (err.message.includes("ENOENT")) {
+      onError("Codex CLI not found. Install it with: npm install -g @openai/codex");
+    } else {
+      onError(`Codex CLI error: ${err.message}`);
+    }
+  });
+  proc.on("close", (code) => {
+    if (code === 0 || fullContent) {
+      onDone({ content: fullContent });
+    } else {
+      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 {
+        onError(err.slice(0, 500) || `Codex CLI exited with code ${code}`);
+      }
+    }
+  });
+}
+
+// src/llm/gemini-cli.ts
+import { spawn as spawn3 } from "child_process";
+async function chatGeminiCli(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.";
+  const contextParts = buildContextParts(context);
+  const fullPrompt = `${SYSTEM_PROMPT}
+
+${buildUserMessage(userPrompt, contextParts)}`;
+  const proc = spawn3("gemini", [], {
+    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);
+  });
+  proc.stderr.on("data", (data) => {
+    errOutput += data.toString();
+  });
+  proc.on("error", (err) => {
+    if (err.message.includes("ENOENT")) {
+      onError("Gemini CLI not found. Install it with: npm install -g @google/gemini-cli");
+    } else {
+      onError(`Gemini CLI error: ${err.message}`);
+    }
+  });
+  proc.on("close", (code) => {
+    if (code === 0 || fullContent) {
+      onDone({ content: fullContent });
+    } 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.");
+      } else {
+        onError(err.slice(0, 500) || `Gemini CLI exited with code ${code}`);
+      }
+    }
+  });
+}
+
 // src/llm/proxy.ts
 var OPENAI_COMPATIBLE_PROVIDERS = /* @__PURE__ */ new Set([
   "openai",
@@ -1543,7 +1789,13 @@ async function handleLlmChat(params, onChunk, onDone, onError) {
     onDone({ content: result.content, modifications });
   };
   try {
-    if (provider === "anthropic") {
+    if (provider === "claude-code") {
+      await chatClaudeCode(messages, context, onChunk, wrappedOnDone, onError);
+    } else if (provider === "codex-cli") {
+      await chatCodexCli(messages, context, onChunk, wrappedOnDone, onError);
+    } else if (provider === "gemini-cli") {
+      await chatGeminiCli(messages, context, onChunk, wrappedOnDone, onError);
+    } else if (provider === "anthropic") {
       await chatAnthropic(model, apiKey, messages, context, onChunk, wrappedOnDone, onError);
     } else if (provider === "google") {
       await chatGoogle(model, apiKey, messages, context, onChunk, wrappedOnDone, onError);
@@ -2272,6 +2524,23 @@ function checkEnvPort(cwd = process.cwd()) {
   }
   return null;
 }
+var LOCKFILE_NAMES = ["package-lock.json", "bun.lock", "bun.lockb", "yarn.lock", "pnpm-lock.yaml"];
+function scanParentLockfiles(projectDir) {
+  const home = process.env.HOME || process.env.USERPROFILE || "";
+  const project = resolve2(projectDir);
+  const found = [];
+  let dir = resolve2(project, "..");
+  while (dir.length > 1 && dir.length >= home.length) {
+    for (const lockfile of LOCKFILE_NAMES) {
+      const p = join4(dir, lockfile);
+      if (existsSync4(p)) found.push(p);
+    }
+    const parent = resolve2(dir, "..");
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return found;
+}
 function getProjectName(cwd = process.cwd()) {
   const pkgPath = join4(cwd, "package.json");
   if (!existsSync4(pkgPath)) return "this project";
@@ -2366,7 +2635,7 @@ function waitForPort(port, timeoutMs = 6e4, shouldAbort) {
 function runCommand(cmd, args, cwd = process.cwd()) {
   return new Promise((resolve4) => {
     try {
-      const child = spawn(cmd, args, {
+      const child = spawn4(cmd, args, {
         cwd,
         stdio: ["ignore", "pipe", "pipe"],
         shell: true
@@ -2433,13 +2702,20 @@ async function validateAppHealth(targetHost, targetPort) {
       console.log(chalk.dim("     The dev server is running, but no page matched."));
       console.log("");
       if (detectedFramework === "Next.js") {
-        console.log(chalk.dim("     Common Next.js causes:"));
-        console.log(chalk.dim("     \u2022 A stray package-lock.json in a parent directory confuses"));
-        console.log(chalk.dim("       Turbopack's workspace root detection."));
-        console.log(chalk.dim("       \u2192 Check for ~/package-lock.json and remove if unneeded"));
-        console.log(chalk.dim("       \u2192 Or set turbopack.root in next.config (Next.js 15+)"));
-        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"));
+        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"));
+        }
       } else if (detectedFramework === "Angular") {
         console.log(chalk.dim("     Angular hint: ensure the base href matches the proxy path."));
       } else if (detectedFramework === "Vite") {
@@ -2540,6 +2816,19 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
   console.log(
     chalk.green(`  \u2713  Dev server running at ${targetHost}:${targetPort}`)
   );
+  if (detectedFramework === "Next.js") {
+    const strayLockfiles = scanParentLockfiles(process.cwd());
+    if (strayLockfiles.length > 0) {
+      console.log("");
+      console.log(chalk.yellow("  \u26A0  Lockfiles found in parent directories:"));
+      for (const f of strayLockfiles) {
+        console.log(chalk.dim(`     \u2022 ${f}`));
+      }
+      console.log(chalk.dim("     Next.js Turbopack may use the wrong workspace root, causing 404s."));
+      console.log(chalk.dim("     Fix: remove them, or add to next.config:"));
+      console.log(chalk.cyan("       turbopack: { root: __dirname }"));
+    }
+  }
   const roots = (opts.root || [process.cwd()]).map(
     (r) => resolve3(r)
   );
@@ -2604,7 +2893,7 @@ async function offerToStartDevServer(expectedPort) {
       }
       const staticPort = expectedPort || 8080;
       console.log(chalk.dim(`  Starting static server on port ${staticPort}...`));
-      const staticChild = spawn("node", ["-e", `
+      const staticChild = spawn4("node", ["-e", `
         const http = require("http");
         const fs = require("fs");
         const path = require("path");
@@ -2778,7 +3067,7 @@ async function offerToStartDevServer(expectedPort) {
   }
   let child;
   try {
-    child = spawn(runCmd, runArgs, {
+    child = spawn4(runCmd, runArgs, {
       cwd: process.cwd(),
       stdio: "inherit",
       env: {