stashes 0.1.52 → 0.1.53

package/dist/cli.js

@@ -548,7 +548,6 @@ import { writeFileSync as writeFileSync2, existsSync as existsSync4, mkdirSync a
 import { join as join4 } from "path";
 import { tmpdir } from "os";
 var CLAUDE_BIN = "/opt/homebrew/bin/claude";
-var DEFAULT_TOOLS = ["Read", "Write", "Edit", "Glob", "Grep", "Bash"];
 function getPlaywrightMcpConfigPath() {
   const configDir = join4(tmpdir(), "stashes-mcp");
   const configPath = join4(configDir, "playwright.json");
@@ -562,11 +561,29 @@ function getPlaywrightMcpConfigPath() {
   }
   return configPath;
 }
+var OVERHEAD_TOOLS = [
+  "Agent",
+  "TodoWrite",
+  "TaskCreate",
+  "TaskUpdate",
+  "TaskList",
+  "TaskGet",
+  "Skill",
+  "ToolSearch",
+  "EnterPlanMode",
+  "ExitPlanMode",
+  "WebSearch",
+  "WebFetch",
+  "NotebookEdit",
+  "mcp__UseAI__*",
+  "mcp__stashes__*",
+  "mcp__plugin_drills*",
+  "mcp__plugin_coverit*"
+];
 var processes = new Map;
 function startAiProcess(idOrOpts, prompt, cwd, resumeSessionId, model) {
   const opts = typeof idOrOpts === "string" ? { id: idOrOpts, prompt, cwd, resumeSessionId, model } : idOrOpts;
-  const bare = opts.bare ?? true;
-  const tools = opts.tools ?? DEFAULT_TOOLS;
+  const restricted = opts.tools !== undefined;
   killAiProcess(opts.id);
   logger.info("claude", `spawning process: ${opts.id}`, {
     cwd: opts.cwd,
@@ -574,15 +591,14 @@ function startAiProcess(idOrOpts, prompt, cwd, resumeSessionId, model) {
     promptPreview: opts.prompt.substring(0, 100),
     resumeSessionId: opts.resumeSessionId,
     model: opts.model,
-    bare,
-    tools: bare ? tools.join(",") : "all"
+    restricted,
+    tools: restricted ? opts.tools.join(",") || "none" : "all"
   });
   const cmd = [CLAUDE_BIN, "-p", opts.prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"];
-  if (bare) {
-    cmd.push("--bare");
-    if (tools.length > 0) {
-      cmd.push("--tools", tools.join(","));
-    }
+  if (restricted) {
+    cmd.push("--tools", opts.tools.length > 0 ? opts.tools.join(",") : '""');
+    cmd.push("--disallowedTools", OVERHEAD_TOOLS.join(","));
+    cmd.push("--strict-mcp-config");
     if (opts.mcpConfigPath) {
       cmd.push("--mcp-config", opts.mcpConfigPath);
     }
@@ -872,7 +888,6 @@ async function captureSmartScreenshots(opts) {
     prompt,
     cwd: worktreePath,
     model: modelFlag,
-    bare: true,
     tools: [],
     mcpConfigPath: getPlaywrightMcpConfigPath()
   });
@@ -1041,8 +1056,7 @@ async function generate(opts) {
     const aiProcess = startAiProcess({
       id: stashId,
       prompt: stashPrompt,
-      cwd: worktree.path,
-      bare: false
+      cwd: worktree.path
     });
     try {
       for await (const chunk of parseClaudeStream(aiProcess.process)) {
@@ -1242,8 +1256,7 @@ async function vary(opts) {
   const aiProcess = startAiProcess({
     id: stashId,
     prompt: varyPrompt,
-    cwd: worktree.path,
-    bare: false
+    cwd: worktree.path
   });
   try {
     for await (const chunk of parseClaudeStream(aiProcess.process)) {
@@ -1914,7 +1927,6 @@ class StashService {
       prompt,
       cwd: this.projectPath,
       model: "claude-haiku-4-5-20251001",
-      bare: true,
       tools: ["Read", "Grep", "Glob", "Bash"]
     });
     let resolvedPath = "";
@@ -2030,8 +2042,7 @@ ${sourceCode.substring(0, 3000)}
       id: "chat",
       prompt: chatPrompt,
       cwd: this.projectPath,
-      resumeSessionId: existingSessionId,
-      bare: false
+      resumeSessionId: existingSessionId
     });
     let thinkingBuf = "";
     let textBuf = "";
@@ -2130,11 +2141,13 @@ ${sourceCode.substring(0, 3000)}
             toolResult = parsed.result ?? chunk.content;
             isError = !!parsed.is_error;
           } catch {}
+          const endToolName = chunk.toolName ?? "unknown";
           save({
             id: crypto.randomUUID(),
             role: "assistant",
             content: chunk.content,
             type: "tool_end",
+            toolName: endToolName,
             toolStatus: isError ? "error" : "completed",
             toolResult: toolResult.substring(0, 300),
             stashActivity,
@@ -2145,6 +2158,7 @@ ${sourceCode.substring(0, 3000)}
             content: chunk.content,
             streamType: "tool_end",
             source: "chat",
+            toolName: endToolName,
             toolStatus: isError ? "error" : "completed",
             toolResult: toolResult.substring(0, 300)
           });

package/dist/mcp.js

@@ -533,7 +533,6 @@ import { writeFileSync as writeFileSync2, existsSync as existsSync4, mkdirSync a
 import { join as join4 } from "path";
 import { tmpdir } from "os";
 var CLAUDE_BIN = "/opt/homebrew/bin/claude";
-var DEFAULT_TOOLS = ["Read", "Write", "Edit", "Glob", "Grep", "Bash"];
 function getPlaywrightMcpConfigPath() {
   const configDir = join4(tmpdir(), "stashes-mcp");
   const configPath = join4(configDir, "playwright.json");
@@ -547,11 +546,29 @@ function getPlaywrightMcpConfigPath() {
   }
   return configPath;
 }
+var OVERHEAD_TOOLS = [
+  "Agent",
+  "TodoWrite",
+  "TaskCreate",
+  "TaskUpdate",
+  "TaskList",
+  "TaskGet",
+  "Skill",
+  "ToolSearch",
+  "EnterPlanMode",
+  "ExitPlanMode",
+  "WebSearch",
+  "WebFetch",
+  "NotebookEdit",
+  "mcp__UseAI__*",
+  "mcp__stashes__*",
+  "mcp__plugin_drills*",
+  "mcp__plugin_coverit*"
+];
 var processes = new Map;
 function startAiProcess(idOrOpts, prompt, cwd, resumeSessionId, model) {
   const opts = typeof idOrOpts === "string" ? { id: idOrOpts, prompt, cwd, resumeSessionId, model } : idOrOpts;
-  const bare = opts.bare ?? true;
-  const tools = opts.tools ?? DEFAULT_TOOLS;
+  const restricted = opts.tools !== undefined;
   killAiProcess(opts.id);
   logger.info("claude", `spawning process: ${opts.id}`, {
     cwd: opts.cwd,
@@ -559,15 +576,14 @@ function startAiProcess(idOrOpts, prompt, cwd, resumeSessionId, model) {
     promptPreview: opts.prompt.substring(0, 100),
     resumeSessionId: opts.resumeSessionId,
     model: opts.model,
-    bare,
-    tools: bare ? tools.join(",") : "all"
+    restricted,
+    tools: restricted ? opts.tools.join(",") || "none" : "all"
   });
   const cmd = [CLAUDE_BIN, "-p", opts.prompt, "--output-format=stream-json", "--verbose", "--dangerously-skip-permissions"];
-  if (bare) {
-    cmd.push("--bare");
-    if (tools.length > 0) {
-      cmd.push("--tools", tools.join(","));
-    }
+  if (restricted) {
+    cmd.push("--tools", opts.tools.length > 0 ? opts.tools.join(",") : '""');
+    cmd.push("--disallowedTools", OVERHEAD_TOOLS.join(","));
+    cmd.push("--strict-mcp-config");
     if (opts.mcpConfigPath) {
       cmd.push("--mcp-config", opts.mcpConfigPath);
     }
@@ -857,7 +873,6 @@ async function captureSmartScreenshots(opts) {
     prompt,
     cwd: worktreePath,
     model: modelFlag,
-    bare: true,
     tools: [],
     mcpConfigPath: getPlaywrightMcpConfigPath()
   });
@@ -1026,8 +1041,7 @@ async function generate(opts) {
     const aiProcess = startAiProcess({
       id: stashId,
       prompt: stashPrompt,
-      cwd: worktree.path,
-      bare: false
+      cwd: worktree.path
     });
     try {
       for await (const chunk of parseClaudeStream(aiProcess.process)) {
@@ -1227,8 +1241,7 @@ async function vary(opts) {
   const aiProcess = startAiProcess({
     id: stashId,
     prompt: varyPrompt,
-    cwd: worktree.path,
-    bare: false
+    cwd: worktree.path
   });
   try {
     for await (const chunk of parseClaudeStream(aiProcess.process)) {
@@ -2138,7 +2151,6 @@ class StashService {
       prompt,
       cwd: this.projectPath,
       model: "claude-haiku-4-5-20251001",
-      bare: true,
       tools: ["Read", "Grep", "Glob", "Bash"]
     });
     let resolvedPath = "";
@@ -2254,8 +2266,7 @@ ${sourceCode.substring(0, 3000)}
       id: "chat",
       prompt: chatPrompt,
       cwd: this.projectPath,
-      resumeSessionId: existingSessionId,
-      bare: false
+      resumeSessionId: existingSessionId
     });
     let thinkingBuf = "";
     let textBuf = "";
@@ -2354,11 +2365,13 @@ ${sourceCode.substring(0, 3000)}
             toolResult = parsed.result ?? chunk.content;
             isError = !!parsed.is_error;
           } catch {}
+          const endToolName = chunk.toolName ?? "unknown";
           save({
             id: crypto.randomUUID(),
             role: "assistant",
             content: chunk.content,
             type: "tool_end",
+            toolName: endToolName,
             toolStatus: isError ? "error" : "completed",
             toolResult: toolResult.substring(0, 300),
             stashActivity,
@@ -2369,6 +2382,7 @@ ${sourceCode.substring(0, 3000)}
             content: chunk.content,
             streamType: "tool_end",
             source: "chat",
+            toolName: endToolName,
             toolStatus: isError ? "error" : "completed",
             toolResult: toolResult.substring(0, 300)
           });