@poe-platform/safe-bash 0.1.749 → 0.1.750

package/dist/safe-bash/core.browser.js

@@ -1383,7 +1383,7 @@ function basicCommands() {
       return { exitCode: 0 };
     }),
     define("basename", async (context2) => {
-      const parsed = options(context2.args, "as:z", { multiple: "a", suffix: "s", zero: "z" });
+      const parsed = options(context2.args, "as:z", { multiple: "a", suffix: "s", zero: "z" }, true);
       const multiple = parsed.flags.has("a") || parsed.flags.has("s");
       requireOperands(parsed.operands, 1, multiple ? Infinity : 2);
       const suffix2 = value(parsed, "s") ?? (multiple ? void 0 : parsed.operands[1]);
@@ -1395,7 +1395,7 @@ function basicCommands() {
       return { exitCode: 0 };
     }, 1, 1),
     define("dirname", async (context2) => {
-      const parsed = options(context2.args, "z", { zero: "z" });
+      const parsed = options(context2.args, "z", { zero: "z" }, true);
       requireOperands(parsed.operands);
       for (const operand of parsed.operands) {
         const parent = dirname(operand);
@@ -56372,7 +56372,6 @@ async function patternAdmission(pattern, context2) {
       }
     } else if (character === "]" && bracket && index > bracketStart + 1) bracket = false;
   }
-  if (bracket) unsupported("unclosed bracket pattern");
 }
 async function unary2(operator, value2, context2) {
   if (operator === "-n") return value2.length > 0;
@@ -75631,7 +75630,7 @@ var Runtime = class _Runtime {
             }
             return !rem.associative && rem.references === 1;
           }
-          return this.isPureSyncValueWord(e.left, rawState) && (e.operator === "==" || e.operator === "=" || e.operator === "!=" ? this.canSyncPatternWordParts(e.right, rawState) : this.isPureSyncValueWord(e.right, rawState));
+          return this.isPureSyncValueWord(e.left, rawState) && this.isPureSyncValueWord(e.right, rawState) && (!(e.operator === "==" || e.operator === "=" || e.operator === "!=") || e.right.parts.length > 0 && e.right.parts.every((p) => p.quoted));
         }
         if (e.kind === "not") return checkCondNoFile(e.operand);
         if (e.kind === "and" || e.kind === "or") return checkCondNoFile(e.left) && checkCondNoFile(e.right);
@@ -78552,6 +78551,7 @@ var Runtime = class _Runtime {
                   positionalSetVersion,
                   savedPositionals: resumeSavedPos,
                   callerLoopDepth,
+                  lastArgument: fnArgs.at(-1) ?? w0Plain,
                   listIndex: bodyRes.listIndex,
                   pipelineIndex: bodyRes.pipelineIndex
                 });
@@ -78606,6 +78606,7 @@ var Runtime = class _Runtime {
               this.setSyncPipeStatusCell(activeExisting, statusStr);
               activeStore.changed(monitor.chargeInternal(syncPipeStatusCharge, syncPipeStatusTickets), "PIPESTATUS");
             }
+            rawState.lastArgument = fnArgs.at(-1) ?? w0Plain;
             rawState.status = exitStatus;
             if (exitStatus !== 0 && !ignored && rawState.errexit) throw new Flow2("exit", exitStatus);
             return exitStatus;
@@ -79070,22 +79071,22 @@ var Runtime = class _Runtime {
         const list = part.script.lists[0];
         if (list.terminator || list.pipelines.length !== 1) return false;
         const p = list.pipelines[0];
-        if (p.negate || p.commands.length < 1 || p.commands.length > 5) return false;
+        if (p.negate || p.commands.length !== 1) return false;
         let cmd = p.commands[0];
-        const hasSingleStdinRedir = cmd.kind === "simple" && cmd.redirects.length === 1 && cmd.redirects[0].operator === "<" && (cmd.redirects[0].descriptor === void 0 || cmd.redirects[0].descriptor === 0) && !cmd.redirects[0].move && !cmd.redirects[0].document && cmd.redirects[0].target.plain !== void 0 && !cmd.redirects[0].target.plain.startsWith("-") && cmd.redirects[0].target.plain !== "/dev/stdin";
-        const hasSingleHereStringRedir = cmd.kind === "simple" && cmd.redirects.length === 1 && cmd.redirects[0].operator === "<<<" && (cmd.redirects[0].descriptor === void 0 || cmd.redirects[0].descriptor === 0) && !cmd.redirects[0].move && !cmd.redirects[0].document && this.isPureSyncValueWord(cmd.redirects[0].target, rawState);
         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 && !hasSingleStdinRedir && !hasSingleHereStringRedir || cmd.words.length === 0) return false;
