@tritard/waterbrother 0.8.2 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Waterbrother: Grok-powered coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -1682,6 +1682,14 @@ function extractExplicitReadOnlyRoots(line, cwd) {
   return [...new Set(roots)];
 }
 
+function extractExplicitWriteRoots(line, cwd) {
+  const text = String(line || "").trim();
+  if (!/\b(create|make|build|write|save|generate|scaffold|edit|update|rewrite|delete|remove|move|rename)\b/i.test(text)) {
+    return [];
+  }
+  return extractExplicitReadOnlyRoots(text, cwd);
+}
+
 function maybeRewriteExplicitInspectionPrompt(promptText, readOnlyRoots = []) {
   const text = String(promptText || "").trim();
   if (readOnlyRoots.length === 0) return text;
@@ -3308,8 +3316,10 @@ async function runTextTurnInteractive({
   spinnerLabel = "thinking..."
 }) {
   const readOnlyRoots = extractExplicitReadOnlyRoots(promptText, context.cwd);
+  const writeRoots = extractExplicitWriteRoots(promptText, context.cwd);
   const effectivePromptText = maybeRewriteExplicitInspectionPrompt(promptText, readOnlyRoots);
   agent.toolRuntime.setReadOnlyRoots(readOnlyRoots);
+  agent.toolRuntime.setWriteRoots(writeRoots);
   await maybeAutoCompactConversation({
     agent,
     currentSession,
@@ -3459,6 +3469,7 @@ async function runTextTurnInteractive({
     detachInterruptListener();
     spinner.stop();
     agent.toolRuntime.setReadOnlyRoots([]);
+    agent.toolRuntime.setWriteRoots([]);
   }
 
   context.lastUsage = response?.usage || null;

package/src/path-utils.js

@@ -39,8 +39,8 @@ function isAllowedReadOnlyHomePath(targetPath) {
   return COMMON_READ_ONLY_HOME_ROOTS.some((rootPath) => isWithinPath(rootPath, targetPath));
 }
 
-function isAllowedExplicitReadOnlyPath(targetPath, allowedReadOnlyRoots = []) {
-  return allowedReadOnlyRoots.some((rootPath) => {
+function isAllowedExplicitPath(targetPath, allowedRoots = []) {
+  return allowedRoots.some((rootPath) => {
     if (!rootPath) return false;
     const resolvedRoot = canonicalizePath(String(rootPath));
     return isWithinPath(resolvedRoot, targetPath);
@@ -65,11 +65,14 @@ export function resolveSandboxPath(baseDir, targetPath, allowOutsideCwd = false,
     const rel = path.relative(baseReal, resolved);
     const outside = rel.startsWith("..") || path.isAbsolute(rel);
     const allowExplicitReadOnly =
-      Array.isArray(options.allowedReadOnlyRoots) && isAllowedExplicitReadOnlyPath(resolved, options.allowedReadOnlyRoots);
+      Array.isArray(options.allowedReadOnlyRoots) && isAllowedExplicitPath(resolved, options.allowedReadOnlyRoots);
+    const allowExplicitWrite =
+      Array.isArray(options.allowedWriteRoots) && isAllowedExplicitPath(resolved, options.allowedWriteRoots);
     if (
       outside &&
       !(options.allowReadOnlyHome === true && isAllowedReadOnlyHomePath(resolved)) &&
-      !allowExplicitReadOnly
+      !allowExplicitReadOnly &&
+      !allowExplicitWrite
     ) {
       throw new Error(`Path is outside cwd sandbox: ${targetPath}`);
     }

package/src/tools.js

@@ -5,7 +5,7 @@ import crypto from "node:crypto";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 import { normalizeAutonomyMode, normalizeExperienceMode } from "./modes.js";
-import { resolveSandboxPath } from "./path-utils.js";
+import { expandHomePath, resolveSandboxPath } from "./path-utils.js";
 import { promptKeyChoice, promptLine } from "./prompt.js";
 import { McpManager } from "./mcp.js";
 
@@ -394,8 +394,8 @@ function globToRegExp(glob) {
 }
 
 function matchesPattern(value, pattern) {
-  const normalizedValue = String(value || "").replace(/^\.\//, "");
-  const normalizedPattern = String(pattern || "").replace(/^\.\//, "");
+  const normalizedValue = normalizePathPattern(value);
+  const normalizedPattern = normalizePathPattern(pattern);
   return globToRegExp(normalizedPattern).test(normalizedValue);
 }
 
@@ -409,7 +409,14 @@ function extractPatchPaths(patchText) {
 }
 
 function normalizePathList(values = []) {
-  return uniqueStrings(values).map((item) => item.replace(/^\.\//, "").replace(/\\/g, "/"));
+  return uniqueStrings(values).map((item) => normalizePathPattern(item));
+}
+
+function normalizePathPattern(value) {
+  const raw = String(value || "").trim();
+  if (!raw) return "";
+  const expanded = expandHomePath(raw);
+  return String(expanded).replace(/^\.\//, "").replace(/\\/g, "/");
 }
 
 function looksLikeMutatingShellCommand(command) {
@@ -891,6 +898,7 @@ export function createToolRuntime({
   let checkpointCreatedThisTurn = false;
   let currentTurn = buildDefaultTurnRecord();
   let currentReadOnlyRoots = [];
+  let currentWriteRoots = [];
   let currentExperienceMode = normalizeExperienceMode(experienceMode);
   let currentAutonomyMode = normalizeAutonomyMode(autonomyMode);
   let currentRequireTurnContracts = requireTurnContracts !== false;
@@ -1326,7 +1334,9 @@ ${clipped}`;
   }
 
   async function writeFile(args = {}) {
-    const filePath = resolveSandboxPath(cwd, args.path, allowOutsideCwd);
+    const filePath = resolveSandboxPath(cwd, args.path, allowOutsideCwd, {
+      allowedWriteRoots: currentWriteRoots
+    });
     await fs.mkdir(path.dirname(filePath), { recursive: true });
     if (args.mode === "append") {
       await fs.appendFile(filePath, args.content, "utf8");
@@ -1383,7 +1393,9 @@ ${clipped}`;
   }
 
   async function replaceInFile(args = {}) {
-    const filePath = resolveSandboxPath(cwd, args.path, allowOutsideCwd);
+    const filePath = resolveSandboxPath(cwd, args.path, allowOutsideCwd, {
+      allowedWriteRoots: currentWriteRoots
+    });
     const source = await fs.readFile(filePath, "utf8");
 
     let next;
@@ -1564,13 +1576,17 @@ ${clipped}`;
   }
 
   async function makeDirectory(args = {}) {
-    const target = resolveSandboxPath(cwd, args.path, allowOutsideCwd);
+    const target = resolveSandboxPath(cwd, args.path, allowOutsideCwd, {
+      allowedWriteRoots: currentWriteRoots
+    });
     await fs.mkdir(target, { recursive: true });
     return pretty({ ok: true, path: args.path });
   }
 
   async function deletePath(args = {}) {
-    const target = resolveSandboxPath(cwd, args.path, allowOutsideCwd);
+    const target = resolveSandboxPath(cwd, args.path, allowOutsideCwd, {
+      allowedWriteRoots: currentWriteRoots
+    });
     if (target === cwd) throw new Error("Refusing to delete cwd root");
     await fs.rm(target, { recursive: Boolean(args.recursive), force: false });
     return pretty({ ok: true, path: args.path, recursive: Boolean(args.recursive) });
@@ -2181,6 +2197,8 @@ ${clipped}`;
     getShellCwd,
     setReadOnlyRoots(paths = []) { currentReadOnlyRoots = normalizePathList(paths); },
     getReadOnlyRoots() { return [...currentReadOnlyRoots]; },
+    setWriteRoots(paths = []) { currentWriteRoots = normalizePathList(paths); },
+    getWriteRoots() { return [...currentWriteRoots]; },
     setExperienceMode(mode) { currentExperienceMode = normalizeExperienceMode(mode); },
     getExperienceMode() { return currentExperienceMode; },
     setAutonomyMode(mode) { currentAutonomyMode = normalizeAutonomyMode(mode); },