stashes 0.1.26 → 0.1.28

package/dist/cli.js

@@ -20,7 +20,7 @@ var __require = import.meta.require;
 
 // src/index.ts
 import { readFileSync as readFileSync9 } from "fs";
-import { join as join12, dirname as dirname5 } from "path";
+import { join as join13, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { Command } from "commander";
 
@@ -31,9 +31,9 @@ import open from "open";
 // ../server/dist/index.js
 import { Hono as Hono2 } from "hono";
 import { cors } from "hono/cors";
-import { join as join8, dirname as dirname2 } from "path";
+import { join as join9, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
-import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
 // ../shared/dist/constants/index.js
 var STASHES_PORT = 4000;
 var DEFAULT_STASH_COUNT = 3;
@@ -159,10 +159,10 @@ function ensureProject(persistence) {
 var apiRoutes = app;
 
 // ../core/dist/generation.js
-import { readFileSync as readFileSync3, existsSync as existsSync6 } from "fs";
-import { join as join6 } from "path";
+import { readFileSync as readFileSync3, existsSync as existsSync7 } from "fs";
+import { join as join7 } from "path";
 var {spawn: spawn3 } = globalThis.Bun;
-import simpleGit2 from "simple-git";
+import simpleGit3 from "simple-git";
 
 // ../core/dist/worktree.js
 import simpleGit from "simple-git";
@@ -542,6 +542,14 @@ class PersistenceService {
     const filePath = join4(this.basePath, "projects", projectId, "stashes.json");
     writeJson(filePath, stashes);
   }
+  getProjectSettings(projectId) {
+    const filePath = join4(this.basePath, "projects", projectId, "settings.json");
+    return readJson(filePath, {});
+  }
+  saveProjectSettings(projectId, settings) {
+    const filePath = join4(this.basePath, "projects", projectId, "settings.json");
+    writeJson(filePath, settings);
+  }
   listChats(projectId) {
     const dir = join4(this.basePath, "projects", projectId, "chats");
     if (!existsSync4(dir))
@@ -622,18 +630,22 @@ class PersistenceService {
 var {spawn } = globalThis.Bun;
 var CLAUDE_BIN = "/opt/homebrew/bin/claude";
 var processes = new Map;
-function startAiProcess(id, prompt, cwd, resumeSessionId) {
+function startAiProcess(id, prompt, cwd, resumeSessionId, model) {
   killAiProcess(id);
   logger.info("claude", `spawning process: ${id}`, {
     cwd,
     promptLength: prompt.length,
     promptPreview: prompt.substring(0, 100),
-    resumeSessionId
+    resumeSessionId,
+    model
   });
   const cmd = [CLAUDE_BIN, "-p", prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"];
   if (resumeSessionId) {
     cmd.push("--resume", resumeSessionId);
   }
+  if (model) {
+    cmd.push("--model", model);
+  }
   const proc = spawn({
     cmd,
     stdin: "ignore",
@@ -757,6 +769,11 @@ async function* parseClaudeStream(proc) {
   }
 }
 
+// ../core/dist/smart-screenshot.js
+import { join as join6 } from "path";
+import { mkdirSync as mkdirSync4, existsSync as existsSync6 } from "fs";
+import simpleGit2 from "simple-git";
+
 // ../core/dist/screenshot.js
 var {spawn: spawn2 } = globalThis.Bun;
 import { join as join5 } from "path";
@@ -799,6 +816,171 @@ async function captureScreenshot(port, projectPath, stashId) {
   return `/api/screenshots/${filename}`;
 }
 
+// ../core/dist/smart-screenshot.js
+var SCREENSHOTS_DIR2 = ".stashes/screenshots";
+var DEFAULT_TIMEOUT = 120000;
+var DIFF_MAX_CHARS = 1e4;
+async function getStashDiff(worktreePath, parentBranch) {
+  const git = simpleGit2(worktreePath);
+  try {
+    const diff = await git.diff([parentBranch, "HEAD"]);
+    if (diff.length <= DIFF_MAX_CHARS)
+      return diff;
+    const diffStat = await git.diff([parentBranch, "HEAD", "--stat"]);
+    const truncatedDiff = diff.substring(0, DIFF_MAX_CHARS);
+    return `## Changed files:
+${diffStat}
+
+## Partial diff (truncated):
+${truncatedDiff}`;
+  } catch (err) {
+    logger.warn("smart-screenshot", `git diff failed, falling back`, {
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return "";
+  }
+}
+function buildScreenshotPrompt(port, diff, screenshotDir, stashId) {
+  return [
+    "You are a screenshot assistant. A developer made UI changes to a web app.",
+    "Your job: navigate the running app, find the pages affected by the changes, and take screenshots.",
+    "",
+    `## The app is running at: http://localhost:${port}`,
+    "",
+    "## Git diff of changes:",
+    "```",
+    diff,
+    "```",
+    "",
+    "## Instructions:",
+    "1. Analyze the diff to identify which components/pages changed",
+    "2. Determine the URL routes where these changes are visible",
+    "3. For each route:",
+    "   - Navigate to it using browser_navigate",
+    "   - If the change is behind an interaction (tab, modal, accordion), perform that interaction",
+    "   - Wait for the page to settle",
+    "   - Take a screenshot using browser_take_screenshot",
+    "4. Decide which screenshot shows the MOST visually significant change \u2014 mark it as primary",
+    "",
+    `## Screenshot save paths:`,
+    `- Primary: ${join6(screenshotDir, `${stashId}.png`)}`,
+    `- Additional: ${join6(screenshotDir, `${stashId}-1.png`)}, ${join6(screenshotDir, `${stashId}-2.png`)}, etc.`,
+    "",
+    "## Output format (after all screenshots are taken):",
+    "Respond with ONLY this JSON (no markdown fences):",
+    "{",
+    '  "screenshots": [',
+    "    {",
+    `      "path": "${join6(screenshotDir, `${stashId}.png`)}",`,
+    '      "label": "Short description of what is shown",',
+    '      "route": "/the-url-path",',
+    '      "isPrimary": true',
+    "    }",
+    "  ]",
+    "}"
+  ].join(`
+`);
+}
+function parseAiResult(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    const jsonMatch = text.match(/\{[\s\S]*"screenshots"[\s\S]*\}/);
+    if (jsonMatch) {
+      try {
+        return JSON.parse(jsonMatch[0]);
+      } catch {
+        return null;
+      }
+    }
+    return null;
+  }
+}
+async function captureSmartScreenshots(opts) {
+  const { projectPath, stashId, stashBranch, parentBranch, worktreePath, port, model = "haiku", timeout = DEFAULT_TIMEOUT } = opts;
+  const screenshotDir = join6(projectPath, SCREENSHOTS_DIR2);
+  if (!existsSync6(screenshotDir)) {
+    mkdirSync4(screenshotDir, { recursive: true });
+  }
+  const diff = await getStashDiff(worktreePath, parentBranch);
+  if (!diff) {
+    logger.info("smart-screenshot", `No diff found for ${stashId}, using simple screenshot`);
+    const url = await captureScreenshot(port, projectPath, stashId);
+    return {
+      primary: url,
+      screenshots: [{ url, label: "Homepage", route: "/", isPrimary: true }]
+    };
+  }
+  const processId = `screenshot-ai-${stashId}`;
+  const prompt = buildScreenshotPrompt(port, diff, screenshotDir, stashId);
+  const modelFlag = model === "sonnet" ? "sonnet" : "haiku";
+  const aiProcess = startAiProcess(processId, prompt, worktreePath, undefined, modelFlag);
+  let textOutput = "";
+  let timedOut = false;
+  const timeoutId = setTimeout(() => {
+    timedOut = true;
+    killAiProcess(processId);
+  }, timeout);
+  try {
+    for await (const chunk of parseClaudeStream(aiProcess.process)) {
+      if (chunk.type === "text") {
+        textOutput += chunk.content;
+      }
+    }
+    await aiProcess.process.exited;
+  } catch (err) {
+    logger.warn("smart-screenshot", `AI process error for ${stashId}`, {
+      error: err instanceof Error ? err.message : String(err),
+      timedOut
+    });
+  } finally {
+    clearTimeout(timeoutId);
+    killAiProcess(processId);
+  }
+  const result = parseAiResult(textOutput);
+  if (!result || !result.screenshots || result.screenshots.length === 0) {
+    logger.info("smart-screenshot", `AI returned no screenshots for ${stashId}, falling back`);
+    const url = await captureScreenshot(port, projectPath, stashId);
+    return {
+      primary: url,
+      screenshots: [{ url, label: "Homepage", route: "/", isPrimary: true }]
+    };
+  }
+  const screenshots = [];
+  let primaryUrl = "";
+  for (const shot of result.screenshots) {
+    const filename = shot.path.split("/").pop() || "";
+    if (!existsSync6(shot.path)) {
+      logger.warn("smart-screenshot", `Screenshot file not found: ${shot.path}`);
+      continue;
+    }
+    const url = `/api/screenshots/${filename}`;
+    const screenshot = {
+      url,
+      label: shot.label,
+      route: shot.route,
+      isPrimary: shot.isPrimary
+    };
+    screenshots.push(screenshot);
+    if (shot.isPrimary)
+      primaryUrl = url;
+  }
+  if (screenshots.length === 0) {
+    logger.info("smart-screenshot", `No valid screenshots for ${stashId}, falling back`);
+    const url = await captureScreenshot(port, projectPath, stashId);
+    return {
+      primary: url,
+      screenshots: [{ url, label: "Homepage", route: "/", isPrimary: true }]
+    };
+  }
+  if (!primaryUrl) {
+    primaryUrl = screenshots[0].url;
+    screenshots[0] = { ...screenshots[0], isPrimary: true };
+  }
+  logger.info("smart-screenshot", `Captured ${screenshots.length} smart screenshots for ${stashId}`);
+  return { primary: primaryUrl, screenshots };
+}
+
 // ../core/dist/prompt.js
 function buildStashPrompt(component, sourceCode, userPrompt, directive) {
   const parts = [
@@ -849,23 +1031,6 @@ async function waitForPort(port, timeout) {
   }
   throw new Error(`Port ${port} not ready within ${timeout}ms`);
 }
-async function captureEphemeralScreenshot(worktreePath, projectPath, stashId, port) {
-  const devServer = spawn3({
-    cmd: ["npm", "run", "dev"],
-    cwd: worktreePath,
-    stdin: "ignore",
-    stdout: "pipe",
-    stderr: "pipe",
-    env: { ...process.env, PORT: String(port), BROWSER: "none" }
-  });
-  try {
-    await waitForPort(port, 60000);
-    await new Promise((r) => setTimeout(r, 2000));
-    return await captureScreenshot(port, projectPath, stashId);
-  } finally {
-    devServer.kill();
-  }
-}
 async function allocatePort() {
   for (let port = 4010;port <= 4030; port++) {
     try {
@@ -883,8 +1048,8 @@ async function generate(opts) {
   const selectedDirectives = directives.slice(0, count);
   let sourceCode = "";
   if (component?.filePath) {
-    const sourceFile = join6(projectPath, component.filePath);
-    if (existsSync6(sourceFile)) {
+    const sourceFile = join7(projectPath, component.filePath);
+    if (existsSync7(sourceFile)) {
       sourceCode = readFileSync3(sourceFile, "utf-8");
     }
   }
@@ -906,6 +1071,7 @@ async function generate(opts) {
       worktreePath: worktree.path,
       port: null,
       screenshotUrl: null,
+      screenshots: [],
       status: "generating",
       error: null,
       relatedTo: [],
@@ -930,7 +1096,7 @@ async function generate(opts) {
         });
       }
       await aiProcess.process.exited;
-      const wtGit = simpleGit2(worktree.path);
+      const wtGit = simpleGit3(worktree.path);
       try {
         await wtGit.add("-A");
         await wtGit.commit(`stashes: stash ${stashId}`);
@@ -953,15 +1119,40 @@ async function generate(opts) {
     try {
       const port = await allocatePort();
       const worktree = await worktreeManager.createForGeneration(`screenshot-${stash.id}`);
-      const screenshotGit = simpleGit2(worktree.path);
+      const screenshotGit = simpleGit3(worktree.path);
       await screenshotGit.checkout(["-f", stash.branch]);
-      const screenshotPath = await captureEphemeralScreenshot(worktree.path, projectPath, stash.id, port);
+      const devServer = spawn3({
+        cmd: ["npm", "run", "dev"],
+        cwd: worktree.path,
+        stdin: "ignore",
+        stdout: "pipe",
+        stderr: "pipe",
+        env: { ...process.env, PORT: String(port), BROWSER: "none" }
+      });
+      try {
+        await waitForPort(port, 60000);
+        await new Promise((r) => setTimeout(r, 2000));
+        const mainGit = simpleGit3(projectPath);
+        const parentBranch = (await mainGit.revparse(["HEAD"])).trim();
+        const { primary, screenshots } = await captureSmartScreenshots({
+          projectPath,
+          stashId: stash.id,
+          stashBranch: stash.branch,
+          parentBranch,
+          worktreePath: worktree.path,
+          port,
+          model: opts.screenshotModel,
+          timeout: opts.screenshotTimeout
+        });
+        const updatedStash = { ...stash, screenshotUrl: primary, screenshots };
+        persistence.saveStash(updatedStash);
+        const idx = completedStashes.indexOf(stash);
+        completedStashes[idx] = updatedStash;
+        emit(onProgress, { type: "ready", stashId: stash.id, screenshotPath: primary });
+      } finally {
+        devServer.kill();
+      }
       await worktreeManager.removeGeneration(`screenshot-${stash.id}`);
-      const updatedStash = { ...stash, screenshotUrl: screenshotPath };
-      persistence.saveStash(updatedStash);
-      const idx = completedStashes.indexOf(stash);
-      completedStashes[idx] = updatedStash;
-      emit(onProgress, { type: "ready", stashId: stash.id, screenshotPath });
     } catch (err) {
       logger.error("generation", `screenshot failed for ${stash.id}`, {
         error: err instanceof Error ? err.message : String(err)
@@ -973,7 +1164,7 @@ async function generate(opts) {
 }
 // ../core/dist/vary.js
 var {spawn: spawn4 } = globalThis.Bun;
-import simpleGit3 from "simple-git";
+import simpleGit4 from "simple-git";
 function emit2(onProgress, event) {
   if (onProgress)
     onProgress(event);
@@ -1031,6 +1222,7 @@ async function vary(opts) {
     worktreePath: worktree.path,
     port: null,
     screenshotUrl: null,
+    screenshots: [],
     status: "generating",
     error: null,
     relatedTo: [sourceStashId],
@@ -1050,7 +1242,7 @@ async function vary(opts) {
       });
     }
     await aiProcess.process.exited;
-    const wtGit = simpleGit3(worktree.path);
+    const wtGit = simpleGit4(worktree.path);
     try {
       await wtGit.add("-A");
       await wtGit.commit(`stashes: vary ${stashId} from ${sourceStashId}`);
@@ -1058,10 +1250,11 @@ async function vary(opts) {
     await worktreeManager.removeGeneration(stashId);
     emit2(onProgress, { type: "screenshotting", stashId });
     let screenshotPath = "";
+    let screenshots = [];
     try {
       const port = await allocatePort2();
       const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
-      const screenshotGit = simpleGit3(screenshotWorktree.path);
+      const screenshotGit = simpleGit4(screenshotWorktree.path);
       await screenshotGit.checkout(["-f", stash.branch]);
       const devServer = spawn4({
         cmd: ["npm", "run", "dev"],
@@ -1074,7 +1267,18 @@ async function vary(opts) {
       try {
         await waitForPort2(port, 60000);
         await new Promise((r) => setTimeout(r, 2000));
-        screenshotPath = await captureScreenshot(port, projectPath, stashId);
+        const result = await captureSmartScreenshots({
+          projectPath,
+          stashId,
+          stashBranch: stash.branch,
+          parentBranch: sourceStash.branch,
+          worktreePath: screenshotWorktree.path,
+          port,
+          model: opts.screenshotModel,
+          timeout: opts.screenshotTimeout
+        });
+        screenshotPath = result.primary;
+        screenshots = [...result.screenshots];
       } finally {
         devServer.kill();
       }
@@ -1084,7 +1288,7 @@ async function vary(opts) {
         error: err instanceof Error ? err.message : String(err)
       });
     }
-    const readyStash = { ...stash, status: "ready", screenshotUrl: screenshotPath || null };
+    const readyStash = { ...stash, status: "ready", screenshotUrl: screenshotPath || null, screenshots };
     persistence.saveStash(readyStash);
     emit2(onProgress, { type: "ready", stashId, screenshotPath });
     return readyStash;
@@ -1108,7 +1312,7 @@ async function apply(opts) {
   logger.info("apply", `stash ${stashId} applied and worktrees cleaned up`);
 }
 // ../core/dist/manage.js
-import simpleGit4 from "simple-git";
+import simpleGit5 from "simple-git";
 async function list(projectPath) {
   const persistence = new PersistenceService(projectPath);
   const projects = persistence.listProjects();
@@ -1129,7 +1333,7 @@ async function remove(projectPath, stashId) {
     }
   }
   try {
-    const git = simpleGit4(projectPath);
+    const git = simpleGit5(projectPath);
     await git.raw(["branch", "-D", `stashes/${stashId}`]);
   } catch {}
   logger.info("manage", `removed stash: ${stashId}`);
@@ -1140,8 +1344,8 @@ async function cleanup(projectPath) {
   logger.info("manage", "cleanup complete");
 }
 // ../server/dist/services/stash-service.js
-import { readFileSync as readFileSync4, existsSync as existsSync7 } from "fs";
-import { join as join7 } from "path";
+import { readFileSync as readFileSync4, existsSync as existsSync8 } from "fs";
+import { join as join8 } from "path";
 
 // ../server/dist/services/preview-pool.js
 class PreviewPool {
@@ -1404,8 +1608,8 @@ class StashService {
     let sourceCode = "";
     const filePath = component?.filePath || "";
     if (filePath && filePath !== "auto-detect") {
-      const sourceFile = join7(this.projectPath, filePath);
-      if (existsSync7(sourceFile)) {
+      const sourceFile = join8(this.projectPath, filePath);
+      if (existsSync8(sourceFile)) {
         sourceCode = readFileSync4(sourceFile, "utf-8");
       }
     }
@@ -1555,6 +1759,7 @@ ${sourceCode.substring(0, 3000)}
       for (const msg of pendingMessages) {
         this.persistence.saveChatMessage(projectId, chatId, msg);
       }
+      this.syncStashesFromDisk(projectId);
     } catch (err) {
       this.broadcast({
         type: "ai_stream",
@@ -1566,6 +1771,25 @@ ${sourceCode.substring(0, 3000)}
       killAiProcess("chat");
     }
   }
+  syncStashesFromDisk(projectId) {
+    const diskStashes = this.persistence.listStashes(projectId);
+    for (const stash of diskStashes) {
+      this.broadcast({
+        type: "stash:status",
+        stashId: stash.id,
+        status: stash.status,
+        number: stash.number
+      });
+      if (stash.screenshotUrl) {
+        this.broadcast({
+          type: "stash:screenshot",
+          stashId: stash.id,
+          url: stash.screenshotUrl,
+          screenshots: stash.screenshots?.length ? [...stash.screenshots] : undefined
+        });
+      }
+    }
+  }
   progressToBroadcast(event) {
     switch (event.type) {
       case "generating":
@@ -1578,7 +1802,12 @@ ${sourceCode.substring(0, 3000)}
           ..."number" in event ? { number: event.number } : {}
         });
         if (event.type === "ready" && "screenshotPath" in event && event.screenshotPath) {
-          this.broadcast({ type: "stash:screenshot", stashId: event.stashId, url: event.screenshotPath });
+          this.broadcast({
+            type: "stash:screenshot",
+            stashId: event.stashId,
+            url: event.screenshotPath,
+            screenshots: "screenshots" in event ? event.screenshots : undefined
+          });
         }
         break;
       case "error":
@@ -1592,6 +1821,7 @@ ${sourceCode.substring(0, 3000)}
     }
   }
   async generate(projectId, prompt, stashCount = DEFAULT_STASH_COUNT, referenceStashIds) {
+    const settings = this.persistence.getProjectSettings(projectId);
     let enrichedPrompt = prompt;
     if (referenceStashIds?.length) {
       const refDescriptions = referenceStashIds.map((id) => this.persistence.getStash(projectId, id)).filter(Boolean).map((s) => `- "${s.prompt}"${s.componentPath ? ` (${s.componentPath})` : ""}`);
@@ -1609,14 +1839,27 @@ ${refDescriptions.join(`
       prompt: enrichedPrompt,
       component: this.selectedComponent ? { filePath: this.selectedComponent.filePath, exportName: this.selectedComponent.name } : undefined,
       count: stashCount,
+      screenshotModel: settings.screenshotModel,
+      screenshotTimeout: settings.screenshotTimeout,
       onProgress: (event) => this.progressToBroadcast(event)
     });
   }
   async vary(sourceStashId, prompt) {
+    let projectId = "";
+    for (const project of this.persistence.listProjects()) {
+      const stashes = this.persistence.listStashes(project.id);
+      if (stashes.find((s) => s.id === sourceStashId)) {
+        projectId = project.id;
+        break;
+      }
+    }
+    const settings = projectId ? this.persistence.getProjectSettings(projectId) : {};
     await vary({
       projectPath: this.projectPath,
       sourceStashId,
       prompt,
+      screenshotModel: settings.screenshotModel,
+      screenshotTimeout: settings.screenshotTimeout,
       onProgress: (event) => this.progressToBroadcast(event)
     });
   }
@@ -1730,115 +1973,93 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
 }
 
 // ../server/dist/services/app-proxy.js
+import { spawn as spawn5 } from "child_process";
 function startAppProxy(userDevPort, proxyPort, injectOverlay) {
-  const upstreamOrigin = `http://localhost:${userDevPort}`;
-  const proxyOrigin = `http://localhost:${proxyPort}`;
-  const server = Bun.serve({
-    port: proxyPort,
-    async fetch(req, server2) {
-      if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
-        const url2 = new URL(req.url);
-        const success = server2.upgrade(req, {
-          data: {
-            path: url2.pathname + url2.search,
-            upstream: null,
-            ready: false,
-            buffer: []
-          }
-        });
-        return success ? undefined : new Response("WebSocket upgrade failed", { status: 400 });
-      }
-      const url = new URL(req.url);
-      const targetUrl = `http://localhost:${userDevPort}${url.pathname}${url.search}`;
-      try {
-        const headers = new Headers;
-        for (const [key, value] of req.headers.entries()) {
-          if (!["host", "accept-encoding"].includes(key.toLowerCase())) {
-            headers.set(key, value);
-          }
-        }
-        headers.set("host", `localhost:${userDevPort}`);
-        const response = await fetch(targetUrl, {
-          method: req.method,
-          headers,
-          body: req.method !== "GET" && req.method !== "HEAD" ? await req.arrayBuffer() : undefined,
-          redirect: "manual"
-        });
-        const contentType = response.headers.get("content-type") || "";
-        const respHeaders = new Headers(response.headers);
-        if (response.status >= 300 && response.status < 400) {
-          const location = respHeaders.get("location");
-          if (location?.startsWith(upstreamOrigin)) {
-            respHeaders.set("location", proxyOrigin + location.substring(upstreamOrigin.length));
-          }
-        }
-        if (contentType.includes("text/html")) {
-          const html = await response.text();
-          const injectedHtml = injectOverlay(html, userDevPort, proxyPort);
-          respHeaders.delete("content-encoding");
-          respHeaders.delete("content-length");
-          return new Response(injectedHtml, {
-            status: response.status,
-            headers: respHeaders
-          });
-        }
-        respHeaders.delete("content-encoding");
-        return new Response(response.body, {
-          status: response.status,
-          headers: respHeaders
-        });
-      } catch (err) {
-        return new Response(JSON.stringify({ error: "Proxy failed", detail: String(err) }), {
-          status: 502,
-          headers: { "content-type": "application/json" }
-        });
-      }
-    },
-    websocket: {
-      open(ws) {
-        const { data } = ws;
-        const upstream = new WebSocket(`ws://localhost:${userDevPort}${data.path}`);
-        upstream.addEventListener("open", () => {
-          data.upstream = upstream;
-          data.ready = true;
-          for (const msg of data.buffer) {
-            upstream.send(msg);
-          }
-          data.buffer = [];
-        });
-        upstream.addEventListener("message", (event) => {
-          try {
-            ws.sendText(typeof event.data === "string" ? event.data : String(event.data));
-          } catch {}
-        });
-        upstream.addEventListener("close", () => {
-          try {
-            ws.close();
-          } catch {}
-        });
-        upstream.addEventListener("error", () => {
-          try {
-            ws.close();
-          } catch {}
-        });
-      },
-      message(ws, msg) {
-        const { data } = ws;
-        if (data.ready && data.upstream) {
-          data.upstream.send(typeof msg === "string" ? msg : new Uint8Array(msg));
-        } else {
-          data.buffer.push(typeof msg === "string" ? msg : new Uint8Array(msg).buffer);
+  const overlayScript = injectOverlay("", userDevPort, proxyPort);
+  const overlayEscaped = JSON.stringify(overlayScript);
+  const proxyScript = `
+const http = require('http');
+const net = require('net');
+const zlib = require('zlib');
+const UPSTREAM = ${userDevPort};
+const OVERLAY = ${overlayEscaped};
+
+const server = http.createServer((clientReq, clientRes) => {
+  const opts = {
+    hostname: 'localhost',
+    port: UPSTREAM,
+    path: clientReq.url,
+    method: clientReq.method,
+    headers: clientReq.headers,
+  };
+  const proxyReq = http.request(opts, (proxyRes) => {
+    const ct = proxyRes.headers['content-type'] || '';
+    if (ct.includes('text/html')) {
+      // Buffer HTML to inject overlay
+      const chunks = [];
+      proxyRes.on('data', c => chunks.push(c));
+      proxyRes.on('end', () => {
+        let html = Buffer.concat(chunks);
+        const enc = proxyRes.headers['content-encoding'];
+        // Decompress if needed
+        if (enc === 'gzip') {
+          try { html = zlib.gunzipSync(html); } catch {}
+        } else if (enc === 'br') {
+          try { html = zlib.brotliDecompressSync(html); } catch {}
+        } else if (enc === 'deflate') {
+          try { html = zlib.inflateSync(html); } catch {}
         }
-      },
-      close(ws) {
-        try {
-          ws.data.upstream?.close();
-        } catch {}
-      }
+        const hdrs = { ...proxyRes.headers };
+        delete hdrs['content-length'];
+        delete hdrs['content-encoding'];
+        delete hdrs['transfer-encoding'];
+        clientRes.writeHead(proxyRes.statusCode, hdrs);
+        clientRes.write(html);
+        clientRes.end(OVERLAY);
+      });
+    } else {
+      // Non-HTML: stream through unchanged
+      clientRes.writeHead(proxyRes.statusCode, proxyRes.headers);
+      proxyRes.pipe(clientRes);
     }
+    proxyRes.on('error', () => clientRes.end());
   });
-  logger.info("proxy", `App proxy at http://localhost:${proxyPort} \u2192 http://localhost:${userDevPort}`);
-  return server;
+  proxyReq.on('error', () => { try { clientRes.writeHead(502); clientRes.end(); } catch {} });
+  clientReq.pipe(proxyReq);
+});
+
+// WebSocket upgrades: raw TCP pipe
+server.on('upgrade', (req, socket, head) => {
+  const upstream = net.createConnection(UPSTREAM, 'localhost', () => {
+    const lines = [req.method + ' ' + req.url + ' HTTP/1.1'];
+    for (const [k, v] of Object.entries(req.headers)) {
+      lines.push(k + ': ' + (Array.isArray(v) ? v.join(', ') : v));
+    }
+    upstream.write(lines.join('\\r\\n') + '\\r\\n\\r\\n');
+    if (head.length) upstream.write(head);
+    socket.pipe(upstream);
+    upstream.pipe(socket);
+  });
+  upstream.on('error', () => socket.destroy());
+  socket.on('error', () => upstream.destroy());
+});
+
+server.listen(${proxyPort}, () => {
+  if (process.send) process.send('ready');
+});
+`;
+  const child = spawn5("node", ["-e", proxyScript], {
+    stdio: ["ignore", "inherit", "inherit", "ipc"]
+  });
+  child.on("error", (err) => {
+    logger.error("proxy", `Failed to start proxy: ${err.message}`);
+  });
+  child.on("message", (msg) => {
+    if (msg === "ready") {
+      logger.info("proxy", `App proxy at http://localhost:${proxyPort} \u2192 http://localhost:${userDevPort}`);
+    }
+  });
+  return child;
 }
 
 // ../server/dist/index.js
@@ -1855,12 +2076,12 @@ app2.route("/api", apiRoutes);
 app2.get("/*", async (c) => {
   const path = c.req.path;
   const selfDir = dirname2(fileURLToPath(import.meta.url));
-  const bundledWebDir = join8(selfDir, "web");
-  const monorepoWebDir = join8(selfDir, "../../web/dist");
-  const webDistDir = existsSync8(join8(bundledWebDir, "index.html")) ? bundledWebDir : monorepoWebDir;
+  const bundledWebDir = join9(selfDir, "web");
+  const monorepoWebDir = join9(selfDir, "../../web/dist");
+  const webDistDir = existsSync9(join9(bundledWebDir, "index.html")) ? bundledWebDir : monorepoWebDir;
   const requestPath = path === "/" ? "/index.html" : path;
-  const filePath = join8(webDistDir, requestPath);
-  if (existsSync8(filePath) && !filePath.includes("..")) {
+  const filePath = join9(webDistDir, requestPath);
+  if (existsSync9(filePath) && !filePath.includes("..")) {
     const content = readFileSync5(filePath);
     const ext = filePath.split(".").pop() || "";
     const contentTypes = {
@@ -1879,8 +2100,8 @@ app2.get("/*", async (c) => {
       headers: { "content-type": contentTypes[ext] || "application/octet-stream" }
     });
   }
-  const indexPath = join8(webDistDir, "index.html");
-  if (existsSync8(indexPath)) {
+  const indexPath = join9(webDistDir, "index.html");
+  if (existsSync9(indexPath)) {
     const html = readFileSync5(indexPath, "utf-8");
     return new Response(html, {
       headers: { "content-type": "text/html; charset=utf-8" }
@@ -1916,7 +2137,7 @@ function startServer(projectPath, userDevPort, port = STASHES_PORT) {
   logger.info("server", `Project: ${projectPath}`);
   return server;
 }
-function injectOverlayScript(html, upstreamPort, proxyPort) {
+function injectOverlayScript(html, _upstreamPort, _proxyPort) {
   const overlayScript = `
 <script data-stashes-overlay>
 (function() {
@@ -1924,35 +2145,6 @@ function injectOverlayScript(html, upstreamPort, proxyPort) {
   var pickerEnabled = false;
   var precisionMode = false;
 
-  // Rewrite cross-origin requests to the upstream dev server through the proxy
-  var upstreamOrigin = 'http://localhost:${upstreamPort}';
-  var proxyOrigin = window.location.origin;
-  if (proxyOrigin !== upstreamOrigin) {
-    function rewriteUrl(url) {
-      if (typeof url === 'string' && (url.startsWith(upstreamOrigin + '/') || url === upstreamOrigin)) {
-        return proxyOrigin + url.substring(upstreamOrigin.length);
-      }
-      return url;
-    }
-    var origFetch = window.fetch;
-    window.fetch = function(input, init) {
-      if (typeof input === 'string') {
-        input = rewriteUrl(input);
-      } else if (input instanceof Request) {
-        var rewritten = rewriteUrl(input.url);
-        if (rewritten !== input.url) { input = new Request(rewritten, input); }
-      }
-      return origFetch.call(window, input, init);
-    };
-    var origXhrOpen = XMLHttpRequest.prototype.open;
-    XMLHttpRequest.prototype.open = function() {
-      if (arguments.length >= 2 && typeof arguments[1] === 'string') {
-        arguments[1] = rewriteUrl(arguments[1]);
-      }
-      return origXhrOpen.apply(this, arguments);
-    };
-  }
-
   function createOverlay() {
     var overlay = document.createElement('div');
     overlay.id = 'stashes-highlight';
@@ -1966,13 +2158,18 @@ function injectOverlayScript(html, upstreamPort, proxyPort) {
   }
 
   var SEMANTIC_TAGS = ['header','nav','main','section','article','aside','footer','form','dialog'];
+  var LEAF_TAGS = ['h1','h2','h3','h4','h5','h6','p','button','a','input','textarea','select','img','svg','video','label','li','td','th','figcaption','blockquote','pre','code','span'];
 
   function findTarget(el, precise) {
     if (precise) return el;
+    // If the element itself is a meaningful leaf, select it directly
+    var elTag = el.tagName ? el.tagName.toLowerCase() : '';
+    if (LEAF_TAGS.indexOf(elTag) !== -1) return el;
     var current = el;
     var best = el;
     while (current && current !== document.body) {
       var tag = current.tagName.toLowerCase();
+      if (LEAF_TAGS.indexOf(tag) !== -1) { best = current; break; }
       if (SEMANTIC_TAGS.indexOf(tag) !== -1) { best = current; break; }
       if (current.id) { best = current; break; }
       if (current.getAttribute('role')) { best = current; break; }
@@ -2123,11 +2320,11 @@ function injectOverlayScript(html, upstreamPort, proxyPort) {
 }
 
 // ../server/dist/services/detector.js
-import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
+import { join as join10 } from "path";
 function detectFramework(projectPath) {
-  const packageJsonPath = join9(projectPath, "package.json");
-  if (!existsSync9(packageJsonPath)) {
+  const packageJsonPath = join10(projectPath, "package.json");
+  if (!existsSync10(packageJsonPath)) {
     return {
       framework: "unknown",
       devCommand: "npm run dev",
@@ -2189,7 +2386,7 @@ function getDevCommand(packageJson, fallback) {
 }
 function findConfig(projectPath, candidates) {
   for (const candidate of candidates) {
-    if (existsSync9(join9(projectPath, candidate))) {
+    if (existsSync10(join10(projectPath, candidate))) {
       return candidate;
     }
   }
@@ -2378,8 +2575,8 @@ Cleaning up all stashes and worktrees...`);
 }
 
 // src/commands/setup.ts
-import { existsSync as existsSync10, readFileSync as readFileSync7, writeFileSync as writeFileSync2, mkdirSync as mkdirSync4 } from "fs";
-import { dirname as dirname3, join as join10 } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync7, writeFileSync as writeFileSync2, mkdirSync as mkdirSync5 } from "fs";
+import { dirname as dirname3, join as join11 } from "path";
 import { homedir } from "os";
 import * as p from "@clack/prompts";
 import pc from "picocolors";
@@ -2398,60 +2595,60 @@ var MCP_ENTRY_ZED = {
 };
 function buildToolDefinitions() {
   const home = homedir();
-  const appSupport = join10(home, "Library", "Application Support");
+  const appSupport = join11(home, "Library", "Application Support");
   return [
     {
       id: "claude-code",
       name: "Claude Code",
-      configPath: join10(home, ".claude.json"),
+      configPath: join11(home, ".claude.json"),
       serversKey: "mcpServers",
       format: "standard",
-      detect: () => existsSync10(join10(home, ".claude.json")) || existsSync10(join10(home, ".claude"))
+      detect: () => existsSync11(join11(home, ".claude.json")) || existsSync11(join11(home, ".claude"))
     },
     {
       id: "claude-desktop",
       name: "Claude Desktop",
-      configPath: join10(appSupport, "Claude", "claude_desktop_config.json"),
+      configPath: join11(appSupport, "Claude", "claude_desktop_config.json"),
       serversKey: "mcpServers",
       format: "standard",
-      detect: () => existsSync10(join10(appSupport, "Claude")) || existsSync10("/Applications/Claude.app")
+      detect: () => existsSync11(join11(appSupport, "Claude")) || existsSync11("/Applications/Claude.app")
     },
     {
       id: "vscode",
       name: "VS Code",
-      configPath: join10(appSupport, "Code", "User", "mcp.json"),
+      configPath: join11(appSupport, "Code", "User", "mcp.json"),
       serversKey: "servers",
       format: "standard",
-      detect: () => existsSync10(join10(appSupport, "Code", "User"))
+      detect: () => existsSync11(join11(appSupport, "Code", "User"))
     },
     {
       id: "cursor",
       name: "Cursor",
-      configPath: join10(home, ".cursor", "mcp.json"),
+      configPath: join11(home, ".cursor", "mcp.json"),
       serversKey: "mcpServers",
       format: "standard",
-      detect: () => existsSync10(join10(home, ".cursor"))
+      detect: () => existsSync11(join11(home, ".cursor"))
     },
     {
       id: "windsurf",
       name: "Windsurf",
-      configPath: join10(home, ".codeium", "windsurf", "mcp_config.json"),
+      configPath: join11(home, ".codeium", "windsurf", "mcp_config.json"),
       serversKey: "mcpServers",
       format: "standard",
-      detect: () => existsSync10(join10(home, ".codeium", "windsurf"))
+      detect: () => existsSync11(join11(home, ".codeium", "windsurf"))
     },
     {
       id: "zed",
       name: "Zed",
-      configPath: join10(appSupport, "Zed", "settings.json"),
+      configPath: join11(appSupport, "Zed", "settings.json"),
       serversKey: "context_servers",
       format: "zed",
-      detect: () => existsSync10(join10(appSupport, "Zed"))
+      detect: () => existsSync11(join11(appSupport, "Zed"))
     }
   ];
 }
 function readJsonFile(path) {
-  if (!existsSync10(path))
+  if (!existsSync11(path))
     return {};
   try {
     const raw = readFileSync7(path, "utf-8").trim();
@@ -2463,7 +2660,7 @@ function readJsonFile(path) {
   }
 }
 function writeJsonFile(path, data) {
-  mkdirSync4(dirname3(path), { recursive: true });
+  mkdirSync5(dirname3(path), { recursive: true });
   writeFileSync2(path, JSON.stringify(data, null, 2) + `
 `);
 }
@@ -2604,13 +2801,13 @@ async function setupCommand(options) {
 import { execFileSync, execSync } from "child_process";
 import { writeFileSync as writeFileSync3, unlinkSync, chmodSync, readFileSync as readFileSync8 } from "fs";
 import { tmpdir } from "os";
-import { join as join11, dirname as dirname4 } from "path";
+import { join as join12, dirname as dirname4 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import * as p2 from "@clack/prompts";
 import pc2 from "picocolors";
 function getCurrentVersion() {
   const selfDir = dirname4(fileURLToPath2(import.meta.url));
-  const pkgPath = join11(selfDir, "..", "package.json");
+  const pkgPath = join12(selfDir, "..", "package.json");
   return JSON.parse(readFileSync8(pkgPath, "utf-8")).version;
 }
 function fetchLatestVersion() {
@@ -2687,7 +2884,7 @@ async function updateCommand() {
     }
     s.stop(`Removed from ${configuredTools.length} tool${configuredTools.length === 1 ? "" : "s"}`);
   }
-  const scriptPath = join11(tmpdir(), `stashes-update-${Date.now()}.sh`);
+  const scriptPath = join12(tmpdir(), `stashes-update-${Date.now()}.sh`);
   writeFileSync3(scriptPath, buildUpdateScript(), "utf-8");
   chmodSync(scriptPath, 493);
   try {
@@ -2706,7 +2903,7 @@ Update failed. Try manually:`);
 
 // src/index.ts
 var selfDir = dirname5(fileURLToPath3(import.meta.url));
-var pkgPath = join12(selfDir, "..", "package.json");
+var pkgPath = join13(selfDir, "..", "package.json");
 var version = JSON.parse(readFileSync9(pkgPath, "utf-8")).version;
 var program = new Command;
 program.name("stashes").description("Generate AI-powered UI design explorations in your project").version(version, "-v, --version");