+        if (cmd.kind !== "simple" || cmd.redirects.length > 0 || cmd.words.length === 0) return false;
         let w0Plain = cmd.words[0].plain;
         if (p.commands.length === 1 && w0Plain !== void 0 && 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.isPureSyncValueWord(w, rawState))) {
+          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.isPureSyncValueWord(w, rawState) && w.parts.length > 0 && w.parts.every(
+            (part2) => part2.quoted || part2.kind === "text" && part2.value.length > 0 && !part2.value.includes(" ") && !part2.value.includes("	") && !part2.value.includes("\n") && !part2.value.includes("{") && !hasGlobOrEscape(part2.value, true)
+          ))) {
             const innerCmd = fnBody.body.lists[0].pipelines[0].commands[0];
             const innerW0 = innerCmd.words[0]?.plain;
-            if (innerW0 && !rawState.functions.has(innerW0) && !rawState.extensions?.builtins.has(innerW0)) {
+            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;
             }
@@ -79097,81 +79098,15 @@ var Runtime = class _Runtime {
           return false;
         }
         if (w0Plain === "command" && cmd.words[1]?.plain === "-v" || w0Plain === "type" && cmd.words[1]?.plain === "-t") {
-          if (p.commands.length === 1 && cmd.words.length === 3 && !rawState.functions.has(w0Plain) && !rawState.extensions?.builtins.has(w0Plain) && this.isPureSyncValueWord(cmd.words[2], rawState) && (cmd.words[2].plain !== void 0 && this.tryResolveSyncDiscovery(w0Plain === "command" ? "name" : "kind", cmd.words[2].plain, rawState) !== void 0 || this._isMemoryBackingFs && this.backingFs?.capabilities?.permissions !== true)) {
-            continue;
-          }
           return false;
         }
-        const isFileCommand = w0Plain === "cat" || w0Plain === "head" || w0Plain === "tail" || w0Plain === "jq" || w0Plain === "awk" || w0Plain === "grep" || w0Plain === "sed" || w0Plain === "cut" || w0Plain === "wc" || w0Plain === "sort" || w0Plain === "uniq" || w0Plain === "tr" || hasSingleHereStringRedir && (w0Plain === "base64" || w0Plain === "rev" || w0Plain === "tac" || w0Plain === "nl" || w0Plain === "paste" || w0Plain === "numfmt");
-        const def = w0Plain ? this.commands.get(w0Plain) ?? (w0Plain === "rev" || w0Plain === "tac" || w0Plain === "nl" || w0Plain === "paste" || w0Plain === "jq" ? this.getExternalCommand(w0Plain) : void 0) : void 0;
-        if (!w0Plain || w0Plain !== "printf" && w0Plain !== "echo" && w0Plain !== "dirname" && w0Plain !== "basename" && w0Plain !== "seq" && !isFileCommand || !def || rawState.functions.has(w0Plain) || rawState.extensions?.builtins.has(w0Plain)) return false;
-        if ((hasSingleStdinRedir || hasSingleHereStringRedir) && !isFileCommand) return false;
-        if (w0Plain === "printf" ? def.execute !== printfCommand.execute : w0Plain === "echo" ? !defaultEchoExecutors.has(def.execute) : w0Plain === "seq" || w0Plain === "rev" || w0Plain === "tac" || w0Plain === "nl" || w0Plain === "paste" || w0Plain === "jq" ? !builtInDirectContextExecutors.has(def.execute) && customRegisteredCommands.has(def.execute) : !builtInDirectContextExecutors.has(def.execute)) return false;
+        const def = w0Plain ? this.commands.get(w0Plain) : void 0;
+        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;
         if (!cmd.words.slice(1).every((w) => this.isPureSyncValueWord(w, rawState))) return false;
-        if (isFileCommand) {
-          if (w0Plain === "tr" && !hasSingleStdinRedir && !hasSingleHereStringRedir) return false;
-          if (w0Plain === "grep" && rawState.errexit) return false;
-          if (!hasSingleHereStringRedir) {
-            const fPlain = hasSingleStdinRedir ? cmd.redirects[0].target.plain : cmd.words[cmd.words.length - 1]?.plain;
-            if (!fPlain || fPlain.startsWith("-") || fPlain === "/dev/stdin") return false;
-            const vCheck = this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, fPlain), false);
-            if (!vCheck || vCheck.byteLength > 16384 || vCheck.includes(0)) return false;
-          }
-          const opWords = hasSingleStdinRedir || hasSingleHereStringRedir ? cmd.words.slice(1) : cmd.words.slice(1, -1);
-          const opCount = opWords.length;
-          const op0 = opWords[0]?.plain;
-          const op1 = opWords[1]?.plain;
-          if (w0Plain === "cat" || w0Plain === "rev" || w0Plain === "tac") {
-            if (opCount !== 0) return false;
-          } else {
-            if (p.commands.length !== 1 && !hasSingleHereStringRedir) return false;
-            if (w0Plain === "head" || w0Plain === "tail") {
-              const validHT = opCount === 0 || opCount === 1 && op0 !== void 0 && (/^-(?:n|c|--lines=|--bytes=)?[0-9]{1,5}$/.test(op0) || /^--(?:lines|bytes)=[0-9]{1,5}$/.test(op0) || w0Plain === "tail" && /^(?:-n|--lines=)\+[0-9]{1,5}$/.test(op0) || w0Plain === "head" && /^(?:-n|--lines=)-[0-9]{1,5}$/.test(op0)) || opCount === 2 && (op0 === "-n" && op1 !== void 0 && (/^[0-9]{1,5}$/.test(op1) || w0Plain === "tail" && /^\+[0-9]{1,5}$/.test(op1) || w0Plain === "head" && /^-[0-9]{1,5}$/.test(op1)) || op0 === "-c" && op1 !== void 0 && /^[0-9]{1,5}$/.test(op1));
-              if (!validHT) return false;
-            }
-            const plainOps = [];
-            for (let oi = 0; oi < opCount; oi++) {
-              const ow = opWords[oi];
-              const pw = ow.plain ?? (ow.parts.length > 0 && ow.parts.every((pt) => pt.kind === "text") ? ow.parts.map((pt) => pt.value).join("") : void 0);
-              if (pw === void 0) break;
-              plainOps.push(pw);
-            }
-            if (w0Plain === "cut") {
-              if (plainOps.length !== opCount || this.evalSyncCut(["\xE9"], plainOps, byteLocale(rawState.variables)) === void 0) return false;
-            } else if (w0Plain === "sed") {
-              if (plainOps.length !== opCount || this.evalSyncSed([], plainOps) === void 0) return false;
-            } else if (w0Plain === "grep") {
-              if (plainOps.length !== opCount || this.evalSyncGrep([], plainOps, Boolean(rawState.errexit)) === void 0) return false;
-            } else if (w0Plain === "awk") {
-              const input3 = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
-              if (plainOps.length !== opCount || input3 === void 0) return false;
-              const lines3 = input3.length === 0 ? [] : input3.split("\n");
-              if (input3.endsWith("\n")) lines3.pop();
-              if (this.evalSyncAwk(lines3, plainOps) === void 0) return false;
-            } else if (w0Plain === "jq") {
-              if (plainOps.length !== opCount) return false;
-              const jqIn = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
-              if (jqIn === void 0 || this.evalSyncJq(jqIn, plainOps) === void 0) return false;
-            } else if (w0Plain === "wc") {
-              if (opCount !== 1 || this.normalizeSyncWcFlag(op0) === void 0) return false;
-            } else if (w0Plain === "sort") {
-              if (plainOps.length !== opCount || this.evalSyncSort([], plainOps, byteLocale(rawState.variables)) === void 0) return false;
-            } else if (w0Plain === "uniq") {
-              if (plainOps.length !== opCount || this.evalSyncUniq([], plainOps) === void 0) return false;
-            } else if (w0Plain === "base64") {
-              if (opCount > 1 || opCount === 1 && op0 !== "-d" && op0 !== "--decode") return false;
-            } else if (w0Plain === "tr") {
-              if (plainOps.length !== opCount || this.evalSyncTr("", plainOps) === void 0) return false;
-            } else if (w0Plain === "nl") {
-              if (plainOps.length !== opCount || this.evalSyncNl([], plainOps) === void 0) return false;
-            } else if (w0Plain === "paste") {
-              if (plainOps.length !== opCount || this.evalSyncPaste([], plainOps) === void 0) return false;
-            } else if (w0Plain === "numfmt") {
-              const nmCheck = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
-              if (nmCheck === void 0 || plainOps.length !== opCount || this.evalSyncNumfmt(nmCheck.split("\n"), plainOps) === void 0) return false;
-            }
-          }
-        }
+        if ((w0Plain === "echo" || w0Plain === "basename" || w0Plain === "dirname") && !cmd.words.slice(1).every((w) => w.parts.length > 0 && w.parts.every(
+          (part2) => part2.quoted || part2.kind === "text" && part2.value.length > 0 && !part2.value.includes(" ") && !part2.value.includes("	") && !part2.value.includes("\n") && !part2.value.includes("{") && !hasGlobOrEscape(part2.value, true)
+        ))) return false;
         if (w0Plain === "printf") {
           if (!this.isSyncPrintfCallOk(cmd, 1, rawState, this._activePrintfInductionName)) return false;
         } else if (w0Plain === "echo") {
@@ -79197,90 +79132,13 @@ var Runtime = class _Runtime {
           }
           if ((w0Plain === "dirname" ? this.evalSyncDirname(simArgs) : this.evalSyncBasename(simArgs)) === void 0) return false;
         } else if (w0Plain === "seq") {
-          const isSeqIntWord = (w) => {
-            if (w.plain !== void 0) return /^-?[0-9]{1,7}$/.test(w.plain);
-            if (w.parts.length === 1) {
-              const p02 = w.parts[0];
-              if (p02.kind === "arithmetic") return true;
-              if (p02.kind === "variable" && !p02.indirect && !p02.prefixNames && !p02.substring && !p02.transform && p02.operator === void 0 && getArraySelector(p02) === void 0) {
-                const cur = rawState.variables[p02.name];
-                return cur !== void 0 && /^-?[0-9]{1,7}$/.test(cur);
-              }
-            }
-            return false;
-          };
-          if (cmd.words.length < 2 || cmd.words.length > 4 || !cmd.words.slice(1).every(isSeqIntWord)) return false;
-        }
-        if (p.commands.length >= 2) {
-          if (w0Plain !== "printf" && w0Plain !== "echo" && w0Plain !== "seq" && w0Plain !== "cat" && !hasSingleHereStringRedir || syncPurePipelineSlotInUse || !this.budget.canSyncPurePipe || rawState.errexit || rawState.nounset) return false;
-          if (w0Plain === "printf") {
-            if (!this.isSyncPrintfCallOk(cmd, 1, rawState, this._activePrintfInductionName)) return false;
-          }
-          for (let sIdx = 1; sIdx < p.commands.length; sIdx++) {
-            const sCmd = p.commands[sIdx];
-            if (sCmd.kind !== "simple" || sCmd.redirects.length !== 0 || sCmd.words.length === 0) return false;
-            const sName = sCmd.words[0].plain;
-            if (!sName || sName !== "cut" && sName !== "tr" && sName !== "sort" && sName !== "head" && sName !== "tail" && sName !== "wc" && sName !== "sed" && sName !== "uniq" && sName !== "rev" && sName !== "awk" && sName !== "grep" && sName !== "jq" && sName !== "base64" && sName !== "tac" && sName !== "nl" && sName !== "paste" && sName !== "numfmt") return false;
-            const sDef = this.commands.get(sName) ?? (sName === "rev" || sName === "tac" || sName === "nl" || sName === "paste" || sName === "jq" ? this.getExternalCommand(sName) : void 0);
-            if (!sDef || customRegisteredCommands.has(sDef.execute) || sName !== "rev" && sName !== "tac" && sName !== "nl" && sName !== "paste" && sName !== "jq" && !builtInDirectContextExecutors.has(sDef.execute)) return false;
-            if (rawState.functions.has(sName) || rawState.extensions?.builtins.has(sName)) return false;
-            const sArgWords = sCmd.words.slice(1);
-            const sPlainArgs = [];
-            let allPlainStageArgs = true;
-            for (let k = 0; k < sArgWords.length; k++) {
-              const sw = sArgWords[k];
-              const sp = sw.plain ?? (sw.parts.length > 0 && sw.parts.every((pt) => pt.kind === "text") ? sw.parts.map((pt) => pt.value).join("") : void 0);
-              if (sp === void 0) {
-                allPlainStageArgs = false;
-                break;
-              }
-              sPlainArgs.push(sp);
-            }
-            if (!allPlainStageArgs) return false;
-            if (sName === "sort") {
-              if (this.evalSyncSort([], sPlainArgs, byteLocale(rawState.variables)) === void 0) return false;
-            } else if (sName === "uniq") {
-              if (this.evalSyncUniq([], sPlainArgs) === void 0) return false;
-            } else if (sName === "wc") {
-              if (sPlainArgs.length !== 1 || this.normalizeSyncWcFlag(sPlainArgs[0]) === void 0) return false;
-            } else if (sName === "head" || sName === "tail") {
-              const okHT = sPlainArgs.length === 0 || sPlainArgs.length === 1 && (/^-(?:n|c)?[0-9]{1,5}$/.test(sPlainArgs[0]) || /^--(?:lines|bytes)=[0-9]{1,5}$/.test(sPlainArgs[0]) || sName === "tail" && /^(?:-n|--lines=)\+[0-9]{1,5}$/.test(sPlainArgs[0]) || sName === "head" && /^(?:-n|--lines=)-[0-9]{1,5}$/.test(sPlainArgs[0])) || sPlainArgs.length === 2 && (sPlainArgs[0] === "-n" && (/^[0-9]{1,5}$/.test(sPlainArgs[1]) || sName === "tail" && /^\+[0-9]{1,5}$/.test(sPlainArgs[1]) || sName === "head" && /^-[0-9]{1,5}$/.test(sPlainArgs[1])) || sPlainArgs[0] === "-c" && /^[0-9]{1,5}$/.test(sPlainArgs[1]));
-              if (!okHT) return false;
-            } else if (sName === "cut") {
-              if (this.evalSyncCut(["\xE9"], sPlainArgs, byteLocale(rawState.variables)) === void 0) return false;
-            } else if (sName === "sed") {
-              if (this.evalSyncSed([], sPlainArgs) === void 0) return false;
-            } else if (sName === "awk") {
-              if (sIdx !== 1) return false;
-              const input3 = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState);
-              if (input3 === void 0) return false;
-              const lines3 = input3.length === 0 ? [] : input3.split("\n");
-              if (input3.endsWith("\n")) lines3.pop();
-              if (this.evalSyncAwk(lines3, sPlainArgs) === void 0) return false;
-            } else if (sName === "grep") {
-              if (this.evalSyncGrep([], sPlainArgs, Boolean(rawState.errexit)) === void 0) return false;
-            } else if (sName === "tr") {
-              if (this.evalSyncTr("", sPlainArgs) === void 0) return false;
-            } else if (sName === "jq") {
-              if (sIdx !== 1) return false;
-              const jqIn = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
-              if (jqIn === void 0 || this.evalSyncJq(jqIn, sPlainArgs) === void 0) return false;
-            } else if (sName === "base64") {
-              if (sPlainArgs.length !== 0) return false;
-            } else if (sName === "tac") {
-              if (sPlainArgs.length !== 0 || w0Plain !== "echo" && !hasSingleHereStringRedir) return false;
-            } else if (sName === "nl") {
-              if (w0Plain !== "echo" && !hasSingleHereStringRedir || this.evalSyncNl([], sPlainArgs) === void 0) return false;
-            } else if (sName === "paste") {
-              if (this.evalSyncPaste([], sPlainArgs) === void 0) return false;
-            } else if (sName === "numfmt") {
-              if (sIdx !== 1) return false;
-              const nmCheck = this.extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState)?.trim();
-              if (nmCheck === void 0 || this.evalSyncNumfmt(nmCheck.split("\n"), sPlainArgs) === void 0) return false;
-            } else if (sName === "rev") {
-              if (sPlainArgs.length !== 0) return false;
-            }
-          }
+          if (cmd.words.length < 2 || cmd.words.length > 4) return false;
+          const operands = cmd.words.slice(1).map((w) => w.plain);
+          if (!operands.every((value2) => value2 !== void 0 && Number.isInteger(Number(value2)) && String(Number(value2)) === value2 && Math.abs(Number(value2)) <= 9999999)) return false;
+          const first = operands.length === 1 ? 1 : Number(operands[0]);
+          const increment = operands.length === 3 ? Number(operands[1]) : 1;
+          const last = Number(operands[operands.length - 1]);
+          if (increment === 0 || Math.abs((last - first) / increment) > 1024) return false;
         }
         continue;
       }
