fauxnix-cli 0.9.1 → 0.9.3

package/dist/translator.js

@@ -1,6 +1,7 @@
 import { FauxnixParseError, isUnquotedLiteral, } from './ast.js';
 import { parseCommand } from './parser.js';
 import { lookup, psStr } from './registry.js';
+import { PYTHON3_WINDOWS_HINT, SH_SCRIPT_WINDOWS_HINT } from './errors.js';
 /* ------------------------------------------------------------------ */
 /* Variable mapping                                                    */
 /* ------------------------------------------------------------------ */
@@ -393,7 +394,6 @@ export function translateSimple(cmd, position, hasStdin) {
     const nameSplat = splatSpec(cmd.name);
     let body;
     if (nameSplat) {
-        const invoke = '& $fx_cmd @fx_na';
         const hasAffix = !!(nameSplat.prefix || nameSplat.suffix);
         const promoted = cmd.args.length === 0
             ? ''
@@ -419,9 +419,7 @@ export function translateSimple(cmd, position, hasStdin) {
         emptyCmdLines.push('if ($fx_cw.Count -eq 0) {', 
         // No words left → bash null command (exit 0). Remaining words are
         // known at compile time, so reuse translateSimple (handlers, not `&`).
-        promoted ? indentBlock(promoted) : '  ', '} else {', '  $fx_na = [object[]]@(' + argListExpr(cmd.args) + ')', '  $fx_cmd = [string]$fx_cw[0]', '  if ($fx_cw.Count -gt 1) { $fx_na = @($fx_cw[1..($fx_cw.Count - 1)]) + $fx_na }', '  ' +
-            (hasStdin ? '($input | ' + invoke + ')' : invoke) +
-            ' | ForEach-Object { [string]$_ }', '  if ($LASTEXITCODE -gt 0) { $script:fx_exit = $LASTEXITCODE } elseif ($LASTEXITCODE -lt 0) { $script:fx_exit = 1 }', '}');
+        promoted ? indentBlock(promoted) : '  ', '} else {', '  $fx_na = [object[]](' + argListExpr(cmd.args) + ')', '  $fx_cmd = [string]$fx_cw[0]', '  if ($fx_cw.Count -gt 1) { $fx_na = [object[]](@($fx_cw[1..($fx_cw.Count - 1)]) + $fx_na) }', '  ' + (hasStdin ? '($input | fx-native $fx_cmd $fx_na)' : 'fx-native $fx_cmd $fx_na'), '}');
         body = emptyCmdLines.join('\n');
     }
     else if (nameLit !== null) {
@@ -431,26 +429,23 @@ export function translateSimple(cmd, position, hasStdin) {
         }
         else {
             // passthrough: native command (git, node, npm, python, cargo, ...)
-            // invoked with the call operator and an argv-style argument array —
-            // no string re-parsing of user text.
+            // via fx-native (Win32 command line + Process). `& name @array` on
+            // PS 5.1 drops empty argv entries and eats embedded quotes.
             const nameExpr = psStr(nameLit);
-            const invoke = '& ' + nameExpr + ' @fx_na';
+            const invoke = 'fx-native ' + nameExpr + ' $fx_na';
             body = [
-                '$fx_na = ' + argListExpr(cmd.args),
-                // feed pipeline stdin into the native process when we are a non-first stage
-                (hasStdin ? '($input | ' + invoke + ')' : invoke) + ' | ForEach-Object { [string]$_ }',
-                'if ($LASTEXITCODE -gt 0) { $script:fx_exit = $LASTEXITCODE } elseif ($LASTEXITCODE -lt 0) { $script:fx_exit = 1 }',
+                '$fx_na = [object[]](' + argListExpr(cmd.args) + ')',
+                (hasStdin ? '($input | ' + invoke + ')' : invoke),
             ].join('\n');
         }
     }
     else {
         // dynamic command name — evaluate it
         const nameExpr = exprOfWord(cmd.name);
-        const invoke = '& (' + nameExpr + ') @fx_na';
+        const invoke = 'fx-native (' + nameExpr + ') $fx_na';
         body = [
-            '$fx_na = ' + argListExpr(cmd.args),
-            (hasStdin ? '($input | ' + invoke + ')' : invoke) + ' | ForEach-Object { [string]$_ }',
-            'if ($LASTEXITCODE -gt 0) { $script:fx_exit = $LASTEXITCODE } elseif ($LASTEXITCODE -lt 0) { $script:fx_exit = 1 }',
+            '$fx_na = [object[]](' + argListExpr(cmd.args) + ')',
+            (hasStdin ? '($input | ' + invoke + ')' : invoke),
         ].join('\n');
     }
     // `VAR=value cmd` is command-scoped. Values are captured in the
@@ -785,6 +780,20 @@ function translateFor(cmd) {
     lines.push('}');
     return lines.join('\n');
 }
+function stdinTarget(c) {
+    let t = null;
+    for (const r of c.redirects) {
+        if (r.op === '<')
+            t = r.target;
+    }
+    return t;
+}
+function stdinReadExpr(target) {
+    const n = normalizeLiteralPath(target);
+    if (n === 'NUL')
+        return '@()';
+    return '@(fx-readlines ' + pathExpr(n) + ')';
+}
 export function translatePipelineBody(p) {
     // Every pipeline stage needs its own status slot. Handlers deliberately use
     // `$script:fx_exit` because their helper functions run in child scopes; in a
@@ -822,7 +831,28 @@ export function translatePipelineBody(p) {
     }
     const pipelineName = '__fx_p' + pipelineId;
     const statuses = bodies.map(() => '0').join(', ');
-    const pipelineCall = names.join(' | ');
+    const stageStdin = p.commands.map((c) => stdinTarget(c));
+    const middleStdin = stageStdin.some((t, i) => i > 0 && t !== null);
+    let pipelineInner;
+    if (middleStdin) {
+        // A non-first `< file` replaces the pipe as that stage's stdin. Run
+        // earlier stages anyway (they may have side effects) but do not feed
+        // their stream into the redirected stage.
+        const seq = ['    $fx_cur = @($input)'];
+        for (let i = 0; i < names.length; i++) {
+            if (stageStdin[i] && i > 0)
+                seq.push('    $fx_cur = ' + stdinReadExpr(stageStdin[i]));
+            if (i === names.length - 1)
+                seq.push('    $fx_cur | ' + names[i]);
+            else
+                seq.push('    $fx_cur = @($fx_cur | ' + names[i] + ')');
+        }
+        pipelineInner = seq.join('\n');
+    }
+    else {
+        pipelineInner =
+            '    $input | ' + names.join(' | ');
+    }
     defs.push([
         'function ' + pipelineName + ' {',
         '  ' + statusVar + ' = @(' + statuses + ')',
@@ -830,7 +860,7 @@ export function translatePipelineBody(p) {
         // The wrapper forwards redirect input to stage zero. With no input,
         // PowerShell still invokes a regular function once, which preserves the
         // existing no-stdin pipeline behavior on Windows PowerShell 5.1.
-        '    $input | ' + pipelineCall,
+        pipelineInner,
         '  } finally {',
         // Bash defaults to pipefail off: only the last stage controls the list
         // status used by a following && / || segment.
@@ -843,13 +873,19 @@ export function translatePipelineBody(p) {
 export function translateCommandList(list) {
     const plans = [];
     for (const seg of list.segments) {
+        const cmds = seg.pipeline.commands;
         const redirects = [];
-        for (const c of seg.pipeline.commands)
+        for (const c of cmds)
             redirects.push(...c.redirects);
+        const outputRedirects = cmds.length ? cmds[cmds.length - 1].redirects.slice() : [];
+        const stdinRedirects = cmds.length
+            ? cmds[0].redirects.filter((r) => r.op === '<')
+            : [];
         const { defs, call } = translatePipelineBody(seg.pipeline);
         let body = defs ? defs + '\n' + call : call;
-        // `< file` redirects feed the pipeline via the FAUXNIX_STDIN_FILE channel
-        if (redirects.some((r) => r.op === '<')) {
+        // First-stage `< file` feeds stage zero via FAUXNIX_STDIN_FILE.
+        // Later-stage `<` is owned inside the pipeline body, not this wrapper.
+        if (stdinRedirects.length) {
             // `& { ... }` (no parens) so the scriptblock can be a non-first
             // pipeline element receiving the fed lines.
             const pipeCall = call.startsWith('(& {') ? call.slice(1, -1) : call;
@@ -861,7 +897,14 @@ export function translateCommandList(list) {
                     call +
                     ' }';
         }
-        plans.push({ op: seg.op, script: wrapScript(body), body, redirects });
+        plans.push({
+            op: seg.op,
+            script: wrapScript(body),
+            body,
+            redirects,
+            outputRedirects,
+            stdinRedirects,
+        });
     }
     return plans;
 }
@@ -880,6 +923,8 @@ const WRAP_HELPER_ORDER = [
     'fx-arrput',
     'fx-arrclr',
     'fx-subget',
+    'fx-winargv',
+    'fx-native',
 ];
 const WRAP_HELPER_DEPS = {
     'fx-readlines': [],
@@ -896,6 +941,8 @@ const WRAP_HELPER_DEPS = {
     'fx-arrput': ['fx-arrdrop', 'fx-svenc'],
     'fx-arrclr': ['fx-arrdrop'],
     'fx-subget': ['fx-arrload', 'fx-ifs1'],
+    'fx-winargv': [],
+    'fx-native': ['fx-winargv'],
 };
 /** Helpers the body calls that wrapScript still has to emit (not already defined there). */
 function wrapHelpersNeeded(body) {
@@ -1169,6 +1216,127 @@ export function wrapScript(body, opts = {}) {
             '  return [string]$arr[$i]',
             '}',
         ],
+        'fx-winargv': [
+            'function fx-winargv($argv, $cmdmeta) {',
+            // Empty [object[]] unwraps to $null on PS 5.1; @($null) is one empty arg.
+            // $cmdmeta: also quote & | () <> ^ so cmd.exe /c does not split the tail.
+            '  if ($null -eq $argv) { $argv = @() }',
+            '  $parts = New-Object System.Collections.Generic.List[string]',
+            '  foreach ($a in @($argv)) {',
+            '    $s = [string]$a',
+            '    if ($s.Length -eq 0) { $parts.Add(\'""\'); continue }',
+            '    $need = $false',
+            '    foreach ($ch in $s.ToCharArray()) {',
+            "      if ($ch -eq ' ' -or $ch -eq ([char]9) -or $ch -eq [char]34) { $need = $true; break }",
+            "      if ($cmdmeta -and ($ch -eq '&' -or $ch -eq '|' -or $ch -eq '(' -or $ch -eq ')' -or $ch -eq '<' -or $ch -eq '>' -or $ch -eq '^')) { $need = $true; break }",
+            '    }',
+            '    if (-not $need) { $parts.Add($s); continue }',
+            '    $sb = New-Object System.Text.StringBuilder',
+            '    [void]$sb.Append([char]34)',
+            '    $bs = 0',
+            '    foreach ($ch in $s.ToCharArray()) {',
+            '      if ($ch -eq [char]92) { $bs++ }',
+            '      elseif ($ch -eq [char]34) {',
+            '        [void]$sb.Append(([string][char]92) * (2 * $bs + 1))',
+            '        [void]$sb.Append([char]34)',
+            '        $bs = 0',
+            '      } else {',
+            '        if ($bs -gt 0) { [void]$sb.Append(([string][char]92) * $bs); $bs = 0 }',
+            '        [void]$sb.Append($ch)',
+            '      }',
+            '    }',
+            '    if ($bs -gt 0) { [void]$sb.Append(([string][char]92) * (2 * $bs)) }',
+            '    [void]$sb.Append([char]34)',
+            '    $parts.Add($sb.ToString())',
+            '  }',
+            "  return (($parts.ToArray()) -join ' ')",
+            '}',
+        ],
+        'fx-native': [
+            'function fx-native($name, $argv) {',
+            '  if ($null -eq $argv) { $argv = @() } else { $argv = [object[]]@($argv) }',
+            '  $app = Get-Command -Name $name -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1',
+            '  if ($null -eq $app) {',
+            // Dynamic/splat names can resolve to PS echo/cat aliases, not an .exe.
+            // Application-first keeps node/git on the Win32 argv path; the call
+            // operator is only for names that are not executables.
+            '    $cmd = Get-Command -Name $name -ErrorAction SilentlyContinue | Select-Object -First 1',
+            '    if ($null -eq $cmd) {',
+            "      $fx_nf = 'bash: ' + $name + ': command not found'",
+            "      $fx_n = [string]$name",
+            // Hint only — never alias python3→python (wrong interpreter).
+            "      if ($fx_n -eq 'python3' -or $fx_n -eq 'python3.exe') { $fx_nf += '" +
+                PYTHON3_WINDOWS_HINT +
+                "' }",
+            "      elseif ($fx_n -like '*.sh') { $fx_nf += '" + SH_SCRIPT_WINDOWS_HINT + "' }",
+            '      [Console]::Error.WriteLine($fx_nf)',
+            '      $script:fx_exit = 127',
+            '      return',
+            '    }',
+            '    $ins = @($input)',
+            '    $global:LASTEXITCODE = 0',
+            '    if ($ins.Count -gt 0) { $ins | & $name @argv } else { & $name @argv }',
+            '    if ($LASTEXITCODE -gt 0) { $script:fx_exit = $LASTEXITCODE }',
+            '    return',
+            '  }',
+            '  $psi = New-Object System.Diagnostics.ProcessStartInfo',
+            '  $ext = [IO.Path]::GetExtension([string]$app.Source)',
+            // CreateProcess cannot launch .cmd/.bat with UseShellExecute=false (npm.cmd).
+            // /s strips one outer quote pair from the /c tail; CRT-quote cmd
+            // metacharacters so `&`/`|`/`()` do not start a second command.
+            "  if ($ext -eq '.cmd' -or $ext -eq '.bat') {",
+            '    $comspec = Get-Command -Name cmd -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1',
+            '    if ($null -eq $comspec) {',
+            "      [Console]::Error.WriteLine('bash: cmd.exe: command not found')",
+            '      $script:fx_exit = 127',
+            '      return',
+            '    }',
+            '    $psi.FileName = $comspec.Source',
+            '    $fx_app = fx-winargv $app.Source $true',
+            '    $fx_rest = fx-winargv $argv $true',
+            "    if ($fx_rest.Length -gt 0) { $fx_tail = $fx_app + ' ' + $fx_rest } else { $fx_tail = $fx_app }",
+            '    $psi.Arguments = \'/d /s /c "\' + $fx_tail + \'"\'',
+            '  } else {',
+            '    $psi.FileName = $app.Source',
+            '    $psi.Arguments = fx-winargv $argv',
+            '  }',
+            '  $psi.UseShellExecute = $false',
+            '  $psi.RedirectStandardInput = $true',
+            '  $psi.RedirectStandardOutput = $true',
+            '  $psi.RedirectStandardError = $true',
+            '  $psi.CreateNoWindow = $true',
+            '  $psi.WorkingDirectory = [Environment]::CurrentDirectory',
+            // StreamReader.ReadToEndAsync is .NET 4.5 (PS 5.1). Start readers
+            // before writing stdin so a chatty child cannot fill the 64KB pipe.
+            "  if ($env:FAUXNIX_NATIVE_ENCODING -eq 'ansi') { $enc = [System.Text.Encoding]::GetEncoding(936) } else { $enc = New-Object System.Text.UTF8Encoding $false }",
+            '  $psi.StandardOutputEncoding = $enc',
+            '  $psi.StandardErrorEncoding = $enc',
+            '  $p = New-Object System.Diagnostics.Process',
+            '  $p.StartInfo = $psi',
+            '  [void]$p.Start()',
+            '  $outTask = $p.StandardOutput.ReadToEndAsync()',
+            '  $errTask = $p.StandardError.ReadToEndAsync()',
+            '  $ins = @($input)',
+            '  if ($ins.Count -gt 0) {',
+            '    foreach ($fx_ln in $ins) { $p.StandardInput.WriteLine([string]$fx_ln) }',
+            '  }',
+            '  $p.StandardInput.Close()',
+            '  [void][System.Threading.Tasks.Task]::WaitAll(@($outTask, $errTask))',
+            '  [void]$p.WaitForExit()',
+            '  $errt = [string]$errTask.Result',
+            '  if ($errt.Length -gt 0) { [Console]::Error.Write($errt) }',
+            '  $t = [string]$outTask.Result',
+            "  $t = $t.Replace(([string][char]13 + [string][char]10), [string][char]10).Replace([string][char]13, [string][char]10)",
+            "  if ($t -ne '') {",
+            '    $parts = @($t.Split([char]10))',
+            "    if ($parts.Count -gt 0 -and $parts[$parts.Count - 1] -eq '') { $parts = $parts[0..($parts.Count - 2)] }",
+            '    foreach ($fx_ol in $parts) { $fx_ol }',
+            '  }',
+            '  $code = [int]$p.ExitCode',
+            '  if ($code -gt 0) { $script:fx_exit = $code } elseif ($code -lt 0) { $script:fx_exit = 1 }',
+            '  try { $p.Close() } catch {}',
+            '}',
+        ],
     };
     cachedWrapHelpers = helpers;
     for (const name of WRAP_HELPER_ORDER) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fauxnix-cli",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Fauxnix — run Linux-style commands on Windows via deterministic PowerShell translation. No VM, no WSL. MCP server + CLI for AI agents.",
   "type": "module",
   "bin": {