@drisp/cli 0.7.8 → 0.7.9

package/dist/{WorkflowInstallWizard-IOJD3YOA.js → WorkflowInstallWizard-FKASDA6N.js}

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

package/dist/{chunk-OYUBT6RS.js → chunk-FYXEDUQ6.js}

@@ -22447,6 +22447,15 @@ function budgetTokens(memory) {
   if (memory.cumulativeTokens === null) return null;
   return Math.max(0, memory.cumulativeTokens - (memory.usage?.cacheRead ?? 0));
 }
+function runUsage(memory) {
+  const counted = budgetTokens(memory);
+  if (counted === null) return null;
+  const whole = (tokens) => Number.isFinite(tokens) ? Math.min(Math.max(0, Math.round(tokens)), Number.MAX_SAFE_INTEGER) : 0;
+  return {
+    counted: whole(counted),
+    cacheRead: whole(memory.usage?.cacheRead ?? 0)
+  };
+}
 function resourceInterruption(stop) {
   const names2 = {
     tokens: "token budget",
@@ -24308,6 +24317,7 @@ export {
   WAITING_ON_CHILDREN_STOP_REASON,
   AWAITING_APPROVAL_STOP_REASON,
   budgetTokens,
+  runUsage,
   createSteerQueue,
   DEFAULT_PERMISSION_GRACE_MS,
   serializeRunMemory,
@@ -24374,4 +24384,4 @@ export {
   compileWorkflowPlan,
   collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-OYUBT6RS.js.map
+//# sourceMappingURL=chunk-FYXEDUQ6.js.map

package/dist/{chunk-HGMJ3YL2.js → chunk-TWOJJ2JD.js}

@@ -48,6 +48,7 @@ import {
   resolveWorkflow,
   resolveWorkflowManifestPath,
   resolveWorkflowPlugins,
+  runUsage,
   selectWorkflowCapabilities,
   serializeRunMemory,
   sizeClassLimits,
@@ -55,7 +56,7 @@ import {
   verifyRendered,
   wakesFreshAfterHandover,
   workflowRegistryDir
-} from "./chunk-OYUBT6RS.js";
+} from "./chunk-FYXEDUQ6.js";
 import {
   __commonJS,
   __toESM
@@ -13087,12 +13088,13 @@ function forecastOfCap(declaredCap) {
 }
 
 // ../../packages/protocol/src/v2.ts
-var protocolVersion = { major: 2, minor: 2 };
+var protocolVersion = { major: 2, minor: 3 };
 var conversationContinuationCapability = "conversation_continuation";
 var abandonedConversationContinuationCapability = "abandoned_conversation_continuation";
 var repositoryAccessCapability = "repository_checkout_v1";
 var workflowInstallCapability = "workflow_install_v1";
 var runDelegationCapability = "run_delegation_v1";
+var runUsageCapability = "run_usage_v1";
 var runArtifactNameSchema = external_exports.string().regex(/^[a-z][a-z0-9_]{0,63}$/);
 var runArtifactMaxBytes = 64 * 1024;
 var secretEnvironmentSchema = external_exports.record(
@@ -13160,6 +13162,8 @@ var factIdentity = {
   executionRevision: positive,
   emittedAt: timestamp
 };
+var runUsageSchema = external_exports.strictObject({ counted: sequence, cacheRead: sequence });
+var reportedUsage = { usage: runUsageSchema.optional() };
 var controlRecordSchema = external_exports.discriminatedUnion("kind", [
   /** Instance-scoped, not tied to a Run: the full replacement inventory of installed Workflows. */
   external_exports.strictObject({ kind: external_exports.literal("workflows.changed"), workflows: installedWorkflowsSchema }),
@@ -13190,7 +13194,8 @@ var controlRecordSchema = external_exports.discriminatedUnion("kind", [
       external_exports.strictObject({ kind: external_exports.literal("local_checkpoint"), checkpointId: id }),
       external_exports.strictObject({ kind: external_exports.literal("portable_checkpoint"), checkpointId: id }),
       external_exports.strictObject({ kind: external_exports.literal("repair_required"), detail: external_exports.string().max(4096) })
-    ])
+    ]),
+    ...reportedUsage
   }),
   external_exports.strictObject({
     kind: external_exports.literal("run.finished"),
@@ -13203,8 +13208,14 @@ var controlRecordSchema = external_exports.discriminatedUnion("kind", [
      * Why a Build Run failed, as its close reason (docs/specs/build-orchestrator.md). Sent only for a grant with
      * `parent` or `delegationToken`, which only a Hub that knows this field issues.
      */
-    reason: buildCloseReasonSchema.optional()
+    reason: buildCloseReasonSchema.optional(),
+    ...reportedUsage
   }),
+  /**
+   * The usage of a Run while it executes, for a grant marked `reportUsage`. Not an execution fact: it carries no
+   * execution revision, so it never advances, parks or closes the Run, and never wakes its parent.
+   */
+  external_exports.strictObject({ kind: external_exports.literal("run.usage"), runId: id, attemptId: id, ...runUsageSchema.shape }),
   external_exports.strictObject({ kind: external_exports.literal("command.applied"), runId: id, attemptId: id, commandId: id }),
   external_exports.strictObject({
     kind: external_exports.literal("command.rejected"),
@@ -13343,7 +13354,9 @@ var grantSchema = external_exports.strictObject({
   /** This attempt's delegation token: only for a Run started with `delegation`, only to a `run_delegation_v1` Runner. */
   delegationToken: external_exports.string().min(32).max(256).optional(),
   /** Copied from the start intent of a delegated child. */
-  parent: runParentSchema.optional()
+  parent: runParentSchema.optional(),
+  /** The runner reports this attempt's usage: set only for a `run_usage_v1` Runner. */
+  reportUsage: external_exports.literal(true).optional()
 });
 var historyRecordSchema = external_exports.strictObject({
   eventId: id,
@@ -13404,7 +13417,13 @@ var runViewSchema = external_exports.object({
   label: external_exports.string().max(160).optional(),
   key: runKeySchema.optional(),
   parent: runParentSchema.optional(),
-  delegation: delegationSchema.optional(),
+  /**
+   * Not strict, unlike the start intent's: a Hub keeps more on the Run's delegation (`initialTokenBudget`) than it
+   * shows, and a client never refuses a view for a field it does not read.
+   */
+  delegation: external_exports.object(delegationSchema.shape).optional(),
+  /** The largest cumulative usage the Run's Runner reported; absent until one does (an older Runner never does). */
+  usage: runUsageSchema.optional(),
   /** Resolved by the runner at start; absent until the Run starts and for runners that predate reporting. */
   workflow: workflowIdentitySchema.optional(),
   execution: external_exports.object({
@@ -14529,6 +14548,7 @@ var ExecutionHost = class {
         const outcome = await this.executor.execute(run.grant, this.store, abort.signal);
         if (publish && !abort.signal.aborted && ["completed", "awaiting_attention"].includes(outcome.status))
           await publish(run.grant, abort.signal);
+        const usage = outcome.usage && run.grant.reportUsage ? { usage: outcome.usage } : {};
         this.store.transaction(() => {
           this.store.fact(runId, (identity) => {
             if (outcome.status === "awaiting_attention")
@@ -14547,7 +14567,8 @@ var ExecutionHost = class {
                 continuation: {
                   kind: this.portableCheckpoints ? "portable_checkpoint" : "local_checkpoint",
                   checkpointId: crypto.randomUUID()
-                }
+                },
+                ...usage
               };
             return {
               ...identity,
@@ -14559,7 +14580,8 @@ var ExecutionHost = class {
               // resend it forever. Portable checkpoints are configured only on managed Runners.
               ...outcome.workspaceMissing && this.portableCheckpoints && run.grant.spec.repository ? { workspaceUnavailable: true } : {},
               // Only a Hub that issues `parent` or a delegation token knows the field; an older one rejects it.
-              ...outcome.reason && (run.grant.parent || run.grant.delegationToken) ? { reason: outcome.reason } : {}
+              ...outcome.reason && (run.grant.parent || run.grant.delegationToken) ? { reason: outcome.reason } : {},
+              ...usage
             };
           });
           if (this.portableCheckpoints && outcome.status !== "awaiting_attention" && !outcome.workspaceMissing)
@@ -14893,9 +14915,18 @@ async function restoreCheckpoint(store, input) {
 
 // ../../modules/runtime/src/software-version.ts
 import "fs";
-var runnerSoftwareVersion = true ? "0.7.8" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
+var runnerSoftwareVersion = true ? "0.7.9" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
 
 // ../../modules/runtime/src/connection.ts
+var runnerCapabilities = [
+  "local_checkpoint",
+  conversationContinuationCapability,
+  abandonedConversationContinuationCapability,
+  repositoryAccessCapability,
+  workflowInstallCapability,
+  runDelegationCapability,
+  runUsageCapability
+];
 var RunnerDisconnectedError = class extends Error {
   constructor() {
     super("runner_disconnected");
@@ -15032,7 +15063,7 @@ var RunnerConnection = class {
         runnerId: store.identity.runnerId,
         installationId: store.identity.installationId,
         softwareVersion: runnerSoftwareVersion,
-        capabilities: ["local_checkpoint", conversationContinuationCapability, abandonedConversationContinuationCapability, repositoryAccessCapability, workflowInstallCapability, runDelegationCapability],
+        capabilities: [...runnerCapabilities],
         ...this.options.workflows ? { workflows: this.options.workflows.current() } : {},
         ...this.options.readiness?.current() ? { readiness: this.options.readiness.current() } : {},
         control: {
@@ -21361,6 +21392,25 @@ function runArtifactEmitter(directory, record, midTurnMinGapMs = MID_TURN_MIN_GA
 // ../../modules/runtime/src/run-usage.ts
 import { readFileSync as readFileSync5, renameSync, writeFileSync as writeFileSync4 } from "fs";
 import { join as join8 } from "path";
+var LIVE_USAGE_MIN_TOKENS = 1e5;
+var LIVE_USAGE_MIN_INTERVAL_MS = 3e4;
+function liveUsageReporter(grant, store, read3, now = Date.now) {
+  if (!grant.reportUsage) return () => {
+  };
+  let last = { counted: read3()?.counted ?? 0, at: now() };
+  return () => {
+    const usage = read3();
+    const at = now();
+    if (!usage || usage.counted - last.counted < LIVE_USAGE_MIN_TOKENS || at - last.at < LIVE_USAGE_MIN_INTERVAL_MS)
+      return;
+    const sent = store.transaction(() => {
+      if (store.run(grant.runId).phase !== "executing") return false;
+      store.appendControl({ kind: "run.usage", runId: grant.runId, attemptId: grant.attemptId, ...usage });
+      return true;
+    });
+    if (sent) last = { counted: usage.counted, at };
+  };
+}
 var isMark = (value) => {
   const mark = value;
   return !!mark && Number.isInteger(mark.index) && typeof mark.title === "string" && typeof mark.tokens === "number" && Number.isFinite(mark.tokens) && mark.tokens >= 0;
@@ -21567,6 +21617,11 @@ function createWorkflowExecutor(dependencies = {}) {
           }
           emitArtifacts(midTurn);
         };
+        const usage2 = () => {
+          const memory = deserializeRunMemory(view2.getLatestRun()?.runMemoryJson);
+          return memory ? runUsage(memory) : null;
+        };
+        const reportLiveUsage2 = liveUsageReporter(grant, store, usage2, dependencies.now);
         const previous = view2.getLatestRun();
         const predecessor = grant.previousRun ? store.sessionValues(grant.sessionId, "workflow").find((snapshot) => snapshot.id === grant.previousRun.runId) : void 0;
         const adapterResumeSessionId2 = grant.purpose === "resume" ? previous?.adapterSessionId : predecessor?.adapterSessionId;
@@ -21610,7 +21665,18 @@ ${JSON.stringify(continuation.answer)}` : grant.spec.prompt;
 Current human request:
 ${prompt2}`;
         }
-        return { workingDirectory: workingDirectory2, config: config2, view: view2, adapterResumeSessionId: adapterResumeSessionId2, storedAnswer: storedAnswer2, prompt: prompt2, displayText: displayText2, sweepArtifacts: sweepArtifacts2 };
+        return {
+          workingDirectory: workingDirectory2,
+          config: config2,
+          view: view2,
+          adapterResumeSessionId: adapterResumeSessionId2,
+          storedAnswer: storedAnswer2,
+          prompt: prompt2,
+          displayText: displayText2,
+          sweepArtifacts: sweepArtifacts2,
+          usage: usage2,
+          reportLiveUsage: reportLiveUsage2
+        };
       };
       let setup2;
       try {
@@ -21622,7 +21688,18 @@ ${prompt2}`;
         if (error instanceof RunSetupError && isBuildCloseReason(error.code)) return { status: "failed", reason: error.code };
         return { status: "failed" };
       }
-      const { workingDirectory, config, view, adapterResumeSessionId, storedAnswer, prompt, displayText, sweepArtifacts } = setup2;
+      const {
+        workingDirectory,
+        config,
+        view,
+        adapterResumeSessionId,
+        storedAnswer,
+        prompt,
+        displayText,
+        sweepArtifacts,
+        usage,
+        reportLiveUsage
+      } = setup2;
       const queue = createSteerQueue();
       queues.set(grant.runId, queue);
       const sweep = setInterval(() => {
@@ -21630,6 +21707,10 @@ ${prompt2}`;
           sweepArtifacts(true);
         } catch {
         }
+        try {
+          reportLiveUsage();
+        } catch {
+        }
       }, dependencies.artifactIntervalMs ?? 2e3);
       sweep.unref();
       const result = await trackHarnessProcesses(store, grant.runId, () => (dependencies.execute ?? runExec)({
@@ -21697,8 +21778,10 @@ ${prompt2}`;
           runMemoryJson: serializeRunMemory({ ...memory, pendingSteers })
         });
       });
+      const reported = usage();
+      const withUsage = (outcome) => reported ? { ...outcome, usage: reported } : outcome;
       if (status === "awaiting_attention" && !result.workflowOutcome.interruption && result.workflowOutcome.stopReason === WAITING_ON_CHILDREN_STOP_REASON)
-        return { status, interruption: { kind: "waiting", message: WAITING_ON_CHILDREN_MESSAGE } };
+        return withUsage({ status, interruption: { kind: "waiting", message: WAITING_ON_CHILDREN_MESSAGE } });
       if (status === "awaiting_attention" && !result.workflowOutcome.interruption && result.workflowOutcome.stopReason === AWAITING_APPROVAL_STOP_REASON) {
         const question = config.workflow?.approvalQuestion;
         if (!question) {
@@ -21706,13 +21789,13 @@ ${prompt2}`;
             code: "approval_question_missing",
             message: "The Journal ended with AWAITING_APPROVAL, but the Workflow has no approvalQuestion."
           });
-          return { status: "failed", reason: "approval_question_missing" };
+          return withUsage({ status: "failed", reason: "approval_question_missing" });
         }
         record(APPROVAL_REQUESTED, { question, plan: emittedPlan(store, grant.runId) });
-        return { status, interruption: { kind: "question", message: question } };
+        return withUsage({ status, interruption: { kind: "question", message: question } });
       }
       const interruption = status === "awaiting_attention" ? result.workflowOutcome.interruption ?? interruptionFromSuspension(result.workflowOutcome.stopReason) : void 0;
-      return {
+      return withUsage({
         status,
         ...interruption ? {
           interruption: {
@@ -21724,7 +21807,7 @@ ${prompt2}`;
             ...interruption.kind === "question" && interruption.requestId ? { requestId: interruption.requestId } : {}
           }
         } : {}
-      };
+      });
     }
   };
 }
@@ -22121,4 +22204,4 @@ export {
   runMachineRunners,
   writeIdentityOnce
 };
-//# sourceMappingURL=chunk-HGMJ3YL2.js.map
+//# sourceMappingURL=chunk-TWOJJ2JD.js.map

package/dist/{chunk-TBUUNMC6.js → chunk-Z5KVWWZU.js}

@@ -1,6 +1,6 @@
 import {
   runMachineRunners
-} from "./chunk-HGMJ3YL2.js";
+} from "./chunk-TWOJJ2JD.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-TBUUNMC6.js.map
+//# sourceMappingURL=chunk-Z5KVWWZU.js.map

package/dist/cli.js

@@ -142,7 +142,7 @@ import {
   visualPositionToOffset,
   wrapText,
   writeIdentityOnce
-} from "./chunk-HGMJ3YL2.js";
+} from "./chunk-TWOJJ2JD.js";
 import {
   generateId as generateId2
 } from "./chunk-PQIB66SG.js";
@@ -201,7 +201,7 @@ import {
   workflowRegistryDir,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-OYUBT6RS.js";
+} from "./chunk-FYXEDUQ6.js";
 import {
   __toESM
 } from "./chunk-G3PMV62Z.js";
@@ -16323,7 +16323,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-IOJD3YOA.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-FKASDA6N.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx24(
           WorkflowInstallWizard,

package/dist/dashboard-daemon.js

@@ -1,6 +1,6 @@
-import "./chunk-TBUUNMC6.js";
-import "./chunk-HGMJ3YL2.js";
+import "./chunk-Z5KVWWZU.js";
+import "./chunk-TWOJJ2JD.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-OYUBT6RS.js";
+import "./chunk-FYXEDUQ6.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=dashboard-daemon.js.map

package/dist/runner.js

@@ -1,6 +1,6 @@
-import "./chunk-TBUUNMC6.js";
-import "./chunk-HGMJ3YL2.js";
+import "./chunk-Z5KVWWZU.js";
+import "./chunk-TWOJJ2JD.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-OYUBT6RS.js";
+import "./chunk-FYXEDUQ6.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=runner.js.map

package/package.json

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