@whittlelabs/sifter 0.30.3 → 0.30.4

package/bin.js

@@ -10097,7 +10097,7 @@ var require_claude_code = __commonJS({
           const { response, readPaths, toolInputs } = await this.runClaude(prompt, spec, runCwd, childEnv, signal, hintedModel, reporter, void 0, dispatch.job.id);
           if (workspace) {
             const reads = [...readPaths];
-            for (const rel of creditOverlayReads(toolInputs, workspace.overlay?.writtenPaths ?? [])) {
+            for (const rel of creditOverlayReads(toolInputs, workspace.overlay?.writtenPaths ?? [], runCwd)) {
               reads.push(path_1.default.join(runCwd, rel));
             }
             response.outputs.push({
@@ -10425,7 +10425,7 @@ var require_claude_code = __commonJS({
       return { finalText, readPaths, usage, resultMeta, structuredOutput, sessionId, toolInputs };
     }
     var MAX_REPORTED_READS = 2e3;
-    function relativeWorkspaceReads(readPaths, cwd) {
+    function workspaceRoots(cwd) {
       const root = path_1.default.resolve(cwd);
       const roots = [root];
       try {
@@ -10434,6 +10434,11 @@ var require_claude_code = __commonJS({
           roots.push(real);
       } catch {
       }
+      return roots;
+    }
+    function relativeWorkspaceReads(readPaths, cwd) {
+      const roots = workspaceRoots(cwd);
+      const root = roots[0];
       const out = /* @__PURE__ */ new Set();
       for (const p of readPaths) {
         const resolved = path_1.default.resolve(root, p);
@@ -10493,9 +10498,10 @@ var require_claude_code = __commonJS({
       }
       return new RegExp(`${re}$`);
     }
-    function creditOverlayReads(toolInputs, writtenPaths) {
+    function creditOverlayReads(toolInputs, writtenPaths, runCwd) {
       if (writtenPaths.length === 0 || toolInputs.length === 0)
         return [];
+      const roots = runCwd ? workspaceRoots(runCwd) : [];
       const dirs = /* @__PURE__ */ new Set();
       for (const rel of writtenPaths) {
         const parts = rel.split("/");
@@ -10503,27 +10509,29 @@ var require_claude_code = __commonJS({
           dirs.add(`${parts.slice(0, i).join("/")}/`);
       }
       const dirAlt = [...dirs].map(escapeRegExp).join("|");
-      const wordRe = dirs.size > 0 ? new RegExp(`(?:${dirAlt})[^\\s"'\`;|&<>(),\\\\]*`, "g") : null;
+      const wordRe = dirs.size > 0 ? new RegExp(`(?:${dirAlt})[^\\s"'\`;|&<>()\\\\]*`, "g") : null;
       const findRe = dirs.size > 0 ? new RegExp(`\\bfind\\s+(?:\\./)?(${[...dirs].map((d) => escapeRegExp(d.slice(0, -1))).join("|")})/?(?=\\s|$)`, "g") : null;
-      const readerRe = /(?:^|[\s"])(?:-exec|-execdir|xargs)\b[^;|&]*\b(?:cat|head|tail|sed|awk|less|more|bat)\b/;
+      const readerRe = new RegExp(`(?:^|[\\s"])(?:-exec|-execdir|xargs)\\b[^;|&]*\\b${READERS}\\b`);
+      const plainReaderRe = new RegExp(`(?:^|[\\s"'\`;|&(])${READERS}\\b`);
       const credited = /* @__PURE__ */ new Set();
-      for (const input of toolInputs) {
+      for (const raw of toolInputs) {
+        const input = roots.reduce((s, r) => s.split(`${r}/`).join(""), raw);
         for (const rel of writtenPaths) {
           if (input.includes(rel))
             credited.add(rel);
         }
-        if (!wordRe)
-          continue;
-        for (const match of input.matchAll(wordRe)) {
-          const word = match[0];
-          if (!GLOB_CHARS.test(word))
-            continue;
-          const re = globToRegExp(word);
-          if (!re)
-            continue;
-          for (const rel of writtenPaths) {
-            if (re.test(rel))
-              credited.add(rel);
+        if (wordRe) {
+          for (const match of input.matchAll(wordRe)) {
+            const word = match[0];
+            if (!GLOB_CHARS.test(word))
+              continue;
+            const re = globToRegExp(word);
+            if (!re)
+              continue;
+            for (const rel of writtenPaths) {
+              if (re.test(rel))
+                credited.add(rel);
+            }
           }
         }
         if (findRe && readerRe.test(input)) {
@@ -10535,9 +10543,27 @@ var require_claude_code = __commonJS({
             }
           }
         }
+        if (!plainReaderRe.test(input))
+          continue;
+        for (const match of input.matchAll(CD_RE)) {
+          const target = match[1].replace(/^\.\//, "").replace(/\/+$/, "");
+          const base = target.length > 0 ? `${target}/` : "";
+          for (const rel of writtenPaths) {
+            if (!rel.startsWith(base))
+              continue;
+            if (namesBareWord(input, rel.slice(base.length)))
+              credited.add(rel);
+          }
+        }
       }
       return [...credited].sort();
     }
+    var READERS = "(?:cat|head|tail|sed|awk|less|more|bat)";
+    var CD_RE = /(?:^|[\s"'`;|&(])cd\s+(?:--\s+)?["']?([^\s"'`;|&<>()\\]+)/g;
+    function namesBareWord(input, word) {
+      const edge = String.raw`[\s"'\`;|&<>(),\\]`;
+      return new RegExp(`(?:^|${edge})${escapeRegExp(word)}(?=$|${edge})`).test(input);
+    }
     async function keepTranscript(dir, name, stdout) {
       try {
         await fs_1.promises.mkdir(dir, { recursive: true });
@@ -25539,7 +25565,7 @@ var import_path = require("path");
 var import_promises = require("fs/promises");
 var import_yaml = __toESM(require_dist4());
 var import_shuttle = __toESM(require_dist5());
-var buildVersion = true ? "0.30.3" : pkg.version;
+var buildVersion = true ? "0.30.4" : pkg.version;
 var sifterBrand = {
   product: {
     id: "sifter",