@jigging/jig 0.1.0-alpha.19 → 0.1.0-alpha.20

package/libexec/installed-cli.js

@@ -7510,7 +7510,7 @@ import { setTimeout as delay } from "timers/promises";
 // package.json
 var package_default = {
   name: "@jigging/jig",
-  version: "0.1.0-alpha.19",
+  version: "0.1.0-alpha.20",
   description: "A local, secure host for admitted FLOW packages",
   license: "SEE LICENSE IN LICENSE.md",
   repository: {
@@ -41585,7 +41585,9 @@ async function executePrivateContainedEffect(input) {
   } catch {
     return failed2("UNAVAILABLE", "the admitted contained-operation runtime cannot be reproduced");
   }
-  const deadlineUnixMs = Math.min(input.parentDeadlineUnixMs, input.parent.intent.deadlineUnixMs, Date.now() + (prepared.kind === "http" ? prepared.value.grant.timeoutMs : PROJECT_COMMAND_LIMITS.timeoutMs));
+  const ownDeadlineUnixMs = Date.now() + (prepared.kind === "http" ? prepared.value.grant.timeoutMs : PROJECT_COMMAND_LIMITS.timeoutMs);
+  const deadlineUnixMs = Math.min(input.parentDeadlineUnixMs, input.parent.intent.deadlineUnixMs, ownDeadlineUnixMs);
+  const deadlineLimit = privateContainedDeadlineLimit(prepared.kind, input.parent.intent.deadlineUnixMs, input.parentDeadlineUnixMs, ownDeadlineUnixMs);
   if (deadlineUnixMs <= Date.now())
     return failed2("DEADLINE_EXCEEDED", "the operation deadline elapsed before dispatch");
   if (input.parentFlow !== undefined)
@@ -41637,6 +41639,7 @@ async function executePrivateContainedEffect(input) {
   }
   const files = [];
   let attempted = false;
+  let phase = "preparing input";
   try {
     for (const [path, source] of Object.entries(prepared.kind === "command" ? prepared.value.input.files : {})) {
       const bytes = Buffer.from(source);
@@ -41654,10 +41657,14 @@ async function executePrivateContainedEffect(input) {
       sandbox: sealed.identity
     });
     attempted = true;
+    phase = "starting the worker";
     const component = await sealed.admit(input.signal);
     const stdin = prepared.kind === "command" ? prepared.value.input.stdin ?? "" : httpInput;
+    phase = "collecting the worker result";
     const observed = await collectEffect(component, stdin, prepared.kind === "http" ? JSON_1_LIMITS.bytes : PROJECT_COMMAND_LIMITS.streamBytes);
+    phase = "fencing and cleanup";
     await releaseEffect(input, lifecycle, observed.fence);
+    phase = "checking the collected result";
     const reason = observed.fence.stopReason;
     if (!["payload_exit", "cancelled", "deadline"].includes(reason))
       return failed2("UNCERTAIN", "the operation was fenced without a proved terminal; effects may have occurred");
@@ -41715,13 +41722,24 @@ async function executePrivateContainedEffect(input) {
     if (input.signal.aborted)
       return failed2("CANCELLED", "the contained operation was cancelled");
     if (Date.now() >= deadlineUnixMs)
-      return failed2("DEADLINE_EXCEEDED", "the contained operation deadline elapsed; effects may have occurred");
+      return failed2("DEADLINE_EXCEEDED", privateContainedDeadlineMessage(prepared.kind, deadlineLimit, phase));
     return failed2(attempted ? "UNCERTAIN" : "EXECUTION_FAILED", attempted ? "operation dispatch may have occurred but no result was proved" : "contained operation setup failed before dispatch");
   } finally {
     for (const file of files)
       closeSync6(file.fd);
   }
 }
+function privateContainedDeadlineLimit(kind, rootDeadlineUnixMs, parentDeadlineUnixMs, ownDeadlineUnixMs) {
+  const deadline = Math.min(rootDeadlineUnixMs, parentDeadlineUnixMs, ownDeadlineUnixMs);
+  if (deadline === rootDeadlineUnixMs)
+    return "root Run";
+  if (deadline === parentDeadlineUnixMs)
+    return "parent Flow";
+  return kind === "http" ? "HTTP grant" : "project command";
+}
+function privateContainedDeadlineMessage(kind, limit2, phase) {
+  return `the ${kind === "http" ? "HTTP request" : "project command"} did not return a proved result by its effective deadline (limited by ${limit2}) while ${phase}; effects may have occurred`;
+}
 function httpPlan(recipe, identity2, deadlineUnixMs) {
   return {
     runId: `effect-${identity2.slice(0, 40)}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jigging/jig",
-  "version": "0.1.0-alpha.19",
+  "version": "0.1.0-alpha.20",
   "description": "A local, secure host for admitted FLOW packages",
   "license": "SEE LICENSE IN LICENSE.md",
   "repository": {