stashes 0.1.29 → 0.1.31

package/dist/cli.js

@@ -247,6 +247,10 @@ class WorktreeManager {
       const { readdirSync } = await import("fs");
       const entries = readdirSync(worktreesDir);
       for (const entry of entries) {
+        if (entry.startsWith("screenshot-")) {
+          logger.info("worktree", `skipping active screenshot worktree: ${entry}`);
+          continue;
+        }
         const worktreePath = join3(worktreesDir, entry);
         logger.info("worktree", `cleaning up stale worktree: ${entry}`);
         try {
@@ -896,6 +900,20 @@ function parseAiResult(text) {
     return null;
   }
 }
+async function fallbackScreenshot(port, projectPath, stashId) {
+  try {
+    const url = await captureScreenshot(port, projectPath, stashId);
+    return {
+      primary: url,
+      screenshots: [{ url, label: "Homepage", route: "/", isPrimary: true }]
+    };
+  } catch (err) {
+    logger.error("smart-screenshot", `Fallback screenshot also failed for ${stashId}`, {
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return { primary: "", screenshots: [] };
+  }
+}
 async function captureSmartScreenshots(opts) {
   const { projectPath, stashId, stashBranch, parentBranch, worktreePath, port, model = "haiku", timeout = DEFAULT_TIMEOUT } = opts;
   const screenshotDir = join6(projectPath, SCREENSHOTS_DIR2);
@@ -905,11 +923,7 @@ async function captureSmartScreenshots(opts) {
   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 }]
-    };
+    return fallbackScreenshot(port, projectPath, stashId);
   }
   const processId = `screenshot-ai-${stashId}`;
   const prompt = buildScreenshotPrompt(port, diff, screenshotDir, stashId);
@@ -939,12 +953,8 @@ async function captureSmartScreenshots(opts) {
   }
   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 }]
-    };
+    logger.info("smart-screenshot", `AI returned no screenshots for ${stashId} (timedOut=${timedOut}), falling back`);
+    return fallbackScreenshot(port, projectPath, stashId);
   }
   const screenshots = [];
   let primaryUrl = "";
@@ -967,11 +977,7 @@ async function captureSmartScreenshots(opts) {
   }
   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 }]
