openmagic 0.32.0 → 0.33.1

package/dist/cli.js

@@ -82,9 +82,12 @@ import {
   readdirSync,
   copyFileSync,
   mkdirSync as mkdirSync2,
-  realpathSync
+  realpathSync,
+  rmSync
 } from "fs";
 import { join as join2, resolve, relative, dirname, extname } from "path";
+import { tmpdir } from "os";
+import { createHash } from "crypto";
 var IGNORED_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -145,6 +148,25 @@ function readFileSafe(filePath, roots) {
     return { error: `Failed to read file: ${e.message}` };
   }
 }
+var BACKUP_DIR = join2(tmpdir(), "openmagic-backups");
+var backupMap = /* @__PURE__ */ new Map();
+function getBackupPath(filePath) {
+  const hash = createHash("md5").update(resolve(filePath)).digest("hex").slice(0, 12);
+  const name = filePath.split(/[/\\]/).pop() || "file";
+  return join2(BACKUP_DIR, `${hash}_${name}`);
+}
+function getBackupForFile(filePath) {
+  return backupMap.get(resolve(filePath));
+}
+function cleanupBackups() {
+  try {
+    if (existsSync2(BACKUP_DIR)) {
+      rmSync(BACKUP_DIR, { recursive: true, force: true });
+    }
+  } catch {
+  }
+  backupMap.clear();
+}
 function writeFileSafe(filePath, content, roots) {
   if (!isPathSafe(filePath, roots)) {
     return { ok: false, error: "Path is outside allowed roots" };
@@ -152,8 +174,10 @@ function writeFileSafe(filePath, content, roots) {
   try {
     let backupPath;
     if (existsSync2(filePath)) {
-      backupPath = filePath + ".openmagic-backup";
+      if (!existsSync2(BACKUP_DIR)) mkdirSync2(BACKUP_DIR, { recursive: true });
+      backupPath = getBackupPath(filePath);
       copyFileSync(filePath, backupPath);
+      backupMap.set(resolve(filePath), backupPath);
     }
     const dir = dirname(filePath);
     if (!existsSync2(dir)) {
@@ -204,6 +228,79 @@ function listFiles(rootPath, roots, maxDepth = 4) {
   walk(rootPath, 0);
   return entries;
 }
+var GREP_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".js",
+  ".jsx",
+  ".ts",
+  ".tsx",
+  ".mjs",
+  ".cjs",
+  ".vue",
+  ".svelte",
+  ".astro",
+  ".html",
+  ".htm",
+  ".css",
+  ".scss",
+  ".less",
+  ".json",
+  ".md",
+  ".yaml",
+  ".yml",
+  ".php",
+  ".py",
+  ".rb"
+]);
+function grepFiles(pattern, searchRoot, roots, maxResults = 30) {
+  if (!isPathSafe(searchRoot, roots)) return [];
+  const results = [];
+  const lowerPattern = pattern.toLowerCase();
+  function walk(dir, depth) {
+    if (depth > 5 || results.length >= maxResults) return;
+    let items;
+    try {
+      items = readdirSync(dir);
+    } catch {
+      return;
+    }
+    for (const item of items) {
+      if (results.length >= maxResults) return;
+      if (IGNORED_DIRS.has(item) || item.startsWith(".") && item !== ".env.example") continue;
+      const fullPath = join2(dir, item);
+      let stat;
+      try {
+        stat = lstatSync(fullPath);
+      } catch {
+        continue;
+      }
+      if (stat.isSymbolicLink()) continue;
+      if (stat.isDirectory()) {
+        walk(fullPath, depth + 1);
+      } else if (stat.isFile()) {
+        const ext = extname(item).toLowerCase();
+        if (!GREP_EXTENSIONS.has(ext)) continue;
+        try {
+          const content = readFileSync2(fullPath, "utf-8");
+          const lines = content.split("\n");
+          let fileMatches = 0;
+          for (let i = 0; i < lines.length && fileMatches < 5; i++) {
+            if (lines[i].toLowerCase().includes(lowerPattern)) {
+              results.push({
+                file: relative(searchRoot, fullPath),
+                lineNum: i + 1,
+                line: lines[i].trim().slice(0, 200)
+              });
+              fileMatches++;
+            }
+          }
+        } catch {
+        }
+      }
+    }
+  }
+  walk(searchRoot, 0);
+  return results;
+}
 function getProjectTree(roots) {
   const lines = [];
   for (const root of roots) {
@@ -909,6 +1006,7 @@ You MUST respond with valid JSON in this exact format:
 4. Include 3-5 lines of surrounding context in the search field to ensure uniqueness
 5. Keep modifications minimal \u2014 change only what's needed. Do NOT rewrite entire files.
 6. If the grounded files don't contain the code you need to modify, return: {"modifications":[],"explanation":"NEED_FILE: exact/relative/path/to/file.ext"}
+7. To search for a pattern across the codebase, return: {"modifications":[],"explanation":"SEARCH_FILES: \\"pattern\\" in optional/path/"}
 7. For style changes: check the dependencies (package.json) to know if the project uses Tailwind, MUI, etc. Use the project's styling approach, not raw CSS
 8. Use the selected element's cssSelector, className, parentContainerStyles, and siblings to understand the full layout context
 9. Use the page URL route and componentHint to identify the correct source file to modify
@@ -949,6 +1047,12 @@ function buildContextParts(context) {
     if (el.reactProps) {
       elementData.reactProps = el.reactProps;
     }
+    if (el.childrenLayout?.length) {
+      elementData.childrenLayout = el.childrenLayout;
+    }
+    if (el.resolvedClasses?.length) {
+      elementData.resolvedClasses = el.resolvedClasses;
+    }
     parts.selectedElement = JSON.stringify(elementData, null, 2);
   }
   if (context.files?.length) {
@@ -959,6 +1063,12 @@ function buildContextParts(context) {
   if (context.pageTitle) parts.pageTitle = context.pageTitle;
   if (context.networkLogs) parts.networkLogs = context.networkLogs.map((l) => `${l.method} ${l.url} \u2192 ${l.status || "pending"}`).join("\n");
   if (context.consoleLogs) parts.consoleLogs = context.consoleLogs.map((l) => `[${l.level}] ${l.args.join(" ")}`).join("\n");
+  if (context.searchResults?.length) {
+    parts.searchResults = context.searchResults.map(
+      (s) => `Search: "${s.query}"
+${s.matches.map((m) => `  ${m.file}:${m.lineNum}: ${m.line}`).join("\n")}`
+    ).join("\n\n");
+  }
   return parts;
 }
 function buildUserMessage(userPrompt, context) {
@@ -1002,6 +1112,12 @@ ${context.networkLogs}
     parts.push(`## Console Output
 \`\`\`
 ${context.consoleLogs}
+\`\`\``);
+  }
+  if (context.searchResults) {
+    parts.push(`## Search Results
+\`\`\`
+${context.searchResults}
 \`\`\``);
   }
   parts.push(`## User Request
@@ -1614,6 +1730,30 @@ async function handleMessage(ws, msg, state, roots) {
       }
       break;
     }
+    case "fs.undo": {
+      const payload = msg.payload;
+      if (!payload?.path) {
+        sendError(ws, "invalid_payload", "Missing path", msg.id);
+        break;
+      }
+      const backupPath = getBackupForFile(payload.path);
+      if (!backupPath) {
+        sendError(ws, "fs_error", "No backup found", msg.id);
+        break;
+      }
+      try {
+        const backupContent = readFileSync3(backupPath, "utf-8");
+        const writeResult = writeFileSafe(payload.path, backupContent, roots);
+        if (!writeResult.ok) {
+          sendError(ws, "fs_error", writeResult.error || "Undo failed", msg.id);
+          break;
+        }
+        send(ws, { id: msg.id, type: "fs.undone", payload: { path: payload.path, ok: true } });
+      } catch (e) {
+        sendError(ws, "fs_error", `Backup read failed: ${e.message}`, msg.id);
+      }
+      break;
+    }
     case "fs.list": {
       const payload = msg.payload;
       const root = payload?.root || roots[0];
@@ -1694,6 +1834,17 @@ async function handleMessage(ws, msg, state, roots) {
       }
       break;
     }
+    case "fs.grep": {
+      const payload = msg.payload;
+      if (!payload?.pattern) {
+        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 results = grepFiles(payload.pattern, searchRoot, roots);
+      send(ws, { id: msg.id, type: "fs.grep.result", payload: { results } });
+      break;
+    }
     case "debug.logs": {
       send(ws, {
         id: msg.id,
@@ -2289,6 +2440,7 @@ program.name("openmagic").description("AI-powered coding toolbar for any web app
   const shutdown = () => {
     console.log("");
     console.log(chalk.dim("  Shutting down OpenMagic..."));
+    cleanupBackups();
     proxyServer.close();
     process.exit(0);
   };