stashes 0.2.4 → 0.2.6

package/dist/cli.js

@@ -139,7 +139,7 @@ async function prepareWorktreeDeps(worktreePath, projectPath) {
     pm = "yarn";
   if (pm === "npm")
     return;
-  const cmd = pm === "pnpm" ? ["pnpm", "install", "--frozen-lockfile", "--prefer-offline"] : pm === "bun" ? ["bun", "install", "--frozen-lockfile"] : ["yarn", "install", "--frozen-lockfile"];
+  const cmd = pm === "pnpm" ? ["pnpm", "install", "--force", "--prefer-offline"] : pm === "bun" ? ["bun", "install", "--frozen-lockfile"] : ["yarn", "install", "--frozen-lockfile"];
   logger.info("worktree", `installing deps (${pm})`, { worktreePath: worktreePath.split("/").slice(-2).join("/") });
   const proc = spawn({
     cmd,
@@ -1090,8 +1090,11 @@ async function generate(opts) {
         id: stashId,
         prompt: stashPrompt,
         cwd: worktree.path,
-        persistSession: false
+        persistSession: true
       })) {
+        if (chunk.type === "session_id" && chunk.sessionId) {
+          persistence.saveStash({ ...stash, sessionId: chunk.sessionId });
+        }
         emit(onProgress, {
           type: "ai_stream",
           stashId,
@@ -1104,12 +1107,36 @@ async function generate(opts) {
             const filePath = chunk.toolInput?.file_path ?? chunk.toolInput?.path ?? chunk.toolInput?.command ?? undefined;
             const lines = chunk.toolInput?.content ? chunk.toolInput.content.split(`
 `).length : undefined;
+            let diff;
+            if (chunk.toolName === "Write") {
+              const writeContent = chunk.toolInput?.content;
+              if (writeContent) {
+                diff = writeContent.substring(0, 5000);
+              }
+            } else if (chunk.toolName === "Edit") {
+              const oldStr = chunk.toolInput?.old_string;
+              const newStr = chunk.toolInput?.new_string;
+              if (oldStr && newStr) {
+                const oldLines = oldStr.split(`
+`).map((l) => `-${l}`).join(`
+`);
+                const newLines = newStr.split(`
+`).map((l) => `+${l}`).join(`
+`);
+                diff = `--- old
++++ new
+@@ @@
+${oldLines}
+${newLines}`.substring(0, 5000);
+              }
+            }
             emit(onProgress, {
               type: "activity",
               stashId,
               action: chunk.toolName,
               file: filePath,
               lines,
+              diff,
               timestamp: Date.now()
             });
           }
@@ -1164,7 +1191,7 @@ async function generate(opts) {
         await screenshotGit.checkout(["--detach", stash.branch]);
         await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
         const devServer = spawn3({
-          cmd: ["npm", "run", "dev", "--", "--port", String(port)],
+          cmd: ["npm", "run", "dev", "--", "--", "--port", String(port)],
           cwd: screenshotWorktree.path,
           stdin: "ignore",
           stdout: "pipe",
@@ -1292,14 +1319,73 @@ ${context}` : `The user wants to vary the current UI. Apply this change: ${promp
       id: stashId,
       prompt: varyPrompt,
       cwd: worktree.path,
-      persistSession: false
+      persistSession: true
     })) {
+      if (chunk.type === "session_id" && chunk.sessionId) {
+        persistence.saveStash({ ...stash, sessionId: chunk.sessionId });
+      }
       emit2(onProgress, {
         type: "ai_stream",
         stashId,
         content: chunk.content,
         streamType: chunk.type
       });
+      if (chunk.type === "tool_use" && chunk.toolName) {
+        const knownTools = ["Read", "Write", "Edit", "Glob", "Grep", "Bash"];
+        if (knownTools.includes(chunk.toolName)) {
+          const filePath = chunk.toolInput?.file_path ?? chunk.toolInput?.path ?? chunk.toolInput?.command ?? undefined;
+          const lines = chunk.toolInput?.content ? chunk.toolInput.content.split(`
+`).length : undefined;
+          let diff;
+          if (chunk.toolName === "Write") {
+            const writeContent = chunk.toolInput?.content;
+            if (writeContent) {
+              diff = writeContent.substring(0, 5000);
+            }
+          } else if (chunk.toolName === "Edit") {
+            const oldStr = chunk.toolInput?.old_string;
+            const newStr = chunk.toolInput?.new_string;
+            if (oldStr && newStr) {
+              const oldLines = oldStr.split(`
+`).map((l) => `-${l}`).join(`
+`);
+              const newLines = newStr.split(`
+`).map((l) => `+${l}`).join(`
+`);
+              diff = `--- old
++++ new
+@@ @@
+${oldLines}
+${newLines}`.substring(0, 5000);
+            }
+          }
+          emit2(onProgress, {
+            type: "activity",
+            stashId,
+            action: chunk.toolName,
+            file: filePath,
+            lines,
+            diff,
+            timestamp: Date.now()
+          });
+        }
+      } else if (chunk.type === "thinking") {
+        emit2(onProgress, {
+          type: "activity",
+          stashId,
+          action: "thinking",
+          content: chunk.content.substring(0, 200),
+          timestamp: Date.now()
+        });
+      } else if (chunk.type === "text") {
+        emit2(onProgress, {
+          type: "activity",
+          stashId,
+          action: "text",
+          content: chunk.content.substring(0, 200),
+          timestamp: Date.now()
+        });
+      }
     }
     const wtGit = simpleGit4(worktree.path);
     let hasChanges = false;
@@ -1336,7 +1422,7 @@ ${context}` : `The user wants to vary the current UI. Apply this change: ${promp
       await screenshotGit.checkout(["--detach", stash.branch]);
       await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
       const devServer = spawn4({
-        cmd: ["npm", "run", "dev", "--", "--port", String(port)],
+        cmd: ["npm", "run", "dev", "--", "--", "--port", String(port)],
         cwd: screenshotWorktree.path,
         stdin: "ignore",
         stdout: "pipe",
@@ -1750,7 +1836,7 @@ class PreviewPool {
     const worktreePath = await this.worktreeManager.createPreviewForPool(stashId);
     await prepareWorktreeDeps(worktreePath, this.worktreeManager.getProjectPath());
     const process2 = Bun.spawn({
-      cmd: ["npm", "run", "dev", "--", "--port", String(devPort)],
+      cmd: ["npm", "run", "dev", "--", "--", "--port", String(devPort)],
       cwd: worktreePath,
       stdin: "ignore",
       stdout: "pipe",
@@ -2401,7 +2487,6 @@ ${sourceCode.substring(0, 3000)}
                 for (const s of allStashes) {
                   if (this.activityStore.has(s.id)) {
                     stashActivity[s.id] = this.activityStore.getSnapshot(s.id);
-                    this.activityStore.clear(s.id);
                   }
                 }
                 if (Object.keys(stashActivity).length === 0)
@@ -2559,6 +2644,7 @@ ${sourceCode.substring(0, 3000)}
           file: event.file,
           lines: event.lines,
           content: event.content,
+          diff: event.diff,
           timestamp: event.timestamp
         };
         this.activityStore.append(activityEvent);
@@ -2630,6 +2716,61 @@ ${refDescriptions.join(`
     await this.previewPool.stop(stashId);
     await remove(this.projectPath, stashId);
   }
+  async continueStash(projectId, stashId, message) {
+    const stash = this.persistence.getStash(projectId, stashId);
+    if (!stash?.sessionId) {
+      this.broadcast({ type: "stash:error", stashId, error: "No session to continue" });
+      return;
+    }
+    const worktree = await this.worktreeManager.createPreviewForPool(stashId);
+    try {
+      for await (const chunk of runAgentQuery({
+        id: `continue-${stashId}`,
+        prompt: message,
+        cwd: worktree,
+        resumeSessionId: stash.sessionId,
+        persistSession: true
+      })) {
+        if (chunk.type === "session_id" && chunk.sessionId) {
+          this.persistence.saveStash({ ...stash, sessionId: chunk.sessionId });
+        }
+        if (chunk.type === "tool_use" && chunk.toolName) {
+          const knownTools = ["Read", "Write", "Edit", "Glob", "Grep", "Bash"];
+          if (knownTools.includes(chunk.toolName)) {
+            const filePath = chunk.toolInput?.file_path ?? chunk.toolInput?.path ?? chunk.toolInput?.command ?? undefined;
+            const activityEvent = {
+              stashId,
+              action: chunk.toolName,
+              file: filePath,
+              timestamp: Date.now()
+            };
+            this.activityStore.append(activityEvent);
+            this.broadcast({ type: "stash:activity", stashId, event: activityEvent });
+          }
+        }
+        if (chunk.type === "text") {
+          this.broadcast({
+            type: "ai_stream",
+            content: chunk.content,
+            streamType: "text",
+            source: `stash-${stashId}`
+          });
+        }
+      }
+      const simpleGit6 = (await import("simple-git")).default;
+      const git = simpleGit6(worktree);
+      await git.add("-A");
+      const status = await git.status();
+      if (status.staged.length > 0) {
+        await git.commit(`stashes: continue ${stashId}`);
+        this.broadcast({ type: "stash:status", stashId, status: "screenshotting" });
+      }
+    } catch (err) {
+      this.broadcast({ type: "stash:error", stashId, error: err instanceof Error ? err.message : String(err) });
+    } finally {
+      killAgentQuery(`continue-${stashId}`);
+    }
+  }
 }
 
 // ../server/dist/services/activity-store.js
@@ -2809,6 +2950,15 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort, stashPor
           case "delete_stash":
             await stashService.deleteStash(event.stashId);
             break;
+          case "continue_stash": {
+            const stash = persistence.getStash(event.projectId, event.stashId);
+            if (!stash?.sessionId) {
+              broadcast({ type: "stash:error", stashId: event.stashId, error: "No session to continue \u2014 stash was generated without session persistence" });
+              break;
+            }
+            await stashService.continueStash(event.projectId, event.stashId, event.message);
+            break;
+          }
         }
       } catch (err) {
         const errorMsg = err instanceof Error ? err.message : String(err);
@@ -2959,6 +3109,26 @@ app.get("/stash-activity/:stashId", (c) => {
   const events = store.getEvents(stashId);
   return c.json({ data: events });
 });
+app.get("/stash-session/:stashId", async (c) => {
+  const stashId = c.req.param("stashId");
+  const persistence2 = getPersistence();
+  let stash = null;
+  for (const project of persistence2.listProjects()) {
+    stash = persistence2.getStash(project.id, stashId);
+    if (stash)
+      break;
+  }
+  if (!stash?.sessionId) {
+    return c.json({ data: null, error: "No session found for this stash" }, 404);
+  }
+  try {
+    const { getSessionMessages } = await import("@anthropic-ai/claude-agent-sdk");
+    const messages = await getSessionMessages(stash.sessionId, { limit: 100 });
+    return c.json({ data: messages });
+  } catch (err) {
+    return c.json({ data: null, error: "Failed to retrieve session messages" }, 500);
+  }
+});
 function ensureProject(persistence2) {
   const projects = persistence2.listProjects();
   if (projects.length > 0)

package/dist/mcp.js

@@ -124,7 +124,7 @@ async function prepareWorktreeDeps(worktreePath, projectPath) {
     pm = "yarn";
   if (pm === "npm")
     return;
-  const cmd = pm === "pnpm" ? ["pnpm", "install", "--frozen-lockfile", "--prefer-offline"] : pm === "bun" ? ["bun", "install", "--frozen-lockfile"] : ["yarn", "install", "--frozen-lockfile"];
+  const cmd = pm === "pnpm" ? ["pnpm", "install", "--force", "--prefer-offline"] : pm === "bun" ? ["bun", "install", "--frozen-lockfile"] : ["yarn", "install", "--frozen-lockfile"];
   logger.info("worktree", `installing deps (${pm})`, { worktreePath: worktreePath.split("/").slice(-2).join("/") });
   const proc = spawn({
     cmd,
@@ -1075,8 +1075,11 @@ async function generate(opts) {
         id: stashId,
         prompt: stashPrompt,
         cwd: worktree.path,
-        persistSession: false
+        persistSession: true
       })) {
+        if (chunk.type === "session_id" && chunk.sessionId) {
+          persistence.saveStash({ ...stash, sessionId: chunk.sessionId });
+        }
         emit(onProgress, {
           type: "ai_stream",
           stashId,
@@ -1089,12 +1092,36 @@ async function generate(opts) {
             const filePath = chunk.toolInput?.file_path ?? chunk.toolInput?.path ?? chunk.toolInput?.command ?? undefined;
             const lines = chunk.toolInput?.content ? chunk.toolInput.content.split(`
 `).length : undefined;
+            let diff;
+            if (chunk.toolName === "Write") {
+              const writeContent = chunk.toolInput?.content;
+              if (writeContent) {
+                diff = writeContent.substring(0, 5000);
+              }
+            } else if (chunk.toolName === "Edit") {
+              const oldStr = chunk.toolInput?.old_string;
+              const newStr = chunk.toolInput?.new_string;
+              if (oldStr && newStr) {
+                const oldLines = oldStr.split(`
+`).map((l) => `-${l}`).join(`
+`);
+                const newLines = newStr.split(`
+`).map((l) => `+${l}`).join(`
+`);
+                diff = `--- old
++++ new
+@@ @@
+${oldLines}
+${newLines}`.substring(0, 5000);
+              }
+            }
             emit(onProgress, {
               type: "activity",
               stashId,
               action: chunk.toolName,
               file: filePath,
               lines,
+              diff,
               timestamp: Date.now()
             });
           }
@@ -1149,7 +1176,7 @@ async function generate(opts) {
         await screenshotGit.checkout(["--detach", stash.branch]);
         await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
         const devServer = spawn3({
-          cmd: ["npm", "run", "dev", "--", "--port", String(port)],
+          cmd: ["npm", "run", "dev", "--", "--", "--port", String(port)],
           cwd: screenshotWorktree.path,
           stdin: "ignore",
           stdout: "pipe",
@@ -1277,14 +1304,73 @@ ${context}` : `The user wants to vary the current UI. Apply this change: ${promp
       id: stashId,
       prompt: varyPrompt,
       cwd: worktree.path,
-      persistSession: false
+      persistSession: true
     })) {
+      if (chunk.type === "session_id" && chunk.sessionId) {
+        persistence.saveStash({ ...stash, sessionId: chunk.sessionId });
+      }
       emit2(onProgress, {
         type: "ai_stream",
         stashId,
         content: chunk.content,
         streamType: chunk.type
       });
+      if (chunk.type === "tool_use" && chunk.toolName) {
+        const knownTools = ["Read", "Write", "Edit", "Glob", "Grep", "Bash"];
+        if (knownTools.includes(chunk.toolName)) {
+          const filePath = chunk.toolInput?.file_path ?? chunk.toolInput?.path ?? chunk.toolInput?.command ?? undefined;
+          const lines = chunk.toolInput?.content ? chunk.toolInput.content.split(`
+`).length : undefined;
+          let diff;
+          if (chunk.toolName === "Write") {
+            const writeContent = chunk.toolInput?.content;
+            if (writeContent) {
+              diff = writeContent.substring(0, 5000);
+            }
+          } else if (chunk.toolName === "Edit") {
+            const oldStr = chunk.toolInput?.old_string;
+            const newStr = chunk.toolInput?.new_string;
+            if (oldStr && newStr) {
+              const oldLines = oldStr.split(`
+`).map((l) => `-${l}`).join(`
+`);
+              const newLines = newStr.split(`
+`).map((l) => `+${l}`).join(`
+`);
+              diff = `--- old
++++ new
+@@ @@
+${oldLines}
+${newLines}`.substring(0, 5000);
+            }
+          }
+          emit2(onProgress, {
+            type: "activity",
+            stashId,
+            action: chunk.toolName,
+            file: filePath,
+            lines,
+            diff,
+            timestamp: Date.now()
+          });
+        }
+      } else if (chunk.type === "thinking") {
+        emit2(onProgress, {
+          type: "activity",
+          stashId,
+          action: "thinking",
+          content: chunk.content.substring(0, 200),
+          timestamp: Date.now()
+        });
+      } else if (chunk.type === "text") {
+        emit2(onProgress, {
+          type: "activity",
+          stashId,
+          action: "text",
+          content: chunk.content.substring(0, 200),
+          timestamp: Date.now()
+        });
+      }
     }
     const wtGit = simpleGit4(worktree.path);
     let hasChanges = false;
@@ -1321,7 +1407,7 @@ ${context}` : `The user wants to vary the current UI. Apply this change: ${promp
       await screenshotGit.checkout(["--detach", stash.branch]);
       await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
       const devServer = spawn4({
-        cmd: ["npm", "run", "dev", "--", "--port", String(port)],
+        cmd: ["npm", "run", "dev", "--", "--", "--port", String(port)],
         cwd: screenshotWorktree.path,
         stdin: "ignore",
         stdout: "pipe",
@@ -1974,7 +2060,7 @@ class PreviewPool {
     const worktreePath = await this.worktreeManager.createPreviewForPool(stashId);
     await prepareWorktreeDeps(worktreePath, this.worktreeManager.getProjectPath());
     const process2 = Bun.spawn({
-      cmd: ["npm", "run", "dev", "--", "--port", String(devPort)],
+      cmd: ["npm", "run", "dev", "--", "--", "--port", String(devPort)],
       cwd: worktreePath,
       stdin: "ignore",
       stdout: "pipe",
@@ -2625,7 +2711,6 @@ ${sourceCode.substring(0, 3000)}
                 for (const s of allStashes) {
                   if (this.activityStore.has(s.id)) {
                     stashActivity[s.id] = this.activityStore.getSnapshot(s.id);
-                    this.activityStore.clear(s.id);
                   }
                 }
                 if (Object.keys(stashActivity).length === 0)
@@ -2783,6 +2868,7 @@ ${sourceCode.substring(0, 3000)}
           file: event.file,
           lines: event.lines,
           content: event.content,
+          diff: event.diff,
           timestamp: event.timestamp
         };
         this.activityStore.append(activityEvent);
@@ -2854,6 +2940,61 @@ ${refDescriptions.join(`
     await this.previewPool.stop(stashId);
     await remove(this.projectPath, stashId);
   }
+  async continueStash(projectId, stashId, message) {
+    const stash = this.persistence.getStash(projectId, stashId);
+    if (!stash?.sessionId) {
+      this.broadcast({ type: "stash:error", stashId, error: "No session to continue" });
+      return;
+    }
+    const worktree = await this.worktreeManager.createPreviewForPool(stashId);
+    try {
+      for await (const chunk of runAgentQuery({
+        id: `continue-${stashId}`,
+        prompt: message,
+        cwd: worktree,
+        resumeSessionId: stash.sessionId,
+        persistSession: true
+      })) {
+        if (chunk.type === "session_id" && chunk.sessionId) {
+          this.persistence.saveStash({ ...stash, sessionId: chunk.sessionId });
+        }
+        if (chunk.type === "tool_use" && chunk.toolName) {
+          const knownTools = ["Read", "Write", "Edit", "Glob", "Grep", "Bash"];
+          if (knownTools.includes(chunk.toolName)) {
+            const filePath = chunk.toolInput?.file_path ?? chunk.toolInput?.path ?? chunk.toolInput?.command ?? undefined;
+            const activityEvent = {
+              stashId,
+              action: chunk.toolName,
+              file: filePath,
+              timestamp: Date.now()
+            };
+            this.activityStore.append(activityEvent);
+            this.broadcast({ type: "stash:activity", stashId, event: activityEvent });
+          }
+        }
+        if (chunk.type === "text") {
+          this.broadcast({
+            type: "ai_stream",
+            content: chunk.content,
+            streamType: "text",
+            source: `stash-${stashId}`
+          });
+        }
+      }
+      const simpleGit6 = (await import("simple-git")).default;
+      const git = simpleGit6(worktree);
+      await git.add("-A");
+      const status = await git.status();
+      if (status.staged.length > 0) {
+        await git.commit(`stashes: continue ${stashId}`);
+        this.broadcast({ type: "stash:status", stashId, status: "screenshotting" });
+      }
+    } catch (err) {
+      this.broadcast({ type: "stash:error", stashId, error: err instanceof Error ? err.message : String(err) });
+    } finally {
+      killAgentQuery(`continue-${stashId}`);
+    }
+  }
 }
 
 // ../server/dist/services/activity-store.js
@@ -3033,6 +3174,15 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort, stashPor
           case "delete_stash":
             await stashService.deleteStash(event.stashId);
             break;
+          case "continue_stash": {
+            const stash = persistence.getStash(event.projectId, event.stashId);
+            if (!stash?.sessionId) {
+              broadcast({ type: "stash:error", stashId: event.stashId, error: "No session to continue \u2014 stash was generated without session persistence" });
+              break;
+            }
+            await stashService.continueStash(event.projectId, event.stashId, event.message);
+            break;
+          }
         }
       } catch (err) {
         const errorMsg = err instanceof Error ? err.message : String(err);
@@ -3183,6 +3333,26 @@ app.get("/stash-activity/:stashId", (c) => {
   const events = store.getEvents(stashId);
   return c.json({ data: events });
 });
+app.get("/stash-session/:stashId", async (c) => {
+  const stashId = c.req.param("stashId");
+  const persistence2 = getPersistence();
+  let stash = null;
+  for (const project of persistence2.listProjects()) {
+    stash = persistence2.getStash(project.id, stashId);
+    if (stash)
+      break;
+  }
+  if (!stash?.sessionId) {
+    return c.json({ data: null, error: "No session found for this stash" }, 404);
+  }
+  try {
+    const { getSessionMessages } = await import("@anthropic-ai/claude-agent-sdk");
+    const messages = await getSessionMessages(stash.sessionId, { limit: 100 });
+    return c.json({ data: messages });
+  } catch (err) {
+    return c.json({ data: null, error: "Failed to retrieve session messages" }, 500);
+  }
+});
 function ensureProject(persistence2) {
   const projects = persistence2.listProjects();
   if (projects.length > 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stashes",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "type": "module",
   "description": "Generate AI-powered UI design explorations in your project",
   "keywords": [