@sjawhar/pi-legion-envoy 5.17.1 → 5.17.2

package/dist/legion.js

@@ -33473,7 +33473,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "5.17.1",
+  version: "5.17.2",
   type: "module",
   omp: {
     extensions: [
@@ -42174,9 +42174,11 @@ function visitParts(parts, st, ctx) {
         visitParts(part.parts, st, ctx);
         break;
       case "CommandExpansion":
-      case "ProcessSubstitution":
         walkSubstitution(part.script, part.inner, part.text, st, ctx);
         break;
+      case "ProcessSubstitution":
+        uncertainly(ctx, () => walkSubstitution(part.script, part.inner, part.text, st, ctx));
+        break;
       case "ArithmeticExpansion":
         visitArithmetic(part.expression, st, ctx);
         break;
@@ -42396,10 +42398,47 @@ function merge2(target, branches) {
       if (target.traps.includes(trap))
         continue;
       merged ??= new Map(target.vars);
-      lifted.push({ ...trap, vars: handlerVars(trap, branch.vars), merged });
+      lifted.push({ ...trap, vars: handlerVars(trap, branch.vars), merged, uncertainSet: true });
     }
   }
-  target.traps = [...target.traps, ...lifted];
+  target.traps = [
+    ...target.traps.map((trap) => branches.every((branch) => branch.traps.includes(trap)) ? trap : { ...trap, uncertainSet: true }),
+    ...lifted
+  ];
+}
+function uncertainly(ctx, walk) {
+  ctx.uncertain.depth += 1;
+  try {
+    walk();
+  } finally {
+    ctx.uncertain.depth -= 1;
+  }
+}
+function modelWrite(st, ctx, file2, content) {
+  st.files.set(file2, ctx.uncertain.depth > 0 ? UNCERTAIN_WRITE : content);
+}
+var UNCERTAIN_WRITE = {
+  why: "the write is inside a branch, a loop body, a handler, or a command this shell does not wait " + "for, so the guard cannot know the shell performed it"
+};
+var UNRENDERED_WRITE = {
+  why: "the command writes output the guard cannot render"
+};
+var OVERLONG_WRITE = {
+  why: `the command writes more than the ${MAX_SCRIPT_BYTES} bytes the guard reads of a script`
+};
+var UNREAD_FILE = {
+  why: "the command appends to a file it has not written, whose contents on disk the guard never reads"
+};
+function modelPidFile(st, ctx, file2, pid) {
+  const model = st.pidFiles;
+  const before = model.get(file2);
+  model.delete(file2);
+  if (ctx.uncertain.depth === 0) {
+    if (pid !== undefined)
+      model.set(file2, pid);
+  } else if (pid !== undefined && before !== undefined) {
+    model.set(file2, [unknown2("a pid a branch or loop body wrote to this file", true)]);
+  }
 }
 function handlerVars(trap, vars) {
   const { vars: branch, merged } = trap;
@@ -42444,11 +42483,17 @@ function subshell(st, patch) {
 function runSetTraps(st, ctx) {
   for (const trap of st.traps) {
     const vars = new Map([...handlerVars(trap, st.vars), ...trap.pids ?? []]);
-    try {
-      runText(trap.text, "the EXIT trap", subshell(st, { source: trap.file, vars }), ctx, trap.site);
-    } catch (error48) {
-      locateRefusal(error48, trap.file);
-    }
+    const run = () => {
+      try {
+        runText(trap.text, "the EXIT trap", subshell(st, { source: trap.file, vars }), ctx, trap.site);
+      } catch (error48) {
+        locateRefusal(error48, trap.file);
+      }
+    };
+    if (trap.signals.includes("EXIT") && trap.uncertainSet !== true)
+      run();
+    else
+      uncertainly(ctx, run);
   }
 }
 function walkList(statements, st, ctx) {
@@ -42459,8 +42504,10 @@ var MAX_DECIDED_PASSES = 64;
 function walkLoopAnyPasses(node, st, ctx) {
   const before = st.output;
   const body = clone2(st);
-  walkList(node.clause.commands, body, ctx);
-  walkList(node.body.commands, body, ctx);
+  uncertainly(ctx, () => {
+    walkList(node.clause.commands, body, ctx);
+    walkList(node.body.commands, body, ctx);
+  });
   merge2(st, [clone2(st), body]);
   if (outputChanged(before, body.output))
     st.output = undefined;
@@ -42564,8 +42611,10 @@ function walkNode(node, st, ctx, pipeIn) {
       if (node.background) {
         const before = st.output;
         const child = subshell(st);
-        walkNode(node.command, child, ctx, pipeIn);
-        runSetTraps(child, ctx);
+        uncertainly(ctx, () => {
+          walkNode(node.command, child, ctx, pipeIn);
+          runSetTraps(child, ctx);
+        });
         if (outputChanged(before, child.output))
           st.output = undefined;
         st.backgroundStarted = true;
@@ -42574,7 +42623,7 @@ function walkNode(node, st, ctx, pipeIn) {
       if (node.command.type === "BraceGroup") {
         const written = groupOutputFile(node, st, ctx);
         if (written !== undefined) {
-          st.files.set(written, walkRenderingGroup(node.command, st, ctx));
+          modelWrite(st, ctx, written, walkRenderingGroup(node.command, st, ctx) ?? UNRENDERED_WRITE);
           return;
         }
       }
@@ -42592,20 +42641,38 @@ function walkNode(node, st, ctx, pipeIn) {
       }
       const before = st.output;
       const parts = [];
-      for (const [index, command] of node.commands.entries()) {
-        const part = subshell(st);
-        walkNode(command, part, ctx, index > 0);
-        runSetTraps(part, ctx);
-        parts.push(part);
-      }
+      uncertainly(ctx, () => {
+        for (const [index, command] of node.commands.entries()) {
+          const part = subshell(st);
+          walkNode(command, part, ctx, index > 0);
+          runSetTraps(part, ctx);
+          parts.push(part);
+        }
+      });
       if (parts.some((part) => outputChanged(before, part.output)))
         st.output = undefined;
       return;
     }
-    case "AndOr":
-      for (const command of node.commands)
-        walkNode(command, st, ctx, pipeIn);
+    case "AndOr": {
+      const [first, ...rest] = node.commands;
+      if (first !== undefined)
+        walkNode(first, st, ctx, pipeIn);
+      if (rest.length === 0)
+        return;
+      const before = st.output;
+      const branches = [clone2(st)];
+      const running = clone2(st);
+      uncertainly(ctx, () => {
+        for (const command of rest) {
+          walkNode(command, running, ctx, pipeIn);
+          branches.push(clone2(running));
+        }
+      });
+      merge2(st, branches);
+      if (branches.some((branch) => outputChanged(before, branch.output)))
+        st.output = undefined;
       return;
+    }
     case "CompoundList":
       walkList(node.commands, st, ctx);
       return;
@@ -42626,10 +42693,12 @@ function walkNode(node, st, ctx, pipeIn) {
       walkList(node.clause.commands, st, ctx);
       const clauseOutput = st.output;
       const then = clone2(st);
-      walkList(node.then.commands, then, ctx);
       const otherwise = clone2(st);
-      if (node.else !== undefined)
-        walkNode(node.else, otherwise, ctx, pipeIn);
+      uncertainly(ctx, () => {
+        walkList(node.then.commands, then, ctx);
+        if (node.else !== undefined)
+          walkNode(node.else, otherwise, ctx, pipeIn);
+      });
       merge2(st, [then, otherwise]);
       if (outputChanged(before, clauseOutput) || outputChanged(clauseOutput, then.output) || outputChanged(clauseOutput, otherwise.output)) {
         st.output = undefined;
@@ -42649,7 +42718,7 @@ function walkNode(node, st, ctx, pipeIn) {
         for (const value of known) {
           const body = clone2(st);
           assignScalar(body, name, [literal2(value)]);
-          walkList(node.body.commands, body, ctx);
+          uncertainly(ctx, () => walkList(node.body.commands, body, ctx));
           branches.push(body);
         }
       } else {
@@ -42661,7 +42730,7 @@ function walkNode(node, st, ctx, pipeIn) {
         assignScalar(body, name, signalSafe ? [unknown2(`\`$${name}\`, a loop variable`, true)] : [unknown2(`\`$${name}\`, a loop variable`)]);
         if (node.type === "Select")
           assignScalar(body, "REPLY", [unknown2("`$REPLY`, read from input")]);
-        walkList(node.body.commands, body, ctx);
+        uncertainly(ctx, () => walkList(node.body.commands, body, ctx));
         branches.push(body);
       }
       merge2(st, branches);
@@ -42675,7 +42744,7 @@ function walkNode(node, st, ctx, pipeIn) {
       visitArithmetic(node.test, st, ctx);
       visitArithmetic(node.update, st, ctx);
       const body = clone2(st);
-      walkList(node.body.commands, body, ctx);
+      uncertainly(ctx, () => walkList(node.body.commands, body, ctx));
       merge2(st, [clone2(st), body]);
       if (outputChanged(before, body.output))
         st.output = undefined;
@@ -42702,7 +42771,7 @@ function walkNode(node, st, ctx, pipeIn) {
         for (const word of item.pattern)
           visitWord(word, st, ctx);
         const body = clone2(st);
-        walkList(item.body.commands, body, ctx);
+        uncertainly(ctx, () => walkList(item.body.commands, body, ctx));
         branches.push(body);
       }
       merge2(st, branches);
@@ -42723,8 +42792,10 @@ function walkNode(node, st, ctx, pipeIn) {
     case "Coproc": {
       const before = st.output;
       const child = subshell(st);
-      walkNode(node.body, child, ctx, false);
-      runSetTraps(child, ctx);
+      uncertainly(ctx, () => {
+        walkNode(node.body, child, ctx, false);
+        runSetTraps(child, ctx);
+      });
       if (outputChanged(before, child.output))
         st.output = undefined;
       checkRedirects(node.redirects, undefined, siteOf(node, st), st, ctx);
@@ -42773,12 +42844,10 @@ function checkRedirects(redirects, command, site, st, ctx) {
       } else if (command?.name === "printf") {
         content = printfText(command.args, MAX_SCRIPT_BYTES, true) ?? null;
       }
-      st.pidFiles.delete(file2);
-      const before = appends ? st.files.get(file2) ?? null : "";
-      st.files.set(file2, content === null || before === null ? null : readable(`${before}${content}`));
-      if (writes && !appends && command?.name === "echo" && command.args.length === 1 && command.args[0]?.exp.length > 0 && command.args[0]?.exp.every((piece) => piece.descendantPid)) {
-        st.pidFiles.set(file2, command.args[0].exp);
-      }
+      const before = appends ? st.files.get(file2) ?? UNREAD_FILE : "";
+      modelWrite(st, ctx, file2, content === null ? UNRENDERED_WRITE : typeof before !== "string" ? before : readable(`${before}${content}`) ?? OVERLONG_WRITE);
+      const pidWritten = writes && !appends && command?.name === "echo" && command.args.length === 1 && command.args[0]?.exp.length > 0 && command.args[0].exp.every((piece) => piece.descendantPid);
+      modelPidFile(st, ctx, file2, pidWritten ? command?.args[0]?.exp : undefined);
     }
   }
 }
@@ -43222,15 +43291,18 @@ function dispatch(invocation, outer, ctx) {
       runFunction(base, only, rest, outer, ctx);
       return;
     }
-    const runs = callee.map((definition) => {
-      const run = clone2(outer);
-      if (definition !== undefined)
-        runFunction(base, definition, rest, run, ctx);
-      else {
-        run.functions.delete(base);
-        dispatch(invocation, run, ctx);
+    const runs = [];
+    uncertainly(ctx, () => {
+      for (const definition of callee) {
+        const run = clone2(outer);
+        if (definition !== undefined)
+          runFunction(base, definition, rest, run, ctx);
+        else {
+          run.functions.delete(base);
+          dispatch(invocation, run, ctx);
+        }
+        runs.push(run);
       }
-      return run;
     });
     merge2(outer, runs);
     return;
@@ -43410,11 +43482,24 @@ function dispatch(invocation, outer, ctx) {
           pids.set(name2, [piece]);
           return `\${${name2}}`;
         }).join("");
-        outer.traps = [...outer.traps, { text: handlerText, site, signals: handled, file: file2, pids }];
+        outer.traps = [
+          ...outer.traps,
+          {
+            text: handlerText,
+            site,
+            signals: handled,
+            file: file2,
+            pids,
+            uncertainSet: ctx.uncertain.depth > 0
+          }
+        ];
       } else if (text === undefined) {
         throw new Refusal(site.snippet, site.line, `the guard cannot read the handler this \`trap\` sets, \`${handler.text}\` (${handler.exp.find((piece) => piece.kind !== "literal")?.why ?? "a value the guard cannot know"}), so it cannot check what runs when this shell exits; write the handler out, or put it in a function`);
       } else if (!text.startsWith("-")) {
-        outer.traps = [...outer.traps, { text, site, signals: handled, file: file2 }];
+        outer.traps = [
+          ...outer.traps,
+          { text, site, signals: handled, file: file2, uncertainSet: ctx.uncertain.depth > 0 }
+        ];
       }
       return;
     }
@@ -43530,7 +43615,7 @@ function dispatch(invocation, outer, ctx) {
           const file2 = path4.resolve(st.cwd, target);
           st.pidFiles.delete(file2);
           const text = heredoc === undefined ? null : heredocText(heredoc);
-          st.files.set(file2, append || text === null ? null : readable(text));
+          modelWrite(st, ctx, file2, append ? UNREAD_FILE : text === null ? UNRENDERED_WRITE : readable(text) ?? OVERLONG_WRITE);
         }
       }
       return;
@@ -44195,8 +44280,8 @@ function runFile(file2, positional, st, ctx, site, kind, source = false) {
   let content;
   if (st.files.has(abs)) {
     const written = st.files.get(abs);
-    if (written === null || written === undefined) {
-      throw new Refusal(site.snippet, site.line, `this command writes ${abs} in a way the guard cannot read before running it (output it cannot render, or more than the ${MAX_SCRIPT_BYTES} bytes it reads of a script); write the script with the write tool first`);
+    if (written === undefined || typeof written !== "string") {
+      throw new Refusal(site.snippet, site.line, `this command may write ${abs} in a way the guard cannot read before running it (${written?.why ?? "the guard cannot say what it holds"}); write the script with the write tool first`);
     }
     content = written;
   } else {
@@ -44389,7 +44474,8 @@ function createPaneGuard(options) {
     env,
     ompPid: options.ompPid,
     parentOf: options.parentOf ?? procParent,
-    steps: { count: 0 }
+    steps: { count: 0 },
+    uncertain: { depth: 0 }
   });
   const initial = (cwd, source) => ({
     vars: new Map,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/pi-legion-envoy",
-  "version": "5.17.1",
+  "version": "5.17.2",
   "type": "module",
   "omp": {
     "extensions": [