openmagic 0.11.0 → 0.13.0

package/dist/cli.js

@@ -68,8 +68,9 @@ function saveConfig(updates) {
     const tmpFile = CONFIG_FILE + ".tmp";
     writeFileSync(tmpFile, JSON.stringify(merged, null, 2), { encoding: "utf-8", mode: 384 });
     renameSync(tmpFile, CONFIG_FILE);
+    return { ok: true };
   } catch (e) {
-    console.warn(`[OpenMagic] Warning: Could not save config to ${CONFIG_FILE}: ${e.message}`);
+    return { ok: false, error: e.message };
   }
 }
 
@@ -78,10 +79,11 @@ import {
   readFileSync as readFileSync2,
   writeFileSync as writeFileSync2,
   existsSync as existsSync2,
-  statSync,
+  lstatSync,
   readdirSync,
   copyFileSync,
-  mkdirSync as mkdirSync2
+  mkdirSync as mkdirSync2,
+  realpathSync
 } from "fs";
 import { join as join2, resolve, relative, dirname, extname } from "path";
 var IGNORED_DIRS = /* @__PURE__ */ new Set([
@@ -117,10 +119,17 @@ var IGNORED_EXTENSIONS = /* @__PURE__ */ new Set([
 ]);
 function isPathSafe(filePath, roots) {
   const resolved = resolve(filePath);
+  let real;
+  try {
+    real = realpathSync(resolved);
+  } catch {
+    real = resolved;
+  }
   return roots.some((root) => {
     const resolvedRoot = resolve(root);
     const rel = relative(resolvedRoot, resolved);
-    return !rel.startsWith("..") && !rel.startsWith("/") && !rel.startsWith("\\");
+    const realRel = relative(resolvedRoot, real);
+    return !rel.startsWith("..") && !rel.startsWith("/") && !rel.startsWith("\\") && (!realRel.startsWith("..") && !realRel.startsWith("/") && !realRel.startsWith("\\"));
   });
 }
 function readFileSafe(filePath, roots) {
@@ -176,10 +185,11 @@ function listFiles(rootPath, roots, maxDepth = 4) {
       const fullPath = join2(dir, item);
       let stat;
       try {
-        stat = statSync(fullPath);
+        stat = lstatSync(fullPath);
       } catch {
         continue;
       }
+      if (stat.isSymbolicLink()) continue;
       const relPath = relative(rootPath, fullPath);
       if (stat.isDirectory()) {
         entries.push({ path: relPath, type: "dir", name: item });
@@ -902,6 +912,18 @@ You MUST respond with valid JSON in this exact format:
 6. If the change involves multiple files, include all modifications in the array
 7. ALWAYS respond with the JSON format above, even for explanations (put them in the "explanation" field)
 8. If you cannot make the requested change, set modifications to an empty array and explain why`;
+function buildContextParts(context) {
+  const parts = {};
+  if (context.selectedElement) parts.selectedElement = context.selectedElement.outerHTML;
+  if (context.files?.length) {
+    parts.filePath = context.files[0].path;
+    parts.fileContent = context.files[0].content;
+  }
+  if (context.projectTree) parts.projectTree = context.projectTree;
+  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");
+  return parts;
+}
 function buildUserMessage(userPrompt, context) {
   const parts = [];
   if (context.projectTree) {
@@ -957,24 +979,7 @@ async function chatOpenAICompatible(provider, model, apiKey, messages, context,
   for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
     if (msg.role === "user" && typeof msg.content === "string" && i === lastUserIdx) {
-      const contextParts = {};
-      if (context.selectedElement) {
-        contextParts.selectedElement = context.selectedElement.outerHTML;
-      }
-      if (context.files && context.files.length > 0) {
-        contextParts.filePath = context.files[0].path;
-        contextParts.fileContent = context.files[0].content;
-      }
-      if (context.projectTree) {
-        contextParts.projectTree = context.projectTree;
-      }
-      if (context.networkLogs) {
-        contextParts.networkLogs = context.networkLogs.map((l) => `${l.method} ${l.url} \u2192 ${l.status || "pending"}`).join("\n");
-      }
-      if (context.consoleLogs) {
-        contextParts.consoleLogs = context.consoleLogs.map((l) => `[${l.level}] ${l.args.join(" ")}`).join("\n");
-      }
-      const enrichedContent = buildUserMessage(msg.content, contextParts);
+      const enrichedContent = buildUserMessage(msg.content, buildContextParts(context));
       const modelInfo2 = providerConfig.models.find((m) => m.id === model);
       if (context.screenshot && modelInfo2?.vision) {
         apiMessages.push({
@@ -1088,24 +1093,7 @@ async function chatAnthropic(model, apiKey, messages, context, onChunk, onDone,
     const msg = messages[i];
     if (msg.role === "system") continue;
     if (msg.role === "user" && typeof msg.content === "string" && i === lastUserIdx) {
-      const contextParts = {};
-      if (context.selectedElement) {
-        contextParts.selectedElement = context.selectedElement.outerHTML;
-      }
-      if (context.files && context.files.length > 0) {
-        contextParts.filePath = context.files[0].path;
-        contextParts.fileContent = context.files[0].content;
-      }
-      if (context.projectTree) {
-        contextParts.projectTree = context.projectTree;
-      }
-      if (context.networkLogs) {
-        contextParts.networkLogs = context.networkLogs.map((l) => `${l.method} ${l.url} \u2192 ${l.status || "pending"}`).join("\n");
-      }
-      if (context.consoleLogs) {
-        contextParts.consoleLogs = context.consoleLogs.map((l) => `[${l.level}] ${l.args.join(" ")}`).join("\n");
-      }
-      const enrichedContent = buildUserMessage(msg.content, contextParts);
+      const enrichedContent = buildUserMessage(msg.content, buildContextParts(context));
       if (context.screenshot) {
         const base64Data = context.screenshot.replace(
           /^data:image\/\w+;base64,/,
@@ -1218,18 +1206,7 @@ async function chatGoogle(model, apiKey, messages, context, onChunk, onDone, onE
     if (msg.role === "system") continue;
     const role = msg.role === "assistant" ? "model" : "user";
     if (msg.role === "user" && typeof msg.content === "string" && i === lastUserIdx) {
-      const contextParts = {};
-      if (context.selectedElement) {
-        contextParts.selectedElement = context.selectedElement.outerHTML;
-      }
-      if (context.files && context.files.length > 0) {
-        contextParts.filePath = context.files[0].path;
-        contextParts.fileContent = context.files[0].content;
-      }
-      if (context.projectTree) {
-        contextParts.projectTree = context.projectTree;
-      }
-      const enrichedContent = buildUserMessage(msg.content, contextParts);
+      const enrichedContent = buildUserMessage(msg.content, buildContextParts(context));
       const parts = [
         { text: enrichedContent }
       ];
@@ -1381,7 +1358,7 @@ async function handleLlmChat(params, onChunk, onDone, onError) {
 }
 
 // src/server.ts
-var VERSION = "0.11.0";
+var VERSION = "0.13.0";
 var __dirname = dirname2(fileURLToPath(import.meta.url));
 function attachOpenMagic(httpServer, roots) {
   function handleRequest(req, res) {
@@ -1463,7 +1440,7 @@ async function handleMessage(ws, msg, state, roots) {
             provider: config.provider,
             model: config.model,
             hasApiKey: !!config.apiKey,
-            apiKeys: config.apiKeys || {}
+            apiKeys: Object.fromEntries(Object.entries(config.apiKeys || {}).map(([k]) => [k, true]))
           }
         }
       });
@@ -1529,7 +1506,7 @@ async function handleMessage(ws, msg, state, roots) {
       await handleLlmChat(
         {
           provider,
-          model: payload.model || config.model || "gpt-4o",
+          model: payload.model || config.model || MODEL_REGISTRY[provider]?.models[0]?.id || "gpt-4o",
           apiKey,
           messages: payload.messages,
           context: payload.context
@@ -1577,12 +1554,12 @@ async function handleMessage(ws, msg, state, roots) {
       } else if (payload.apiKey !== void 0) {
         updates.apiKey = payload.apiKey;
       }
-      saveConfig(updates);
-      send(ws, {
-        id: msg.id,
-        type: "config.saved",
-        payload: { ok: true }
-      });
+      const result = saveConfig(updates);
+      if (!result.ok) {
+        sendError(ws, "config_error", result.error || "Failed to save", msg.id);
+      } else {
+        send(ws, { id: msg.id, type: "config.saved", payload: { ok: true } });
+      }
       break;
     }
     default:
@@ -1662,6 +1639,7 @@ function createProxyServer(targetHost, targetPort, roots) {
       delete headers["x-content-security-policy"];
       delete headers["etag"];
       delete headers["last-modified"];
+      headers["cache-control"] = "no-store";
       res.writeHead(proxyRes.statusCode || 200, headers);
       res.end(body);
     }).catch(() => {
@@ -1728,18 +1706,7 @@ async function collectBody(stream) {
   }
 }
 function buildInjectionScript(token) {
-  return `
-<script data-openmagic="true">
-(function() {
-  if (window.__OPENMAGIC_LOADED__) return;
-  window.__OPENMAGIC_LOADED__ = true;
-  window.__OPENMAGIC_TOKEN__ = "${token}";
-  var s = document.createElement("script");
-  s.src = "/__openmagic__/toolbar.js";
-  s.dataset.openmagic = "true";
-  document.body.appendChild(s);
-})();
-</script>`;
+  return `<script src="/__openmagic__/toolbar.js?v=${Date.now()}" data-openmagic="true" data-openmagic-token="${token}" defer></script>`;
 }
 
 // src/detect.ts
@@ -1765,6 +1732,8 @@ var COMMON_DEV_PORTS = [
   // Common alternate
   4e3,
   // Phoenix, generic
+  5e3,
+  // Flask
   1234,
   // Parcel
   4321,
@@ -1916,7 +1885,7 @@ process.on("uncaughtException", (err) => {
   process.exit(1);
 });
 var childProcesses = [];
-var VERSION2 = "0.11.0";
+var VERSION2 = "0.13.0";
 function ask(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve3) => {