arashi 1.24.0 → 1.25.0

package/README.md

@@ -172,7 +172,7 @@ arashi switch --no-default-launch           # bypass configured sesh/Herdr mode
 
 Explicit `--tmux` is a per-invocation launcher override for `create` and `switch`; it is not a persisted configuration mode. It requires an active tmux context whose `TMUX` value is non-empty after trimming, uses the selected worktree path as one argv-safe `tmux new-window -c` argument, and does not fall back to another launcher when the prerequisite or launch fails. On `create`, it implies both launch and switch, while validation failures occur before worktree mutation.
 
-`--tab` is a CLI-only launch disposition for `create` and `switch`; it is never persisted. It requests a true terminal tab or documented managed-context equivalent, implies launch (and selection for `create`), overrides automatic parent-shell `cd`, and never degrades to a window or another launcher. Unsupported adapters fail with `TAB_DISPOSITION_UNSUPPORTED`; launch/preflight failures use `LAUNCH_FAILED`. Human-only tab launch is incompatible with `--json`.
+`--tab` is a CLI-only launch disposition for `create` and `switch`; it is never persisted. It requests a true terminal tab or documented managed-context equivalent, implies launch (and selection for `create`), overrides automatic parent-shell `cd`, and never degrades to a window or another launcher. For switch, it bypasses configured `sesh` or `herdr` launch defaults; for create, it bypasses configured generic or editor-scoped launch defaults. An explicit launcher selector remains authoritative. Unsupported adapters fail with `TAB_DISPOSITION_UNSUPPORTED`; launch/preflight failures use `LAUNCH_FAILED`. Human-only tab launch is incompatible with `--json`.
 
 ### Managed Git ignore rules
 
@@ -229,24 +229,16 @@ For automated installs, set `ARASHI_SHELL_INTEGRATION=yes` to enable it without
 
 ## Hooks
 
-Arashi can run lifecycle hooks during `arashi create` and `arashi remove`.
+Arashi can run lifecycle hooks during `arashi create` and `arashi remove`. Configured create uses
+workspace `pre-create`/`post-create` plus repository-specific `pre-create.<repo>` and
+`post-create.<repo>` files. Configured remove evaluates repository, workspace, user-global targeted,
+and user-global shared scopes once per target repository. Standalone mode activates only targeted
+and shared user-global hooks.
 
-- Global hooks in `.arashi/hooks/`:
-  - `pre-create.sh`
-  - `post-create.sh`
-  - `pre-remove.sh`
-  - `post-remove.sh`
-- Repository-specific hooks:
-  - `pre-create.<repo>.sh`
-  - `post-create.<repo>.sh`
-- Scoped remove hooks:
-  - repository scope: `repos/<repo>/.arashi/hooks/pre-remove.sh` and `post-remove.sh`
-  - global shared: `~/.arashi/hooks/pre-remove.sh` and `post-remove.sh`
-  - global targeted: `~/.arashi/hooks/<repo>/pre-remove.sh` and `post-remove.sh`
-
-For `arashi remove`, hook execution order is: repository scope -> workspace-root scope -> global targeted scope -> global shared scope.
-
-`pre-remove.sh` is useful for teardown before deletion (for example, stopping tmux sessions), and `post-remove.sh` can run final cleanup after remove operations complete.
+POSIX uses executable `.sh` files. Windows uses one case-insensitive `.ps1`, `.cmd`, or `.bat`
+candidate per location and never runs `.sh` implicitly. Hook failures participate in create rollback
+or remove finalization, all hooks default to a 300000 ms timeout, and JSON results expose the ordered
+ledger at `data.hookOutcomes` on success or `error.details.hookOutcomes` on failure.
 
 See [`docs/hooks.md`](./docs/hooks.md) for hook behavior, environment variables, and examples.
 
@@ -351,7 +343,7 @@ Legacy switch-only `launchMode` and `launch_mode` fields remain readable for a b
 
 Use `defaults.create` for terminal `arashi create` behavior. Use `defaults.editors.<host>.create` for editor-specific overrides such as VS Code extension create flows. Supported hosts are `vscode`, `cursor`, and `kiro`. Each scope has one canonical `launch` choice: `none` | `auto` | `sesh` | `herdr`. `switch` stays independent, while any enabled launch implies switch handling for the newly created primary worktree.
 
-Create precedence is: reject `--sesh` plus `--herdr`; then explicit `--sesh` / `--herdr`; `--launch`; `--no-launch`; the matching configured scope; and built-in `none`. An editor-hosted invocation does not fall back to terminal or another editor scope.
+Create precedence is: reject `--sesh` plus `--herdr`; then explicit `--sesh` / `--herdr`; `--tab` or `--launch`; `--no-launch`; the matching configured scope; and built-in `none`. `--tab` bypasses the matching configured scope unless an explicit launcher selector is present. An editor-hosted invocation does not fall back to terminal or another editor scope.
 
 Legacy create booleans plus `launchMode` / `launch_mode` remain readable for a bounded compatibility window. Accepted combinations warn on stderr with the exact canonical replacement and do not rewrite the file. Disabled launch plus a launcher, conflicting aliases, and conflicting canonical/legacy choices are rejected before workspace mutation.
 

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.25.0",
   "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",

package/schema/config.schema.json

@@ -34,7 +34,10 @@
           "description": "Optional workspace-level hooks settings",
           "properties": {
             "timeout": {
-              "description": "Timeout in milliseconds for long-running operations",
+              "description": "Lifecycle-hook timeout in milliseconds (default: 300000)",
+              "maximum": 2147483647,
+              "minimum": 1,
+              "multipleOf": 1,
               "type": "number"
             }
           },