-    };
+    return fallbackScreenshot(port, projectPath, stashId);
   }
   if (!primaryUrl) {
     primaryUrl = screenshots[0].url;
@@ -1120,7 +1126,7 @@ async function generate(opts) {
       const port = await allocatePort();
       const worktree = await worktreeManager.createForGeneration(`screenshot-${stash.id}`);
       const screenshotGit = simpleGit3(worktree.path);
-      await screenshotGit.checkout(["-f", stash.branch]);
+      await screenshotGit.checkout(["--detach", stash.branch]);
       const devServer = spawn3({
         cmd: ["npm", "run", "dev"],
         cwd: worktree.path,
@@ -1255,7 +1261,7 @@ async function vary(opts) {
       const port = await allocatePort2();
       const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
       const screenshotGit = simpleGit4(screenshotWorktree.path);
-      await screenshotGit.checkout(["-f", stash.branch]);
+      await screenshotGit.checkout(["--detach", stash.branch]);
       const devServer = spawn4({
         cmd: ["npm", "run", "dev"],
         cwd: screenshotWorktree.path,
@@ -1612,6 +1618,7 @@ class StashService {
     this.isProcessingMessage = false;
   }
   async processMessage(projectId, chatId, message, referenceStashIds, componentContext) {
+    const preExistingStashIds = new Set(this.persistence.listStashes(projectId).map((s) => s.id));
     const component = componentContext ? { name: componentContext.name, filePath: this.selectedComponent?.filePath || "" } : this.selectedComponent;
     let sourceCode = "";
     const filePath = component?.filePath || "";
@@ -1770,7 +1777,7 @@ ${sourceCode.substring(0, 3000)}
       await aiProcess.process.exited;
       flushThinking();
       flushText();
-      this.syncStashesFromDisk(projectId, chatId);
+      this.syncStashesFromDisk(projectId, chatId, preExistingStashIds);
     } catch (err) {
       this.broadcast({
         type: "ai_stream",
@@ -1783,12 +1790,11 @@ ${sourceCode.substring(0, 3000)}
       killAiProcess("chat");
     }
   }
-  syncStashesFromDisk(projectId, chatId) {
+  syncStashesFromDisk(projectId, chatId, preExistingIds) {
     const diskStashes = this.persistence.listStashes(projectId);
     for (const stash of diskStashes) {
-      if (chatId && !stash.originChatId && !this.knownStashIds.has(stash.id)) {
-        const updated = { ...stash, originChatId: chatId };
-        this.persistence.saveStash(updated);
+      if (chatId && !stash.originChatId && preExistingIds && !preExistingIds.has(stash.id)) {
+        this.persistence.saveStash({ ...stash, originChatId: chatId });
       }
       this.broadcast({
         type: "stash:status",

package/dist/mcp.js

@@ -129,6 +129,10 @@ class WorktreeManager {
       const { readdirSync } = await import("fs");
       const entries = readdirSync(worktreesDir);
       for (const entry of entries) {
+        if (entry.startsWith("screenshot-")) {
+          logger.info("worktree", `skipping active screenshot worktree: ${entry}`);
+          continue;
+        }
         const worktreePath = join2(worktreesDir, entry);
         logger.info("worktree", `cleaning up stale worktree: ${entry}`);
         try {
@@ -778,6 +782,20 @@ function parseAiResult(text) {
     return null;
   }
 }
+async function fallbackScreenshot(port, projectPath, stashId) {
+  try {
+    const url = await captureScreenshot(port, projectPath, stashId);
+    return {
+      primary: url,
+      screenshots: [{ url, label: "Homepage", route: "/", isPrimary: true }]
+    };
+  } catch (err) {
+    logger.error("smart-screenshot", `Fallback screenshot also failed for ${stashId}`, {
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return { primary: "", screenshots: [] };
+  }
+}
 async function captureSmartScreenshots(opts) {
   const { projectPath, stashId, stashBranch, parentBranch, worktreePath, port, model = "haiku", timeout = DEFAULT_TIMEOUT } = opts;
   const screenshotDir = join5(projectPath, SCREENSHOTS_DIR2);
@@ -787,11 +805,7 @@ async function captureSmartScreenshots(opts) {
   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 }]
-    };
+    return fallbackScreenshot(port, projectPath, stashId);
   }
   const processId = `screenshot-ai-${stashId}`;
   const prompt = buildScreenshotPrompt(port, diff, screenshotDir, stashId);
@@ -821,12 +835,8 @@ async function captureSmartScreenshots(opts) {
   }
   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 }]
-    };
+    logger.info("smart-screenshot", `AI returned no screenshots for ${stashId} (timedOut=${timedOut}), falling back`);
+    return fallbackScreenshot(port, projectPath, stashId);
   }
   const screenshots = [];
   let primaryUrl = "";
@@ -849,11 +859,7 @@ async function captureSmartScreenshots(opts) {
   }
   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 }]
-    };
+    return fallbackScreenshot(port, projectPath, stashId);
   }
   if (!primaryUrl) {
     primaryUrl = screenshots[0].url;
@@ -1002,7 +1008,7 @@ async function generate(opts) {
       const port = await allocatePort();
       const worktree = await worktreeManager.createForGeneration(`screenshot-${stash.id}`);
       const screenshotGit = simpleGit3(worktree.path);
-      await screenshotGit.checkout(["-f", stash.branch]);
+      await screenshotGit.checkout(["--detach", stash.branch]);
       const devServer = spawn3({
         cmd: ["npm", "run", "dev"],
         cwd: worktree.path,
@@ -1137,7 +1143,7 @@ async function vary(opts) {
       const port = await allocatePort2();
       const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
       const screenshotGit = simpleGit4(screenshotWorktree.path);
-      await screenshotGit.checkout(["-f", stash.branch]);
+      await screenshotGit.checkout(["--detach", stash.branch]);
       const devServer = spawn4({
         cmd: ["npm", "run", "dev"],
         cwd: screenshotWorktree.path,
@@ -1808,6 +1814,7 @@ class StashService {
     this.isProcessingMessage = false;
   }
   async processMessage(projectId, chatId, message, referenceStashIds, componentContext) {
+    const preExistingStashIds = new Set(this.persistence.listStashes(projectId).map((s) => s.id));
     const component = componentContext ? { name: componentContext.name, filePath: this.selectedComponent?.filePath || "" } : this.selectedComponent;
     let sourceCode = "";
     const filePath = component?.filePath || "";
@@ -1966,7 +1973,7 @@ ${sourceCode.substring(0, 3000)}
       await aiProcess.process.exited;
       flushThinking();
       flushText();
-      this.syncStashesFromDisk(projectId, chatId);
+      this.syncStashesFromDisk(projectId, chatId, preExistingStashIds);
     } catch (err) {
       this.broadcast({
         type: "ai_stream",
@@ -1979,12 +1986,11 @@ ${sourceCode.substring(0, 3000)}
       killAiProcess("chat");
     }
   }
-  syncStashesFromDisk(projectId, chatId) {
+  syncStashesFromDisk(projectId, chatId, preExistingIds) {
     const diskStashes = this.persistence.listStashes(projectId);
     for (const stash of diskStashes) {
-      if (chatId && !stash.originChatId && !this.knownStashIds.has(stash.id)) {
-        const updated = { ...stash, originChatId: chatId };
-        this.persistence.saveStash(updated);
+      if (chatId && !stash.originChatId && preExistingIds && !preExistingIds.has(stash.id)) {
+        this.persistence.saveStash({ ...stash, originChatId: chatId });
       }
       this.broadcast({
         type: "stash:status",