@drisp/protocol 0.8.5 → 0.8.6

package/dist/v2.d.ts

@@ -18,14 +18,38 @@ declare function classOfCap(declaredCap: number): SizeClass;
 /** What a Run declaring `declaredCap` is expected to use: its class's forecast. */
 declare function forecastOfCap(declaredCap: number): number;
 /**
- * What one attempt holds against the budget: a closed attempt (finished, failed, cancelled) its forecast, never more
- * than its own declared cap (so the rule stays looser than the cap sum it replaces); a running or queued one still its
- * declared cap. A closed attempt whose cap is no positive number counts its forecast.
+ * What an attempt declaring `declaredCap` is expected to use: its class's forecast, never more than its own cap (so
+ * the rule stays looser than the cap sum it replaces). A cap that is no positive number counts the `S` forecast.
  */
-declare function attemptCost(attempt: {
+declare function attemptForecast(declaredCap: number): number;
+/**
+ * One attempt of a child: its declared cap, whether it has closed, and the counted tokens it reported, if any. No
+ * caller passes `spent` yet: the CLI and the Hub count forecasts until reported usage feeds the rule (DRI-246).
+ */
+type BudgetAttempt = {
     tokenCap: number;
     closed: boolean;
-}): number;
+    spent?: number;
+};
+/**
+ * What one attempt holds against the budget: a closed attempt (finished, failed, cancelled) what it reported, else its
+ * forecast; a running or queued one the larger of its forecast and what it reported, so a resumed attempt never counts
+ * the same tokens twice and an overrun counts once reported.
+ */
+declare function attemptCost(attempt: BudgetAttempt): number;
+/**
+ * The budget rule the CLI and the Hub share (root ADR-0011). `used` is the sum over every attempt of every child, a
+ * retry being a new attempt; the next start, forecast at `next`, fits when `used + next` is within the budget. Issues
+ * not yet started never enter it: the app warns of them on the plan sheet (Kit `shortfallNote`) and nothing parks.
+ */
+declare function budgetCheck(input: {
+    tokenBudget: number;
+    attempts: readonly BudgetAttempt[];
+    next: number;
+}): {
+    used: number;
+    fits: boolean;
+};
 /** A class needs this many finished Runs of a harness before its forecast is measured (DRI-244). */
 declare const CALIBRATION_MIN_RUNS = 10;
 /** Only Runs closed within this many days count. */
