@drisp/cli 0.7.1 → 0.7.2

package/dist/{WorkflowInstallWizard-BVWAIVBH.js → WorkflowInstallWizard-K3DWPLYZ.js}

@@ -8,7 +8,7 @@ import {
   installWorkflowPlugins,
   resolveWorkflow,
   writeGlobalConfig
-} from "./chunk-TRNUPQQJ.js";
+} from "./chunk-2CJ6YKTL.js";
 import "./chunk-G3PMV62Z.js";
 
 // src/setup/steps/WorkflowInstallWizard.tsx
@@ -93,4 +93,4 @@ function WorkflowInstallWizard({ source, onDone }) {
 export {
   WorkflowInstallWizard as default
 };
-//# sourceMappingURL=WorkflowInstallWizard-BVWAIVBH.js.map
+//# sourceMappingURL=WorkflowInstallWizard-K3DWPLYZ.js.map

package/dist/{chunk-TRNUPQQJ.js → chunk-2CJ6YKTL.js}

@@ -22322,6 +22322,10 @@ import path10 from "path";
 // src/core/workflows/continuationPolicy.ts
 var DEFAULT_RESTART_TOKENS = 2e3;
 var DEFAULT_WORKING_TOKENS = 8e3;
+function budgetTokens(memory) {
+  if (memory.cumulativeTokens === null) return null;
+  return Math.max(0, memory.cumulativeTokens - (memory.usage?.cacheRead ?? 0));
+}
 function resourceInterruption(stop) {
   const names2 = {
     tokens: "token budget",
@@ -23302,7 +23306,7 @@ function admitResult(result, previous, cfg) {
   const stop = admitContinuation({
     loop: cfg.loop,
     iteration: memory.iteration,
-    tokens: memory.cumulativeTokens,
+    tokens: budgetTokens(memory),
     checkpointPath: memory.checkpoint?.path,
     context: fresh ? context : void 0
   });
@@ -23750,7 +23754,7 @@ function createWorkflowRunner(input2) {
           cumulativeTokens: total,
           stop: {
             ...event.stop,
-            ...event.stop.cause === "tokens" ? { used: total } : {}
+            ...event.stop.cause === "tokens" ? { used: budgetTokens(memory) ?? total } : {}
           }
         };
       }
@@ -23785,7 +23789,7 @@ function createWorkflowRunner(input2) {
         const limit = admitContinuation({
           loop,
           iteration: memory.iteration,
-          tokens: memory.cumulativeTokens
+          tokens: budgetTokens(memory)
         });
         if (limit) {
           stop(limit);
@@ -23802,7 +23806,7 @@ function createWorkflowRunner(input2) {
           const decision = admitContinuation({
             loop,
             iteration: memory.iteration,
-            tokens: memory.cumulativeTokens,
+            tokens: budgetTokens(memory),
             context: {
               opening: usage.openingContextSize,
               required: required2,
@@ -24247,4 +24251,4 @@ export {
   compileWorkflowPlan,
   collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-TRNUPQQJ.js.map
+//# sourceMappingURL=chunk-2CJ6YKTL.js.map

package/dist/{chunk-CPU4RLSW.js → chunk-DAQU2MPK.js}

@@ -55,7 +55,7 @@ import {
   verifyRendered,
   wakesFreshAfterHandover,
   workflowRegistryDir
-} from "./chunk-TRNUPQQJ.js";
+} from "./chunk-2CJ6YKTL.js";
 import {
   __commonJS,
   __toESM
@@ -3487,6 +3487,7 @@ function createTokenAccumulator() {
   let openingContextSize = 0;
   let contextWindowSize = null;
   let hasMessageUsage = false;
+  const countedById = /* @__PURE__ */ new Map();
   function promptSize(usage) {
     return (usage.input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0);
   }
@@ -3544,10 +3545,13 @@ function createTokenAccumulator() {
         }
       } else {
         hasMessageUsage = true;
-        inputTokens += usage.input_tokens ?? 0;
-        outputTokens += usage.output_tokens ?? 0;
-        cacheRead += usage.cache_read_input_tokens ?? 0;
-        cacheWrite += usage.cache_creation_input_tokens ?? 0;
+        const messageId = isAssistantEnvelope ? parsed.message["id"] : parsed["id"];
+        const counted = typeof messageId === "string" ? countedById.get(messageId) : void 0;
+        inputTokens += (usage.input_tokens ?? 0) - (counted?.input_tokens ?? 0);
+        outputTokens += (usage.output_tokens ?? 0) - (counted?.output_tokens ?? 0);
+        cacheRead += (usage.cache_read_input_tokens ?? 0) - (counted?.cache_read_input_tokens ?? 0);
+        cacheWrite += (usage.cache_creation_input_tokens ?? 0) - (counted?.cache_creation_input_tokens ?? 0);
+        if (typeof messageId === "string") countedById.set(messageId, usage);
         if (!isSubagent) {
           observeRootContext(promptSize(usage));
         }
@@ -3601,6 +3605,7 @@ function createTokenAccumulator() {
     reset() {
       buffer = "";
       hasMessageUsage = false;
+      countedById.clear();
       inputTokens = 0;
       outputTokens = 0;
       cacheRead = 0;
@@ -14868,7 +14873,7 @@ async function restoreCheckpoint(store, input) {
 
 // ../../modules/runtime/src/software-version.ts
 import "fs";
-var runnerSoftwareVersion = true ? "0.7.1" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
+var runnerSoftwareVersion = true ? "0.7.2" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
 
 // ../../modules/runtime/src/connection.ts
 var RunnerDisconnectedError = class extends Error {
@@ -20125,7 +20130,7 @@ function sessionStore(store, runId, options = {}) {
 
 // ../../modules/runtime/src/workflow-executor.ts
 import { execFileSync as execFileSync9 } from "child_process";
-import { statSync as statSync2, writeFileSync as writeFileSync4 } from "fs";
+import { statSync as statSync3, writeFileSync as writeFileSync4 } from "fs";
 import { join as join8 } from "path";
 
 // src/core/build/workspace.ts
@@ -21148,20 +21153,22 @@ async function closeOrphanedRuns(store, {
 
 // ../../modules/runtime/src/run-artifacts.ts
 import { createHash as createHash3 } from "crypto";
-import { mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync2, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir as tmpdir5 } from "os";
 import { dirname as dirname4, join as join7 } from "path";
 var ARTIFACT_MAX_BYTES = 64 * 1024;
 var ARTIFACT_NAME = /^[a-z][a-z0-9_]{0,63}$/;
 var NEVER_EMITTED = /* @__PURE__ */ new Set(["answer"]);
 var EMITTED_STATE = ".emitted.json";
+var MID_TURN_MAX_BYTES = 1024 * 1024;
+var MID_TURN_MIN_GAP_MS = 5e3;
 function runnerDataDirectory(databasePath) {
   return databasePath && databasePath !== ":memory:" ? dirname4(databasePath) : join7(tmpdir5(), "drisp-runner");
 }
 function runArtifactsDirectory(dataDirectory, runId) {
   return join7(dataDirectory, "artifacts", runId) + "/";
 }
-function runArtifactEmitter(directory, record) {
+function runArtifactEmitter(directory, record, midTurnMinGapMs = MID_TURN_MIN_GAP_MS) {
   mkdirSync2(directory, { recursive: true, mode: 448 });
   const statePath = join7(directory, EMITTED_STATE);
   let emitted = {};
@@ -21169,27 +21176,43 @@ function runArtifactEmitter(directory, record) {
     emitted = JSON.parse(readFileSync4(statePath, "utf8"));
   } catch {
   }
-  return () => {
+  const lastEmittedAt = {};
+  return (midTurn = false) => {
     let changed = false;
+    const now = Date.now();
     for (const entry of readdirSync2(directory, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
       if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
       const name = entry.name.slice(0, -".json".length);
       if (!ARTIFACT_NAME.test(name) || NEVER_EMITTED.has(name)) continue;
-      const bytes = readFileSync4(join7(directory, entry.name));
+      const path23 = join7(directory, entry.name);
+      let bytes;
+      try {
+        if (midTurn) {
+          if (statSync2(path23).size > MID_TURN_MAX_BYTES) continue;
+          if (now - (lastEmittedAt[name] ?? -Infinity) < midTurnMinGapMs) continue;
+        }
+        bytes = readFileSync4(path23);
+      } catch {
+        continue;
+      }
       const hash = createHash3("sha256").update(bytes).digest("hex");
       if (emitted[name] === hash) continue;
-      emitted[name] = hash;
-      changed = true;
       let json;
       try {
         json = JSON.parse(bytes.toString("utf8"));
       } catch {
+        if (midTurn) continue;
         record("run.artifact_rejected", { name, bytes: bytes.length });
+        emitted[name] = hash;
+        changed = true;
         continue;
       }
       const serialized = Buffer.byteLength(JSON.stringify(json));
       if (serialized > ARTIFACT_MAX_BYTES) record("run.artifact_rejected", { name, bytes: serialized });
       else record("run.artifact", { name, json });
+      emitted[name] = hash;
+      lastEmittedAt[name] = now;
+      changed = true;
     }
     if (changed) writeFileSync3(statePath, JSON.stringify(emitted));
   };
@@ -21225,7 +21248,7 @@ function delegationEnvironment(grant, hubUrl) {
 function requireProjectDirectory(projectDir) {
   let directory = false;
   try {
-    directory = statSync2(projectDir).isDirectory();
+    directory = statSync3(projectDir).isDirectory();
   } catch {
   }
   if (!directory)
@@ -21316,7 +21339,7 @@ function createWorkflowExecutor(dependencies = {}) {
           dependencies.dataDirectory ?? runnerDataDirectory(store.sql.database.name),
           grant.runId
         );
-        const emitArtifacts2 = runArtifactEmitter(artifacts, record);
+        const emitArtifacts2 = runArtifactEmitter(artifacts, record, (dependencies.artifactIntervalMs ?? 2e3) * 2.5);
         const loop = bootstrapped.workflow?.loop;
         const childLoop = grant.parent && loop ? { ...loop, maxRunTokens: Math.min(loop.maxRunTokens ?? Infinity, grant.parent.tokenCap) } : loop;
         const config2 = {
@@ -21403,6 +21426,13 @@ ${prompt2}`;
       const { workingDirectory, config, view, adapterResumeSessionId, storedAnswer, prompt, displayText, emitArtifacts } = setup2;
       const queue = createSteerQueue();
       queues.set(grant.runId, queue);
+      const sweep = setInterval(() => {
+        try {
+          emitArtifacts(true);
+        } catch {
+        }
+      }, dependencies.artifactIntervalMs ?? 2e3);
+      sweep.unref();
       const result = await trackHarnessProcesses(store, grant.runId, () => (dependencies.execute ?? runExec)({
         prompt,
         promptPresentation: displayText === void 0 ? { origin: "workflow" } : { origin: "human", displayText },
@@ -21440,6 +21470,7 @@ ${prompt2}`;
         json: false
       })).finally(() => {
         queues.delete(grant.runId);
+        clearInterval(sweep);
         emitArtifacts();
       });
       if (!result.workflowOutcome)
@@ -21887,4 +21918,4 @@ export {
   runMachineRunners,
   writeIdentityOnce
 };
-//# sourceMappingURL=chunk-CPU4RLSW.js.map
+//# sourceMappingURL=chunk-DAQU2MPK.js.map

package/dist/{chunk-LCT645C4.js → chunk-Q4I2HYJ5.js}

@@ -1,6 +1,6 @@
 import {
   runMachineRunners
-} from "./chunk-CPU4RLSW.js";
+} from "./chunk-DAQU2MPK.js";
 
 // src/app/entry/runnerDaemon.ts
 if (process.argv.includes("--help")) {
@@ -13,4 +13,4 @@ if (process.argv.includes("--help")) {
     process.exitCode = 1;
   });
 }
-//# sourceMappingURL=chunk-LCT645C4.js.map
+//# sourceMappingURL=chunk-Q4I2HYJ5.js.map

package/dist/cli.js

@@ -138,7 +138,7 @@ import {
   visualPositionToOffset,
   wrapText,
   writeIdentityOnce
-} from "./chunk-CPU4RLSW.js";
+} from "./chunk-DAQU2MPK.js";
 import {
   generateId as generateId2
 } from "./chunk-PQIB66SG.js";
@@ -196,7 +196,7 @@ import {
   workflowRegistryDir,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-TRNUPQQJ.js";
+} from "./chunk-2CJ6YKTL.js";
 import {
   __toESM
 } from "./chunk-G3PMV62Z.js";
@@ -15939,7 +15939,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-BVWAIVBH.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-K3DWPLYZ.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx24(
           WorkflowInstallWizard,

package/dist/dashboard-daemon.js

@@ -1,6 +1,6 @@
-import "./chunk-LCT645C4.js";
-import "./chunk-CPU4RLSW.js";
+import "./chunk-Q4I2HYJ5.js";
+import "./chunk-DAQU2MPK.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-TRNUPQQJ.js";
+import "./chunk-2CJ6YKTL.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=dashboard-daemon.js.map

package/dist/runner.js

@@ -1,6 +1,6 @@
-import "./chunk-LCT645C4.js";
-import "./chunk-CPU4RLSW.js";
+import "./chunk-Q4I2HYJ5.js";
+import "./chunk-DAQU2MPK.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-TRNUPQQJ.js";
+import "./chunk-2CJ6YKTL.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=runner.js.map

package/package.json

@@ -17,7 +17,7 @@
 		"hooks",
 		"dashboard"
 	],
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"license": "MIT",
 	"bin": {
 		"athena": "dist/cli.js",