arashi 1.26.2 → 1.28.0

package/bin/arashi

@@ -53,13 +53,9 @@ fi
 
 # Close stdin only when piping list output (fzf compatibility)
 command=""
-force_remove="false"
 for arg in "$@"; do
   case "$arg" in
     -*)
-      case "$arg" in
-        -f|--force) force_remove="true" ;;
-      esac
       continue
       ;;
     *)
@@ -71,7 +67,7 @@ for arg in "$@"; do
 done
 
 if [ ! -t 1 ]; then
-  if [ "$command" = "list" ] || { [ "$command" = "remove" ] && [ "$force_remove" = "true" ]; }; then
+  if [ "$command" = "list" ]; then
     exec "$BINARY" "$@" 0<&-
   fi
 fi

package/bin/prepare-spawn-command.js

@@ -1,5 +1,6 @@
 const WINDOWS_BATCH_FILE = /\.(?:cmd|bat)$/i;
 const CMD_ARGUMENT_VARIABLE_PREFIX = "ARASHI_CMD_ARGUMENT_";
+const CMD_LITERAL_PERCENT_VARIABLE = "ARASHI_CMD_LITERAL_PERCENT";
 
 // Quote according to CommandLineToArgvW's rules. The result is stored in an
 // environment variable and introduced with ordinary expansion. Cmd expands each
@@ -13,6 +14,7 @@ export function prepareSpawnCommand(
   platform = process.platform,
   env = process.env,
   forceWindowsShell = false,
+  callBatchFile = false,
 ) {
   const executable = command[0];
   if (
@@ -22,21 +24,34 @@ export function prepareSpawnCommand(
     return { args: command.slice(1), command: executable, windowsVerbatimArguments: false };
   }
 
-  const values = command.map((argument) => quoteWindowsArgument(argument));
+  const values = command.map((argument) => {
+    const quoted = quoteWindowsArgument(argument);
+    return callBatchFile
+      ? quoted.replaceAll("%", `%${CMD_LITERAL_PERCENT_VARIABLE}%`)
+      : quoted;
+  });
   const variableNames = values.map((_value, index) => `${CMD_ARGUMENT_VARIABLE_PREFIX}${index}`);
 
   const commandInterpreter =
     Object.entries(env).find(([key]) => key.toLowerCase() === "comspec")?.[1] ?? "cmd.exe";
 
+  const invocation = variableNames.map((name) => `%${name}%`).join(" ");
+  const args = ["/d"];
+  if (callBatchFile) args.push("/e:on");
+  args.push("/v:off", "/s", "/c", `"${callBatchFile ? "call " : ""}${invocation}"`);
+
   return {
-    args: ["/d", "/v:off", "/s", "/c", `"${variableNames.map((name) => `%${name}%`).join(" ")}"`],
+    args,
     command: commandInterpreter,
     env: {
       ...Object.fromEntries(
         Object.entries(env).filter(
-          ([name]) => !name.toUpperCase().startsWith(CMD_ARGUMENT_VARIABLE_PREFIX),
+          ([name]) =>
+            !name.toUpperCase().startsWith(CMD_ARGUMENT_VARIABLE_PREFIX) &&
+            name.toUpperCase() !== CMD_LITERAL_PERCENT_VARIABLE,
         ),
       ),
+      ...(callBatchFile ? { [CMD_LITERAL_PERCENT_VARIABLE]: "%" } : {}),
       ...Object.fromEntries(variableNames.map((name, index) => [name, values[index]])),
     },
     windowsVerbatimArguments: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arashi",
-  "version": "1.26.2",
+  "version": "1.28.0",
   "description": "Git worktree manager for meta-repositories - The eye of the storm for your development workflow",
   "keywords": [
     "cli",
@@ -88,6 +88,7 @@
     "husky": "9.1.7",
     "js-yaml": "4.3.0",
     "lint-staged": "16.2.7",
+    "node-pty": "1.1.0",
     "ora": "8.2.0",
     "oxfmt": "0.28.0",
     "oxlint": "1.43.0",