@whittlelabs/sifter 0.30.0 → 0.30.1

package/bin.js

@@ -10008,6 +10008,8 @@ var require_claude_code = __commonJS({
     exports2.createClaudeCodeExecutor = createClaudeCodeExecutor;
     exports2.parseStreamJson = parseStreamJson;
     exports2.relativeWorkspaceReads = relativeWorkspaceReads;
+    exports2.globToRegExp = globToRegExp;
+    exports2.creditOverlayReads = creditOverlayReads;
     exports2.extractJsonObject = extractJsonObject;
     var child_process_1 = require("child_process");
     var fs_1 = require("fs");
@@ -10092,12 +10094,11 @@ var require_claude_code = __commonJS({
             promptOnlyScratch = await fs_1.promises.mkdtemp(path_1.default.join(tmpBase, "shuttle-cc-run-"));
           }
           const runCwd = workspace?.cwd ?? promptOnlyScratch;
-          const { response, readPaths, toolText } = await this.runClaude(prompt, spec, runCwd, childEnv, signal, hintedModel, reporter);
+          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 workspace.overlay?.writtenPaths ?? []) {
-              if (toolText.includes(rel))
-                reads.push(path_1.default.join(runCwd, rel));
+            for (const rel of creditOverlayReads(toolInputs, workspace.overlay?.writtenPaths ?? [])) {
+              reads.push(path_1.default.join(runCwd, rel));
             }
             response.outputs.push({
               label: "workspace_reads",
@@ -10155,14 +10156,14 @@ var require_claude_code = __commonJS({
             outputLabel: handle.outputLabel,
             outputSchema: handle.outputSchema
           };
-          const { response } = await this.runClaude(followUp, spec, scratch, handle.childEnv, signal, handle.model, null, handle.sessionId);
+          const { response } = await this.runClaude(followUp, spec, scratch, handle.childEnv, signal, handle.model, null, handle.sessionId, `${handle.sessionId}-repair`);
           return response;
         } finally {
           await fs_1.promises.rm(scratch, { recursive: true, force: true }).catch(() => {
           });
         }
       }
-      runClaude(prompt, spec, cwd, childEnv, signal, modelOverride, reporter, resumeSessionId) {
+      runClaude(prompt, spec, cwd, childEnv, signal, modelOverride, reporter, resumeSessionId, transcriptName) {
         const outputLabel = spec.outputLabel;
         const model = modelOverride ?? this.config.model;
         return new Promise((resolve, reject) => {
@@ -10251,6 +10252,9 @@ var require_claude_code = __commonJS({
               tap.end();
             }
             const stdout = Buffer.concat(stdoutChunks).toString("utf-8");
+            if (this.config.keepTranscripts && transcriptName) {
+              void keepTranscript((0, apply_1.expandHome)(this.config.keepTranscripts), transcriptName, stdout);
+            }
             if (code === 0) {
               try {
                 const stream = parseStreamJson(stdout);
@@ -10286,7 +10290,7 @@ var require_claude_code = __commonJS({
                     } : {}
                   },
                   readPaths: stream.readPaths,
-                  toolText: stream.toolText
+                  toolInputs: stream.toolInputs
                 }));
               } catch (err) {
                 settle(() => reject(err instanceof Error ? err : new Error(String(err))));
@@ -10334,6 +10338,12 @@ var require_claude_code = __commonJS({
         }
         validated.timeout = config.timeout;
       }
+      if (config.keepTranscripts !== void 0) {
+        if (typeof config.keepTranscripts !== "string" || config.keepTranscripts.length === 0) {
+          throw new Error('"keepTranscripts" must be a non-empty directory path');
+        }
+        validated.keepTranscripts = config.keepTranscripts;
+      }
       if (config.overlayAllowedHosts !== void 0) {
         if (!Array.isArray(config.overlayAllowedHosts) || !config.overlayAllowedHosts.every((h) => typeof h === "string")) {
           throw new Error('"overlayAllowedHosts" must be an array of strings');
@@ -10358,7 +10368,7 @@ var require_claude_code = __commonJS({
       let resultMeta = null;
       let structuredOutput = null;
       let sessionId = null;
-      let toolText = "";
+      const toolInputs = [];
       for (const line of stdout.split("\n")) {
         const trimmed = line.trim();
         if (!trimmed.startsWith("{"))
@@ -10384,7 +10394,7 @@ var require_claude_code = __commonJS({
               readPaths.push(fp);
             }
             if (b.input && typeof b.input === "object")
-              toolText += JSON.stringify(b.input);
+              toolInputs.push(JSON.stringify(b.input));
           }
         } else if (event.type === "result") {
           if (typeof event.result === "string" && event.result.trim().length > 0) {
@@ -10412,24 +10422,131 @@ var require_claude_code = __commonJS({
           };
         }
       }
-      return { finalText, readPaths, usage, resultMeta, structuredOutput, sessionId, toolText };
+      return { finalText, readPaths, usage, resultMeta, structuredOutput, sessionId, toolInputs };
     }
     var MAX_REPORTED_READS = 2e3;
     function relativeWorkspaceReads(readPaths, cwd) {
       const root = path_1.default.resolve(cwd);
+      const roots = [root];
+      try {
+        const real = (0, fs_1.realpathSync)(root);
+        if (real !== root)
+          roots.push(real);
+      } catch {
+      }
       const out = /* @__PURE__ */ new Set();
       for (const p of readPaths) {
         const resolved = path_1.default.resolve(root, p);
-        if (resolved === root)
-          continue;
-        if (!resolved.startsWith(root + path_1.default.sep))
-          continue;
-        out.add(resolved.slice(root.length + 1));
+        for (const r of roots) {
+          if (resolved === r)
+            break;
+          if (!resolved.startsWith(r + path_1.default.sep))
+            continue;
+          out.add(resolved.slice(r.length + 1));
+          break;
+        }
         if (out.size >= MAX_REPORTED_READS)
           break;
       }
       return [...out].sort();
     }
+    var GLOB_CHARS = /[*?[{]/;
+    function escapeRegExp(s) {
+      return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    }
+    function globToRegExp(glob) {
+      let re = "^";
+      for (let i = 0; i < glob.length; i++) {
+        const ch = glob[i];
+        if (ch === "*") {
+          if (glob[i + 1] === "*") {
+            if (glob[i + 2] === "/") {
+              re += "(?:.*/)?";
+              i += 2;
+            } else {
+              re += ".*";
+              i += 1;
+            }
+          } else {
+            re += "[^/]*";
+          }
+        } else if (ch === "?") {
+          re += "[^/]";
+        } else if (ch === "[") {
+          const end = glob.indexOf("]", i + 1);
+          if (end === -1)
+            return null;
+          let cls = glob.slice(i + 1, end);
+          if (cls.startsWith("!"))
+            cls = `^${cls.slice(1)}`;
+          re += `[${cls.replace(/\\/g, "\\\\")}]`;
+          i = end;
+        } else if (ch === "{") {
+          const end = glob.indexOf("}", i + 1);
+          if (end === -1)
+            return null;
+          re += `(?:${glob.slice(i + 1, end).split(",").map(escapeRegExp).join("|")})`;
+          i = end;
+        } else {
+          re += escapeRegExp(ch);
+        }
+      }
+      return new RegExp(`${re}$`);
+    }
+    function creditOverlayReads(toolInputs, writtenPaths) {
+      if (writtenPaths.length === 0 || toolInputs.length === 0)
+        return [];
+      const dirs = /* @__PURE__ */ new Set();
+      for (const rel of writtenPaths) {
+        const parts = rel.split("/");
+        for (let i = 1; i < parts.length; i++)
+          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 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 credited = /* @__PURE__ */ new Set();
+      for (const input of toolInputs) {
+        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 (findRe && readerRe.test(input)) {
+          for (const match of input.matchAll(findRe)) {
+            const dir = `${match[1]}/`;
+            for (const rel of writtenPaths) {
+              if (rel.startsWith(dir))
+                credited.add(rel);
+            }
+          }
+        }
+      }
+      return [...credited].sort();
+    }
+    async function keepTranscript(dir, name, stdout) {
+      try {
+        await fs_1.promises.mkdir(dir, { recursive: true });
+        const safe = name.replace(/[^A-Za-z0-9._-]/g, "_");
+        await fs_1.promises.writeFile(path_1.default.join(dir, `${safe}.jsonl`), stdout);
+      } catch (err) {
+        console.warn(`[shuttle] could not keep the transcript for ${name} under ${dir}: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
     function extractJsonObject(s) {
       const exact = tryParseObject(s);
       if (exact)
@@ -25422,7 +25539,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.0" : pkg.version;
+var buildVersion = true ? "0.30.1" : pkg.version;
 var sifterBrand = {
   product: {
     id: "sifter",
@@ -25467,7 +25584,12 @@ var sifterBrand = {
         "https://api.sift.whittlelabs.com",
         "https://api.sift.stage.whittlelabs.com",
         "http://localhost:3008"
-      ]
+      ],
+      // Transcript retention is a diagnostic switch a person flips for one
+      // session, so it rides the environment rather than a file they would
+      // have to remember to unset. The shared package reads no env of its
+      // own (BE-005); this brand is where the variable becomes config.
+      ...process.env.SHUTTLE_KEEP_TRANSCRIPTS ? { keepTranscripts: process.env.SHUTTLE_KEEP_TRANSCRIPTS } : {}
     }
   },
   // The environments Whittle Labs operates, keyed by the profile name that