@sema-agent/core 7.29.0 → 7.30.0

package/dist/shell/lex.js

@@ -2,13 +2,6 @@ export const SHELL_LEX_DIALECT = "bash";
 export const QUOTE_KINDS = ["'", '"', "$'", '$"', "\\"];
 export const EXPANSION_KINDS = ["parameter", "command", "process", "arithmetic", "tilde", "brace", "glob"];
 export const UNRESOLVED_REASONS = ["ansi_c_escape", "locale_string", "parameter_text", "subscript_text", "compound_array_value"];
-export const UNRESOLVED_VIEW = {
-    ansi_c_escape: "refuse",
-    locale_string: "fold",
-    parameter_text: "refuse",
-    subscript_text: "refuse",
-    compound_array_value: "refuse",
-};
 export const UNRESOLVED_SENTENCE = {
     ansi_c_escape: "an ANSI-C quoted word carries an escape this lexer does not fold",
     locale_string: "a locale-translated string carries text this lexer does not read",
@@ -30,7 +23,6 @@ export const PARSE_FAILURE_REASONS = [
     "redirect_without_target",
     "heredoc_without_delimiter",
     "heredoc_delimiter_expands",
-    "background_operator",
 ];
 export const PARSE_FAILURE_SENTENCE = {
     unterminated_single_quote: "a single-quoted word never closes",
@@ -46,7 +38,6 @@ export const PARSE_FAILURE_SENTENCE = {
     redirect_without_target: "a redirection names no target",
     heredoc_without_delimiter: "a here-document operator names no delimiter",
     heredoc_delimiter_expands: "a here-document delimiter is not a plain word",
-    background_operator: "`&` backgrounding is not allowed — a backgrounded process outlives the command",
 };
 export const BASH_ONLY_CONSTRUCTS = [
     "ansi_c_quoting",
@@ -57,6 +48,7 @@ export const BASH_ONLY_CONSTRUCTS = [
     "here_string",
     "process_substitution",
     "redirect_both",
+    "pipe_both",
     "brace_expansion",
 ];
 export const ANSI_C_ESCAPES = {
@@ -78,11 +70,6 @@ export const SUBSTITUTION_PLACEHOLDER = " subst";
 export const SHELL_CONTROL_PREFIXES = new Set(["!", "if", "then", "elif", "else", "while", "until", "do", "time"]);
 const COMPOUND_OPERAND_COMMANDS = new Set(["alias", "declare", "eval", "export", "let", "local", "readonly", "typeset"]);
 const GROUP_WORDS = new Set(["{", "}"]);
-function quoteStep(open, ch) {
-    if (open === undefined)
-        return ch === '"' || ch === "'" ? ch : undefined;
-    return open === ch ? undefined : open;
-}
 export function dollarOpensQuote(text, at) {
     const next = text[at + 1];
     if (next !== "'" && next !== '"')
@@ -103,32 +90,6 @@ export function ansiCQuoteClose(source, open) {
     }
     return undefined;
 }
-export function quoteMask(s) {
-    const openedBy = new Array(s.length).fill(undefined);
-    const quoted = new Array(s.length).fill(false);
-    let open;
-    for (let i = 0; i < s.length; i++) {
-        if (open === undefined && s[i] === "$" && s[i + 1] === "'") {
-            const close = ansiCQuoteClose(s, i + 1);
-            for (let k = i; k <= (close ?? s.length - 1); k++) {
-                openedBy[k] = "'";
-                quoted[k] = true;
-            }
-            if (close === undefined) {
-                open = "'";
-                break;
-            }
-            i = close;
-            continue;
-        }
-        const before = open;
-        open = quoteStep(open, s[i]);
-        const holds = before ?? open;
-        openedBy[i] = holds;
-        quoted[i] = holds !== undefined;
-    }
-    return { openedBy, quoted, balanced: open === undefined };
-}
 export function literalTildeSpelling(word) {
     return word.startsWith("~") ? `./${word}` : word;
 }
@@ -153,6 +114,9 @@ function decodeAnsiC(body) {
     }
     return { text, unresolved };
 }
+export function argvOf(segment) {
+    return segment.tokens.filter((t) => t.kind === "word");
+}
 export function wordsOf(segment) {
     const folded = [];
     const raw = [];
@@ -355,7 +319,6 @@ export function substitutionsInHeredocBody(body) {
     }
     return out;
 }
-const WHITESPACE = /\s/;
 const BLANK = /[ \t]/;
 const fail = (reason, at) => ({ parseFailure: { reason, at } });
 const publicPiece = (p) => ({
@@ -681,8 +644,7 @@ class WordBuilder {
             this.carveBraceAndGlob();
         if (assignment !== undefined && this.subscript?.text)
             this.mark("subscript_text", this.subscript.rawStart);
-        const marks = this.marks.filter((m) => m.reason !== "subscript_text" || assignment?.subscript !== undefined)
-            .sort((a, b) => (UNRESOLVED_VIEW[a.reason] === UNRESOLVED_VIEW[b.reason] ? a.at - b.at : UNRESOLVED_VIEW[a.reason] === "refuse" ? -1 : 1));
+        const marks = this.marks.filter((m) => m.reason !== "subscript_text" || assignment?.subscript !== undefined).sort((a, b) => a.at - b.at);
         const unresolved = marks[0]?.reason ?? (assignment?.value.unresolved);
         const spans = [];
         for (let i = 0; i < this.rawQuoted.length; i++) {
@@ -709,9 +671,8 @@ class WordBuilder {
         };
     }
 }
-function scan(source, opts) {
-    const lenient = opts.mode === "lenient";
-    const split = opts.connectors !== "text";
+function scan(source, connectorsAreText) {
+    const split = !connectorsAreText;
     const segments = [{ start: 0, end: source.length, connector: "start", tokens: [], substitutions: [] }];
     const current = () => segments[segments.length - 1];
     const pendingHeredocs = [];
@@ -723,11 +684,14 @@ function scan(source, opts) {
     let regionAt = 0;
     let pendingLocale = false;
     let acceptable = true;
+    let timeGrammar;
+    let definitionName = false;
     let afterLeadingRedirect = false;
-    let wordsSoFar = 0;
+    let assignmentSeen = false;
+    let subscriptsClosed = false;
     let commandWord;
     let w = new WordBuilder();
-    const next = (j) => (lenient ? past(source, j + 1) : j + 1);
+    const next = (j) => past(source, j + 1);
     const quotedBy = () => (inSingle || inDouble ? regionBy : undefined);
     const take = (ch, src) => w.emit(ch, ch, quotedBy(), src, src + 1);
     const substitution = (from, to, body, kind) => {
@@ -735,6 +699,7 @@ function scan(source, opts) {
         w.opaque(source.slice(from, to), SUBSTITUTION_PLACEHOLDER, by, from, to, { kind, yields: kind === "command" && by === undefined ? "many" : "one", body });
         current().substitutions.push(body);
     };
+    const resetPosition = () => { acceptable = true; commandWord = undefined; afterLeadingRedirect = false; assignmentSeen = false; subscriptsClosed = false; timeGrammar = undefined; definitionName = false; };
     const endWord = () => {
         if (!w.started)
             return undefined;
@@ -751,48 +716,72 @@ function scan(source, opts) {
             const token = { kind: "heredoc", delimiter: word.folded, quoted: /["'\\]/.test(word.raw), body: "" };
             current().tokens.push(token);
             pendingHeredocs.push({ delimiter: word.folded, quoted: token.quoted, dash: header.dash, token });
-            if (wordsSoFar > 0)
-                acceptable = false;
-            else
-                afterLeadingRedirect = true;
+            if (acceptable) {
+                if (assignmentSeen)
+                    subscriptsClosed = true;
+                else
+                    afterLeadingRedirect = true;
+            }
             return undefined;
         }
         if (pendingRedirect !== undefined) {
-            const op = pendingRedirect;
+            const { op, fd } = pendingRedirect;
             pendingRedirect = undefined;
             const target = { ...word, atCommandPosition: false };
+            const written = fd !== undefined ? { fd } : {};
             if ((op === ">&" || op === "<&") && word.raw === word.folded && /^(?:\d+-?|-)$/.test(word.folded))
-                current().tokens.push({ kind: "redirect", op });
-            else
-                current().tokens.push({ kind: "redirect", op: op === ">&" ? "&>" : op === "<&" ? "<" : op, target });
-            if (wordsSoFar > 0)
-                acceptable = false;
+                current().tokens.push({ kind: "redirect", op, ...written, dup: word.folded });
             else
-                afterLeadingRedirect = true;
+                current().tokens.push({ kind: "redirect", op: op === ">&" ? "&>" : op === "<&" ? "<" : op, ...written, target });
+            if (acceptable) {
+                if (assignmentSeen)
+                    subscriptsClosed = true;
+                else
+                    afterLeadingRedirect = true;
+            }
             return undefined;
         }
         current().tokens.push(word);
-        if (acceptable && word.raw === word.folded && (SHELL_CONTROL_PREFIXES.has(word.folded) || GROUP_WORDS.has(word.folded)))
+        const bare = word.raw === word.folded;
+        if (definitionName) {
+            resetPosition();
+            return undefined;
+        }
+        if (acceptable && bare && word.folded === "function") {
+            acceptable = false;
+            definitionName = true;
             return undefined;
-        wordsSoFar++;
-        if (word.assignment !== undefined && word.assignment.bare && acceptable)
+        }
+        if (acceptable && bare && (SHELL_CONTROL_PREFIXES.has(word.folded) || GROUP_WORDS.has(word.folded))) {
+            timeGrammar = word.folded === "time" ? "opt" : undefined;
+            return undefined;
+        }
+        if (acceptable && bare && timeGrammar === "opt" && word.folded === "-p") {
+            timeGrammar = "ign";
+            return undefined;
+        }
+        if (acceptable && bare && timeGrammar !== undefined && word.folded === "--") {
+            timeGrammar = undefined;
             return undefined;
+        }
+        timeGrammar = undefined;
+        if (word.assignment !== undefined && word.assignment.bare && acceptable) {
+            assignmentSeen = true;
+            return undefined;
+        }
         if (acceptable)
-            commandWord = word.raw === word.folded ? word.folded : undefined;
+            commandWord = bare ? word.folded : undefined;
         acceptable = false;
         return undefined;
     };
     const operandOwed = (at) => pendingRedirect !== undefined ? fail("redirect_without_target", at) : pendingHeredoc !== undefined ? fail("heredoc_without_delimiter", at) : undefined;
-    const closeSegment = (connector, at, from) => {
+    const closeSegment = (connector, at, from, pipesStderr = false) => {
         const refusal = endWord() ?? operandOwed(at);
         if (refusal !== undefined)
             return refusal;
         current().end = at;
-        segments.push({ start: from, end: source.length, connector, tokens: [], substitutions: [] });
-        acceptable = true;
-        wordsSoFar = 0;
-        commandWord = undefined;
-        afterLeadingRedirect = false;
+        segments.push({ start: from, end: source.length, connector, ...(pipesStderr ? { pipesStderr: true } : {}), tokens: [], substitutions: [] });
+        resetPosition();
         return undefined;
     };
     const readHeredocBodies = (from) => {
@@ -826,7 +815,7 @@ function scan(source, opts) {
         return Math.min(p, source.length);
     };
     for (let i = 0; i < source.length; i++) {
-        if (lenient && !inSingle) {
+        if (!inSingle) {
             const j = past(source, i);
             if (j >= source.length)
                 break;
@@ -897,7 +886,7 @@ function scan(source, opts) {
             take(ch, i);
             continue;
         }
-        if (!inDouble && ch === "[" && w.started && w.subscript === undefined && !w.compound && acceptable && IDENTIFIER.test(w.raw)) {
+        if (!inDouble && ch === "[" && w.started && w.subscript === undefined && !w.compound && acceptable && !subscriptsClosed && IDENTIFIER.test(w.raw)) {
             w.subscript = { rawStart: w.raw.length, depth: 1, text: false };
             take(ch, i);
             continue;
@@ -926,250 +915,211 @@ function scan(source, opts) {
                 take(ch, i);
                 continue;
             }
-            if (!lenient) {
-                take(ch, i);
-                continue;
-            }
             if (ch === "\\" && source[i + 1] === "]")
                 sub.text = true;
         }
         if (w.inSubscript() && inDouble && ch === "]")
             w.subscript.text = true;
-        if (lenient) {
-            const n1 = next(i);
-            if (ch === "\\") {
-                const escaped = source[i + 1];
-                if (escaped === undefined) {
-                    take(ch, i);
-                    continue;
-                }
-                if (inDouble && !"$`\"\\".includes(escaped))
-                    w.emit(ch + escaped, ch + escaped, quotedBy(), i, i + 2);
-                else
-                    w.emit(ch + escaped, escaped, inDouble ? quotedBy() : "\\", i, i + 2);
-                i++;
-                continue;
-            }
-            if (ch === "`") {
-                const tick = backtickBody(source, i);
-                if (tick === undefined)
-                    return fail("unterminated_command_substitution", i);
-                substitution(i, tick.close + 1, tick.body, "command");
-                i = tick.close;
-                continue;
-            }
-            if (ch === "$" && source[n1] === "(") {
-                const arithmetic = source[next(n1)] === "(";
-                const end = parenBodyEnd(source, n1);
-                if (end === undefined)
-                    return fail("unterminated_command_substitution", i);
-                if (end === "unreadable")
-                    return fail("undelimited_substitution", i);
-                substitution(i, end, source.slice(n1 + 1, end - 1), arithmetic ? "arithmetic" : "command");
-                i = end - 1;
-                continue;
-            }
-            if (ch === "$" && source[n1] === "{") {
-                const end = braceExpansionEnd(source, n1);
-                if (end === undefined)
-                    return fail("unterminated_parameter_expansion", i);
-                const body = source.slice(n1 + 1, end - 1);
-                const text = source.slice(i, end);
-                const name = EXPANSION_NAME.exec(body)?.[1];
-                if (UNREADABLE_EXPANSION_TEXT.test(body))
-                    w.mark("parameter_text", w.raw.length);
-                w.opaque(text, text, quotedBy(), i, end, { kind: "parameter", yields: inDouble ? "one" : "many", body, ...(name !== undefined ? { name } : {}) });
-                i = end - 1;
-                continue;
-            }
-            if (ch === "$") {
-                const head = BARE_PARAMETER.exec(source.slice(n1, n1 + 64))?.[0];
-                if (head !== undefined) {
-                    const text = source.slice(i, n1 + head.length);
-                    w.opaque(text, text, quotedBy(), i, n1 + head.length, { kind: "parameter", yields: inDouble ? "one" : "many", name: head });
-                    i = n1 + head.length - 1;
-                    continue;
-                }
-            }
-            if (inDouble) {
+        const n1 = next(i);
+        if (ch === "\\") {
+            const escaped = source[i + 1];
+            if (escaped === undefined) {
                 take(ch, i);
                 continue;
             }
-            if ((ch === "<" || ch === ">") && source[n1] === "(") {
-                const end = parenBodyEnd(source, n1);
-                if (end === undefined)
-                    return fail("unterminated_process_substitution", i);
-                if (end === "unreadable")
-                    return fail("undelimited_substitution", i);
-                substitution(i, end, source.slice(n1 + 1, end - 1), "process");
-                i = end - 1;
-                continue;
-            }
-            if (ch === "(" && w.started && w.isAssignmentHead() && (acceptable || (commandWord !== undefined && COMPOUND_OPERAND_COMMANDS.has(commandWord)))) {
-                const end = matchedParen(source, i);
-                if (end === undefined)
-                    return fail("unterminated_compound_value", i);
-                const inner = scan(source.slice(i + 1, end - 1), { mode: "lenient", connectors: "text" });
-                if ("parseFailure" in inner)
-                    return fail(inner.parseFailure.reason, i + 1 + inner.parseFailure.at);
-                const text = source.slice(i, end);
-                w.mark("compound_array_value", w.raw.length);
-                w.opaque(text, text, undefined, i, end, undefined);
-                w.compound = true;
-                current().substitutions.push(...inner.command.substitutions);
-                i = end - 1;
+            if (inDouble && !"$`\"\\".includes(escaped))
+                w.emit(ch + escaped, ch + escaped, quotedBy(), i, i + 2);
+            else
+                w.emit(ch + escaped, escaped, inDouble ? quotedBy() : "\\", i, i + 2);
+            i++;
+            continue;
+        }
+        if (ch === "`") {
+            const tick = backtickBody(source, i);
+            if (tick === undefined)
+                return fail("unterminated_command_substitution", i);
+            substitution(i, tick.close + 1, tick.body, "command");
+            i = tick.close;
+            continue;
+        }
+        if (ch === "$" && source[n1] === "(") {
+            const arithmetic = source[next(n1)] === "(";
+            const end = parenBodyEnd(source, n1);
+            if (end === undefined)
+                return fail("unterminated_command_substitution", i);
+            if (end === "unreadable")
+                return fail("undelimited_substitution", i);
+            substitution(i, end, source.slice(n1 + 1, end - 1), arithmetic ? "arithmetic" : "command");
+            i = end - 1;
+            continue;
+        }
+        if (ch === "$" && source[n1] === "{") {
+            const end = braceExpansionEnd(source, n1);
+            if (end === undefined)
+                return fail("unterminated_parameter_expansion", i);
+            const body = source.slice(n1 + 1, end - 1);
+            const text = source.slice(i, end);
+            const name = EXPANSION_NAME.exec(body)?.[1];
+            if (UNREADABLE_EXPANSION_TEXT.test(body))
+                w.mark("parameter_text", w.raw.length);
+            w.opaque(text, text, quotedBy(), i, end, { kind: "parameter", yields: inDouble ? "one" : "many", body, ...(name !== undefined ? { name } : {}) });
+            i = end - 1;
+            continue;
+        }
+        if (ch === "$") {
+            const head = BARE_PARAMETER.exec(source.slice(n1, n1 + 64))?.[0];
+            if (head !== undefined) {
+                const text = source.slice(i, n1 + head.length);
+                w.opaque(text, text, quotedBy(), i, n1 + head.length, { kind: "parameter", yields: inDouble ? "one" : "many", name: head });
+                i = n1 + head.length - 1;
                 continue;
             }
-            if (w.inSubscript()) {
-                take(ch, i);
+        }
+        if (inDouble) {
+            take(ch, i);
+            continue;
+        }
+        if ((ch === "<" || ch === ">") && source[n1] === "(") {
+            const end = parenBodyEnd(source, n1);
+            if (end === undefined)
+                return fail("unterminated_process_substitution", i);
+            if (end === "unreadable")
+                return fail("undelimited_substitution", i);
+            substitution(i, end, source.slice(n1 + 1, end - 1), "process");
+            i = end - 1;
+            continue;
+        }
+        if (ch === "(" && w.started && w.isAssignmentHead() && (acceptable || (commandWord !== undefined && COMPOUND_OPERAND_COMMANDS.has(commandWord)))) {
+            const end = matchedParen(source, i);
+            if (end === undefined)
+                return fail("unterminated_compound_value", i);
+            const inner = scan(source.slice(i + 1, end - 1), true);
+            if ("parseFailure" in inner)
+                return fail(inner.parseFailure.reason, i + 1 + inner.parseFailure.at);
+            const text = source.slice(i, end);
+            w.mark("compound_array_value", w.raw.length);
+            w.opaque(text, text, undefined, i, end, undefined);
+            w.compound = true;
+            current().substitutions.push(...inner.command.substitutions);
+            i = end - 1;
+            continue;
+        }
+        if (w.inSubscript()) {
+            take(ch, i);
+            continue;
+        }
+        if (ch === "#" && !w.started) {
+            const nl = source.indexOf("\n", i);
+            i = nl < 0 ? source.length : nl - 1;
+            continue;
+        }
+        if (ch === "\n") {
+            if (!split) {
+                const r = endWord();
+                if (r !== undefined)
+                    return r;
                 continue;
             }
-            if (ch === "#" && !w.started) {
-                const nl = source.indexOf("\n", i);
-                i = nl < 0 ? source.length : nl - 1;
-                continue;
+            const refusal = closeSegment("\n", i, i + 1);
+            if (refusal !== undefined)
+                return refusal;
+            if (pendingHeredocs.length > 0) {
+                const resume = readHeredocBodies(i + 1);
+                if (typeof resume !== "number")
+                    return resume;
+                current().start = resume;
+                i = resume - 1;
             }
-            if (ch === "\n") {
-                if (!split) {
-                    const r = endWord();
-                    if (r !== undefined)
-                        return r;
-                    continue;
-                }
-                const refusal = closeSegment("\n", i, i + 1);
-                if (refusal !== undefined)
-                    return refusal;
-                if (pendingHeredocs.length > 0) {
-                    const resume = readHeredocBodies(i + 1);
-                    if (typeof resume !== "number")
-                        return resume;
-                    current().start = resume;
-                    i = resume - 1;
-                }
-                continue;
+            continue;
+        }
+        if (ch === "(" || ch === ")") {
+            const r = endWord() ?? operandOwed(i);
+            if (r !== undefined)
+                return r;
+            current().tokens.push({ kind: "group", op: ch });
+            resetPosition();
+            continue;
+        }
+        if (ch === "<" || ch === ">" || (ch === "&" && source[n1] === ">")) {
+            let fd;
+            if (ch !== "&" && w.started && w.raw === w.folded && /^\d+$/.test(w.raw)) {
+                fd = Number(w.raw);
+                w = new WordBuilder();
             }
-            if (ch === "(" || ch === ")") {
+            else {
                 const r = endWord() ?? operandOwed(i);
                 if (r !== undefined)
                     return r;
-                current().tokens.push({ kind: "group", op: ch });
-                acceptable = true;
-                wordsSoFar = 0;
-                commandWord = undefined;
-                afterLeadingRedirect = false;
-                continue;
             }
-            if (ch === "<" || ch === ">" || (ch === "&" && source[n1] === ">")) {
-                if (ch !== "&" && w.started && w.raw === w.folded && /^\d+$/.test(w.raw))
-                    w = new WordBuilder();
-                else {
-                    const r = endWord() ?? operandOwed(i);
-                    if (r !== undefined)
-                        return r;
-                }
-                const n2 = next(n1);
-                if (ch === "&") {
-                    if (source[n2] === ">") {
-                        pendingRedirect = "&>>";
-                        i = n2;
-                    }
-                    else {
-                        pendingRedirect = "&>";
-                        i = n1;
-                    }
-                    continue;
-                }
-                if (ch === "<" && source[n1] === "<") {
-                    if (source[n2] === "<") {
-                        pendingRedirect = "<<<";
-                        i = n2;
-                        continue;
-                    }
-                    const dash = source[n2] === "-";
-                    pendingHeredoc = { dash };
-                    i = dash ? n2 : n1;
-                    continue;
-                }
-                if (source[n1] === "&") {
-                    pendingRedirect = ch === ">" ? ">&" : "<&";
-                    i = n1;
-                    continue;
+            const written = fd !== undefined ? { fd } : {};
+            const n2 = next(n1);
+            if (ch === "&") {
+                if (source[n2] === ">") {
+                    pendingRedirect = { op: "&>>" };
+                    i = n2;
                 }
-                if (ch === ">" && (source[n1] === ">" || source[n1] === "|")) {
-                    pendingRedirect = source[n1] === ">" ? ">>" : ">";
+                else {
+                    pendingRedirect = { op: "&>" };
                     i = n1;
-                    continue;
                 }
-                pendingRedirect = ch;
                 continue;
             }
-            if (split) {
-                let refusal;
-                if (ch === ";")
-                    refusal = closeSegment(";", i, i + 1);
-                else if (ch === "&") {
-                    if (source[n1] === "&") {
-                        refusal = closeSegment("&&", i, n1 + 1);
-                        i = n1;
-                    }
-                    else
-                        refusal = closeSegment("&", i, i + 1);
-                }
-                else if (ch === "|") {
-                    if (source[n1] === "|" || source[n1] === "&") {
-                        refusal = closeSegment(source[n1] === "|" ? "||" : "|", i, n1 + 1);
-                        i = n1;
-                    }
-                    else
-                        refusal = closeSegment("|", i, i + 1);
-                }
-                else if (BLANK.test(ch)) {
-                    refusal = endWord();
-                }
-                else {
-                    take(ch, i);
+            if (ch === "<" && source[n1] === "<") {
+                if (source[n2] === "<") {
+                    pendingRedirect = { op: "<<<", ...written };
+                    i = n2;
                     continue;
                 }
-                if (refusal !== undefined)
-                    return refusal;
+                const dash = source[n2] === "-";
+                pendingHeredoc = { dash };
+                i = dash ? n2 : n1;
                 continue;
             }
-            if (BLANK.test(ch)) {
-                const r = endWord();
-                if (r !== undefined)
-                    return r;
+            if (source[n1] === "&") {
+                pendingRedirect = { op: ch === ">" ? ">&" : "<&", ...written };
+                i = n1;
                 continue;
             }
-            take(ch, i);
+            if (ch === ">" && (source[n1] === ">" || source[n1] === "|")) {
+                pendingRedirect = { op: source[n1] === ">" ? ">>" : ">", ...written };
+                i = n1;
+                continue;
+            }
+            pendingRedirect = { op: ch, ...written };
             continue;
         }
-        if (!inDouble && split) {
-            if (ch === "&") {
-                if (source[i + 1] !== "&")
-                    return fail("background_operator", i);
-                const r = closeSegment("&&", i, i + 2);
-                if (r !== undefined)
-                    return r;
-                i++;
-                continue;
+        if (split) {
+            let refusal;
+            if (ch === ";")
+                refusal = closeSegment(";", i, i + 1);
+            else if (ch === "&") {
+                if (source[n1] === "&") {
+                    refusal = closeSegment("&&", i, n1 + 1);
+                    i = n1;
+                }
+                else
+                    refusal = closeSegment("&", i, i + 1);
             }
-            if (ch === "|") {
-                const double = source[i + 1] === "|";
-                const r = closeSegment(double ? "||" : "|", i, double ? i + 2 : i + 1);
-                if (r !== undefined)
-                    return r;
-                if (double)
-                    i++;
-                continue;
+            else if (ch === "|") {
+                if (source[n1] === "|" || source[n1] === "&") {
+                    refusal = closeSegment(source[n1] === "|" ? "||" : "|", i, n1 + 1, source[n1] === "&");
+                    i = n1;
+                }
+                else
+                    refusal = closeSegment("|", i, i + 1);
             }
-            if (ch === ";") {
-                const r = closeSegment(";", i, i + 1);
-                if (r !== undefined)
-                    return r;
+            else if (BLANK.test(ch)) {
+                refusal = endWord();
+            }
+            else {
+                take(ch, i);
                 continue;
             }
+            if (refusal !== undefined)
+                return refusal;
+            continue;
         }
-        if (!inDouble && WHITESPACE.test(ch)) {
+        if (BLANK.test(ch)) {
             const r = endWord();
             if (r !== undefined)
                 return r;
@@ -1189,23 +1139,24 @@ function scan(source, opts) {
     const out = segments.map((s) => ({
         text: source.slice(s.start, s.end),
         connector: s.connector,
+        ...(s.pipesStderr ? { pipesStderr: true } : {}),
         tokens: s.tokens,
         substitutions: s.substitutions,
     }));
     return { command: { segments: out, substitutions: out.flatMap((s) => s.substitutions) } };
 }
-export function lexShell(source, opts) {
-    const pass = scan(source, opts);
+export function lexShell(source) {
+    const pass = scan(source, false);
     return "parseFailure" in pass ? pass : pass.command;
 }
-export function lexShellText(source, opts) {
-    const lexed = lexShell(source, opts);
+export function lexShellText(source) {
+    const lexed = lexShell(source);
     if ("parseFailure" in lexed)
         return { reject: PARSE_FAILURE_SENTENCE[lexed.parseFailure.reason] };
     for (const segment of lexed.segments) {
         for (const token of segment.tokens) {
             const word = token.kind === "word" ? token : token.kind === "redirect" ? token.target : undefined;
-            if (word?.unresolved !== undefined && UNRESOLVED_VIEW[word.unresolved] === "refuse")
+            if (word?.unresolved !== undefined)
                 return { reject: UNRESOLVED_SENTENCE[word.unresolved] };
         }
     }
@@ -1236,6 +1187,8 @@ export function bashOnlyConstructsOf(command) {
         }
     };
     for (const segment of command.segments) {
+        if (segment.pipesStderr)
+            found.add("pipe_both");
         for (const t of segment.tokens) {
             if (t.kind === "word")
                 word(t);