@poe-platform/safe-bash 0.1.800 → 0.1.801

package/dist/safe-bash/shell/runtime.js

@@ -14,27 +14,6 @@ import { captureIgnoredTrapSignals } from "./trap.js";
 import { writeDiagnostic } from "../escaping.js";
 import { cancelTurn, hasYieldCheckpoint, inheritYieldCheckpoint, monotonicNow, registerInternalYieldCheckpoint, runYieldCheckpoint, scheduleTurn, yieldTurn } from "../contracts/yield.js";
 import { ACCESS_MODES, FsError, basename, composeMiddleware, createBytePipe, dirname, normalizePath, pipeBytes, resolvePath, validateExitCode, writeBytes, writeText, } from "../contracts/index.js";
-import { createBcCommands } from "../commands/bc/index.js";
-import { createStreamInspectionCommands } from "../commands/stream-inspection/index.js";
-import { createStreamFormatCommands } from "../commands/stream-format/index.js";
-import { createSpongeCommands } from "../commands/sponge/index.js";
-import { createFdCommands } from "../commands/fd/index.js";
-import { createLessCommands } from "../commands/less/index.js";
-import { createIdCommands } from "../commands/id/index.js";
-import { createWhoamiCommands } from "../commands/whoami/index.js";
-import { createUnameCommands } from "../commands/uname/index.js";
-import { createHostnameCommands } from "../commands/hostname/index.js";
-import { createNprocCommands } from "../commands/nproc/index.js";
-import { createShufCommands } from "../shuf.js";
-import { createDdCommands } from "../dd.js";
-import { createNumfmtCommands } from "../commands/numfmt/index.js";
-import { createEnvsubstCommands } from "../commands/envsubst/index.js";
-import { createCalCommands } from "../commands/cal/index.js";
-import { createPathchkCommands } from "../commands/pathchk/index.js";
-import { createGetconfCommands } from "../commands/getconf/index.js";
-import { createLocaleCommands } from "../commands/locale/index.js";
-import { createDfCommands } from "../commands/df/index.js";
-import { createSqlite3Commands } from "../commands/sqlite3/index.js";
 import { concatShellValues, shellValueByteLength, shellValueBytes, shellValueFromBytes, shellValueText } from "../contracts/value.js";
 import { createCommandArguments, getCommandArguments } from "../contracts/command.js";
 import { ValueArena, ValueScope } from "./value-state.js";
@@ -114,6 +93,7 @@ import { variablePresence } from "../commands/variable-presence.js";
 import { getArrayAssignment, getArraySelector, copyArraySelector, numericIndex, literalIndex, stringIndex, isQuoteMarker, prefixNameQuoteGroups, setArraySelector } from "./arrays/syntax.js";
 import { ArrayFailure, ArrayOwner, exactSum } from "./arrays/ledger.js";
 import { controlNames, IndexedBinding, textToken, valueToken } from "./arrays/bindings.js";
+import { readDynamicVariable, writeDynamicVariable } from "./dynamic-variables.js";
 import { collectMapfile, mapfileOptions, MapfileUsageError } from "./mapfile.js";
 import { arrayStore, ensureStateMonitor, guestArrays, monitorSymbol, requireArrays, snapshotState, stateMonitor, trackState, trySnapshotStateSync } from "./arrays/state.js";
 import { pipelineStatusTarget, publishPipelineStatus } from "./pipestatus.js";
@@ -826,8 +806,6 @@ Object.assign(Budget.prototype, {
     onInternalError: undefined, _yieldCheckpoint: undefined, _values: undefined, _executionScope: undefined, _pathLookup: undefined, _pathLookupSuspensions: 0, _executionCleanup: undefined, globstarEntries: 0, globstarStates: 0, _cleanupChargeFs: undefined, _wallClockTimer: undefined, _aborted: false, _cpuStarted: 0, _hasExternalSignal: false,
 });
 const EMPTY_CAPTURE_BYTES = new Uint8Array(0);
