@kontextmind/kxm 0.7.23 → 0.7.25

package/plugins/kxm/src/vnext-runtime-supervisor.ts

@@ -23,7 +23,7 @@ import {
 } from "./vnext-runtime.ts";
 import { createVnextOneShotProducer } from "./vnext-oneshot-producer.ts";
 import { isProducerAdmitted } from "./producers.ts";
-import { VnextRunScheduler, createVnextSimulatedProducer, recoverVnextRun } from "./vnext-engine.ts";
+import { VnextRunScheduler, createVnextSimulatedProducer, recordDriveReceipt, recoverVnextRun, vnextDrivePollProjection } from "./vnext-engine.ts";
 import { vnextOpenDriveSessions } from "./vnext-runtime-owner.ts";
 
 /* ------------------------------------------------------------------ *
@@ -318,6 +318,16 @@ async function waitForDriveSessions(settled: Promise<unknown>[], graceMs: number
   }
 }
 
+async function driveSessionStillPending(settled: Promise<unknown>): Promise<boolean> {
+  let pending = true;
+  void settled.then(
+    () => { pending = false; },
+    () => { pending = false; },
+  );
+  await Promise.resolve();
+  return pending;
+}
+
 export interface VnextRuntimeSupervisor {
   server: Server;
   port: number;
@@ -446,7 +456,9 @@ async function startVnextRuntimeSupervisorInner(
           const bundle = loadVnextProject(projectRoot, {});
           if (request.method === "GET" && !sub) {
             const projected = rebuildVnextRunProjection(context, runId);
-            sendJson(response, 200, { ok: true, run: projected });
+            const folded = foldStoredVnextRun(context, projected);
+            const drive = vnextDrivePollProjection(context, runId, folded);
+            sendJson(response, 200, { ok: true, run: projected, ...(drive !== undefined ? { drive } : {}) });
             return;
           }
           if (request.method === "POST" && sub === "drive") {
@@ -493,7 +505,7 @@ async function startVnextRuntimeSupervisorInner(
               const scheduler = VnextRunScheduler.for(context, bundle);
               const opening = scheduler.openDriveSession(runId, {
                 mode: body.mode,
-                allowLimits: true,
+                allowLimits: false,
                 liveMode: body.mode === "live",
                 createProducer,
               });
@@ -684,6 +696,15 @@ async function startVnextRuntimeSupervisorInner(
       }
     }
     await waitForDriveSessions(openSessions.map(({ session }) => session.settled), runtimeStopGraceMs());
+    for (const { context, session } of openSessions) {
+      if (!(await driveSessionStillPending(session.settled))) continue;
+      recordDriveReceipt(context, session, {
+        kind: "unsettled",
+        reason: "runtime_shutdown_grace_expired",
+        producerId: session.producerId,
+        producerClosed: false,
+      });
+    }
     for (const context of contexts.values()) closeVnextRuntimeContext(context);
     contexts.clear();
     const closed = new Promise<void>((resolveStop) => server.close(() => resolveStop()));

package/plugins/kxm/src/vnext-runtime.ts

@@ -464,6 +464,7 @@ export function foldStoredVnextRun(context: VnextRuntimeContext, run: VnextRunRe
         if (!step || step.kind !== "gate") return undefined;
         return envelope.gates.definitions[step.gate]?.kind;
       },
+      projectLimits: envelope.projectLimits,
     }
     : {});
   if (envelope) verifyVnextGateEvidence(context.eventStore, run, envelope, events, state);
@@ -551,7 +552,13 @@ export interface VnextRunCancelResult {
 export function cancelVnextRun(
   context: VnextRuntimeContext,
   runId: string,
-  options: { commandId?: string; now?: string; monotonicNs?: string; reason?: string } = {},
+  options: {
+    commandId?: string;
+    now?: string;
+    monotonicNs?: string;
+    reason?: string;
+    budget?: { budgetMs: number; elapsedMs: number; source: "workflow" | "project" | "both" };
+  } = {},
 ): VnextRunCancelResult {
   const commandId = options.commandId ?? newVnextCommandId();
   const now = options.now ?? new Date().toISOString();
@@ -600,10 +607,17 @@ export function cancelVnextRun(
 
     const cancelReason = options.reason ?? "operator_cancel";
     const activeAttempt = Boolean(folded.currentStep?.attemptId) || vnextFoldPanelAttemptIds(folded.currentStep).length > 0;
-    push("run.cancel_requested", {
+    const cancelPayload: Record<string, unknown> = {
       actor: { kind: "runtime", id: context.homeRuntimeId },
       reason: cancelReason,
-    });
+    };
+    if (cancelReason === "budget_run_duration") {
+      if (!options.budget) {
+        throw runtimeError("run_events_illegal", runId, "budget_run_duration requires a budget payload");
+      }
+      cancelPayload.budget = options.budget;
+    }
+    push("run.cancel_requested", cancelPayload);
 
     let status: VnextRunStatus = "cancelled";
     if (folded.status === "running" && activeAttempt) {

package/schemas/vnext/common.schema.json

@@ -164,6 +164,7 @@
         "run.created",
         "run.status_changed",
         "run.cancel_requested",
+        "run.drive_opened",
         "step.entered",
         "step.status_changed",
         "step.outcome_recorded",

package/schemas/vnext/drive-receipt.schema.json

@@ -0,0 +1,95 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://schemas.kxm.dev/vnext/drive-receipt.schema.json",
+  "title": "KXM vNext drive session receipt",
+  "type": "object",
+  "required": [
+    "schema",
+    "driveId",
+    "runId",
+    "projectId",
+    "homeRuntimeId",
+    "mode",
+    "openedAt",
+    "openedSequence",
+    "closedAt",
+    "lastSequence",
+    "logHash",
+    "settlement",
+    "budget",
+    "producer"
+  ],
+  "properties": {
+    "schema": { "const": "kxm.drive-receipt.v1" },
+    "driveId": { "$ref": "common.schema.json#/$defs/opaqueId" },
+    "runId": { "$ref": "common.schema.json#/$defs/opaqueId" },
+    "projectId": { "$ref": "common.schema.json#/$defs/opaqueId" },
+    "homeRuntimeId": { "$ref": "common.schema.json#/$defs/opaqueId" },
+    "mode": { "enum": ["simulated", "live"] },
+    "openedAt": { "$ref": "common.schema.json#/$defs/timestamp" },
+    "openedSequence": { "type": "integer", "minimum": 1 },
+    "closedAt": { "$ref": "common.schema.json#/$defs/timestamp" },
+    "lastSequence": { "type": "integer", "minimum": 1 },
+    "logHash": { "$ref": "common.schema.json#/$defs/sha256" },
+    "settlement": { "$ref": "#/$defs/settlement" },
+    "budget": { "$ref": "#/$defs/budget" },
+    "producer": {
+      "type": "object",
+      "required": ["id", "closed"],
+      "properties": {
+        "id": { "$ref": "common.schema.json#/$defs/identifier" },
+        "closed": { "type": "boolean" }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false,
+  "$defs": {
+    "settlement": {
+      "type": "object",
+      "required": ["kind", "status", "reason"],
+      "properties": {
+        "kind": { "enum": ["terminal", "handoff", "unsettled"] },
+        "status": { "$ref": "common.schema.json#/$defs/lifecycleStatus" },
+        "reason": { "type": "string", "maxLength": 4000 },
+        "handoff": { "$ref": "#/$defs/handoff" },
+        "error": { "$ref": "common.schema.json#/$defs/errorSummary" }
+      },
+      "additionalProperties": false,
+      "allOf": [
+        {
+          "if": { "properties": { "kind": { "const": "handoff" } }, "required": ["kind"] },
+          "then": { "required": ["handoff"] },
+          "else": { "not": { "required": ["handoff"] } }
+        }
+      ]
+    },
+    "budget": {
+      "oneOf": [
+        { "type": "null" },
+        {
+          "type": "object",
+          "required": ["budgetMs", "source", "elapsedMs", "overrun"],
+          "properties": {
+            "budgetMs": { "$ref": "common.schema.json#/$defs/durationMs" },
+            "source": { "enum": ["workflow", "project", "both"] },
+            "elapsedMs": { "type": "integer", "minimum": 0 },
+            "overrun": { "type": "boolean" }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
+    "handoff": {
+      "type": "object",
+      "required": ["reason", "detail"],
+      "properties": {
+        "reason": { "type": "string", "minLength": 1, "maxLength": 80 },
+        "field": { "type": "string", "minLength": 1, "maxLength": 128 },
+        "stepId": { "$ref": "common.schema.json#/$defs/identifier" },
+        "detail": { "type": "string", "minLength": 1, "maxLength": 4000 }
+      },
+      "additionalProperties": false
+    }
+  }
+}

package/schemas/vnext/run-event.schema.json

@@ -90,6 +90,24 @@
         }
       }
     },
+    {
+      "if": {
+        "properties": {
+          "eventType": { "const": "run.cancel_requested" },
+          "payload": {
+            "type": "object",
+            "properties": { "reason": { "const": "budget_run_duration" } },
+            "required": ["reason"]
+          }
+        },
+        "required": ["eventType", "payload"]
+      },
+      "then": {
+        "properties": {
+          "payload": { "type": "object", "required": ["actor", "reason", "budget"] }
+        }
+      }
+    },
     {
       "if": { "properties": { "eventType": { "const": "step.entered" } }, "required": ["eventType"] },
       "then": {
@@ -278,10 +296,28 @@
           "payload": { "type": "object", "required": ["routing"] }
         }
       }
+    },
+    {
+      "if": { "properties": { "eventType": { "const": "run.drive_opened" } }, "required": ["eventType"] },
+      "then": {
+        "properties": {
+          "payload": { "type": "object", "required": ["driveId", "mode"] }
+        }
+      }
     }
   ],
   "additionalProperties": false,
   "$defs": {
+    "runDurationBudget": {
+      "type": "object",
+      "required": ["budgetMs", "elapsedMs", "source"],
+      "properties": {
+        "budgetMs": { "$ref": "common.schema.json#/$defs/durationMs" },
+        "elapsedMs": { "type": "integer", "minimum": 0 },
+        "source": { "enum": ["workflow", "project", "both"] }
+      },
+      "additionalProperties": false
+    },
     "repositorySnapshot": {
       "type": "object",
       "required": ["repositoryId", "baseCommit", "contentSnapshotHash"],
@@ -383,6 +419,7 @@
         "timing": { "$ref": "common.schema.json#/$defs/timing" },
         "usage": { "$ref": "common.schema.json#/$defs/usage" },
         "error": { "$ref": "common.schema.json#/$defs/errorSummary" },
+        "budget": { "$ref": "#/$defs/runDurationBudget" },
         "actor": { "$ref": "common.schema.json#/$defs/actor" },
         "resolvedBy": { "$ref": "common.schema.json#/$defs/actor" },
         "resolutionAction": {
@@ -394,6 +431,8 @@
           "maxItems": 64
         },
         "lease": { "$ref": "common.schema.json#/$defs/lease" },
+        "driveId": { "$ref": "common.schema.json#/$defs/opaqueId" },
+        "mode": { "enum": ["simulated", "live"] },
         "candidateId": { "$ref": "common.schema.json#/$defs/opaqueId" },
         "counts": {
           "type": "object",