fauxnix-cli 0.11.0 → 0.12.0

package/dist/commands/text-filters.js

@@ -3,7 +3,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { FauxnixParseError, wordToString } from '../ast.js';
 import { parseWords, psStr } from '../registry.js';
-import { argListExpr, exprOfWord, literalOfWord, operandExpr } from '../translator.js';
+import { argListExpr, exprOfWord, literalOfWord, operandExpr, PURE_SED_FILE_MESSAGE, } from '../translator.js';
 /* ------------------------------------------------------------------ */
 /* Shared PS snippets (same shape as files.ts)                         */
 /* ------------------------------------------------------------------ */
@@ -981,7 +981,7 @@ function parseSedScript(src, isEre) {
     }
     return out;
 }
-const sed = (args) => {
+const sed = (args, ctx) => {
     // custom argv parse: -i takes an ATTACHED suffix; -e/-f take attached or next
     const raw = args.map((w) => wordToString(w));
     let noPrint = false;
@@ -1030,6 +1030,9 @@ const sed = (args) => {
                         throw new FauxnixParseError('fauxnix: sed -' + ch + ' requires an argument');
                     }
                     if (ch === 'f') {
+                        if (ctx.translationMode === 'pure') {
+                            throw new FauxnixParseError(PURE_SED_FILE_MESSAGE);
+                        }
                         try {
                             val = readFileSync(nodePathOf(val), 'utf8');
                         }
@@ -1775,20 +1778,42 @@ const awk = (args) => {
     const { values, operandWords } = parseWords(args, ['F', 'v']);
     // -v may repeat; collect all of them
     const vvars = [];
+    const addVVar = (nv) => {
+        const eq = nv.indexOf('=');
+        if (eq < 1) {
+            throw new FauxnixParseError("fauxnix: awk invalid -v assignment '" + nv + "'");
+        }
+        const name = nv.slice(0, eq);
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+            throw new FauxnixParseError("fauxnix: awk invalid variable name '" + name + "'");
+        }
+        vvars.push([name, nv.slice(eq + 1)]);
+    };
+    let onlyOperands = false;
     for (let i = 0; i < args.length; i++) {
         const t = wordToString(args[i]);
-        if (t === '-v' && i + 1 < args.length) {
-            const nv = wordToString(args[i + 1]);
-            const eq = nv.indexOf('=');
-            if (eq > 0)
-                vvars.push([nv.slice(0, eq), nv.slice(eq + 1)]);
+        if (t === '--') {
+            onlyOperands = true;
+            continue;
+        }
+        if (onlyOperands)
+            continue;
+        if (t === '-F') {
+            if (i + 1 < args.length)
+                i++;
+            continue;
+        }
+        if (t.startsWith('-F') && t.length > 2)
+            continue;
+        if (t === '-v') {
+            if (i + 1 >= args.length) {
+                throw new FauxnixParseError('fauxnix: awk -v requires an argument');
+            }
+            addVVar(wordToString(args[i + 1]));
             i++;
         }
         else if (t.startsWith('-v') && t.length > 2) {
-            const nv = t.slice(2);
-            const eq = nv.indexOf('=');
-            if (eq > 0)
-                vvars.push([nv.slice(0, eq), nv.slice(eq + 1)]);
+            addVVar(t.slice(2));
         }
     }
     if (operandWords.length === 0) {

package/dist/commands/text-io.js

@@ -523,6 +523,20 @@ const head = (args, ctx) => {
 /* ------------------------------------------------------------------ */
 /* tail                                                                */
 /* ------------------------------------------------------------------ */
+/** A count embedded in generated PS must be a canonical Int32 literal. */
+function tailCountLiteral(raw) {
+    if (!/^[+-]?\d+$/.test(raw))
+        return null;
+    try {
+        const n = BigInt(raw.replace(/^[+-]/, ''));
+        if (n > 2147483647n)
+            return null;
+        return n.toString();
+    }
+    catch {
+        return null;
+    }
+}
 const tail = (args, ctx) => {
     const pre = parseWords(args);
     if (pre.flags.has('f') || pre.flags.has('F')) {
@@ -533,9 +547,35 @@ const tail = (args, ctx) => {
     let nLines = null;
     let fromLine = null;
     let nBytes = null;
+    let fromByte = false;
     const operandWords = [];
     let quiet = false;
     let verbose = false;
+    const setCount = (kind, raw) => {
+        const literal = tailCountLiteral(raw);
+        if (literal === null) {
+            return psErrExpr(psStr("tail: invalid number of " + kind + ": '" + raw + "'"));
+        }
+        if (kind === 'bytes') {
+            nBytes = literal;
+            fromByte = raw.startsWith('+');
+            nLines = null;
+            fromLine = null;
+        }
+        else {
+            nBytes = null;
+            fromByte = false;
+            if (raw.startsWith('+')) {
+                fromLine = literal;
+                nLines = null;
+            }
+            else {
+                nLines = literal;
+                fromLine = null;
+            }
+        }
+        return null;
+    };
     {
         let i = 0;
         let onlyOps = false;
@@ -567,12 +607,9 @@ const tail = (args, ctx) => {
                     else {
                         i++;
                     }
-                    if (name === '--bytes')
-                        nBytes = val;
-                    else if (val.startsWith('+'))
-                        fromLine = val.slice(1);
-                    else
-                        nLines = val.replace(/^-/, '');
+                    const err = setCount(name === '--bytes' ? 'bytes' : 'lines', val);
+                    if (err !== null)
+                        return err;
                     continue;
                 }
                 if (name === '--quiet' || name === '--silent') {
@@ -589,49 +626,45 @@ const tail = (args, ctx) => {
                 continue;
             }
             let m;
-            if (t === '-n' || t === '-c') {
-                const val = i + 1 < args.length ? wordToString(args[i + 1]) : null;
-                if (val === null) {
-                    return psErrExpr(psStr('tail: option requires an argument -- ' + t.slice(1)));
-                }
-                if (t === '-c')
-                    nBytes = val;
-                else if (val.startsWith('+'))
-                    fromLine = val.slice(1);
-                else
-                    nLines = val.replace(/^-/, ''); // -n -N ≡ -n N (last N)
-                i += 2;
-                continue;
-            }
-            if ((m = t.match(/^-[nc](.*)$/)) !== null) {
-                const val = m[1];
-                if (t[1] === 'c')
-                    nBytes = val;
-                else if (val.startsWith('+'))
-                    fromLine = val.slice(1);
-                else
-                    nLines = val.replace(/^-/, '');
-                i++;
-                continue;
-            }
             if ((m = t.match(/^-(\d+)$/)) !== null) {
-                nLines = m[1];
+                const err = setCount('lines', t);
+                if (err !== null)
+                    return err;
                 i++;
                 continue;
             }
             if ((m = t.match(/^\+(\d+)$/)) !== null) {
-                fromLine = m[1];
+                const err = setCount('lines', t);
+                if (err !== null)
+                    return err;
                 i++;
                 continue;
             }
             if (t.startsWith('-') && t.length > 1) {
-                for (const ch of t.slice(1)) {
+                const body = t.slice(1);
+                let usedNext = false;
+                for (let c = 0; c < body.length; c++) {
+                    const ch = body[c];
                     if (ch === 'q')
                         quiet = true;
                     else if (ch === 'v')
                         verbose = true;
+                    else if (ch === 'n' || ch === 'c') {
+                        let val = body.slice(c + 1);
+                        if (val === '') {
+                            if (i + 1 >= args.length) {
+                                return psErrExpr(psStr('tail: option requires an argument -- ' + ch));
+                            }
+                            val = wordToString(args[i + 1]);
+                            usedNext = true;
+                        }
+                        const err = setCount(ch === 'c' ? 'bytes' : 'lines', val);
+                        if (err !== null)
+                            return err;
+                        break;
+                    }
                 }
-                i++;
+                i += usedNext ? 2 : 1;
                 continue;
             }
             operandWords.push(args[i]);
@@ -639,13 +672,7 @@ const tail = (args, ctx) => {
         }
     }
     const bytesMode = nBytes !== null;
-    const countLit = bytesMode
-        ? nBytes
-        : fromLine !== null
-            ? fromLine
-            : nLines !== null
-                ? nLines
-                : '10';
+    const countLit = bytesMode ? nBytes : fromLine ?? nLines ?? '10';
     const lines = [
         PS_GLOB_FN,
         PS_READTEXT_FN,
@@ -659,7 +686,9 @@ const tail = (args, ctx) => {
         lines.push(STDIN_INLINES);
     lines.push(...psCollectFiles(operandWords, (g) => qErr('tail', g, 'No such file or directory'), (g) => qErr('tail', g, 'Is a directory', 'error reading ')), '$fx_count = [int](' + countLit + ')', '$fx_from = ' + pb(fromLine !== null && !bytesMode), '$fx_hdr = ((($fx_srcs.Count -gt 1) -and ' + pb(!quiet) + ') -or ' + pb(verbose) + ')', '$fx_first = $true');
     if (bytesMode) {
-        lines.push('$fx_out = New-Object System.Text.StringBuilder', 'for ($fx_k = 0; $fx_k -lt $fx_srcs.Count; $fx_k++) {', '  $fx_g = $fx_srcs[$fx_k]', "  if ($fx_g -eq '-') { $fx_txt = (fx-stdinraw $fx_items); $fx_disp = 'standard input' }", '  else { $fx_txt = fx-read $fx_g; $fx_disp = $fx_names[$fx_k] }', '  if ($fx_hdr) {', '    if (-not $fx_first) { [void]$fx_out.Append([string][char]10) }', "    [void]$fx_out.Append('==> ' + $fx_disp + ' <==' + [string][char]10)", '  }', '  $fx_first = $false', '  $fx_st = $fx_txt.Length - $fx_count', '  if ($fx_st -lt 0) { $fx_st = 0 }', '  if ($fx_st -lt $fx_txt.Length) { [void]$fx_out.Append($fx_txt.Substring($fx_st)) }', '}', 'fx-write $fx_out.ToString() $fx_term');
+        lines.push('$fx_out = New-Object System.Text.StringBuilder', 'for ($fx_k = 0; $fx_k -lt $fx_srcs.Count; $fx_k++) {', '  $fx_g = $fx_srcs[$fx_k]', "  if ($fx_g -eq '-') { $fx_txt = (fx-stdinraw $fx_items); $fx_disp = 'standard input' }", '  else { $fx_txt = fx-read $fx_g; $fx_disp = $fx_names[$fx_k] }', '  if ($fx_hdr) {', '    if (-not $fx_first) { [void]$fx_out.Append([string][char]10) }', "    [void]$fx_out.Append('==> ' + $fx_disp + ' <==' + [string][char]10)", '  }', '  $fx_first = $false', fromByte
+            ? '  $fx_st = $fx_count - 1'
+            : '  $fx_st = $fx_txt.Length - $fx_count', '  if ($fx_st -lt 0) { $fx_st = 0 }', '  if ($fx_st -lt $fx_txt.Length) { [void]$fx_out.Append($fx_txt.Substring($fx_st)) }', '}', 'fx-write $fx_out.ToString() $fx_term');
     }
     else {
         lines.push('for ($fx_k = 0; $fx_k -lt $fx_srcs.Count; $fx_k++) {', '  $fx_g = $fx_srcs[$fx_k]', "  if ($fx_g -eq '-') { $fx_ls = @($fx_in); $fx_disp = 'standard input' }", '  else { $fx_ls = @(fx-splitlines (fx-read $fx_g)); $fx_disp = $fx_names[$fx_k] }', '  if ($fx_hdr) {', "    if (-not $fx_first) { '' }", "    '==> ' + $fx_disp + ' <=='", '  }', '  $fx_first = $false', '  if ($fx_from) {', '    $fx_st = $fx_count - 1', '    if ($fx_st -lt 0) { $fx_st = 0 }', '  } else {', '    $fx_st = $fx_ls.Count - $fx_count', '    if ($fx_st -lt 0) { $fx_st = 0 }', '  }', '  for ($fx_i = $fx_st; $fx_i -lt $fx_ls.Count; $fx_i++) { $fx_ls[$fx_i] }', '}');

package/dist/doctor.d.ts

@@ -18,3 +18,4 @@ export declare function hasCodexFauxnix(text: string): boolean;
 export declare function hasOpenCodeFauxnix(data: unknown): boolean;
 export declare function isServerMap(value: unknown): boolean;
 export declare function serverMapHasFauxnix(value: unknown): boolean;
+export declare function fauxnixServerNames(value: unknown): string[];

package/dist/doctor.js

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
+import { resolveQwenLaunchTuple, sameQwenLaunchTuple } from './qwen-launch.js';
 const VALUE_INDENT = '             ';
 export async function collectDoctorReport(opts = {}) {
     const home = opts.home ?? homedir();
@@ -13,6 +14,7 @@ export async function collectDoctorReport(opts = {}) {
     lines.push(field('claude', detectClaude(home, cwd, env)));
     lines.push(field('codex', detectCodex(home, env)));
     lines.push(field('opencode', detectOpenCode(home, env)));
+    lines.push(field('qwen', detectQwen(home)));
     lines.push('');
     const mcp = await mcpLines(nodeVersion, opts.loadMcp);
     lines.push(...mcp.lines);
@@ -159,6 +161,41 @@ function detectOpenCode(home, env) {
         return `fauxnix MCP configured (${path})`;
     return `found ${path}, fauxnix MCP not listed — add mcp.fauxnix (see README)`;
 }
+function detectQwen(home) {
+    const path = join(home, '.qwen', 'settings.json');
+    if (!existsSync(path))
+        return 'not detected — see README';
+    const text = readText(path);
+    if (text === undefined)
+        return `found ${path} (unreadable) — see README`;
+    let data;
+    try {
+        data = JSON.parse(stripBom(text));
+    }
+    catch {
+        return `found ${path} (unreadable JSON) — see README`;
+    }
+    if (!data || typeof data !== 'object' || Array.isArray(data)) {
+        return `found ${path} (not a JSON object) — see README`;
+    }
+    const servers = data.mcpServers;
+    if (!isServerMap(servers)) {
+        return `found ${path}, fauxnix MCP not listed — run: fauxnix install --qwen`;
+    }
+    const extraNames = fauxnixServerNames(servers).filter((name) => name !== 'fauxnix');
+    if (extraNames.length) {
+        return `found ${path}, additional fauxnix MCP entries (${extraNames.join(', ')}) — remove them, then run: fauxnix install --qwen`;
+    }
+    const config = servers.fauxnix;
+    const expected = resolveQwenLaunchTuple();
+    if (expected.ok && sameQwenLaunchTuple(config, expected.value)) {
+        return `fauxnix MCP configured with an absolute launcher (${path})`;
+    }
+    if (config != null || serverMapHasFauxnix(servers)) {
+        return `found ${path}, fauxnix MCP launcher does not match this installation — run: fauxnix install --qwen`;
+    }
+    return `found ${path}, fauxnix MCP not listed — run: fauxnix install --qwen`;
+}
 export function hasOpenCodeFauxnix(data) {
     if (!data || typeof data !== 'object' || Array.isArray(data))
         return false;
@@ -174,15 +211,19 @@ export function isServerMap(value) {
     return !!value && typeof value === 'object' && !Array.isArray(value);
 }
 export function serverMapHasFauxnix(value) {
+    return fauxnixServerNames(value).length > 0;
+}
+export function fauxnixServerNames(value) {
     if (!isServerMap(value))
-        return false;
+        return [];
+    const names = [];
     for (const [name, cfg] of Object.entries(value)) {
         if (name === 'servers')
             continue;
         if (looksLikeFauxnixServer(name, cfg))
-            return true;
+            names.push(name);
     }
-    return false;
+    return names;
 }
 function looksLikeFauxnixServer(name, cfg) {
     if (/^fauxnix(-cli)?$/i.test(name))

package/dist/errors.js

@@ -43,7 +43,7 @@ function unescapeClixml(t) {
         .trim();
 }
 /**
- * When stderr is redirected, powershell.exe serializes error records as
+ * When stderr is redirected, PowerShell can serialize error records as
  * CLIXML (`#< CLIXML` + XML). Unwrap the real message lines and drop
  * progress records, so agents see plain bash-style text.
  */
@@ -76,8 +76,10 @@ export function normalizeStderr(stderr) {
         let m = line.match(/^The term '(.+?)' is not recognized/);
         if (m)
             return commandNotFound(m[1]);
-        // zh-CN: 无法将"x"项识别为 cmdlet、函数、脚本文件或可运行程序的名称
-        m = line.match(/^无法将["'”]?([^"'”]+)["'”]?项识别为/);
+        // zh-CN: & : 无法将“x”项识别为 cmdlet、函数、脚本文件或可运行程序的名称。
+        // Require the PowerShell-specific suffix so ordinary Chinese prose that
+        // happens to contain “无法将…项识别为” is not rewritten.
+        m = line.match(/^(?:\S+\s*:\s*)?无法将[“"'‘]?(.+?)[”"'’]?项识别为\s*cmdlet、函数、脚本文件或可运行程序的名称(?:。|$)/);
         if (m)
             return commandNotFound(m[1]);
         // "x : The term 'y' is not recognized ..." (with source prefix)
@@ -94,18 +96,26 @@ export function normalizeStderr(stderr) {
                 ': No such file or directory');
         }
         // zh-CN: "Get-Content : 找不到路径“X”，因为该路径不存在。"
-        m = line.match(/^(\S+)\s*:\s*找不到路径[“'"](.+?)[”'"]，因为该路径不存在\.?$/);
+        m = line.match(/^(\S+)\s*:\s*找不到路径[“"'‘](.+?)[”"'’]，因为该路径不存在[。.]?$/);
         if (m) {
             return m[1].toLowerCase() + ': ' + m[2].replace(/\\/g, '/') + ': No such file or directory';
         }
         // "cat : Cannot find drive. A drive with the name 'z' does not exist."
         m = line.match(/^(\S+)\s*:\s*Cannot find drive\..*name '(.+?)'.*$/);
+        if (m)
+            return m[1].toLowerCase() + ': ' + m[2] + ': No such file or directory';
+        // zh-CN: "Get-Content : 找不到驱动器。名为“Z”的驱动器不存在。"
+        m = line.match(/^(\S+)\s*:\s*找不到驱动器[。.]\s*名为[“"'‘](.+?)[”"'’]的驱动器不存在[。.]?$/);
         if (m)
             return m[1].toLowerCase() + ': ' + m[2] + ': No such file or directory';
         // "rm : Cannot remove item ... Access is denied"
         m = line.match(/^(\S+)\s*:\s*(.*)Access to the path '(.+?)' is denied\.?$/);
         if (m)
             return m[1].toLowerCase() + ': cannot remove \'' + m[3] + '\': Permission denied';
+        // zh-CN: "rm : 对路径“C:\\protected”的访问被拒绝。"
+        m = line.match(/^(\S+)\s*:\s*对路径[“"'‘](.+?)[”"'’]的访问被拒绝[。.]?$/);
+        if (m)
+            return m[1].toLowerCase() + ': cannot remove \'' + m[2] + '\': Permission denied';
         // leftover PS not-recognized lines that the rewrites above did not catch
         if (/\.sh'?/.test(line) && /is not recognized/.test(line)) {
             return line + SH_SCRIPT_WINDOWS_HINT;

package/dist/executor.d.ts

@@ -29,12 +29,15 @@ export declare class FauxnixSession {
     private hostFile;
     private host;
     private lifecycleLock;
+    /** True once `env` was loaded from the host's complete environment snapshot. */
+    private hasEnvSnapshot;
+    private readonly powerShell;
     constructor();
     private bindFiles;
     private withLock;
     private syncFromDisk;
     private ensureHost;
-    /** Boot powershell.exe now so the first run() is not the 1.1s cold start. */
+    /** Boot the selected PowerShell now so the first run() is not a cold start. */
     prewarm(): Promise<void>;
     dispose(): Promise<void>;
     /** Kill the host and re-prewarm the same session object (no second FauxnixSession). */