@drisp/cli 0.7.4 → 0.7.5

package/dist/{WorkflowInstallWizard-AJYDKFDL.js → WorkflowInstallWizard-4GRQGM42.js}

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

package/dist/{chunk-F6XUMTMC.js → chunk-N4B7HLBN.js}

@@ -1,6 +1,6 @@
 import {
   runMachineRunners
-} from "./chunk-XG7B4OOC.js";
+} from "./chunk-TG5EGPD2.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-F6XUMTMC.js.map
+//# sourceMappingURL=chunk-N4B7HLBN.js.map

package/dist/{chunk-XG7B4OOC.js → chunk-TG5EGPD2.js}

@@ -19,7 +19,6 @@ import {
   BUILD_STRINGS,
   DEFAULT_PERMISSION_GRACE_MS,
   LAYOUT_MARKERS,
-  ORCHESTRATOR_LIMITS,
   ORCHESTRATOR_LOOP,
   WAITING_ON_CHILDREN_STOP_REASON,
   compileWorkflowPlan,
@@ -55,7 +54,7 @@ import {
   verifyRendered,
   wakesFreshAfterHandover,
   workflowRegistryDir
-} from "./chunk-TSIMXPJN.js";
+} from "./chunk-UQWOGG3L.js";
 import {
   __commonJS,
   __toESM
@@ -13078,12 +13077,12 @@ var SIZE_CLASS_FORECASTS = {
   L: 12e5
 };
 function classOfCap(declaredCap) {
-  if (declaredCap <= SIZE_CLASS_CAPS.S) return "S";
+  if (Number.isNaN(declaredCap) || declaredCap <= SIZE_CLASS_CAPS.S) return "S";
   if (declaredCap <= SIZE_CLASS_CAPS.M) return "M";
   return "L";
 }
-function attemptCost(attempt) {
-  return attempt.closed ? SIZE_CLASS_FORECASTS[classOfCap(attempt.tokenCap)] : attempt.tokenCap;
+function forecastOfCap(declaredCap) {
+  return SIZE_CLASS_FORECASTS[classOfCap(declaredCap)];
 }
 
 // ../../packages/protocol/src/v2.ts
@@ -14893,7 +14892,7 @@ async function restoreCheckpoint(store, input) {
 
 // ../../modules/runtime/src/software-version.ts
 import "fs";
-var runnerSoftwareVersion = true ? "0.7.4" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
+var runnerSoftwareVersion = true ? "0.7.5" : JSON.parse(readFileSync2(new URL("../../../apps/cli/package.json", import.meta.url), "utf8")).version;
 
 // ../../modules/runtime/src/connection.ts
 var RunnerDisconnectedError = class extends Error {
@@ -20261,7 +20260,8 @@ var issueEntrySchema = external_exports.strictObject({
   workflowName: external_exports.string().max(128)
 });
 var buildPlanSchema = external_exports.strictObject({
-  version: external_exports.literal(2),
+  /** 3 carries the forecast; 2 (read, never written) carried the sum of the children's caps. */
+  version: external_exports.union([external_exports.literal(2), external_exports.literal(3)]),
   orchestratorRunId: external_exports.string().min(1),
   planKey: external_exports.string().regex(/^plan:.+$/),
   projectId: external_exports.string().min(1),
@@ -20270,11 +20270,18 @@ var buildPlanSchema = external_exports.strictObject({
   templateVersion: external_exports.string().regex(/^[0-9a-f]{64}$/),
   branch: external_exports.string().regex(/^drisp\/build-[a-z0-9]+$/),
   commit: external_exports.string().regex(/^[0-9a-f]{40}$/),
-  budget: external_exports.strictObject({
-    tokenBudget: count,
-    orchestratorCap: count,
-    childCapsSum: count
-  }),
+  budget: external_exports.union([
+    external_exports.strictObject({
+      tokenBudget: count,
+      orchestratorCap: count,
+      forecast: count
+    }),
+    external_exports.strictObject({
+      tokenBudget: count,
+      orchestratorCap: count,
+      childCapsSum: count
+    })
+  ]),
   groups: external_exports.array(
     external_exports.strictObject({
       index: external_exports.number().int().positive(),
@@ -20627,11 +20634,12 @@ function planBuild(context) {
     });
   }
   const groups = layers.map((issues, index) => ({ index: index + 1, issues }));
+  const forecast = groups.flatMap((group2) => group2.issues).reduce((sum, entry) => sum + SIZE_CLASS_FORECASTS[entry.sizeClass], 0);
   return {
     status: "planned",
     workflows,
     plan: {
-      version: 2,
+      version: 3,
       orchestratorRunId: context.orchestratorRunId,
       planKey: `plan:${input.project.id}`,
       projectId: input.project.id,
@@ -20640,9 +20648,9 @@ function planBuild(context) {
       templateVersion: context.templateVersion,
       branch: buildBranch(input.project.slugId),
       budget: {
-        tokenBudget: ORCHESTRATOR_LIMITS.tokenBudget,
+        tokenBudget: defaultBudget(forecast),
         orchestratorCap: ORCHESTRATOR_LOOP.maxRunTokens,
-        childCapsSum: groups.flatMap((group2) => group2.issues).reduce((sum, entry) => sum + entry.tokenCap, 0)
+        forecast
       },
       groups,
       skipped,
@@ -20667,6 +20675,9 @@ function finalizePlan(draft, commit) {
     ...needsPerson ? { needsPerson } : {}
   };
 }
+function defaultBudget(forecast) {
+  return Math.ceil(forecast * 1.5 / 1e5) * 1e5;
+}
 
 // src/core/build/childWorktree.ts
 import fs23 from "fs";
@@ -21899,7 +21910,7 @@ export {
   RUN_EXIT_CODE,
   localAnswerDecision,
   runExec,
-  attemptCost,
+  forecastOfCap,
   repositoryBindingSchema,
   commandSchema,
   historyRecordSchema,
@@ -21956,4 +21967,4 @@ export {
   runMachineRunners,
   writeIdentityOnce
 };
-//# sourceMappingURL=chunk-XG7B4OOC.js.map
+//# sourceMappingURL=chunk-TG5EGPD2.js.map

package/dist/{chunk-TSIMXPJN.js → chunk-UQWOGG3L.js}

@@ -21287,7 +21287,6 @@ var workflow_default = '# Orchestrator: plan and run a Build\n\nYou plan and run
 var ORCHESTRATOR_WORKFLOW_NAME = "orchestrator";
 var ORCHESTRATOR_LIMITS = {
   maxChildren: 2,
-  tokenBudget: 6e7,
   tickAllowance: 300
 };
 var ORCHESTRATOR_LOOP = {
@@ -24251,4 +24250,4 @@ export {
   compileWorkflowPlan,
   collectMcpServersWithOptions
 };
-//# sourceMappingURL=chunk-TSIMXPJN.js.map
+//# sourceMappingURL=chunk-UQWOGG3L.js.map

package/dist/cli.js

@@ -10,7 +10,6 @@ import {
   ServiceNotEnabledError,
   approvalAnswer,
   attachRuntimeEventLoop,
-  attemptCost,
   behindMain,
   bootstrapRuntimeConfig,
   buildApiKeyHelperSettings,
@@ -48,6 +47,7 @@ import {
   finalizePlan,
   fit,
   fitAnsi,
+  forecastOfCap,
   forgetRunner,
   formatClock,
   formatProbeCommand,
@@ -140,7 +140,7 @@ import {
   visualPositionToOffset,
   wrapText,
   writeIdentityOnce
-} from "./chunk-XG7B4OOC.js";
+} from "./chunk-TG5EGPD2.js";
 import {
   generateId as generateId2
 } from "./chunk-PQIB66SG.js";
@@ -198,7 +198,7 @@ import {
   workflowRegistryDir,
   writeGlobalConfig,
   writeProjectConfig
-} from "./chunk-TSIMXPJN.js";
+} from "./chunk-UQWOGG3L.js";
 import {
   __toESM
 } from "./chunk-G3PMV62Z.js";
@@ -14362,21 +14362,15 @@ function assessTick(facts) {
   }).length;
   const queue = [];
   if (!parkReason) {
-    let capped = Object.values(state.attempts).flat().reduce(
-      (sum, attempt) => sum + attemptCost({
-        tokenCap: attempt.tokenCap,
-        closed: views.get(attempt.runId)?.closed === true
-      }),
-      0
-    );
+    let committed = Object.values(state.attempts).flat().reduce((sum, attempt) => sum + forecastOfCap(attempt.tokenCap), 0);
     for (const entry of entries) {
       if (status.get(entry.id) !== "ready") continue;
-      if (capped + entry.tokenCap > facts.limits.tokenBudget) {
+      if (committed + forecastOfCap(entry.tokenCap) > facts.limits.tokenBudget) {
         parkReason = "budget";
         break;
       }
       queue.push(entry);
-      capped += entry.tokenCap;
+      committed += forecastOfCap(entry.tokenCap);
     }
   }
   return {
@@ -14535,7 +14529,11 @@ async function runBuildTick(deps) {
     state: stored,
     children: children.runs,
     templateVersion,
-    limits: buildLimits(ORCHESTRATOR_LIMITS, parent.delegation),
+    // The approved plan's budget (the member's, once it is editable) narrowed by what the Hub enforces.
+    limits: buildLimits(
+      { ...ORCHESTRATOR_LIMITS, tokenBudget: plan.budget.tokenBudget },
+      parent.delegation
+    ),
     pullRequests: (branch) => deps.pullRequests(deps.folder, branch),
     locate: (entry) => locate(deps, entry, issues.get(entry.id)?.branchName),
     rebaseFailed: deps.rebaseFailed ?? [],
@@ -15960,7 +15958,7 @@ Available commands: ${[...KNOWN_COMMANDS].join(", ")}`
         await exitWith(1);
         return;
       }
-      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-AJYDKFDL.js");
+      const { default: WorkflowInstallWizard } = await import("./WorkflowInstallWizard-4GRQGM42.js");
       const { waitUntilExit } = render(
         /* @__PURE__ */ jsx24(
           WorkflowInstallWizard,

package/dist/dashboard-daemon.js

@@ -1,6 +1,6 @@
-import "./chunk-F6XUMTMC.js";
-import "./chunk-XG7B4OOC.js";
+import "./chunk-N4B7HLBN.js";
+import "./chunk-TG5EGPD2.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-TSIMXPJN.js";
+import "./chunk-UQWOGG3L.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=dashboard-daemon.js.map

package/dist/runner.js

@@ -1,6 +1,6 @@
-import "./chunk-F6XUMTMC.js";
-import "./chunk-XG7B4OOC.js";
+import "./chunk-N4B7HLBN.js";
+import "./chunk-TG5EGPD2.js";
 import "./chunk-PQIB66SG.js";
-import "./chunk-TSIMXPJN.js";
+import "./chunk-UQWOGG3L.js";
 import "./chunk-G3PMV62Z.js";
 //# sourceMappingURL=runner.js.map

package/package.json

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