-const sharedCaptureStdoutScratch = new Uint8Array(65536);
-const sharedCaptureStderrScratch = new Uint8Array(65536);
 export class Capture {
     constructor(budget, signal) {
         this._chunks = undefined;
@@ -841,8 +819,8 @@ export class Capture {
         this.signal = signal;
         this.file = undefined;
     }
-    enableScratchBuffer(isStderr = false) {
-        this._scratch4k ??= isStderr ? sharedCaptureStderrScratch : sharedCaptureStdoutScratch;
+    enableScratchBuffer() {
+        this._scratch4k ??= new Uint8Array(65536);
     }
     get self() {
         return this;
@@ -2206,6 +2184,7 @@ function publishVariable(state, name, value) {
         return;
     }
     state.variables[name] = shellValueText(value);
+    writeDynamicVariable(state, name, shellValueText(value));
 }
 function tryRestoreVariableSync(state, name, saved) {
     if (typedSavedVariables.has(saved))
@@ -2991,11 +2970,6 @@ function hasGlobOrEscape(text, extglob = false) {
     return false;
 }
 let nextProcessSubstitutionId = 0;
-let defaultRuntimeMuscleMemoryMap;
-function getRuntimeMuscleMemoryCommand(name) {
-    defaultRuntimeMuscleMemoryMap ??= new Map([...createStreamFormatCommands(), ...createStreamInspectionCommands(), ...createBcCommands(), ...createSpongeCommands(), ...createFdCommands(), ...createLessCommands(), ...createIdCommands(), ...createWhoamiCommands(), ...createUnameCommands(), ...createHostnameCommands(), ...createNprocCommands(), ...createShufCommands(), ...createDdCommands(), ...createNumfmtCommands(), ...createEnvsubstCommands(), ...createCalCommands(), ...createPathchkCommands(), ...createGetconfCommands(), ...createLocaleCommands(), ...createDfCommands(), ...createSqlite3Commands()].map(cmd => [cmd.name, cmd]));
-    return defaultRuntimeMuscleMemoryMap.get(name);
-}
 const fastSubScratchArgs = [];
 const defaultValueScopeReserve = ValueScope.prototype.reserve;
 const defaultStringCodePointAt = String.prototype.codePointAt;
@@ -3093,16 +3067,8 @@ const SYNC_UNIT_ZERO = Object.freeze({ exitCode: 0, terminated: false });
 const SYNC_UNIT_ONE = Object.freeze({ exitCode: 1, terminated: false });
 const EMPTY_BYTES = new Uint8Array(0);
 const SYNC_PIPE_DONE_RESULT = Object.freeze({ done: true, value: undefined });
-const sharedSyncPipeBuf0 = new Uint8Array(65536);
-const sharedSyncPipeBuf1 = new Uint8Array(65536);
 const sharedSyncPipeDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
 let syncPurePipelineSlotInUse = false;
-let lastPurePipeAst;
-const lastPurePipeSrcRefs = new WeakSet();
-let lastPurePipeSlice1 = "";
-let lastPurePipeRegistry;
-const lastPurePipeOutBuf = new Uint8Array(256);
-let lastPurePipeOutLen = 0;
 function isSimpleAsciiGrepPattern(pat) {
     const start = pat.length >= 2 && pat.charCodeAt(0) === 94 ? 1 : 0;
     if (start >= pat.length)
@@ -4507,6 +4473,10 @@ export class Runtime {
         if (state.readonlyVariables?.has(name))
             throw new PublicDiagnostic(`${name}: readonly variable`);
         delete state.variables[name];
+        if (name === "RANDOM")
+            state.randomDisabled = true;
+        if (name === "SECONDS")
+            state.secondsDisabled = true;
         state.exported.delete(name);
         state.variableAttributes?.delete(name);
         if (name === "OPTIND" && !internal)
@@ -4733,7 +4703,7 @@ export class Runtime {
             case "literal": return true;
             case "name": {
                 const effName = resolveSyncNameref(state, tree.name);
-                if (effName === "OPTIND" || effName === "PIPESTATUS")
+                if (effName === "OPTIND" || effName === "PIPESTATUS" || effName === "RANDOM" || effName === "SECONDS")
                     return false;
                 const monitor = stateMonitor(state);
                 if (monitor?.hasOverlay(effName) || monitor?.store?.watches.has(effName))
@@ -4832,6 +4802,8 @@ export class Runtime {
         return true;
     }
     tryBuildSyncPatternWord(word, rawState, io, diagnosticLine) {
+        if (word.plain !== undefined)
+            return word.plain.startsWith("~") ? undefined : word.plain;
         if (word.parts.length === 0)
             return undefined;
         let out = "";
@@ -5017,7 +4989,7 @@ export class Runtime {
                 const name = typeof key === "string" ? this.referenceName(state, key) : key;
                 if (arrayStore(state)?.get(String(name)))
                     throw new ArrayFailure("indexed arithmetic is unsupported");
-                const value = Reflect.get(target, name)
+                const value = (typeof name === "string" && (name === "RANDOM" || name === "SECONDS") ? this.variable(state, name) : Reflect.get(target, name))
                     ?? (name === "LINENO" ? String(line ?? 1)
                         : name === "_" ? state.lastArgument ?? ""
                             : name === "FUNCNAME" ? state.functionNames?.[0]
@@ -5066,6 +5038,8 @@ export class Runtime {
     }
     variable(state, name) {
         name = this.referenceName(state, name);
+        if (name === "RANDOM" || name === "SECONDS")
+            return readDynamicVariable(stateMonitor(state)?.raw ?? state, name) ?? state.variables[name];
         const binding = arrayStore(state)?.get(name);
         if (binding)
             return binding.get(binding.associative ? binding.keys.get("30")?.index ?? -1 : 0);
@@ -5989,7 +5963,10 @@ export class Runtime {
                         try {
                             val = this.fastValueWord(entry.value, rawState, io, false, false, false, false, entry.index === undefined ? undefined : 0, diagnosticLine);
                         }
-                        catch {
+                        catch (error) {
+                            this.signal.throwIfAborted();
+                            if (error instanceof ShellLimitError)
+                                throw error;
                             return false;
                         }
                     }
@@ -6079,7 +6056,10 @@ export class Runtime {
                             try {
                                 unsplit = this.fastValueWord(entry.value, rawState, io, false, false, false, false, undefined, diagnosticLine);
                             }
-                            catch {
+                            catch (error) {
+                                this.signal.throwIfAborted();
+                                if (error instanceof ShellLimitError)
+                                    throw error;
                                 return false;
                             }
                             if (typeof unsplit !== "string" || hasGlobOrEscape(unsplit, !!rawState.extglob))
@@ -6105,7 +6085,10 @@ export class Runtime {
                         try {
                             val = this.fastValueWord(entry.value, rawState, io, false, false, false, false, entry.index === undefined ? undefined : 0, diagnosticLine);
                         }
-                        catch {
+                        catch (error) {
+                            this.signal.throwIfAborted();
+                            if (error instanceof ShellLimitError)
+                                throw error;
                             return false;
                         }
                     }
@@ -6201,7 +6184,10 @@ export class Runtime {
                 try {
                     val = this.fastValueWord(assignment.value, rawState, io, false, false, false, false, 0, diagnosticLine);
                 }
-                catch {
+                catch (error) {
+                    this.signal.throwIfAborted();
+                    if (error instanceof ShellLimitError)
+                        throw error;
                     return false;
                 }
                 if (typeof val !== "string")
@@ -6236,7 +6222,10 @@ export class Runtime {
                     return false;
                 val = this.fastValueWord(assignment.value, rawState, io, false, false, false, false, 0, diagnosticLine);
             }
-            catch {
+            catch (error) {
+                this.signal.throwIfAborted();
+                if (error instanceof ShellLimitError)
+                    throw error;
                 return false;
             }
             if (typeof val !== "string")
@@ -6354,12 +6343,11 @@ export class Runtime {
         const holding = store.owner.hold();
         let staged;
         try {
-            const watch = await store.watch(name, operation, this.signal);
-            const current = store.get(name);
+            let current = store.get(name);
             if (associative !== undefined && current && current.associative !== associative)
                 throw new ArrayFailure("cannot convert array kind");
             const isAssociative = associative ?? current?.associative;
-            const initialMaximum = current?.maximum ?? (state.variables[name] === undefined ? -1 : 0);
+            let initialMaximum = current?.maximum ?? (state.variables[name] === undefined ? -1 : 0);
             let selectedIndex;
             let planned = assignment.append && assignment.kind === "compound" ? initialMaximum + 1 : 0;
             if (assignment.kind === "element") {
@@ -6392,6 +6380,37 @@ export class Runtime {
                     }
                     await operation.ledger.checkpoint(this.signal, entry.value.parts.length + 2);
                 }
+            // Word expansion can mutate this binding. Finish it before taking the
+            // publication snapshot, and choose the append cursor from the new maximum.
+            const expandedEntries = [];
+            let elementFields;
+            if (assignment.kind === "element") {
+                elementFields = await this.valueWord(assignment.value, state, io, false, false, false, false, undefined, false, false, 0);
+            }
+            else
+                for (const entry of assignment.entries) {
+                    const original = compoundEntryWords.get(entry);
+                    let expandedEntry = false;
+                    if (entry.index && original && state.braceexpand !== false && original.parts.some(part => part.kind === "text" && !part.quoted && part.value.includes("{"))) {
+                        for await (const expanded of expandBraces(original, this.budget, this.signal)) {
+                            if (expanded === original)
+                                break;
+                            expandedEntry = true;
+                            const fields = await this.valueWord(expanded, state, io, true, false, false, false, undefined, false, false);
+                            operation.reserve({ metadata: 32, slots: 1, work: 1 });
+                            expandedEntries.push({ entry: { value: expanded }, fields });
+                        }
+                    }
+                    if (expandedEntry)
+                        continue;
+                    const fields = await this.valueWord(entry.value, state, io, entry.index === undefined, false, false, false, undefined, false, entry.index === undefined, entry.index === undefined ? undefined : 0);
+                    operation.reserve({ metadata: 32, slots: 1, work: 1 });
+                    expandedEntries.push({ entry, fields });
+                }
+            current = store.get(name);
+            initialMaximum = current?.maximum ?? (state.variables[name] === undefined ? -1 : 0);
+            this.assertArrayWritable(state, name, origin);
+            const watch = await store.watch(name, operation, this.signal);
             const supersede = await stateMonitor(state).prepareTypedPublication(name, operation, this.signal);
             await this.prepareArrayObservers(state, operation);
             const tickets = operation.reserve({ generation: true, version: true, epoch: true, work: 8 });
@@ -6480,7 +6499,7 @@ export class Runtime {
                     }
                     else
                         index = (await this.arrayIndex(targetBinding, assignment.index, state, io, operation, true));
-                    const value = await join(await this.valueWord(assignment.value, state, io, false, false, false, false, undefined, false, false, 0));
+                    const value = await join(elementFields);
                     // Expansion can initialize the unset target as a scalar. Preserve that
                     // value when promoting it to an indexed binding.
                     if (!current && state.variables[name] !== undefined && (index !== 0 || assignment.append)) {
@@ -6497,25 +6516,8 @@ export class Runtime {
                     await insert(index, value, assignment.append);
                 }
                 else
-                    for (const entry of assignment.entries) {
-                        const original = compoundEntryWords.get(entry);
-                        if (entry.index && original && state.braceexpand !== false && original.parts.some(part => part.kind === "text" && !part.quoted && part.value.includes("{"))) {
-                            let expandedEntry = false;
-                            for await (const expanded of expandBraces(original, this.budget, this.signal)) {
-                                if (expanded === original)
-                                    break;
-                                expandedEntry = true;
-                                const values = await this.valueWord(expanded, state, io, true, false, false, false, undefined, false, false);
-                                for (const value of values) {
-                                    await insert(cursor, value);
-                                    cursor++;
-                                }
-                            }
-                            if (expandedEntry)
-                                continue;
-                        }
+                    for (const { entry, fields } of expandedEntries) {
                         const index = entry.index ? (await this.arrayIndex(targetBinding, entry.index, state, io, operation, true)) : undefined;
-                        const fields = await this.valueWord(entry.value, state, io, entry.index === undefined, false, false, false, undefined, false, entry.index === undefined, entry.index === undefined ? undefined : 0);
                         if (index !== undefined) {
                             const value = await join(fields);
                             await insert(index, value, entry.append);
@@ -8058,7 +8060,7 @@ export class Runtime {
             const diagnosticLine = io.diagnosticCommandLines?.get(command) ?? (command.line ?? 1) + (io.diagnosticOffset ?? 0);
             if (cSingle !== undefined && !customRegisteredRegistries.has(this.commands) && !hasShellFunction(rawState, cSingle.w0Plain) && !rawState.extensions?.builtins.has(cSingle.w0Plain) && command.words.length <= this.budget.maxExpansionFieldsSmi && (this.budget.commands + 1 <= this.budget.maxCommandsSmi || this.budget.commands + 1 <= this.budget.limits.maxCommands)) {
                 w0Plain = cSingle.w0Plain;
-                const extD = this.getExternalCommand(w0Plain);
+                const extD = this.commands.get(w0Plain);
                 if (!extD || !builtInDirectContextExecutors.has(extD.execute) || customRegisteredCommands.has(extD.execute))
                     return undefined;
                 externalDef = extD;
@@ -8079,7 +8081,7 @@ export class Runtime {
                     return undefined;
                 }
                 w0Plain = w0P;
-                const extD = this.getExternalCommand(w0Plain);
+                const extD = this.commands.get(w0Plain);
                 if (!extD || !builtInDirectContextExecutors.has(extD.execute) || customRegisteredCommands.has(extD.execute) || customRegisteredRegistries.has(this.commands) || command.words.length > this.budget.maxExpansionFieldsSmi || (this.budget.commands + 1 > this.budget.maxCommandsSmi && this.budget.commands + 1 > this.budget.limits.maxCommands)) {
                     return undefined;
                 }
@@ -8131,14 +8133,12 @@ export class Runtime {
             let redirectSink;
             if (command.redirects.length === 1) {
                 const r0 = command.redirects[0];
-                let targetVal = r0.target.plain;
-                if (targetVal === undefined) {
-                    try {
-                        targetVal = this.fastValueWord(r0.target, rawState, io, true, false, false, true, undefined, diagnosticLine);
-                    }
-                    catch {
-                        return undefined;
-                    }
+                let targetVal;
+                try {
+                    targetVal = this.fastValueWord(r0.target, rawState, io, true, false, false, true, undefined, diagnosticLine);
+                }
+                catch {
+                    return undefined;
                 }
                 if (typeof targetVal !== "string" || !targetVal || targetVal.includes("\0"))
                     return undefined;
@@ -8208,26 +8208,6 @@ export class Runtime {
             const n = pipeline.commands.length;
             if ((this.budget.commands + n > this.budget.maxCommandsSmi && this.budget.commands + n > this.budget.limits.maxCommands))
                 return undefined;
-            if (pipeline === lastPurePipeAst && !syncPurePipelineSlotInUse && this._isMemoryBackingFs && this.backingFs && this.backingFs.capabilitiesFor === undefined && this.commands === lastPurePipeRegistry && (!rawState.functions || rawState.functions.size === 0) && !rawState.extensions?.builtins.size && io.stdinIsDefault && !this.signal.aborted && !hasYieldCheckpoint(this.signal) && this.budget.canSyncPurePipe && Date.now === defaultDateNow && io.stdout instanceof Capture && io.stdout._scratch4k !== undefined && io.stdout.length === 0 && io.stdout.write === Capture.prototype.write && io.stderr instanceof Capture && io.stderr.length === 0 && io.stderr.write === Capture.prototype.write) {
-                const rootEntry = this.backingFs.root?.entries?.get(lastPurePipeSlice1);
-                if (rootEntry && rootEntry.type === "file" && rootEntry.revision === 0 && rootEntry.mode !== undefined && ((rootEntry.mode >> 6) & 4) === 4 && rootEntry.sourceRef && lastPurePipeSrcRefs.has(rootEntry.sourceRef)) {
-                    this.budget.enterPipelineStages(n);
-                    this.budget.commands += n;
-                    try {
-                        this.budget.fileSystemOperation();
-                        io.stdout.writeRangeSync(lastPurePipeOutBuf, lastPurePipeOutLen);
-                    }
-                    finally {
-                        this.budget.leavePipelineStages(n);
-                    }
-                    const restEpoch = monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets).epoch;
-                    monitor.lazyPipeStatus = ZERO_PIPE_STATUSES[n];
-                    monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets);
-                    rawState.status = 0;
-                    monitor.epoch = restEpoch;
-                    return SYNC_UNIT_ZERO;
-                }
-            }
             for (let i = 0; i < n; i++) {
                 const cmd = pipeline.commands[i];
                 if (cmd.kind !== "simple" || !this.isPureExternalStageCommand(cmd, rawState) || cmd.words.length > this.budget.maxExpansionFieldsSmi)
@@ -8355,11 +8335,10 @@ export class Runtime {
             return undefined;
         }
         const n = pipeline.commands.length;
-        let firstStageRootSourceRef;
         for (let i = 0; i < n; i++) {
             const cmd = pipeline.commands[i];
             const name = cmd.words[0].plain;
-            const extDef = this.getExternalCommand(name);
+            const extDef = this.commands.get(name);
             if (!extDef || !builtInDirectContextExecutors.has(extDef.execute) || customRegisteredCommands.has(extDef.execute)) {
                 return undefined;
             }
@@ -8387,8 +8366,6 @@ export class Runtime {
                         const rootEntry = backing.root?.entries?.get(slice1);
                         if (!rootEntry || rootEntry.type !== "file" || (rootEntry.data && rootEntry.data.byteLength > 65536))
                             return undefined;
-                        if (rootEntry.revision === 0 && rootEntry.mode !== undefined && ((rootEntry.mode >> 6) & 4) === 4 && rootEntry.data && rootEntry.data.byteLength >= 1024)
-                            firstStageRootSourceRef = rootEntry.sourceRef;
                     }
                 }
                 else if (name === "find") {
@@ -8436,23 +8413,8 @@ export class Runtime {
                     return undefined;
             }
         }
-        if (n >= 3 && pipeline === lastPurePipeAst && firstStageRootSourceRef !== undefined && lastPurePipeSrcRefs.has(firstStageRootSourceRef) && Date.now === defaultDateNow) {
-            this.budget.enterPipelineStages(n);
-            this.budget.commands += n;
-            try {
-                this.budget.fileSystemOperation();
-                io.stdout.writeRangeSync(lastPurePipeOutBuf, lastPurePipeOutLen);
-            }
-            finally {
-                this.budget.leavePipelineStages(n);
-            }
-            const restEpoch = monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets).epoch;
-            monitor.lazyPipeStatus = ZERO_PIPE_STATUSES[n] ?? new Array(n).fill(0);
-            monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets);
-            rawState.status = 0;
-            monitor.epoch = restEpoch;
-            return SYNC_UNIT_ZERO;
-        }
+        const sharedSyncPipeBuf0 = new Uint8Array(65536);
+        const sharedSyncPipeBuf1 = new Uint8Array(65536);
         syncPurePipelineSlotInUse = true;
         this.budget.enterPipelineStages(n);
         this.budget.commands += n;
@@ -8463,7 +8425,7 @@ export class Runtime {
             for (let index = start; index < n; index++) {
                 const cmd = pipeline.commands[index];
                 const firstName = cmd.words[0].plain;
-                const extDef = this.getExternalCommand(firstName);
+                const extDef = this.commands.get(firstName);
                 const stageArgs = cmd._cachedPlainArgs;
                 const isFirst = index === 0;
                 const isLast = index === n - 1;
@@ -8534,22 +8496,7 @@ export class Runtime {
             syncPurePipelineSlotInUse = false;
             this.budget.leavePipelineStages(n);
         };
-        const stdout = io.stdout;
-        const stderr = io.stderr;
         const finish = () => {
-            if (n >= 3 && !pipeline.negate && statuses === undefined && firstStageRootSourceRef !== undefined && stderr.length === 0 && stdout.length <= 256 && Date.now === defaultDateNow) {
-                const scratch = stdout._scratch4k;
-                if (scratch) {
-                    const outLen = stdout.length;
-                    for (let bi = 0; bi < outLen; bi++)
-                        lastPurePipeOutBuf[bi] = scratch[bi];
-                    lastPurePipeOutLen = outLen;
-                    lastPurePipeAst = pipeline;
-                    lastPurePipeSlice1 = (pipeline.commands[0]._cachedSlice1) ?? "";
-                    lastPurePipeRegistry = this.commands;
-                    lastPurePipeSrcRefs.add(firstStageRootSourceRef);
-                }
-            }
             const restEpoch = monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets).epoch;
             const finalStatuses = statuses ?? ZERO_PIPE_STATUSES[n] ?? new Array(n).fill(0);
             monitor.lazyPipeStatus = finalStatuses;
@@ -8611,7 +8558,7 @@ export class Runtime {
             for (let index = 0; index < n; index++) {
                 const cmd = pipeline.commands[index];
                 const firstName = cmd.words[0].plain;
-                const extDef = this.getExternalCommand(firstName);
+                const extDef = this.commands.get(firstName);
                 let stageArgs = cmd._cachedPlainArgs;
                 if (!stageArgs) {
                     stageArgs = new Array(cmd.words.length - 1);
@@ -9915,7 +9862,7 @@ export class Runtime {
         // Loops and pure substitutions cannot replay after an unsupported result.
         // These operators depend on arithmetic, filesystem or collation state that
         // the speculative synchronous evaluator does not fully support.
-        if (requireTotal && ((expr.kind === "unary" && syncConditionalFileUnaryOps.has(expr.operator)) ||
+        if (requireTotal && ((expr.kind === "unary" && (expr.operator === "-v" || syncConditionalFileUnaryOps.has(expr.operator))) ||
             (expr.kind === "binary" && expr.operator !== "==" && expr.operator !== "=" && expr.operator !== "!=" && expr.operator !== "=~")))
             return false;
         const okWord = (w) => !Runtime.wordMayMutate(w) || (rawState !== undefined && this.isPureSyncValueWord(w, rawState));
@@ -10518,7 +10465,7 @@ export class Runtime {
                     const rhsOp = scalarMutMatch[4];
                     const rhs2 = scalarMutMatch[5] !== undefined ? Number(scalarMutMatch[5]) : 0;
                     const rhsNum = rhsOp === "+" ? rhs1 + rhs2 : rhsOp === "-" ? rhs1 - rhs2 : rhsOp === "*" ? rhs1 * rhs2 : rhs1;
-                    if (varName !== "OPTIND" && varName !== "PIPESTATUS" && !store?.get(varName) && !hasNonNamerefAttributes(rawState)) {
+                    if (!controlNames.has(varName) && varName !== "PIPESTATUS" && !store?.get(varName) && !hasNonNamerefAttributes(rawState)) {
                         const curVal = (this._syncArithRawWriteOnly && this._syncArithTouched?.has(varName))
                             ? (rawState.variables[varName] ?? "0")
                             : (monitor.values.get(varName, rawState.variables[varName] ?? "0") ?? rawState.variables[varName] ?? "0");
@@ -10787,7 +10734,7 @@ export class Runtime {
                 const clause = command.clauses[cIdx];
                 for (let pIdx = 0; pIdx < clause.patterns.length; pIdx++) {
                     const pw = clause.patterns[pIdx];
-                    const pStr = pw.plain ?? this.tryBuildSyncPatternWord(pw, rawState, io, diagnosticLine);
+                    const pStr = this.tryBuildSyncPatternWord(pw, rawState, io, diagnosticLine);
                     if (pStr === undefined)
                         return undefined;
                     const matched = tryMatchesPatternSync(pStr, fastSubject, work, false, false);
@@ -12549,7 +12496,7 @@ export class Runtime {
                             allArrOk = false;
                             break;
                         }
-                        else if (rawState.locals.length === 0 && isShellIdentifier(tExpanded) && !tExpanded.startsWith("-") && !rawState.readonlyVariables?.has(tExpanded) && !arrStore.get(tExpanded) && !rawState.functions.has(tExpanded) && !monitor.hasOverlay(tExpanded) && tExpanded !== "OPTIND" && tExpanded !== "PIPESTATUS" && tExpanded !== "_" && tExpanded !== "IFS" && tExpanded !== "PATH") {
+                        else if (rawState.locals.length === 0 && isShellIdentifier(tExpanded) && !tExpanded.startsWith("-") && !rawState.readonlyVariables?.has(tExpanded) && !arrStore.get(tExpanded) && !rawState.functions.has(tExpanded) && !monitor.hasOverlay(tExpanded) && !controlNames.has(tExpanded) && tExpanded !== "PIPESTATUS" && tExpanded !== "_") {
                             ops.push({ kind: "scalar", targetName: tExpanded });
                             continue;
                         }
@@ -12629,7 +12576,7 @@ export class Runtime {
                         for (let ui = uStart; ui < command.words.length; ui++) {
                             const targetName = command.words[ui].plain;
                             const existingTargetArr = targetName ? store?.get(targetName) : undefined;
-                            if (targetName && isShellIdentifier(targetName) && !targetName.startsWith("-") && !rawState.readonlyVariables?.has(targetName) && (!existingTargetArr || (existingTargetArr.references === 1 && !store.watches.has(targetName) && !hasUnpreparedLocal(rawState, targetName))) && !rawState.functions.has(targetName) && !monitor.hasOverlay(targetName) && targetName !== "OPTIND" && targetName !== "PIPESTATUS" && targetName !== "_" && targetName !== "IFS" && targetName !== "PATH") {
+                            if (targetName && isShellIdentifier(targetName) && !targetName.startsWith("-") && !rawState.readonlyVariables?.has(targetName) && (!existingTargetArr || (existingTargetArr.references === 1 && !store.watches.has(targetName) && !hasUnpreparedLocal(rawState, targetName))) && !rawState.functions.has(targetName) && !monitor.hasOverlay(targetName) && !controlNames.has(targetName) && targetName !== "PIPESTATUS" && targetName !== "_") {
                                 targets.push(targetName);
                             }
                             else {
@@ -14202,7 +14149,7 @@ export class Runtime {
                 // Unsubscripted array references expand element zero through the normal
                 // evaluator. fastValueWord cannot guarantee that expansion throughout
                 // a loop, so reject it before executing any loop effects.
-                if (stateMonitor(rawState)?.store?.get(part.name))
+                if (part.name === "RANDOM" || part.name === "SECONDS" || stateMonitor(rawState)?.store?.get(part.name))
                     return false;
                 // These expansions can require multiple fields or asynchronous quoting
                 // as loop state changes. Decide before the loop produces any effects.
@@ -14330,125 +14277,8 @@ export class Runtime {
                     return false;
                 if (this.tryAdmitLoopInvariantSubstitution(part, rawState))
                     continue;
-                if (customRegisteredRegistries.has(this.commands))
-                    return false;
-                if (part.script.lists.length !== 1)
-                    return false;
-                const list = part.script.lists[0];
-                if (list.terminator || list.pipelines.length !== 1)
-                    return false;
-                const p = list.pipelines[0];
-                // Pipeline buffers can overflow after variable or stage expansion.
-                // A synchronous loop cannot resume after earlier body effects, so keep
-                // bounded pipelines on the normal substitution execution path.
-                if (p.negate || p.commands.length !== 1)
-                    return false;
-                let cmd = p.commands[0];
-                // Loop substitutions require a real subshell: header admission can
-                // decline at runtime, and induction writes also change export attributes.
-                if (cmd.kind === "for" || cmd.kind === "arithmetic-for" || cmd.kind === "while")
-                    return false;
-                if (p.commands.length === 1 && (cmd.kind === "if" || cmd.kind === "case") && this.isPureSyncSubIfOrCase(cmd, rawState)) {
-                    continue;
-                }
-                if (cmd.kind !== "simple" || cmd.redirects.length > 0 || cmd.words.length === 0)
-                    return false;
-                let w0Plain = cmd.words[0].plain;
-                // Range-aware tr and Buffer-free 76-col base64 are handled below.
-                if (p.commands.length === 1 && w0Plain !== undefined && rawState.functions.has(w0Plain) && this.firstInternalDiscovery(w0Plain, rawState, false) === "function" && !rawState.extensions?.builtins.has(w0Plain)) {
-                    const fnBody = rawState.functions.get(w0Plain);
-                    if (fnBody.kind === "group" &&
-                        fnBody.redirects.length === 0 &&
-                        fnBody.body.lists.length === 1 &&
-                        !fnBody.body.lists[0].terminator &&
-                        fnBody.body.lists[0].pipelines.length === 1 &&
-                        !fnBody.body.lists[0].pipelines[0].negate &&
-                        fnBody.body.lists[0].pipelines[0].commands.length === 1 &&
-                        fnBody.body.lists[0].pipelines[0].commands[0].kind === "simple" &&
-                        fnBody.body.lists[0].pipelines[0].commands[0].redirects.length === 0 &&
-                        cmd.words.slice(1).every(w => this.isPureArgWord(w, rawState) && this.isPureSyncValueWord(w, rawState) && w.parts.length > 0 && w.parts.every(part => part.quoted || (part.kind === "text" && part.value.length > 0 && !part.value.includes(" ") && !part.value.includes("\t") && !part.value.includes("\n") && !part.value.includes("{") && !hasGlobOrEscape(part.value, true))))) {
-                        const innerCmd = fnBody.body.lists[0].pipelines[0].commands[0];
-                        const innerW0 = innerCmd.words[0]?.plain;
-                        if (innerW0 && (innerW0 === "echo" || innerW0 === "printf" || innerW0 === "dirname" || innerW0 === "basename" || innerW0 === "pwd" || innerW0 === "command" || innerW0 === "type" || innerW0 === "seq") && !rawState.functions.has(innerW0) && !rawState.extensions?.builtins.has(innerW0)) {
-                            cmd = innerCmd;
-                            w0Plain = innerW0;
-                        }
-                    }
-                }
-                // These evaluators can decline based on runtime input. Loop execution
-                // has no continuation for a declined substitution after earlier effects.
-                if (w0Plain === "tac" || w0Plain === "nl" || (w0Plain === "base64" && cmd.words.length > 1))
-                    return false;
-                if (w0Plain === "pwd") {
-                    if (p.commands.length === 1 && (cmd.words.length === 1 || (cmd.words.length === 2 && (cmd.words[1]?.plain === "-L" || cmd.words[1]?.plain === "--logical"))) && !rawState.functions.has("pwd") && !rawState.extensions?.builtins.has("pwd"))
-                        continue;
-                    return false;
-                }
-                if ((w0Plain === "command" && cmd.words[1]?.plain === "-v") || (w0Plain === "type" && cmd.words[1]?.plain === "-t")) {
-                    // PATH entries can change after admission, making discovery decline.
-                    return false;
-                }
-                // File and here-string evaluators can decline on mutable input. Keep
-                // these on the normal path, which can handle arbitrary input sizes.
-                const def = w0Plain ? (w0Plain === "seq" ? this.getExternalCommand(w0Plain) : this.commands.get(w0Plain)) : undefined;
-                if (!w0Plain || (w0Plain !== "printf" && w0Plain !== "echo" && w0Plain !== "dirname" && w0Plain !== "basename" && w0Plain !== "seq") || !def || rawState.functions.has(w0Plain) || rawState.extensions?.builtins.has(w0Plain))
-                    return false;
-                if (w0Plain === "printf" ? def.execute !== printfCommand.execute : w0Plain === "echo" ? !defaultEchoExecutors.has(def.execute) : w0Plain === "seq" ? (!builtInDirectContextExecutors.has(def.execute) && customRegisteredCommands.has(def.execute)) : !builtInDirectContextExecutors.has(def.execute))
-                    return false;
-                // Admission must satisfy the substitution evaluator too: a loop cannot
-                // recover from a declined argument after executing earlier body effects.
-                if (!cmd.words.slice(1).every(w => this.isPureArgWord(w, rawState) && this.isPureSyncValueWord(w, rawState)))
-                    return false;
-                // These substitutions consume one value per word. Unquoted expansions
-                // can split, glob, or disappear, including after loop admission.
-                if ((w0Plain === "echo" || w0Plain === "basename" || w0Plain === "dirname") &&
-                    !cmd.words.slice(1).every(w => w.parts.length > 0 && w.parts.every(part => part.quoted || (part.kind === "text" && part.value.length > 0 && !part.value.includes(" ") && !part.value.includes("\t") && !part.value.includes("\n") && !part.value.includes("{") && !hasGlobOrEscape(part.value, true)))))
-                    return false;
-                if (w0Plain === "printf") {
-                    if (!this.isSyncPrintfCallOk(cmd, 1, rawState, this._activePrintfInductionName))
-                        return false;
-                }
-                else if (w0Plain === "echo") {
-                    if (!this.isSyncSubEchoCallOk(cmd, rawState))
-                        return false;
-                }
-                else if (w0Plain === "dirname" || w0Plain === "basename") {
-                    const simArgs = [];
-                    let seenDoubleDash = false;
-                    for (let wi = 1; wi < cmd.words.length; wi++) {
-                        const w = cmd.words[wi];
-                        // Tilde prefixes depend on mutable HOME/PWD/OLDPWD; use normal expansion.
-                        if (w.parts[0]?.kind === "text" && !w.parts[0].quoted && w.parts[0].value.startsWith("~"))
-                            return false;
-                        const st = w.plain ?? (w.parts.length > 0 && w.parts.every(pt => pt.kind === "text") ? w.parts.map(pt => pt.value).join("") : undefined);
-                        if (st !== undefined) {
-                            if (st === "--")
-                                seenDoubleDash = true;
-                            simArgs.push(st);
-                        }
-                        else {
-                            // A loop operand can become an option after admission.
-                            if (!seenDoubleDash)
-                                return false;
-                            simArgs.push("x");
-                        }
-                    }
-                    if ((w0Plain === "dirname" ? this.evalSyncDirname(simArgs) : this.evalSyncBasename(simArgs)) === undefined)
-                        return false;
-                }
-                else if (w0Plain === "seq") {
-                    const simArgs = [];
-                    for (let wi = 1; wi < cmd.words.length; wi++) {
-                        const w = cmd.words[wi];
-                        const st = w.plain ?? (w.parts.length > 0 && w.parts.every(pt => pt.kind === "text") ? w.parts.map(pt => pt.value).join("") : undefined);
-                        if (st === undefined)
-                            return false;
-                        simArgs.push(st);
-                    }
-                    if (this.evalSyncSeq(simArgs) === undefined)
-                        return false;
-                }
-                continue;
+                // Dynamic substitutions execute at the committed expansion boundary.
+                return false;
             }
             return false;
         }
@@ -14521,7 +14351,7 @@ export class Runtime {
         };
         const safeArgWord = (w, numeric = false) => (!checkIntVars || this.isPureSyncValueWord(w, rawState)) &&
             (w.parts.every(p => p.quoted || (p.kind === "text" && p.value.length > 0 && !p.value.includes(" ") && !p.value.includes("\t") && !p.value.includes("\n") && !p.value.includes("{") && !hasGlobOrEscape(p.value, true))) ||
-                (numeric && ((!checkIntVars && w.parts.length === 1 && w.parts[0].kind === "variable") || (checkIntVars && rawState.variables.IFS === undefined && isGuaranteedIntWord(w)))));
+                (numeric && ((!checkIntVars && w.parts.length === 1 && w.parts[0].kind === "variable") || (checkIntVars && (rawState.variables.IFS === undefined || rawState.variables.IFS === " \t\n") && isGuaranteedIntWord(w)))));
         if (args.length === 2) {
             const op = args[0].plain;
             if ((op === "-n" || op === "-z") && safeArgWord(args[1])) {
@@ -15034,7 +14864,7 @@ export class Runtime {
         for (const cl of cmd.clauses) {
             if (cl.terminator !== ";;" && cl.terminator !== "esac")
                 return false;
-            if (!cl.patterns.every(pw => pw.plain !== undefined && tryMatchesPatternSync(pw.plain, "", work, false, false) !== undefined))
+            if (!cl.patterns.every(pw => pw.plain !== undefined && !pw.plain.startsWith("~") && tryMatchesPatternSync(pw.plain, "", work, false, false) !== undefined))
                 return false;
             if (!isSimpleEchoOrPrintf(cl.body))
                 return false;
@@ -15137,7 +14967,7 @@ export class Runtime {
                                 return false;
                             if (pw.plain === undefined && !pw.parts.every(p => p.quoted))
                                 return false;
-                            const pattern = pw.plain ?? (io ? this.tryBuildSyncPatternWord(pw, rawState, io) : undefined);
+                            const pattern = (io ? this.tryBuildSyncPatternWord(pw, rawState, io) : (pw.plain?.startsWith("~") ? undefined : pw.plain));
                             return pattern !== undefined && tryMatchesPatternSync(pattern, "", work, false, false) !== undefined;
                         })) {
                             caseOk = false;
@@ -15760,7 +15590,14 @@ export class Runtime {
             for (let b = 0; b + 1 < bodyAssignments.length; b++) {
                 const curr = bodyAssignments[b];
                 const next = bodyAssignments[b + 1];
-                if (curr.targetWord !== undefined && curr.value !== undefined && this.isSimpleRedirectEchoWord(curr.value) && !curr.append && next.targetWord !== undefined && next.value !== undefined && this.isSimpleRedirectEchoWord(next.value) && next.append && sameRedirectTargetWord(curr.targetWord, next.targetWord)) {
+                // The first echo must finish before a dependent command or $? expansion.
+                if (curr.listOperator === undefined && next.listOperator === undefined &&
+                    curr.targetWord !== undefined && curr.value !== undefined &&
+                    this.isSimpleRedirectEchoWord(curr.value) && !curr.append &&
+                    next.targetWord !== undefined && next.value !== undefined &&
+                    this.isSimpleRedirectEchoWord(next.value) && next.append &&
+                    sameRedirectTargetWord(curr.targetWord, next.targetWord) &&
+                    [next.value, next.targetWord].every(word => word.parts.every(part => part.kind !== "variable" || part.name !== "?"))) {
                     curr.coalesceNext = true;
                     b++;
                 }
@@ -15835,22 +15672,29 @@ export class Runtime {
             return undefined;
         }
         const regNames = forPlan.regNames;
+        for (const refName of regNames) {
+            if (store?.get(refName) || store?.watches.has(refName) || monitor.hasOverlay(refName) || rawState.variableAttributes?.has(refName))
+                return undefined;
+        }
+        const intBudgetSnapshot = this.budget.parsing.snapshot();
         for (let r = 0; r < regNames.length; r++) {
             const refName = regNames[r];
-            if (store?.get(refName))
-                return undefined;
             if (r > 0) {
                 const parsed = fastSafeInt(rawState.variables[refName], this.budget.parsing);
-                if (parsed === undefined)
+                if (parsed === undefined) {
+                    this.budget.parsing.restore(intBudgetSnapshot);
                     return undefined;
+                }
                 sharedLoopIntRegs[r] = parsed | 0;
             }
         }
-        monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets);
-        this.budget.tick();
         const { ok } = runIntForLoop(fastLoopWords, forPlan.bodyStepCount, forPlan.intSteps, this.budget.parsing);
-        if (!ok)
+        if (!ok) {
+            this.budget.parsing.restore(intBudgetSnapshot);
             return undefined;
+        }
+        monitor.chargeInternal(syncRestorationCharge, syncRestorationTickets);
+        this.budget.tick();
         this.budget.iterations += wordCount;
         this.budget.commands += wordCount * forPlan.bodyStepCount;
         for (let r = 0; r < regNames.length; r++) {
@@ -16017,6 +15861,7 @@ export class Runtime {
             touched.clear();
             let lastCmd;
             let lastArg = "";
+            let lastPipelineStatus;
             const mode = 0o666 & ~(rawState.umask ?? 0o022);
             if (command.kind === "arithmetic-for") {
                 let plan = command._cachedArithPlan;
@@ -16354,6 +16199,8 @@ export class Runtime {
                             canUseIntRegisters = false;
                         else {
                             usedFastIntPath = true;
+                            if (iterations > 0)
+                                lastPipelineStatus = 0;
                             this.budget.parsing.admit(limitVal < 0 ? 4 : 2);
                             this.budget.iterations += iterations + 1;
                             this.budget.commands += iterations * bodyAssignments.length + subCount;
@@ -16384,6 +16231,7 @@ export class Runtime {
                             loopStatus = rawState.status;
                             lastCmd = fb.lastCmd;
                             lastArg = fb.lastArg;
+                            lastPipelineStatus = fb.pipelineStatus;
                             lastInductionVal = fb.lastInductionVal;
                         }
                         finally {
@@ -16463,12 +16311,14 @@ export class Runtime {
                     rawState.lastArgument = lastArg;
                     if (io.assignmentDiagnosticContext)
                         io.assignmentDiagnosticContext.name = undefined;
+                }
+                if (lastPipelineStatus !== undefined) {
                     if (!existing) {
-                        monitor.lazyPipeStatus = loopStatus === 0 ? singleStatusZero : [loopStatus];
+                        monitor.lazyPipeStatus = lastPipelineStatus === 0 ? singleStatusZero : [lastPipelineStatus];
                         monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets);
                     }
                     else {
-                        this.setSyncPipeStatusCell(existing, String(loopStatus));
+                        this.setSyncPipeStatusCell(existing, String(lastPipelineStatus));
                         store.changed(monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets), "PIPESTATUS");
                     }
                 }
@@ -16486,6 +16336,8 @@ export class Runtime {
                 if (cp.negate || cp.commands.length !== 1)
                     return undefined;
                 const condCmd = cp.commands[0];
+                if (condCmd.kind !== "simple" && condCmd.kind !== "arithmetic" && condCmd.kind !== "conditional")
+                    return undefined;
                 let whileArithProg;
                 let whileCondExpr;
                 let whileReadSpec;
@@ -16714,6 +16566,7 @@ export class Runtime {
                 this._syncArithTouched = touched;
                 const condLine = io.diagnosticCommandLines?.get(condCmd) ?? (condCmd.line ?? diagnosticLine) + (io.diagnosticOffset ?? 0);
                 let loopStatus = 0;
+                const progress = { lastCmd: undefined, lastArg: rawState.lastArgument ?? "", pipelineStatus: undefined };
                 let iterCount = 0;
                 try {
                     if (whileReadSpec !== undefined && syncReadInputText !== undefined) {
@@ -16779,8 +16632,9 @@ export class Runtime {
                                     rawState.variables[vn] = "";
                                     touched.add(vn);
                                 }
-                                lastCmd = rCmd;
-                                lastArg = rLastArg;
+                                progress.lastCmd = rCmd;
+                                progress.lastArg = rLastArg;
+                                progress.pipelineStatus = 1;
                                 break;
                             }
                             const nlIdx = syncReadInputText.indexOf(readDelim, cursor);
@@ -16788,19 +16642,23 @@ export class Runtime {
                                 const partialLine = syncReadInputText.slice(cursor);
                                 cursor = textLen;
                                 splitSyncReadLine(partialLine, readIfs);
-                                lastCmd = rCmd;
-                                lastArg = rLastArg;
+                                progress.lastCmd = rCmd;
+                                progress.lastArg = rLastArg;
+                                progress.pipelineStatus = 1;
                                 break;
                             }
                             const lineStr = syncReadInputText.slice(cursor, nlIdx);
                             cursor = nlIdx + 1;
                             splitSyncReadLine(lineStr, readIfs);
+                            progress.lastCmd = rCmd;
+                            progress.lastArg = rLastArg;
+                            progress.pipelineStatus = 0;
                             rawState.status = 0;
                             ++iterCount;
                             this.budget.loop();
                             if ((iterCount & 127) === 0)
                                 runYieldCheckpoint(this.signal);
-                            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
+                            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, progress);
                             loopStatus = rawState.status;
                             if (this._syncLoopAction !== undefined) {
                                 const act = this._syncLoopAction;
@@ -16831,8 +16689,9 @@ export class Runtime {
                             }
                             rawState.variables[whileGetoptsSpec.optVar] = res.option;
                             touched.add(whileGetoptsSpec.optVar);
-                            lastCmd = whileGetoptsSpec.getoptsCmd;
-                            lastArg = whileGetoptsSpec.cmdLastArg;
+                            progress.lastCmd = whileGetoptsSpec.getoptsCmd;
+                            progress.lastArg = whileGetoptsSpec.cmdLastArg;
+                            progress.pipelineStatus = res.status;
                             if (res.status !== 0)
                                 break;
                             rawState.status = 0;
@@ -16840,7 +16699,7 @@ export class Runtime {
                             this.budget.loop();
                             if ((iterCount & 127) === 0)
                                 runYieldCheckpoint(this.signal);
-                            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
+                            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, progress);
                             loopStatus = rawState.status;
                             if (this._syncLoopAction !== undefined) {
                                 const act = this._syncLoopAction;
@@ -16856,18 +16715,18 @@ export class Runtime {
                             const condNonZero = whileCondExpr !== undefined
                                 ? (this.tryEvalConditionalSync(whileCondExpr, rawState, monitor, store, io, condLine) ?? 1) === 0
                                 : this.evalSyncLoopArithStmt(whileArithProg, rawState, io, touched, condLine);
-                            if (condCmd.kind === "simple") {
-                                lastCmd = condCmd;
-                                lastArg = this.fastValueWord(condCmd.words[condCmd.words.length - 1], rawState, io, false, false, false, true);
-                            }
+                            progress.lastCmd = condCmd;
+                            if (condCmd.kind === "simple")
+                                progress.lastArg = this.fastValueWord(condCmd.words[condCmd.words.length - 1], rawState, io, false, false, false, true);
                             rawState.status = condNonZero ? 0 : 1;
+                            progress.pipelineStatus = rawState.status;
                             if (condNonZero !== (command.kind === "while"))
                                 break;
                             ++iterCount;
                             this.budget.loop();
                             if ((iterCount & 127) === 0)
                                 runYieldCheckpoint(this.signal);
-                            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
+                            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, progress);
                             loopStatus = rawState.status;
                             if (this._syncLoopAction !== undefined) {
                                 const act = this._syncLoopAction;
@@ -16898,6 +16757,9 @@ export class Runtime {
                         }
                     }
                 }
+                lastCmd = progress.lastCmd;
+                lastArg = progress.lastArg;
+                lastPipelineStatus = progress.pipelineStatus;
                 if (lastCmd) {
                     if (rawState.extensions && !rawState.extensions.eventDepth)
                         publishCommandSpelling(rawState, commandSpelling(lastCmd));
@@ -16907,9 +16769,11 @@ export class Runtime {
                     rawState.lastArgument = lastArg;
                     if (io.assignmentDiagnosticContext)
                         io.assignmentDiagnosticContext.name = undefined;
-                    const statusStr = loopStatus === 0 ? "0" : String(loopStatus);
+                }
+                if (lastPipelineStatus !== undefined) {
+                    const statusStr = String(lastPipelineStatus);
                     if (!existing) {
-                        monitor.lazyPipeStatus = loopStatus === 0 ? singleStatusZero : [loopStatus];
+                        monitor.lazyPipeStatus = lastPipelineStatus === 0 ? singleStatusZero : [lastPipelineStatus];
                         monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets);
                     }
                     else {
@@ -17204,6 +17068,8 @@ export class Runtime {
                         canUseIntRegisters = false;
                     else {
                         usedFastIntFor = true;
+                        if (fastLoopWords.length > 0)
+                            lastPipelineStatus = 0;
                         lastCmd = bodyAssignments[bodyAssignments.length - 1]?.cmd;
                         this.budget.iterations += fastLoopWords.length;
                         this.budget.commands += fastLoopWords.length * bodyAssignments.length + subCount;
@@ -17234,6 +17100,7 @@ export class Runtime {
                         loopStatus = fastLoopWords.length === 0 ? 0 : rawState.status;
                         lastCmd = fb.lastCmd;
                         lastArg = fb.lastArg;
+                        lastPipelineStatus = fb.pipelineStatus;
                     }
                     finally {
                         this._syncReturnDepth--;
@@ -17282,12 +17149,14 @@ export class Runtime {
                     rawState.lastArgument = lastArg;
                     if (io.assignmentDiagnosticContext)
                         io.assignmentDiagnosticContext.name = undefined;
+                }
+                if (lastPipelineStatus !== undefined) {
                     if (!existing) {
-                        monitor.lazyPipeStatus = loopStatus === 0 ? singleStatusZero : [loopStatus];
+                        monitor.lazyPipeStatus = lastPipelineStatus === 0 ? singleStatusZero : [lastPipelineStatus];
                         monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets);
                     }
                     else {
-                        this.setSyncPipeStatusCell(existing, String(loopStatus));
+                        this.setSyncPipeStatusCell(existing, String(lastPipelineStatus));
                         store.changed(monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets), "PIPESTATUS");
                     }
                 }
@@ -17912,8 +17781,7 @@ export class Runtime {
     }
     runSyncArithForFallback(e0, e1, e2, inductionName, hasDeferredSteps, deferredMask, bodyAssignments, rawState, io, monitor, touched, mode, diagnosticLine) {
         let enteredBody = false;
-        let lastCmd;
-        let lastArg = rawState.lastArgument ?? "";
+        const progress = { lastCmd: undefined, lastArg: rawState.lastArgument ?? "", pipelineStatus: undefined };
         let lastInductionVal;
         touched.add(inductionName);
         this.syncShellArithmeticNonZero(e0, rawState, diagnosticLine);
@@ -17927,160 +17795,7 @@ export class Runtime {
             enteredBody = true;
             if (hasDeferredSteps)
                 lastInductionVal = rawState.variables[inductionName];
-            for (let b = 0; b < bodyAssignments.length; b++) {
-                const step = bodyAssignments[b];
-                if (step.listOperator !== undefined && ((step.listOperator === "&&" && rawState.status !== 0) || (step.listOperator === "||" && rawState.status === 0)))
-                    continue;
-                if (step.caseClauses === undefined && step.ifBranches === undefined && step.nestedLoop === undefined)
-                    lastCmd = step.cmd;
-                this.budget.tick();
-                if (step.loopAction !== undefined) {
-                    lastArg = step.cmd.words[step.cmd.words.length - 1].plain;
-                    rawState.status = 0;
-                    this._syncLoopAction = step.loopAction;
-                    break;
-                }
-                if (step.unsetVars !== undefined) {
-                    lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
-                    rawState.status = 0;
-                    continue;
-                }
-                if (step.localDecl !== undefined) {
-                    lastArg = this.execSyncLocalDeclStep(step.localDecl, rawState, io, monitor, touched, step.line);
-                    rawState.status = 0;
-                    continue;
-                }
-                if (step.shiftCount !== undefined) {
-                    const shRes = this.execSyncShiftStep(step.shiftCount, step.cmd, rawState);
-                    lastArg = shRes.lastArg;
-                    rawState.status = shRes.status;
-                    continue;
-                }
-                if (step.readHereString !== undefined) {
-                    lastArg = this.execSyncReadHereStringStep(step.readHereString, step, rawState, io, monitor, touched);
-                    continue;
-                }
-                if (deferredMask & (1 << b)) {
-                    lastArg = "";
-                    rawState.status = 0;
-                    continue;
-                }
-                if (step.coalesceNext) {
-                    const nextStep = bodyAssignments[++b];
-                    this.budget.tick();
-                    const encoded = this.encodeSyncRedirectWordsToScratch(step.value, nextStep.value, rawState, io);
-                    this.writeSyncRedirectStep(step, encoded, false, mode, rawState, io);
-                    this.budget.fileSystemOperation();
-                    this.budget.fileSystemOperation();
-                    this.budget.bytes += encoded.byteLength;
-                    lastCmd = nextStep.cmd;
-                    lastArg = this.evalSyncRedirectWord(nextStep.value, rawState, io) ?? "";
-                }
-                else if (step.targetWord !== undefined && step.value !== undefined) {
-                    if (this.isSimpleRedirectEchoWord(step.value)) {
-                        const encoded = this.encodeSyncRedirectWordsToScratch(step.value, undefined, rawState, io);
-                        this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
-                        this.budget.fileSystemOperation();
-                        this.budget.bytes += encoded.byteLength;
-                        lastArg = this.evalSyncRedirectWord(step.value, rawState, io) ?? "";
-                    }
-                    else {
-                        const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
-                        const encoded = fastSharedTextEncoder.encode(this.formatSyncEchoLine(val));
-                        this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
-                        this.budget.fileSystemOperation();
-                        this.budget.bytes += encoded.byteLength;
-                        lastArg = val;
-                    }
-                }
-                else if (step.targetWord !== undefined && step.printfVArgs !== undefined) {
-                    const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
-                    const encoded = fastSharedTextEncoder.encode(formatted);
-                    this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
-                    this.budget.fileSystemOperation();
-                    this.budget.bytes += encoded.byteLength;
-                    lastArg = pLastArg;
-                }
-                else if (step.isStdoutEcho && step.value !== undefined) {
-                    const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
-                    this.writeSyncStdoutText(this.formatSyncEchoLine(val), io);
-                    lastArg = val;
-                }
-                else if (step.isStdoutEcho && step.printfVArgs !== undefined) {
-                    const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
-                    this.writeSyncStdoutText(formatted, io);
-                    lastArg = pLastArg;
-                }
-                else if (step.arrayAssign !== undefined) {
-                    if (!this.tryFastArrayAssignmentSync(step.arrayAssign, rawState, io, step.line, undefined, undefined, true)) {
-                        throw new Error("Synchronous loop array assignment was not executable");
-                    }
-                    lastArg = "";
-                }
-                else if (step.caseClauses !== undefined) {
-                    this.flushSyncStdoutBatch(io);
-                    this.execSyncCaseStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    if (this._syncLoopAction !== undefined)
-                        break;
-                    continue;
-                }
-                else if (step.ifBranches !== undefined) {
-                    this.flushSyncStdoutBatch(io);
-                    this.execSyncIfStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    if (this._syncLoopAction !== undefined)
-                        break;
-                    continue;
-                }
-                else if (step.condStmt !== undefined) {
-                    const cStatus = this.tryEvalConditionalSync(step.condStmt, rawState, monitor, arrayStore(rawState), io, step.line) ?? 1;
-                    if (step.cmd.kind === "simple") {
-                        lastArg = this.fastValueWord(step.cmd.words[step.cmd.words.length - 1], rawState, io, false, false, false, true);
-                    }
-                    rawState.status = cStatus;
-                    continue;
-                }
-                else if (step.nestedLoop !== undefined) {
-                    this.flushSyncStdoutBatch(io);
-                    this.execSyncNestedLoopStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    continue;
-                }
-                else if (step.fnCall !== undefined) {
-                    this.flushSyncStdoutBatch(io);
-                    this.execSyncFnStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    continue;
-                }
-                else if (step.arithStmt !== undefined) {
-                    const nonZero = this.evalSyncLoopArithStmt(step.arithStmt, rawState, io, touched, step.line);
-                    rawState.status = nonZero ? 0 : 1;
-                    continue;
-                }
-                else if (step.printfVArgs !== undefined && step.name !== undefined) {
-                    const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
-                    rawState.variables[step.name] = formatted;
-                    touched.add(step.name);
-                    lastArg = pLastArg;
-                }
-                else if (step.isDiscardDevNull && step.discardWords !== undefined) {
-                    lastArg = this.runSyncDiscardStep(step, rawState, io);
-                }
-                else if (step.name !== undefined && step.value !== undefined) {
-                    rawState.substitutionStatus = 0;
-                    const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
-                    if (step.append) {
-                        const curRaw = rawState.variables[step.name];
-                        const curStr = curRaw === undefined ? "" : (touched.has(step.name) ? curRaw : (monitor.values.get(step.name, curRaw) ?? curRaw));
-                        rawState.variables[step.name] = (typeof curStr === "string" ? curStr : "") + val;
-                    }
-                    else
-                        rawState.variables[step.name] = val;
-                    touched.add(step.name);
-                    lastArg = "";
-                }
-                else {
-                    lastArg = step.cmd.words[0].plain;
-                }
-                rawState.status = step.name !== undefined && step.value !== undefined ? rawState.substitutionStatus : 0;
-            }
+            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, progress, deferredMask);
             if (this._syncLoopAction !== undefined) {
                 const act = this._syncLoopAction;
                 this._syncLoopAction = undefined;
@@ -18092,7 +17807,7 @@ export class Runtime {
         this.flushSyncStdoutBatch(io);
         if (!enteredBody)
             rawState.status = 0;
-        return { lastCmd, lastArg, lastInductionVal };
+        return { ...progress, lastInductionVal };
     }
     _syncLoopFnCheckDepth = 0;
     canSyncReadOnlyArraySubscripts(tree, rawState) {
@@ -18295,7 +18010,7 @@ export class Runtime {
             rawState.positional = savedPos;
         }
     }
-    execSyncFnStep(step, rawState, io, monitor, touched, mode, onUpdate) {
+    execSyncFnStep(step, rawState, io, monitor, touched, mode, progress) {
         const fnCall = step.fnCall;
         const fnArgs = [];
         for (let i = 0; i < fnCall.argWords.length; i++) {
@@ -18336,13 +18051,15 @@ export class Runtime {
                 }
             }
             if (fnCall.steps.length > 0) {
-                this.execSyncLoopSteps(fnCall.steps, rawState, io, monitor, touched, mode, onUpdate);
+                this.execSyncLoopSteps(fnCall.steps, rawState, io, monitor, touched, mode, progress);
             }
             else {
                 rawState.status = 0;
             }
             rawState.lastArgument = fnArgs.at(-1) ?? fnCall.name;
-            onUpdate({ lastCmd: step.cmd, lastArg: rawState.lastArgument });
+            progress.lastCmd = step.cmd;
+            progress.lastArg = rawState.lastArgument;
+            progress.pipelineStatus = rawState.status;
         }
         finally {
             for (let i = savedLocals.length - 1; i >= 0; i--) {
@@ -18362,16 +18079,10 @@ export class Runtime {
             this._fastSubPositional = prevFastSubPos;
         }
     }
-    execSyncNestedLoopStep(step, rawState, io, monitor, touched, mode, onUpdate) {
+    execSyncNestedLoopStep(step, rawState, io, monitor, touched, mode, progress) {
         const nl = step.nestedLoop;
         const lc = nl.loopCmd;
-        let innerLastCmd;
-        let innerLastArg = "";
         let innerStatus = 0;
-        const updateInner = (v) => {
-            innerLastCmd = v.lastCmd;
-            innerLastArg = v.lastArg;
-        };
         rawState.loopDepth++;
         try {
             if (lc.kind === "arithmetic-for") {
@@ -18385,7 +18096,7 @@ export class Runtime {
                     this.budget.loop();
                     if ((++turn & 127) === 0)
                         runYieldCheckpoint(this.signal);
-                    this.execSyncLoopSteps(nl.steps, rawState, io, monitor, touched, mode, updateInner);
+                    this.execSyncLoopSteps(nl.steps, rawState, io, monitor, touched, mode, progress);
                     innerStatus = rawState.status;
                     if (this._syncLoopAction !== undefined) {
                         const act = this._syncLoopAction;
@@ -18406,7 +18117,7 @@ export class Runtime {
                     if ((++turn & 127) === 0)
                         runYieldCheckpoint(this.signal);
                     rawState.variables[lc.name] = words[i];
-                    this.execSyncLoopSteps(nl.steps, rawState, io, monitor, touched, mode, updateInner);
+                    this.execSyncLoopSteps(nl.steps, rawState, io, monitor, touched, mode, progress);
                     innerStatus = rawState.status;
                     if (this._syncLoopAction !== undefined) {
                         const act = this._syncLoopAction;
@@ -18423,17 +18134,17 @@ export class Runtime {
                     const condOk = nl.condExpr !== undefined
                         ? (this.tryEvalConditionalSync(nl.condExpr, rawState, monitor, arrayStore(rawState), io, nl.condLine) ?? 1) === 0
                         : this.evalSyncLoopArithStmt(nl.condArith, rawState, io, touched, nl.condLine);
-                    if (nl.condCmd?.kind === "simple") {
-                        innerLastCmd = nl.condCmd;
-                        innerLastArg = this.fastValueWord(nl.condCmd.words[nl.condCmd.words.length - 1], rawState, io, false, false, false, true);
-                    }
+                    progress.lastCmd = nl.condCmd;
+                    if (nl.condCmd?.kind === "simple")
+                        progress.lastArg = this.fastValueWord(nl.condCmd.words[nl.condCmd.words.length - 1], rawState, io, false, false, false, true);
                     rawState.status = condOk ? 0 : 1;
+                    progress.pipelineStatus = rawState.status;
                     if (condOk !== (lc.kind === "while"))
                         break;
                     this.budget.loop();
                     if ((++turn & 127) === 0)
                         runYieldCheckpoint(this.signal);
-                    this.execSyncLoopSteps(nl.steps, rawState, io, monitor, touched, mode, updateInner);
+                    this.execSyncLoopSteps(nl.steps, rawState, io, monitor, touched, mode, progress);
                     innerStatus = rawState.status;
                     if (this._syncLoopAction !== undefined) {
                         const act = this._syncLoopAction;
@@ -18448,17 +18159,15 @@ export class Runtime {
             rawState.loopDepth--;
         }
         rawState.status = innerStatus;
-        if (innerLastCmd)
-            onUpdate({ lastCmd: innerLastCmd, lastArg: innerLastArg });
     }
-    execSyncCaseStep(step, rawState, io, monitor, touched, mode, onUpdate) {
+    execSyncCaseStep(step, rawState, io, monitor, touched, mode, progress) {
         const subj = this.fastValueWord(step.caseSubject, rawState, io, false, false, false, false, 0, step.line);
         const work = { remaining: this.budget.limits.maxExpansionBytes, signal: this.signal, exhausted: () => this.budget.fail("maxExpansionBytes") };
         let chosen;
         for (let ci = 0; ci < step.caseClauses.length; ci++) {
             const cl = step.caseClauses[ci];
             for (let pi = 0; pi < cl.patterns.length; pi++) {
-                const pattern = cl.patterns[pi].plain ?? this.tryBuildSyncPatternWord(cl.patterns[pi], rawState, io, step.line);
+                const pattern = this.tryBuildSyncPatternWord(cl.patterns[pi], rawState, io, step.line);
                 if (pattern !== undefined && tryMatchesPatternSync(pattern, subj, work, false, false)) {
                     chosen = cl.steps;
                     break;
@@ -18471,10 +18180,10 @@ export class Runtime {
             rawState.status = 0;
         }
         else {
-            this.execSyncLoopSteps(chosen, rawState, io, monitor, touched, mode, onUpdate);
+            this.execSyncLoopSteps(chosen, rawState, io, monitor, touched, mode, progress);
         }
     }
-    execSyncIfStep(step, rawState, io, monitor, touched, mode, onUpdate) {
+    execSyncIfStep(step, rawState, io, monitor, touched, mode, progress) {
         let chosen;
         for (let bi = 0; bi < step.ifBranches.length; bi++) {
             const br = step.ifBranches[bi];
@@ -18482,9 +18191,11 @@ export class Runtime {
             const condOk = br.condExpr !== undefined
                 ? (this.tryEvalConditionalSync(br.condExpr, rawState, monitor, arrayStore(rawState), io, br.condLine) ?? 1) === 0
                 : this.evalSyncLoopArithStmt(br.cond, rawState, io, touched, br.condLine);
+            progress.lastCmd = br.condCmd;
             if (br.condCmd.kind === "simple")
-                onUpdate({ lastCmd: br.condCmd, lastArg: this.fastValueWord(br.condCmd.words[br.condCmd.words.length - 1], rawState, io, false, false, false, true) });
+                progress.lastArg = this.fastValueWord(br.condCmd.words[br.condCmd.words.length - 1], rawState, io, false, false, false, true);
             rawState.status = condOk ? 0 : 1;
+            progress.pipelineStatus = rawState.status;
             if (condOk) {
                 chosen = br.steps;
                 break;
@@ -18496,83 +18207,63 @@ export class Runtime {
             rawState.status = 0;
         }
         else {
-            this.execSyncLoopSteps(chosen, rawState, io, monitor, touched, mode, onUpdate);
+            this.execSyncLoopSteps(chosen, rawState, io, monitor, touched, mode, progress);
         }
     }
-    execSyncLoopSteps(steps, rawState, io, monitor, touched, mode, onUpdate) {
-        let lastCmd;
-        let lastArg = rawState.lastArgument ?? "";
+    execSyncLoopSteps(steps, rawState, io, monitor, touched, mode, progress, deferredMask = 0) {
         for (let b = 0; b < steps.length; b++) {
             const step = steps[b];
             if (step.listOperator !== undefined && ((step.listOperator === "&&" && rawState.status !== 0) || (step.listOperator === "||" && rawState.status === 0)))
                 continue;
-            if (step.caseClauses === undefined && step.ifBranches === undefined && step.nestedLoop === undefined)
-                lastCmd = step.cmd;
             this.budget.tick();
-            if (step.loopAction !== undefined) {
-                lastArg = step.cmd.words[step.cmd.words.length - 1].plain;
-                rawState.status = 0;
-                this._syncLoopAction = step.loopAction;
-                onUpdate({ lastCmd, lastArg });
-                break;
-            }
-            if (step.unsetVars !== undefined) {
-                lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
-                rawState.status = 0;
-                onUpdate({ lastCmd, lastArg });
-                continue;
-            }
-            if (step.localDecl !== undefined) {
-                lastArg = this.execSyncLocalDeclStep(step.localDecl, rawState, io, monitor, touched, step.line);
-                rawState.status = 0;
-                onUpdate({ lastCmd, lastArg });
+            // Compound commands return their body's status, but only executed pipelines
+            // update PIPESTATUS. Share progress so empty branches and loops preserve it.
+            if (step.nestedLoop !== undefined || step.fnCall !== undefined || step.caseClauses !== undefined || step.ifBranches !== undefined) {
+                this.flushSyncStdoutBatch(io);
+                if (step.nestedLoop !== undefined)
+                    this.execSyncNestedLoopStep(step, rawState, io, monitor, touched, mode, progress);
+                else if (step.fnCall !== undefined)
+                    this.execSyncFnStep(step, rawState, io, monitor, touched, mode, progress);
+                else if (step.caseClauses !== undefined)
+                    this.execSyncCaseStep(step, rawState, io, monitor, touched, mode, progress);
+                else
+                    this.execSyncIfStep(step, rawState, io, monitor, touched, mode, progress);
+                if (this._syncLoopAction !== undefined)
+                    break;
                 continue;
             }
-            if (step.shiftCount !== undefined) {
-                const shRes = this.execSyncShiftStep(step.shiftCount, step.cmd, rawState);
-                lastArg = shRes.lastArg;
-                rawState.status = shRes.status;
-                onUpdate({ lastCmd, lastArg });
-                continue;
+            progress.lastCmd = step.cmd;
+            let status = 0;
+            if (step.loopAction !== undefined) {
+                progress.lastArg = step.cmd.words[step.cmd.words.length - 1].plain;
+                this._syncLoopAction = step.loopAction;
             }
-            if (step.readHereString !== undefined) {
-                lastArg = this.execSyncReadHereStringStep(step.readHereString, step, rawState, io, monitor, touched);
-                onUpdate({ lastCmd, lastArg });
-                continue;
+            else if (step.unsetVars !== undefined) {
+                progress.lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
             }
-            if (step.nestedLoop !== undefined) {
-                this.execSyncNestedLoopStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; onUpdate(v); });
-                continue;
+            else if (step.localDecl !== undefined) {
+                progress.lastArg = this.execSyncLocalDeclStep(step.localDecl, rawState, io, monitor, touched, step.line);
             }
-            else if (step.fnCall !== undefined) {
-                this.execSyncFnStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; onUpdate(v); });
-                continue;
+            else if (step.shiftCount !== undefined) {
+                const result = this.execSyncShiftStep(step.shiftCount, step.cmd, rawState);
+                progress.lastArg = result.lastArg;
+                status = result.status;
             }
-            else if (step.caseClauses !== undefined) {
-                this.execSyncCaseStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; onUpdate(v); });
-                if (this._syncLoopAction !== undefined)
-                    break;
-                continue;
+            else if (step.readHereString !== undefined) {
+                progress.lastArg = this.execSyncReadHereStringStep(step.readHereString, step, rawState, io, monitor, touched);
+                status = rawState.status;
             }
-            else if (step.ifBranches !== undefined) {
-                this.execSyncIfStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; onUpdate(v); });
-                if (this._syncLoopAction !== undefined)
-                    break;
-                continue;
+            else if (deferredMask & (1 << b)) {
+                progress.lastArg = "";
             }
             else if (step.condStmt !== undefined) {
-                const cStatus = this.tryEvalConditionalSync(step.condStmt, rawState, monitor, arrayStore(rawState), io, step.line) ?? 1;
+                status = this.tryEvalConditionalSync(step.condStmt, rawState, monitor, arrayStore(rawState), io, step.line) ?? 1;
                 if (step.cmd.kind === "simple") {
-                    lastArg = this.fastValueWord(step.cmd.words[step.cmd.words.length - 1], rawState, io, false, false, false, true);
-                    onUpdate({ lastCmd, lastArg });
+                    progress.lastArg = this.fastValueWord(step.cmd.words[step.cmd.words.length - 1], rawState, io, false, false, false, true);
                 }
-                rawState.status = cStatus;
-                continue;
             }
             else if (step.arithStmt !== undefined) {
-                const nonZero = this.evalSyncLoopArithStmt(step.arithStmt, rawState, io, touched, step.line);
-                rawState.status = nonZero ? 0 : 1;
-                continue;
+                status = this.evalSyncLoopArithStmt(step.arithStmt, rawState, io, touched, step.line) ? 0 : 1;
             }
             else if (step.coalesceNext) {
                 const nextStep = steps[++b];
@@ -18582,8 +18273,8 @@ export class Runtime {
                 this.budget.fileSystemOperation();
                 this.budget.fileSystemOperation();
                 this.budget.bytes += encoded.byteLength;
-                lastCmd = nextStep.cmd;
-                lastArg = this.evalSyncRedirectWord(nextStep.value, rawState, io);
+                progress.lastCmd = nextStep.cmd;
+                progress.lastArg = this.evalSyncRedirectWord(nextStep.value, rawState, io);
             }
             else if (step.targetWord !== undefined && step.value !== undefined) {
                 if (this.isSimpleRedirectEchoWord(step.value)) {
@@ -18591,7 +18282,7 @@ export class Runtime {
                     this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
                     this.budget.fileSystemOperation();
                     this.budget.bytes += encoded.byteLength;
-                    lastArg = this.evalSyncRedirectWord(step.value, rawState, io);
+                    progress.lastArg = this.evalSyncRedirectWord(step.value, rawState, io);
                 }
                 else {
                     const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
@@ -18599,31 +18290,31 @@ export class Runtime {
                     this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
                     this.budget.fileSystemOperation();
                     this.budget.bytes += encoded.byteLength;
-                    lastArg = val;
+                    progress.lastArg = val;
                 }
             }
             else if (step.targetWord !== undefined && step.printfVArgs !== undefined) {
-                const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
+                const { formatted, lastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
                 const encoded = fastSharedTextEncoder.encode(formatted);
                 this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
                 this.budget.fileSystemOperation();
                 this.budget.bytes += encoded.byteLength;
-                lastArg = pLastArg;
+                progress.lastArg = lastArg;
             }
             else if (step.arrayAssign !== undefined) {
                 if (!this.tryFastArrayAssignmentSync(step.arrayAssign, rawState, io, step.line, undefined, undefined, true)) {
                     throw new Error("Synchronous loop array assignment was not executable");
                 }
-                lastArg = "";
+                progress.lastArg = "";
             }
             else if (step.printfVArgs !== undefined && step.name !== undefined) {
-                const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
+                const { formatted, lastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
                 rawState.variables[step.name] = formatted;
                 touched.add(step.name);
-                lastArg = pLastArg;
+                progress.lastArg = lastArg;
             }
             else if (step.isDiscardDevNull && step.discardWords !== undefined) {
-                lastArg = this.runSyncDiscardStep(step, rawState, io);
+                progress.lastArg = this.runSyncDiscardStep(step, rawState, io);
             }
             else if (step.name !== undefined && step.value !== undefined) {
                 rawState.substitutionStatus = 0;
@@ -18636,179 +18327,37 @@ export class Runtime {
                 else
                     rawState.variables[step.name] = val;
                 touched.add(step.name);
-                lastArg = "";
+                progress.lastArg = "";
+                status = rawState.substitutionStatus;
             }
             else if (step.isStdoutEcho && step.value !== undefined) {
                 const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
                 this.writeSyncStdoutText(this.formatSyncEchoLine(val), io);
-                lastArg = val;
+                progress.lastArg = val;
             }
             else if (step.isStdoutEcho && step.printfVArgs !== undefined) {
-                const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
+                const { formatted, lastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
                 this.writeSyncStdoutText(formatted, io);
-                lastArg = pLastArg;
+                progress.lastArg = lastArg;
             }
             else {
-                lastArg = step.cmd.words[0].plain;
+                progress.lastArg = step.cmd.words[0].plain;
             }
-            rawState.status = step.name !== undefined && step.value !== undefined ? rawState.substitutionStatus : 0;
-            onUpdate({ lastCmd, lastArg });
+            rawState.status = status;
+            progress.pipelineStatus = status;
+            if (this._syncLoopAction !== undefined)
+                break;
         }
     }
     runSyncForFallback(varName, fastLoopWords, bodyAssignments, rawState, io, monitor, touched, mode) {
-        let lastCmd;
-        let lastArg = rawState.lastArgument ?? "";
+        const progress = { lastCmd: undefined, lastArg: rawState.lastArgument ?? "", pipelineStatus: undefined };
         let loopTurn = 0;
         for (let idx = 0; idx < fastLoopWords.length; idx++) {
             this.budget.loop();
             if ((++loopTurn & 127) === 0)
                 runYieldCheckpoint(this.signal);
             rawState.variables[varName] = fastLoopWords[idx];
-            for (let b = 0; b < bodyAssignments.length; b++) {
-                const step = bodyAssignments[b];
-                if (step.listOperator !== undefined && ((step.listOperator === "&&" && rawState.status !== 0) || (step.listOperator === "||" && rawState.status === 0)))
-                    continue;
-                if (step.caseClauses === undefined && step.ifBranches === undefined && step.nestedLoop === undefined)
-                    lastCmd = step.cmd;
-                this.budget.tick();
-                if (step.loopAction !== undefined) {
-                    lastArg = step.cmd.words[step.cmd.words.length - 1].plain;
-                    rawState.status = 0;
-                    this._syncLoopAction = step.loopAction;
-                    break;
-                }
-                if (step.unsetVars !== undefined) {
-                    lastArg = this.execSyncUnsetStep(step, rawState, monitor, touched);
-                    rawState.status = 0;
-                    continue;
-                }
-                if (step.localDecl !== undefined) {
-                    lastArg = this.execSyncLocalDeclStep(step.localDecl, rawState, io, monitor, touched, step.line);
-                    rawState.status = 0;
-                    continue;
-                }
-                if (step.shiftCount !== undefined) {
-                    const shRes = this.execSyncShiftStep(step.shiftCount, step.cmd, rawState);
-                    lastArg = shRes.lastArg;
-                    rawState.status = shRes.status;
-                    continue;
-                }
-                if (step.readHereString !== undefined) {
-                    lastArg = this.execSyncReadHereStringStep(step.readHereString, step, rawState, io, monitor, touched);
-                    continue;
-                }
-                if (step.coalesceNext) {
-                    const nextStep = bodyAssignments[++b];
-                    this.budget.tick();
-                    const encoded = this.encodeSyncRedirectWordsToScratch(step.value, nextStep.value, rawState, io);
-                    this.writeSyncRedirectStep(step, encoded, false, mode, rawState, io);
-                    this.budget.fileSystemOperation();
-                    this.budget.fileSystemOperation();
-                    this.budget.bytes += encoded.byteLength;
-                    lastCmd = nextStep.cmd;
-                    lastArg = this.evalSyncRedirectWord(nextStep.value, rawState, io) ?? "";
-                }
-                else if (step.targetWord !== undefined && step.value !== undefined) {
-                    if (this.isSimpleRedirectEchoWord(step.value)) {
-                        const encoded = this.encodeSyncRedirectWordsToScratch(step.value, undefined, rawState, io);
-                        this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
-                        this.budget.fileSystemOperation();
-                        this.budget.bytes += encoded.byteLength;
-                        lastArg = this.evalSyncRedirectWord(step.value, rawState, io) ?? "";
-                    }
-                    else {
-                        const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
-                        const encoded = fastSharedTextEncoder.encode(this.formatSyncEchoLine(val));
-                        this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
-                        this.budget.fileSystemOperation();
-                        this.budget.bytes += encoded.byteLength;
-                        lastArg = val;
-                    }
-                }
-                else if (step.targetWord !== undefined && step.printfVArgs !== undefined) {
-                    const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
-                    const encoded = fastSharedTextEncoder.encode(formatted);
-                    this.writeSyncRedirectStep(step, encoded, step.append, mode, rawState, io);
-                    this.budget.fileSystemOperation();
-                    this.budget.bytes += encoded.byteLength;
-                    lastArg = pLastArg;
-                }
-                else if (step.nestedLoop !== undefined) {
-                    this.execSyncNestedLoopStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    continue;
-                }
-                else if (step.fnCall !== undefined) {
-                    this.execSyncFnStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    continue;
-                }
-                else if (step.caseClauses !== undefined) {
-                    this.execSyncCaseStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    if (this._syncLoopAction !== undefined)
-                        break;
-                    continue;
-                }
-                else if (step.ifBranches !== undefined) {
-                    this.execSyncIfStep(step, rawState, io, monitor, touched, mode, v => { lastCmd = v.lastCmd; lastArg = v.lastArg; });
-                    if (this._syncLoopAction !== undefined)
-                        break;
-                    continue;
-                }
-                else if (step.condStmt !== undefined) {
-                    const cStatus = this.tryEvalConditionalSync(step.condStmt, rawState, monitor, arrayStore(rawState), io, step.line) ?? 1;
-                    if (step.cmd.kind === "simple") {
-                        lastArg = this.fastValueWord(step.cmd.words[step.cmd.words.length - 1], rawState, io, false, false, false, true);
-                    }
-                    rawState.status = cStatus;
-                    continue;
-                }
-                else if (step.arrayAssign !== undefined) {
-                    if (!this.tryFastArrayAssignmentSync(step.arrayAssign, rawState, io, step.line, undefined, undefined, true)) {
-                        throw new Error("Synchronous loop array assignment was not executable");
-                    }
-                    lastArg = "";
-                }
-                else if (step.arithStmt !== undefined) {
-                    const nonZero = this.evalSyncLoopArithStmt(step.arithStmt, rawState, io, touched, step.line);
-                    rawState.status = nonZero ? 0 : 1;
-                    continue;
-                }
-                else if (step.printfVArgs !== undefined && step.name !== undefined) {
-                    const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line);
-                    rawState.variables[step.name] = formatted;
-                    touched.add(step.name);
-                    lastArg = pLastArg;
-                }
-                else if (step.isDiscardDevNull && step.discardWords !== undefined) {
-                    lastArg = this.runSyncDiscardStep(step, rawState, io);
-                }
-                else if (step.name !== undefined && step.value !== undefined) {
-                    rawState.substitutionStatus = 0;
-                    const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
-                    if (step.append) {
-                        const curRaw = rawState.variables[step.name];
-                        const curStr = curRaw === undefined ? "" : (touched.has(step.name) ? curRaw : (monitor.values.get(step.name, curRaw) ?? curRaw));
-                        rawState.variables[step.name] = (typeof curStr === "string" ? curStr : "") + val;
-                    }
-                    else
-                        rawState.variables[step.name] = val;
-                    touched.add(step.name);
-                    lastArg = "";
-                }
-                else if (step.isStdoutEcho && step.value !== undefined) {
-                    const val = this.fastValueWord(step.value, rawState, io, false, false, false, false, 0, step.line);
-                    this.writeSyncStdoutText(this.formatSyncEchoLine(val), io);
-                    lastArg = val;
-                }
-                else if (step.isStdoutEcho && step.printfVArgs !== undefined) {
-                    const { formatted, lastArg: pLastArg } = this.evalSyncPrintfStep(step.printfVArgs, rawState, io, step.line, step.cmd.words[0]?.plain === "echo");
-                    this.writeSyncStdoutText(formatted, io);
-                    lastArg = pLastArg;
-                }
-                else {
-                    lastArg = step.cmd.words[0].plain;
-                }
-                rawState.status = step.name !== undefined && step.value !== undefined ? rawState.substitutionStatus : 0;
-            }
+            this.execSyncLoopSteps(bodyAssignments, rawState, io, monitor, touched, mode, progress);
             if (this._syncLoopAction !== undefined) {
                 const act = this._syncLoopAction;
                 this._syncLoopAction = undefined;
@@ -18817,7 +18366,7 @@ export class Runtime {
             }
         }
         this.flushSyncStdoutBatch(io);
-        return { lastCmd, lastArg };
+        return progress;
     }
     async script(script, state, io, startListIndex = 0, startPipelineIndex = 0, skipFirstSync = false) {
         if (state.extensions?.syntax.indexedDeclarations?.includes("readonly"))
@@ -19138,13 +18687,11 @@ export class Runtime {
                                         const isFastPure = isPureStage || runtime.isPureExternalStageCommand(command, rawStateForChild);
                                         const forkedExt = isFastPure ? forkExtensions(state.extensions, "pipeline") : undefined;
                                         const child = isFastPure
-                                            ? Object.assign(new RootShellState(rawStateForChild.cwd, rawStateForChild.variables, rawStateForChild.exported, forkedExt), rawStateForChild, {
+                                            ? Object.assign(cloneRawState(rawStateForChild, false), {
                                                 extensions: forkedExt, isolated: true, _readOnlyStage: true,
                                             })
                                             : (tryCloneStateSync(state) ?? await cloneState(state, this.signal));
                                         preparedChild = child;
-                                        if (child._readOnlyStage)
-                                            child.variables = { ...child.variables };
                                         child.variables.BASH_SUBSHELL = String(Number(state.variables.BASH_SUBSHELL ?? 0) + 1);
                                         if (!child._readOnlyStage) {
                                             child.extensions = undefined;
@@ -19440,7 +18987,7 @@ export class Runtime {
                 }
             }
         }
-        const extDef = this.getExternalCommand(firstName);
+        const extDef = this.commands.get(firstName);
         return extDef !== undefined && !customRegisteredCommands.has(extDef.execute) && !customRegisteredRegistries.has(this.commands);
     }
     publishStatus(state, statuses, io, terminal) {
@@ -19758,7 +19305,7 @@ export class Runtime {
                         }
                         for (let pIdx = 0; pIdx < clause.patterns.length; pIdx++) {
                             const pw = clause.patterns[pIdx];
-                            const pStr = pw.plain ?? (pw.parts.length === 1 && pw.parts[0].kind === "text" && !pw.parts[0].quoted && !pw.parts[0].value.includes("~") ? pw.parts[0].value : undefined);
+                            const pStr = this.tryBuildSyncPatternWord(pw, state, originalIO, diagnosticLine);
                             if (pStr === undefined) {
                                 allFast = false;
                                 break;
@@ -21697,7 +21244,7 @@ export class Runtime {
             }
         }
         const scope = io[invocationScope].child();
-        const externalDef = typeof name === "string" ? this.getExternalCommand(name) : undefined;
+        const externalDef = typeof name === "string" ? this.commands.get(name) : undefined;
         const fastInline = !state.externalInvocation && this.middleware.length === 0 && typeof name === "string" && (!externalDef || (!customRegisteredCommands.has(externalDef.execute) && !customRegisteredRegistries.has(this.commands))) && !(!bypassFunctions && state.functions.has(name)) && !state.extensions?.builtins.has(name) && name !== "." && name !== "source" && name !== "eval" && name !== "command" && name !== "builtin" && name !== "type" && name !== "read" && name !== "mapfile" && name !== "readarray";
         if (fastInline && externalDef !== undefined && values.every(value => typeof value === "string") && !implementedBuiltins.has(name) && !(name === "printf" && externalDef.execute === printfCommand.execute && args[0]?.startsWith("-v"))) {
             try {
@@ -22155,7 +21702,7 @@ export class Runtime {
                             return { exitCode: builtin };
                         }
                     }
-                    const definition = this.getExternalCommand(context.command);
+                    const definition = this.commands.get(context.command);
                     if (context.command === "printf" && definition?.execute === printfCommand.execute && context.args[0]?.startsWith("-v")) {
                         ensureRuntimeContext();
                         return { exitCode: await this.printfVariable(context, state, assignments) };
@@ -22249,7 +21796,7 @@ export class Runtime {
             matches.push({ kind: "function", name });
         if (implementedBuiltins.has(name) || state.extensions?.builtins.has(name))
             matches.push({ kind: "builtin", name });
-        else if (this.hasExternalCommand(name))
+        else if (this.commands.has(name))
             matches.push({ kind: "command", name });
         else if (name === "bash" || name === "sh")
             matches.push({ kind: "interpreter", name });
@@ -22298,23 +21845,12 @@ export class Runtime {
             return "function";
         if (isBuiltin)
             return "builtin";
-        if (this.hasExternalCommand(name))
+        if (this.commands.has(name))
             return "command";
         if (name === "bash" || name === "sh")
             return "interpreter";
         return undefined;
     }
-    getExternalCommand(name) {
-        const direct = this.commands.get(name);
-        if (direct)
-            return direct;
-        if (this.commands.has("rg") || this.commands.has("grep"))
-            return getRuntimeMuscleMemoryCommand(name);
-        return undefined;
-    }
-    hasExternalCommand(name) {
-        return this.getExternalCommand(name) !== undefined;
-    }
     async discoveryBuiltin(context, state, io, assignments, inheritedDefaultPath = false) {
         const args = [...context.args];
         const command = context.command === "command";
@@ -26119,7 +25655,7 @@ export class Runtime {
                 const name = this.referenceName(state, part.name);
                 const binding = arrayStore(state)?.get(name);
                 const index = binding?.associative ? binding.keys.get("30")?.index ?? -1 : 0;
-                retained = binding?.getValue(index) ?? stateMonitor(state)?.values.get(name, value) ?? value;
+                retained = name === "RANDOM" || name === "SECONDS" || name === "LINENO" ? value : binding?.getValue(index) ?? stateMonitor(state)?.values.get(name, value) ?? value;
             }
             else if (/^0+$/u.test(part.name))
                 retained = stateMonitor(state)?.positionals.get(zeroPositionKey, value) ?? value;
@@ -26523,6 +26059,8 @@ export class Runtime {
         let out = "";
         for (let i = 0; i < word.parts.length; i++) {
             let resolvedPart = word.parts[i];
+            if (resolvedPart.kind === "variable" && (resolveSyncNameref(rawState, resolvedPart.name) === "RANDOM" || resolveSyncNameref(rawState, resolvedPart.name) === "SECONDS"))
+                return undefined;
             if (resolvedPart.kind === "variable" && !resolvedPart.prefixNames && rawState.variableAttributes?.get(resolvedPart.name)?.includes("n")) {
                 if (resolvedPart.indirect)
                     return undefined;
@@ -27273,7 +26811,7 @@ export class Runtime {
                         if (!patQuoted && hasGlobOrEscape(pat, !!rawState.extglob)) {
                             if (rawState.nocasematch || byteLocale(rawVars))
                                 return undefined;
-                            if (isPrefixTrim && pat.charCodeAt(0) === 42 && !hasGlobOrEscape(pat.slice(1), !!rawState.extglob))
+                            if (isPrefixTrim && pat.charCodeAt(0) === 42 && !(rawState.extglob && pat.charCodeAt(1) === 40) && !hasGlobOrEscape(pat.slice(1), !!rawState.extglob))
                                 starWildcardLit = pat.slice(1);
                             else if (!isPrefixTrim && pat.charCodeAt(pat.length - 1) === 42 && !hasGlobOrEscape(pat.slice(0, -1), !!rawState.extglob))
                                 starWildcardLit = pat.slice(0, -1);
@@ -27478,6 +27016,11 @@ export class Runtime {
             else if (part.kind === "substitution") {
                 if (split && !part.quoted)
                     return undefined;
+                // General word probes may be replayed by a caller after another word or
+                // command guard declines. Run substitutions at the committed valuePart
+                // boundary; only pre-admitted loop invariants belong in this path.
+                if (!this._syncLoopInvariantSubMap?.has(part))
+                    return undefined;
                 const substVal = this.tryFastPureSubstitution(part, state, rawState, io);
                 if (substVal === undefined)
                     return undefined;
@@ -36171,7 +35714,7 @@ export class Runtime {
             if (p.kind === "text")
                 continue;
             if (p.kind === "variable") {
-                if (p.name === "BASH_SUBSHELL")
+                if (p.name === "BASH_SUBSHELL" || p.name === "RANDOM" || p.name === "SECONDS")
                     return false;
                 if (!p.indirect && !p.prefixNames && !p.length && !p.substring && !p.transform && p.operator === undefined && getArraySelector(p) === undefined && (p.name === "?" || p.name === "#" || (p.name.length === 1 && p.name >= "1" && p.name <= "9"))) {
                     const activePos = this._fastSubPositional ?? rawState.positional;
@@ -36189,17 +35732,19 @@ export class Runtime {
                 continue;
             }
             if (p.kind === "arithmetic") {
-                if (p.expression.hasSubscript || p.expression.hasMutation || rawState.nounset)
-                    return false;
-                if (p.expression.error && (p.expression.source.includes("=") || p.expression.source.includes("++") || p.expression.source.includes("--")))
-                    return false;
-                continue;
+                // Even read-only arithmetic can fail (including through variable values).
+                // Its diagnostic and exit status belong to the substitution's child shell.
+                return false;
             }
             return false;
         }
         return true;
     }
     tryFastPureSubstitution(part, state, rawState, io) {
+        // Synchronous evaluators do not expose cumulative source-read accounting.
+        // Use the command context whenever the caller has set an input ceiling.
+        if (this.budget.limits.maxInputBytes !== Infinity)
+            return undefined;
         const cachedInv = this._syncLoopInvariantSubMap?.get(part);
         if (cachedInv !== undefined && !cachedInv.dynamic) {
             const nextTotalBytes = this.budget.bytes + cachedInv.outBytes;
@@ -36243,7 +35788,7 @@ export class Runtime {
                 continue;
             if (name === "fmt" && command === pipeline.commands[0] && command.redirects.length === 0 && !io.stdinIsDefault)
                 return undefined;
-            const definition = this.getExternalCommand(name);
+            const definition = this.commands.get(name);
             if (definition && customRegisteredCommands.has(definition.execute))
                 return undefined;
             if (name === "uname" || name === "nproc" || name === "hostname" || name === "id" || name === "whoami") {
@@ -36285,7 +35830,7 @@ export class Runtime {
                 return undefined;
             if (!cmd0StdinRedir && !cmd0HereStringRedir && w0Plain0 === "cat" && cmd0.words.length < 2)
                 return undefined;
-            const def0 = (w0Plain0 === "printf" || w0Plain0 === "echo" || w0Plain0 === "cat" || w0Plain0 === "pwd" || w0Plain0 === "dirname" || w0Plain0 === "basename") ? this.commands.get(w0Plain0) : this.getExternalCommand(w0Plain0);
+            const def0 = this.commands.get(w0Plain0);
             if (!def0 || (w0Plain0 === "printf" ? def0.execute !== printfCommand.execute : w0Plain0 === "echo" ? !defaultEchoExecutors.has(def0.execute) : (w0Plain0 === "cat" || w0Plain0 === "seq" || cmd0YesStage || cmd0SysStage || cmd0StdinRedir || cmd0HereStringRedir || cmd0FileStage) ? (w0Plain0 !== "rev" && w0Plain0 !== "tac" && w0Plain0 !== "nl" && w0Plain0 !== "paste" && w0Plain0 !== "comm" && w0Plain0 !== "join" && w0Plain0 !== "jq" && w0Plain0 !== "strings" && w0Plain0 !== "bc" && w0Plain0 !== "factor" && w0Plain0 !== "tsort" && w0Plain0 !== "envsubst" && w0Plain0 !== "xxd" && w0Plain0 !== "od" && w0Plain0 !== "hexdump" && w0Plain0 !== "hd" && w0Plain0 !== "fmt" && w0Plain0 !== "md5sum" && w0Plain0 !== "sha1sum" && w0Plain0 !== "sha224sum" && w0Plain0 !== "sha256sum" && w0Plain0 !== "sha384sum" && w0Plain0 !== "sha512sum" && w0Plain0 !== "cksum" && w0Plain0 !== "base32" && w0Plain0 !== "base64" && w0Plain0 !== "csvcut" && w0Plain0 !== "csvgrep" && w0Plain0 !== "dos2unix" && w0Plain0 !== "unix2dos" && w0Plain0 !== "iconv" && w0Plain0 !== "gzip" && w0Plain0 !== "gunzip" && w0Plain0 !== "zcat" && w0Plain0 !== "unzstd" && w0Plain0 !== "zstdcat" && w0Plain0 !== "htmlq" && w0Plain0 !== "xmllint" && w0Plain0 !== "xq" && w0Plain0 !== "yq" && w0Plain0 !== "mdq" && w0Plain0 !== "shuf" && w0Plain0 !== "html-to-markdown" && w0Plain0 !== "unrtf" && w0Plain0 !== "pr" && w0Plain0 !== "file" && w0Plain0 !== "diff3" && w0Plain0 !== "cmp" && w0Plain0 !== "which" && w0Plain0 !== "diff" && w0Plain0 !== "xan" && w0Plain0 !== "less" && w0Plain0 !== "more" && w0Plain0 !== "df" && w0Plain0 !== "du" && w0Plain0 !== "tree" && w0Plain0 !== "stat" && w0Plain0 !== "fd" && w0Plain0 !== "rg" && w0Plain0 !== "readlink" && w0Plain0 !== "realpath" && w0Plain0 !== "ls" && w0Plain0 !== "find" && w0Plain0 !== "csvlook" && w0Plain0 !== "csvjson" && w0Plain0 !== "csvsort" && w0Plain0 !== "csvformat" && w0Plain0 !== "csvstat" && w0Plain0 !== "in2csv" && w0Plain0 !== "csvstack" && w0Plain0 !== "csvjoin" && w0Plain0 !== "dd" && w0Plain0 !== "env" && w0Plain0 !== "xargs" && w0Plain0 !== "openssl" && w0Plain0 !== "sqlite3" && w0Plain0 !== "gpg" && w0Plain0 !== "ssh" && w0Plain0 !== "ssh-keygen" && w0Plain0 !== "pdfinfo" && w0Plain0 !== "pdffonts" && w0Plain0 !== "pdftotext" && w0Plain0 !== "pdftohtml" && w0Plain0 !== "exiftool" && w0Plain0 !== "qpdf" && w0Plain0 !== "pdftk" && w0Plain0 !== "sips" && w0Plain0 !== "identify" && w0Plain0 !== "magick" && w0Plain0 !== "convert" && w0Plain0 !== "pdfimages" && w0Plain0 !== "pdfdetach" && w0Plain0 !== "ffprobe" && w0Plain0 !== "ffmpeg" && w0Plain0 !== "gh" && w0Plain0 !== "pdftoppm" && w0Plain0 !== "pdftocairo" && w0Plain0 !== "mmdc" && w0Plain0 !== "pandoc" && w0Plain0 !== "soffice" && w0Plain0 !== "libreoffice" && w0Plain0 !== "ssconvert" && w0Plain0 !== "wkhtmltopdf" && w0Plain0 !== "op" && w0Plain0 !== "date" && w0Plain0 !== "printenv" && w0Plain0 !== "egrep" && w0Plain0 !== "fgrep" && w0Plain0 !== "yes" && w0Plain0 !== "cal" && w0Plain0 !== "ncal" && w0Plain0 !== "expr" && w0Plain0 !== "getopt" && w0Plain0 !== "pathchk" && !builtInDirectContextExecutors.has(def0.execute)) : (customRegisteredCommands.has(def0.execute) || customRegisteredRegistries.has(this.commands))))
                 return undefined;
             if (!this.arePureArgWords(cmd0.words, rawState))
@@ -36302,7 +35847,7 @@ export class Runtime {
                 const sName = sCmd.words[0].plain;
                 if (!sName || hasShellFunction(rawState, sName) || rawState.extensions?.builtins.has(sName))
                     return undefined;
-                const extDef = this.getExternalCommand(sName);
+                const extDef = this.commands.get(sName);
                 if (!extDef || ((sName !== "cat" || startStageIdx === 0) && sName !== "rev" && sName !== "tac" && sName !== "nl" && sName !== "paste" && sName !== "column" && sName !== "fold" && sName !== "expand" && sName !== "unexpand" && sName !== "strings" && sName !== "comm" && sName !== "join" && sName !== "jq" && sName !== "bc" && sName !== "factor" && sName !== "tsort" && sName !== "envsubst" && sName !== "xxd" && sName !== "od" && sName !== "hexdump" && sName !== "hd" && sName !== "fmt" && sName !== "md5sum" && sName !== "sha1sum" && sName !== "sha224sum" && sName !== "sha256sum" && sName !== "sha384sum" && sName !== "sha512sum" && sName !== "cksum" && sName !== "base32" && sName !== "base64" && sName !== "csvcut" && sName !== "csvgrep" && sName !== "dos2unix" && sName !== "unix2dos" && sName !== "iconv" && sName !== "gzip" && sName !== "gunzip" && sName !== "zcat" && sName !== "unzstd" && sName !== "zstdcat" && sName !== "htmlq" && sName !== "xmllint" && sName !== "xq" && sName !== "yq" && sName !== "mdq" && sName !== "shuf" && sName !== "html-to-markdown" && sName !== "unrtf" && sName !== "pr" && sName !== "file" && sName !== "diff3" && sName !== "cmp" && sName !== "which" && sName !== "diff" && sName !== "xan" && sName !== "less" && sName !== "more" && sName !== "df" && sName !== "du" && sName !== "tree" && sName !== "stat" && sName !== "fd" && sName !== "rg" && sName !== "readlink" && sName !== "realpath" && sName !== "ls" && sName !== "find" && sName !== "csvlook" && sName !== "csvjson" && sName !== "csvsort" && sName !== "csvformat" && sName !== "csvstat" && sName !== "in2csv" && sName !== "csvstack" && sName !== "csvjoin" && sName !== "dd" && sName !== "xargs" && sName !== "openssl" && sName !== "sqlite3" && sName !== "gpg" && sName !== "ssh" && sName !== "ssh-keygen" && sName !== "pdfinfo" && sName !== "pdffonts" && sName !== "pdftotext" && sName !== "pdftohtml" && sName !== "exiftool" && sName !== "qpdf" && sName !== "pdftk" && sName !== "sips" && sName !== "identify" && sName !== "magick" && sName !== "convert" && sName !== "pdfimages" && sName !== "pdfdetach" && sName !== "ffprobe" && sName !== "ffmpeg" && sName !== "gh" && sName !== "pdftoppm" && sName !== "pdftocairo" && sName !== "mmdc" && sName !== "pandoc" && sName !== "soffice" && sName !== "libreoffice" && sName !== "ssconvert" && sName !== "wkhtmltopdf" && sName !== "op" && sName !== "date" && sName !== "cal" && sName !== "ncal" && sName !== "getopt" && sName !== "pathchk" && sName !== "printenv" && sName !== "env" && sName !== "egrep" && sName !== "fgrep" && !builtInDirectContextExecutors.has(extDef.execute)) || customRegisteredCommands.has(extDef.execute))
                     return undefined;
                 if ((sName === "xxd" || sName === "od") && !builtInDirectContextExecutors.has(extDef.execute))
@@ -36633,8 +36178,10 @@ export class Runtime {
             if (stage0Formatted === undefined || stage0Formatted.length > 8192)
                 return undefined;
             const stage0ByteLen = shellValueByteLength(stage0Formatted);
-            if (stage0ByteLen > sharedSyncPipeBuf0.byteLength)
+            if (stage0ByteLen > 65536)
                 return undefined;
+            const sharedSyncPipeBuf0 = new Uint8Array(65536);
+            const sharedSyncPipeBuf1 = new Uint8Array(65536);
             const nextBytes0 = this.budget.bytes + stage0ByteLen;
             if (nextBytes0 > this.budget.maxOutputBytesSmi && stage0ByteLen > this.budget.limits.maxOutputBytes - this.budget.bytes)
                 this.budget.fail("maxOutputBytes");
@@ -37839,7 +37386,7 @@ export class Runtime {
                 for (const cl of cmd.clauses) {
                     let matched = false;
                     for (const pw of cl.patterns) {
-                        if (pw.plain !== undefined && tryMatchesPatternSync(pw.plain, subj, work, false, false) === true) {
+                        if (pw.plain !== undefined && !pw.plain.startsWith("~") && tryMatchesPatternSync(pw.plain, subj, work, false, false) === true) {
                             matched = true;
                             break;
                         }
@@ -37879,14 +37426,14 @@ export class Runtime {
         if (w0Plain === "fmt" && !hasSingleStdinRedir && !hasSingleHereStringRedir && !io.stdinIsDefault)
             return undefined;
         if (w0Plain === "xxd" || w0Plain === "od" || w0Plain === "mktemp" || w0Plain === "chmod" || w0Plain === "uname" || w0Plain === "nproc" || w0Plain === "hostname" || w0Plain === "id" || w0Plain === "whoami") {
-            const definition = this.getExternalCommand(w0Plain);
+            const definition = this.commands.get(w0Plain);
             if (!definition || !builtInDirectContextExecutors.has(definition.execute))
                 return undefined;
         }
         if (cmd.words.length === 2 && cmd.redirects.length === 0 && (cmd.words[1]?.plain === "--help" || cmd.words[1]?.plain === "--version")) {
             const gnuInfo = gnuInformationSync(w0Plain, [cmd.words[1].plain], false, (rawState.exported.has("POSIXLY_CORRECT") || rawState.allexport) && rawState.variables.POSIXLY_CORRECT !== undefined);
             if (gnuInfo !== undefined) {
-                const extDef = this.getExternalCommand(w0Plain);
+                const extDef = this.commands.get(w0Plain);
                 if (!extDef || !builtInDirectContextExecutors.has(extDef.execute))
                     return undefined;
                 return gnuInfo.replace(/\n+$/, "");
@@ -37907,7 +37454,7 @@ export class Runtime {
             w0Plain === "uniq" ||
             w0Plain === "tr" ||
             (w0Plain === "base64" || w0Plain === "rev" || w0Plain === "tac" || w0Plain === "nl" || w0Plain === "paste" || w0Plain === "numfmt" || w0Plain === "column" || w0Plain === "fold" || w0Plain === "expand" || w0Plain === "unexpand" || w0Plain === "strings" || w0Plain === "comm" || w0Plain === "join") || w0Plain === "comm" || w0Plain === "join" || w0Plain === "paste" || w0Plain === "numfmt" || w0Plain === "nl" || w0Plain === "expr" || w0Plain === "bc" || w0Plain === "xxd" || w0Plain === "od" || w0Plain === "factor" || w0Plain === "tsort" || w0Plain === "envsubst" || w0Plain === "hexdump" || w0Plain === "hd" || w0Plain === "fmt" || w0Plain === "uname" || w0Plain === "id" || w0Plain === "whoami" || w0Plain === "hostname" || w0Plain === "nproc" || w0Plain === "getconf" || w0Plain === "locale" || w0Plain === "csvcut" || w0Plain === "csvgrep" || w0Plain === "getopt" || w0Plain === "dos2unix" || w0Plain === "unix2dos" || w0Plain === "iconv" || w0Plain === "gzip" || w0Plain === "gunzip" || w0Plain === "zcat" || w0Plain === "unzstd" || w0Plain === "zstdcat" || w0Plain === "zstd" || w0Plain === "bzip2" || w0Plain === "bunzip2" || w0Plain === "bzcat" || w0Plain === "xz" || w0Plain === "unxz" || w0Plain === "xzcat" || w0Plain === "lzma" || w0Plain === "unlzma" || w0Plain === "lzcat" || w0Plain === "htmlq" || w0Plain === "xmllint" || w0Plain === "xq" || w0Plain === "yq" || w0Plain === "mdq" || w0Plain === "shuf" || w0Plain === "html-to-markdown" || w0Plain === "unrtf" || w0Plain === "pr" || w0Plain === "pathchk" || w0Plain === "file" || w0Plain === "diff3" || w0Plain === "cmp" || w0Plain === "which" || w0Plain === "diff" || w0Plain === "xan" || w0Plain === "less" || w0Plain === "more" || w0Plain === "df" || w0Plain === "du" || w0Plain === "tree" || w0Plain === "stat" || w0Plain === "fd" || w0Plain === "rg" || w0Plain === "readlink" || w0Plain === "realpath" || w0Plain === "ls" || w0Plain === "find" || w0Plain === "csvlook" || w0Plain === "csvjson" || w0Plain === "csvsort" || w0Plain === "csvformat" || w0Plain === "csvstat" || w0Plain === "in2csv" || w0Plain === "csvstack" || w0Plain === "csvjoin" || w0Plain === "dd" || w0Plain === "env" || w0Plain === "xargs" || w0Plain === "openssl" || w0Plain === "sqlite3" || w0Plain === "gpg" || w0Plain === "ssh" || w0Plain === "ssh-keygen" || w0Plain === "pdfinfo" || w0Plain === "pdffonts" || w0Plain === "pdftotext" || w0Plain === "pdftohtml" || w0Plain === "exiftool" || w0Plain === "qpdf" || w0Plain === "pdftk" || w0Plain === "sips" || w0Plain === "identify" || w0Plain === "magick" || w0Plain === "convert" || w0Plain === "mogrify" || w0Plain === "composite" || w0Plain === "montage" || w0Plain === "compare" || w0Plain === "pdfimages" || w0Plain === "pdfdetach" || w0Plain === "ffprobe" || w0Plain === "ffmpeg" || w0Plain === "gh" || w0Plain === "pdftoppm" || w0Plain === "pdftocairo" || w0Plain === "mmdc" || w0Plain === "pandoc" || w0Plain === "soffice" || w0Plain === "libreoffice" || w0Plain === "ssconvert" || w0Plain === "wkhtmltopdf" || w0Plain === "op" || w0Plain === "git" || w0Plain === "tar" || w0Plain === "unzip" || w0Plain === "zip" || w0Plain === "timeout" || w0Plain === "split" || w0Plain === "csplit" || w0Plain === "curl" || w0Plain === "wget" || w0Plain === "sponge" || w0Plain === "truncate" || w0Plain === "install" || w0Plain === "apply_patch" || w0Plain === "mktemp" || w0Plain === "tee" || w0Plain === "touch" || w0Plain === "cp" || w0Plain === "mv" || w0Plain === "rmdir" || w0Plain === "sleep" || w0Plain === "chmod" || w0Plain === "patch" || w0Plain === "mkdir" || w0Plain === "rm" || w0Plain === "ln" || w0Plain === "date" || w0Plain === "printenv" || w0Plain === "egrep" || w0Plain === "fgrep" || w0Plain === "cal" || w0Plain === "ncal" || w0Plain === "md5sum" || w0Plain === "sha1sum" || w0Plain === "sha224sum" || w0Plain === "sha256sum" || w0Plain === "sha384sum" || w0Plain === "sha512sum" || w0Plain === "cksum" || w0Plain === "base32";
-        if (isSingleFileTool && !hasShellFunction(rawState, w0Plain) && (this.commands.has(w0Plain) || ((w0Plain === "base64" || w0Plain === "rev" || w0Plain === "tac" || w0Plain === "nl" || w0Plain === "paste" || w0Plain === "column" || w0Plain === "fold" || w0Plain === "expand" || w0Plain === "unexpand" || w0Plain === "strings" || w0Plain === "comm" || w0Plain === "join" || w0Plain === "expr" || w0Plain === "bc" || w0Plain === "xxd" || w0Plain === "od" || w0Plain === "factor" || w0Plain === "tsort" || w0Plain === "envsubst" || w0Plain === "hexdump" || w0Plain === "hd" || w0Plain === "fmt" || w0Plain === "uname" || w0Plain === "id" || w0Plain === "whoami" || w0Plain === "hostname" || w0Plain === "nproc" || w0Plain === "getconf" || w0Plain === "locale" || w0Plain === "csvcut" || w0Plain === "csvgrep" || w0Plain === "getopt" || w0Plain === "dos2unix" || w0Plain === "unix2dos" || w0Plain === "iconv" || w0Plain === "gzip" || w0Plain === "gunzip" || w0Plain === "zcat" || w0Plain === "unzstd" || w0Plain === "zstdcat" || w0Plain === "zstd" || w0Plain === "bzip2" || w0Plain === "bunzip2" || w0Plain === "bzcat" || w0Plain === "xz" || w0Plain === "unxz" || w0Plain === "xzcat" || w0Plain === "lzma" || w0Plain === "unlzma" || w0Plain === "lzcat" || w0Plain === "htmlq" || w0Plain === "xmllint" || w0Plain === "xq" || w0Plain === "yq" || w0Plain === "mdq" || w0Plain === "shuf" || w0Plain === "html-to-markdown" || w0Plain === "unrtf" || w0Plain === "pr" || w0Plain === "pathchk" || w0Plain === "file" || w0Plain === "diff3" || w0Plain === "cmp" || w0Plain === "which" || w0Plain === "diff" || w0Plain === "xan" || w0Plain === "less" || w0Plain === "more" || w0Plain === "df" || w0Plain === "du" || w0Plain === "tree" || w0Plain === "stat" || w0Plain === "fd" || w0Plain === "rg" || w0Plain === "readlink" || w0Plain === "realpath" || w0Plain === "ls" || w0Plain === "find" || w0Plain === "csvlook" || w0Plain === "csvjson" || w0Plain === "csvsort" || w0Plain === "csvformat" || w0Plain === "csvstat" || w0Plain === "in2csv" || w0Plain === "csvstack" || w0Plain === "csvjoin" || w0Plain === "dd" || w0Plain === "env" || w0Plain === "xargs" || w0Plain === "openssl" || w0Plain === "sqlite3" || w0Plain === "gpg" || w0Plain === "ssh" || w0Plain === "ssh-keygen" || w0Plain === "pdfinfo" || w0Plain === "pdffonts" || w0Plain === "pdftotext" || w0Plain === "pdftohtml" || w0Plain === "exiftool" || w0Plain === "qpdf" || w0Plain === "pdftk" || w0Plain === "sips" || w0Plain === "identify" || w0Plain === "magick" || w0Plain === "convert" || w0Plain === "mogrify" || w0Plain === "composite" || w0Plain === "montage" || w0Plain === "compare" || w0Plain === "pdfimages" || w0Plain === "pdfdetach" || w0Plain === "ffprobe" || w0Plain === "ffmpeg" || w0Plain === "gh" || w0Plain === "pdftoppm" || w0Plain === "pdftocairo" || w0Plain === "mmdc" || w0Plain === "pandoc" || w0Plain === "soffice" || w0Plain === "libreoffice" || w0Plain === "ssconvert" || w0Plain === "wkhtmltopdf" || w0Plain === "op" || w0Plain === "git" || w0Plain === "tar" || w0Plain === "unzip" || w0Plain === "zip" || w0Plain === "timeout" || w0Plain === "split" || w0Plain === "csplit" || w0Plain === "curl" || w0Plain === "wget" || w0Plain === "sponge" || w0Plain === "truncate" || w0Plain === "install" || w0Plain === "apply_patch" || w0Plain === "mktemp" || w0Plain === "tee" || w0Plain === "touch" || w0Plain === "cp" || w0Plain === "mv" || w0Plain === "rmdir" || w0Plain === "sleep" || w0Plain === "chmod" || w0Plain === "patch" || w0Plain === "mkdir" || w0Plain === "rm" || w0Plain === "ln" || w0Plain === "date" || w0Plain === "printenv" || w0Plain === "egrep" || w0Plain === "fgrep" || w0Plain === "cal" || w0Plain === "ncal" || w0Plain === "md5sum" || w0Plain === "sha1sum" || w0Plain === "sha224sum" || w0Plain === "sha256sum" || w0Plain === "sha384sum" || w0Plain === "sha512sum" || w0Plain === "cksum" || w0Plain === "base32") && Boolean(this.getExternalCommand(w0Plain))))) {
+        if (isSingleFileTool && !hasShellFunction(rawState, w0Plain) && (this.commands.has(w0Plain) || ((w0Plain === "base64" || w0Plain === "rev" || w0Plain === "tac" || w0Plain === "nl" || w0Plain === "paste" || w0Plain === "column" || w0Plain === "fold" || w0Plain === "expand" || w0Plain === "unexpand" || w0Plain === "strings" || w0Plain === "comm" || w0Plain === "join" || w0Plain === "expr" || w0Plain === "bc" || w0Plain === "xxd" || w0Plain === "od" || w0Plain === "factor" || w0Plain === "tsort" || w0Plain === "envsubst" || w0Plain === "hexdump" || w0Plain === "hd" || w0Plain === "fmt" || w0Plain === "uname" || w0Plain === "id" || w0Plain === "whoami" || w0Plain === "hostname" || w0Plain === "nproc" || w0Plain === "getconf" || w0Plain === "locale" || w0Plain === "csvcut" || w0Plain === "csvgrep" || w0Plain === "getopt" || w0Plain === "dos2unix" || w0Plain === "unix2dos" || w0Plain === "iconv" || w0Plain === "gzip" || w0Plain === "gunzip" || w0Plain === "zcat" || w0Plain === "unzstd" || w0Plain === "zstdcat" || w0Plain === "zstd" || w0Plain === "bzip2" || w0Plain === "bunzip2" || w0Plain === "bzcat" || w0Plain === "xz" || w0Plain === "unxz" || w0Plain === "xzcat" || w0Plain === "lzma" || w0Plain === "unlzma" || w0Plain === "lzcat" || w0Plain === "htmlq" || w0Plain === "xmllint" || w0Plain === "xq" || w0Plain === "yq" || w0Plain === "mdq" || w0Plain === "shuf" || w0Plain === "html-to-markdown" || w0Plain === "unrtf" || w0Plain === "pr" || w0Plain === "pathchk" || w0Plain === "file" || w0Plain === "diff3" || w0Plain === "cmp" || w0Plain === "which" || w0Plain === "diff" || w0Plain === "xan" || w0Plain === "less" || w0Plain === "more" || w0Plain === "df" || w0Plain === "du" || w0Plain === "tree" || w0Plain === "stat" || w0Plain === "fd" || w0Plain === "rg" || w0Plain === "readlink" || w0Plain === "realpath" || w0Plain === "ls" || w0Plain === "find" || w0Plain === "csvlook" || w0Plain === "csvjson" || w0Plain === "csvsort" || w0Plain === "csvformat" || w0Plain === "csvstat" || w0Plain === "in2csv" || w0Plain === "csvstack" || w0Plain === "csvjoin" || w0Plain === "dd" || w0Plain === "env" || w0Plain === "xargs" || w0Plain === "openssl" || w0Plain === "sqlite3" || w0Plain === "gpg" || w0Plain === "ssh" || w0Plain === "ssh-keygen" || w0Plain === "pdfinfo" || w0Plain === "pdffonts" || w0Plain === "pdftotext" || w0Plain === "pdftohtml" || w0Plain === "exiftool" || w0Plain === "qpdf" || w0Plain === "pdftk" || w0Plain === "sips" || w0Plain === "identify" || w0Plain === "magick" || w0Plain === "convert" || w0Plain === "mogrify" || w0Plain === "composite" || w0Plain === "montage" || w0Plain === "compare" || w0Plain === "pdfimages" || w0Plain === "pdfdetach" || w0Plain === "ffprobe" || w0Plain === "ffmpeg" || w0Plain === "gh" || w0Plain === "pdftoppm" || w0Plain === "pdftocairo" || w0Plain === "mmdc" || w0Plain === "pandoc" || w0Plain === "soffice" || w0Plain === "libreoffice" || w0Plain === "ssconvert" || w0Plain === "wkhtmltopdf" || w0Plain === "op" || w0Plain === "git" || w0Plain === "tar" || w0Plain === "unzip" || w0Plain === "zip" || w0Plain === "timeout" || w0Plain === "split" || w0Plain === "csplit" || w0Plain === "curl" || w0Plain === "wget" || w0Plain === "sponge" || w0Plain === "truncate" || w0Plain === "install" || w0Plain === "apply_patch" || w0Plain === "mktemp" || w0Plain === "tee" || w0Plain === "touch" || w0Plain === "cp" || w0Plain === "mv" || w0Plain === "rmdir" || w0Plain === "sleep" || w0Plain === "chmod" || w0Plain === "patch" || w0Plain === "mkdir" || w0Plain === "rm" || w0Plain === "ln" || w0Plain === "date" || w0Plain === "printenv" || w0Plain === "egrep" || w0Plain === "fgrep" || w0Plain === "cal" || w0Plain === "ncal" || w0Plain === "md5sum" || w0Plain === "sha1sum" || w0Plain === "sha224sum" || w0Plain === "sha256sum" || w0Plain === "sha384sum" || w0Plain === "sha512sum" || w0Plain === "cksum" || w0Plain === "base32") && Boolean(this.commands.get(w0Plain))))) {
             const allArgs = [];
             let fOk = true;
             for (let i = 1; i < cmd.words.length; i++) {
@@ -38039,7 +37586,7 @@ export class Runtime {
                 }
             }
             if (fOk && (w0Plain === "date" || w0Plain === "printenv" || w0Plain === "env") && !hasSingleStdinRedir && !hasSingleHereStringRedir) {
-                const ext = this.getExternalCommand(w0Plain);
+                const ext = this.commands.get(w0Plain);
                 const dpOut = w0Plain === "date"
                     ? evalSyncDate(allArgs, rawState.exported.has("TZ") ? rawState.variables.TZ : undefined, ext?.execute, (p) => this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, p), true, true), (p) => this.tryInspectMemoryNodeSync(resolvePath(rawState.cwd, p), true, true)?.mtimeMs)
                     : w0Plain === "env"
@@ -38067,7 +37614,7 @@ export class Runtime {
                 const inspectNode = (p) => this.tryInspectMemoryNodeSync(p, true);
                 const inspectStat = (p, follow) => this.tryInspectMemoryNodeSync(p, true, follow);
                 const vfsOut = w0Plain === "df"
-                    ? evalSyncDf(allArgs, rawState.cwd, rawState.variables, inspectNode, this.getExternalCommand("df")?.execute)
+                    ? evalSyncDf(allArgs, rawState.cwd, rawState.variables, inspectNode, this.commands.get("df")?.execute)
                     : w0Plain === "du"
                         ? evalSyncDu(allArgs, rawState.cwd, rawState.variables, inspectNode)
                         : w0Plain === "tree"
@@ -38327,7 +37874,7 @@ export class Runtime {
                                                                                                                                             return false;
                                                                                                                                         } })
                                                                                                                                         : w0Plain === "gh"
-                                                                                                                                            ? syncCommandEvaluators.evalSyncGh?.(this.getExternalCommand("gh").execute, allArgs, rawState.variables, rawState.cwd, readFile)
+                                                                                                                                            ? syncCommandEvaluators.evalSyncGh?.(this.commands.get("gh").execute, allArgs, rawState.variables, rawState.cwd, readFile)
                                                                                                                                             : w0Plain === "pdftoppm"
                                                                                                                                                 ? syncCommandEvaluators.evalSyncPdftoppm?.(optInBytes, allArgs, readFile, (p, b) => { try {
                                                                                                                                                     if (this._inSyncLoopPreflight)
@@ -38389,7 +37936,7 @@ export class Runtime {
                                                                                                                                                                     return false;
                                                                                                                                                                 } })
                                                                                                                                                                 : w0Plain === "ssconvert"
-                                                                                                                                                                    ? syncCommandEvaluators.evalSyncSsconvert?.(this.getExternalCommand("ssconvert").execute, allArgs, optInBytes, readFile, (p, b) => { try {
+                                                                                                                                                                    ? syncCommandEvaluators.evalSyncSsconvert?.(this.commands.get("ssconvert").execute, allArgs, optInBytes, readFile, (p, b) => { try {
                                                                                                                                                                         if (this._inSyncLoopPreflight)
                                                                                                                                                                             return Boolean(this.canFastMemoryRedirect && this._isMemoryBackingFs);
                                                                                                                                                                         const fp = resolvePath(rawState.cwd, p);
@@ -38413,9 +37960,9 @@ export class Runtime {
                                                                                                                                                                             return false;
                                                                                                                                                                         } })
                                                                                                                                                                         : w0Plain === "op"
-                                                                                                                                                                            ? syncCommandEvaluators.evalSyncOp?.(this.getExternalCommand("op").execute, allArgs, rawState.variables)
+                                                                                                                                                                            ? syncCommandEvaluators.evalSyncOp?.(this.commands.get("op").execute, allArgs, rawState.variables)
                                                                                                                                                                             : w0Plain === "git"
-                                                                                                                                                                                ? syncCommandEvaluators.evalSyncGit?.(optInBytes, allArgs, rawState.cwd, (p, follow) => this.tryInspectMemoryNodeSync(p, p === "/", follow), (p) => this.tryReadMemoryFileViewSync(p, false, true), this.getExternalCommand("git").execute, (p, b, m) => { try {
+                                                                                                                                                                                ? syncCommandEvaluators.evalSyncGit?.(optInBytes, allArgs, rawState.cwd, (p, follow) => this.tryInspectMemoryNodeSync(p, p === "/", follow), (p) => this.tryReadMemoryFileViewSync(p, false, true), this.commands.get("git").execute, (p, b, m) => { try {
                                                                                                                                                                                     if (this._inSyncLoopPreflight)
                                                                                                                                                                                         return Boolean(this.canFastMemoryRedirect && this._isMemoryBackingFs);
                                                                                                                                                                                     const dir = p.slice(0, p.lastIndexOf("/")) || "/";
@@ -39287,7 +38834,7 @@ export class Runtime {
                             } });
                         }
                         else if (w0Plain === "gh") {
-                            fileRes = syncCommandEvaluators.evalSyncGh?.(this.getExternalCommand("gh").execute, opArgs, rawState.variables, rawState.cwd, (p) => this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, p), false));
+                            fileRes = syncCommandEvaluators.evalSyncGh?.(this.commands.get("gh").execute, opArgs, rawState.variables, rawState.cwd, (p) => this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, p), false));
                         }
                         else if (w0Plain === "pdftoppm") {
                             const readFile = (p) => this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, p), true, true);
@@ -39360,7 +38907,7 @@ export class Runtime {
                             } });
                         }
                         else if (w0Plain === "ssconvert") {
-                            fileRes = syncCommandEvaluators.evalSyncSsconvert?.(this.getExternalCommand("ssconvert").execute, opArgs, view, (p) => this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, p), true, true), (p, b) => { try {
+                            fileRes = syncCommandEvaluators.evalSyncSsconvert?.(this.commands.get("ssconvert").execute, opArgs, view, (p) => this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, p), true, true), (p, b) => { try {
                                 if (this._inSyncLoopPreflight)
                                     return Boolean(this.canFastMemoryRedirect && this._isMemoryBackingFs);
                                 const fp = resolvePath(rawState.cwd, p);
@@ -39387,10 +38934,10 @@ export class Runtime {
                             } });
                         }
                         else if (w0Plain === "op") {
-                            fileRes = syncCommandEvaluators.evalSyncOp?.(this.getExternalCommand("op").execute, opArgs, rawState.variables);
+                            fileRes = syncCommandEvaluators.evalSyncOp?.(this.commands.get("op").execute, opArgs, rawState.variables);
                         }
                         else if (w0Plain === "git") {
-                            fileRes = syncCommandEvaluators.evalSyncGit?.(view, opArgs, rawState.cwd, (p, follow) => this.tryInspectMemoryNodeSync(p, p === "/", follow), (p) => this.tryReadMemoryFileViewSync(p, false, true), this.getExternalCommand("git").execute, (p, b, m) => { try {
+                            fileRes = syncCommandEvaluators.evalSyncGit?.(view, opArgs, rawState.cwd, (p, follow) => this.tryInspectMemoryNodeSync(p, p === "/", follow), (p) => this.tryReadMemoryFileViewSync(p, false, true), this.commands.get("git").execute, (p, b, m) => { try {
                                 if (this._inSyncLoopPreflight)
                                     return Boolean(this.canFastMemoryRedirect && this._isMemoryBackingFs);
                                 const dir = p.slice(0, p.lastIndexOf("/")) || "/";
@@ -39869,6 +39416,8 @@ export class Runtime {
         }
         let fnPositional;
         if (rawState.functions.has(w0Plain)) {
+            if (rawState.functionDepth >= this.budget.limits.maxFunctionDepth)
+                return undefined;
             if (rawState.depth + 1 >= this.budget.limits.maxSubstitutionDepth)
                 return undefined;
             const fnBody = rawState.functions.get(w0Plain);
@@ -39906,7 +39455,7 @@ export class Runtime {
                 const disc = typeof targetName === "string" ? this.tryResolveSyncDiscovery(w0Plain === "command" ? "name" : "kind", targetName, rawState) : undefined;
                 if (disc !== undefined && (disc.status === 0 || !rawState.errexit)) {
                     if (disc.status === 0) {
-                        const byteLength = (disc.text.length * 3 > 127 ? shellValueByteLength(disc.text) : disc.text.length) + 1;
+                        const byteLength = shellValueByteLength(disc.text) + 1;
                         const nextBytes = this.budget.bytes + byteLength;
                         if (nextBytes > this.budget.maxOutputBytesSmi && byteLength > this.budget.limits.maxOutputBytes - this.budget.bytes)
                             this.budget.fail("maxOutputBytes");
@@ -39924,7 +39473,7 @@ export class Runtime {
                 let res = rawState.cwd;
                 while (res.endsWith("\n"))
                     res = res.slice(0, -1);
-                const byteLength = (res.length * 3 > 127 ? shellValueByteLength(res) : res.length) + 1;
+                const byteLength = shellValueByteLength(res) + 1;
                 const nextBytes = this.budget.bytes + byteLength;
                 if (nextBytes > this.budget.maxOutputBytesSmi && byteLength > this.budget.limits.maxOutputBytes - this.budget.bytes)
                     this.budget.fail("maxOutputBytes");
@@ -39938,7 +39487,7 @@ export class Runtime {
             }
             if (w0Plain !== "printf" && w0Plain !== "echo" && w0Plain !== "dirname" && w0Plain !== "basename" && w0Plain !== "seq")
                 return undefined;
-            const def = w0Plain === "seq" ? this.getExternalCommand(w0Plain) : this.commands.get(w0Plain);
+            const def = this.commands.get(w0Plain);
             if (!def)
                 return undefined;
             if (w0Plain === "printf" && def.execute !== printfCommand.execute)
@@ -41001,6 +40550,7 @@ export class RootShellState {
         this.status = 0;
         this.substitutionStatus = 0;
         this.lastArgument = "";
+        this.secondsOrigin = Date.now();
     }
     get exported() {
         const raw = stateMonitor(this)?.raw;