stashes 0.1.28 → 0.1.30

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,
@@ -1537,7 +1543,10 @@ class StashService {
   selectedComponent = null;
   messageQueue = [];
   isProcessingMessage = false;
+  activeChatId = null;
   chatSessions = new Map;
+  stashPollTimer = null;
+  knownStashIds = new Set;
   constructor(projectPath, worktreeManager, persistence, broadcast) {
     this.projectPath = projectPath;
     this.worktreeManager = worktreeManager;
@@ -1545,6 +1554,9 @@ class StashService {
     this.broadcast = broadcast;
     this.previewPool = new PreviewPool(worktreeManager, broadcast);
   }
+  getActiveChatId() {
+    return this.activeChatId;
+  }
   setSelectedComponent(component) {
     this.selectedComponent = component;
     if (component.filePath === "auto-detect") {
@@ -1599,8 +1611,10 @@ class StashService {
     this.isProcessingMessage = true;
     while (this.messageQueue.length > 0) {
       const msg = this.messageQueue.shift();
+      this.activeChatId = msg.chatId;
       await this.processMessage(msg.projectId, msg.chatId, msg.message, msg.referenceStashIds, msg.componentContext);
     }
+    this.activeChatId = null;
     this.isProcessingMessage = false;
   }
   async processMessage(projectId, chatId, message, referenceStashIds, componentContext) {
@@ -1660,20 +1674,22 @@ ${sourceCode.substring(0, 3000)}
     const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath, existingSessionId);
     let thinkingBuf = "";
     let textBuf = "";
-    const pendingMessages = [];
     const now = new Date().toISOString();
-    function flushThinking() {
+    const save = (msg) => {
+      this.persistence.saveChatMessage(projectId, chatId, msg);
+    };
+    const flushThinking = () => {
       if (!thinkingBuf)
         return;
-      pendingMessages.push({ id: crypto.randomUUID(), role: "assistant", content: thinkingBuf, type: "thinking", createdAt: now });
+      save({ id: crypto.randomUUID(), role: "assistant", content: thinkingBuf, type: "thinking", createdAt: now });
       thinkingBuf = "";
-    }
-    function flushText() {
+    };
+    const flushText = () => {
       if (!textBuf)
         return;
-      pendingMessages.push({ id: crypto.randomUUID(), role: "assistant", content: textBuf, type: "text", createdAt: now });
+      save({ id: crypto.randomUUID(), role: "assistant", content: textBuf, type: "text", createdAt: now });
       textBuf = "";
-    }
+    };
     try {
       for await (const chunk of parseClaudeStream(aiProcess.process)) {
         if (chunk.type === "session_id" && chunk.sessionId) {
@@ -1707,7 +1723,7 @@ ${sourceCode.substring(0, 3000)}
             toolName = parsed.tool ?? "unknown";
             toolParams = parsed.input ?? {};
           } catch {}
-          pendingMessages.push({
+          save({
             id: crypto.randomUUID(),
             role: "assistant",
             content: chunk.content,
@@ -1726,7 +1742,11 @@ ${sourceCode.substring(0, 3000)}
             toolParams,
             toolStatus: "running"
           });
+          if (toolName.includes("stashes_generate") || toolName.includes("stashes_vary")) {
+            this.startStashPoll(projectId, chatId);
+          }
         } else if (chunk.type === "tool_result") {
+          this.stopStashPoll();
           let toolResult = chunk.content;
           let isError = false;
           try {
@@ -1734,7 +1754,7 @@ ${sourceCode.substring(0, 3000)}
             toolResult = parsed.result ?? chunk.content;
             isError = !!parsed.is_error;
           } catch {}
-          pendingMessages.push({
+          save({
             id: crypto.randomUUID(),
             role: "assistant",
             content: chunk.content,
@@ -1756,10 +1776,7 @@ ${sourceCode.substring(0, 3000)}
       await aiProcess.process.exited;
       flushThinking();
       flushText();
-      for (const msg of pendingMessages) {
-        this.persistence.saveChatMessage(projectId, chatId, msg);
-      }
-      this.syncStashesFromDisk(projectId);
+      this.syncStashesFromDisk(projectId, chatId);
     } catch (err) {
       this.broadcast({
         type: "ai_stream",
@@ -1768,12 +1785,16 @@ ${sourceCode.substring(0, 3000)}
         source: "chat"
       });
     } finally {
+      this.stopStashPoll();
       killAiProcess("chat");
     }
   }
-  syncStashesFromDisk(projectId) {
+  syncStashesFromDisk(projectId, chatId) {
     const diskStashes = this.persistence.listStashes(projectId);
     for (const stash of diskStashes) {
+      if (chatId && !stash.originChatId) {
+        this.persistence.saveStash({ ...stash, originChatId: chatId });
+      }
       this.broadcast({
         type: "stash:status",
         stashId: stash.id,
@@ -1788,6 +1809,48 @@ ${sourceCode.substring(0, 3000)}
           screenshots: stash.screenshots?.length ? [...stash.screenshots] : undefined
         });
       }
+      this.knownStashIds.add(stash.id);
+    }
+  }
+  startStashPoll(projectId, chatId) {
+    this.stopStashPoll();
+    const lastStatus = new Map;
+    for (const s of this.persistence.listStashes(projectId)) {
+      this.knownStashIds.add(s.id);
+      lastStatus.set(s.id, s.status);
+    }
+    this.stashPollTimer = setInterval(() => {
+      const stashes = this.persistence.listStashes(projectId);
+      for (const stash of stashes) {
+        const prev = lastStatus.get(stash.id);
+        if (!prev || prev !== stash.status) {
+          if (chatId && !stash.originChatId) {
+            this.persistence.saveStash({ ...stash, originChatId: chatId });
+          }
+          this.broadcast({
+            type: "stash:status",
+            stashId: stash.id,
+            status: stash.status,
+            number: stash.number
+          });
+          if (stash.screenshotUrl && prev !== stash.status) {
+            this.broadcast({
+              type: "stash:screenshot",
+              stashId: stash.id,
+              url: stash.screenshotUrl,
+              screenshots: stash.screenshots?.length ? [...stash.screenshots] : undefined
+            });
+          }
+          lastStatus.set(stash.id, stash.status);
+          this.knownStashIds.add(stash.id);
+        }
+      }
+    }, 2000);
+  }
+  stopStashPoll() {
+    if (this.stashPollTimer) {
+      clearInterval(this.stashPollTimer);
+      this.stashPollTimer = null;
     }
   }
   progressToBroadcast(event) {
@@ -1914,6 +1977,10 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
         projectId: project.id,
         projectName: project.name
       }));
+      const activeChatId = stashService.getActiveChatId();
+      if (activeChatId) {
+        ws.send(JSON.stringify({ type: "processing", chatId: activeChatId }));
+      }
     },
     async message(ws, message) {
       const raw = typeof message === "string" ? message : new TextDecoder().decode(message);

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,
@@ -1733,7 +1739,10 @@ class StashService {
   selectedComponent = null;
   messageQueue = [];
   isProcessingMessage = false;
+  activeChatId = null;
   chatSessions = new Map;
+  stashPollTimer = null;
+  knownStashIds = new Set;
   constructor(projectPath, worktreeManager, persistence, broadcast) {
     this.projectPath = projectPath;
     this.worktreeManager = worktreeManager;
@@ -1741,6 +1750,9 @@ class StashService {
     this.broadcast = broadcast;
     this.previewPool = new PreviewPool(worktreeManager, broadcast);
   }
+  getActiveChatId() {
+    return this.activeChatId;
+  }
   setSelectedComponent(component) {
     this.selectedComponent = component;
     if (component.filePath === "auto-detect") {
@@ -1795,8 +1807,10 @@ class StashService {
     this.isProcessingMessage = true;
     while (this.messageQueue.length > 0) {
       const msg = this.messageQueue.shift();
+      this.activeChatId = msg.chatId;
       await this.processMessage(msg.projectId, msg.chatId, msg.message, msg.referenceStashIds, msg.componentContext);
     }
+    this.activeChatId = null;
     this.isProcessingMessage = false;
   }
   async processMessage(projectId, chatId, message, referenceStashIds, componentContext) {
@@ -1856,20 +1870,22 @@ ${sourceCode.substring(0, 3000)}
     const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath, existingSessionId);
     let thinkingBuf = "";
     let textBuf = "";
-    const pendingMessages = [];
     const now = new Date().toISOString();
-    function flushThinking() {
+    const save = (msg) => {
+      this.persistence.saveChatMessage(projectId, chatId, msg);
+    };
+    const flushThinking = () => {
       if (!thinkingBuf)
         return;
-      pendingMessages.push({ id: crypto.randomUUID(), role: "assistant", content: thinkingBuf, type: "thinking", createdAt: now });
+      save({ id: crypto.randomUUID(), role: "assistant", content: thinkingBuf, type: "thinking", createdAt: now });
       thinkingBuf = "";
-    }
-    function flushText() {
+    };
+    const flushText = () => {
       if (!textBuf)
         return;
-      pendingMessages.push({ id: crypto.randomUUID(), role: "assistant", content: textBuf, type: "text", createdAt: now });
+      save({ id: crypto.randomUUID(), role: "assistant", content: textBuf, type: "text", createdAt: now });
       textBuf = "";
-    }
+    };
     try {
       for await (const chunk of parseClaudeStream(aiProcess.process)) {
         if (chunk.type === "session_id" && chunk.sessionId) {
@@ -1903,7 +1919,7 @@ ${sourceCode.substring(0, 3000)}
             toolName = parsed.tool ?? "unknown";
             toolParams = parsed.input ?? {};
           } catch {}
-          pendingMessages.push({
+          save({
             id: crypto.randomUUID(),
             role: "assistant",
             content: chunk.content,
@@ -1922,7 +1938,11 @@ ${sourceCode.substring(0, 3000)}
             toolParams,
             toolStatus: "running"
           });
+          if (toolName.includes("stashes_generate") || toolName.includes("stashes_vary")) {
+            this.startStashPoll(projectId, chatId);
+          }
         } else if (chunk.type === "tool_result") {
+          this.stopStashPoll();
           let toolResult = chunk.content;
           let isError = false;
           try {
@@ -1930,7 +1950,7 @@ ${sourceCode.substring(0, 3000)}
             toolResult = parsed.result ?? chunk.content;
             isError = !!parsed.is_error;
           } catch {}
-          pendingMessages.push({
+          save({
             id: crypto.randomUUID(),
             role: "assistant",
             content: chunk.content,
@@ -1952,10 +1972,7 @@ ${sourceCode.substring(0, 3000)}
       await aiProcess.process.exited;
       flushThinking();
       flushText();
-      for (const msg of pendingMessages) {
-        this.persistence.saveChatMessage(projectId, chatId, msg);
-      }
-      this.syncStashesFromDisk(projectId);
+      this.syncStashesFromDisk(projectId, chatId);
     } catch (err) {
       this.broadcast({
         type: "ai_stream",
@@ -1964,12 +1981,16 @@ ${sourceCode.substring(0, 3000)}
         source: "chat"
       });
     } finally {
+      this.stopStashPoll();
       killAiProcess("chat");
     }
   }
-  syncStashesFromDisk(projectId) {
+  syncStashesFromDisk(projectId, chatId) {
     const diskStashes = this.persistence.listStashes(projectId);
     for (const stash of diskStashes) {
+      if (chatId && !stash.originChatId) {
+        this.persistence.saveStash({ ...stash, originChatId: chatId });
+      }
       this.broadcast({
         type: "stash:status",
         stashId: stash.id,
@@ -1984,6 +2005,48 @@ ${sourceCode.substring(0, 3000)}
           screenshots: stash.screenshots?.length ? [...stash.screenshots] : undefined
         });
       }
+      this.knownStashIds.add(stash.id);
+    }
+  }
+  startStashPoll(projectId, chatId) {
+    this.stopStashPoll();
+    const lastStatus = new Map;
+    for (const s of this.persistence.listStashes(projectId)) {
+      this.knownStashIds.add(s.id);
+      lastStatus.set(s.id, s.status);
+    }
+    this.stashPollTimer = setInterval(() => {
+      const stashes = this.persistence.listStashes(projectId);
+      for (const stash of stashes) {
+        const prev = lastStatus.get(stash.id);
+        if (!prev || prev !== stash.status) {
+          if (chatId && !stash.originChatId) {
+            this.persistence.saveStash({ ...stash, originChatId: chatId });
+          }
+          this.broadcast({
+            type: "stash:status",
+            stashId: stash.id,
+            status: stash.status,
+            number: stash.number
+          });
+          if (stash.screenshotUrl && prev !== stash.status) {
+            this.broadcast({
+              type: "stash:screenshot",
+              stashId: stash.id,
+              url: stash.screenshotUrl,
+              screenshots: stash.screenshots?.length ? [...stash.screenshots] : undefined
+            });
+          }
+          lastStatus.set(stash.id, stash.status);
+          this.knownStashIds.add(stash.id);
+        }
+      }
+    }, 2000);
+  }
+  stopStashPoll() {
+    if (this.stashPollTimer) {
+      clearInterval(this.stashPollTimer);
+      this.stashPollTimer = null;
     }
   }
   progressToBroadcast(event) {
@@ -2110,6 +2173,10 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
         projectId: project.id,
         projectName: project.name
       }));
+      const activeChatId = stashService.getActiveChatId();
+      if (activeChatId) {
+        ws.send(JSON.stringify({ type: "processing", chatId: activeChatId }));
+      }
     },
     async message(ws, message) {
       const raw = typeof message === "string" ? message : new TextDecoder().decode(message);