@oxygen-agent/cli 1.1010.721 → 1.1010.905

package/node_modules/@oxygen/workflows/dist/usage-estimate.js

@@ -1,14 +1,14 @@
-// Static automation-action usage estimation shared by the web workflow page
-// and the worker scheduler's admission gate. The per-run count derived from a
-// manifest is a FLOOR, never a projection: runtime metering bills 1 action per
-// EMITTED checkpoint (recipe code loops multiply), 1 per row written by
-// oxygen.rows_upsert (see estimateAutomationActionsForTool in
-// @oxygen/integrations automation-usage.ts), and retried attempts bill again.
-// Surfaces must present these numbers as minimums; observed run history is the
-// honest projection (projectObservedAutomationUsage below).
+// Static automation usage estimation shared by the web workflow page and the
+// worker scheduler's admission gate. The unit is the workflow STEP: every step a
+// live run executes bills one (repricing 2026-09, decision 6.1) and rows written
+// inside a run are free (decision 6.2), so a row-writing step costs one step
+// however many rows it writes. The per-run count derived from a manifest is a
+// FLOOR, never a projection: recipe code emits one step per checkpoint (loops
+// multiply) and a retried attempt bills again. Surfaces present these numbers as
+// minimums; observed run history is the honest projection
+// (projectObservedAutomationUsage below).
 import { loopBodyNodeIds } from "./graph/topology.js";
 import { isWorkflowGraphManifest, workflowGraphNodeKindBills, MAX_WORKFLOW_LOOP_ITERATIONS, } from "./graph/types.js";
-const ROW_FANOUT_TOOL_IDS = new Set(["oxygen.rows_upsert"]);
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -64,21 +64,6 @@ function manifestHasDynamicRuntimeActions(manifest) {
     return graph.nodes.some((node) => node.hasRecipe
         || (node.kind === "loop" && !node.disabled && declaredLoopIterations(node.maxIterations) === null));
 }
-function manifestWritesRowsPerRun(manifest) {
-    if (!isRecord(manifest))
-        return false;
-    const steps = Array.isArray(manifest.steps) ? manifest.steps : null;
-    if (steps) {
-        return steps.some((step) => isRecord(step) && step.kind === "tool" && typeof step.tool === "string" && ROW_FANOUT_TOOL_IDS.has(step.tool));
-    }
-    const graph = readWorkflowGraph(manifest);
-    if (graph) {
-        return graph.nodes.some((node) => (node.kind === "tool" && typeof node.tool === "string" && ROW_FANOUT_TOOL_IDS.has(node.tool))
-            || node.recipeTools.some((tool) => ROW_FANOUT_TOOL_IDS.has(tool)));
-    }
-    const toolsUsed = Array.isArray(manifest.tools_used) ? manifest.tools_used : [];
-    return toolsUsed.some((tool) => typeof tool === "string" && ROW_FANOUT_TOOL_IDS.has(tool));
-}
 function readWorkflowGraph(manifest) {
     if (!isWorkflowGraphManifest(manifest))
         return null;
@@ -194,7 +179,7 @@ export function estimateWorkflowAutomationUsage(manifest, cron) {
         scheduledRunsPer30Days,
         scheduledActionsPer30DaysFloor: scheduledRunsPer30Days === null ? null : scheduledRunsPer30Days * actionsPerRunFloor,
         dynamicRuntimeActions: manifestHasDynamicRuntimeActions(manifest),
-        perRowFanout: manifestWritesRowsPerRun(manifest),
+        perRowFanout: false,
     };
 }
 // Fixed 30-day month, minute and hour fields treated independently; timezone
@@ -279,8 +264,15 @@ const MINUTES_PER_30_DAYS = 43_200;
 // Cadence-vs-allowance arithmetic for a cron trigger, using the manifest FLOOR
 // (see the header): the cheapest run this workflow can physically have. A
 // verdict of "impossible" is therefore a lower bound that already overruns the
-// plan — the real run cost is only ever higher, because row fan-out is added at
-// runtime and is unbounded.
+// allowance — the real run cost is only ever higher (recipe checkpoints, loops
+// over run-time collections and retries add steps).
+//
+// On the credit basis the allowance is the plan's monthly credits OR the
+// balance the workspace can spend, whichever is larger (proposal P-65): at 0.05
+// a step an every-minute, 5-step cron costs 10,800 credits a month, more than
+// the $99 plan includes, and a workspace that funded that from top-ups must be
+// able to arm it. The fire-time gate charges against the balance, so a funded
+// cron is never paused mid-month either.
 //
 // Returns null when the question is not decidable or not meaningful:
 // no cron (on-demand), an unparseable cron, an unlimited allowance, or overage
@@ -299,6 +291,16 @@ export function assessCronCadenceViability(input) {
         && input.includedCredits > 0
         ? input.includedCredits
         : null;
+    const spendableCredits = typeof input.spendableCredits === "number"
+        && Number.isFinite(input.spendableCredits)
+        && input.spendableCredits > 0
+        ? input.spendableCredits
+        : null;
+    // A plan without monthly credits (free) is never judged here: its crons run on
+    // the balance and the fire-time gate is their only stop, as before.
+    const allowanceCredits = includedCredits === null
+        ? null
+        : Math.max(includedCredits, spendableCredits ?? 0);
     // Prefer a real action quota when the plan still has one; otherwise derive the
     // equivalent action budget from monthly credits.
     const basis = input.includedActions === null
@@ -306,8 +308,8 @@ export function assessCronCadenceViability(input) {
         : "plan_action_quota";
     const includedActions = basis === "plan_action_quota"
         ? input.includedActions
-        : (includedCredits !== null && creditsPerAction !== null
-            ? Math.floor(includedCredits / creditsPerAction)
+        : (allowanceCredits !== null && creditsPerAction !== null
+            ? Math.floor(allowanceCredits / creditsPerAction)
             : null);
     if (includedActions === null)
         return null;
@@ -327,6 +329,8 @@ export function assessCronCadenceViability(input) {
         floorShareOfIncluded: floorActionsPer30Days / includedActions,
         basis,
         includedCredits: basis === "plan_monthly_credits" ? includedCredits : null,
+        spendableCredits: basis === "plan_monthly_credits" ? spendableCredits : null,
+        allowanceCredits: basis === "plan_monthly_credits" ? allowanceCredits : null,
         floorCreditsPer30Days: basis === "plan_monthly_credits" && creditsPerAction !== null
             ? Math.round(floorActionsPer30Days * creditsPerAction * 1000) / 1000
             : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxygen-agent/cli",
-  "version": "1.1010.721",
+  "version": "1.1010.905",
   "private": false,
   "license": "UNLICENSED",
   "type": "module",