stashes 0.1.21 → 0.1.23

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,29 +1419,41 @@ ${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);
+    }
+    const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath, existingSessionId);
     let thinkingBuf = "";
     let textBuf = "";
     const pendingMessages = [];
@@ -1435,6 +1472,10 @@ ${sourceCode.substring(0, 3000)}
     }
     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") {
           flushThinking();
           textBuf += chunk.content;
@@ -2523,8 +2564,8 @@ async function setupCommand(options) {
 }
 
 // src/commands/update.ts
-import { spawn as spawn5, execSync } from "child_process";
-import { writeFileSync as writeFileSync3, chmodSync, readFileSync as readFileSync8 } from "fs";
+import { execFileSync, execSync } from "child_process";
+import { writeFileSync as writeFileSync3, unlinkSync, chmodSync, readFileSync as readFileSync8 } from "fs";
 import { tmpdir } from "os";
 import { join as join11, dirname as dirname4 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -2545,7 +2586,7 @@ function fetchLatestVersion() {
     return null;
   }
 }
-function buildUpdateScript(scriptPath) {
+function buildUpdateScript() {
   return [
     "#!/bin/bash",
     "set -e",
@@ -2561,12 +2602,8 @@ function buildUpdateScript(scriptPath) {
     'echo "Re-registering with AI tools..."',
     "stashes setup",
     "",
-    "NEW_VERSION=$(stashes --version)",
     'echo ""',
-    'echo "\u2713 Updated to stashes v${NEW_VERSION}"',
-    "",
-    "# Self-cleanup",
-    `rm -f "${scriptPath}"`
+    'echo "\u2713 Update complete!"'
   ].join(`
 `);
 }
@@ -2614,15 +2651,20 @@ async function updateCommand() {
     s.stop(`Removed from ${configuredTools.length} tool${configuredTools.length === 1 ? "" : "s"}`);
   }
   const scriptPath = join11(tmpdir(), `stashes-update-${Date.now()}.sh`);
-  writeFileSync3(scriptPath, buildUpdateScript(scriptPath), "utf-8");
+  writeFileSync3(scriptPath, buildUpdateScript(), "utf-8");
   chmodSync(scriptPath, 493);
-  p2.outro("Handing off to updater...");
-  const child = spawn5("bash", [scriptPath], {
-    detached: true,
-    stdio: "inherit"
-  });
-  child.unref();
-  process.exit(0);
+  try {
+    execFileSync("bash", [scriptPath], { stdio: "inherit" });
+  } catch {
+    console.error(`
+Update failed. Try manually:`);
+    console.error("  npm install -g stashes@latest && stashes setup");
+    process.exitCode = 1;
+  } finally {
+    try {
+      unlinkSync(scriptPath);
+    } catch {}
+  }
 }
 
 // src/index.ts

package/dist/commands/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAuDA,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CA6EnD"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAmDA,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAmFnD"}

package/dist/commands/update.js

@@ -1,5 +1,5 @@
-import { spawn, execSync } from 'node:child_process';
-import { writeFileSync, chmodSync, readFileSync } from 'node:fs';
+import { execFileSync, execSync } from 'node:child_process';
+import { writeFileSync, unlinkSync, chmodSync, readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -23,7 +23,7 @@ function fetchLatestVersion() {
         return null;
     }
 }
-function buildUpdateScript(scriptPath) {
+function buildUpdateScript() {
     return [
         '#!/bin/bash',
         'set -e',
@@ -39,12 +39,8 @@ function buildUpdateScript(scriptPath) {
         'echo "Re-registering with AI tools..."',
         'stashes setup',
         '',
-        'NEW_VERSION=$(stashes --version)',
         'echo ""',
-        'echo "✓ Updated to stashes v${NEW_VERSION}"',
-        '',
-        '# Self-cleanup',
-        `rm -f "${scriptPath}"`,
+        'echo "✓ Update complete!"',
     ].join('\n');
 }
 // ── Command ─────────────────────────────────────────────────────────────────────
@@ -98,18 +94,29 @@ export async function updateCommand() {
         }
         s.stop(`Removed from ${configuredTools.length} tool${configuredTools.length === 1 ? '' : 's'}`);
     }
-    // Write a detached shell script to handle uninstall → install → setup.
-    // This avoids the self-destruct problem: the current Node process exits
-    // cleanly before npm removes the binary from disk.
+    // Run uninstall → install → setup via a synchronous shell script.
+    // Safe on Unix: npm uninstall deletes the binary on disk, but the OS keeps
+    // the inode alive for this running process (all code is already in memory).
+    // The parent blocks until the script finishes, then exits cleanly — no
+    // shell prompt interleaving, no dangling background process.
     const scriptPath = join(tmpdir(), `stashes-update-${Date.now()}.sh`);
-    writeFileSync(scriptPath, buildUpdateScript(scriptPath), 'utf-8');
+    writeFileSync(scriptPath, buildUpdateScript(), 'utf-8');
     chmodSync(scriptPath, 0o755);
-    p.outro('Handing off to updater...');
-    const child = spawn('bash', [scriptPath], {
-        detached: true,
-        stdio: 'inherit',
-    });
-    child.unref();
-    process.exit(0);
+    try {
+        execFileSync('bash', [scriptPath], { stdio: 'inherit' });
+    }
+    catch {
+        console.error('\nUpdate failed. Try manually:');
+        console.error('  npm install -g stashes@latest && stashes setup');
+        process.exitCode = 1;
+    }
+    finally {
+        try {
+            unlinkSync(scriptPath);
+        }
+        catch {
+            // Script may already be gone
+        }
+    }
 }
 //# sourceMappingURL=update.js.map

package/dist/commands/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}

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,29 +1615,41 @@ ${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);
+    }
+    const aiProcess = startAiProcess("chat", chatPrompt, this.projectPath, existingSessionId);
     let thinkingBuf = "";
     let textBuf = "";
     const pendingMessages = [];
@@ -1631,6 +1668,10 @@ ${sourceCode.substring(0, 3000)}
     }
     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") {
           flushThinking();
           textBuf += chunk.content;