@whittlelabs/sifter 0.15.0 → 0.16.0

package/bin.js

@@ -15420,6 +15420,15 @@ var require_client = __commonJS({
       async createOutput(jobId, options) {
         return this.request("POST", `/api/jobs/${jobId}/output`, options);
       }
+      /**
+       * Post a batch of live progress frames for a running job. Best-effort
+       * telemetry: the service publishes it over core NATS and never derives
+       * authoritative state from it, so callers should swallow failures rather than
+       * let a dropped frame affect the job.
+       */
+      async postProgress(jobId, options) {
+        await this.request("POST", `/api/jobs/${jobId}/progress`, options);
+      }
       // ── Attendance (subscriber dispatch lifecycle) ───────────────────
       /**
        * Accept a dispatched job. The subscribe loop calls this; direct
@@ -15722,8 +15731,12 @@ var require_self_update = __commonJS({
       });
     }
     function defaultRespawn() {
-      const child = (0, child_process_1.spawn)(process.execPath, process.argv.slice(1), { stdio: "inherit" });
-      child.on("exit", (code) => process.exit(code ?? 0));
+      const child = (0, child_process_1.spawn)(process.execPath, process.argv.slice(1), {
+        detached: true,
+        stdio: "inherit"
+      });
+      child.unref();
+      process.exit(0);
     }
   }
 });
@@ -16007,6 +16020,8 @@ var require_prompt_execution2 = __commonJS({
         spec.providerHints = options.providerHints;
       if (options.costCapHint)
         spec.costCapHint = options.costCapHint;
+      if (options.progressChannel !== void 0)
+        spec.progressChannel = options.progressChannel;
       if (options.rendering === "producer" && !options.prompt) {
         throw new Error("rendering='producer' requires `prompt`");
       }
@@ -18880,6 +18895,155 @@ var require_validate_output = __commonJS({
   }
 });
 
+// ../../packages/shuttle/dist/executors/progress.js
+var require_progress = __commonJS({
+  "../../packages/shuttle/dist/executors/progress.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.StreamJsonTap = exports2.ProgressReporter = void 0;
+    var ProgressReporter = class {
+      sink;
+      seq = 0;
+      pending = [];
+      textBuf = "";
+      timer = null;
+      closed = false;
+      flushMs;
+      maxChars;
+      constructor(sink, options = {}) {
+        this.sink = sink;
+        this.flushMs = options.flushMs ?? 400;
+        this.maxChars = options.maxChars ?? 1200;
+      }
+      reasoning(text) {
+        if (this.closed || !text)
+          return;
+        this.textBuf += text;
+        if (this.textBuf.length >= this.maxChars) {
+          this.flush();
+        } else {
+          this.arm();
+        }
+      }
+      tool(name, target) {
+        if (this.closed || !name)
+          return;
+        this.drainText();
+        this.push({ kind: "tool", tool: target ? { name, target } : { name } });
+        this.flush();
+      }
+      /** Flush pending text + frames now. */
+      flush() {
+        if (this.closed)
+          return;
+        this.drainText();
+        this.clearTimer();
+        if (this.pending.length === 0)
+          return;
+        const batch = this.pending;
+        this.pending = [];
+        try {
+          this.sink(batch);
+        } catch {
+        }
+      }
+      /** Final flush; no further frames are emitted after this. */
+      close() {
+        this.flush();
+        this.closed = true;
+        this.clearTimer();
+      }
+      drainText() {
+        if (this.textBuf.length === 0)
+          return;
+        this.push({ kind: "reasoning", text: this.textBuf });
+        this.textBuf = "";
+      }
+      push(frame) {
+        this.pending.push({ seq: this.seq++, at: (/* @__PURE__ */ new Date()).toISOString(), ...frame });
+      }
+      arm() {
+        if (this.timer)
+          return;
+        this.timer = setTimeout(() => {
+          this.timer = null;
+          this.flush();
+        }, this.flushMs);
+        this.timer.unref?.();
+      }
+      clearTimer() {
+        if (this.timer) {
+          clearTimeout(this.timer);
+          this.timer = null;
+        }
+      }
+    };
+    exports2.ProgressReporter = ProgressReporter;
+    var StreamJsonTap = class {
+      handlers;
+      buf = "";
+      constructor(handlers) {
+        this.handlers = handlers;
+      }
+      /** Feed a raw stdout chunk. Emits handlers for every complete line parsed. */
+      push(chunk) {
+        this.buf += chunk;
+        let nl;
+        while ((nl = this.buf.indexOf("\n")) !== -1) {
+          const line = this.buf.slice(0, nl);
+          this.buf = this.buf.slice(nl + 1);
+          this.consumeLine(line);
+        }
+      }
+      /** Flush a trailing partial line (best-effort; usually empty at process close). */
+      end() {
+        if (this.buf.trim().length > 0)
+          this.consumeLine(this.buf);
+        this.buf = "";
+      }
+      consumeLine(line) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("{"))
+          return;
+        let event;
+        try {
+          event = JSON.parse(trimmed);
+        } catch {
+          return;
+        }
+        if (event.type === "assistant") {
+          const content = event.message?.content;
+          if (!Array.isArray(content))
+            return;
+          for (const block of content) {
+            const b = block;
+            if (b?.type === "text" && typeof b.text === "string" && b.text.length > 0) {
+              this.handlers.onReasoning?.(b.text);
+            } else if (b?.type === "thinking" && typeof b.thinking === "string" && b.thinking.length > 0) {
+              this.handlers.onReasoning?.(b.thinking);
+            } else if (b?.type === "tool_use" && typeof b.name === "string") {
+              this.handlers.onTool?.(b.name, toolTarget(b.input));
+            }
+          }
+        } else if (event.type === "result") {
+          this.handlers.onResult?.();
+        }
+      }
+    };
+    exports2.StreamJsonTap = StreamJsonTap;
+    function toolTarget(input) {
+      if (!input)
+        return void 0;
+      for (const key of ["file_path", "path", "pattern", "command", "url", "query", "notebook_path"]) {
+        const v = input[key];
+        if (typeof v === "string" && v.length > 0)
+          return v;
+      }
+      return void 0;
+    }
+  }
+});
+
 // ../../packages/shuttle/dist/executors/workspace.js
 var require_workspace = __commonJS({
   "../../packages/shuttle/dist/executors/workspace.js"(exports2) {
@@ -19111,7 +19275,7 @@ var require_overlay = __commonJS({
       const maxBytes = options.maxBytes ?? DEFAULT_MAX_BYTES;
       const allowed = new Set(options.allowedHosts.map(normalizeOrigin).filter((o) => !!o));
       const rootReal = await fs_1.promises.realpath(runDir);
-      const result = { written: 0, skipped: [] };
+      const result = { written: 0, writtenPaths: [], skipped: [] };
       const files = Array.isArray(overlay.files) ? overlay.files : [];
       for (const file of files) {
         const skip = (reason) => result.skipped.push({ path: String(file?.path ?? "?"), reason });
@@ -19145,6 +19309,7 @@ var require_overlay = __commonJS({
           await fs_1.promises.mkdir(path_1.default.dirname(dest), { recursive: true });
           await fs_1.promises.writeFile(dest, content);
           result.written += 1;
+          result.writtenPaths.push(file.path);
         } catch (err) {
           skip(err instanceof Error ? err.message : String(err));
         }
@@ -19258,9 +19423,11 @@ var require_claude_code = __commonJS({
     var fs_1 = require("fs");
     var os_1 = __importDefault(require("os"));
     var path_1 = __importDefault(require("path"));
+    var string_decoder_1 = require("string_decoder");
     var loom_1 = require_dist3();
     var keep_1 = require_dist4();
     var validate_output_1 = require_validate_output();
+    var progress_1 = require_progress();
     var workspace_1 = require_workspace();
     var overlay_1 = require_overlay();
     var env_ref_1 = require_env_ref();
@@ -19281,7 +19448,7 @@ var require_claude_code = __commonJS({
           outputTokens: spec.costCapHint?.estimatedOutputTokens
         };
       }
-      async execute(dispatch, signal) {
+      async execute(dispatch, signal, ctx) {
         const { prompt, spec } = (0, loom_1.renderPromptExecution)(dispatch.inputs);
         let credentials = null;
         if (this.config.resolveCredentials) {
@@ -19306,6 +19473,7 @@ var require_claude_code = __commonJS({
         let workspace = null;
         let promptOnlyScratch = null;
         let overlayResult = null;
+        const reporter = spec.progressChannel && ctx?.reportProgress ? new progress_1.ProgressReporter((frames) => ctx.reportProgress(spec.progressChannel, frames)) : null;
         try {
           if (spec.workspace) {
             workspace = await (0, workspace_1.prepareWorkspace)(spec.workspace, {
@@ -19327,11 +19495,16 @@ 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 } = await this.runClaude(prompt, spec, runCwd, childEnv, signal, hintedModel);
+          const { response, readPaths, toolText } = await this.runClaude(prompt, spec, runCwd, childEnv, signal, hintedModel, reporter);
           if (workspace) {
+            const reads = [...readPaths];
+            for (const rel of overlayResult?.writtenPaths ?? []) {
+              if (toolText.includes(rel))
+                reads.push(path_1.default.join(runCwd, rel));
+            }
             response.outputs.push({
               label: "workspace_reads",
-              content: { paths: relativeWorkspaceReads(readPaths, runCwd) }
+              content: { paths: relativeWorkspaceReads(reads, runCwd) }
             });
             response.outputs.push({
               label: "workspace",
@@ -19349,6 +19522,7 @@ var require_claude_code = __commonJS({
           }
           return response;
         } finally {
+          reporter?.close();
           if (workspace)
             await workspace.cleanup();
           if (promptOnlyScratch)
@@ -19359,7 +19533,7 @@ var require_claude_code = __commonJS({
             });
         }
       }
-      runClaude(prompt, spec, cwd, childEnv, signal, modelOverride) {
+      runClaude(prompt, spec, cwd, childEnv, signal, modelOverride, reporter) {
         const outputLabel = spec.outputLabel;
         const model = modelOverride ?? this.config.model;
         return new Promise((resolve, reject) => {
@@ -19395,7 +19569,17 @@ var require_claude_code = __commonJS({
             settled = true;
             fn();
           };
-          child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+          const tap = reporter ? new progress_1.StreamJsonTap({
+            onReasoning: (t) => reporter.reasoning(t),
+            onTool: (name, target) => reporter.tool(name, target),
+            onResult: () => reporter.flush()
+          }) : null;
+          const decoder = tap ? new string_decoder_1.StringDecoder("utf8") : null;
+          child.stdout.on("data", (chunk) => {
+            stdoutChunks.push(chunk);
+            if (tap && decoder)
+              tap.push(decoder.write(chunk));
+          });
           child.stdin.write(prompt);
           child.stdin.end();
           const timeout = this.config.timeout ?? DEFAULT_TIMEOUT;
@@ -19422,6 +19606,10 @@ var require_claude_code = __commonJS({
           child.on("close", (code) => {
             clearTimeout(timer);
             signal.removeEventListener("abort", onAbort);
+            if (tap && decoder) {
+              tap.push(decoder.end());
+              tap.end();
+            }
             const stdout = Buffer.concat(stdoutChunks).toString("utf-8");
             if (code === 0) {
               try {
@@ -19446,7 +19634,8 @@ var require_claude_code = __commonJS({
                       ...stream.usage ?? {}
                     }
                   },
-                  readPaths: stream.readPaths
+                  readPaths: stream.readPaths,
+                  toolText: stream.toolText
                 }));
               } catch (err) {
                 settle(() => reject(err instanceof Error ? err : new Error(String(err))));
@@ -19543,6 +19732,7 @@ var require_claude_code = __commonJS({
       let usage = null;
       let resultMeta = null;
       let structuredOutput = null;
+      let toolText = "";
       for (const line of stdout.split("\n")) {
         const trimmed = line.trim();
         if (!trimmed.startsWith("{"))
@@ -19559,9 +19749,14 @@ var require_claude_code = __commonJS({
             continue;
           for (const block of content) {
             const b = block;
-            if (b?.type === "tool_use" && b.name === "Read" && typeof b.input?.file_path === "string") {
-              readPaths.push(b.input.file_path);
+            if (b?.type !== "tool_use")
+              continue;
+            const fp = b.input?.file_path;
+            if (b.name === "Read" && typeof fp === "string") {
+              readPaths.push(fp);
             }
+            if (b.input && typeof b.input === "object")
+              toolText += JSON.stringify(b.input);
           }
         } else if (event.type === "result") {
           if (typeof event.result === "string" && event.result.trim().length > 0) {
@@ -19584,7 +19779,7 @@ var require_claude_code = __commonJS({
           };
         }
       }
-      return { finalText, readPaths, usage, resultMeta, structuredOutput };
+      return { finalText, readPaths, usage, resultMeta, structuredOutput, toolText };
     }
     var MAX_REPORTED_READS = 2e3;
     function relativeWorkspaceReads(readPaths, cwd) {
@@ -20847,9 +21042,15 @@ var require_shuttle = __commonJS({
           }
           await observerChain.notify({ kind: "executor.dispatch.started", jobId, attendanceId, executor: executor.capability.id, strategy }, onObserverError);
           const dispatchStartedAt = Date.now();
+          const executionCtx = {
+            reportProgress: (channel, frames) => {
+              void jobsClient.postProgress(jobId, { channel, frames }).catch(() => {
+              });
+            }
+          };
           let response;
           try {
-            response = await executor.execute(dispatch, signal);
+            response = await executor.execute(dispatch, signal, executionCtx);
           } catch (err) {
             const reason = `executor failed: ${err instanceof Error ? err.message : String(err)}`;
             await observerChain.notify({ kind: "attendance.closed", jobId, attendanceId, status: "failed", reason, totalDurationMs: Date.now() - startedAt }, onObserverError);
@@ -21527,58 +21728,14 @@ var import_path = require("path");
 var import_promises = require("fs/promises");
 var import_yaml = __toESM(require_dist());
 var import_shuttle = __toESM(require_dist5());
-
-// package.json
-var package_default = {
-  name: "@whittlelabs/sifter",
-  version: "0.15.0",
-  description: "Whittle Sifter: paired AI reviewer for Whittle Sift job pools.",
-  bin: {
-    "whittle-sifter": "./dist/bin.js"
-  },
-  main: "dist/bin.js",
-  engines: {
-    node: ">=20"
-  },
-  scripts: {
-    dev: "tsx watch src/bin.ts",
-    build: "node scripts/bundle.mjs",
-    typecheck: "tsc --noEmit",
-    start: "node dist/bin.js",
-    lint: "eslint src/"
-  },
-  publishConfig: {
-    registry: "https://registry.npmjs.org/",
-    access: "public"
-  },
-  repository: {
-    type: "git",
-    url: "https://github.com/whittlelabs/whittlelabs.git",
-    directory: "apps/whittle-sifter"
-  },
-  author: "Whittle Labs",
-  license: "UNLICENSED",
-  private: false,
-  dependencies: {
-    "@whittlelabs/shuttle": "workspace:*",
-    yaml: "^2.7.1"
-  },
-  devDependencies: {
-    "@types/node": "^20.10.5",
-    esbuild: "^0.25.0",
-    tsx: "^4.21.0",
-    typescript: "^5.3.3"
-  }
-};
-
-// src/brand.ts
+var buildVersion = true ? "0.16.0" : pkg.version;
 var sifterBrand = {
   product: {
     id: "sifter",
     title: "Whittle Sifter",
     cliBinary: "whittle-sifter",
     packageName: "@whittlelabs/sifter",
-    version: package_default.version,
+    version: buildVersion,
     description: "Pairs with Whittle Sift to run AI code reviews on your hardware with your credentials."
   },
   paths: {
@@ -21723,7 +21880,7 @@ async function buildExecutorBlock(executor, ctx) {
     console.error("Keep refused its credentials \u2014 it was decommissioned from the");
     console.error("web app, or its secret was rotated by a newer pairing.");
     console.error("");
-    console.error(`Run \`${sifterBrand.product.command} init\` to pair again.`);
+    console.error(`Run \`${sifterBrand.product.cliBinary} init\` to pair again.`);
     console.error("");
     process.exit(3);
   }