arashi 1.24.0 → 1.24.1

package/bin/prepare-spawn-command.js

@@ -0,0 +1,44 @@
+const WINDOWS_BATCH_FILE = /\.(?:cmd|bat)$/i;
+const CMD_ARGUMENT_VARIABLE_PREFIX = "ARASHI_CMD_ARGUMENT_";
+
+// Quote according to CommandLineToArgvW's rules. The result is stored in an
+// environment variable and introduced with ordinary expansion. Cmd expands each
+// fixed %VARIABLE% token once, but does not rescan user-controlled contents as
+// command syntax. Delayed expansion stays disabled so literal ! characters survive.
+const quoteWindowsArgument = (argument) =>
+  `"${argument.replaceAll(/(\\*)"/g, String.raw`$1$1\"`).replace(/(\\*)$/, "$1$1")}"`;
+
+export function prepareSpawnCommand(
+  command,
+  platform = process.platform,
+  env = process.env,
+  forceWindowsShell = false,
+) {
+  const executable = command[0];
+  if (
+    platform !== "win32" ||
+    (!forceWindowsShell && !WINDOWS_BATCH_FILE.test(executable))
+  ) {
+    return { args: command.slice(1), command: executable, windowsVerbatimArguments: false };
+  }
+
+  const values = command.map((argument) => quoteWindowsArgument(argument));
+  const variableNames = values.map((_value, index) => `${CMD_ARGUMENT_VARIABLE_PREFIX}${index}`);
+
+  const commandInterpreter =
+    Object.entries(env).find(([key]) => key.toLowerCase() === "comspec")?.[1] ?? "cmd.exe";
+
+  return {
+    args: ["/d", "/v:off", "/s", "/c", `"${variableNames.map((name) => `%${name}%`).join(" ")}"`],
+    command: commandInterpreter,
+    env: {
+      ...Object.fromEntries(
+        Object.entries(env).filter(
+          ([name]) => !name.toUpperCase().startsWith(CMD_ARGUMENT_VARIABLE_PREFIX),
+        ),
+      ),
+      ...Object.fromEntries(variableNames.map((name, index) => [name, values[index]])),
+    },
+    windowsVerbatimArguments: true,
+  };
+}

package/bin/update.js

@@ -1,9 +1,10 @@
 import { spawnSync } from "node:child_process";
 import { readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import { getPlatformInfo, installBinary, MANUAL_INSTALL_URL, PACKAGE_NAME } from "./install-binary.js";
+import { prepareSpawnCommand } from "./prepare-spawn-command.js";
 
 export const UPDATE_COMMAND_DESCRIPTION = "Check for and apply Arashi updates";
 
@@ -97,15 +98,84 @@ export async function fetchLatestGitHubRelease({ fetchImpl = fetch, repo = "corw
   };
 }
 
+function normalizeInstallPath(value) {
+  return String(value ?? "")
+    .trim()
+    .replaceAll("\\", "/")
+    .replace(/\/+$/, "")
+    .toLowerCase();
+}
+
+function readEnvironmentValue(env, name) {
+  return Object.entries(env).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1] ?? "";
+}
+
+function readEnvironmentPath(env, name) {
+  return normalizeInstallPath(readEnvironmentValue(env, name));
+}
+
+function detectPackageManagerFromInstallRoot(rootDir, env) {
+  const root = normalizeInstallPath(rootDir);
+  if (!root) return null;
+
+  const userProfile = readEnvironmentPath(env, "USERPROFILE");
+  const home = userProfile || readEnvironmentPath(env, "HOME");
+  const appData =
+    readEnvironmentPath(env, "APPDATA") ||
+    (userProfile ? `${userProfile}/appdata/roaming` : "");
+  const localAppData =
+    readEnvironmentPath(env, "LOCALAPPDATA") ||
+    (userProfile ? `${userProfile}/appdata/local` : "");
+
+  if (home && root === `${home}/.vite-plus/packages/${PACKAGE_NAME}/current/package`) {
+    return "vite-plus";
+  }
+  if (appData && root === `${appData}/npm/node_modules/${PACKAGE_NAME}`) return "npm";
+  if (localAppData && root === `${localAppData}/yarn/data/global/node_modules/${PACKAGE_NAME}`) {
+    return "yarn";
+  }
+  if (userProfile && root === `${userProfile}/.bun/install/global/node_modules/${PACKAGE_NAME}`) {
+    return "bun";
+  }
+
+  const pnpmHomes = new Set(
+    [localAppData ? `${localAppData}/pnpm` : "", readEnvironmentPath(env, "PNPM_HOME")].filter(Boolean),
+  );
+  for (const pnpmHome of pnpmHomes) {
+    const relativeRoot = root.startsWith(`${pnpmHome}/`) ? root.slice(pnpmHome.length + 1) : "";
+    if (
+      /^global\/[^/]+\/(?:\.pnpm\/[^/]+\/node_modules|node_modules)\/arashi$/.test(relativeRoot)
+    ) {
+      return "pnpm";
+    }
+  }
+
+  return null;
+}
+
 export function selectPackageManagerCommand({ env = process.env, rootDir } = {}) {
-  const userAgent = env.npm_config_user_agent ?? "";
-  const execPath = env.npm_execpath ?? "";
+  const installRootManager = detectPackageManagerFromInstallRoot(rootDir, env);
+  if (installRootManager === "vite-plus") {
+    return { args: ["update", "-g", PACKAGE_NAME], command: "vp", label: "Vite+" };
+  }
+  if (installRootManager === "pnpm") {
+    return { args: ["add", "-g", `${PACKAGE_NAME}@latest`], command: "pnpm", label: "pnpm" };
+  }
+  if (installRootManager === "yarn") {
+    return { args: ["global", "add", `${PACKAGE_NAME}@latest`], command: "yarn", label: "yarn" };
+  }
+  if (installRootManager === "bun") {
+    return { args: ["add", "-g", `${PACKAGE_NAME}@latest`], command: "bun", label: "bun" };
+  }
+  if (installRootManager === "npm") {
+    return { args: ["install", "-g", `${PACKAGE_NAME}@latest`], command: "npm", label: "npm" };
+  }
+
+  const userAgent = readEnvironmentValue(env, "npm_config_user_agent");
+  const execPath = readEnvironmentValue(env, "npm_execpath");
   const combined = `${userAgent} ${execPath}`.toLowerCase();
-  const normalizedRootDir = String(rootDir ?? "").toLowerCase();
   const looksLikeVitePlus =
-    combined.includes("vite-plus") ||
-    /(^|[\\/\s])vp(?:\.exe)?($|[\\/\s])/.test(combined) ||
-    /(^|[\\/])\.vite-plus([\\/]|$)/.test(normalizedRootDir);
+    combined.includes("vite-plus") || /(^|[\\/\s])vp(?:\.exe)?($|[\\/\s])/.test(combined);
 
   if (looksLikeVitePlus) {
     return { args: ["update", "-g", PACKAGE_NAME], command: "vp", label: "Vite+" };
@@ -212,7 +282,8 @@ export async function runNpmManagedUpdate(argv = [], options = {}) {
     return 0;
   }
 
-  const packageManager = options.packageManager ?? selectPackageManagerCommand(options);
+  const packageManager =
+    options.packageManager ?? selectPackageManagerCommand({ ...options, rootDir });
   log(`Update available: ${PACKAGE_NAME} v${metadata.version} -> v${latestVersion}`);
 
   if (flags.check) {
@@ -240,10 +311,21 @@ export async function runNpmManagedUpdate(argv = [], options = {}) {
   }
 
   const spawnSyncImpl = options.spawnSyncImpl ?? spawnSync;
-  const result = spawnSyncImpl(packageManager.command, packageManager.args, {
-    cwd: rootDir,
+  const platform = options.platform ?? process.platform;
+  const env = options.env ?? process.env;
+  const updateCwd = options.updateCwd ?? dirname(process.execPath);
+  const invocation = prepareSpawnCommand(
+    [packageManager.command, ...packageManager.args],
+    platform,
+    env,
+    true,
+  );
+  const result = spawnSyncImpl(invocation.command, invocation.args, {
+    cwd: updateCwd,
     encoding: "utf8",
+    env: invocation.env ?? env,
     stdio: "inherit",
+    windowsVerbatimArguments: invocation.windowsVerbatimArguments,
   });
 
   if (result.error) {
@@ -256,20 +338,39 @@ export async function runNpmManagedUpdate(argv = [], options = {}) {
     return 1;
   }
 
-  let updatedMetadata = metadata;
   try {
-    updatedMetadata = await readPackageMetadata(rootDir, options);
-  } catch {
-    updatedMetadata = { ...metadata, version: latestVersion };
-  }
+    let activeRootDir = rootDir;
+    if (packageManager.command === "pnpm") {
+      const rootInvocation = prepareSpawnCommand([packageManager.command, "root", "-g"], platform, env, true);
+      const rootResult = spawnSyncImpl(rootInvocation.command, rootInvocation.args, {
+        cwd: updateCwd,
+        encoding: "utf8",
+        env: rootInvocation.env ?? env,
+        windowsVerbatimArguments: rootInvocation.windowsVerbatimArguments,
+      });
+      if (rootResult.error) throw rootResult.error;
+      if (rootResult.status !== 0) {
+        throw new Error(`pnpm root -g failed with exit code ${rootResult.status ?? "unknown"}`);
+      }
+      const globalRoot = String(rootResult.stdout ?? "").trim();
+      if (!globalRoot) throw new Error("pnpm root -g returned an empty path");
+      const separator = platform === "win32" ? "\\" : "/";
+      activeRootDir = `${globalRoot.replace(/[\\/]+$/, "")}${separator}${PACKAGE_NAME}`;
+    }
+
+    let updatedMetadata = metadata;
+    try {
+      updatedMetadata = await readPackageMetadata(activeRootDir, options);
+    } catch {
+      updatedMetadata = { ...metadata, version: latestVersion };
+    }
 
-  try {
     const installBinaryImpl = options.installBinaryImpl ?? installBinary;
     const installResult = await installBinaryImpl({
       ...options,
       binDir: options.binDir,
       force: true,
-      rootDir,
+      rootDir: activeRootDir,
       version: updatedMetadata.version,
     });
     log(`✓ Updated ${PACKAGE_NAME} from v${metadata.version} to v${updatedMetadata.version}.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arashi",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "description": "Git worktree manager for meta-repositories - The eye of the storm for your development workflow",
   "keywords": [
     "cli",
@@ -30,6 +30,7 @@
     "bin/arashi",
     "bin/arashi.js",
     "bin/install-binary.js",
+    "bin/prepare-spawn-command.js",
     "bin/update.js",
     "bin/arashi.bat",
     "bin/arashi.ps1",