@@ -79684,7 +79542,7 @@ var Runtime = class _Runtime {
                 if (patInfo?.isVar) return false;
                 return this.isPureSyncValueWord(e.left, rawState) && this.getFastAnchoredEreRegex(e.right, rawState) !== void 0 && !rawState.readonlyVariables?.has("BASH_REMATCH") && !rawState.exported.has("BASH_REMATCH") && !stateMonitor(rawState)?.hasOverlay("BASH_REMATCH") && !(store ?? requireArrays(rawState))?.watches.has("BASH_REMATCH");
               }
-              return this.isPureSyncValueWord(e.left, rawState) && (e.operator === "==" || e.operator === "=" || e.operator === "!=" ? this.canSyncPatternWordParts(e.right, rawState) : this.isPureSyncValueWord(e.right, rawState));
+              return this.isPureSyncValueWord(e.left, rawState) && this.isPureSyncValueWord(e.right, rawState) && (!(e.operator === "==" || e.operator === "=" || e.operator === "!=") || e.right.parts.length > 0 && e.right.parts.every((p2) => p2.quoted));
             }
             if (e.kind === "not") return checkLeaf(e.operand);
             if (e.kind === "and" || e.kind === "or") return checkLeaf(e.left) && checkLeaf(e.right);
@@ -79804,6 +79662,7 @@ var Runtime = class _Runtime {
         if (this.extractPosixBracketCondExpr(cmd, rawState, true, script2) !== void 0) continue;
         if (cmd.kind !== "simple") return false;
         if (nested && cmd.redirects.length !== 0) return false;
+        if (cmd.words.length === 0) return false;
         if (cmd.redirects.length === 1) {
           const r0Check = cmd.redirects[0];
           const w0DevPlain = cmd.words[0].plain;
@@ -80389,21 +80248,12 @@ var Runtime = class _Runtime {
     const forPrintfInd = command7.kind === "for" && command7.words?.length === 1 && /^\{[0-9]{1,4}\.\.[0-9]{1,4}(?:\.\.[1-9][0-9]{0,2})?\}$/.test(command7.words[0].plain ?? "") ? command7.name : void 0;
     const printfInductionName = initializer?.kind === "binary" && initializer.operator === "=" && initializer.left.kind === "name" && initializer.right.kind === "literal" && initializer.right.value >= 0n && initializer.right.value <= 2000n && condition?.kind === "binary" && (condition.operator === "<" || condition.operator === "<=") && condition.left.kind === "name" && condition.left.name === initializer.left.name && condition.right.kind === "literal" && condition.right.value >= 0n && condition.right.value <= 2000n && increment?.kind === "unary" && increment.operator === "++" && increment.operand.kind === "name" && increment.operand.name === initializer.left.name && this.canSyncPrintfInductionBody(command7.body, rawState, initializer.left.name) ? initializer.left.name : whilePrintfInd && this.canSyncPrintfInductionBody(command7.body, rawState, whilePrintfInd) ? whilePrintfInd : forPrintfInd && this.canSyncPrintfInductionBody(command7.body, rawState, forPrintfInd) ? forPrintfInd : void 0;
     const prevActivePrintfInd = this._activePrintfInductionName;
-    const prevActiveLoopScript = this._activeLoopBodyScript;
-    const prevActiveLoopCond = this._activeLoopCondScript;
-    const prevActiveLoopVar = this._activeLoopVarName;
     this._activePrintfInductionName = printfInductionName;
-    this._activeLoopBodyScript = command7.body;
-    this._activeLoopCondScript = command7.kind === "while" ? command7.condition : void 0;
-    this._activeLoopVarName = command7.kind === "for" ? command7.name : printfInductionName ?? (whilePrintfInd || void 0);
     let bodySyncOk = false;
     try {
       bodySyncOk = !(guestArrays(rawState) && (guestArrays(rawState).watches.size > 0 || this.budget.limits.maxExpansionBytes < 65536)) && this.canSyncLoopBody(command7.body, rawState, io, false, printfInductionName);
     } finally {
       this._activePrintfInductionName = prevActivePrintfInd;
-      this._activeLoopBodyScript = prevActiveLoopScript;
-      this._activeLoopCondScript = prevActiveLoopCond;
-      this._activeLoopVarName = prevActiveLoopVar;
     }
     if (!bodySyncOk) {
       command7._skipTrySyncLoop = true;
@@ -80929,7 +80779,7 @@ var Runtime = class _Runtime {
               if (patInfo?.isVar) return false;
               return depth === 0 && this.isPureSyncValueWord(e.left, rawState) && this.getFastAnchoredEreRegex(e.right, rawState) !== void 0 && !rawState.readonlyVariables?.has("BASH_REMATCH") && !rawState.exported.has("BASH_REMATCH") && !monitor.hasOverlay("BASH_REMATCH") && !(store ?? requireArrays(rawState))?.watches.has("BASH_REMATCH");
             }
-            return this.isPureSyncValueWord(e.left, rawState) && (e.operator === "==" || e.operator === "=" || e.operator === "!=" ? this.canSyncPatternWordParts(e.right, rawState) : this.isPureSyncValueWord(e.right, rawState));
+            return this.isPureSyncValueWord(e.left, rawState) && this.isPureSyncValueWord(e.right, rawState) && (!(e.operator === "==" || e.operator === "=" || e.operator === "!=") || e.right.parts.length > 0 && e.right.parts.every((p) => p.quoted));
           }
           if (e.kind === "not") return checkWhileCond(e.operand, depth + 1);
           if (e.kind === "and" || e.kind === "or") return checkWhileCond(e.left, depth + 1) && checkWhileCond(e.right, depth + 1);
@@ -81188,7 +81038,7 @@ var Runtime = class _Runtime {
       if (store) store.epoch = restEpoch2;
       return loopStatus2;
     }
-    if (!isShellIdentifier(command7.name) || command7.name === "OPTIND" || command7.name.includes("[") || store?.get(command7.name) || command7.words && (command7.words.length === 0 || command7.words.length > 64) || rawState.braceexpand === false) {
+    if (!isShellIdentifier(command7.name) || command7.name === "OPTIND" || controlNames.has(command7.name) || command7.name === "LC_COLLATE" || command7.name.includes("[") || store?.get(command7.name) || command7.words && (command7.words.length === 0 || command7.words.length > 64) || rawState.braceexpand === false) {
       return void 0;
     }
     const activeValScope = io[valueScope];
@@ -81643,149 +81493,6 @@ ${s1}
     return pos <= 128 ? fastRedirectScratchViews[pos] : fastRedirectScratchBytes.subarray(0, pos);
   }
   _activePrintfInductionName = void 0;
-  _activeLoopBodyScript = void 0;
-  _activeLoopCondScript = void 0;
-  _activeLoopVarName = void 0;
-  isVarUnmutatedInScript(varName, script2) {
-    for (const list of script2.lists) {
-      for (const pipeline of list.pipelines) {
-        for (const cmd of pipeline.commands) {
-          if (cmd.kind === "arithmetic") {
-            if (cmd.expression.hasMutation && cmd.expression.source.includes(varName)) return false;
-            continue;
-          }
-          if (cmd.kind === "if") {
-            for (const br of cmd.branches) {
-              if (!this.isVarUnmutatedInScript(varName, br.condition) || !this.isVarUnmutatedInScript(varName, br.body)) return false;
-            }
-            if (cmd.otherwise && !this.isVarUnmutatedInScript(varName, cmd.otherwise)) return false;
-            continue;
-          }
-          if (cmd.kind === "case") {
-            for (const cl of cmd.clauses) {
-              if (!this.isVarUnmutatedInScript(varName, cl.body)) return false;
-            }
-            continue;
-          }
-          if (cmd.kind === "for") {
-            if (cmd.name === varName || !this.isVarUnmutatedInScript(varName, cmd.body)) return false;
-            continue;
-          }
-          if (cmd.kind === "arithmetic-for") {
-            if (cmd.expressions.some((e) => e && e.hasMutation && e.source.includes(varName)) || !this.isVarUnmutatedInScript(varName, cmd.body)) return false;
-            continue;
-          }
-          if (cmd.kind === "while") {
-            if (!this.isVarUnmutatedInScript(varName, cmd.condition) || !this.isVarUnmutatedInScript(varName, cmd.body)) return false;
-            continue;
-          }
-          if (cmd.kind === "group" || cmd.kind === "subshell") {
-            if (!this.isVarUnmutatedInScript(varName, cmd.body)) return false;
-            continue;
-          }
-          if (cmd.kind !== "simple") return false;
-          for (const w of cmd.words) {
-            const arrAss = getArrayAssignment(w);
-            if (arrAss && arrAss.name === varName) return false;
-            const p02 = w.parts[0];
-            if (p02?.kind === "text" && !p02.quoted && (p02.value.startsWith(varName + "=") || p02.value.startsWith(varName + "+=") || p02.value.startsWith(varName + "["))) return false;
-          }
-          const w0 = cmd.words[0]?.plain;
-          if (w0 === "read" || w0 === "unset" || w0 === "declare" || w0 === "typeset" || w0 === "local" || w0 === "export" || w0 === "mapfile" || w0 === "readarray") {
-            if (w0 === "read" && varName === "REPLY") return false;
-            if (cmd.words.slice(1).some((w) => (w.plain ?? "").includes(varName))) return false;
-          }
-          if (w0 === "printf" && cmd.words[1]?.plain === "-v" && (cmd.words[2]?.plain ?? "").startsWith(varName)) return false;
-          for (const w of [...cmd.words, ...cmd.redirects.map((r) => r.target)]) {
-            for (const pt of w.parts) {
-              if (pt.kind === "arithmetic" && pt.expression.hasMutation && pt.expression.source.includes(varName)) return false;
-              if (pt.kind === "substitution" && !this.isVarUnmutatedInScript(varName, pt.script)) return false;
-            }
-          }
-        }
-      }
-    }
-    return true;
-  }
-  isVarUnmutatedInActiveLoop(varName) {
-    if (varName === this._activeLoopVarName || varName === this._activePrintfInductionName) return false;
-    if (this._activeLoopCondScript && !this.isVarUnmutatedInScript(varName, this._activeLoopCondScript)) return false;
-    if (this._activeLoopBodyScript && !this.isVarUnmutatedInScript(varName, this._activeLoopBodyScript)) return false;
-    return true;
-  }
-  isFileReadOnlyScript(script2, rawState) {
-    const visit = (value2) => {
-      if (value2 === null || typeof value2 !== "object") return true;
-      if (Array.isArray(value2)) return value2.every(visit);
-      const node = value2;
-      if (typeof node.operator === "string" && "target" in node && !["<", "<<<", "<<", "<<-"].includes(node.operator)) return false;
-      if (node.kind === "simple") {
-        const cmd = value2;
-        const name2 = cmd.words[0]?.plain;
-        if (name2 === void 0 && !cmd.words.every((word) => this.assignment(word) || getArrayAssignment(word))) return false;
-        if (name2 !== void 0 && (hasShellFunction(rawState, name2) || !["jq", "cat", "echo", "printf", "test", "[", ":", "true", "false"].includes(name2))) return false;
-      }
-      return Object.values(node).every(visit);
-    };
-    return visit(script2);
-  }
-  extractLoopInvariantInput(cmd, hasSingleStdinRedir, hasSingleHereStringRedir, rawState) {
-    const w0 = cmd.words[0]?.plain;
-    const resolveInvariantWord = (w) => {
-      if (w.plain !== void 0) return w.plain;
-      if (w.parts.length > 0 && w.parts.every((pt) => pt.kind === "text")) return w.parts.map((pt) => pt.value).join("");
-      if (w.parts.length === 1 && w.parts[0].kind === "variable") {
-        const vp = w.parts[0];
-        if (!vp.indirect && !vp.operator && !vp.substring && !vp.transform && !vp.length && !vp.prefixNames && getArraySelector(vp) === void 0 && this.isVarUnmutatedInActiveLoop(vp.name)) {
-          const val = rawState.variables[vp.name];
-          if (typeof val === "string") return val;
-        }
-      }
-      return void 0;
-    };
-    if (w0 === "jq" || w0 === "numfmt" || w0 === "awk") {
-      if (hasSingleHereStringRedir) {
-        const resolved = resolveInvariantWord(cmd.redirects[0].target);
-        return resolved !== void 0 ? resolved + "\n" : void 0;
-      }
-      if (this._fileWrites?.size || this._outputFiles?.size) return void 0;
-      if ([this._activeLoopBodyScript, this._activeLoopCondScript].some((script2) => script2 && !this.isFileReadOnlyScript(script2, rawState))) return void 0;
-      const fPlain = hasSingleStdinRedir ? cmd.redirects[0].target.plain : cmd.words[cmd.words.length - 1]?.plain;
-      if (!fPlain || fPlain.startsWith("-") || fPlain === "/dev/stdin") return void 0;
-      const vCheck = this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, fPlain), false);
-      if (!vCheck || vCheck.byteLength > 16384 || vCheck.includes(0)) return void 0;
-      return sharedSyncPipeDecoder.decode(vCheck);
-    }
-    if (w0 === "cat") {
-      if (hasSingleHereStringRedir) {
-        const resolved = resolveInvariantWord(cmd.redirects[0].target);
-        return resolved !== void 0 ? resolved + "\n" : void 0;
-      }
-      if (this._fileWrites?.size || this._outputFiles?.size) return void 0;
-      if ([this._activeLoopBodyScript, this._activeLoopCondScript].some((script2) => script2 && !this.isFileReadOnlyScript(script2, rawState))) return void 0;
-      const fPlain = hasSingleStdinRedir ? cmd.redirects[0].target.plain : cmd.words[1]?.plain;
-      if (!fPlain || fPlain.startsWith("-") || fPlain === "/dev/stdin") return void 0;
-      const vCheck = this.tryReadMemoryFileViewSync(resolvePath(rawState.cwd, fPlain), false);
-      if (!vCheck || vCheck.byteLength > 16384 || vCheck.includes(0)) return void 0;
-      return sharedSyncPipeDecoder.decode(vCheck);
-    }
-    if (w0 === "echo" && cmd.words.length === 2) {
-      const resolved = resolveInvariantWord(cmd.words[1]);
-      if (resolved !== void 0 && !resolved.startsWith("-")) return resolved + "\n";
-      return void 0;
-    }
-    if (w0 === "printf" && cmd.words.length >= 2) {
-      const args = [];
-      for (let i = 1; i < cmd.words.length; i++) {
-        const r = resolveInvariantWord(cmd.words[i]);
-        if (r === void 0) return void 0;
-        args.push(r);
-      }
-      const formatted3 = tryFastPrintf(args);
-      return formatted3;
-    }
-    return void 0;
-  }
   canSyncPrintfInductionBody(script2, rawState, inductionName) {
     for (const list of script2.lists) for (const pipeline of list.pipelines) for (const command7 of pipeline.commands) {
       if (command7.kind === "arithmetic") {
@@ -82363,6 +82070,7 @@ ${s1}
     return check(tree);
   }
   canSyncErrorArithmeticStmt(expr, rawState) {
+    if (expr.source.includes("$")) return false;
     if (expr.source.includes("/") || expr.source.includes("%") || expr.source.includes("<<") || expr.source.includes(">>") || expr.source.includes("**") || expr.source.includes("[")) return false;
     try {
       const cachedExpr = expr;
@@ -82504,27 +82212,40 @@ ${s1}
     const prevFastSubPos = this._fastSubPositional;
     rawState.positional = fnArgs;
     this._fastSubPositional = fnArgs;
-    const savedLocals = new Array(fnCall.locals.length);
+    const savedLocals = [];
+    const seenLocals = /* @__PURE__ */ new Set();
     try {
-      for (let i = 0; i < fnCall.locals.length; i++) {
-        const loc = fnCall.locals[i];
-        if (loc.isFirstInCmd) this.budget.tick();
-        savedLocals[i] = { name: loc.name, val: rawState.variables[loc.name], wasTouched: touched.has(loc.name) };
-        if (loc.valueWord !== void 0) {
-          rawState.variables[loc.name] = this.fastValueWord(loc.valueWord, rawState, io, false, false, false, false, 0, step.line);
-          touched.add(loc.name);
-        } else {
-          delete rawState.variables[loc.name];
+      for (let i = 0; i < fnCall.locals.length; ) {
+        this.budget.tick();
+        let end = i + 1;
+        while (end < fnCall.locals.length && !fnCall.locals[end].isFirstInCmd) end++;
+        const values = fnCall.locals.slice(i, end).map((loc) => loc.valueWord === void 0 ? void 0 : this.fastValueWord(loc.valueWord, rawState, io, false, false, false, false, 0, step.line));
+        const start = i;
+        for (; i < end; i++) {
+          const loc = fnCall.locals[i];
+          const alreadyLocal = seenLocals.has(loc.name);
+          if (!alreadyLocal) {
+            savedLocals.push({ name: loc.name, val: rawState.variables[loc.name], wasTouched: touched.has(loc.name) });
+            seenLocals.add(loc.name);
+          }
+          const value2 = values[i - start];
+          if (value2 !== void 0) {
+            rawState.variables[loc.name] = value2;
+            touched.add(loc.name);
+          } else if (!alreadyLocal) {
+            delete rawState.variables[loc.name];
+          }
         }
       }
       if (fnCall.steps.length > 0) {
         this.execSyncLoopSteps(fnCall.steps, rawState, io, monitor, touched, mode, onUpdate);
       } else {
         rawState.status = 0;
-        onUpdate({ lastCmd: step.cmd, lastArg: fnArgs.length > 0 ? fnArgs[fnArgs.length - 1] : fnCall.name });
       }
+      rawState.lastArgument = fnArgs.at(-1) ?? fnCall.name;
+      onUpdate({ lastCmd: step.cmd, lastArg: rawState.lastArgument });
     } finally {
-      for (let i = fnCall.locals.length - 1; i >= 0; i--) {
+      for (let i = savedLocals.length - 1; i >= 0; i--) {
         const saved = savedLocals[i];
         if (saved.val !== void 0) {
           rawState.variables[saved.name] = saved.val;
@@ -85399,6 +85120,7 @@ ${s1}
         throw checkpointFailure;
       }
       if (hasThrown) throw thrownError;
+      state.lastArgument = pendingResume?.lastArgument ?? args.at(-1) ?? name2;
       return exitStatus;
     } finally {
       await scope.close();
@@ -85897,6 +85619,7 @@ ${s1}
               throw checkpointFailure;
             }
             if (outcome.kind === "throw") throw outcome.reason;
+            state.lastArgument = context3.args.at(-1) ?? context3.command;
             return outcome.value;
           }
           if (selectedKind === "builtin" && !(state.externalInvocation && this.commands.has(context3.command))) {
@@ -90459,6 +90182,7 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
   }
   expandSyncTrCharArray(spec) {
     if (spec.length === 0) return void 0;
+    for (let i = 0; i < spec.length; i++) if (spec.charCodeAt(i) >= 128) return void 0;
     if (spec.includes("\\") && spec.includes("-")) return void 0;
     const posixClasses = {
       "[:lower:]": "abcdefghijklmnopqrstuvwxyz",
@@ -90884,9 +90608,9 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
       for (const el of item) {
         if (!el || typeof el !== "object" || Array.isArray(el)) return void 0;
         const rec = el;
-        const k = rec.key ?? rec.name ?? rec.k;
+        const k = [rec.key, rec.Key, rec.name, rec.Name].find((value2) => value2 !== void 0 && value2 !== null && value2 !== false);
         if (typeof k !== "string") return void 0;
-        obj[k] = Object.hasOwn(rec, "value") ? rec.value : Object.hasOwn(rec, "v") ? rec.v : null;
+        obj[k] = Object.hasOwn(rec, "value") ? rec.value : Object.hasOwn(rec, "Value") ? rec.Value : null;
       }
       return [obj];
     }
@@ -90915,7 +90639,7 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
         if (!Array.isArray(item) || !item.every((x) => typeof x === "string" || typeof x === "number" || typeof x === "boolean" || x === null)) return void 0;
         return [item.map((x) => x === null ? "" : String(x)).join(arg)];
       }
-      if (fn === "split") return typeof item === "string" ? [item.split(arg)] : void 0;
+      if (fn === "split") return typeof item === "string" ? [arg === "" ? Array.from(item) : item.split(arg)] : void 0;
       if (fn === "ltrimstr") return typeof item === "string" ? [item.startsWith(arg) ? item.slice(arg.length) : item] : void 0;
       if (fn === "rtrimstr") return typeof item === "string" ? [arg.length > 0 && item.endsWith(arg) ? item.slice(0, -arg.length) : item] : void 0;
       if (fn === "startswith") return typeof item === "string" ? [item.startsWith(arg)] : void 0;
@@ -91120,9 +90844,8 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
         break;
       }
       if (!a.startsWith("-") || a === "-") {
-        operands.push(a);
-        idx++;
-        continue;
+        operands.push(...args.slice(idx));
+        break;
       }
       if (a === "-a" || a === "--multiple") {
         multiple = true;
@@ -91443,7 +91166,7 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
         }
         if (st.kind === "=") {
           out.push(String(idx1));
-          lastInputIndex = i;
+          lastInputIndex = -1;
           continue;
         }
         if (st.kind === "q") {
@@ -91480,7 +91203,10 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
           }
           return replacement;
         });
-        if (matchedOnce && st.printOnMatch) out.push(l);
+        if (matchedOnce && st.printOnMatch) {
+          out.push(l);
+          lastInputIndex = i;
+        }
       }
       if (quitNow) {
         break;
@@ -92413,14 +92139,16 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
       endField = km[2] !== void 0 ? Number(km[2]) : void 0;
       if (endField !== void 0 && endField < startField) return void 0;
       const kf = km[3] ?? "";
-      if (kf.includes("n")) keyNum = true;
-      if (kf.includes("h")) keyHuman = true;
-      if (kf.includes("M")) keyMonth = true;
-      if (kf.includes("d")) keyDict = true;
-      if (kf.includes("r")) keyRev = true;
-      if (kf.includes("f")) keyFold = true;
-      if (kf.includes("b")) keyBlanks = true;
-      if (kf.includes("V")) keyVer = true;
+      if (kf.length > 0) {
+        keyNum = kf.includes("n");
+        keyHuman = kf.includes("h");
+        keyMonth = kf.includes("M");
+        keyDict = kf.includes("d");
+        keyRev = kf.includes("r");
+        keyFold = kf.includes("f");
+        keyBlanks = kf.includes("b");
+        keyVer = kf.includes("V");
+      }
     }
     const extractKey = (l) => {
       let raw = keySpec === void 0 ? l : (() => {
@@ -92444,7 +92172,13 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
       })();
       if (keyBlanks) raw = raw.replace(/^[ \t]+/, "");
       if (keyDict) raw = raw.replace(/[^a-zA-Z0-9 \t]+/g, "");
-      return keyFold ? raw.toUpperCase() : raw;
+      if (!keyFold) return raw;
+      let folded = "";
+      for (let i = 0; i < raw.length; i++) {
+        const code = raw.charCodeAt(i);
+        folded += code >= 97 && code <= 122 ? String.fromCharCode(code - 32) : raw[i];
+      }
+      return folded;
     };
     const parseNum = (s) => {
       const m = /^[ \t]*(-?(?:\d+(?:\.\d*)?|\.\d+))/.exec(s);
@@ -92472,6 +92206,23 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
       const idx = ["JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"].indexOf(m[1].toUpperCase());
       return idx === -1 ? 0 : idx + 1;
     };
+    const encoded2 = /* @__PURE__ */ new Map();
+    const bytesOf = (line) => {
+      let bytes2 = encoded2.get(line);
+      if (bytes2 === void 0) {
+        bytes2 = fastSharedTextEncoder.encode(line);
+        encoded2.set(line, bytes2);
+      }
+      return bytes2;
+    };
+    const compareBytes2 = (left, right) => {
+      const a = bytesOf(left);
+      const b = bytesOf(right);
+      for (let i = 0; i < Math.min(a.length, b.length); i++) {
+        if (a[i] !== b[i]) return a[i] - b[i];
+      }
+      return a.length - b.length;
+    };
     const sorted = [...rawLines].sort((a, b) => {
       const ka = extractKey(a);
       const kb = extractKey(b);
@@ -92490,13 +92241,12 @@ ${prefix3} line ${offset + line}: \`${source2.split("\n")[line - 1] ?? ""}'
         const vc = this.compareSyncVersion(ka, kb);
         if (vc !== 0) return keyRev ? -vc : vc;
       } else if (ka !== kb) {
-        return ka < kb ? keyRev ? 1 : -1 : keyRev ? -1 : 1;
+        const comparison2 = compareBytes2(ka, kb);
+        return keyRev ? -comparison2 : comparison2;
       }
       if (uniq || stable) return 0;
-      const fa = fold2 ? a.toUpperCase() : a;
-      const fb = fold2 ? b.toUpperCase() : b;
-      if (fa !== fb) return fa < fb ? rev ? 1 : -1 : rev ? -1 : 1;
-      return a < b ? rev ? 1 : -1 : a > b ? rev ? -1 : 1 : 0;
+      const comparison = compareBytes2(a, b);
+      return rev ? -comparison : comparison;
     });
     if (!uniq) return sorted;
     const dedup = [];