fluxflow-cli 2.16.0 → 2.16.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/fluxflow.js +49 -17
- package/package.json +1 -1
package/dist/fluxflow.js
CHANGED
|
@@ -3703,6 +3703,7 @@ var init_TerminalBox = __esm({
|
|
|
3703
3703
|
const collapsedCount = rawLines.length - limit;
|
|
3704
3704
|
const visibleLines = hasCollapsibleContent && !isExpanded ? rawLines.slice(rawLines.length - limit) : rawLines;
|
|
3705
3705
|
const renderedOutput = visibleLines.join("\n");
|
|
3706
|
+
const displayOutput = rawLines.length > 0;
|
|
3706
3707
|
return /* @__PURE__ */ React3.createElement(
|
|
3707
3708
|
Box2,
|
|
3708
3709
|
{
|
|
@@ -3715,7 +3716,7 @@ var init_TerminalBox = __esm({
|
|
|
3715
3716
|
borderColor: "#555555",
|
|
3716
3717
|
paddingLeft: 2,
|
|
3717
3718
|
paddingRight: 0,
|
|
3718
|
-
paddingY:
|
|
3719
|
+
paddingY: 1,
|
|
3719
3720
|
marginTop: 1,
|
|
3720
3721
|
width: "100%"
|
|
3721
3722
|
},
|
|
@@ -5576,10 +5577,22 @@ var init_exec_command = __esm({
|
|
|
5576
5577
|
netEnv.NO_PROXY = "localhost,127.0.0.1";
|
|
5577
5578
|
}
|
|
5578
5579
|
return new Promise((resolve) => {
|
|
5579
|
-
const attempt = (
|
|
5580
|
-
const
|
|
5581
|
-
|
|
5582
|
-
let
|
|
5580
|
+
const attempt = (shellType) => {
|
|
5581
|
+
const isPowerShell = shellType === "pwsh" || shellType === "powershell";
|
|
5582
|
+
const command = adjustWindowsCommand(rawCommand, isPowerShell);
|
|
5583
|
+
let shell;
|
|
5584
|
+
if (isWin) {
|
|
5585
|
+
if (shellType === "pwsh") {
|
|
5586
|
+
shell = "C:\\Users\\User\\AppData\\Local\\Microsoft\\WindowsApps\\pwsh.exe";
|
|
5587
|
+
} else if (shellType === "powershell") {
|
|
5588
|
+
shell = "powershell.exe";
|
|
5589
|
+
} else {
|
|
5590
|
+
shell = "cmd.exe";
|
|
5591
|
+
}
|
|
5592
|
+
} else {
|
|
5593
|
+
shell = process.env.SHELL || "bash";
|
|
5594
|
+
}
|
|
5595
|
+
let shellArgs = isWin ? isPowerShell ? ["-NoProfile", "-Command", command] : ["/c", command] : ["-c", command];
|
|
5583
5596
|
if (systemSettings.networkAccess === false && !isWin) {
|
|
5584
5597
|
const originalShell = shell;
|
|
5585
5598
|
const originalArgs = [...shellArgs];
|
|
@@ -5641,30 +5654,44 @@ ${finalOutput}`);
|
|
|
5641
5654
|
});
|
|
5642
5655
|
return true;
|
|
5643
5656
|
} catch (err) {
|
|
5644
|
-
if (isWin &&
|
|
5657
|
+
if (isWin && (shellType === "pwsh" || shellType === "powershell") && err.code === "ENOENT") {
|
|
5645
5658
|
return false;
|
|
5646
5659
|
}
|
|
5647
|
-
runStandardSpawn(resolve, command, rawCommand, netEnv, onChunk,
|
|
5660
|
+
runStandardSpawn(resolve, command, rawCommand, netEnv, onChunk, shellType, systemSettings);
|
|
5648
5661
|
return true;
|
|
5649
5662
|
}
|
|
5650
5663
|
} else {
|
|
5651
|
-
runStandardSpawn(resolve, command, rawCommand, netEnv, onChunk,
|
|
5664
|
+
runStandardSpawn(resolve, command, rawCommand, netEnv, onChunk, shellType, systemSettings);
|
|
5652
5665
|
return true;
|
|
5653
5666
|
}
|
|
5654
5667
|
};
|
|
5655
5668
|
if (isWin) {
|
|
5656
|
-
if (!attempt(
|
|
5657
|
-
attempt(
|
|
5669
|
+
if (!attempt("pwsh")) {
|
|
5670
|
+
if (!attempt("powershell")) {
|
|
5671
|
+
attempt("cmd");
|
|
5672
|
+
}
|
|
5658
5673
|
}
|
|
5659
5674
|
} else {
|
|
5660
|
-
attempt(
|
|
5675
|
+
attempt("bash");
|
|
5661
5676
|
}
|
|
5662
5677
|
});
|
|
5663
5678
|
};
|
|
5664
|
-
runStandardSpawn = (resolve, command, rawCommand, netEnv, onChunk,
|
|
5679
|
+
runStandardSpawn = (resolve, command, rawCommand, netEnv, onChunk, shellType = "powershell", systemSettings = {}) => {
|
|
5665
5680
|
const isWin = process.platform === "win32";
|
|
5666
|
-
|
|
5667
|
-
let
|
|
5681
|
+
const isPowerShell = shellType === "pwsh" || shellType === "powershell";
|
|
5682
|
+
let shell;
|
|
5683
|
+
if (isWin) {
|
|
5684
|
+
if (shellType === "pwsh") {
|
|
5685
|
+
shell = "C:\\Users\\User\\AppData\\Local\\Microsoft\\WindowsApps\\pwsh.exe";
|
|
5686
|
+
} else if (shellType === "powershell") {
|
|
5687
|
+
shell = "powershell.exe";
|
|
5688
|
+
} else {
|
|
5689
|
+
shell = "cmd.exe";
|
|
5690
|
+
}
|
|
5691
|
+
} else {
|
|
5692
|
+
shell = process.env.SHELL || "bash";
|
|
5693
|
+
}
|
|
5694
|
+
let shellArgs = isWin ? isPowerShell ? ["-NoProfile", "-Command", command] : ["/c", command] : ["-c", command];
|
|
5668
5695
|
if (systemSettings.networkAccess === false && !isWin) {
|
|
5669
5696
|
const originalShell = shell;
|
|
5670
5697
|
const originalArgs = [...shellArgs];
|
|
@@ -5742,9 +5769,14 @@ ${finalOutput}`);
|
|
|
5742
5769
|
}
|
|
5743
5770
|
});
|
|
5744
5771
|
child.on("error", (err) => {
|
|
5745
|
-
if (isWin &&
|
|
5746
|
-
|
|
5747
|
-
|
|
5772
|
+
if (isWin && err.code === "ENOENT") {
|
|
5773
|
+
if (shellType === "pwsh") {
|
|
5774
|
+
const nextCommand = adjustWindowsCommand(rawCommand, true);
|
|
5775
|
+
return runStandardSpawn(resolve, nextCommand, rawCommand, netEnv, onChunk, "powershell", systemSettings);
|
|
5776
|
+
} else if (shellType === "powershell") {
|
|
5777
|
+
const nextCommand = adjustWindowsCommand(rawCommand, false);
|
|
5778
|
+
return runStandardSpawn(resolve, nextCommand, rawCommand, netEnv, onChunk, "cmd", systemSettings);
|
|
5779
|
+
}
|
|
5748
5780
|
}
|
|
5749
5781
|
activeChildProcess = null;
|
|
5750
5782
|
const errorMsg = err instanceof Error ? err.message : String(err);
|