@@ -535,6 +559,10 @@ declare const commandSchema: z.ZodObject<{
         kind: z.ZodLiteral<"resume">;
         interruptionId: z.ZodString;
         guidance: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>, z.ZodObject<{
+        kind: z.ZodLiteral<"setBudget">;
+        tokenBudget: z.ZodNumber;
+        resume: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strict>], "kind">;
 }, z.core.$strict>;
 declare const grantSchema: z.ZodObject<{
@@ -975,6 +1003,10 @@ declare const runViewSchema: z.ZodObject<{
         kind: z.ZodLiteral<"resume">;
         interruptionId: z.ZodString;
         guidance: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>, z.ZodObject<{
+        kind: z.ZodLiteral<"setBudget">;
+        tokenBudget: z.ZodNumber;
+        resume: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strict>], "kind">>;
     runnerStopped: z.ZodOptional<z.ZodBoolean>;
     canAbandon: z.ZodOptional<z.ZodBoolean>;
@@ -1070,6 +1102,10 @@ declare const clientFrameSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
             kind: z.ZodLiteral<"resume">;
             interruptionId: z.ZodString;
             guidance: z.ZodOptional<z.ZodString>;
+        }, z.core.$strict>, z.ZodObject<{
+            kind: z.ZodLiteral<"setBudget">;
+            tokenBudget: z.ZodNumber;
+            resume: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strict>], "kind">;
     }, z.core.$strict>;
 }, z.core.$strict>, z.ZodObject<{
@@ -1516,4 +1552,4 @@ type ConnectPendingResponse = z.infer<typeof connectPendingResponseSchema>;
 type TeamDefault = z.infer<typeof teamDefaultSchema>;
 type RunsGoTo = z.infer<typeof runsGoToSchema>;
 
-export { type Audience, type BuildCloseReason, CALIBRATION_MIN_RUNS, CALIBRATION_WINDOW_DAYS, type Calibration, type CalibrationSample, type Checkpoint, type ClassCalibration, type Command, type ConnectAlreadyConnected, type ConnectPendingResponse, type ConnectRedeemRequest, type ConnectRedeemResponse, type ConnectStartRequest, type ConnectStartResponse, type ControlRecord, type Delegation, type ExecutionFact, type Grant, type Harness, type HarnessReadiness, type HistoryRecord, type InstalledWorkflow, type RepositoryBinding, type RepositorySource, type RunCloseReason, type RunParent, type RunUsage, type RunView, type RunnerAdoptRequest, type RunnerDisconnectPreview, type RunnerDisconnectResponse, type RunnerFrame, type RunnerList, type RunnerListEntry, type RunnerReadiness, type RunsGoTo, SIZE_CLASS_CAPS, SIZE_CLASS_FORECASTS, type Scope, type SizeClass, type TeamDefault, type WorkflowIdentity, type WorkflowInstallReference, type WorkflowReference, abandonedConversationContinuationCapability, attemptCost, audienceSchema, buildCloseReasonSchema, calibrate, calibrationSchema, canonicalJson, checkpointPathSchema, checkpointSchema, classOfCap, clientFrameSchema, commandSchema, connectAlreadyConnectedSchema, connectApproveRequestSchema, connectCodeAlphabet, connectCodeRequestSchema, connectCodeResponseSchema, connectCodeSchema, connectDenyRequestSchema, connectPendingResponseSchema, connectPollRequestSchema, connectRedeemRequestSchema, connectRedeemResponseSchema, connectStartRequestSchema, connectStartResponseSchema, controlRecordSchema, conversationContinuationCapability, delegationSchema, delegationTokenPrefix, forecastOfCap, forecastOfClass, grantSchema, harnessReadinessSchema, harnessSchema, historyRecordSchema, hubEpochRequestSchema, installReference, installedWorkflowsSchema, interruptionSchema, permissionAnswerSchema, protocolVersion, readableHistory, readinessFixCommand, repositoryAccessCapability, repositoryBindingSchema, repositoryRefSchema, repositorySourceSchema, repositoryWorkingDirectorySchema, runArtifactMaxBytes, runArtifactNameSchema, runCloseReasonSchema, runDelegationCapability, runKeySchema, runParentIntentSchema, runParentSchema, runSpecSchema, runUsageCapability, runUsageSchema, runViewSchema, runnerAdoptRequestSchema, runnerDisconnectPreviewSchema, runnerDisconnectRequestSchema, runnerDisconnectResponseSchema, runnerFrameSchema, runnerListEntrySchema, runnerListSchema, runnerReadinessSchema, runnerUpdateCommand, runnerUpdateRequestSchema, runsGoToSchema, sameWorkflow, scopeSchema, secretEnvironmentSchema, sequence, teamDefaultRequestSchema, teamDefaultSchema, workflowIdentitySchema, workflowInstallCapability, workflowName, workflowReferenceSchema, workflowSourceSchema };
+export { type Audience, type BudgetAttempt, type BuildCloseReason, CALIBRATION_MIN_RUNS, CALIBRATION_WINDOW_DAYS, type Calibration, type CalibrationSample, type Checkpoint, type ClassCalibration, type Command, type ConnectAlreadyConnected, type ConnectPendingResponse, type ConnectRedeemRequest, type ConnectRedeemResponse, type ConnectStartRequest, type ConnectStartResponse, type ControlRecord, type Delegation, type ExecutionFact, type Grant, type Harness, type HarnessReadiness, type HistoryRecord, type InstalledWorkflow, type RepositoryBinding, type RepositorySource, type RunCloseReason, type RunParent, type RunUsage, type RunView, type RunnerAdoptRequest, type RunnerDisconnectPreview, type RunnerDisconnectResponse, type RunnerFrame, type RunnerList, type RunnerListEntry, type RunnerReadiness, type RunsGoTo, SIZE_CLASS_CAPS, SIZE_CLASS_FORECASTS, type Scope, type SizeClass, type TeamDefault, type WorkflowIdentity, type WorkflowInstallReference, type WorkflowReference, abandonedConversationContinuationCapability, attemptCost, attemptForecast, audienceSchema, budgetCheck, buildCloseReasonSchema, calibrate, calibrationSchema, canonicalJson, checkpointPathSchema, checkpointSchema, classOfCap, clientFrameSchema, commandSchema, connectAlreadyConnectedSchema, connectApproveRequestSchema, connectCodeAlphabet, connectCodeRequestSchema, connectCodeResponseSchema, connectCodeSchema, connectDenyRequestSchema, connectPendingResponseSchema, connectPollRequestSchema, connectRedeemRequestSchema, connectRedeemResponseSchema, connectStartRequestSchema, connectStartResponseSchema, controlRecordSchema, conversationContinuationCapability, delegationSchema, delegationTokenPrefix, forecastOfCap, forecastOfClass, grantSchema, harnessReadinessSchema, harnessSchema, historyRecordSchema, hubEpochRequestSchema, installReference, installedWorkflowsSchema, interruptionSchema, permissionAnswerSchema, protocolVersion, readableHistory, readinessFixCommand, repositoryAccessCapability, repositoryBindingSchema, repositoryRefSchema, repositorySourceSchema, repositoryWorkingDirectorySchema, runArtifactMaxBytes, runArtifactNameSchema, runCloseReasonSchema, runDelegationCapability, runKeySchema, runParentIntentSchema, runParentSchema, runSpecSchema, runUsageCapability, runUsageSchema, runViewSchema, runnerAdoptRequestSchema, runnerDisconnectPreviewSchema, runnerDisconnectRequestSchema, runnerDisconnectResponseSchema, runnerFrameSchema, runnerListEntrySchema, runnerListSchema, runnerReadinessSchema, runnerUpdateCommand, runnerUpdateRequestSchema, runsGoToSchema, sameWorkflow, scopeSchema, secretEnvironmentSchema, sequence, teamDefaultRequestSchema, teamDefaultSchema, workflowIdentitySchema, workflowInstallCapability, workflowName, workflowReferenceSchema, workflowSourceSchema };

package/dist/v2.js

@@ -67,10 +67,18 @@ function classOfCap(declaredCap) {
 function forecastOfCap(declaredCap) {
   return SIZE_CLASS_FORECASTS[classOfCap(declaredCap)];
 }
+function attemptForecast(declaredCap) {
+  const forecast = forecastOfCap(declaredCap);
+  return declaredCap > 0 ? Math.min(declaredCap, forecast) : forecast;
+}
 function attemptCost(attempt) {
-  if (!attempt.closed) return attempt.tokenCap;
-  const forecast = forecastOfCap(attempt.tokenCap);
-  return attempt.tokenCap > 0 ? Math.min(attempt.tokenCap, forecast) : forecast;
+  const forecast = attemptForecast(attempt.tokenCap);
+  if (attempt.closed) return attempt.spent ?? forecast;
+  return Math.max(forecast, attempt.spent ?? 0);
+}
+function budgetCheck(input) {
+  const used = input.attempts.reduce((sum, attempt) => sum + attemptCost(attempt), 0);
+  return { used, fits: used + input.next <= input.tokenBudget };
 }
 var CALIBRATION_MIN_RUNS = 10;
 var CALIBRATION_WINDOW_DAYS = 90;
@@ -350,6 +358,16 @@ var commandSchema = z2.strictObject({
       kind: z2.literal("resume"),
       interruptionId: id,
       guidance: z2.string().max(131072).optional()
+    }),
+    /**
+     * A member rewrites an Orchestrator's `delegation.tokenBudget` (root ADR-0011), never below what its children
+     * used. With `resume`, a parked Orchestrator with no live child is resumed when the value is strictly greater.
+     * Hub-only: never delivered to a Runner.
+     */
+    z2.strictObject({
+      kind: z2.literal("setBudget"),
+      tokenBudget: delegationSchema.shape.tokenBudget,
+      resume: z2.boolean().optional()
     })
   ])
 });
