stashes 0.2.2 → 0.2.4

package/dist/cli.js

@@ -62,13 +62,14 @@ import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
 // ../core/dist/generation.js
 import { readFileSync as readFileSync2, existsSync as existsSync6 } from "fs";
 import { join as join6 } from "path";
-var {spawn: spawn2 } = globalThis.Bun;
+var {spawn: spawn3 } = globalThis.Bun;
 import simpleGit3 from "simple-git";
 
 // ../core/dist/worktree.js
 import simpleGit from "simple-git";
 import { join as join2 } from "path";
 import { existsSync as existsSync2, rmSync, symlinkSync } from "fs";
+var {spawn } = globalThis.Bun;
 
 // ../core/dist/logger.js
 import { appendFileSync, mkdirSync, existsSync } from "fs";
@@ -128,6 +129,32 @@ var logger = {
 };
 
 // ../core/dist/worktree.js
+async function prepareWorktreeDeps(worktreePath, projectPath) {
+  let pm = "npm";
+  if (existsSync2(join2(projectPath, "pnpm-lock.yaml")))
+    pm = "pnpm";
+  else if (existsSync2(join2(projectPath, "bun.lock")) || existsSync2(join2(projectPath, "bun.lockb")))
+    pm = "bun";
+  else if (existsSync2(join2(projectPath, "yarn.lock")))
+    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"];
+  logger.info("worktree", `installing deps (${pm})`, { worktreePath: worktreePath.split("/").slice(-2).join("/") });
+  const proc = spawn({
+    cmd,
+    cwd: worktreePath,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+    env: { ...process.env }
+  });
+  const exitCode = await proc.exited;
+  if (exitCode !== 0) {
+    const stderr = await new Response(proc.stderr).text();
+    logger.warn("worktree", `${pm} install exited ${exitCode}`, { stderr: stderr.substring(0, 300) });
+  }
+}
 var PREVIEW_PORT = STASH_PORT_START;
 
 class WorktreeManager {
@@ -140,6 +167,9 @@ class WorktreeManager {
     this.git = simpleGit(projectPath);
     this.cleanupStaleWorktrees();
   }
+  getProjectPath() {
+    return this.projectPath;
+  }
   async cleanupStaleWorktrees() {
     const worktreesDir = join2(this.projectPath, ".stashes", "worktrees");
     if (!existsSync2(worktreesDir))
@@ -704,7 +734,7 @@ import { mkdirSync as mkdirSync4, existsSync as existsSync5 } from "fs";
 import simpleGit2 from "simple-git";
 
 // ../core/dist/screenshot.js
-var {spawn } = globalThis.Bun;
+var {spawn: spawn2 } = globalThis.Bun;
 import { join as join4 } from "path";
 import { mkdirSync as mkdirSync3, existsSync as existsSync4 } from "fs";
 var SCREENSHOTS_DIR = ".stashes/screenshots";
@@ -743,7 +773,7 @@ async function captureScreenshot(portOrOpts, projectPath, stashId) {
       await browser.close();
     })();
   `;
-  const proc = spawn({
+  const proc = spawn2({
     cmd: ["node", "-e", playwrightScript],
     stdin: "ignore",
     stdout: "pipe",
@@ -1132,8 +1162,9 @@ async function generate(opts) {
         const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
         const screenshotGit = simpleGit3(screenshotWorktree.path);
         await screenshotGit.checkout(["--detach", stash.branch]);
-        const devServer = spawn2({
-          cmd: ["npm", "run", "dev"],
+        await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
+        const devServer = spawn3({
+          cmd: ["npm", "run", "dev", "--", "--port", String(port)],
           cwd: screenshotWorktree.path,
           stdin: "ignore",
           stdout: "pipe",
@@ -1185,7 +1216,7 @@ async function generate(opts) {
   return completedStashes;
 }
 // ../core/dist/vary.js
-var {spawn: spawn3 } = globalThis.Bun;
+var {spawn: spawn4 } = globalThis.Bun;
 import simpleGit4 from "simple-git";
 function emit2(onProgress, event) {
   if (onProgress)
@@ -1303,8 +1334,9 @@ ${context}` : `The user wants to vary the current UI. Apply this change: ${promp
       const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
       const screenshotGit = simpleGit4(screenshotWorktree.path);
       await screenshotGit.checkout(["--detach", stash.branch]);
-      const devServer = spawn3({
-        cmd: ["npm", "run", "dev"],
+      await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
+      const devServer = spawn4({
+        cmd: ["npm", "run", "dev", "--", "--port", String(port)],
         cwd: screenshotWorktree.path,
         stdin: "ignore",
         stdout: "pipe",
@@ -1398,7 +1430,7 @@ import { query as query2, tool, createSdkMcpServer } from "@anthropic-ai/claude-
 import { z } from "zod/v4";
 
 // ../server/dist/services/app-proxy.js
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 function startAppProxy(userDevPort, proxyPort, injectOverlay) {
   const overlayScript = injectOverlay("", userDevPort, proxyPort);
   const overlayEscaped = JSON.stringify(overlayScript);
@@ -1473,7 +1505,7 @@ server.listen(${proxyPort}, () => {
   if (process.send) process.send('ready');
 });
 `;
-  const child = spawn4("node", ["-e", proxyScript], {
+  const child = spawn5("node", ["-e", proxyScript], {
     stdio: ["ignore", "inherit", "inherit", "ipc"]
   });
   child.on("error", (err) => {
@@ -1716,8 +1748,9 @@ class PreviewPool {
     this.usedPorts.add(proxyPort);
     const devPort = proxyPort + DEV_PORT_OFFSET;
     const worktreePath = await this.worktreeManager.createPreviewForPool(stashId);
+    await prepareWorktreeDeps(worktreePath, this.worktreeManager.getProjectPath());
     const process2 = Bun.spawn({
-      cmd: ["npm", "run", "dev"],
+      cmd: ["npm", "run", "dev", "--", "--port", String(devPort)],
       cwd: worktreePath,
       stdin: "ignore",
       stdout: "pipe",
@@ -2218,11 +2251,44 @@ ${sourceCode.substring(0, 3000)}
           mcpServers: {
             "stashes-chat": stashServer
           },
+          disallowedTools: [
+            "Write",
+            "Edit",
+            "Bash",
+            "NotebookEdit",
+            "LSP",
+            "Agent",
+            "TodoWrite",
+            "TaskCreate",
+            "TaskUpdate",
+            "TaskList",
+            "TaskGet",
+            "Skill",
+            "ToolSearch",
+            "EnterPlanMode",
+            "ExitPlanMode",
+            "WebSearch",
+            "WebFetch"
+          ],
           permissionMode: "bypassPermissions",
           allowDangerouslySkipPermissions: true,
           includePartialMessages: true
         }
       });
+      const VISIBLE_TOOLS = new Set([
+        "generate_stashes",
+        "vary_stash",
+        "show_stash",
+        "stashes_generate",
+        "stashes_vary",
+        "stashes_show",
+        "stashes_list",
+        "stashes_apply",
+        "stashes_remove",
+        "stashes_browse"
+      ]);
+      const hiddenToolIds = new Set;
+      let insideHiddenTool = false;
       for await (const sdkMessage of queryIter) {
         if (sdkMessage.type === "system" && "subtype" in sdkMessage && sdkMessage.subtype === "init") {
           const sessionId = "session_id" in sdkMessage ? sdkMessage.session_id : "";
@@ -2236,14 +2302,16 @@ ${sourceCode.substring(0, 3000)}
           if (event.type === "content_block_delta") {
             const delta = event.delta;
             if (delta.type === "text_delta" && delta.text) {
-              flushThinking();
-              textBuf += delta.text;
-              this.broadcast({
-                type: "ai_stream",
-                content: delta.text,
-                streamType: "text",
-                source: "chat"
-              });
+              if (!insideHiddenTool) {
+                flushThinking();
+                textBuf += delta.text;
+                this.broadcast({
+                  type: "ai_stream",
+                  content: delta.text,
+                  streamType: "text",
+                  source: "chat"
+                });
+              }
             } else if (delta.type === "thinking_delta" && delta.thinking) {
               thinkingBuf += delta.thinking;
               this.broadcast({
@@ -2260,12 +2328,19 @@ ${sourceCode.substring(0, 3000)}
           const msg = sdkMessage.message;
           for (const block of msg.content || []) {
             if (block.type === "tool_use") {
-              flushThinking();
-              flushText();
               const toolId = block.id;
               const toolName = block.name;
               const toolParams = block.input ?? {};
               toolNameMap.set(toolId, toolName);
+              const isVisible = VISIBLE_TOOLS.has(toolName);
+              if (!isVisible) {
+                hiddenToolIds.add(toolId);
+                insideHiddenTool = true;
+                continue;
+              }
+              insideHiddenTool = false;
+              flushThinking();
+              flushText();
               save({
                 id: crypto.randomUUID(),
                 role: "assistant",
@@ -2301,6 +2376,12 @@ ${sourceCode.substring(0, 3000)}
               const toolUseId = b.tool_use_id;
               const isError = b.is_error || false;
               const endToolName = toolNameMap.get(toolUseId) || "unknown";
+              if (hiddenToolIds.has(toolUseId)) {
+                hiddenToolIds.delete(toolUseId);
+                insideHiddenTool = false;
+                continue;
+              }
+              insideHiddenTool = false;
               if (endToolName.includes("generate_stashes") || endToolName.includes("stashes_generate") || endToolName.includes("vary_stash") || endToolName.includes("stashes_vary")) {
                 this.stopStashPoll();
               }
@@ -2469,9 +2550,19 @@ ${sourceCode.substring(0, 3000)}
       case "error":
         this.broadcast({ type: "stash:error", stashId: event.stashId, error: event.error });
         break;
-      case "ai_stream": {
-        const streamType = event.streamType === "tool_use" ? "tool_start" : event.streamType;
-        this.broadcast({ type: "ai_stream", content: event.content, streamType });
+      case "ai_stream":
+        break;
+      case "activity": {
+        const activityEvent = {
+          stashId: event.stashId,
+          action: event.action,
+          file: event.file,
+          lines: event.lines,
+          content: event.content,
+          timestamp: event.timestamp
+        };
+        this.activityStore.append(activityEvent);
+        this.broadcast({ type: "stash:activity", stashId: event.stashId, event: activityEvent });
         break;
       }
     }

package/dist/mcp.js

@@ -28,7 +28,7 @@ import { z } from "zod";
 // ../core/dist/generation.js
 import { readFileSync as readFileSync2, existsSync as existsSync6 } from "fs";
 import { join as join6 } from "path";
-var {spawn: spawn2 } = globalThis.Bun;
+var {spawn: spawn3 } = globalThis.Bun;
 import simpleGit3 from "simple-git";
 // ../shared/dist/constants/index.js
 var STASHES_PORT = 4000;
@@ -54,6 +54,7 @@ var DEFAULT_DIRECTIVES = [
 import simpleGit from "simple-git";
 import { join as join2 } from "path";
 import { existsSync as existsSync2, rmSync, symlinkSync } from "fs";
+var {spawn } = globalThis.Bun;
 
 // ../core/dist/logger.js
 import { appendFileSync, mkdirSync, existsSync } from "fs";
@@ -113,6 +114,32 @@ var logger = {
 };
 
 // ../core/dist/worktree.js
+async function prepareWorktreeDeps(worktreePath, projectPath) {
+  let pm = "npm";
+  if (existsSync2(join2(projectPath, "pnpm-lock.yaml")))
+    pm = "pnpm";
+  else if (existsSync2(join2(projectPath, "bun.lock")) || existsSync2(join2(projectPath, "bun.lockb")))
+    pm = "bun";
+  else if (existsSync2(join2(projectPath, "yarn.lock")))
+    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"];
+  logger.info("worktree", `installing deps (${pm})`, { worktreePath: worktreePath.split("/").slice(-2).join("/") });
+  const proc = spawn({
+    cmd,
+    cwd: worktreePath,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+    env: { ...process.env }
+  });
+  const exitCode = await proc.exited;
+  if (exitCode !== 0) {
+    const stderr = await new Response(proc.stderr).text();
+    logger.warn("worktree", `${pm} install exited ${exitCode}`, { stderr: stderr.substring(0, 300) });
+  }
+}
 var PREVIEW_PORT = STASH_PORT_START;
 
 class WorktreeManager {
@@ -125,6 +152,9 @@ class WorktreeManager {
     this.git = simpleGit(projectPath);
     this.cleanupStaleWorktrees();
   }
+  getProjectPath() {
+    return this.projectPath;
+  }
   async cleanupStaleWorktrees() {
     const worktreesDir = join2(this.projectPath, ".stashes", "worktrees");
     if (!existsSync2(worktreesDir))
@@ -689,7 +719,7 @@ import { mkdirSync as mkdirSync4, existsSync as existsSync5 } from "fs";
 import simpleGit2 from "simple-git";
 
 // ../core/dist/screenshot.js
-var {spawn } = globalThis.Bun;
+var {spawn: spawn2 } = globalThis.Bun;
 import { join as join4 } from "path";
 import { mkdirSync as mkdirSync3, existsSync as existsSync4 } from "fs";
 var SCREENSHOTS_DIR = ".stashes/screenshots";
@@ -728,7 +758,7 @@ async function captureScreenshot(portOrOpts, projectPath, stashId) {
       await browser.close();
     })();
   `;
-  const proc = spawn({
+  const proc = spawn2({
     cmd: ["node", "-e", playwrightScript],
     stdin: "ignore",
     stdout: "pipe",
@@ -1117,8 +1147,9 @@ async function generate(opts) {
         const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
         const screenshotGit = simpleGit3(screenshotWorktree.path);
         await screenshotGit.checkout(["--detach", stash.branch]);
-        const devServer = spawn2({
-          cmd: ["npm", "run", "dev"],
+        await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
+        const devServer = spawn3({
+          cmd: ["npm", "run", "dev", "--", "--port", String(port)],
           cwd: screenshotWorktree.path,
           stdin: "ignore",
           stdout: "pipe",
@@ -1170,7 +1201,7 @@ async function generate(opts) {
   return completedStashes;
 }
 // ../core/dist/vary.js
-var {spawn: spawn3 } = globalThis.Bun;
+var {spawn: spawn4 } = globalThis.Bun;
 import simpleGit4 from "simple-git";
 function emit2(onProgress, event) {
   if (onProgress)
@@ -1288,8 +1319,9 @@ ${context}` : `The user wants to vary the current UI. Apply this change: ${promp
       const screenshotWorktree = await worktreeManager.createForGeneration(`screenshot-${stashId}`);
       const screenshotGit = simpleGit4(screenshotWorktree.path);
       await screenshotGit.checkout(["--detach", stash.branch]);
-      const devServer = spawn3({
-        cmd: ["npm", "run", "dev"],
+      await prepareWorktreeDeps(screenshotWorktree.path, projectPath);
+      const devServer = spawn4({
+        cmd: ["npm", "run", "dev", "--", "--port", String(port)],
         cwd: screenshotWorktree.path,
         stdin: "ignore",
         stdout: "pipe",
@@ -1622,7 +1654,7 @@ import { query as query2, tool, createSdkMcpServer } from "@anthropic-ai/claude-
 import { z as z6 } from "zod/v4";
 
 // ../server/dist/services/app-proxy.js
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 function startAppProxy(userDevPort, proxyPort, injectOverlay) {
   const overlayScript = injectOverlay("", userDevPort, proxyPort);
   const overlayEscaped = JSON.stringify(overlayScript);
@@ -1697,7 +1729,7 @@ server.listen(${proxyPort}, () => {
   if (process.send) process.send('ready');
 });
 `;
-  const child = spawn4("node", ["-e", proxyScript], {
+  const child = spawn5("node", ["-e", proxyScript], {
     stdio: ["ignore", "inherit", "inherit", "ipc"]
   });
   child.on("error", (err) => {
@@ -1940,8 +1972,9 @@ class PreviewPool {
     this.usedPorts.add(proxyPort);
     const devPort = proxyPort + DEV_PORT_OFFSET;
     const worktreePath = await this.worktreeManager.createPreviewForPool(stashId);
+    await prepareWorktreeDeps(worktreePath, this.worktreeManager.getProjectPath());
     const process2 = Bun.spawn({
-      cmd: ["npm", "run", "dev"],
+      cmd: ["npm", "run", "dev", "--", "--port", String(devPort)],
       cwd: worktreePath,
       stdin: "ignore",
       stdout: "pipe",
@@ -2442,11 +2475,44 @@ ${sourceCode.substring(0, 3000)}
           mcpServers: {
             "stashes-chat": stashServer
           },
+          disallowedTools: [
+            "Write",
+            "Edit",
+            "Bash",
+            "NotebookEdit",
+            "LSP",
+            "Agent",
+            "TodoWrite",
+            "TaskCreate",
+            "TaskUpdate",
+            "TaskList",
+            "TaskGet",
+            "Skill",
+            "ToolSearch",
+            "EnterPlanMode",
+            "ExitPlanMode",
+            "WebSearch",
+            "WebFetch"
+          ],
           permissionMode: "bypassPermissions",
           allowDangerouslySkipPermissions: true,
           includePartialMessages: true
         }
       });
+      const VISIBLE_TOOLS = new Set([
+        "generate_stashes",
+        "vary_stash",
+        "show_stash",
+        "stashes_generate",
+        "stashes_vary",
+        "stashes_show",
+        "stashes_list",
+        "stashes_apply",
+        "stashes_remove",
+        "stashes_browse"
+      ]);
+      const hiddenToolIds = new Set;
+      let insideHiddenTool = false;
       for await (const sdkMessage of queryIter) {
         if (sdkMessage.type === "system" && "subtype" in sdkMessage && sdkMessage.subtype === "init") {
           const sessionId = "session_id" in sdkMessage ? sdkMessage.session_id : "";
@@ -2460,14 +2526,16 @@ ${sourceCode.substring(0, 3000)}
           if (event.type === "content_block_delta") {
             const delta = event.delta;
             if (delta.type === "text_delta" && delta.text) {
-              flushThinking();
-              textBuf += delta.text;
-              this.broadcast({
-                type: "ai_stream",
-                content: delta.text,
-                streamType: "text",
-                source: "chat"
-              });
+              if (!insideHiddenTool) {
+                flushThinking();
+                textBuf += delta.text;
+                this.broadcast({
+                  type: "ai_stream",
+                  content: delta.text,
+                  streamType: "text",
+                  source: "chat"
+                });
+              }
             } else if (delta.type === "thinking_delta" && delta.thinking) {
               thinkingBuf += delta.thinking;
               this.broadcast({
@@ -2484,12 +2552,19 @@ ${sourceCode.substring(0, 3000)}
           const msg = sdkMessage.message;
           for (const block of msg.content || []) {
             if (block.type === "tool_use") {
-              flushThinking();
-              flushText();
               const toolId = block.id;
               const toolName = block.name;
               const toolParams = block.input ?? {};
               toolNameMap.set(toolId, toolName);
+              const isVisible = VISIBLE_TOOLS.has(toolName);
+              if (!isVisible) {
+                hiddenToolIds.add(toolId);
+                insideHiddenTool = true;
+                continue;
+              }
+              insideHiddenTool = false;
+              flushThinking();
+              flushText();
               save({
                 id: crypto.randomUUID(),
                 role: "assistant",
@@ -2525,6 +2600,12 @@ ${sourceCode.substring(0, 3000)}
               const toolUseId = b.tool_use_id;
               const isError = b.is_error || false;
               const endToolName = toolNameMap.get(toolUseId) || "unknown";
+              if (hiddenToolIds.has(toolUseId)) {
+                hiddenToolIds.delete(toolUseId);
+                insideHiddenTool = false;
+                continue;
+              }
+              insideHiddenTool = false;
               if (endToolName.includes("generate_stashes") || endToolName.includes("stashes_generate") || endToolName.includes("vary_stash") || endToolName.includes("stashes_vary")) {
                 this.stopStashPoll();
               }
@@ -2693,9 +2774,19 @@ ${sourceCode.substring(0, 3000)}
       case "error":
         this.broadcast({ type: "stash:error", stashId: event.stashId, error: event.error });
         break;
-      case "ai_stream": {
-        const streamType = event.streamType === "tool_use" ? "tool_start" : event.streamType;
-        this.broadcast({ type: "ai_stream", content: event.content, streamType });
+      case "ai_stream":
+        break;
+      case "activity": {
+        const activityEvent = {
+          stashId: event.stashId,
+          action: event.action,
+          file: event.file,
+          lines: event.lines,
+          content: event.content,
+          timestamp: event.timestamp
+        };
+        this.activityStore.append(activityEvent);
+        this.broadcast({ type: "stash:activity", stashId: event.stashId, event: activityEvent });
         break;
       }
     }

package/package.json

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