stashes 0.1.20 → 0.1.22

package/dist/cli.js

@@ -622,15 +622,20 @@ class PersistenceService {
 var {spawn } = globalThis.Bun;
 var CLAUDE_BIN = "/opt/homebrew/bin/claude";
 var processes = new Map;
-function startAiProcess(id, prompt, cwd) {
+function startAiProcess(id, prompt, cwd, resumeSessionId) {
   killAiProcess(id);
   logger.info("claude", `spawning process: ${id}`, {
     cwd,
     promptLength: prompt.length,
-    promptPreview: prompt.substring(0, 100)
+    promptPreview: prompt.substring(0, 100),
+    resumeSessionId
   });
+  const cmd = [CLAUDE_BIN, "-p", prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"];
+  if (resumeSessionId) {
+    cmd.push("--resume", resumeSessionId);
+  }
   const proc = spawn({
-    cmd: [CLAUDE_BIN, "-p", prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"],
+    cmd,
     stdin: "ignore",
     stdout: "pipe",
     stderr: "pipe",
@@ -684,6 +689,9 @@ async function* parseClaudeStream(proc) {
         } catch {
           continue;
         }
+        if (parsed.type === "system" && parsed.subtype === "init" && parsed.session_id) {
+          yield { type: "session_id", content: "", sessionId: parsed.session_id };
+        }
         if (parsed.type === "assistant" && parsed.message) {
           const message = parsed.message;
           for (const block of message.content || []) {
@@ -1323,6 +1331,9 @@ class StashService {
   broadcast;
   previewPool;
   selectedComponent = null;
+  messageQueue = [];
+  isProcessingMessage = false;
+  chatSessions = new Map;
   constructor(projectPath, worktreeManager, persistence, broadcast) {
     this.projectPath = projectPath;
     this.worktreeManager = worktreeManager;
@@ -1375,6 +1386,20 @@ class StashService {
     }
   }
   async message(projectId, chatId, message, referenceStashIds, componentContext) {
+    this.messageQueue.push({ projectId, chatId, message, referenceStashIds, componentContext });
+    if (!this.isProcessingMessage) {
+      await this.processMessageQueue();
+    }
+  }
+  async processMessageQueue() {
+    this.isProcessingMessage = true;
+    while (this.messageQueue.length > 0) {
+      const msg = this.messageQueue.shift();
+      await this.processMessage(msg.projectId, msg.chatId, msg.message, msg.referenceStashIds, msg.componentContext);
+    }
+    this.isProcessingMessage = false;
+  }
+  async processMessage(projectId, chatId, message, referenceStashIds, componentContext) {
     const component = componentContext ? { name: componentContext.name, filePath: this.selectedComponent?.filePath || "" } : this.selectedComponent;
     let sourceCode = "";
     const filePath = component?.filePath || "";
@@ -1394,34 +1419,66 @@ ${refs.join(`
 `)}`;
       }
     }
-    const chatPrompt = [
-      "You are helping the user explore UI design variations for their project.",
-      "You have access to stashes MCP tools to generate, list, show, browse, vary, and apply stashes.",
-      "If the user asks you to generate, create, or make variations, use the stashes_generate tool.",
-      "If the user asks to vary an existing stash, use the stashes_vary tool.",
-      "If the user asks about what a stash changed, its diff, or its contents, use stashes_show to inspect it.",
-      'IMPORTANT: NEVER call stashes_apply unless the user explicitly asks to "apply" or "merge" a stash.',
-      'IMPORTANT: NEVER call stashes_remove unless the user explicitly asks to "delete" or "remove" a stash.',
-      "Otherwise, respond conversationally about their project and stashes.",
-      "",
-      component ? `Component: ${component.name}` : "",
-      filePath !== "auto-detect" ? `File: ${filePath}` : "",
-      sourceCode ? `
+    const existingSessionId = this.chatSessions.get(chatId);
+    let chatPrompt;
+    if (existingSessionId) {
+      const parts = [message];
+      if (stashContext)
+        parts.push(stashContext);
+      if (component && !existingSessionId)
+        parts.push(`Component: ${component.name}`);
+      chatPrompt = parts.join(`
+`);
+    } else {
+      chatPrompt = [
+        "You are helping the user explore UI design variations for their project.",
+        "You have access to stashes MCP tools to generate, list, show, browse, vary, and apply stashes.",
+        "If the user asks you to generate, create, or make variations, use the stashes_generate tool.",
+        "If the user asks to vary an existing stash, use the stashes_vary tool.",
+        "If the user asks about what a stash changed, its diff, or its contents, use stashes_show to inspect it.",
+        'IMPORTANT: NEVER call stashes_apply unless the user explicitly asks to "apply" or "merge" a stash.',
+        'IMPORTANT: NEVER call stashes_remove unless the user explicitly asks to "delete" or "remove" a stash.',
+        "Otherwise, respond conversationally about their project and stashes.",
+        "",
+        component ? `Component: ${component.name}` : "",
+        filePath !== "auto-detect" ? `File: ${filePath}` : "",
+        sourceCode ? `
 Source:
 \`\`\`
 ${sourceCode.substring(0, 3000)}
 \`\`\`` : "",
-      stashContext,
-      "",
-      `User: ${message}`
-    ].filter(Boolean).join(`
+        stashContext,
+        "",
+        `User: ${message}`
+      ].filter(Boolean).join(`
 `);
-    const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath);
-    let fullResponse = "";
+    }
+    const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath, existingSessionId);
+    let thinkingBuf = "";
+    let textBuf = "";
+    const pendingMessages = [];
+    const now = new Date().toISOString();
+    function flushThinking() {
+      if (!thinkingBuf)
+        return;
+      pendingMessages.push({ id: crypto.randomUUID(), role: "assistant", content: thinkingBuf, type: "thinking", createdAt: now });
+      thinkingBuf = "";
+    }
+    function flushText() {
+      if (!textBuf)
+        return;
+      pendingMessages.push({ 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) {
+          this.chatSessions.set(chatId, chunk.sessionId);
+          continue;
+        }
         if (chunk.type === "text") {
-          fullResponse += chunk.content;
+          flushThinking();
+          textBuf += chunk.content;
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
@@ -1429,6 +1486,7 @@ ${sourceCode.substring(0, 3000)}
             source: "chat"
           });
         } else if (chunk.type === "thinking") {
+          thinkingBuf += chunk.content;
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
@@ -1436,36 +1494,66 @@ ${sourceCode.substring(0, 3000)}
             source: "chat"
           });
         } else if (chunk.type === "tool_use") {
+          flushThinking();
+          flushText();
+          let toolName = "unknown";
+          let toolParams = {};
+          try {
+            const parsed = JSON.parse(chunk.content);
+            toolName = parsed.tool ?? "unknown";
+            toolParams = parsed.input ?? {};
+          } catch {}
+          pendingMessages.push({
+            id: crypto.randomUUID(),
+            role: "assistant",
+            content: chunk.content,
+            type: "tool_start",
+            toolName,
+            toolParams,
+            toolStatus: "running",
+            createdAt: now
+          });
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
             streamType: "tool_start",
             source: "chat",
-            toolName: chunk.toolName ?? "unknown",
-            toolParams: chunk.toolInput ?? {},
+            toolName,
+            toolParams,
             toolStatus: "running"
           });
         } else if (chunk.type === "tool_result") {
+          let toolResult = chunk.content;
+          let isError = false;
+          try {
+            const parsed = JSON.parse(chunk.content);
+            toolResult = parsed.result ?? chunk.content;
+            isError = !!parsed.is_error;
+          } catch {}
+          pendingMessages.push({
+            id: crypto.randomUUID(),
+            role: "assistant",
+            content: chunk.content,
+            type: "tool_end",
+            toolStatus: isError ? "error" : "completed",
+            toolResult: toolResult.substring(0, 300),
+            createdAt: now
+          });
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
             streamType: "tool_end",
             source: "chat",
-            toolName: chunk.toolName ?? "unknown",
-            toolStatus: chunk.isError ? "error" : "completed",
-            toolResult: chunk.content.substring(0, 300)
+            toolStatus: isError ? "error" : "completed",
+            toolResult: toolResult.substring(0, 300)
           });
         }
       }
       await aiProcess.process.exited;
-      if (fullResponse) {
-        this.persistence.saveChatMessage(projectId, chatId, {
-          id: crypto.randomUUID(),
-          role: "assistant",
-          content: fullResponse,
-          type: "text",
-          createdAt: new Date().toISOString()
-        });
+      flushThinking();
+      flushText();
+      for (const msg of pendingMessages) {
+        this.persistence.saveChatMessage(projectId, chatId, msg);
       }
     } catch (err) {
       this.broadcast({

package/dist/mcp.js

@@ -504,15 +504,20 @@ class PersistenceService {
 var {spawn } = globalThis.Bun;
 var CLAUDE_BIN = "/opt/homebrew/bin/claude";
 var processes = new Map;
-function startAiProcess(id, prompt, cwd) {
+function startAiProcess(id, prompt, cwd, resumeSessionId) {
   killAiProcess(id);
   logger.info("claude", `spawning process: ${id}`, {
     cwd,
     promptLength: prompt.length,
-    promptPreview: prompt.substring(0, 100)
+    promptPreview: prompt.substring(0, 100),
+    resumeSessionId
   });
+  const cmd = [CLAUDE_BIN, "-p", prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"];
+  if (resumeSessionId) {
+    cmd.push("--resume", resumeSessionId);
+  }
   const proc = spawn({
-    cmd: [CLAUDE_BIN, "-p", prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"],
+    cmd,
     stdin: "ignore",
     stdout: "pipe",
     stderr: "pipe",
@@ -566,6 +571,9 @@ async function* parseClaudeStream(proc) {
         } catch {
           continue;
         }
+        if (parsed.type === "system" && parsed.subtype === "init" && parsed.session_id) {
+          yield { type: "session_id", content: "", sessionId: parsed.session_id };
+        }
         if (parsed.type === "assistant" && parsed.message) {
           const message = parsed.message;
           for (const block of message.content || []) {
@@ -1519,6 +1527,9 @@ class StashService {
   broadcast;
   previewPool;
   selectedComponent = null;
+  messageQueue = [];
+  isProcessingMessage = false;
+  chatSessions = new Map;
   constructor(projectPath, worktreeManager, persistence, broadcast) {
     this.projectPath = projectPath;
     this.worktreeManager = worktreeManager;
@@ -1571,6 +1582,20 @@ class StashService {
     }
   }
   async message(projectId, chatId, message, referenceStashIds, componentContext) {
+    this.messageQueue.push({ projectId, chatId, message, referenceStashIds, componentContext });
+    if (!this.isProcessingMessage) {
+      await this.processMessageQueue();
+    }
+  }
+  async processMessageQueue() {
+    this.isProcessingMessage = true;
+    while (this.messageQueue.length > 0) {
+      const msg = this.messageQueue.shift();
+      await this.processMessage(msg.projectId, msg.chatId, msg.message, msg.referenceStashIds, msg.componentContext);
+    }
+    this.isProcessingMessage = false;
+  }
+  async processMessage(projectId, chatId, message, referenceStashIds, componentContext) {
     const component = componentContext ? { name: componentContext.name, filePath: this.selectedComponent?.filePath || "" } : this.selectedComponent;
     let sourceCode = "";
     const filePath = component?.filePath || "";
@@ -1590,34 +1615,66 @@ ${refs.join(`
 `)}`;
       }
     }
-    const chatPrompt = [
-      "You are helping the user explore UI design variations for their project.",
-      "You have access to stashes MCP tools to generate, list, show, browse, vary, and apply stashes.",
-      "If the user asks you to generate, create, or make variations, use the stashes_generate tool.",
-      "If the user asks to vary an existing stash, use the stashes_vary tool.",
-      "If the user asks about what a stash changed, its diff, or its contents, use stashes_show to inspect it.",
-      'IMPORTANT: NEVER call stashes_apply unless the user explicitly asks to "apply" or "merge" a stash.',
-      'IMPORTANT: NEVER call stashes_remove unless the user explicitly asks to "delete" or "remove" a stash.',
-      "Otherwise, respond conversationally about their project and stashes.",
-      "",
-      component ? `Component: ${component.name}` : "",
-      filePath !== "auto-detect" ? `File: ${filePath}` : "",
-      sourceCode ? `
+    const existingSessionId = this.chatSessions.get(chatId);
+    let chatPrompt;
+    if (existingSessionId) {
+      const parts = [message];
+      if (stashContext)
+        parts.push(stashContext);
+      if (component && !existingSessionId)
+        parts.push(`Component: ${component.name}`);
+      chatPrompt = parts.join(`
+`);
+    } else {
+      chatPrompt = [
+        "You are helping the user explore UI design variations for their project.",
+        "You have access to stashes MCP tools to generate, list, show, browse, vary, and apply stashes.",
+        "If the user asks you to generate, create, or make variations, use the stashes_generate tool.",
+        "If the user asks to vary an existing stash, use the stashes_vary tool.",
+        "If the user asks about what a stash changed, its diff, or its contents, use stashes_show to inspect it.",
+        'IMPORTANT: NEVER call stashes_apply unless the user explicitly asks to "apply" or "merge" a stash.',
+        'IMPORTANT: NEVER call stashes_remove unless the user explicitly asks to "delete" or "remove" a stash.',
+        "Otherwise, respond conversationally about their project and stashes.",
+        "",
+        component ? `Component: ${component.name}` : "",
+        filePath !== "auto-detect" ? `File: ${filePath}` : "",
+        sourceCode ? `
 Source:
 \`\`\`
 ${sourceCode.substring(0, 3000)}
 \`\`\`` : "",
-      stashContext,
-      "",
-      `User: ${message}`
-    ].filter(Boolean).join(`
+        stashContext,
+        "",
+        `User: ${message}`
+      ].filter(Boolean).join(`
 `);
-    const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath);
-    let fullResponse = "";
+    }
+    const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath, existingSessionId);
+    let thinkingBuf = "";
+    let textBuf = "";
+    const pendingMessages = [];
+    const now = new Date().toISOString();
+    function flushThinking() {
+      if (!thinkingBuf)
+        return;
+      pendingMessages.push({ id: crypto.randomUUID(), role: "assistant", content: thinkingBuf, type: "thinking", createdAt: now });
+      thinkingBuf = "";
+    }
+    function flushText() {
+      if (!textBuf)
+        return;
+      pendingMessages.push({ 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) {
+          this.chatSessions.set(chatId, chunk.sessionId);
+          continue;
+        }
         if (chunk.type === "text") {
-          fullResponse += chunk.content;
+          flushThinking();
+          textBuf += chunk.content;
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
@@ -1625,6 +1682,7 @@ ${sourceCode.substring(0, 3000)}
             source: "chat"
           });
         } else if (chunk.type === "thinking") {
+          thinkingBuf += chunk.content;
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
@@ -1632,36 +1690,66 @@ ${sourceCode.substring(0, 3000)}
             source: "chat"
           });
         } else if (chunk.type === "tool_use") {
+          flushThinking();
+          flushText();
+          let toolName = "unknown";
+          let toolParams = {};
+          try {
+            const parsed = JSON.parse(chunk.content);
+            toolName = parsed.tool ?? "unknown";
+            toolParams = parsed.input ?? {};
+          } catch {}
+          pendingMessages.push({
+            id: crypto.randomUUID(),
+            role: "assistant",
+            content: chunk.content,
+            type: "tool_start",
+            toolName,
+            toolParams,
+            toolStatus: "running",
+            createdAt: now
+          });
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
             streamType: "tool_start",
             source: "chat",
-            toolName: chunk.toolName ?? "unknown",
-            toolParams: chunk.toolInput ?? {},
+            toolName,
+            toolParams,
             toolStatus: "running"
           });
         } else if (chunk.type === "tool_result") {
+          let toolResult = chunk.content;
+          let isError = false;
+          try {
+            const parsed = JSON.parse(chunk.content);
+            toolResult = parsed.result ?? chunk.content;
+            isError = !!parsed.is_error;
+          } catch {}
+          pendingMessages.push({
+            id: crypto.randomUUID(),
+            role: "assistant",
+            content: chunk.content,
+            type: "tool_end",
+            toolStatus: isError ? "error" : "completed",
+            toolResult: toolResult.substring(0, 300),
+            createdAt: now
+          });
           this.broadcast({
             type: "ai_stream",
             content: chunk.content,
             streamType: "tool_end",
             source: "chat",
-            toolName: chunk.toolName ?? "unknown",
-            toolStatus: chunk.isError ? "error" : "completed",
-            toolResult: chunk.content.substring(0, 300)
+            toolStatus: isError ? "error" : "completed",
+            toolResult: toolResult.substring(0, 300)
           });
         }
       }
       await aiProcess.process.exited;
-      if (fullResponse) {
-        this.persistence.saveChatMessage(projectId, chatId, {
-          id: crypto.randomUUID(),
-          role: "assistant",
-          content: fullResponse,
-          type: "text",
-          createdAt: new Date().toISOString()
-        });
+      flushThinking();
+      flushText();
+      for (const msg of pendingMessages) {
+        this.persistence.saveChatMessage(projectId, chatId, msg);
       }
     } catch (err) {
       this.broadcast({