@@ -678,7 +696,9 @@ export {
   SIZE_CLASS_FORECASTS,
   abandonedConversationContinuationCapability,
   attemptCost,
+  attemptForecast,
   audienceSchema,
+  budgetCheck,
   buildCloseReasonSchema,
   calibrate,
   calibrationSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drisp/protocol",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "Wire contract between a drisp runner and the hub: zod schemas, inferred types, and JSON Schema for the instance-socket frames, Run, Turn, Interruption, and the event stream",
   "repository": {
     "type": "git",

package/schema/v2/client.json

@@ -448,6 +448,28 @@
                     "interruptionId"
                   ],
                   "additionalProperties": false
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "kind": {
+                      "type": "string",
+                      "const": "setBudget"
+                    },
+                    "tokenBudget": {
+                      "type": "integer",
+                      "exclusiveMinimum": 0,
+                      "maximum": 9007199254740991
+                    },
+                    "resume": {
+                      "type": "boolean"
+                    }
+                  },
+                  "required": [
+                    "kind",
+                    "tokenBudget"
+                  ],
+                  "additionalProperties": false
                 }
               ]
             }

package/schema/v2/command.json

@@ -385,6 +385,28 @@
             "interruptionId"
           ],
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "setBudget"
+            },
+            "tokenBudget": {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            },
+            "resume": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "kind",
+            "tokenBudget"
+          ],
+          "additionalProperties": false
         }
       ]
     }

package/schema/v2/run.json

@@ -631,6 +631,28 @@
             "interruptionId"
           ],
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "setBudget"
+            },
+            "tokenBudget": {
+              "type": "integer",
+              "exclusiveMinimum": 0,
+              "maximum": 9007199254740991
+            },
+            "resume": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "kind",
+            "tokenBudget"
+          ],
+          "additionalProperties": false
         }
       ]
     },